Request 2683 (accepted)

iRony.spec Changed

@@ -37,8 +37,8 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           iRony
-Version:        0.4.2
-Release:	    4%{?dist}
+Version:        0.4.3
+Release:	    1%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
@@ -50,9 +50,6 @@
 Source1:        iRony.conf
 Source2:        iRony.logrotate
 
-Patch0001:      0001-Avoid-refering-to-kolab_auth-if-it-isn-t-actually-th.patch
-Patch0002:      0001-Support-shortlogins-via-the-username_domain-configur.patch
-
 BuildArch:      noarch
 
 Requires:       chwala >= 0.5.2
@@ -104,9 +101,6 @@
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-
 %build
 rm -rvf vendor/sabre
 
@@ -191,6 +185,9 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Thu Jan 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.3-1
+- Release of version 0.4.3
+
 * Tue Apr 23 2019 Christian Mollekopf (Kolab Systems) <mollekopf@kolabsys.com> - 0.4.2-4
 - Support shortlogins via the username_domain configuration option

0001-Avoid-refering-to-kolab_auth-if-it-isn-t-actually-th.patch Deleted

@@ -1,27 +0,0 @@
-From ea645099ea398310270218c32ef9b6d068fb58fa Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Thu, 11 Apr 2019 12:47:47 +0200
-Subject: [PATCH] Avoid refering to kolab_auth if it isn't actually there
-
----
- lib/Kolab/DAV/Auth/HTTPBasic.php | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Kolab/DAV/Auth/HTTPBasic.php b/lib/Kolab/DAV/Auth/HTTPBasic.php
-index 4ba5ddf..616c752 100644
---- a/lib/Kolab/DAV/Auth/HTTPBasic.php
-+++ b/lib/Kolab/DAV/Auth/HTTPBasic.php
-@@ -101,7 +101,9 @@ class HTTPBasic extends DAV\Auth\Backend\AbstractBasic
-             $error_str = rcube::get_instance()->get_storage()->get_error_str();
-         }
- 
--        \kolab_auth::log_login_error($auth['user'], $error_str ?: $error);
-+        if (class_exists('kolab_auth')) {
-+            \kolab_auth::log_login_error($auth['user'], $error_str ?: $error);
-+        }
- 
-         // IMAP server failure... send 503 error
-         if ($error == rcube_imap_generic::ERROR_BAD) {
--- 
-2.20.1
-

0001-Support-shortlogins-via-the-username_domain-configur.patch Deleted

@@ -1,53 +0,0 @@
-From 51ba8a44fbe920b901b1cdd07777dfe3a45b80db Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@kolabsys.com>
-Date: Wed, 17 Apr 2019 11:48:36 +0200
-Subject: [PATCH] Support shortlogins via the username_domain configuration
- option.
-
-Summary: Same logic as roundcubemail/program/lib/Roundcube/rcube_imap.php
-
-Differential Revision: https://git.kolab.org/D755
----
- lib/Kolab/DAV/Auth/HTTPBasic.php | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/lib/Kolab/DAV/Auth/HTTPBasic.php b/lib/Kolab/DAV/Auth/HTTPBasic.php
-index 616c752..687c4a5 100644
---- a/lib/Kolab/DAV/Auth/HTTPBasic.php
-+++ b/lib/Kolab/DAV/Auth/HTTPBasic.php
-@@ -175,6 +175,7 @@ class HTTPBasic extends DAV\Auth\Backend\AbstractBasic
-         $storage      = $rcube->get_storage();
-         $login_lc     = $rcube->config->get('login_lc');
-         $default_port = $rcube->config->get('default_port', 143);
-+        $username_domain = $rcube->config->get('username_domain');
- 
-         // parse $host
-         $a_host = parse_url($host);
-@@ -193,6 +194,24 @@ class HTTPBasic extends DAV\Auth\Backend\AbstractBasic
-             $port = $default_port;
-         }
- 
-+        // Check if we need to add/force domain to username
-+        if (!empty($username_domain)) {
-+            $domain = is_array($username_domain) ? $username_domain[$host] : $username_domain;
-+
-+            if ($domain = rcube_utils::parse_host((string)$domain, $host)) {
-+                $pos = strpos($username, '@');
-+
-+                // force configured domains
-+                if ($pos !== false && $rcube->config->get('username_domain_forced')) {
-+                    $username = substr($username, 0, $pos) . '@' . $domain;
-+                }
-+                // just add domain if not specified
-+                else if ($pos === false) {
-+                    $username .= '@' . $domain;
-+                }
-+            }
-+        }
-+
-         // Convert username to lowercase. If storage backend
-         // is case-insensitive we need to store always the same username
-         if ($login_lc) {
--- 
-2.20.1
-

debian.changelog Changed

debian.series Changed

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/LICENSE Deleted

@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/composer.json Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/config.inc.php.dist Deleted

@@ -1,91 +0,0 @@
-<?php
-
-// The id of the LDAP address book (which refers to the $rcmail_config['ldap_public'])
-// or complete addressbook definition array.
-// --------------------------------------------------------------------
-// Note: Multi-domain (hosted) installations can resolve domain aliases
-//   by adding following settings in kolab_auth_addressbook spec.:
-//
-//   'domain_base_dn'   => 'cn=kolab,cn=config',
-//   'domain_filter'    => '(&(objectclass=domainrelatedobject)(associateddomain=%s))',
-//   'domain_name_attr' => 'associateddomain',
-//
-//   With this %dc variable in base_dn and groups/base_dn will be
-//   replaced with DN string of resolved domain
-//---------------------------------------------------------------------
-$config['kolab_auth_addressbook'] = '';
-
-// This will overwrite defined filter
-$config['kolab_auth_filter'] = '(&(objectClass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)(alias=%fu)))';
-
-// Use this field (from fieldmap configuration) to get authentication ID. Don't use an array here!
-$config['kolab_auth_login'] = 'email';
-
-// Use these fields (from fieldmap configuration) for default identity.
-// If the value array contains more than one field, first non-empty will be used
-// Note: These aren't LDAP attributes, but field names in config
-// Note: If there's more than one email address, as many identities will be created
-$config['kolab_auth_name']         = array('name', 'cn');
-$config['kolab_auth_email']        = array('email');
-$config['kolab_auth_organization'] = array('organization');
-
-// Role field (from fieldmap configuration)
-$config['kolab_auth_role'] = 'role';
-
-// Template for user names displayed in the UI.
-// You can use all attributes from the 'fieldmap' property of the 'kolab_auth_addressbook' configuration
-$config['kolab_auth_user_displayname'] = '{name} ({ou})';
-
-// Login and password of the admin user. Enables "Login As" feature.
-$config['kolab_auth_admin_login']    = '';
-$config['kolab_auth_admin_password'] = '';
-
-// Enable audit logging for abuse of administrative privileges.
-$config['kolab_auth_auditlog'] = false;
-
-// As set of rules to define the required rights on the target entry
-// which allow an admin user to login as another user (the target).
-// The effective rights value refers to either entry level attribute level rights:
-//  * entry:[read|add|delete]
-//  * attrib:<attribute-name>:[read|write|delete]
-$config['kolab_auth_admin_rights'] = array(
-    // Roundcube task => required effective right
-    'settings'        => 'entry:read',
-    'mail'            => 'entry:delete',
-    'addressbook'     => 'entry:delete',
-    // or use a wildcard entry like this:
-    '*'               => 'entry:read',
-);
-
-// Enable plugins on a role-by-role basis. In this example, the 'acl' plugin
-// is enabled for people with a 'cn=professional-user,dc=mykolab,dc=ch' role.
-//
-// Note that this does NOT mean the 'acl' plugin is disabled for other people.
-$config['kolab_auth_role_plugins'] = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'acl',
-            ),
-    );
-
-// Settings on a role-by-role basis. In this example, the 'htmleditor' setting
-// is enabled(1) for people with a 'cn=professional-user,dc=mykolab,dc=ch' role,
-// and it cannot be overridden. Sample use-case: disable htmleditor for normal people,
-// do not allow the setting to be controlled through the preferences, enable the
-// html editor for professional users and allow them to override the setting in
-// the preferences.
-$config['kolab_auth_role_settings'] = Array(
-        'cn=professional-user,dc=mykolab,dc=ch' => Array(
-                'htmleditor' => Array(
-                        'mode' => 'override',
-                        'value' => 1,
-                        'allow_override' => true
-                    ),
-            ),
-    );
-
-// List of LDAP addressbooks (keys of ldap_public configuration array)
-// for which base_dn variables (%dc, etc.) will be replaced according to authenticated user DN
-// Note: special name '*' for all LDAP addressbooks
-$config['kolab_auth_ldap_addressbooks'] = array('*');
-
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/kolab_auth.php Deleted

@@ -1,788 +0,0 @@
-<?php
-
-/**
- * Kolab Authentication (based on ldap_authentication plugin)
- *
- * Authenticates on LDAP server, finds canonized authentication ID for IMAP
- * and for new users creates identity based on LDAP information.
- *
- * Supports impersonate feature (login as another user). To use this feature
- * imap_auth_type/smtp_auth_type must be set to DIGEST-MD5 or PLAIN.
- *
- * @version @package_version@
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2011-2013, 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/>.
- */
-
-class kolab_auth extends rcube_plugin
-{
-    static $ldap;
-    private $username;
-    private $data = array();
-
-    public function init()
-    {
-        $rcmail = rcube::get_instance();
-
-        $this->load_config();
-
-        $this->add_hook('authenticate', array($this, 'authenticate'));
-        $this->add_hook('startup', array($this, 'startup'));
-        $this->add_hook('user_create', array($this, 'user_create'));
-
-        // Hook for password change
-        $this->add_hook('password_ldap_bind', array($this, 'password_ldap_bind'));
-
-        // Hooks related to "Login As" feature
-        $this->add_hook('template_object_loginform', array($this, 'login_form'));
-        $this->add_hook('storage_connect', array($this, 'imap_connect'));
-        $this->add_hook('managesieve_connect', array($this, 'imap_connect'));
-        $this->add_hook('smtp_connect', array($this, 'smtp_connect'));
-        $this->add_hook('identity_form', array($this, 'identity_form'));
-
-        // Hook to modify some configuration, e.g. ldap
-        $this->add_hook('config_get', array($this, 'config_get'));
-
-        // Hook to modify logging directory
-        $this->add_hook('write_log', array($this, 'write_log'));
-        $this->username = $_SESSION['username'];
-
-        // Enable debug logs (per-user), when logged as another user
-        if (!empty($_SESSION['kolab_auth_admin']) && $rcmail->config->get('kolab_auth_auditlog')) {
-            $rcmail->config->set('debug_level', 1);
-            $rcmail->config->set('devel_mode', true);
-            $rcmail->config->set('smtp_log', true);
-            $rcmail->config->set('log_logins', true);
-            $rcmail->config->set('log_session', true);
-            $rcmail->config->set('memcache_debug', true);
-            $rcmail->config->set('imap_debug', true);
-            $rcmail->config->set('ldap_debug', true);
-            $rcmail->config->set('smtp_debug', true);
-            $rcmail->config->set('sql_debug', true);
-
-            // SQL debug need to be set directly on DB object
-            // setting config variable will not work here because
-            // the object is already initialized/configured
-            if ($db = $rcmail->get_dbh()) {
-                $db->set_debug(true);
-            }
-        }
-    }
-
-    /**
-     * Startup hook handler
-     */
-    public function startup($args)
-    {
-        // Check access rights when logged in as another user
-        if (!empty($_SESSION['kolab_auth_admin']) && $args['task'] != 'login' && $args['task'] != 'logout') {
-            // access to specified task is forbidden,
-            // redirect to the first task on the list
-            if (!empty($_SESSION['kolab_auth_allowed_tasks'])) {
-                $tasks = (array)$_SESSION['kolab_auth_allowed_tasks'];
-                if (!in_array($args['task'], $tasks) && !in_array('*', $tasks)) {
-                    header('Location: ?_task=' . array_shift($tasks));
-                    die;
-                }
-
-                // add script that will remove disabled taskbar buttons
-                if (!in_array('*', $tasks)) {
-                    $this->add_hook('render_page', array($this, 'render_page'));
-                }
-            }
-        }
-
-        // load per-user settings
-        $this->load_user_role_plugins_and_settings();
-
-        return $args;
-    }
-
-    /**
-     * Modify some configuration according to LDAP user record
-     */
-    public function config_get($args)
-    {
-        // Replaces ldap_vars (%dc, etc) in public kolab ldap addressbooks
-        // config based on the users base_dn. (for multi domain support)
-        if ($args['name'] == 'ldap_public' && !empty($args['result'])) {
-            $rcmail      = rcube::get_instance();
-            $kolab_books = (array) $rcmail->config->get('kolab_auth_ldap_addressbooks');
-
-            foreach ($args['result'] as $name => $config) {
-                if (in_array($name, $kolab_books) || in_array('*', $kolab_books)) {
-                    $args['result'][$name] = $this->patch_ldap_config($config);
-                }
-            }
-        }
-        else if ($args['name'] == 'kolab_users_directory' && !empty($args['result'])) {
-            $args['result'] = $this->patch_ldap_config($args['result']);
-        }
-
-        return $args;
-    }
-
-    /**
-     * Helper method to patch the given LDAP directory config with user-specific values
-     */
-    protected function patch_ldap_config($config)
-    {
-        if (is_array($config)) {
-            $config['base_dn']        = self::parse_ldap_vars($config['base_dn']);
-            $config['search_base_dn'] = self::parse_ldap_vars($config['search_base_dn']);
-            $config['bind_dn']        = str_replace('%dn', $_SESSION['kolab_dn'], $config['bind_dn']);
-
-            if (!empty($config['groups'])) {
-                $config['groups']['base_dn'] = self::parse_ldap_vars($config['groups']['base_dn']);
-            }
-        }
-
-        return $config;
-    }
-
-    /**
-     * Modifies list of plugins and settings according to
-     * specified LDAP roles
-     */
-    public function load_user_role_plugins_and_settings()
-    {
-        if (empty($_SESSION['user_roledns'])) {
-            return;
-        }
-
-        $rcmail = rcube::get_instance();
-
-        // Example 'kolab_auth_role_plugins' =
-        //
-        //  Array(
-        //      '<role_dn>' => Array('plugin1', 'plugin2'),
-        //  );
-        //
-        // NOTE that <role_dn> may in fact be something like: 'cn=role,%dc'
-
-        $role_plugins = $rcmail->config->get('kolab_auth_role_plugins');
-
-        // Example $rcmail_config['kolab_auth_role_settings'] =
-        //
-        //  Array(
-        //      '<role_dn>' => Array(
-        //          '$setting' => Array(
-        //              'mode' => '(override|merge)', (default: override)
-        //              'value' => <>,
-        //              'allow_override' => (true|false) (default: false)
-        //          ),
-        //      ),
-        //  );
-        //
-        // NOTE that <role_dn> may in fact be something like: 'cn=role,%dc'
-
-        $role_settings = $rcmail->config->get('kolab_auth_role_settings');
-
-        if (!empty($role_plugins)) {
-            foreach ($role_plugins as $role_dn => $plugins) {
-                $role_dn = self::parse_ldap_vars($role_dn);
-                if (!empty($role_plugins[$role_dn])) {
-                    $role_plugins[$role_dn] = array_unique(array_merge((array)$role_plugins[$role_dn], $plugins));
-                } else {
-                    $role_plugins[$role_dn] = $plugins;
-                }
-            }
-        }
-
-        if (!empty($role_settings)) {
-            foreach ($role_settings as $role_dn => $settings) {
-                $role_dn = self::parse_ldap_vars($role_dn);
-                if (!empty($role_settings[$role_dn])) {
-                    $role_settings[$role_dn] = array_merge((array)$role_settings[$role_dn], $settings);
-                } else {
-                    $role_settings[$role_dn] = $settings;
-                }
-            }
-        }
-
-        foreach ($_SESSION['user_roledns'] as $role_dn) {
-            if (!empty($role_settings[$role_dn]) && is_array($role_settings[$role_dn])) {
-                foreach ($role_settings[$role_dn] as $setting_name => $setting) {
-                    if (!isset($setting['mode'])) {
-                        $setting['mode'] = 'override';
-                    }
-
-                    if ($setting['mode'] == "override") {
-                        $rcmail->config->set($setting_name, $setting['value']);
-                    } elseif ($setting['mode'] == "merge") {
-                        $orig_setting = $rcmail->config->get($setting_name);
-
-                        if (!empty($orig_setting)) {
-                            if (is_array($orig_setting)) {
-                                $rcmail->config->set($setting_name, array_merge($orig_setting, $setting['value']));
-                            }
-                        } else {
-                            $rcmail->config->set($setting_name, $setting['value']);
-                        }
-                    }
-
-                    $dont_override = (array) $rcmail->config->get('dont_override');
-
-                    if (empty($setting['allow_override'])) {
-                        $rcmail->config->set('dont_override', array_merge($dont_override, array($setting_name)));
-                    }
-                    else {
-                        if (in_array($setting_name, $dont_override)) {
-                            $_dont_override = array();
-                            foreach ($dont_override as $_setting) {
-                                if ($_setting != $setting_name) {
-                                    $_dont_override[] = $_setting;
-                                }
-                            }
-                            $rcmail->config->set('dont_override', $_dont_override);
-                        }
-                    }
-
-                    if ($setting_name == 'skin') {
-                        if ($rcmail->output->type == 'html') {
-                            $rcmail->output->set_skin($setting['value']);
-                            $rcmail->output->set_env('skin', $setting['value']);
-                        }
-                    }
-                }
-            }
-
-            if (!empty($role_plugins[$role_dn])) {
-                foreach ((array)$role_plugins[$role_dn] as $plugin) {
-                    $this->api->load_plugin($plugin);
-                }
-            }
-        }
-    }
-
-    /**
-     * Logging method replacement to print debug/errors into
-     * a separate (sub)folder for each user
-     */
-    public function write_log($args)
-    {
-        $rcmail = rcube::get_instance();
-
-        if ($rcmail->config->get('log_driver') == 'syslog') {
-            return $args;
-        }
-
-        // log_driver == 'file' is assumed here
-        $log_dir  = $rcmail->config->get('log_dir', RCUBE_INSTALL_PATH . 'logs');
-
-        // Append original username + target username for audit-logging
-        if ($rcmail->config->get('kolab_auth_auditlog') && !empty($_SESSION['kolab_auth_admin'])) {
-            $args['dir'] = $log_dir . '/' . strtolower($_SESSION['kolab_auth_admin']) . '/' . strtolower($this->username);
-
-            // Attempt to create the directory
-            if (!is_dir($args['dir'])) {
-                @mkdir($args['dir'], 0750, true);
-            }
-        }
-        // Define the user log directory if a username is provided
-        else if ($rcmail->config->get('per_user_logging') && !empty($this->username)) {
-            $user_log_dir = $log_dir . '/' . strtolower($this->username);
-            if (is_writable($user_log_dir)) {
-                $args['dir'] = $user_log_dir;
-            }
-            else if ($args['name'] != 'errors') {
-                $args['abort'] = true;  // don't log if unauthenticed
-            }
-        }
-
-        return $args;
-    }
-
-    /**
-     * Sets defaults for new user.
-     */
-    public function user_create($args)
-    {
-        if (!empty($this->data['user_email'])) {
-            // addresses list is supported
-            if (array_key_exists('email_list', $args)) {
-                $email_list = array_unique($this->data['user_email']);
-
-                // add organization to the list
-                if (!empty($this->data['user_organization'])) {
-                    foreach ($email_list as $idx => $email) {
-                        $email_list[$idx] = array(
-                            'organization' => $this->data['user_organization'],
-                            'email'        => $email,
-                        );
-                    }
-                }
-
-                $args['email_list'] = $email_list;
-            }
-            else {
-                $args['user_email'] = $this->data['user_email'][0];
-            }
-        }
-
-        if (!empty($this->data['user_name'])) {
-            $args['user_name'] = $this->data['user_name'];
-        }
-
-        return $args;
-    }
-
-    /**
-     * Modifies login form adding additional "Login As" field
-     */
-    public function login_form($args)
-    {
-        $this->add_texts('localization/');
-
-        $rcmail      = rcube::get_instance();
-        $admin_login = $rcmail->config->get('kolab_auth_admin_login');
-        $group       = $rcmail->config->get('kolab_auth_group');
-        $role_attr   = $rcmail->config->get('kolab_auth_role');
-
-        // Show "Login As" input
-        if (empty($admin_login) || (empty($group) && empty($role_attr))) {
-            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', 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']);
-
-        return $args;
-    }
-
-    /**
-     * Find user credentials In LDAP.
-     */
-    public function authenticate($args)
-    {
-        // get username and host
-        $host    = $args['host'];
-        $user    = $args['user'];
-        $pass    = $args['pass'];
-        $loginas = trim(rcube_utils::get_input_value('_loginas', rcube_utils::INPUT_POST));
-
-        if (empty($user) || empty($pass)) {
-            $args['abort'] = true;
-            return $args;
-        }
-
-        // temporarily set the current username to the one submitted
-        $this->username = $user;
-
-        $ldap = self::ldap();
-        if (!$ldap || !$ldap->ready) {
-            $args['abort'] = true;
-            $args['kolab_ldap_error'] = true;
-            $message = sprintf(
-                    'Login failure for user %s from %s in session %s (error %s)',
-                    $user,
-                    rcube_utils::remote_ip(),
-                    session_id(),
-                    "LDAP not ready"
-                );
-
-            rcube::write_log('userlogins', $message);
-
-            return $args;
-        }
-
-        // Find user record in LDAP
-        $record = $ldap->get_user_record($user, $host);
-
-        if (empty($record)) {
-            $args['abort'] = true;
-            $message = sprintf(
-                    'Login failure for user %s from %s in session %s (error %s)',
-                    $user,
-                    rcube_utils::remote_ip(),
-                    session_id(),
-                    "No user record found"
-                );
-
-            rcube::write_log('userlogins', $message);
-
-            return $args;
-        }
-
-        $rcmail      = rcube::get_instance();
-        $admin_login = $rcmail->config->get('kolab_auth_admin_login');
-        $admin_pass  = $rcmail->config->get('kolab_auth_admin_password');
-        $login_attr  = $rcmail->config->get('kolab_auth_login');
-        $name_attr   = $rcmail->config->get('kolab_auth_name');
-        $email_attr  = $rcmail->config->get('kolab_auth_email');
-        $org_attr    = $rcmail->config->get('kolab_auth_organization');
-        $role_attr   = $rcmail->config->get('kolab_auth_role');
-        $imap_attr   = $rcmail->config->get('kolab_auth_mailhost');
-
-        if (!empty($role_attr) && !empty($record[$role_attr])) {
-            $_SESSION['user_roledns'] = (array)($record[$role_attr]);
-        }
-
-        if (!empty($imap_attr) && !empty($record[$imap_attr])) {
-            $default_host = $rcmail->config->get('default_host');
-            if (!empty($default_host)) {
-                rcube::write_log("errors", "Both default host and kolab_auth_mailhost set. Incompatible.");
-            } else {
-                $args['host'] = "tls://" . $record[$imap_attr];
-            }
-        }
-
-        // Login As...
-        if (!empty($loginas) && $admin_login) {
-            // Authenticate to LDAP
-            $result = $ldap->bind($record['dn'], $pass);
-
-            if (!$result) {
-                $args['abort'] = true;
-                $message = sprintf(
-                        'Login failure for user %s from %s in session %s (error %s)',
-                        $user,
-                        rcube_utils::remote_ip(),
-                        session_id(),
-                        "Unable to bind with '" . $record['dn'] . "'"
-                    );
-
-                rcube::write_log('userlogins', $message);
-
-                return $args;
-            }
-
-            $isadmin = false;
-            $admin_rights = $rcmail->config->get('kolab_auth_admin_rights', array());
-
-            // @deprecated: fall-back to the old check if the original user has/belongs to administrative role/group
-            if (empty($admin_rights)) {
-                $group   = $rcmail->config->get('kolab_auth_group');
-                $role_dn = $rcmail->config->get('kolab_auth_role_value');
-
-                // check role attribute
-                if (!empty($role_attr) && !empty($role_dn) && !empty($record[$role_attr])) {
-                    $role_dn = $ldap->parse_vars($role_dn, $user, $host);
-                    if (in_array($role_dn, (array)$record[$role_attr])) {
-                        $isadmin = true;
-                    }
-                }
-
-                // check group
-                if (!$isadmin && !empty($group)) {
-                    $groups = $ldap->get_user_groups($record['dn'], $user, $host);
-                    if (in_array($group, $groups)) {
-                        $isadmin = true;
-                    }
-                }
-
-                if ($isadmin) {
-                    // user has admin privileges privilage, get "login as" user credentials
-                    $target_entry = $ldap->get_user_record($loginas, $host);
-                    $allowed_tasks = $rcmail->config->get('kolab_auth_allowed_tasks');
-                }
-            }
-            else {
-                // get "login as" user credentials
-                $target_entry = $ldap->get_user_record($loginas, $host);
-
-                if (!empty($target_entry)) {
-                    // get effective rights to determine login-as permissions
-                    $effective_rights = (array)$ldap->effective_rights($target_entry['dn']);
-
-                    if (!empty($effective_rights)) {
-                        $effective_rights['attrib'] = $effective_rights['attributeLevelRights'];
-                        $effective_rights['entry']  = $effective_rights['entryLevelRights'];
-
-                        // compare the rights with the permissions mapping
-                        $allowed_tasks = array();
-                        foreach ($admin_rights as $task => $perms) {
-                            $perms_ = explode(':', $perms);
-                            $type   = array_shift($perms_);
-                            $req    = array_pop($perms_);
-                            $attrib = array_pop($perms_);
-
-                            if (array_key_exists($type, $effective_rights)) {
-                                if ($type == 'entry' && in_array($req, $effective_rights[$type])) {
-                                    $allowed_tasks[] = $task;
-                                }
-                                else if ($type == 'attrib' && array_key_exists($attrib, $effective_rights[$type]) &&
-                                        in_array($req, $effective_rights[$type][$attrib])) {
-                                    $allowed_tasks[] = $task;
-                                }
-                            }
-                        }
-
-                        $isadmin = !empty($allowed_tasks);
-                    }
-                }
-            }
-
-            // Save original user login for log (see below)
-            if ($login_attr) {
-                $origname = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
-            }
-            else {
-                $origname = $user;
-            }
-
-            if (!$isadmin || empty($target_entry)) {
-                $this->add_texts('localization/');
-
-                $args['abort'] = true;
-                $args['error'] = $this->gettext(array(
-                    'name' => 'loginasnotallowed',
-                    'vars' => array('user' => Q($loginas)),
-                ));
-
-                $message = sprintf(
-                        'Login failure for user %s (as user %s) from %s in session %s (error %s)',
-                        $user,
-                        $loginas,
-                        rcube_utils::remote_ip(),
-                        session_id(),
-                        "No privileges to login as '" . $loginas . "'"
-                    );
-
-                rcube::write_log('userlogins', $message);
-
-                return $args;
-            }
-
-            // replace $record with target entry
-            $record = $target_entry;
-
-            $args['user'] = $this->username = $loginas;
-
-            // Mark session to use SASL proxy for IMAP authentication
-            $_SESSION['kolab_auth_admin']    = strtolower($origname);
-            $_SESSION['kolab_auth_login']    = $rcmail->encrypt($admin_login);
-            $_SESSION['kolab_auth_password'] = $rcmail->encrypt($admin_pass);
-            $_SESSION['kolab_auth_allowed_tasks'] = $allowed_tasks;
-        }
-
-        // Store UID and DN of logged user in session for use by other plugins
-        $_SESSION['kolab_uid'] = is_array($record['uid']) ? $record['uid'][0] : $record['uid'];
-        $_SESSION['kolab_dn']  = $record['dn'];
-
-        // Store LDAP replacement variables used for current user
-        // This improves performance of load_user_role_plugins_and_settings()
-        // which is executed on every request (via startup hook) and where
-        // we don't like to use LDAP (connection + bind + search)
-        $_SESSION['kolab_auth_vars'] = $ldap->get_parse_vars();
-
-        // Set user login
-        if ($login_attr) {
-            $this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
-        }
-        if ($this->data['user_login']) {
-            $args['user'] = $this->username = $this->data['user_login'];
-        }
-
-        // User name for identity (first log in)
-        foreach ((array)$name_attr as $field) {
-            $name = is_array($record[$field]) ? $record[$field][0] : $record[$field];
-            if (!empty($name)) {
-                $this->data['user_name'] = $name;
-                break;
-            }
-        }
-        // User email(s) for identity (first log in)
-        foreach ((array)$email_attr as $field) {
-            $email = is_array($record[$field]) ? array_filter($record[$field]) : $record[$field];
-            if (!empty($email)) {
-                $this->data['user_email'] = array_merge((array)$this->data['user_email'], (array)$email);
-            }
-        }
-        // Organization name for identity (first log in)
-        foreach ((array)$org_attr as $field) {
-            $organization = is_array($record[$field]) ? $record[$field][0] : $record[$field];
-            if (!empty($organization)) {
-                $this->data['user_organization'] = $organization;
-                break;
-            }
-        }
-
-        // Log "Login As" usage
-        if (!empty($origname)) {
-            rcube::write_log('userlogins', sprintf('Admin login for %s by %s from %s',
-                $args['user'], $origname, rcube_utils::remote_ip()));
-        }
-
-        // load per-user settings/plugins
-        $this->load_user_role_plugins_and_settings();
-
-        return $args;
-    }
-
-    /**
-     * Set user DN for password change (password plugin with ldap_simple driver)
-     */
-    public function password_ldap_bind($args)
-    {
-        $args['user_dn'] = $_SESSION['kolab_dn'];
-
-        $rcmail = rcube::get_instance();
-
-        $rcmail->config->set('password_ldap_method', 'user');
-
-        return $args;
-    }
-
-    /**
-     * Sets SASL Proxy login/password for IMAP and Managesieve auth
-     */
-    public function imap_connect($args)
-    {
-        if (!empty($_SESSION['kolab_auth_admin'])) {
-            $rcmail      = rcube::get_instance();
-            $admin_login = $rcmail->decrypt($_SESSION['kolab_auth_login']);
-            $admin_pass  = $rcmail->decrypt($_SESSION['kolab_auth_password']);
-
-            $args['auth_cid'] = $admin_login;
-            $args['auth_pw']  = $admin_pass;
-        }
-
-        return $args;
-    }
-
-    /**
-     * Sets SASL Proxy login/password for SMTP auth
-     */
-    public function smtp_connect($args)
-    {
-        if (!empty($_SESSION['kolab_auth_admin'])) {
-            $rcmail      = rcube::get_instance();
-            $admin_login = $rcmail->decrypt($_SESSION['kolab_auth_login']);
-            $admin_pass  = $rcmail->decrypt($_SESSION['kolab_auth_password']);
-
-            $args['smtp_auth_cid'] = $admin_login;
-            $args['smtp_auth_pw']  = $admin_pass;
-        }
-
-        return $args;
-    }
-
-    /**
-     * Hook to replace the plain text input field for email address by a drop-down list
-     * with all email addresses (including aliases) from this user's LDAP record.
-     */
-    public function identity_form($args)
-    {
-        $rcmail      = rcube::get_instance();
-        $ident_level = intval($rcmail->config->get('identities_level', 0));
-
-        // do nothing if email address modification is disabled
-        if ($ident_level == 1 || $ident_level == 3) {
-            return $args;
-        }
-
-        $ldap = self::ldap();
-        if (!$ldap || !$ldap->ready || empty($_SESSION['kolab_dn'])) {
-            return $args;
-        }
-
-        $emails      = array();
-        $user_record = $ldap->get_record($_SESSION['kolab_dn']);
-
-        foreach ((array)$rcmail->config->get('kolab_auth_email', array()) as $col) {
-            $values = rcube_addressbook::get_col_values($col, $user_record, true);
-            if (!empty($values))
-                $emails = array_merge($emails, array_filter($values));
-        }
-
-        // kolab_delegation might want to modify this addresses list
-        $plugin = $rcmail->plugins->exec_hook('kolab_auth_emails', array('emails' => $emails));
-        $emails = $plugin['emails'];
-
-        if (!empty($emails)) {
-            $args['form']['addressing']['content']['email'] = array(
-                'type' => 'select',
-                'options' => array_combine($emails, $emails),
-            );
-        }
-
-        return $args;
-    }
-
-    /**
-     * Action executed before the page is rendered to add an onload script
-     * that will remove all taskbar buttons for disabled tasks
-     */
-    public function render_page($args)
-    {
-        $rcmail  = rcube::get_instance();
-        $tasks   = (array)$_SESSION['kolab_auth_allowed_tasks'];
-        $tasks[] = 'logout';
-
-        // disable buttons in taskbar
-        $script = "
-        \$('a').filter(function() {
-            var ev = \$(this).attr('onclick');
-            return ev && ev.match(/'switch-task','([a-z]+)'/)
-                && \$.inArray(RegExp.\$1, " . json_encode($tasks) . ") < 0;
-        }).remove();
-        ";
-
-        $rcmail->output->add_script($script, 'docready');
-    }
-
-    /**
-     * Initializes LDAP object and connects to LDAP server
-     */
-    public static function ldap()
-    {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
-        $rcmail      = rcube::get_instance();
-        $addressbook = $rcmail->config->get('kolab_auth_addressbook');
-
-        if (!is_array($addressbook)) {
-            $ldap_config = (array)$rcmail->config->get('ldap_public');
-            $addressbook = $ldap_config[$addressbook];
-        }
-
-        if (empty($addressbook)) {
-            return null;
-        }
-
-        require_once __DIR__ . '/kolab_auth_ldap.php';
-
-        self::$ldap = new kolab_auth_ldap($addressbook);
-
-        return self::$ldap;
-    }
-
-    /**
-     * Parses LDAP DN string with replacing supported variables.
-     * See kolab_auth_ldap::parse_vars()
-     *
-     * @param string $str LDAP DN string
-     *
-     * @return string Parsed DN string
-     */
-    public static function parse_ldap_vars($str)
-    {
-        if (!empty($_SESSION['kolab_auth_vars'])) {
-            $str = strtr($str, $_SESSION['kolab_auth_vars']);
-        }
-
-        return $str;
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/kolab_auth_ldap.php Deleted

@@ -1,548 +0,0 @@
-<?php
-
-/**
- * Kolab Authentication
- *
- * @version @package_version@
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2011-2013, 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/>.
- */
-
-/**
- * Wrapper class for rcube_ldap_generic
- */
-class kolab_auth_ldap extends rcube_ldap_generic
-{
-    private $icache = array();
-    private $conf = array();
-    private $fieldmap = array();
-
-
-    function __construct($p)
-    {
-        $rcmail = rcube::get_instance();
-
-        $this->conf = $p;
-        $this->conf['kolab_auth_user_displayname'] = $rcmail->config->get('kolab_auth_user_displayname', '{name}');
-
-        $this->fieldmap = $p['fieldmap'];
-        $this->fieldmap['uid'] = 'uid';
-
-        $p['attributes'] = array_values($this->fieldmap);
-        $p['debug']      = (bool) $rcmail->config->get('ldap_debug');
-
-        // Connect to the server (with bind)
-        parent::__construct($p);
-        $this->_connect();
-
-        $rcmail->add_shutdown_function(array($this, 'close'));
-    }
-
-    /**
-    * Establish a connection to the LDAP server
-    */
-    private function _connect()
-    {
-        // try to connect + bind for every host configured
-        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
-        // see http://www.php.net/manual/en/function.ldap-connect.php
-        foreach ((array)$this->config['hosts'] as $host) {
-            // skip host if connection failed
-            if (!$this->connect($host)) {
-                continue;
-            }
-
-            $bind_pass = $this->config['bind_pass'];
-            $bind_user = $this->config['bind_user'];
-            $bind_dn   = $this->config['bind_dn'];
-
-            if (empty($bind_pass)) {
-                $this->ready = true;
-            }
-            else {
-                if (!empty($bind_dn)) {
-                    $this->ready = $this->bind($bind_dn, $bind_pass);
-                }
-                else if (!empty($this->config['auth_cid'])) {
-                    $this->ready = $this->sasl_bind($this->config['auth_cid'], $bind_pass, $bind_user);
-                }
-                else {
-                    $this->ready = $this->sasl_bind($bind_user, $bind_pass);
-                }
-            }
-
-            // connection established, we're done here
-            if ($this->ready) {
-                break;
-            }
-
-        }  // end foreach hosts
-
-        if (!is_resource($this->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $host"), true);
-
-            $this->ready = false;
-        }
-
-        return $this->ready;
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_record($user, $host)
-    {
-        $rcmail  = rcube::get_instance();
-        $filter  = $rcmail->config->get('kolab_auth_filter');
-        $filter  = $this->parse_vars($filter, $user, $host);
-        $base_dn = $this->parse_vars($this->config['base_dn'], $user, $host);
-        $scope   = $this->config['scope'];
-
-        // @TODO: print error if filter is empty
-
-        // get record
-        if ($result = parent::search($base_dn, $filter, $scope, $this->attributes)) {
-            if ($result->count() == 1) {
-                $entries = $result->entries(true);
-                $dn      = key($entries);
-                $entry   = array_pop($entries);
-                $entry   = $this->field_mapping($dn, $entry);
-
-                return $entry;
-            }
-        }
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_groups($dn, $user, $host)
-    {
-        if (empty($dn) || empty($this->config['groups'])) {
-            return array();
-        }
-
-        $base_dn     = $this->parse_vars($this->config['groups']['base_dn'], $user, $host);
-        $name_attr   = $this->config['groups']['name_attr'] ? $this->config['groups']['name_attr'] : 'cn';
-        $member_attr = $this->get_group_member_attr();
-        $filter      = "(member=$dn)(uniqueMember=$dn)";
-
-        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
-            $filter .= "($member_attr=$dn)";
-        $filter = strtr("(|$filter)", array("\\" => "\\\\"));
-
-        $result = parent::search($base_dn, $filter, 'sub', array('dn', $name_attr));
-
-        if (!$result) {
-            return array();
-        }
-
-        $groups = array();
-        foreach ($result as $entry) {
-            $dn    = $entry['dn'];
-            $entry = rcube_ldap_generic::normalize_entry($entry);
-
-            $groups[$dn] = $entry[$name_attr];
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Get a specific LDAP record
-     *
-     * @param string DN
-     *
-     * @return array Record data
-     */
-    function get_record($dn)
-    {
-        if (!$this->ready) {
-            return;
-        }
-
-        if ($rec = $this->get_entry($dn)) {
-            $rec = rcube_ldap_generic::normalize_entry($rec);
-            $rec = $this->field_mapping($dn, $rec);
-        }
-
-        return $rec;
-    }
-
-    /**
-     * Replace LDAP record data items
-     *
-     * @param string $dn    DN
-     * @param array  $entry LDAP entry
-     *
-     * return bool True on success, False on failure
-     */
-    function replace($dn, $entry)
-    {
-        // fields mapping
-        foreach ($this->fieldmap as $field => $attr) {
-            if (array_key_exists($field, $entry)) {
-                $entry[$attr] = $entry[$field];
-                if ($attr != $field) {
-                    unset($entry[$field]);
-                }
-            }
-        }
-
-        return $this->mod_replace($dn, $entry);
-    }
-
-    /**
-     * Search records (simplified version of rcube_ldap::search)
-     *
-     * @param mixed   $fields   The field name or 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*)
-     * @param array   $required List of fields that cannot be empty
-     * @param int     $limit    Number of records
-     * @param int     $count    Returns the number of records found
-     *
-     * @return array List or false on error
-     */
-    function dosearch($fields, $value, $mode=1, $required = array(), $limit = 0, &$count = 0)
-    {
-        if (empty($fields)) {
-            return array();
-        }
-
-        $mode = intval($mode);
-
-        // use AND operator for advanced searches
-        $filter = is_array($value) ? '(&' : '(|';
-
-        // set wildcards
-        $wp = $ws = '';
-        if (!empty($this->config['fuzzy_search']) && $mode != 1) {
-            $ws = '*';
-            if (!$mode) {
-                $wp = '*';
-            }
-        }
-
-        foreach ((array)$fields as $idx => $field) {
-            $val   = is_array($value) ? $value[$idx] : $value;
-            $attrs = (array) $this->fieldmap[$field];
-
-            if (empty($attrs)) {
-                $filter .= "($field=$wp" . rcube_ldap_generic::quote_string($val) . "$ws)";
-            }
-            else {
-                if (count($attrs) > 1)
-                    $filter .= '(|';
-                foreach ($attrs as $f)
-                    $filter .= "($f=$wp" . rcube_ldap_generic::quote_string($val) . "$ws)";
-                if (count($attrs) > 1)
-                    $filter .= ')';
-            }
-        }
-        $filter .= ')';
-
-        // add required (non empty) fields filter
-        $req_filter = '';
-
-        foreach ((array)$required as $field) {
-            if (in_array($field, (array)$fields))  // required field is already in search filter
-                continue;
-
-            $attrs = (array) $this->fieldmap[$field];
-
-            if (empty($attrs)) {
-                $req_filter .= "($field=*)";
-            }
-            else {
-                if (count($attrs) > 1)
-                    $req_filter .= '(|';
-                foreach ($attrs as $f)
-                    $req_filter .= "($f=*)";
-                if (count($attrs) > 1)
-                    $req_filter .= ')';
-            }
-        }
-
-        if (!empty($req_filter)) {
-            $filter = '(&' . $req_filter . $filter . ')';
-        }
-
-        // avoid double-wildcard if $value is empty
-        $filter = preg_replace('/\*+/', '*', $filter);
-
-        // add general filter to query
-        if (!empty($this->config['filter'])) {
-            $filter = '(&(' . preg_replace('/^$|$$/', '', $this->config['filter']) . ')' . $filter . ')';
-        }
-
-        $base_dn = $this->parse_vars($this->config['base_dn']);
-        $scope   = $this->config['scope'];
-        $attrs   = array_values($this->fieldmap);
-        $list    = array();
-
-        if ($result = $this->search($base_dn, $filter, $scope, $attrs)) {
-            $count = $result->count();
-            $i = 0;
-            foreach ($result as $entry) {
-                if ($limit && $limit <= $i) {
-                    break;
-                }
-
-                $dn        = $entry['dn'];
-                $entry     = rcube_ldap_generic::normalize_entry($entry);
-                $list[$dn] = $this->field_mapping($dn, $entry);
-                $i++;
-            }
-        }
-
-        return $list;
-    }
-
-    /**
-     * Set filter used in search()
-     */
-    function set_filter($filter)
-    {
-        $this->config['filter'] = $filter;
-    }
-
-    /**
-     * Maps LDAP attributes to defined fields
-     */
-    protected function field_mapping($dn, $entry)
-    {
-        $entry['dn'] = $dn;
-
-        // fields mapping
-        foreach ($this->fieldmap as $field => $attr) {
-            // $entry might be indexed by lower-case attribute names
-            $attr_lc = strtolower($attr);
-            if (isset($entry[$attr_lc])) {
-                $entry[$field] = $entry[$attr_lc];
-            }
-            else if (isset($entry[$attr])) {
-                $entry[$field] = $entry[$attr];
-            }
-        }
-
-        // compose display name according to config
-        if (empty($this->fieldmap['displayname'])) {
-            $entry['displayname'] = rcube_addressbook::compose_search_name(
-                $entry,
-                $entry['email'],
-                $entry['name'],
-                $this->conf['kolab_auth_user_displayname']
-            );
-        }
-
-        return $entry;
-    }
-
-    /**
-     * Detects group member attribute name
-     */
-    private function get_group_member_attr($object_classes = array())
-    {
-        if (empty($object_classes)) {
-            $object_classes = $this->config['groups']['object_classes'];
-        }
-        if (!empty($object_classes)) {
-            foreach ((array)$object_classes as $oc) {
-                switch (strtolower($oc)) {
-                    case 'group':
-                    case 'groupofnames':
-                    case 'kolabgroupofnames':
-                        $member_attr = 'member';
-                        break;
-
-                    case 'groupofuniquenames':
-                    case 'kolabgroupofuniquenames':
-                        $member_attr = 'uniqueMember';
-                        break;
-                }
-            }
-        }
-
-        if (!empty($member_attr)) {
-            return $member_attr;
-        }
-
-        if (!empty($this->config['groups']['member_attr'])) {
-            return $this->config['groups']['member_attr'];
-        }
-
-        return 'member';
-    }
-
-    /**
-     * Prepares filter query for LDAP search
-     */
-    function parse_vars($str, $user = null, $host = null)
-    {
-        // When authenticating user $user is always set
-        // if not set it means we use this LDAP object for other
-        // purposes, e.g. kolab_delegation, then username with
-        // correct domain is in a session
-        if (!$user) {
-            $user = $_SESSION['username'];
-        }
-
-        if (isset($this->icache[$user])) {
-            list($user, $dc) = $this->icache[$user];
-        }
-        else {
-            $orig_user = $user;
-            $rcmail = rcube::get_instance();
-
-            // get default domain
-            if ($username_domain = $rcmail->config->get('username_domain')) {
-                if ($host && is_array($username_domain) && isset($username_domain[$host])) {
-                    $domain = rcube_utils::parse_host($username_domain[$host], $host);
-                }
-                else if (is_string($username_domain)) {
-                    $domain = rcube_utils::parse_host($username_domain, $host);
-                }
-            }
-
-            // realmed username (with domain)
-            if (strpos($user, '@')) {
-                list($usr, $dom) = explode('@', $user);
-
-                // unrealm domain, user login can contain a domain alias
-                if ($dom != $domain && ($dc = $this->find_domain($dom))) {
-                    // @FIXME: we should replace domain in $user, I suppose
-                }
-            }
-            else if ($domain) {
-                $user .= '@' . $domain;
-            }
-
-            $this->icache[$orig_user] = array($user, $dc);
-        }
-
-        // replace variables in filter
-        list($u, $d) = explode('@', $user);
-
-        // hierarchal domain string
-        if (empty($dc)) {
-            $dc = 'dc=' . strtr($d, array('.' => ',dc='));
-        }
-
-        $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u);
-
-        $this->parse_replaces = $replaces;
-
-        return strtr($str, $replaces);
-    }
-
-    /**
-     * Find root domain for specified domain
-     *
-     * @param string $domain Domain name
-     *
-     * @return string Domain DN string
-     */
-    function find_domain($domain)
-    {
-        if (empty($domain) || empty($this->config['domain_base_dn']) || empty($this->config['domain_filter'])) {
-            return null;
-        }
-
-        $base_dn   = $this->config['domain_base_dn'];
-        $filter    = $this->config['domain_filter'];
-        $name_attr = $this->config['domain_name_attribute'];
-
-        if (empty($name_attr)) {
-            $name_attr = 'associateddomain';
-        }
-
-        $filter = str_replace('%s', rcube_ldap_generic::quote_string($domain), $filter);
-        $result = parent::search($base_dn, $filter, 'sub', array($name_attr, 'inetdomainbasedn'));
-
-        if (!$result) {
-            return null;
-        }
-
-        $entries  = $result->entries(true);
-        $entry_dn = key($entries);
-        $entry    = $entries[$entry_dn];
-
-        if (is_array($entry)) {
-            if (!empty($entry['inetdomainbasedn'])) {
-                return $entry['inetdomainbasedn'];
-            }
-
-            $domain = is_array($entry[$name_attr]) ? $entry[$name_attr][0] : $entry[$name_attr];
-
-            return $domain ? 'dc=' . implode(',dc=', explode('.', $domain)) : null;
-        }
-    }
-
-    /**
-     * Returns variables used for replacement in (last) parse_vars() call
-     *
-     * @return array Variable-value hash array
-     */
-    public function get_parse_vars()
-    {
-        return $this->parse_replaces;
-    }
-
-    /**
-     * Register additional fields
-     */
-    public function extend_fieldmap($map)
-    {
-        foreach ((array)$map as $name => $attr) {
-            if (!in_array($attr, $this->attributes)) {
-                $this->attributes[]    = $attr;
-                $this->fieldmap[$name] = $attr;
-            }
-        }
-    }
-
-    /**
-     * HTML-safe DN string encoding
-     *
-     * @param string $str DN string
-     *
-     * @return string Encoded HTML identifier string
-     */
-    static function dn_encode($str)
-    {
-        return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
-    }
-
-    /**
-     * Decodes DN string encoded with _dn_encode()
-     *
-     * @param string $str Encoded HTML identifier string
-     *
-     * @return string DN string
-     */
-    static function dn_decode($str)
-    {
-        $str = str_pad(strtr($str, '-_', '+/'), strlen($str) % 4, '=', STR_PAD_RIGHT);
-        return base64_decode($str);
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/bg_BG.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/de_CH.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/en_US.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/es_ES.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/et_EE.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/fr_FR.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/ja_JP.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/nl_NL.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/pl_PL.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/pt_BR.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/ru_RU.inc Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/README Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql.initial.sql Deleted

@@ -1,187 +0,0 @@
-/**
- * libkolab database schema
- *
- * @version 1.1
- * @author Thomas Bruederli
- * @licence GNU AGPL
- **/
-
-
-DROP TABLE IF EXISTS `kolab_folders`;
-
-CREATE TABLE `kolab_folders` (
-  `folder_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `resource` VARCHAR(255) NOT NULL,
-  `type` VARCHAR(32) NOT NULL,
-  `synclock` INT(10) NOT NULL DEFAULT '0',
-  `ctag` VARCHAR(40) DEFAULT NULL,
-  PRIMARY KEY(`folder_id`),
-  INDEX `resource_type` (`resource`, `type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-DROP TABLE IF EXISTS `kolab_cache`;
-
-DROP TABLE IF EXISTS `kolab_cache_contact`;
-
-CREATE TABLE `kolab_cache_contact` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  `name` VARCHAR(255) NOT NULL,
-  `firstname` VARCHAR(255) NOT NULL,
-  `surname` VARCHAR(255) NOT NULL,
-  `email` VARCHAR(255) NOT NULL,
-  CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  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 */;
-
-DROP TABLE IF EXISTS `kolab_cache_event`;
-
-CREATE TABLE `kolab_cache_event` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
-    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 */;
-
-DROP TABLE IF EXISTS `kolab_cache_task`;
-
-CREATE TABLE `kolab_cache_task` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
-    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 */;
-
-DROP TABLE IF EXISTS `kolab_cache_journal`;
-
-CREATE TABLE `kolab_cache_journal` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
-    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 */;
-
-DROP TABLE IF EXISTS `kolab_cache_note`;
-
-CREATE TABLE `kolab_cache_note` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
-    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 */;
-
-DROP TABLE IF EXISTS `kolab_cache_file`;
-
-CREATE TABLE `kolab_cache_file` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `filename` varchar(255) DEFAULT NULL,
-  CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  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 */;
-
-DROP TABLE IF EXISTS `kolab_cache_configuration`;
-
-CREATE TABLE `kolab_cache_configuration` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  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 */;
-
-DROP TABLE IF EXISTS `kolab_cache_freebusy`;
-
-CREATE TABLE `kolab_cache_freebusy` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
-  `tags` TEXT NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
-    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 */;
-
-
-INSERT INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2015011600');

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013100400.sql Deleted

@@ -1,174 +0,0 @@
-CREATE TABLE `kolab_folders` (
-  `folder_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `resource` VARCHAR(255)  NOT NULL,
-  `type` VARCHAR(32) NOT NULL,
-  `synclock` INT(10) NOT NULL DEFAULT '0',
-  `ctag` VARCHAR(40) DEFAULT NULL,
-  PRIMARY KEY(`folder_id`),
-  INDEX `resource_type` (`resource`, `type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_contact` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  CONSTRAINT `fk_kolab_cache_contact_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `contact_type` (`folder_id`,`type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_event` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_event_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_task` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_task_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_journal` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_journal_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_note` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_file` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `filename` varchar(255) DEFAULT NULL,
-  CONSTRAINT `fk_kolab_cache_file_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `folder_filename` (`folder_id`, `filename`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_configuration` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
-  CONSTRAINT `fk_kolab_cache_configuration_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`),
-  INDEX `configuration_type` (`folder_id`,`type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-CREATE TABLE `kolab_cache_freebusy` (
-  `folder_id` BIGINT UNSIGNED NOT NULL,
-  `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
-  `created` DATETIME DEFAULT NULL,
-  `changed` DATETIME DEFAULT NULL,
-  `data` TEXT NOT NULL,
-  `xml` TEXT NOT NULL,
-  `tags` VARCHAR(255) NOT NULL,
-  `words` TEXT NOT NULL,
-  `dtstart` DATETIME,
-  `dtend` DATETIME,
-  CONSTRAINT `fk_kolab_cache_freebusy_folder` FOREIGN KEY (`folder_id`)
-    REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
-  PRIMARY KEY(`folder_id`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
-
--- Migrate data from old kolab_cache table
-
-INSERT INTO kolab_folders (resource, type)
-  SELECT DISTINCT resource, type
-  FROM  kolab_cache WHERE type IN ('event','contact','task','file');
-
-INSERT INTO kolab_cache_event (folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type = 'event' AND kolab_folders.folder_id IS NOT NULL;
-
-INSERT INTO kolab_cache_task (folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, dtstart, dtend
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type = 'task' AND kolab_folders.folder_id IS NOT NULL;
-
-INSERT INTO kolab_cache_contact (folder_id, msguid, uid, created, changed, data, xml, tags, words, type)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, kolab_cache.type
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type IN ('contact','distribution-list') AND kolab_folders.folder_id IS NOT NULL;
-
-INSERT INTO kolab_cache_file (folder_id, msguid, uid, created, changed, data, xml, tags, words, filename)
-  SELECT kolab_folders.folder_id, msguid, uid, created, changed, data, xml, tags, words, filename
-  FROM kolab_cache LEFT JOIN kolab_folders ON (kolab_folders.resource = kolab_cache.resource)
-  WHERE kolab_cache.type = 'file' AND kolab_folders.folder_id IS NOT NULL;
-
-
-DROP TABLE IF EXISTS `kolab_cache`;
-

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013121100.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014021000.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014032700.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014040900.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2014112700.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2015011600.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/oracle Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/oracle.initial.sql Deleted

@@ -1,184 +0,0 @@
-/**
- * libkolab database schema
- *
- * @version 1.1
- * @author Aleksander Machniak
- * @licence GNU AGPL
- **/
-
-
-CREATE TABLE "kolab_folders" (
-    "folder_id" number NOT NULL PRIMARY KEY,
-    "resource" VARCHAR(255) NOT NULL,
-    "type" VARCHAR(32) NOT NULL,
-    "synclock" integer DEFAULT 0 NOT NULL,
-    "ctag" VARCHAR(40) DEFAULT NULL
-);
-
-CREATE INDEX "kolab_folders_resource_idx" ON "kolab_folders" ("resource", "type");
-
-CREATE SEQUENCE "kolab_folders_seq"
-    START WITH 1 INCREMENT BY 1 NOMAXVALUE;
-
-CREATE TRIGGER "kolab_folders_seq_trig"
-BEFORE INSERT ON "kolab_folders" FOR EACH ROW
-BEGIN
-    :NEW."folder_id" := "kolab_folders_seq".nextval;
-END;
-/
-
-CREATE TABLE "kolab_cache_contact" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "type" varchar(32) NOT NULL,
-    "name" varchar(255) DEFAULT NULL,
-    "firstname" varchar(255) DEFAULT NULL,
-    "surname" varchar(255) DEFAULT NULL,
-    "email" varchar(255) DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_contact_type_idx" ON "kolab_cache_contact" ("folder_id", "type");
-CREATE INDEX "kolab_cache_contact_uid2msguid" ON "kolab_cache_contact" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_event" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_event_uid2msguid" ON "kolab_cache_event" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_task" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_task_uid2msguid" ON "kolab_cache_task" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_journal" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_journal_uid2msguid" ON "kolab_cache_journal" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_note" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_note_uid2msguid" ON "kolab_cache_note" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_file" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "filename" varchar(255) DEFAULT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_file_filename" ON "kolab_cache_file" ("folder_id", "filename");
-CREATE INDEX "kolab_cache_file_uid2msguid" ON "kolab_cache_file" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_configuration" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "type" varchar(32) NOT NULL,
-    PRIMARY KEY ("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_config_type" ON "kolab_cache_configuration" ("folder_id", "type");
-CREATE INDEX "kolab_cache_config_uid2msguid" ON "kolab_cache_configuration" ("folder_id", "uid", "msguid");
-
-
-CREATE TABLE "kolab_cache_freebusy" (
-    "folder_id" number NOT NULL
-        REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
-    "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
-    "created" timestamp DEFAULT NULL,
-    "changed" timestamp DEFAULT NULL,
-    "data" clob NOT NULL,
-    "xml" clob NOT NULL,
-    "tags" clob DEFAULT NULL,
-    "words" clob DEFAULT NULL,
-    "dtstart" timestamp DEFAULT NULL,
-    "dtend" timestamp DEFAULT NULL,
-    PRIMARY KEY("folder_id", "msguid")
-);
-
-CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
-
-
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2015011600');

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/oracle/2015011600.sql Deleted

@@ -1,40 +0,0 @@
--- direct change from varchar to clob does not work, need temp column (#4257)
-ALTER TABLE "kolab_cache_contact" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_contact" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_contact" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_contact" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_event" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_event" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_event" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_event" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_task" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_task" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_task" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_task" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_journal" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_journal" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_journal" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_journal" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_note" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_note" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_note" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_note" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_file" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_file" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_file" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_file" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_configuration" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_configuration" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_configuration" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_configuration" RENAME COLUMN "tags1" TO "tags";
-
-ALTER TABLE "kolab_cache_freebusy" ADD "tags1" clob DEFAULT NULL;
-UPDATE "kolab_cache_freebusy" SET "tags1" = "tags";
-ALTER TABLE "kolab_cache_freebusy" DROP COLUMN "tags";
-ALTER TABLE "kolab_cache_freebusy" RENAME COLUMN "tags1" TO "tags";

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/UPGRADING Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin/modcache.sh Deleted

@@ -1,235 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * Kolab storage cache modification script
- *
- * @version 3.1
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012-2014, 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/>.
- */
-
-define('INSTALL_PATH', realpath('.') . '/' );
-ini_set('display_errors', 1);
-
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
-require_once INSTALL_PATH . 'program/include/clisetup.php';
-
-function print_usage()
-{
-	print "Usage:  modcache.sh [OPTIONS] ACTION [USERNAME ARGS ...]\n";
-	print "Possible actions are: expunge, clear, prewarm\n";
-	print "-a, --all      Clear/expunge all caches\n";
-	print "-h, --host     IMAP host name\n";
-	print "-u, --user     IMAP user name to authenticate\n";
-	print "-t, --type     Object types to clear/expunge cache\n";
-	print "-l, --limit    Limit the number of records to be expunged\n";
-}
-
-// read arguments
-$opts = get_opt(array(
-    'a' => 'all',
-    'h' => 'host',
-    'u' => 'user',
-    'p' => 'password',
-    't' => 'type',
-    'l' => 'limit',
-    'v' => 'verbose',
-));
-
-$opts['username'] = !empty($opts[1]) ? $opts[1] : $opts['user'];
-$action = $opts[0];
-
-$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
-
-
-// connect to database
-$db = $rcmail->get_dbh();
-$db->db_connect('w');
-if (!$db->is_connected() || $db->is_error())
-    die("No DB connection\n");
-
-ini_set('display_errors', 1);
-
-/*
- * Script controller
- */
-switch (strtolower($action)) {
-
-/*
- * Clear/expunge all cache records
- */
-case 'expunge':
-    $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','journal','note','task');
-    $folder_types_db = array_map(array($db, 'quote'), $folder_types);
-    $expire = strtotime(!empty($opts[2]) ? $opts[2] : 'now - 10 days');
-    $sql_where = "type IN (" . join(',', $folder_types_db) . ")";
-
-    if ($opts['username']) {
-        $sql_where .= ' AND resource LIKE ?';
-    }
-
-    $sql_query = "DELETE FROM %s WHERE folder_id IN (SELECT folder_id FROM kolab_folders WHERE $sql_where) AND created <= " . $db->quote(date('Y-m-d 00:00:00', $expire));
-    if ($opts['limit']) {
-        $sql_query = ' LIMIT ' . intval($opts['limit']);
-    }
-    foreach ($folder_types as $type) {
-        $table_name = 'kolab_cache_' . $type;
-        $db->query(sprintf($sql_query, $table_name), resource_prefix($opts).'%');
-        echo $db->affected_rows() . " records deleted from '$table_name'\n";
-    }
-
-    $db->query("UPDATE kolab_folders SET ctag='' WHERE $sql_where", resource_prefix($opts).'%');
-    break;
-
-case 'clear':
-    $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','journal','note','task');
-    $folder_types_db = array_map(array($db, 'quote'), $folder_types);
-
-    if ($opts['all']) {
-        $sql_query = "DELETE FROM kolab_folders WHERE 1";
-    }
-    else if ($opts['username']) {
-        $sql_query = "DELETE FROM kolab_folders WHERE type IN (" . join(',', $folder_types_db) . ") AND resource LIKE ?";
-    }
-
-    if ($sql_query) {
-        $db->query($sql_query, resource_prefix($opts).'%');
-        echo $db->affected_rows() . " records deleted from 'kolab_folders'\n";
-    }
-    break;
-
-
-/*
- * Prewarm cache by synchronizing objects for the given user
- */
-case 'prewarm':
-    // make sure libkolab classes are loaded
-    $rcmail->plugins->load_plugin('libkolab');
-
-    if (authenticate($opts)) {
-        $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','task');
-        foreach ($folder_types as $type) {
-            // sync every folder of the given type
-            foreach (kolab_storage::get_folders($type) as $folder) {
-                echo "Synching " . $folder->name . " ($type) ... ";
-                echo $folder->count($type) . "\n";
-
-                // also sync distribution lists in contact folders
-                if ($type == 'contact') {
-                    echo "Synching " . $folder->name . " (distribution-list) ... ";
-                    echo $folder->count('distribution-list') . "\n";
-                }
-            }
-        }
-    }
-    else
-        die("Authentication failed for " . $opts['user']);
-    break;
-
-/**
- * Update the cache meta columns from the serialized/xml data
- * (might be run after a schema update)
- */
-case 'update':
-    // make sure libkolab classes are loaded
-    $rcmail->plugins->load_plugin('libkolab');
-
-    $folder_types = $opts['type'] ? explode(',', $opts['type']) : array('contact','configuration','event','file','task');
-    foreach ($folder_types as $type) {
-        $class = 'kolab_storage_cache_' . $type;
-        $sql_result = $db->query("SELECT folder_id FROM kolab_folders WHERE type=? AND synclock = 0", $type);
-        while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
-            $folder = new $class;
-            $folder->select_by_id($sql_arr['folder_id']);
-            echo "Updating " . $sql_arr['folder_id'] . " ($type) ";
-            foreach ($folder->select() as $object) {
-                $object['_formatobj']->to_array();  // load data
-                $folder->save($object['_msguid'], $object, $object['_msguid']);
-                echo ".";
-            }
-            echo "done.\n";
-        }
-    }
-    break;
-
-
-/*
- * Unknown action => show usage
- */
-default:
-    print_usage();
-    exit;
-}
-
-
-/**
- * Compose cache resource URI prefix for the given user credentials
- */
-function resource_prefix($opts)
-{
-    return 'imap://' . str_replace('%', '\\%', urlencode($opts['username'])) . '@' . $opts['host'] . '/';
-}
-
-
-/**
- * Authenticate to the IMAP server with the given user credentials
- */
-function authenticate(&$opts)
-{
-    global $rcmail;
-
-    // prompt for password
-    if (empty($opts['password']) && ($opts['username'] || $opts['user'])) {
-        $opts['password'] = prompt_silent("Password: ");
-    }
-
-    // simulate "login as" feature
-    if ($opts['user'] && $opts['user'] != $opts['username'])
-        $_POST['_loginas'] = $opts['username'];
-    else if (empty($opts['user']))
-        $opts['user'] = $opts['username'];
-
-    // let the kolab_auth plugin do its magic
-    $auth = $rcmail->plugins->exec_hook('authenticate', array(
-        'host' => trim($opts['host']),
-        'user' => trim($opts['user']),
-        'pass' => $opts['password'],
-        'cookiecheck' => false,
-        'valid' => !empty($opts['user']) && !empty($opts['host']),
-    ));
-
-    if ($auth['valid']) {
-        $storage = $rcmail->get_storage();
-        if ($storage->connect($auth['host'], $auth['user'], $auth['pass'], 143, false)) {
-            if ($opts['verbose'])
-                echo "IMAP login succeeded.\n";
-            if (($user = rcube_user::query($opts['username'], $auth['host'])) && $user->ID)
-                $rcmail->user = $user;
-        }
-        else
-            die("Login to IMAP server failed!\n");
-    }
-    else {
-        die("Invalid login credentials!\n");
-    }
-
-    return $auth['valid'];
-}
-

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin/randomcontacts.sh Deleted

@@ -1,181 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * Generate a number contacts with random data
- *
- * @version 3.1
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-
-define('INSTALL_PATH', realpath('.') . '/' );
-ini_set('display_errors', 1);
-
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
-require_once INSTALL_PATH . 'program/include/clisetup.php';
-
-function print_usage()
-{
-    print "Usage:  randomcontacts.sh [OPTIONS] USERNAME FOLDER\n";
-    print "Create random contact that for then given user in the specified folder.\n";
-    print "-n, --num      Number of contacts to be created, defaults to 50\n";
-    print "-h, --host     IMAP host name\n";
-    print "-p, --password IMAP user password\n";
-}
-
-// read arguments
-$opts = get_opt(array(
-    'n' => 'num',
-    'h' => 'host',
-    'u' => 'user',
-    'p' => 'pass',
-    'v' => 'verbose',
-));
-
-$opts['username'] = !empty($opts[0]) ? $opts[0] : $opts['user'];
-$opts['folder'] = $opts[1];
-
-$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
-$rcmail->plugins->load_plugins(array('libkolab'));
-ini_set('display_errors', 1);
-
-
-if (empty($opts['host'])) {
-    $opts['host'] = $rcmail->config->get('default_host');
-    if (is_array($opts['host']))  // not unique
-        $opts['host'] = null;
-}
-
-if (empty($opts['username']) || empty($opts['folder']) || empty($opts['host'])) {
-    print_usage();
-    exit;
-}
-
-// prompt for password
-if (empty($opts['pass'])) {
-    $opts['pass'] = rcube_utils::prompt_silent("Password: ");
-}
-
-// parse $host URL
-$a_host = parse_url($opts['host']);
-if ($a_host['host']) {
-    $host = $a_host['host'];
-    $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
-    $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : 143);
-}
-else {
-    $host = $opts['host'];
-    $imap_port = 143;
-}
-
-// instantiate IMAP class
-$IMAP = $rcmail->get_storage();
-
-// try to connect to IMAP server
-if ($IMAP->connect($host, $opts['username'], $opts['pass'], $imap_port, $imap_ssl)) {
-    print "IMAP login successful.\n";
-    $user = rcube_user::query($opts['username'], $host);
-    $rcmail->user = $user ?: new rcube_user(null, array('username' => $opts['username'], 'host' => $host));
-}
-else {
-    die("IMAP login failed for user " . $opts['username'] . " @ $host\n");
-}
-
-// get contacts folder
-$folder = kolab_storage::get_folder($opts['folder']);
-if (!$folder || empty($folder->type)) {
-    die("Invalid Address Book " . $opts['folder'] . "\n");
-}
-
-$format = new kolab_format_contact;
-
-$num = $opts['num'] ? intval($opts['num']) : 50;
-echo "Creating $num contacts in " . $folder->get_resource_uri() . "\n";
-
-for ($i=0; $i < $num; $i++) {
-    // generate random names
-    $contact = array(
-        'surname' => random_string(rand(1,2)),
-        'firstname' => random_string(rand(1,2)),
-        'organization' => random_string(rand(0,2)),
-        'profession' => random_string(rand(1,2)),
-        'email' => array(),
-        'phone' => array(),
-        'address' => array(),
-        'notes' => random_string(rand(10,200)),
-    );
-
-    // randomly add email addresses
-    $em = rand(1,3);
-    for ($e=0; $e < $em; $e++) {
-        $type = array_rand($format->emailtypes);
-        $contact['email'][] = array(
-            'address' => strtolower(random_string(1) . '@' . random_string(1) . '.tld'),
-            'type' => $type,
-        );
-    }
-
-    // randomly add phone numbers
-    $ph = rand(1,4);
-    for ($p=0; $p < $ph; $p++) {
-        $type = array_rand($format->phonetypes);
-        $contact['phone'][] = array(
-            'number' => '+'.rand(2,8).rand(1,9).rand(1,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9).rand(0,9),
-            'type' => $type,
-        );
-    }
-
-    // randomly add addresses
-    $ad = rand(0,2);
-    for ($a=0; $a < $ad; $a++) {
-        $type = array_rand($format->addresstypes);
-        $contact['address'][] = array(
-            'street' => random_string(rand(1,3)),
-            'locality' => random_string(rand(1,2)),
-            'code' => rand(1000, 89999),
-            'country' => random_string(1),
-            'type' => $type,
-        );
-    }
-
-    $contact['name'] = $contact['firstname'] . ' ' . $contact['surname'];
-
-    if ($folder->save($contact, 'contact')) {
-        echo ".";
-    }
-    else {
-        echo "x";
-        break;  // abort on error
-    }
-}
-
-echo " done.\n";
-
-
-
-function random_string($len)
-{
-    $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 features 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.");
-    for ($i = 0; $i < $len; $i++) {
-        $str .= $words[rand(0,count($words)-1)] . " ";
-    }
-
-    return rtrim($str);
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/bin/readcache.sh Deleted

@@ -1,150 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/**
- * Kolab storage cache testing script
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-
-define('INSTALL_PATH', realpath('.') . '/' );
-ini_set('display_errors', 1);
-libxml_use_internal_errors(true);
-
-if (!file_exists(INSTALL_PATH . 'program/include/clisetup.php'))
-    die("Execute this from the Roundcube installation dir!\n\n");
-
-require_once INSTALL_PATH . 'program/include/clisetup.php';
-
-function print_usage()
-{
-	print "Usage:  readcache.sh [OPTIONS] FOLDER\n";
-	print "-h, --host     IMAP host name\n";
-	print "-l, --limit    Limit the number of records to be listed\n";
-}
-
-// read arguments
-$opts = get_opt(array(
-    'h' => 'host',
-    'l' => 'limit',
-    'v' => 'verbose',
-));
-
-$folder = $opts[0];
-$imap_host = $opts['host'];
-
-$rcmail = rcube::get_instance(rcube::INIT_WITH_DB | rcube::INIT_WITH_PLUGINS);
-
-if (empty($imap_host)) {
-    $default_host = $rcmail->config->get('default_host');
-    if (is_array($default_host)) {
-        list($k,$v) = each($default_host);
-        $imap_host = is_numeric($k) ? $v : $k;
-    }
-    else {
-        $imap_host = $default_host;
-    }
-
-    // strip protocol prefix
-    $imap_host = preg_replace('!^[a-z]+://!', '', $imap_host);
-}
-
-if (empty($folder) || empty($imap_host)) {
-    print_usage();
-    exit;
-}
-
-// connect to database
-$db = $rcmail->get_dbh();
-$db->db_connect('r');
-if (!$db->is_connected() || $db->is_error())
-    die("No DB connection\n");
-
-
-// resolve folder_id
-if (!is_numeric($folder)) {
-    if (strpos($folder, '@')) {
-        list($mailbox, $domain) = explode('@', $folder);
-        list($username, $subpath) = explode('/', preg_replace('!^user/!', '', $mailbox), 2);
-        $folder_uri = 'imap://' . urlencode($username.'@'.$domain) . '@' . $imap_host . '/' . $subpath;
-    }
-    else {
-        die("Invalid mailbox identifier! Example: user/john.doe/Calendar@example.org\n");
-    }
-
-    print "Resolving folder $folder_uri...";
-    $sql_result = $db->query('SELECT * FROM `kolab_folders` WHERE `resource`=?', $folder_uri);
-    if ($sql_result && ($folder_data = $db->fetch_assoc($sql_result))) {
-        $folder_id = $folder_data['folder_id'];
-        print $folder_id;
-    }
-    print "\n";
-}
-else {
-    $folder_id = intval($folder);
-    $sql_result = $db->query('SELECT * FROM `kolab_folders` WHERE `folder_id`=?', $folder_id);
-    if ($sql_result) {
-        $folder_data = $db->fetch_assoc($sql_result);
-    }
-}
-
-if (empty($folder_data)) {
-    die("Can't find cache mailbox for '$folder'\n");
-}
-
-print "Querying cache for folder $folder_id ($folder_data[type])...\n";
-
-$extra_cols = array(
-    'event'   => array('dtstart','dtend'),
-    'contact' => array('type'),
-);
-
-$cache_table = $db->table_name('kolab_cache_' . $folder_data['type']);
-$extra_cols_ = $extra_cols[$folder_data['type']] ?: array();
-$sql_arr = $db->fetch_assoc($db->query("SELECT COUNT(*) as cnt FROM `$cache_table` WHERE `folder_id`=?", intval($folder_id)));
-
-print "CTag  = " . $folder_data['ctag'] . "\n";
-print "Lock  = " . $folder_data['synclock'] . "\n";
-print "Count = " . $sql_arr['cnt'] . "\n";
-print "----------------------------------------------------------------------------------\n";
-print "<MSG>\t<UUID>\t<CHANGED>\t<DATA>\t<XML>\t";
-print join("\t", array_map(function($c) { return '<' . strtoupper($c) . '>'; }, $extra_cols_));
-print "\n----------------------------------------------------------------------------------\n";
-
-$result = $db->limitquery("SELECT * FROM `$cache_table` WHERE `folder_id`=?", 0, $opts['limit'], intval($folder_id));
-while ($result && ($sql_arr = $db->fetch_assoc($result))) {
-    print $sql_arr['msguid'] . "\t" . $sql_arr['uid'] . "\t" . $sql_arr['changed'];
-
-    // try to unserialize data block
-    $object = @unserialize(@base64_decode($sql_arr['data']));
-    print "\t" . ($object === false ? 'FAIL!' : ($object['uid'] == $sql_arr['uid'] ? 'OK' : '!!!'));
-
-    // check XML validity
-    $xml = simplexml_load_string($sql_arr['xml']);
-    print "\t" . ($xml === false ? 'FAIL!' : 'OK');
-
-    // print extra cols
-    array_walk($extra_cols_, function($c) use ($sql_arr) {
-        print "\t" . $sql_arr[$c];
-    });
-
-    print "\n";
-}
-
-print "----------------------------------------------------------------------------------\n";
-echo "Done.\n";

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/composer.json Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/config.inc.php.dist Deleted

@@ -1,62 +0,0 @@
-<?php
-
-/* Configuration for libkolab */
-
-// Enable caching of Kolab objects in local database
-$config['kolab_cache'] = true;
-
-// Specify format version to write Kolab objects (must be a string value!)
-$config['kolab_format_version']  = '3.0';
-
-// Optional override of the URL to read and trigger Free/Busy information of Kolab users
-// Defaults to https://<imap-server->/freebusy
-$config['kolab_freebusy_server'] = null;
-
-// Enables listing of only subscribed folders. This e.g. will limit
-// folders in calendar view or available addressbooks
-$config['kolab_use_subscriptions'] = false;
-
-// List any of 'personal','shared','other' namespaces to be excluded from groupware folder listing
-// example: array('other');
-$config['kolab_skip_namespace'] = null;
-
-// Enables the use of displayname folder annotations as introduced in KEP:?
-// for displaying resource folder names (experimental!)
-$config['kolab_custom_display_names'] = false;
-
-// Configuration of HTTP requests.
-// See http://pear.php.net/manual/en/package.http.http-request2.config.php
-// for list of supported configuration options (array keys)
-$config['kolab_http_request'] = array();
-
-// When kolab_cache is enabled Roundcube's messages cache will be redundant
-// when working on kolab folders. Here we can:
-// 2 - bypass messages/indexes cache completely
-// 1 - bypass only messages, but use index cache
-$config['kolab_messages_cache_bypass'] = 0;
-
-// LDAP directory to find avilable users for folder sharing.
-// Either contains an array with LDAP addressbook configuration or refers to entry in $config['ldap_public'].
-// If not specified, the configuraton from 'kolab_auth_addressbook' will be used.
-// Should be provided for multi-domain setups with placeholders like %dc, %d, %u, %fu or %dn.
-$config['kolab_users_directory'] = null;
-
-// Filter to be used for resolving user folders in LDAP.
-// Defaults to the 'kolab_auth_filter' configuration option.
-$config['kolab_users_filter'] = '(&(objectclass=kolabInetOrgPerson)(|(uid=%u)(mail=%fu)))';
-
-// Which property of the LDAP user record to use for user folder mapping in IMAP.
-// Defaults to the 'kolab_auth_login' configuration option.
-$config['kolab_users_id_attrib'] = null;
-
-// Use these attributes when searching users in LDAP
-$config['kolab_users_search_attrib'] = array('cn','mail','alias');
-
-// JSON-RPC endpoint configuration of the Bonnie web service providing historic data for groupware objects
-$config['kolab_bonnie_api'] = array(
-    'uri'    => 'https://<kolab-hostname>:8080/api/rpc',
-    'user'   => 'webclient',
-    'pass'   => 'Welcome2KolabSystems',
-    'secret' => '8431f191707fffffff00000000cccc',
-    'debug'  => true,   // logs requests/responses to <log-dir>/bonnie
-);

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/js Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/js/folderlist.js Deleted

@@ -1,350 +0,0 @@
-/**
- * Kolab groupware folders treelist widget
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * @licstart  The following is the entire license notice for the
- * JavaScript code in this file.
- *
- * Copyright (C) 2014, 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/>.
- *
- * @licend  The above is the entire license notice
- * for the JavaScript code in this file.
- */
-
-function kolab_folderlist(node, p)
-{
-    // extends treelist.js
-    rcube_treelist_widget.call(this, node, p);
-
-    // private vars
-    var me = this;
-    var search_results;
-    var search_results_widget;
-    var search_results_container;
-    var listsearch_request;
-    var search_messagebox;
-
-    var Q = rcmail.quote_html;
-
-    // render the results for folderlist search
-    function render_search_results(results)
-    {
-        if (results.length) {
-          // create treelist widget to present the search results
-          if (!search_results_widget) {
-              var list_id = (me.container.attr('id') || p.id_prefix || '0')
-              search_results_container = $('<div class="searchresults"></div>')
-                  .html(p.search_title ? '<h2 class="boxtitle" id="st:' + list_id + '">' + p.search_title + '</h2>' : '')
-                  .insertAfter(me.container);
-
-              search_results_widget = new rcube_treelist_widget('<ul>', {
-                  id_prefix: p.id_prefix,
-                  id_encode: p.id_encode,
-                  id_decode: p.id_decode,
-                  selectable: false
-              });
-              // copy classes from main list
-              search_results_widget.container.addClass(me.container.attr('class')).attr('aria-labelledby', 'st:' + list_id);
-
-              // register click handler on search result's checkboxes to select the given item for listing
-              search_results_widget.container
-                  .appendTo(search_results_container)
-                  .on('click', 'input[type=checkbox], a.subscribed, span.subscribed', function(e) {
-                      var node, has_children, li = $(this).closest('li'),
-                          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
-                      if (p.id_decode)
-                          id = p.id_decode(id);
-                      node = search_results_widget.get_node(id);
-                      has_children = node.children && node.children.length;
-
-                      e.stopPropagation();
-                      e.bubbles = false;
-
-                      // activate + subscribe
-                      if ($(e.target).hasClass('subscribed')) {
-                          search_results[id].subscribed = true;
-                          $(e.target).attr('aria-checked', 'true');
-                          li.children().first()
-                              .toggleClass('subscribed')
-                              .find('input[type=checkbox]').get(0).checked = true;
-
-                          if (has_children && search_results[id].group == 'other user') {
-                              li.find('ul li > div').addClass('subscribed')
-                                  .find('a.subscribed').attr('aria-checked', 'true');;
-                          }
-                      }
-                      else if (!this.checked) {
-                          return;
-                      }
-
-                      // copy item to the main list
-                      add_result2list(id, li, true);
-
-                      if (has_children) {
-                          li.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
-                          li.find('a.subscribed, span.subscribed').first().hide();
-                      }
-                      else {
-                          li.remove();
-                      }
-
-                      // set partial subscription status
-                      if (search_results[id].subscribed && search_results[id].parent && search_results[id].group == 'other') {
-                          parent_subscription_status($(me.get_item(id, true)));
-                      }
-
-                      // set focus to cloned checkbox
-                      if (rcube_event.is_keyboard(e)) {
-                        $(me.get_item(id, true)).find('input[type=checkbox]').first().focus();
-                      }
-                  })
-                  .on('click', function(e) {
-                      var prop, id = String($(e.target).closest('li').attr('id')).replace(new RegExp('^'+p.id_prefix), '');
-                      if (p.id_decode)
-                          id = p.id_decode(id);
-
-                      // forward event
-                      if (prop = search_results[id]) {
-                        e.data = prop;
-                        if (me.triggerEvent('click-item', e) === false) {
-                          e.stopPropagation();
-                          return false;
-                        }
-                      }
-                  });
-          }
-
-          // add results to list
-          for (var prop, item, i=0; i < results.length; i++) {
-              prop = results[i];
-              item = $(prop.html);
-              search_results[prop.id] = prop;
-              search_results_widget.insert({
-                  id: prop.id,
-                  classes: [ prop.group || '' ],
-                  html: item,
-                  collapsed: true,
-                  virtual: prop.virtual
-              }, prop.parent);
-
-              // disable checkbox if item already exists in main list
-              if (me.get_node(prop.id) && !me.get_node(prop.id).virtual) {
-                  item.find('input[type=checkbox]').first().prop('disabled', true).prop('checked', true);
-                  item.find('a.subscribed, span.subscribed').hide();
-              }
-          }
-
-          search_results_container.show();
-        }
-    }
-
-    // helper method to (recursively) add a search result item to the main list widget
-    function add_result2list(id, li, active)
-    {
-        var node = search_results_widget.get_node(id),
-            prop = search_results[id],
-            parent_id = prop.parent || null,
-            has_children = node.children && node.children.length,
-            dom_node = has_children ? li.children().first().clone(true, true) : li.children().first(),
-            childs = [];
-
-        // find parent node and insert at the right place
-        if (parent_id && me.get_node(parent_id)) {
-            dom_node.children('span,a').first().html(Q(prop.editname || prop.listname));
-        }
-        else if (parent_id && search_results[parent_id]) {
-            // copy parent tree from search results
-            add_result2list(parent_id, $(search_results_widget.get_item(parent_id)), false);
-        }
-        else if (parent_id) {
-            // use full name for list display
-            dom_node.children('span,a').first().html(Q(prop.name));
-        }
-
-        // replace virtual node with a real one
-        if (me.get_node(id)) {
-            $(me.get_item(id, true)).children().first()
-                .replaceWith(dom_node)
-                .removeClass('virtual');
-        }
-        else {
-            // copy childs, too
-            if (has_children && prop.group == 'other user') {
-                for (var cid, j=0; j < node.children.length; j++) {
-                    if ((cid = node.children[j].id) && search_results[cid]) {
-                        childs.push(search_results_widget.get_node(cid));
-                    }
-                }
-            }
-
-            // move this result item to the main list widget
-            me.insert({
-                id: id,
-                classes: [ prop.group || '' ],
-                virtual: prop.virtual,
-                html: dom_node,
-                level: node.level,
-                collapsed: true,
-                children: childs
-            }, parent_id, prop.group);
-        }
-
-        delete prop.html;
-        prop.active = active;
-        me.triggerEvent('insert-item', { id: id, data: prop, item: li });
-
-        // register childs, too
-        if (childs.length) {
-            for (var cid, j=0; j < node.children.length; j++) {
-                if ((cid = node.children[j].id) && search_results[cid]) {
-                    prop = search_results[cid];
-                    delete prop.html;
-                    prop.active = false;
-                    me.triggerEvent('insert-item', { id: cid, data: prop });
-                }
-            }
-        }
-    }
-
-    // update the given item's parent's (partial) subscription state
-    function parent_subscription_status(li)
-    {
-        var top_li = li.closest(me.container.children('li')),
-            all_childs = $('li > div:not(.treetoggle)', top_li),
-            subscribed = all_childs.filter('.subscribed').length;
-
-        if (subscribed == 0) {
-            top_li.children('div:first').removeClass('subscribed partial');
-        }
-        else {
-            top_li.children('div:first')
-                .addClass('subscribed')[subscribed < all_childs.length ? 'addClass' : 'removeClass']('partial');
-        }
-    }
-
-    // do some magic when search is performed on the widget
-    this.addEventListener('search', function(search) {
-        // hide search results
-        if (search_results_widget) {
-            search_results_container.hide();
-            search_results_widget.reset();
-        }
-        search_results = {};
-
-        if (search_messagebox)
-            rcmail.hide_message(search_messagebox);
-
-        // send search request(s) to server
-        if (search.query && search.execute) {
-            // require a minimum length for the search string
-            if (rcmail.env.autocomplete_min_length && search.query.length < rcmail.env.autocomplete_min_length && search.query != '*') {
-                search_messagebox = rcmail.display_message(
-                    rcmail.get_label('autocompletechars').replace('$min', rcmail.env.autocomplete_min_length));
-                return;
-            }
-
-            if (listsearch_request) {
-                // ignore, let the currently running request finish
-                if (listsearch_request.query == search.query) {
-                    return;
-                }
-                else { // cancel previous search request
-                    rcmail.multi_thread_request_abort(listsearch_request.id);
-                    listsearch_request = null;
-                }
-            }
-
-            var sources = p.search_sources || [ 'folders' ];
-            var reqid = rcmail.multi_thread_http_request({
-                items: sources,
-                threads: rcmail.env.autocomplete_threads || 1,
-                action:  p.search_action || 'listsearch',
-                postdata: { action:'search', q:search.query, source:'%s' },
-                lock: rcmail.display_message(rcmail.get_label('searching'), 'loading'),
-                onresponse: render_search_results,
-                whendone: function(data){
-                  listsearch_request = null;
-                  me.triggerEvent('search-complete', data);
-                }
-            });
-
-            listsearch_request = { id:reqid, query:search.query };
-        }
-        else if (!search.query && listsearch_request) {
-            rcmail.multi_thread_request_abort(listsearch_request.id);
-            listsearch_request = null;
-        }
-    });
-
-    this.container.on('click', 'a.subscribed, span.subscribed', function(e) {
-        var li = $(this).closest('li'),
-            id = li.attr('id').replace(new RegExp('^'+p.id_prefix), ''),
-            div = li.children().first(),
-            is_subscribed;
-
-        if (me.is_search()) {
-            id = id.replace(/--xsR$/, '');
-            li = $(me.get_item(id, true));
-            div = $(div).add(li.children().first());
-        }
-
-        if (p.id_decode)
-            id = p.id_decode(id);
-
-        div.toggleClass('subscribed');
-        is_subscribed = div.hasClass('subscribed');
-        $(this).attr('aria-checked', is_subscribed ? 'true' : 'false');
-        me.triggerEvent('subscribe', { id: id, subscribed: is_subscribed, item: li });
-
-        // update subscribe state of all 'virtual user' child folders
-        if (li.hasClass('other user')) {
-            $('ul li > div', li).each(function() {
-                $(this)[is_subscribed ? 'addClass' : 'removeClass']('subscribed');
-                $('.subscribed', div).attr('aria-checked', is_subscribed ? 'true' : 'false');
-            });
-            div.removeClass('partial');
-        }
-        // propagate subscription state to parent  'virtual user' folder
-        else if (li.closest('li.other.user').length) {
-            parent_subscription_status(li);
-        }
-
-        e.stopPropagation();
-        return false;
-    });
-
-    this.container.on('click', 'a.remove', function(e) {
-      var li = $(this).closest('li'),
-          id = li.attr('id').replace(new RegExp('^'+p.id_prefix), '');
-
-      if (me.is_search()) {
-          id = id.replace(/--xsR$/, '');
-          li = $(me.get_item(id, true));
-      }
-
-      if (p.id_decode)
-          id = p.id_decode(id);
-
-      me.triggerEvent('remove', { id: id, item: li });
-
-      e.stopPropagation();
-      return false;
-    });
-}
-
-// link prototype from base class
-kolab_folderlist.prototype = rcube_treelist_widget.prototype;

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api.php Deleted

@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Provider class for accessing historic groupware object data through the Bonnie service
- *
- * API Specification at https://wiki.kolabsys.com/User:Bruederli/Draft:Bonnie_Client_API
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-
-class kolab_bonnie_api
-{
-    public $ready = false;
-
-    private $config = array();
-    private $client = null;
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct($config)
-    {
-        $this->config = $config;
-
-        $this->client = new kolab_bonnie_api_client($config['uri'], $config['timeout'] ?: 5, (bool)$config['debug']);
-
-        $this->client->set_secret($config['secret']);
-        $this->client->set_authentication($config['user'], $config['pass']);
-        $this->client->set_request_user(rcube::get_instance()->get_user_name());
-
-        $this->ready = !empty($config['secret']) && !empty($config['user']) && !empty($config['pass']);
-    }
-
-    /**
-     * Wrapper function for <object>.changelog() API call
-     */
-    public function changelog($type, $uid, $mailbox=null)
-    {
-        return $this->client->execute($type.'.changelog', array('uid' => $uid, 'mailbox' => $mailbox));
-    }
-
-    /**
-     * Wrapper function for <object>.diff() API call
-     */
-    public function diff($type, $uid, $rev, $mailbox=null)
-    {
-        return $this->client->execute($type.'.diff', array('uid' => $uid, 'rev' => $rev, 'mailbox' => $mailbox));
-    }
-
-    /**
-     * Wrapper function for <object>.get() API call
-     */
-    public function get($type, $uid, $rev, $mailbox=null)
-    {
-      return $this->client->execute($type.'.get', array('uid' => $uid, 'rev' => intval($rev), 'mailbox' => $mailbox));
-    }
-
-    /**
-     * Generic wrapper for direct API calls
-     */
-    public function _execute($method, $params = array())
-    {
-        return $this->client->execute($method, $params);
-    }
-
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_bonnie_api_client.php Deleted

@@ -1,239 +0,0 @@
-<?php
-
-/**
- * JSON-RPC client class with some extra features for communicating with the Bonnie API service.
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-
-class kolab_bonnie_api_client
-{
-    /**
-     * URL of the RPC endpoint
-     * @var string
-     */
-    protected $url;
-
-    /**
-     * HTTP client timeout in seconds
-     * @var integer
-     */
-    protected $timeout;
-
-    /**
-     * Debug flag
-     * @var bool
-     */
-    protected $debug;
-
-    /**
-     * Username for authentication
-     * @var string
-     */
-    protected $username;
-
-    /**
-     * Password for authentication
-     * @var string
-     */
-    protected $password;
-
-    /**
-     * Secret key for request signing
-     * @var string
-     */
-    protected $secret;
-
-    /**
-     * Default HTTP headers to send to the server
-     * @var array
-     */
-    protected $headers = array(
-        'Connection' => 'close',
-        'Content-Type' => 'application/json',
-        'Accept' => 'application/json',
-    );
-
-    /**
-     * Constructor
-     *
-     * @param  string  $url      Server URL
-     * @param  integer $timeout  Request timeout
-     * @param  bool    $debug    Enabled debug logging
-     * @param  array   $headers  Custom HTTP headers
-     */
-    public function __construct($url, $timeout = 5, $debug = false, $headers = array())
-    {
-        $this->url = $url;
-        $this->timeout = $timeout;
-        $this->debug = $debug;
-        $this->headers = array_merge($this->headers, $headers);
-    }
-
-    /**
-     * Setter for secret key for request signing
-     */
-    public function set_secret($secret)
-    {
-        $this->secret = $secret;
-    }
-
-    /**
-     * Setter for the X-Request-User header
-     */
-    public function set_request_user($username)
-    {
-        $this->headers['X-Request-User'] = $username;
-    }
-
-    /**
-     * Set authentication parameters
-     *
-     * @param  string $username  Username
-     * @param  string $password  Password
-     */
-    public function set_authentication($username, $password)
-    {
-        $this->username = $username;
-        $this->password = $password;
-    }
-
-    /**
-     * Automatic mapping of procedures
-     *
-     * @param  string $method  Procedure name
-     * @param  array  $params  Procedure arguments
-     * @return mixed
-     */
-    public function __call($method, $params)
-    {
-        return $this->execute($method, $params);
-    }
-
-    /**
-     * Execute an RPC command
-     *
-     * @param  string $method  Procedure name
-     * @param  array  $params  Procedure arguments
-     * @return mixed
-     */
-    public function execute($method, array $params = array())
-    {
-        $id = mt_rand();
-
-        $payload = array(
-            'jsonrpc' => '2.0',
-            'method' => $method,
-            'id' => $id,
-        );
-
-        if (!empty($params)) {
-            $payload['params'] = $params;
-        }
-
-        $result = $this->send_request($payload, $method != 'system.keygen');
-
-        if (isset($result['id']) && $result['id'] == $id && array_key_exists('result', $result)) {
-            return $result['result'];
-        }
-        else if (isset($result['error'])) {
-            $this->_debug('ERROR', $result);
-        }
-
-        return null;
-    }
-
-    /**
-     * Do the HTTP request
-     *
-     * @param  string  $payload  Data to send
-     */
-    protected function send_request($payload, $sign = true)
-    {
-        try {
-            $payload_ = json_encode($payload);
-
-            // add request signature
-            if ($sign && !empty($this->secret)) {
-                $this->headers['X-Request-Sign'] = $this->request_signature($payload_);
-            }
-            else if ($this->headers['X-Request-Sign']) {
-                unset($this->headers['X-Request-Sign']);
-            }
-
-            $this->_debug('REQUEST', $payload, $this->headers);
-            $request = libkolab::http_request($this->url, 'POST', array('timeout' => $this->timeout));
-            $request->setHeader($this->headers);
-            $request->setAuth($this->username, $this->password);
-            $request->setBody($payload_);
-
-            $response = $request->send();
-
-            if ($response->getStatus() == 200) {
-                $result = json_decode($response->getBody(), true);
-                $this->_debug('RESPONSE', $result);
-            }
-            else {
-                throw new Exception(sprintf("HTTP %d %s", $response->getStatus(), $response->getReasonPhrase()));
-            }
-        }
-        catch (Exception $e) {
-            rcube::raise_error(array(
-                'code' => 500,
-                'type' => 'php',
-                'message' => "Bonnie API request failed: " . $e->getMessage(),
-            ), true);
-
-            return array('id' => $payload['id'], 'error' => $e->getMessage(), 'code' => -32000);
-        }
-
-        return is_array($result) ? $result : array();
-    }
-
-    /**
-     * Compute the hmac signature for the current event payload using
-     * the secret key configured for this API client
-     *
-     * @param string $data The request payload data
-     * @return string The request signature
-     */
-    protected function request_signature($data)
-    {
-        // TODO: get the session key with a system.keygen call
-        return hash_hmac('sha256', $this->headers['X-Request-User'] . ':' . $data, $this->secret);
-    }
-
-    /**
-     * Write debug log
-     */
-    protected function _debug(/* $message, $data1, data2, ...*/)
-    {
-        if (!$this->debug)
-            return;
-
-        $args = func_get_args();
-
-        $msg = array();
-        foreach ($args as $arg) {
-            $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
-        }
-
-        rcube::write_log('bonnie', join(";\n", $msg));
-    }
-
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_date_recurrence.php Deleted

@@ -1,135 +0,0 @@
-<?php
-
-/**
- * Recurrence computation class for xcal-based Kolab format objects
- *
- * Utility class to compute instances of recurring events.
- * It requires the libcalendaring PHP module to be installed and loaded.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-class kolab_date_recurrence
-{
-    private /* EventCal */ $engine;
-    private /* kolab_format_xcal */ $object;
-    private /* DateTime */ $start;
-    private /* DateTime */ $next;
-    private /* cDateTime */ $cnext;
-    private /* DateInterval */ $duration;
-
-    /**
-     * Default constructor
-     *
-     * @param array The Kolab object to operate on
-     */
-    function __construct($object)
-    {
-        $data = $object->to_array();
-
-        $this->object = $object;
-        $this->engine = $object->to_libcal();
-        $this->start = $this->next = $data['start'];
-        $this->cnext = kolab_format::get_datetime($this->next);
-
-        if (is_object($data['start']) && is_object($data['end']))
-            $this->duration = $data['start']->diff($data['end']);
-        else
-            $this->duration = new DateInterval('PT' . ($data['end'] - $data['start']) . 'S');
-    }
-
-    /**
-     * Get date/time of the next occurence of this event
-     *
-     * @param boolean Return a Unix timestamp instead of a DateTime object
-     * @return mixed  DateTime object/unix timestamp or False if recurrence ended
-     */
-    public function next_start($timestamp = false)
-    {
-        $time = false;
-
-        if ($this->engine && $this->next) {
-            if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) {
-                $next = kolab_format::php_datetime($cnext);
-                $time = $timestamp ? $next->format('U') : $next;
-                $this->cnext = $cnext;
-                $this->next = $next;
-            }
-        }
-
-        return $time;
-    }
-
-    /**
-     * 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_start()) {
-            $next_end = clone $next_start;
-            $next_end->add($this->duration);
-
-            $next = $this->object->to_array();
-            $next['recurrence_id'] = $next_start->format('Y-m-d');
-            $next['start'] = $next_start;
-            $next['end'] = $next_end;
-            unset($next['_formatobj']);
-
-            return $next;
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the end date of the occurence of this recurrence cycle
-     *
-     * @return DateTime|bool End datetime of the last event or False if recurrence exceeds limit
-     */
-    public function end()
-    {
-        $event = $this->object->to_array();
-
-        // recurrence end date is given
-        if ($event['recurrence']['UNTIL'] instanceof DateTime) {
-            return $event['recurrence']['UNTIL'];
-        }
-
-        // let libkolab do the work
-        if ($this->engine && ($cend = $this->engine->getLastOccurrence()) && ($end_dt = kolab_format::php_datetime(new cDateTime($cend)))) {
-            return $end_dt;
-        }
-
-        // determine a reasonable end date if none given
-        if (!$event['recurrence']['COUNT'] && $event['end'] instanceof DateTime) {
-          switch ($event['recurrence']['FREQ']) {
-            case 'YEARLY':  $intvl = 'P100Y'; break;
-            case 'MONTHLY': $intvl = 'P20Y';  break;
-            default:        $intvl = 'P10Y';  break;
-          }
-
-          $end_dt = clone $event['end'];
-          $end_dt->add(new DateInterval($intvl));
-          return $end_dt;
-        }
-
-        return false;
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format.php Deleted

@@ -1,699 +0,0 @@
-<?php
-
-/**
- * Kolab format model class wrapping libkolabxml bindings
- *
- * Abstract base class for different Kolab groupware objects read from/written
- * to the new Kolab 3 format using the PHP bindings of libkolabxml.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-abstract class kolab_format
-{
-    public static $timezone;
-
-    public /*abstract*/ $CTYPE;
-    public /*abstract*/ $CTYPEv2;
-
-    protected /*abstract*/ $objclass;
-    protected /*abstract*/ $read_func;
-    protected /*abstract*/ $write_func;
-
-    protected $obj;
-    protected $data;
-    protected $xmldata;
-    protected $xmlobject;
-    protected $formaterror;
-    protected $loaded = false;
-    protected $version = '3.0';
-
-    const KTYPE_PREFIX = 'application/x-vnd.kolab.';
-    const PRODUCT_ID   = 'Roundcube-libkolab-1.1';
-
-    // mapping table for valid PHP timezones not supported by libkolabxml
-    // basically the entire list of ftp://ftp.iana.org/tz/data/backward
-    protected static $timezone_map = array(
-        'Africa/Asmera' => 'Africa/Asmara',
-        'Africa/Timbuktu' => 'Africa/Abidjan',
-        'America/Argentina/ComodRivadavia' => 'America/Argentina/Catamarca',
-        'America/Atka' => 'America/Adak',
-        'America/Buenos_Aires' => 'America/Argentina/Buenos_Aires',
-        'America/Catamarca' => 'America/Argentina/Catamarca',
-        'America/Coral_Harbour' => 'America/Atikokan',
-        'America/Cordoba' => 'America/Argentina/Cordoba',
-        'America/Ensenada' => 'America/Tijuana',
-        'America/Fort_Wayne' => 'America/Indiana/Indianapolis',
-        'America/Indianapolis' => 'America/Indiana/Indianapolis',
-        'America/Jujuy' => 'America/Argentina/Jujuy',
-        'America/Knox_IN' => 'America/Indiana/Knox',
-        'America/Louisville' => 'America/Kentucky/Louisville',
-        'America/Mendoza' => 'America/Argentina/Mendoza',
-        'America/Porto_Acre' => 'America/Rio_Branco',
-        'America/Rosario' => 'America/Argentina/Cordoba',
-        'America/Virgin' => 'America/Port_of_Spain',
-        'Asia/Ashkhabad' => 'Asia/Ashgabat',
-        'Asia/Calcutta' => 'Asia/Kolkata',
-        'Asia/Chungking' => 'Asia/Shanghai',
-        'Asia/Dacca' => 'Asia/Dhaka',
-        'Asia/Katmandu' => 'Asia/Kathmandu',
-        'Asia/Macao' => 'Asia/Macau',
-        'Asia/Saigon' => 'Asia/Ho_Chi_Minh',
-        'Asia/Tel_Aviv' => 'Asia/Jerusalem',
-        'Asia/Thimbu' => 'Asia/Thimphu',
-        'Asia/Ujung_Pandang' => 'Asia/Makassar',
-        'Asia/Ulan_Bator' => 'Asia/Ulaanbaatar',
-        'Atlantic/Faeroe' => 'Atlantic/Faroe',
-        'Atlantic/Jan_Mayen' => 'Europe/Oslo',
-        'Australia/ACT' => 'Australia/Sydney',
-        'Australia/Canberra' => 'Australia/Sydney',
-        'Australia/LHI' => 'Australia/Lord_Howe',
-        'Australia/NSW' => 'Australia/Sydney',
-        'Australia/North' => 'Australia/Darwin',
-        'Australia/Queensland' => 'Australia/Brisbane',
-        'Australia/South' => 'Australia/Adelaide',
-        'Australia/Tasmania' => 'Australia/Hobart',
-        'Australia/Victoria' => 'Australia/Melbourne',
-        'Australia/West' => 'Australia/Perth',
-        'Australia/Yancowinna' => 'Australia/Broken_Hill',
-        'Brazil/Acre' => 'America/Rio_Branco',
-        'Brazil/DeNoronha' => 'America/Noronha',
-        'Brazil/East' => 'America/Sao_Paulo',
-        'Brazil/West' => 'America/Manaus',
-        'Canada/Atlantic' => 'America/Halifax',
-        'Canada/Central' => 'America/Winnipeg',
-        'Canada/East-Saskatchewan' => 'America/Regina',
-        'Canada/Eastern' => 'America/Toronto',
-        'Canada/Mountain' => 'America/Edmonton',
-        'Canada/Newfoundland' => 'America/St_Johns',
-        'Canada/Pacific' => 'America/Vancouver',
-        'Canada/Saskatchewan' => 'America/Regina',
-        'Canada/Yukon' => 'America/Whitehorse',
-        'Chile/Continental' => 'America/Santiago',
-        'Chile/EasterIsland' => 'Pacific/Easter',
-        'Cuba' => 'America/Havana',
-        'Egypt' => 'Africa/Cairo',
-        'Eire' => 'Europe/Dublin',
-        'Europe/Belfast' => 'Europe/London',
-        'Europe/Tiraspol' => 'Europe/Chisinau',
-        'GB' => 'Europe/London',
-        'GB-Eire' => 'Europe/London',
-        'Greenwich' => 'Etc/GMT',
-        'Hongkong' => 'Asia/Hong_Kong',
-        'Iceland' => 'Atlantic/Reykjavik',
-        'Iran' => 'Asia/Tehran',
-        'Israel' => 'Asia/Jerusalem',
-        'Jamaica' => 'America/Jamaica',
-        'Japan' => 'Asia/Tokyo',
-        'Kwajalein' => 'Pacific/Kwajalein',
-        'Libya' => 'Africa/Tripoli',
-        'Mexico/BajaNorte' => 'America/Tijuana',
-        'Mexico/BajaSur' => 'America/Mazatlan',
-        'Mexico/General' => 'America/Mexico_City',
-        'NZ' => 'Pacific/Auckland',
-        'NZ-CHAT' => 'Pacific/Chatham',
-        'Navajo' => 'America/Denver',
-        'PRC' => 'Asia/Shanghai',
-        'Pacific/Ponape' => 'Pacific/Pohnpei',
-        'Pacific/Samoa' => 'Pacific/Pago_Pago',
-        'Pacific/Truk' => 'Pacific/Chuuk',
-        'Pacific/Yap' => 'Pacific/Chuuk',
-        'Poland' => 'Europe/Warsaw',
-        'Portugal' => 'Europe/Lisbon',
-        'ROC' => 'Asia/Taipei',
-        'ROK' => 'Asia/Seoul',
-        'Singapore' => 'Asia/Singapore',
-        'Turkey' => 'Europe/Istanbul',
-        'UCT' => 'Etc/UCT',
-        'US/Alaska' => 'America/Anchorage',
-        'US/Aleutian' => 'America/Adak',
-        'US/Arizona' => 'America/Phoenix',
-        'US/Central' => 'America/Chicago',
-        'US/East-Indiana' => 'America/Indiana/Indianapolis',
-        'US/Eastern' => 'America/New_York',
-        'US/Hawaii' => 'Pacific/Honolulu',
-        'US/Indiana-Starke' => 'America/Indiana/Knox',
-        'US/Michigan' => 'America/Detroit',
-        'US/Mountain' => 'America/Denver',
-        'US/Pacific' => 'America/Los_Angeles',
-        'US/Samoa' => 'Pacific/Pago_Pago',
-        'Universal' => 'Etc/UTC',
-        'W-SU' => 'Europe/Moscow',
-        'Zulu' => 'Etc/UTC',
-    );
-
-    /**
-     * Factory method to instantiate a kolab_format object of the given type and version
-     *
-     * @param string Object type to instantiate
-     * @param float  Format version
-     * @param string Cached xml data to initialize with
-     * @return object kolab_format
-     */
-    public static function factory($type, $version = '3.0', $xmldata = null)
-    {
-        if (!isset(self::$timezone))
-            self::$timezone = new DateTimeZone('UTC');
-
-        if (!self::supports($version))
-            return PEAR::raiseError("No support for Kolab format version " . $version);
-
-        $type = preg_replace('/configuration\.[a-z._]+$/', 'configuration', $type);
-        $suffix = preg_replace('/[^a-z]+/', '', $type);
-        $classname = 'kolab_format_' . $suffix;
-        if (class_exists($classname))
-            return new $classname($xmldata, $version);
-
-        return PEAR::raiseError("Failed to load Kolab Format wrapper for type " . $type);
-    }
-
-    /**
-     * Determine support for the given format version
-     *
-     * @param float Format version to check
-     * @return boolean True if supported, False otherwise
-     */
-    public static function supports($version)
-    {
-        if ($version == '2.0')
-            return class_exists('kolabobject');
-        // default is version 3
-        return class_exists('kolabformat');
-    }
-
-    /**
-     * Convert the given date/time value into a cDateTime object
-     *
-     * @param mixed         Date/Time value either as unix timestamp, date string or PHP DateTime object
-     * @param DateTimeZone  The timezone the date/time is in. Use global default if Null, local time if False
-     * @param boolean       True of the given date has no time component
-     * @return object       The libkolabxml date/time object
-     */
-    public static function get_datetime($datetime, $tz = null, $dateonly = false)
-    {
-        // use timezone information from datetime of global setting
-        if (!$tz && $tz !== false) {
-            if ($datetime instanceof DateTime)
-                $tz = $datetime->getTimezone();
-            if (!$tz)
-                $tz = self::$timezone;
-        }
-        $result = new cDateTime();
-
-        try {
-            // got a unix timestamp (in UTC)
-            if (is_numeric($datetime)) {
-                $datetime = new DateTime('@'.$datetime, new DateTimeZone('UTC'));
-                if ($tz) $datetime->setTimezone($tz);
-            }
-            else if (is_string($datetime) && strlen($datetime)) {
-                $datetime = $tz ? new DateTime($datetime, $tz) : new DateTime($datetime);
-            }
-        }
-        catch (Exception $e) {}
-
-        if ($datetime instanceof DateTime) {
-            $result->setDate($datetime->format('Y'), $datetime->format('n'), $datetime->format('j'));
-
-            if (!$dateonly)
-                $result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));
-
-            if ($tz && in_array($tz->getName(), array('UTC', 'GMT', '+00:00', 'Z'))) {
-                $result->setUTC(true);
-            }
-            else if ($tz !== false) {
-                $tzid = $tz->getName();
-                if (array_key_exists($tzid, self::$timezone_map))
-                    $tzid = self::$timezone_map[$tzid];
-                $result->setTimezone($tzid);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert the given cDateTime into a PHP DateTime object
-     *
-     * @param object cDateTime  The libkolabxml datetime object
-     * @return object DateTime  PHP datetime instance
-     */
-    public static function php_datetime($cdt)
-    {
-        if (!is_object($cdt) || !$cdt->isValid())
-            return null;
-
-        $d = new DateTime;
-        $d->setTimezone(self::$timezone);
-
-        try {
-            if ($tzs = $cdt->timezone()) {
-                $tz = new DateTimeZone($tzs);
-                $d->setTimezone($tz);
-            }
-            else if ($cdt->isUTC()) {
-                $d->setTimezone(new DateTimeZone('UTC'));
-            }
-        }
-        catch (Exception $e) { }
-
-        $d->setDate($cdt->year(), $cdt->month(), $cdt->day());
-
-        if ($cdt->isDateOnly()) {
-            $d->_dateonly = true;
-            $d->setTime(12, 0, 0);  // set time to noon to avoid timezone troubles
-        }
-        else {
-            $d->setTime($cdt->hour(), $cdt->minute(), $cdt->second());
-        }
-
-        return $d;
-    }
-
-    /**
-     * Convert a libkolabxml vector to a PHP array
-     *
-     * @param object vector Object
-     * @return array Indexed array containing vector elements
-     */
-    public static function vector2array($vec, $max = PHP_INT_MAX)
-    {
-        $arr = array();
-        for ($i=0; $i < $vec->size() && $i < $max; $i++)
-            $arr[] = $vec->get($i);
-        return $arr;
-    }
-
-    /**
-     * Build a libkolabxml vector (string) from a PHP array
-     *
-     * @param array Array with vector elements
-     * @return object vectors
-     */
-    public static function array2vector($arr)
-    {
-        $vec = new vectors;
-        foreach ((array)$arr as $val) {
-            if (strlen($val))
-                $vec->push($val);
-        }
-        return $vec;
-    }
-
-    /**
-     * Parse the X-Kolab-Type header from MIME messages and return the object type in short form
-     *
-     * @param string X-Kolab-Type header value
-     * @return string Kolab object type (contact,event,task,note,etc.)
-     */
-    public static function mime2object_type($x_kolab_type)
-    {
-        return preg_replace(
-            array('/dictionary.[a-z.]+$/', '/contact.distlist$/'),
-            array( 'dictionary',            'distribution-list'),
-            substr($x_kolab_type, strlen(self::KTYPE_PREFIX))
-        );
-    }
-
-
-    /**
-     * Default constructor of all kolab_format_* objects
-     */
-    public function __construct($xmldata = null, $version = null)
-    {
-        $this->obj = new $this->objclass;
-        $this->xmldata = $xmldata;
-
-        if ($version)
-            $this->version = $version;
-
-        // use libkolab module if available
-        if (class_exists('kolabobject'))
-            $this->xmlobject = new XMLObject();
-    }
-
-    /**
-     * Check for format errors after calling kolabformat::write*()
-     *
-     * @return boolean True if there were errors, False if OK
-     */
-    protected function format_errors()
-    {
-        $ret = $log = false;
-        switch (kolabformat::error()) {
-            case kolabformat::NoError:
-                $ret = false;
-                break;
-            case kolabformat::Warning:
-                $ret = false;
-                $uid = is_object($this->obj) ? $this->obj->uid() : $this->data['uid'];
-                $log = "Warning @ $uid";
-                break;
-            default:
-                $ret = true;
-                $log = "Error";
-        }
-
-        if ($log && !isset($this->formaterror)) {
-            rcube::raise_error(array(
-                'code' => 660,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "kolabformat $log: " . kolabformat::errorMessage(),
-            ), true);
-
-            $this->formaterror = $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Save the last generated UID to the object properties.
-     * Should be called after kolabformat::writeXXXX();
-     */
-    protected function update_uid()
-    {
-        // get generated UID
-        if (!$this->data['uid']) {
-            if ($this->xmlobject) {
-                $this->data['uid'] = $this->xmlobject->getSerializedUID();
-            }
-            if (empty($this->data['uid'])) {
-                $this->data['uid'] = kolabformat::getSerializedUID();
-            }
-            $this->obj->setUid($this->data['uid']);
-        }
-    }
-
-    /**
-     * Initialize libkolabxml object with cached xml data
-     */
-    protected function init()
-    {
-        if (!$this->loaded) {
-            if ($this->xmldata) {
-                $this->load($this->xmldata);
-                $this->xmldata = null;
-            }
-            $this->loaded = true;
-        }
-    }
-
-    /**
-     * Get constant value for libkolab's version parameter
-     *
-     * @param float Version value to convert
-     * @return int Constant value of either kolabobject::KolabV2 or kolabobject::KolabV3 or false if kolabobject module isn't available
-     */
-    protected function libversion($v = null)
-    {
-        if (class_exists('kolabobject')) {
-            $version = $v ?: $this->version;
-            if ($version <= '2.0')
-                return kolabobject::KolabV2;
-            else
-                return kolabobject::KolabV3;
-        }
-
-        return false;
-    }
-
-    /**
-     * Determine the correct libkolab(xml) wrapper function for the given call
-     * depending on the available PHP modules
-     */
-    protected function libfunc($func)
-    {
-        if (is_array($func) || strpos($func, '::'))
-            return $func;
-        else if (class_exists('kolabobject'))
-            return array($this->xmlobject, $func);
-        else
-            return 'kolabformat::' . $func;
-    }
-
-    /**
-     * Direct getter for object properties
-     */
-    public function __get($var)
-    {
-        return $this->data[$var];
-    }
-
-    /**
-     * Load Kolab object data from the given XML block
-     *
-     * @param string XML data
-     * @return boolean True on success, False on failure
-     */
-    public function load($xml)
-    {
-        $this->formaterror = null;
-        $read_func = $this->libfunc($this->read_func);
-
-        if (is_array($read_func))
-            $r = call_user_func($read_func, $xml, $this->libversion());
-        else
-            $r = call_user_func($read_func, $xml, false);
-
-        if (is_resource($r))
-            $this->obj = new $this->objclass($r);
-        else if (is_a($r, $this->objclass))
-            $this->obj = $r;
-
-        $this->loaded = !$this->format_errors();
-    }
-
-    /**
-     * Write object data to XML format
-     *
-     * @param float Format version to write
-     * @return string XML data
-     */
-    public function write($version = null)
-    {
-        $this->formaterror = null;
-
-        $this->init();
-        $write_func = $this->libfunc($this->write_func);
-        if (is_array($write_func))
-            $this->xmldata = call_user_func($write_func, $this->obj, $this->libversion($version), self::PRODUCT_ID);
-        else
-            $this->xmldata = call_user_func($write_func, $this->obj, self::PRODUCT_ID);
-
-        if (!$this->format_errors())
-            $this->update_uid();
-        else
-            $this->xmldata = null;
-
-        return $this->xmldata;
-    }
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        $this->init();
-
-        if (!empty($object['uid']))
-            $this->obj->setUid($object['uid']);
-
-        // set some automatic values if missing
-        if (empty($object['created']) && method_exists($this->obj, 'setCreated')) {
-            $cdt = $this->obj->created();
-            $object['created'] = $cdt && $cdt->isValid() ? self::php_datetime($cdt) : new DateTime('now', new DateTimeZone('UTC'));
-            if (!$cdt || !$cdt->isValid())
-                $this->obj->setCreated(self::get_datetime($object['created']));
-        }
-
-        $object['changed'] = new DateTime('now', new DateTimeZone('UTC'));
-        $this->obj->setLastModified(self::get_datetime($object['changed']));
-
-        // Save custom properties of the given object
-        if (isset($object['x-custom']) && method_exists($this->obj, 'setCustomProperties')) {
-            $vcustom = new vectorcs;
-            foreach ((array)$object['x-custom'] as $cp) {
-                if (is_array($cp))
-                    $vcustom->push(new CustomProperty($cp[0], $cp[1]));
-            }
-            $this->obj->setCustomProperties($vcustom);
-        }
-        // load custom properties from XML for caching (#2238) if method exists (#3125)
-        else if (method_exists($this->obj, 'customProperties')) {
-            $object['x-custom'] = array();
-            $vcustom = $this->obj->customProperties();
-            for ($i=0; $i < $vcustom->size(); $i++) {
-                $cp = $vcustom->get($i);
-                $object['x-custom'][] = array($cp->identifier, $cp->value);
-            }
-        }
-    }
-
-    /**
-     * Convert the Kolab object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Kolab object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        $this->init();
-
-        // read object properties into local data object
-        $object = array(
-            'uid'     => $this->obj->uid(),
-            'changed' => self::php_datetime($this->obj->lastModified()),
-        );
-
-        // not all container support the created property
-        if (method_exists($this->obj, 'created')) {
-            $object['created'] = self::php_datetime($this->obj->created());
-        }
-
-        // read custom properties
-        if (method_exists($this->obj, 'customProperties')) {
-            $vcustom = $this->obj->customProperties();
-            for ($i=0; $i < $vcustom->size(); $i++) {
-                $cp = $vcustom->get($i);
-                $object['x-custom'][] = array($cp->identifier, $cp->value);
-            }
-        }
-
-        // merge with additional data, e.g. attachments from the message
-        if ($data) {
-            foreach ($data as $idx => $value) {
-                if (is_array($value)) {
-                    $object[$idx] = array_merge((array)$object[$idx], $value);
-                }
-                else {
-                    $object[$idx] = $value;
-                }
-            }
-        }
-
-        return $object;
-    }
-
-    /**
-     * Object validation method to be implemented by derived classes
-     */
-    abstract public function is_valid();
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        return array();
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        return array();
-    }
-
-    /**
-     * Utility function to extract object attachment data
-     *
-     * @param array Hash array reference to append attachment data into
-     */
-    public function get_attachments(&$object)
-    {
-        $this->init();
-
-        // handle attachments
-        $vattach = $this->obj->attachments();
-        for ($i=0; $i < $vattach->size(); $i++) {
-            $attach = $vattach->get($i);
-
-            // skip cid: attachments which are mime message parts handled by kolab_storage_folder
-            if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
-                $name    = $attach->label();
-                $key     = $name . (isset($object['_attachments'][$name]) ? '.'.$i : '');
-                $content = $attach->data();
-                $object['_attachments'][$key] = array(
-                    'id'       => 'i:'.$i,
-                    'name'     => $name,
-                    'mimetype' => $attach->mimetype(),
-                    'size'     => strlen($content),
-                    'content'  => $content,
-                );
-            }
-            else if (in_array(substr($attach->uri(), 0, 4), array('http','imap'))) {
-                $object['links'][] = $attach->uri();
-            }
-        }
-    }
-
-    /**
-     * Utility function to set attachment properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     * @param boolean True to always overwrite attachment information
-     */
-    protected function set_attachments($object, $write = true)
-    {
-        // save attachments
-        $vattach = new vectorattachment;
-        foreach ((array) $object['_attachments'] as $cid => $attr) {
-            if (empty($attr))
-                continue;
-            $attach = new Attachment;
-            $attach->setLabel((string)$attr['name']);
-            $attach->setUri('cid:' . $cid, $attr['mimetype'] ?: 'application/octet-stream');
-            if ($attach->isValid()) {
-                $vattach->push($attach);
-                $write = true;
-            }
-            else {
-                rcube::raise_error(array(
-                    'code' => 660,
-                    'type' => 'php',
-                    'file' => __FILE__,
-                    'line' => __LINE__,
-                    'message' => "Invalid attributes for attachment $cid: " . var_export($attr, true),
-                ), true);
-            }
-        }
-
-        foreach ((array) $object['links'] as $link) {
-            $attach = new Attachment;
-            $attach->setUri($link, 'unknown');
-            $vattach->push($attach);
-            $write = true;
-        }
-
-        if ($write) {
-            $this->obj->setAttachments($vattach);
-        }
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_configuration.php Deleted

@@ -1,284 +0,0 @@
-<?php
-
-/**
- * Kolab Configuration data model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_configuration extends kolab_format
-{
-    public $CTYPE   = 'application/vnd.kolab+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.configuration';
-
-    protected $objclass   = 'Configuration';
-    protected $read_func  = 'readConfiguration';
-    protected $write_func = 'writeConfiguration';
-
-    private $type_map = array(
-        'category'    => Configuration::TypeCategoryColor,
-        'dictionary'  => Configuration::TypeDictionary,
-        'file_driver' => Configuration::TypeFileDriver,
-        'relation'    => Configuration::TypeRelation,
-        'snippet'     => Configuration::TypeSnippet,
-    );
-
-    private $driver_settings_fields = array('host', 'port', 'username', 'password');
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // read type-specific properties
-        switch ($object['type']) {
-        case 'dictionary':
-            $dict = new Dictionary($object['language']);
-            $dict->setEntries(self::array2vector($object['e']));
-            $this->obj = new Configuration($dict);
-            break;
-
-        case 'category':
-            // TODO: implement this
-            $categories = new vectorcategorycolor;
-            $this->obj = new Configuration($categories);
-            break;
-
-        case 'file_driver':
-            $driver = new FileDriver($object['driver'], $object['title']);
-
-            $driver->setEnabled((bool) $object['enabled']);
-
-            foreach ($this->driver_settings_fields as $field) {
-                $value = $object[$field];
-                if ($value !== null) {
-                    $driver->{'set' . ucfirst($field)}($value);
-                }
-            }
-
-            $this->obj = new Configuration($driver);
-            break;
-
-        case 'relation':
-            $relation = new Relation(strval($object['name']), strval($object['category']));
-
-            if ($object['color']) {
-                $relation->setColor($object['color']);
-            }
-            if ($object['parent']) {
-                $relation->setParent($object['parent']);
-            }
-            if ($object['iconName']) {
-                $relation->setIconName($object['iconName']);
-            }
-            if ($object['priority'] > 0) {
-                $relation->setPriority((int) $object['priority']);
-            }
-            if (!empty($object['members'])) {
-                $relation->setMembers(self::array2vector($object['members']));
-            }
-
-            $this->obj = new Configuration($relation);
-            break;
-
-        case 'snippet':
-            $collection = new SnippetCollection($object['name']);
-            $snippets   = new vectorsnippets;
-
-            foreach ((array) $object['snippets'] as $item) {
-                $snippet = new snippet($item['name'], $item['text']);
-                $snippet->setTextType(strtolower($item['type']) == 'html' ? Snippet::HTML : Snippet::Plain);
-                if ($item['shortcut']) {
-                    $snippet->setShortCut($item['shortcut']);
-                }
-
-                $snippets->push($snippet);
-            }
-
-            $collection->setSnippets($snippets);
-
-            $this->obj = new Configuration($collection);
-            break;
-
-        default:
-            return false;
-        }
-
-        // adjust content-type string
-        $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
-
-        // reset old object data, otherwise set() will overwrite current data (#4095)
-        $this->xmldata = null;
-        // set common object properties
-        parent::set($object);
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return $this->data || (is_object($this->obj) && $this->obj->isValid());
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data)) {
-            return $this->data;
-        }
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $type_map = array_flip($this->type_map);
-
-        $object['type'] = $type_map[$this->obj->type()];
-
-        // read type-specific properties
-        switch ($object['type']) {
-        case 'dictionary':
-            $dict = $this->obj->dictionary();
-            $object['language'] = $dict->language();
-            $object['e'] = self::vector2array($dict->entries());
-            break;
-
-        case 'category':
-            // TODO: implement this
-            break;
-
-        case 'file_driver':
-            $driver = $this->obj->fileDriver();
-
-            $object['driver']  = $driver->driver();
-            $object['title']   = $driver->title();
-            $object['enabled'] = $driver->enabled();
-
-            foreach ($this->driver_settings_fields as $field) {
-                $object[$field] = $driver->{$field}();
-            }
-
-            break;
-
-        case 'relation':
-            $relation = $this->obj->relation();
-
-            $object['name']     = $relation->name();
-            $object['category'] = $relation->type();
-            $object['color']    = $relation->color();
-            $object['parent']   = $relation->parent();
-            $object['iconName'] = $relation->iconName();
-            $object['priority'] = $relation->priority();
-            $object['members']  = self::vector2array($relation->members());
-
-            break;
-
-        case 'snippet':
-            $collection = $this->obj->snippets();
-
-            $object['name']     = $collection->name();
-            $object['snippets'] = array();
-
-            $snippets = $collection->snippets();
-            for ($i=0; $i < $snippets->size(); $i++) {
-                $snippet = $snippets->get($i);
-                $object['snippets'][] = array(
-                    'name'     => $snippet->name(),
-                    'text'     => $snippet->text(),
-                    'type'     => $snippet->textType() == Snippet::HTML ? 'html' : 'plain',
-                    'shortcut' => $snippet->shortCut(),
-                );
-            }
-
-            break;
-        }
-
-        // adjust content-type string
-        if ($object['type']) {
-            $this->CTYPEv2 = 'application/x-vnd.kolab.configuration.' . $object['type'];
-        }
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        switch ($this->data['type']) {
-        case 'dictionary':
-            $tags = array($this->data['language']);
-            break;
-
-        case 'relation':
-            $tags = array('category:' . $this->data['category']);
-            break;
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        $words = array();
-
-        foreach ((array)$this->data['members'] as $url) {
-            $member = kolab_storage_config::parse_member_url($url);
-
-            if (empty($member)) {
-                if (strpos($url, 'urn:uuid:') === 0) {
-                    $words[] = substr($url, 9);
-                }
-            }
-            else if (!empty($member['params']['message-id'])) {
-                $words[] = $member['params']['message-id'];
-            }
-            else {
-                // derive message identifier from URI
-                $words[] = md5($url);
-            }
-        }
-
-        return $words;
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_contact.php Deleted

@@ -1,482 +0,0 @@
-<?php
-
-/**
- * Kolab Contact model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_contact extends kolab_format
-{
-    public $CTYPE = 'application/vcard+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.contact';
-
-    protected $objclass = 'Contact';
-    protected $read_func = 'readContact';
-    protected $write_func = 'writeContact';
-
-    public static $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'email:address');
-
-    public $phonetypes = array(
-        'home'    => Telephone::Home,
-        'work'    => Telephone::Work,
-        'text'    => Telephone::Text,
-        'main'    => Telephone::Voice,
-        'homefax' => Telephone::Fax,
-        'workfax' => Telephone::Fax,
-        'mobile'  => Telephone::Cell,
-        'video'   => Telephone::Video,
-        'pager'   => Telephone::Pager,
-        'car'     => Telephone::Car,
-        'other'   => Telephone::Textphone,
-    );
-
-    public $emailtypes = array(
-        'home' => Email::Home,
-        'work' => Email::Work,
-        'other' => Email::NoType,
-    );
-
-    public $addresstypes = array(
-        'home' => Address::Home,
-        'work' => Address::Work,
-        'office' => 0,
-    );
-
-    private $gendermap = array(
-        'female' => Contact::Female,
-        'male'   => Contact::Male,
-    );
-
-    private $relatedmap = array(
-        'manager'   => Related::Manager,
-        'assistant' => Related::Assistant,
-        'spouse'    => Related::Spouse,
-        'children'  => Related::Child,
-    );
-
-
-    /**
-     * Default constructor
-     */
-    function __construct($xmldata = null, $version = 3.0)
-    {
-        parent::__construct($xmldata, $version);
-
-        // complete phone types
-        $this->phonetypes['homefax'] |= Telephone::Home;
-        $this->phonetypes['workfax'] |= Telephone::Work;
-    }
-
-    /**
-     * Set contact properties to the kolabformat object
-     *
-     * @param array  Contact data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        // do the hard work of setting object values
-        $nc = new NameComponents;
-        $nc->setSurnames(self::array2vector($object['surname']));
-        $nc->setGiven(self::array2vector($object['firstname']));
-        $nc->setAdditional(self::array2vector($object['middlename']));
-        $nc->setPrefixes(self::array2vector($object['prefix']));
-        $nc->setSuffixes(self::array2vector($object['suffix']));
-        $this->obj->setNameComponents($nc);
-        $this->obj->setName($object['name']);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-
-        if (isset($object['nickname']))
-            $this->obj->setNickNames(self::array2vector($object['nickname']));
-        if (isset($object['jobtitle']))
-            $this->obj->setTitles(self::array2vector($object['jobtitle']));
-
-        // organisation related properties (affiliation)
-        $org = new Affiliation;
-        $offices = new vectoraddress;
-        if ($object['organization'])
-            $org->setOrganisation($object['organization']);
-        if ($object['department'])
-            $org->setOrganisationalUnits(self::array2vector($object['department']));
-        if ($object['profession'])
-            $org->setRoles(self::array2vector($object['profession']));
-
-        $rels = new vectorrelated;
-        foreach (array('manager','assistant') as $field) {
-            if (!empty($object[$field])) {
-                $reltype = $this->relatedmap[$field];
-                foreach ((array)$object[$field] as $value) {
-                    $rels->push(new Related(Related::Text, $value, $reltype));
-                }
-            }
-        }
-        $org->setRelateds($rels);
-
-        // im, email, url
-        $this->obj->setIMaddresses(self::array2vector($object['im']));
-
-        if (class_exists('vectoremail')) {
-            $vemails = new vectoremail;
-            foreach ((array)$object['email'] as $email) {
-                $type = $this->emailtypes[$email['type']];
-                $vemails->push(new Email($email['address'], intval($type)));
-            }
-        }
-        else {
-            $vemails = self::array2vector(array_map(function($v){ return $v['address']; }, $object['email']));
-        }
-        $this->obj->setEmailAddresses($vemails);
-
-        $vurls = new vectorurl;
-        foreach ((array)$object['website'] as $url) {
-            $type = $url['type'] == 'blog' ? Url::Blog : Url::NoType;
-            $vurls->push(new Url($url['url'], $type));
-        }
-        $this->obj->setUrls($vurls);
-
-        // addresses
-        $adrs = new vectoraddress;
-        foreach ((array)$object['address'] as $address) {
-            $adr = new Address;
-            $type = $this->addresstypes[$address['type']];
-            if (isset($type))
-                $adr->setTypes($type);
-            else if ($address['type'])
-                $adr->setLabel($address['type']);
-            if ($address['street'])
-                $adr->setStreet($address['street']);
-            if ($address['locality'])
-                $adr->setLocality($address['locality']);
-            if ($address['code'])
-                $adr->setCode($address['code']);
-            if ($address['region'])
-                $adr->setRegion($address['region']);
-            if ($address['country'])
-                $adr->setCountry($address['country']);
-
-            if ($address['type'] == 'office')
-                $offices->push($adr);
-            else
-                $adrs->push($adr);
-        }
-        $this->obj->setAddresses($adrs);
-        $org->setAddresses($offices);
-
-        // add org affiliation after addresses are set
-        $orgs = new vectoraffiliation;
-        $orgs->push($org);
-        $this->obj->setAffiliations($orgs);
-
-        // telephones
-        $tels = new vectortelephone;
-        foreach ((array)$object['phone'] as $phone) {
-            $tel = new Telephone;
-            if (isset($this->phonetypes[$phone['type']]))
-                $tel->setTypes($this->phonetypes[$phone['type']]);
-            $tel->setNumber($phone['number']);
-            $tels->push($tel);
-        }
-        $this->obj->setTelephones($tels);
-
-        if (isset($object['gender']))
-            $this->obj->setGender($this->gendermap[$object['gender']] ? $this->gendermap[$object['gender']] : Contact::NotSet);
-        if (isset($object['notes']))
-            $this->obj->setNote($object['notes']);
-        if (isset($object['freebusyurl']))
-            $this->obj->setFreeBusyUrl($object['freebusyurl']);
-        if (isset($object['lang']))
-            $this->obj->setLanguages(self::array2vector($object['lang']));
-        if (isset($object['birthday']))
-            $this->obj->setBDay(self::get_datetime($object['birthday'], false, true));
-        if (isset($object['anniversary']))
-            $this->obj->setAnniversary(self::get_datetime($object['anniversary'], false, true));
-
-        if (!empty($object['photo'])) {
-            if ($type = rcube_mime::image_content_type($object['photo']))
-                $this->obj->setPhoto($object['photo'], $type);
-        }
-        else if (isset($object['photo']))
-            $this->obj->setPhoto('','');
-        else if ($this->obj->photoMimetype())  // load saved photo for caching
-            $object['photo'] = $this->obj->photo();
-
-        // spouse and children are relateds
-        $rels = new vectorrelated;
-        foreach (array('spouse','children') as $field) {
-            if (!empty($object[$field])) {
-                $reltype = $this->relatedmap[$field];
-                foreach ((array)$object[$field] as $value) {
-                    $rels->push(new Related(Related::Text, $value, $reltype));
-                }
-            }
-        }
-        // add other relateds
-        if (is_array($object['related'])) {
-            foreach ($object['related'] as $value) {
-                $rels->push(new Related(Related::Text, $value));
-            }
-        }
-        $this->obj->setRelateds($rels);
-
-        // insert/replace crypto keys
-        $pgp_index = $pkcs7_index = -1;
-        $keys = $this->obj->keys();
-        for ($i=0; $i < $keys->size(); $i++) {
-            $key = $keys->get($i);
-            if ($pgp_index < 0 && $key->type() == Key::PGP)
-                $pgp_index = $i;
-            else if ($pkcs7_index < 0 && $key->type() == Key::PKCS7_MIME)
-                $pkcs7_index = $i;
-        }
-
-        $pgpkey   = $object['pgppublickey']   ? new Key($object['pgppublickey'], Key::PGP) : new Key();
-        $pkcs7key = $object['pkcs7publickey'] ? new Key($object['pkcs7publickey'], Key::PKCS7_MIME) : new Key();
-
-        if ($pgp_index >= 0)
-            $keys->set($pgp_index, $pgpkey);
-        else if (!empty($object['pgppublickey']))
-            $keys->push($pgpkey);
-        if ($pkcs7_index >= 0)
-            $keys->set($pkcs7_index, $pkcs7key);
-        else if (!empty($object['pkcs7publickey']))
-            $keys->push($pkcs7key);
-
-        $this->obj->setKeys($keys);
-
-        // TODO: handle language, gpslocation, etc.
-
-        // set type property for proper caching
-        $object['_type'] = 'contact';
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->uid() /*$this->obj->isValid()*/));
-    }
-
-    /**
-     * Convert the Contact object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Contact data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $object['name'] = $this->obj->name();
-
-        $nc = $this->obj->nameComponents();
-        $object['surname']    = join(' ', self::vector2array($nc->surnames()));
-        $object['firstname']  = join(' ', self::vector2array($nc->given()));
-        $object['middlename'] = join(' ', self::vector2array($nc->additional()));
-        $object['prefix']     = join(' ', self::vector2array($nc->prefixes()));
-        $object['suffix']     = join(' ', self::vector2array($nc->suffixes()));
-        $object['nickname']   = join(' ', self::vector2array($this->obj->nickNames()));
-        $object['jobtitle']   = join(' ', self::vector2array($this->obj->titles()));
-        $object['categories'] = self::vector2array($this->obj->categories());
-
-        // organisation related properties (affiliation)
-        $orgs = $this->obj->affiliations();
-        if ($orgs->size()) {
-            $org = $orgs->get(0);
-            $object['organization']   = $org->organisation();
-            $object['profession']     = join(' ', self::vector2array($org->roles()));
-            $object['department']     = join(' ', self::vector2array($org->organisationalUnits()));
-            $this->read_relateds($org->relateds(), $object);
-        }
-
-        $object['im'] = self::vector2array($this->obj->imAddresses());
-
-        $emails = $this->obj->emailAddresses();
-        if ($emails instanceof vectoremail) {
-            $emailtypes = array_flip($this->emailtypes);
-            for ($i=0; $i < $emails->size(); $i++) {
-                $email = $emails->get($i);
-                $object['email'][] = array('address' => $email->address(), 'type' => $emailtypes[$email->types()]);
-            }
-        }
-        else {
-            $object['email'] = self::vector2array($emails);
-        }
-
-        $urls = $this->obj->urls();
-        for ($i=0; $i < $urls->size(); $i++) {
-            $url = $urls->get($i);
-            $subtype = $url->type() == Url::Blog ? 'blog' : 'homepage';
-            $object['website'][] = array('url' => $url->url(), 'type' => $subtype);
-        }
-
-        // addresses
-        $this->read_addresses($this->obj->addresses(), $object);
-        if ($org && ($offices = $org->addresses()))
-            $this->read_addresses($offices, $object, 'office');
-
-        // telehones
-        $tels = $this->obj->telephones();
-        $teltypes = array_flip($this->phonetypes);
-        for ($i=0; $i < $tels->size(); $i++) {
-            $tel = $tels->get($i);
-            $object['phone'][] = array('number' => $tel->number(), 'type' => $teltypes[$tel->types()]);
-        }
-
-        $object['notes'] = $this->obj->note();
-        $object['freebusyurl'] = $this->obj->freeBusyUrl();
-        $object['lang'] = self::vector2array($this->obj->languages());
-
-        if ($bday = self::php_datetime($this->obj->bDay()))
-            $object['birthday'] = $bday;
-
-        if ($anniversary = self::php_datetime($this->obj->anniversary()))
-            $object['anniversary'] = $anniversary;
-
-        $gendermap = array_flip($this->gendermap);
-        if (($g = $this->obj->gender()) && $gendermap[$g])
-            $object['gender'] = $gendermap[$g];
-
-        if ($this->obj->photoMimetype())
-            $object['photo'] = $this->obj->photo();
-        else if ($this->xmlobject && ($photo_name = $this->xmlobject->pictureAttachmentName()))
-            $object['photo'] = $photo_name;
-
-        // relateds -> spouse, children
-        $this->read_relateds($this->obj->relateds(), $object, 'related');
-
-        // crypto settings: currently only key values are supported
-        $keys = $this->obj->keys();
-        for ($i=0; is_object($keys) && $i < $keys->size(); $i++) {
-            $key = $keys->get($i);
-            if ($key->type() == Key::PGP)
-                $object['pgppublickey'] = $key->key();
-            else if ($key->type() == Key::PKCS7_MIME)
-                $object['pkcs7publickey'] = $key->key();
-        }
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        $data = '';
-        foreach (self::$fulltext_cols as $colname) {
-            list($col, $field) = explode(':', $colname);
-
-            if ($field) {
-                $a = array();
-                foreach ((array)$this->data[$col] as $attr)
-                    $a[] = $attr[$field];
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
-            }
-
-            if (strlen($val))
-                $data .= $val . ' ';
-        }
-
-        return array_unique(rcube_utils::normalize_string($data, true));
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        if (!empty($this->data['birthday'])) {
-            $tags[] = 'x-has-birthday';
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Helper method to copy contents of an Address vector to the contact data object
-     */
-    private function read_addresses($addresses, &$object, $type = null)
-    {
-        $adrtypes = array_flip($this->addresstypes);
-
-        for ($i=0; $i < $addresses->size(); $i++) {
-            $adr = $addresses->get($i);
-            $object['address'][] = array(
-                'type'     => $type ? $type : ($adrtypes[$adr->types()] ? $adrtypes[$adr->types()] : ''), /*$adr->label()),*/
-                'street'   => $adr->street(),
-                'code'     => $adr->code(),
-                'locality' => $adr->locality(),
-                'region'   => $adr->region(),
-                'country'  => $adr->country()
-            );
-        }
-    }
-
-    /**
-     * Helper method to map contents of a Related vector to the contact data object
-     */
-    private function read_relateds($rels, &$object, $catchall = null)
-    {
-        $typemap = array_flip($this->relatedmap);
-
-        for ($i=0; $i < $rels->size(); $i++) {
-            $rel = $rels->get($i);
-            if ($rel->type() != Related::Text)  // we can't handle UID relations yet
-                continue;
-
-            $known = false;
-            $types = $rel->relationTypes();
-            foreach ($typemap as $t => $field) {
-                if ($types & $t) {
-                    $object[$field][] = $rel->text();
-                    $known = true;
-                    break;
-                }
-            }
-
-            if (!$known && $catchall) {
-                $object[$catchall][] = $rel->text();
-            }
-        }
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_distributionlist.php Deleted

@@ -1,125 +0,0 @@
-<?php
-
-/**
- * Kolab Distribution List model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_distributionlist extends kolab_format
-{
-    public $CTYPE = 'application/vcard+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.distribution-list';
-
-    protected $objclass = 'DistList';
-    protected $read_func = 'readDistlist';
-    protected $write_func = 'writeDistlist';
-
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        $this->obj->setName($object['name']);
-
-        $seen = array();
-        $members = new vectorcontactref;
-        foreach ((array)$object['member'] as $i => $member) {
-            if ($member['uid']) {
-                $key = 'uid:' . $member['uid'];
-                $m = new ContactReference(ContactReference::UidReference, $member['uid']);
-            }
-            else if ($member['email']) {
-                $key = 'mailto:' . $member['email'];
-                $m = new ContactReference(ContactReference::EmailReference, $member['email']);
-                $m->setName($member['name']);
-            }
-            else {
-                continue;
-            }
-
-            if (!$seen[$key]++) {
-                $members->push($m);
-            }
-            else {
-                // remove dupes for caching
-                unset($object['member'][$i]);
-            }
-        }
-
-        $this->obj->setMembers($members);
-
-        // set type property for proper caching
-        $object['_type'] = 'distribution-list';
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Distlist object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Distribution list data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        // add object properties
-        $object += array(
-            'name'      => $this->obj->name(),
-            'member'    => array(),
-            '_type'     => 'distribution-list',
-        );
-
-        $members = $this->obj->members();
-        for ($i=0; $i < $members->size(); $i++) {
-            $member = $members->get($i);
-//            if ($member->type() == ContactReference::UidReference && ($uid = $member->uid()))
-                $object['member'][] = array(
-                    'uid'   => $member->uid(),
-                    'email' => $member->email(),
-                    'name'  => $member->name(),
-                );
-        }
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_event.php Deleted

@@ -1,244 +0,0 @@
-<?php
-
-/**
- * Kolab Event model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_event extends kolab_format_xcal
-{
-    public $CTYPEv2 = 'application/x-vnd.kolab.event';
-
-    public $scheduling_properties = array('start', 'end', 'allday', 'location', 'status', 'cancelled');
-
-    protected $objclass = 'Event';
-    protected $read_func = 'readEvent';
-    protected $write_func = 'writeEvent';
-
-    /**
-     * Default constructor
-     */
-    function __construct($data = null, $version = 3.0)
-    {
-        parent::__construct(is_string($data) ? $data : null, $version);
-
-        // got an Event object as argument
-        if (is_object($data) && is_a($data, $this->objclass)) {
-            $this->obj = $data;
-            $this->loaded = true;
-        }
-    }
-
-    /**
-     * Clones into an instance of libcalendaring's extended EventCal class
-     *
-     * @return mixed EventCal object or false on failure
-     */
-    public function to_libcal()
-    {
-        static $error_logged = false;
-
-        if (class_exists('kolabcalendaring')) {
-            return new EventCal($this->obj);
-        }
-        else if (!$error_logged) {
-            $error_logged = true;
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "required kolabcalendaring module not found"
-            ), true);
-        }
-
-        return false;
-    }
-
-    /**
-     * Set event properties to the kolabformat object
-     *
-     * @param array  Event data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common xcal properties
-        parent::set($object);
-
-        // do the hard work of setting object values
-        $this->obj->setStart(self::get_datetime($object['start'], null, $object['allday']));
-        $this->obj->setEnd(self::get_datetime($object['end'], null, $object['allday']));
-        $this->obj->setTransparency($object['free_busy'] == 'free');
-
-        $status = kolabformat::StatusUndefined;
-        if ($object['free_busy'] == 'tentative')
-            $status = kolabformat::StatusTentative;
-        if ($object['cancelled'])
-            $status = kolabformat::StatusCancelled;
-        else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
-            $status = $this->status_map[$object['status']];
-        $this->obj->setStatus($status);
-
-        // save recurrence exceptions
-        if (is_array($object['recurrence']) && $object['recurrence']['EXCEPTIONS']) {
-            $vexceptions = new vectorevent;
-            foreach((array)$object['recurrence']['EXCEPTIONS'] as $i => $exception) {
-                $exevent = new kolab_format_event;
-                $exevent->set(($compacted = $this->compact_exception($exception, $object)));  // only save differing values
-                $exevent->obj->setRecurrenceID(self::get_datetime($exception['start'], null, true), (bool)$exception['thisandfuture']);
-                $vexceptions->push($exevent->obj);
-                // write cleaned-up exception data back to memory/cache
-                $object['recurrence']['EXCEPTIONS'][$i] = $this->expand_exception($compacted, $object);
-            }
-            $this->obj->setExceptions($vexceptions);
-        }
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && (($this->data && !empty($this->data['start']) && !empty($this->data['end'])) ||
-            (is_object($this->obj) && $this->obj->isValid() && $this->obj->uid()));
-    }
-
-    /**
-     * Convert the Event object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Event data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common xcal props
-        $object = parent::to_array($data);
-
-        // read object properties
-        $object += array(
-            'end'         => self::php_datetime($this->obj->end()),
-            'allday'      => $this->obj->start()->isDateOnly(),
-            'free_busy'   => $this->obj->transparency() ? 'free' : 'busy',  // TODO: transparency is only boolean
-            'attendees'   => array(),
-        );
-
-        // derive event end from duration (#1916)
-        if (!$object['end'] && $object['start'] && ($duration = $this->obj->duration()) && $duration->isValid()) {
-            $interval = new DateInterval('PT0S');
-            $interval->d = $duration->weeks() * 7 + $duration->days();
-            $interval->h = $duration->hours();
-            $interval->i = $duration->minutes();
-            $interval->s = $duration->seconds();
-            $object['end'] = clone $object['start'];
-            $object['end']->add($interval);
-        }
-
-        // organizer is part of the attendees list in Roundcube
-        if ($object['organizer']) {
-            $object['organizer']['role'] = 'ORGANIZER';
-            array_unshift($object['attendees'], $object['organizer']);
-        }
-
-        // status defines different event properties...
-        $status = $this->obj->status();
-        if ($status == kolabformat::StatusTentative)
-          $object['free_busy'] = 'tentative';
-        else if ($status == kolabformat::StatusCancelled)
-          $object['cancelled'] = true;
-
-        // this is an exception object
-        if ($this->obj->recurrenceID()->isValid()) {
-            $object['thisandfuture'] = $this->obj->thisAndFuture();
-        }
-        // read exception event objects
-        else if (($exceptions = $this->obj->exceptions()) && is_object($exceptions) && $exceptions->size()) {
-            $recurrence_exceptions = array();
-            for ($i=0; $i < $exceptions->size(); $i++) {
-                if (($exobj = $exceptions->get($i))) {
-                    $exception = new kolab_format_event($exobj);
-                    if ($exception->is_valid()) {
-                        $recurrence_exceptions[] = $this->expand_exception($exception->to_array(), $object);
-                    }
-                }
-            }
-            $object['recurrence']['EXCEPTIONS'] = $recurrence_exceptions;
-        }
-
-        return $this->data = $object;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = parent::get_tags();
-
-        foreach ((array)$this->data['categories'] as $cat) {
-            $tags[] = rcube_utils::normalize_string($cat);
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Remove some attributes from the exception container
-     */
-    private function compact_exception($exception, $master)
-    {
-      $forbidden = array('recurrence','organizer','attendees','sequence');
-
-      foreach ($forbidden as $prop) {
-        if (array_key_exists($prop, $exception)) {
-          unset($exception[$prop]);
-        }
-      }
-
-      foreach ($master as $prop => $value) {
-        if (isset($exception[$prop]) && gettype($exception[$prop]) == gettype($value) && $exception[$prop] == $value) {
-          unset($exception[$prop]);
-        }
-      }
-
-      return $exception;
-    }
-
-    /**
-     * Copy attributes not specified by the exception from the master event
-     */
-    private function expand_exception($exception, $master)
-    {
-      foreach ($master as $prop => $value) {
-        if (empty($exception[$prop]) && !empty($value))
-          $exception[$prop] = $value;
-      }
-
-      return $exception;
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_file.php Deleted

@@ -1,156 +0,0 @@
-<?php
-
-/**
- * Kolab File model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_file extends kolab_format
-{
-    public $CTYPE = 'application/vnd.kolab+xml';
-
-    protected $objclass = 'File';
-    protected $read_func = 'kolabformat::readKolabFile';
-    protected $write_func = 'kolabformat::writeKolabFile';
-
-    protected $sensitivity_map = array(
-        'public'       => kolabformat::ClassPublic,
-        'private'      => kolabformat::ClassPrivate,
-        'confidential' => kolabformat::ClassConfidential,
-    );
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-
-        if (isset($object['notes'])) {
-            $this->obj->setNote($object['notes']);
-        }
-
-        // Add file attachment
-        if (!empty($object['_attachments'])) {
-            $cid         = key($object['_attachments']);
-            $attach_attr = $object['_attachments'][$cid];
-            $attach      = new Attachment;
-
-            $attach->setLabel((string)$attach_attr['name']);
-            $attach->setUri('cid:' . $cid, $attach_attr['mimetype']);
-            $this->obj->setFile($attach);
-
-            // make sure size is set, so object saved in cache contains this info
-            if (!isset($attach_attr['size'])) {
-                $size = 0;
-
-                if (!empty($attach_attr['content'])) {
-                    if (is_resource($attach_attr['content'])) {
-                        $stat = fstat($attach_attr['content']);
-                        $size = $stat ? $stat['size'] : 0;
-                    }
-                    else {
-                        $size = strlen($attach_attr['content']);
-                    }
-                }
-                else if (isset($attach_attr['path'])) {
-                    $size = @filesize($attach_attr['path']);
-                }
-
-                $object['_attachments'][$cid]['size'] = $size;
-            }
-        }
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     * Check if object's data validity
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data)) {
-            return $this->data;
-        }
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $sensitivity_map = array_flip($this->sensitivity_map);
-
-        // read object properties
-        $object += array(
-            'sensitivity' => $sensitivity_map[$this->obj->classification()],
-            'categories'  => self::vector2array($this->obj->categories()),
-            'notes'       => $this->obj->note(),
-        );
-
-        return $this->data = $object;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        foreach ((array)$this->data['categories'] as $cat) {
-            $tags[] = rcube_utils::normalize_string($cat);
-        }
-
-        // Add file mimetype to tags
-        if (!empty($this->data['_attachments'])) {
-            reset($this->data['_attachments']);
-            $key        = key($this->data['_attachments']);
-            $attachment = $this->data['_attachments'][$key];
-
-            if ($attachment['mimetype']) {
-                $tags[] = $attachment['mimetype'];
-            }
-        }
-
-        return $tags;
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_journal.php Deleted

@@ -1,82 +0,0 @@
-<?php
-
-/**
- * Kolab Journal model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_journal extends kolab_format
-{
-    public $CTYPE = 'application/calendar+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.journal';
-
-    protected $objclass = 'Journal';
-    protected $read_func = 'readJournal';
-    protected $write_func = 'writeJournal';
-
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        // TODO: set object propeties
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        // TODO: read object properties
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_note.php Deleted

@@ -1,153 +0,0 @@
-<?php
-
-/**
- * Kolab Note model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_note extends kolab_format
-{
-    public $CTYPE = 'application/vnd.kolab+xml';
-    public $CTYPEv2 = 'application/x-vnd.kolab.note';
-
-    public static $fulltext_cols = array('title', 'description', 'categories');
-
-    protected $objclass = 'Note';
-    protected $read_func = 'readNote';
-    protected $write_func = 'writeNote';
-
-    protected $sensitivity_map = array(
-        'public'       => kolabformat::ClassPublic,
-        'private'      => kolabformat::ClassPrivate,
-        'confidential' => kolabformat::ClassConfidential,
-    );
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common object properties
-        parent::set($object);
-
-        $this->obj->setSummary($object['title']);
-        $this->obj->setDescription($object['description']);
-        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-
-        $this->set_attachments($object);
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common object props into local data object
-        $object = parent::to_array($data);
-
-        $sensitivity_map = array_flip($this->sensitivity_map);
-
-        // read object properties
-        $object += array(
-            'sensitivity' => $sensitivity_map[$this->obj->classification()],
-            'categories'  => self::vector2array($this->obj->categories()),
-            'title'       => $this->obj->summary(),
-            'description' => $this->obj->description(),
-        );
-
-        $this->get_attachments($object);
-
-        return $this->data = $object;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        foreach ((array)$this->data['categories'] as $cat) {
-            $tags[] = rcube_utils::normalize_string($cat);
-        }
-
-        // add tag for message references
-        foreach ((array)$this->data['links'] as $link) {
-            $url = parse_url($link);
-            if ($url['scheme'] == 'imap') {
-                parse_str($url['query'], $param);
-                $tags[] = 'ref:' . trim($param['message-id'] ?: urldecode($url['fragment']), '<> ');
-            }
-        }
-
-        return $tags;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        $data = '';
-        foreach (self::$fulltext_cols as $col) {
-            // convert HTML content to plain text
-            if ($col == 'description' && preg_match('/<(html|body)(\s[a-z]|>)/', $this->data[$col], $m) && strpos($this->data[$col], '</'.$m[1].'>')) {
-                $converter = new rcube_html2text($this->data[$col], false, false, 0);
-                $val = $converter->get_text();
-            }
-            else {
-                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
-            }
-
-            if (strlen($val))
-                $data .= $val . ' ';
-        }
-
-        return array_filter(array_unique(rcube_utils::normalize_string($data, true)));
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_task.php Deleted

@@ -1,129 +0,0 @@
-<?php
-
-/**
- * Kolab Task (ToDo) model class
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_format_task extends kolab_format_xcal
-{
-    public $CTYPEv2 = 'application/x-vnd.kolab.task';
-
-    public $scheduling_properties = array('start', 'due', 'summary', 'status');
-
-    protected $objclass = 'Todo';
-    protected $read_func = 'readTodo';
-    protected $write_func = 'writeTodo';
-
-
-    /**
-     * Set properties to the kolabformat object
-     *
-     * @param array  Object data as hash array
-     */
-    public function set(&$object)
-    {
-        // set common xcal properties
-        parent::set($object);
-
-        $this->obj->setPercentComplete(intval($object['complete']));
-
-        $status = kolabformat::StatusUndefined;
-        if ($object['complete'] == 100 && !array_key_exists('status', $object))
-            $status = kolabformat::StatusCompleted;
-        else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
-            $status = $this->status_map[$object['status']];
-        $this->obj->setStatus($status);
-
-        $this->obj->setStart(self::get_datetime($object['start'], null, $object['start']->_dateonly));
-        $this->obj->setDue(self::get_datetime($object['due'], null, $object['due']->_dateonly));
-
-        $related = new vectors;
-        if (!empty($object['parent_id']))
-            $related->push($object['parent_id']);
-        $this->obj->setRelatedTo($related);
-
-        // cache this data
-        $this->data = $object;
-        unset($this->data['_formatobj']);
-    }
-
-    /**
-     *
-     */
-    public function is_valid()
-    {
-        return !$this->formaterror && ($this->data || (is_object($this->obj) && $this->obj->isValid()));
-    }
-
-    /**
-     * Convert the Configuration object into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Config object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // return cached result
-        if (!empty($this->data))
-            return $this->data;
-
-        // read common xcal props
-        $object = parent::to_array($data);
-
-        $object['complete'] = intval($this->obj->percentComplete());
-
-        // if due date is set
-        if ($due = $this->obj->due())
-            $object['due'] = self::php_datetime($due);
-
-        // related-to points to parent task; we only support one relation
-        $related = self::vector2array($this->obj->relatedTo());
-        if (count($related))
-            $object['parent_id'] = $related[0];
-
-        // TODO: map more properties
-
-        $this->data = $object;
-        return $this->data;
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = parent::get_tags();
-
-        if ($this->data['status'] == 'COMPLETED' || ($this->data['complete'] == 100 && empty($this->data['status'])))
-            $tags[] = 'x-complete';
-
-        if ($this->data['priority'] == 1)
-            $tags[] = 'x-flagged';
-
-        if ($this->data['parent_id'])
-            $tags[] = 'x-parent:' . $this->data['parent_id'];
-
-        return $tags;
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_format_xcal.php Deleted

@@ -1,630 +0,0 @@
-<?php
-
-/**
- * Xcal based Kolab format class wrapping libkolabxml bindings
- *
- * Base class for xcal-based Kolab groupware objects such as event, todo, journal
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-abstract class kolab_format_xcal extends kolab_format
-{
-    public $CTYPE = 'application/calendar+xml';
-
-    public static $fulltext_cols = array('title', 'description', 'location', 'attendees:name', 'attendees:email', 'categories');
-
-    public $scheduling_properties = array('start', 'end', 'location');
-
-    protected $sensitivity_map = array(
-        'public'       => kolabformat::ClassPublic,
-        'private'      => kolabformat::ClassPrivate,
-        'confidential' => kolabformat::ClassConfidential,
-    );
-
-    protected $role_map = array(
-        'REQ-PARTICIPANT' => kolabformat::Required,
-        'OPT-PARTICIPANT' => kolabformat::Optional,
-        'NON-PARTICIPANT' => kolabformat::NonParticipant,
-        'CHAIR' => kolabformat::Chair,
-    );
-
-    protected $cutype_map = array(
-        'INDIVIDUAL' => kolabformat::CutypeIndividual,
-        'GROUP'      => kolabformat::CutypeGroup,
-        'ROOM'       => kolabformat::CutypeRoom,
-        'RESOURCE'   => kolabformat::CutypeResource,
-        'UNKNOWN'    => kolabformat::CutypeUnknown,
-    );
-
-    protected $rrule_type_map = array(
-        'MINUTELY' => RecurrenceRule::Minutely,
-        'HOURLY' => RecurrenceRule::Hourly,
-        'DAILY' => RecurrenceRule::Daily,
-        'WEEKLY' => RecurrenceRule::Weekly,
-        'MONTHLY' => RecurrenceRule::Monthly,
-        'YEARLY' => RecurrenceRule::Yearly,
-    );
-
-    protected $weekday_map = array(
-        'MO' => kolabformat::Monday,
-        'TU' => kolabformat::Tuesday,
-        'WE' => kolabformat::Wednesday,
-        'TH' => kolabformat::Thursday,
-        'FR' => kolabformat::Friday,
-        'SA' => kolabformat::Saturday,
-        'SU' => kolabformat::Sunday,
-    );
-
-    protected $alarm_type_map = array(
-        'DISPLAY' => Alarm::DisplayAlarm,
-        'EMAIL' => Alarm::EMailAlarm,
-        'AUDIO' => Alarm::AudioAlarm,
-    );
-
-    protected $status_map = array(
-        'NEEDS-ACTION' => kolabformat::StatusNeedsAction,
-        'IN-PROCESS'   => kolabformat::StatusInProcess,
-        'COMPLETED'    => kolabformat::StatusCompleted,
-        'CANCELLED'    => kolabformat::StatusCancelled,
-        'TENTATIVE'    => kolabformat::StatusTentative,
-        'CONFIRMED'    => kolabformat::StatusConfirmed,
-        'DRAFT'        => kolabformat::StatusDraft,
-        'FINAL'        => kolabformat::StatusFinal,
-    );
-
-    protected $part_status_map = array(
-        'UNKNOWN' => kolabformat::PartNeedsAction,
-        'NEEDS-ACTION' => kolabformat::PartNeedsAction,
-        'TENTATIVE' => kolabformat::PartTentative,
-        'ACCEPTED' => kolabformat::PartAccepted,
-        'DECLINED' => kolabformat::PartDeclined,
-        'DELEGATED' => kolabformat::PartDelegated,
-      );
-
-
-    /**
-     * Convert common xcard properties into a hash array data structure
-     *
-     * @param array Additional data for merge
-     *
-     * @return array  Object data as hash array
-     */
-    public function to_array($data = array())
-    {
-        // read common object props
-        $object = parent::to_array($data);
-
-        $status_map = array_flip($this->status_map);
-        $sensitivity_map = array_flip($this->sensitivity_map);
-
-        $object += array(
-            'sequence'    => intval($this->obj->sequence()),
-            'title'       => $this->obj->summary(),
-            'location'    => $this->obj->location(),
-            'description' => $this->obj->description(),
-            'url'         => $this->obj->url(),
-            'status'      => $status_map[$this->obj->status()],
-            'sensitivity' => $sensitivity_map[$this->obj->classification()],
-            'priority'    => $this->obj->priority(),
-            'categories'  => self::vector2array($this->obj->categories()),
-            'start'       => self::php_datetime($this->obj->start()),
-        );
-
-        if (method_exists($this->obj, 'comment')) {
-            $object['comment'] = $this->obj->comment();
-        }
-
-        // read organizer and attendees
-        if (($organizer = $this->obj->organizer()) && ($organizer->email() || $organizer->name())) {
-            $object['organizer'] = array(
-                'email' => $organizer->email(),
-                'name' => $organizer->name(),
-            );
-        }
-
-        $role_map = array_flip($this->role_map);
-        $cutype_map = array_flip($this->cutype_map);
-        $part_status_map = array_flip($this->part_status_map);
-        $attvec = $this->obj->attendees();
-        for ($i=0; $i < $attvec->size(); $i++) {
-            $attendee = $attvec->get($i);
-            $cr = $attendee->contact();
-            if ($cr->email() != $object['organizer']['email']) {
-                $delegators = $delegatees = array();
-                $vdelegators = $attendee->delegatedFrom();
-                for ($j=0; $j < $vdelegators->size(); $j++) {
-                    $delegators[] = $vdelegators->get($j)->email();
-                }
-                $vdelegatees = $attendee->delegatedTo();
-                for ($j=0; $j < $vdelegatees->size(); $j++) {
-                    $delegatees[] = $vdelegatees->get($j)->email();
-                }
-
-                $object['attendees'][] = array(
-                    'role' => $role_map[$attendee->role()],
-                    'cutype' => $cutype_map[$attendee->cutype()],
-                    'status' => $part_status_map[$attendee->partStat()],
-                    'rsvp' => $attendee->rsvp(),
-                    'email' => $cr->email(),
-                    'name' => $cr->name(),
-                    'delegated-from' => $delegators,
-                    'delegated-to' => $delegatees,
-                );
-            }
-        }
-
-        // read recurrence rule
-        if (($rr = $this->obj->recurrenceRule()) && $rr->isValid()) {
-            $rrule_type_map = array_flip($this->rrule_type_map);
-            $object['recurrence'] = array('FREQ' => $rrule_type_map[$rr->frequency()]);
-
-            if ($intvl = $rr->interval())
-                $object['recurrence']['INTERVAL'] = $intvl;
-
-            if (($count = $rr->count()) && $count > 0) {
-                $object['recurrence']['COUNT'] = $count;
-            }
-            else if ($until = self::php_datetime($rr->end())) {
-                $until->setTime($object['start']->format('G'), $object['start']->format('i'), 0);
-                $object['recurrence']['UNTIL'] = $until;
-            }
-
-            if (($byday = $rr->byday()) && $byday->size()) {
-                $weekday_map = array_flip($this->weekday_map);
-                $weekdays = array();
-                for ($i=0; $i < $byday->size(); $i++) {
-                    $daypos = $byday->get($i);
-                    $prefix = $daypos->occurence();
-                    $weekdays[] = ($prefix ? $prefix : '') . $weekday_map[$daypos->weekday()];
-                }
-                $object['recurrence']['BYDAY'] = join(',', $weekdays);
-            }
-
-            if (($bymday = $rr->bymonthday()) && $bymday->size()) {
-                $object['recurrence']['BYMONTHDAY'] = join(',', self::vector2array($bymday));
-            }
-
-            if (($bymonth = $rr->bymonth()) && $bymonth->size()) {
-                $object['recurrence']['BYMONTH'] = join(',', self::vector2array($bymonth));
-            }
-
-            if ($exdates = $this->obj->exceptionDates()) {
-                for ($i=0; $i < $exdates->size(); $i++) {
-                    if ($exdate = self::php_datetime($exdates->get($i)))
-                        $object['recurrence']['EXDATE'][] = $exdate;
-                }
-            }
-        }
-
-        if ($rdates = $this->obj->recurrenceDates()) {
-            for ($i=0; $i < $rdates->size(); $i++) {
-                if ($rdate = self::php_datetime($rdates->get($i)))
-                    $object['recurrence']['RDATE'][] = $rdate;
-            }
-        }
-
-        // read alarm
-        $valarms = $this->obj->alarms();
-        $alarm_types = array_flip($this->alarm_type_map);
-        $object['valarms'] = array();
-        for ($i=0; $i < $valarms->size(); $i++) {
-            $alarm = $valarms->get($i);
-            $type = $alarm_types[$alarm->type()];
-
-            if ($type == 'DISPLAY' || $type == 'EMAIL' || $type == 'AUDIO') {  // only some alarms are supported
-                $valarm = array(
-                    'action' => $type,
-                    'summary' => $alarm->summary(),
-                    'description' => $alarm->description(),
-                );
-
-                if ($type == 'EMAIL') {
-                    $valarm['attendees'] = array();
-                    $attvec = $alarm->attendees();
-                    for ($j=0; $j < $attvec->size(); $j++) {
-                        $cr = $attvec->get($j);
-                        $valarm['attendees'][] = $cr->email();
-                    }
-                }
-                else if ($type == 'AUDIO') {
-                    $attach = $alarm->audioFile();
-                    $valarm['uri'] = $attach->uri();
-                }
-
-                if ($start = self::php_datetime($alarm->start())) {
-                    $object['alarms'] = '@' . $start->format('U');
-                    $valarm['trigger'] = $start;
-                }
-                else if ($offset = $alarm->relativeStart()) {
-                    $prefix = $alarm->relativeTo() == kolabformat::End ? '+' : '-';
-                    $value = $time = '';
-                    if      ($w = $offset->weeks())     $value .= $w . 'W';
-                    else if ($d = $offset->days())      $value .= $d . 'D';
-                    else if ($h = $offset->hours())     $time  .= $h . 'H';
-                    else if ($m = $offset->minutes())   $time  .= $m . 'M';
-                    else if ($s = $offset->seconds())   $time  .= $s . 'S';
-
-                    // assume 'at event time'
-                    if (empty($value) && empty($time)) {
-                        $prefix = '';
-                        $time = '0S';
-                    }
-
-                    $object['alarms'] = $prefix . $value . $time;
-                    $valarm['trigger'] = $prefix . 'P' . $value . ($time ? 'T' . $time : '');
-                }
-
-                // read alarm duration and repeat properties
-                if (($duration = $alarm->duration()) && $duration->isValid()) {
-                    $value = $time = '';
-                    if      ($w = $duration->weeks())     $value .= $w . 'W';
-                    else if ($d = $duration->days())      $value .= $d . 'D';
-                    else if ($h = $duration->hours())     $time  .= $h . 'H';
-                    else if ($m = $duration->minutes())   $time  .= $m . 'M';
-                    else if ($s = $duration->seconds())   $time  .= $s . 'S';
-                    $valarm['duration'] = 'P' . $value . ($time ? 'T' . $time : '');
-                    $valarm['repeat'] = $alarm->numrepeat();
-                }
-
-                $object['alarms']  .= ':' . $type;  // legacy property
-                $object['valarms'][] = array_filter($valarm);
-            }
-        }
-
-        $this->get_attachments($object);
-
-        return $object;
-    }
-
-
-    /**
-     * Set common xcal properties to the kolabformat object
-     *
-     * @param array  Event data as hash array
-     */
-    public function set(&$object)
-    {
-        $this->init();
-
-        $is_new = !$this->obj->uid();
-        $old_sequence = $this->obj->sequence();
-        $reschedule = $is_new;
-
-        // set common object properties
-        parent::set($object);
-
-        // set sequence value
-        if (!isset($object['sequence'])) {
-            if ($is_new) {
-                $object['sequence'] = 0;
-            }
-            else {
-                $object['sequence'] = $old_sequence;
-                $old = $this->data['uid'] ? $this->data : $this->to_array();
-
-                // increment sequence when updating properties relevant for scheduling.
-                // RFC 5545: "It is incremented [...] each time the Organizer makes a significant revision to the calendar component."
-                // TODO: make the list of properties considered 'significant' for scheduling configurable
-                foreach ($this->scheduling_properties as $prop) {
-                    $a = $old[$prop];
-                    $b = $object[$prop];
-                    if ($object['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
-                        $a = $a->format('Y-m-d');
-                        $b = $b->format('Y-m-d');
-                    }
-                    if ($a != $b) {
-                        $object['sequence']++;
-                        break;
-                    }
-                }
-            }
-        }
-        $this->obj->setSequence(intval($object['sequence']));
-
-        if ($object['sequence'] > $old_sequence) {
-            $reschedule = true;
-        }
-
-        $this->obj->setSummary($object['title']);
-        $this->obj->setLocation($object['location']);
-        $this->obj->setDescription($object['description']);
-        $this->obj->setPriority($object['priority']);
-        $this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
-        $this->obj->setCategories(self::array2vector($object['categories']));
-        $this->obj->setUrl(strval($object['url']));
-
-        if (method_exists($this->obj, 'setComment')) {
-            $this->obj->setComment($object['comment']);
-        }
-
-        // process event attendees
-        $attendees = new vectorattendee;
-        foreach ((array)$object['attendees'] as $i => $attendee) {
-            if ($attendee['role'] == 'ORGANIZER') {
-                $object['organizer'] = $attendee;
-            }
-            else if ($attendee['email'] != $object['organizer']['email']) {
-                $cr = new ContactReference(ContactReference::EmailReference, $attendee['email']);
-                $cr->setName($attendee['name']);
-
-                // set attendee RSVP if missing
-                if (!isset($attendee['rsvp'])) {
-                    $object['attendees'][$i]['rsvp'] = $attendee['rsvp'] = true;
-                }
-
-                $att = new Attendee;
-                $att->setContact($cr);
-                $att->setPartStat($this->part_status_map[$attendee['status']]);
-                $att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);
-                $att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
-                $att->setRSVP((bool)$attendee['rsvp']);
-
-                if (!empty($attendee['delegated-from'])) {
-                    $vdelegators = new vectorcontactref;
-                    foreach ((array)$attendee['delegated-from'] as $delegator) {
-                        $vdelegators->push(new ContactReference(ContactReference::EmailReference, $delegator));
-                    }
-                    $att->setDelegatedFrom($vdelegators);
-                }
-                if (!empty($attendee['delegated-to'])) {
-                    $vdelegatees = new vectorcontactref;
-                    foreach ((array)$attendee['delegated-to'] as $delegatee) {
-                        $vdelegatees->push(new ContactReference(ContactReference::EmailReference, $delegatee));
-                    }
-                    $att->setDelegatedTo($vdelegatees);
-                }
-
-                if ($att->isValid()) {
-                    $attendees->push($att);
-                }
-                else {
-                    rcube::raise_error(array(
-                        'code' => 600, 'type' => 'php',
-                        'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Invalid event attendee: " . json_encode($attendee),
-                    ), true);
-                }
-            }
-        }
-        $this->obj->setAttendees($attendees);
-
-        if ($object['organizer']) {
-            $organizer = new ContactReference(ContactReference::EmailReference, $object['organizer']['email']);
-            $organizer->setName($object['organizer']['name']);
-            $this->obj->setOrganizer($organizer);
-        }
-
-        // save recurrence rule
-        $rr = new RecurrenceRule;
-        $rr->setFrequency(RecurrenceRule::FreqNone);
-
-        if ($object['recurrence'] && !empty($object['recurrence']['FREQ'])) {
-            $rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);
-
-            if ($object['recurrence']['INTERVAL'])
-                $rr->setInterval(intval($object['recurrence']['INTERVAL']));
-
-            if ($object['recurrence']['BYDAY']) {
-                $byday = new vectordaypos;
-                foreach (explode(',', $object['recurrence']['BYDAY']) as $day) {
-                    $occurrence = 0;
-                    if (preg_match('/^([\d-]+)([A-Z]+)$/', $day, $m)) {
-                        $occurrence = intval($m[1]);
-                        $day = $m[2];
-                    }
-                    if (isset($this->weekday_map[$day]))
-                        $byday->push(new DayPos($occurrence, $this->weekday_map[$day]));
-                }
-                $rr->setByday($byday);
-            }
-
-            if ($object['recurrence']['BYMONTHDAY']) {
-                $bymday = new vectori;
-                foreach (explode(',', $object['recurrence']['BYMONTHDAY']) as $day)
-                    $bymday->push(intval($day));
-                $rr->setBymonthday($bymday);
-            }
-
-            if ($object['recurrence']['BYMONTH']) {
-                $bymonth = new vectori;
-                foreach (explode(',', $object['recurrence']['BYMONTH']) as $month)
-                    $bymonth->push(intval($month));
-                $rr->setBymonth($bymonth);
-            }
-
-            if ($object['recurrence']['COUNT'])
-                $rr->setCount(intval($object['recurrence']['COUNT']));
-            else if ($object['recurrence']['UNTIL'])
-                $rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true));
-
-            if ($rr->isValid()) {
-                // add exception dates (only if recurrence rule is valid)
-                $exdates = new vectordatetime;
-                foreach ((array)$object['recurrence']['EXDATE'] as $exdate)
-                    $exdates->push(self::get_datetime($exdate, null, true));
-                $this->obj->setExceptionDates($exdates);
-            }
-            else {
-                rcube::raise_error(array(
-                    'code' => 600, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Invalid event recurrence rule: " . json_encode($object['recurrence']),
-                ), true);
-            }
-        }
-
-        $this->obj->setRecurrenceRule($rr);
-
-        // save recurrence dates (aka RDATE)
-        if (!empty($object['recurrence']['RDATE'])) {
-            $rdates = new vectordatetime;
-            foreach ((array)$object['recurrence']['RDATE'] as $rdate)
-                $rdates->push(self::get_datetime($rdate, null, true));
-            $this->obj->setRecurrenceDates($rdates);
-        }
-
-        // save alarm
-        $valarms = new vectoralarm;
-        if ($object['valarms']) {
-            foreach ($object['valarms'] as $valarm) {
-                if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
-                    continue;  // skip unknown alarm types
-                }
-
-                if ($valarm['action'] == 'EMAIL') {
-                    $recipients = new vectorcontactref;
-                    foreach (($valarm['attendees'] ?: array($object['_owner'])) as $email) {
-                        $recipients->push(new ContactReference(ContactReference::EmailReference, $email));
-                    }
-                    $alarm = new Alarm(
-                        strval($valarm['summary'] ?: $object['title']),
-                        strval($valarm['description'] ?: $object['description']),
-                        $recipients
-                    );
-                }
-                else if ($valarm['action'] == 'AUDIO') {
-                    $attach = new Attachment;
-                    $attach->setUri($valarm['uri'] ?: 'null', 'unknown');
-                    $alarm = new Alarm($attach);
-                }
-                else {
-                    // action == DISPLAY
-                    $alarm = new Alarm(strval($valarm['summary'] ?: $object['title']));
-                }
-
-                if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTime) {
-                    $alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
-                }
-                else {
-                    try {
-                        $prefix = $valarm['trigger'][0];
-                        $period = new DateInterval(preg_replace('/[^0-9PTWDHMS]/', '', $valarm['trigger']));
-                        $duration = new Duration($period->d, $period->h, $period->i, $period->s, $prefix == '-');
-                    }
-                    catch (Exception $e) {
-                        // skip alarm with invalid trigger values
-                        rcube::raise_error($e, true);
-                        continue;
-                    }
-
-                    $alarm->setRelativeStart($duration, $prefix == '-' ? kolabformat::Start : kolabformat::End);
-                }
-
-                if ($valarm['duration']) {
-                    try {
-                        $d = new DateInterval($valarm['duration']);
-                        $duration = new Duration($d->d, $d->h, $d->i, $d->s);
-                        $alarm->setDuration($duration, intval($valarm['repeat']));
-                    }
-                    catch (Exception $e) {
-                        // ignore
-                    }
-                }
-
-                $valarms->push($alarm);
-            }
-        }
-        // legacy support
-        else if ($object['alarms']) {
-            list($offset, $type) = explode(":", $object['alarms']);
-
-            if ($type == 'EMAIL' && !empty($object['_owner'])) {  // email alarms implicitly go to event owner
-                $recipients = new vectorcontactref;
-                $recipients->push(new ContactReference(ContactReference::EmailReference, $object['_owner']));
-                $alarm = new Alarm($object['title'], strval($object['description']), $recipients);
-            }
-            else {  // default: display alarm
-                $alarm = new Alarm($object['title']);
-            }
-
-            if (preg_match('/^@(\d+)/', $offset, $d)) {
-                $alarm->setStart(self::get_datetime($d[1], new DateTimeZone('UTC')));
-            }
-            else if (preg_match('/^([-+]?)P?T?(\d+)([SMHDW])/', $offset, $d)) {
-                $days = $hours = $minutes = $seconds = 0;
-                switch ($d[3]) {
-                    case 'W': $days  = 7*intval($d[2]); break;
-                    case 'D': $days    = intval($d[2]); break;
-                    case 'H': $hours   = intval($d[2]); break;
-                    case 'M': $minutes = intval($d[2]); break;
-                    case 'S': $seconds = intval($d[2]); break;
-                }
-                $alarm->setRelativeStart(new Duration($days, $hours, $minutes, $seconds, $d[1] == '-'), $d[1] == '-' ? kolabformat::Start : kolabformat::End);
-            }
-
-            $valarms->push($alarm);
-        }
-        $this->obj->setAlarms($valarms);
-
-        $this->set_attachments($object);
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get words to index for fulltext search
-     *
-     * @return array List of words to save in cache
-     */
-    public function get_words()
-    {
-        $data = '';
-        foreach (self::$fulltext_cols as $colname) {
-            list($col, $field) = explode(':', $colname);
-
-            if ($field) {
-                $a = array();
-                foreach ((array)$this->data[$col] as $attr)
-                    $a[] = $attr[$field];
-                $val = join(' ', $a);
-            }
-            else {
-                $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
-            }
-
-            if (strlen($val))
-                $data .= $val . ' ';
-        }
-
-        return array_unique(rcube_utils::normalize_string($data, true));
-    }
-
-    /**
-     * Callback for kolab_storage_cache to get object specific tags to cache
-     *
-     * @return array List of tags to save in cache
-     */
-    public function get_tags()
-    {
-        $tags = array();
-
-        if (!empty($this->data['valarms'])) {
-            $tags[] = 'x-has-alarms';
-        }
-
-        // create tags reflecting participant status
-        if (is_array($this->data['attendees'])) {
-            foreach ($this->data['attendees'] as $attendee) {
-                if (!empty($attendee['email']) && !empty($attendee['status']))
-                    $tags[] = 'x-partstat:' . $attendee['email'] . ':' . strtolower($attendee['status']);
-            }
-        }
-
-        return $tags;
-    }
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage.php Deleted

@@ -1,1571 +0,0 @@
-<?php
-
-/**
- * Kolab storage class providing static methods to access groupware objects on a Kolab server.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012-2014, 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/>.
- */
-
-class kolab_storage
-{
-    const CTYPE_KEY = '/shared/vendor/kolab/folder-type';
-    const CTYPE_KEY_PRIVATE = '/private/vendor/kolab/folder-type';
-    const COLOR_KEY_SHARED  = '/shared/vendor/kolab/color';
-    const COLOR_KEY_PRIVATE = '/private/vendor/kolab/color';
-    const NAME_KEY_SHARED   = '/shared/vendor/kolab/displayname';
-    const NAME_KEY_PRIVATE  = '/private/vendor/kolab/displayname';
-    const UID_KEY_SHARED    = '/shared/vendor/kolab/uniqueid';
-    const UID_KEY_PRIVATE   = '/private/vendor/kolab/uniqueid';
-    const UID_KEY_CYRUS     = '/shared/vendor/cmu/cyrus-imapd/uniqueid';
-
-    const ERROR_IMAP_CONN      = 1;
-    const ERROR_CACHE_DB       = 2;
-    const ERROR_NO_PERMISSION  = 3;
-    const ERROR_INVALID_FOLDER = 4;
-
-    public static $version = '3.0';
-    public static $last_error;
-    public static $encode_ids = false;
-
-    private static $ready = false;
-    private static $with_tempsubs = true;
-    private static $subscriptions;
-    private static $typedata = array();
-    private static $states;
-    private static $config;
-    private static $imap;
-    private static $ldap;
-
-    // Default folder names
-    private static $default_folders = array(
-        'event'         => 'Calendar',
-        'contact'       => 'Contacts',
-        'task'          => 'Tasks',
-        'note'          => 'Notes',
-        'file'          => 'Files',
-        'configuration' => 'Configuration',
-        'journal'       => 'Journal',
-        'mail.inbox'       => 'INBOX',
-        'mail.drafts'      => 'Drafts',
-        'mail.sentitems'   => 'Sent',
-        'mail.wastebasket' => 'Trash',
-        'mail.outbox'      => 'Outbox',
-        'mail.junkemail'   => 'Junk',
-    );
-
-
-    /**
-     * Setup the environment needed by the libs
-     */
-    public static function setup()
-    {
-        if (self::$ready)
-            return true;
-
-        $rcmail = rcube::get_instance();
-        self::$config = $rcmail->config;
-        self::$version = strval($rcmail->config->get('kolab_format_version', self::$version));
-        self::$imap = $rcmail->get_storage();
-        self::$ready = class_exists('kolabformat') &&
-            (self::$imap->get_capability('METADATA') || self::$imap->get_capability('ANNOTATEMORE') || self::$imap->get_capability('ANNOTATEMORE2'));
-
-        if (self::$ready) {
-            // set imap options
-            self::$imap->set_options(array(
-                'skip_deleted' => true,
-                'threading' => false,
-            ));
-        }
-        else if (!class_exists('kolabformat')) {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "required kolabformat module not found"
-            ), true);
-        }
-        else {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "IMAP server doesn't support METADATA or ANNOTATEMORE"
-            ), true);
-        }
-
-        return self::$ready;
-    }
-
-    /**
-     * Initializes LDAP object to resolve Kolab users
-     */
-    public static function ldap()
-    {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
-        self::setup();
-
-        $config = self::$config->get('kolab_users_directory', self::$config->get('kolab_auth_addressbook'));
-
-        if (!is_array($config)) {
-            $ldap_config = (array)self::$config->get('ldap_public');
-            $config = $ldap_config[$config];
-        }
-
-        if (empty($config)) {
-            return null;
-        }
-
-        // overwrite filter option
-        if ($filter = self::$config->get('kolab_users_filter')) {
-            self::$config->set('kolab_auth_filter', $filter);
-        }
-
-        // re-use the LDAP wrapper class from kolab_auth plugin
-        require_once rtrim(RCUBE_PLUGINS_DIR, '/') . '/kolab_auth/kolab_auth_ldap.php';
-
-        self::$ldap = new kolab_auth_ldap($config);
-
-        return self::$ldap;
-    }
-
-    /**
-     * Get a list of storage folders for the given data type
-     *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
-     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
-     *
-     * @return array List of Kolab_Folder objects (folder names in UTF7-IMAP)
-     */
-    public static function get_folders($type, $subscribed = null)
-    {
-        $folders = $folderdata = array();
-
-        if (self::setup()) {
-            foreach ((array)self::list_folders('', '*', $type, $subscribed, $folderdata) as $foldername) {
-                $folders[$foldername] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            }
-        }
-
-        return $folders;
-    }
-
-    /**
-     * Getter for the storage folder for the given type
-     *
-     * @param string Data type to list folders for (contact,distribution-list,event,task,note)
-     * @return object kolab_storage_folder  The folder object
-     */
-    public static function get_default_folder($type)
-    {
-        if (self::setup()) {
-            foreach ((array)self::list_folders('', '*', $type . '.default', false, $folderdata) as $foldername) {
-                return new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Getter for a specific storage folder
-     *
-     * @param string IMAP folder to access (UTF7-IMAP)
-     * @param string Expected folder type
-     *
-     * @return object kolab_storage_folder  The folder object
-     */
-    public static function get_folder($folder, $type = null)
-    {
-        return self::setup() ? new kolab_storage_folder($folder, $type) : null;
-    }
-
-    /**
-     * Getter for a single Kolab object, identified by its UID.
-     * This will search all folders storing objects of the given type.
-     *
-     * @param string Object UID
-     * @param string Object type (contact,event,task,journal,file,note,configuration)
-     * @return array The Kolab object represented as hash array or false if not found
-     */
-    public static function get_object($uid, $type)
-    {
-        self::setup();
-        $folder = null;
-        foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
-            if (!$folder)
-                $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            else
-                $folder->set_folder($foldername, $type, $folderdata[$foldername]);
-
-            if ($object = $folder->get_object($uid, '*'))
-                return $object;
-        }
-
-        return false;
-    }
-
-    /**
-     * Execute cross-folder searches with the given query.
-     *
-     * @param array  Pseudo-SQL query as list of filter parameter triplets
-     * @param string Object type (contact,event,task,journal,file,note,configuration)
-     * @return array List of Kolab data objects (each represented as hash array)
-     * @see kolab_storage_format::select()
-     */
-    public static function select($query, $type)
-    {
-        self::setup();
-        $folder = null;
-        $result = array();
-
-        foreach ((array)self::list_folders('', '*', $type, null, $folderdata) as $foldername) {
-            if (!$folder)
-                $folder = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            else
-                $folder->set_folder($foldername, $type, $folderdata[$foldername]);
-
-            foreach ($folder->select($query, '*') as $object) {
-                $result[] = $object;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns Free-busy server URL
-     */
-    public static function get_freebusy_server()
-    {
-        $url = 'https://' . $_SESSION['imap_host'] . '/freebusy';
-        $url = self::$config->get('kolab_freebusy_server', $url);
-        $url = rcube_utils::resolve_url($url);
-
-        return unslashify($url);
-    }
-
-    /**
-     * Compose an URL to query the free/busy status for the given user
-     */
-    public static function get_freebusy_url($email)
-    {
-        return self::get_freebusy_server() . '/' . $email . '.ifb';
-    }
-
-    /**
-     * Creates folder ID from folder name
-     *
-     * @param string  $folder Folder name (UTF7-IMAP)
-     * @param boolean $enc    Use lossless encoding
-     * @return string Folder ID string
-     */
-    public static function folder_id($folder, $enc = null)
-    {
-        return $enc == true || ($enc === null && self::$encode_ids) ?
-            self::id_encode($folder) :
-            asciiwords(strtr($folder, '/.-', '___'));
-    }
-
-    /**
-     * Encode the given ID to a safe ascii representation
-     *
-     * @param string $id Arbitrary identifier string
-     *
-     * @return string Ascii representation
-     */
-    public static function id_encode($id)
-    {
-        return rtrim(strtr(base64_encode($id), '+/', '-_'), '=');
-    }
-
-    /**
-     * Convert the given identifier back to it's raw value
-     *
-     * @param string $id Ascii identifier
-     * @return string Raw identifier string
-     */
-    public static function id_decode($id)
-    {
-      return base64_decode(str_pad(strtr($id, '-_', '+/'), strlen($id) % 4, '=', STR_PAD_RIGHT));
-    }
-
-    /**
-     * Return the (first) path of the requested IMAP namespace
-     *
-     * @param string  Namespace name (personal, shared, other)
-     * @return string IMAP root path for that namespace
-     */
-    public static function namespace_root($name)
-    {
-        foreach ((array)self::$imap->get_namespace($name) as $paths) {
-            if (strlen($paths[0]) > 1) {
-                return $paths[0];
-            }
-        }
-
-        return '';
-    }
-
-
-    /**
-     * Deletes IMAP folder
-     *
-     * @param string $name Folder name (UTF7-IMAP)
-     *
-     * @return bool True on success, false on failure
-     */
-    public static function folder_delete($name)
-    {
-        // clear cached entries first
-        if ($folder = self::get_folder($name))
-            $folder->cache->purge();
-
-        $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_delete', array('name' => $name));
-
-        $success = self::$imap->delete_folder($name);
-        self::$last_error = self::$imap->get_error_str();
-
-        return $success;
-    }
-
-    /**
-     * Creates IMAP folder
-     *
-     * @param string $name       Folder name (UTF7-IMAP)
-     * @param string $type       Folder type
-     * @param bool   $subscribed Sets folder subscription
-     * @param bool   $active     Sets folder state (client-side subscription)
-     *
-     * @return bool True on success, false on failure
-     */
-    public static function folder_create($name, $type = null, $subscribed = false, $active = false)
-    {
-        self::setup();
-
-        $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_create', array('record' => array(
-            'name' => $name,
-            'subscribe' => $subscribed,
-        )));
-
-        if ($saved = self::$imap->create_folder($name, $subscribed)) {
-            // set metadata for folder type
-            if ($type) {
-                $saved = self::set_folder_type($name, $type);
-
-                // revert if metadata could not be set
-                if (!$saved) {
-                    self::$imap->delete_folder($name);
-                }
-                // activate folder
-                else if ($active) {
-                    self::set_state($name, true);
-                }
-            }
-        }
-
-        if ($saved) {
-            return true;
-        }
-
-        self::$last_error = self::$imap->get_error_str();
-        return false;
-    }
-
-
-    /**
-     * Renames IMAP folder
-     *
-     * @param string $oldname Old folder name (UTF7-IMAP)
-     * @param string $newname New folder name (UTF7-IMAP)
-     *
-     * @return bool True on success, false on failure
-     */
-    public static function folder_rename($oldname, $newname)
-    {
-        self::setup();
-
-        $rcmail = rcube::get_instance();
-        $plugin = $rcmail->plugins->exec_hook('folder_rename', array(
-            'oldname' => $oldname, 'newname' => $newname));
-
-        $oldfolder = self::get_folder($oldname);
-        $active    = self::folder_is_active($oldname);
-        $success   = self::$imap->rename_folder($oldname, $newname);
-        self::$last_error = self::$imap->get_error_str();
-
-        // pass active state to new folder name
-        if ($success && $active) {
-            self::set_state($oldname, false);
-            self::set_state($newname, true);
-        }
-
-        // assign existing cache entries to new resource uri
-        if ($success && $oldfolder) {
-            $oldfolder->cache->rename($newname);
-        }
-
-        return $success;
-    }
-
-
-    /**
-     * Rename or Create a new IMAP folder.
-     *
-     * Does additional checks for permissions and folder name restrictions
-     *
-     * @param array Hash array with folder properties and metadata
-     *  - name:       Folder name
-     *  - oldname:    Old folder name when changed
-     *  - parent:     Parent folder to create the new one in
-     *  - type:       Folder type to create
-     *  - subscribed: Subscribed flag (IMAP subscription)
-     *  - active:     Activation flag (client-side subscription)
-     * @return mixed New folder name or False on failure
-     */
-    public static function folder_update(&$prop)
-    {
-        self::setup();
-
-        $folder    = rcube_charset::convert($prop['name'], RCUBE_CHARSET, 'UTF7-IMAP');
-        $oldfolder = $prop['oldname']; // UTF7
-        $parent    = $prop['parent']; // UTF7
-        $delimiter = self::$imap->get_hierarchy_delimiter();
-
-        if (strlen($oldfolder)) {
-            $options = self::$imap->folder_info($oldfolder);
-        }
-
-        if (!empty($options) && ($options['norename'] || $options['protected'])) {
-        }
-        // sanity checks (from steps/settings/save_folder.inc)
-        else if (!strlen($folder)) {
-            self::$last_error = 'cannotbeempty';
-            return false;
-        }
-        else if (strlen($folder) > 128) {
-            self::$last_error = 'nametoolong';
-            return false;
-        }
-        else {
-            // these characters are problematic e.g. when used in LIST/LSUB
-            foreach (array($delimiter, '%', '*') as $char) {
-                if (strpos($folder, $char) !== false) {
-                    self::$last_error = 'forbiddencharacter';
-                    return false;
-                }
-            }
-        }
-
-        if (!empty($options) && ($options['protected'] || $options['norename'])) {
-            $folder = $oldfolder;
-        }
-        else if (strlen($parent)) {
-            $folder = $parent . $delimiter . $folder;
-        }
-        else {
-            // add namespace prefix (when needed)
-            $folder = self::$imap->mod_folder($folder, 'in');
-        }
-
-        // Check access rights to the parent folder
-        if (strlen($parent) && (!strlen($oldfolder) || $oldfolder != $folder)) {
-            $parent_opts = self::$imap->folder_info($parent);
-            if ($parent_opts['namespace'] != 'personal'
-                && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts['rights'])))
-            ) {
-                self::$last_error = 'No permission to create folder';
-                return false;
-          }
-        }
-
-        // update the folder name
-        if (strlen($oldfolder)) {
-            if ($oldfolder != $folder) {
-                $result = self::folder_rename($oldfolder, $folder);
-          }
-          else
-              $result = true;
-        }
-        // create new folder
-        else {
-            $result = self::folder_create($folder, $prop['type'], $prop['subscribed'], $prop['active']);
-        }
-
-        if ($result) {
-            self::set_folder_props($folder, $prop);
-        }
-
-        return $result ? $folder : false;
-    }
-
-
-    /**
-     * Getter for human-readable name of Kolab object (folder)
-     * See http://wiki.kolab.org/UI-Concepts/Folder-Listing for reference
-     *
-     * @param string $folder    IMAP folder name (UTF7-IMAP)
-     * @param string $folder_ns Will be set to namespace name of the folder
-     *
-     * @return string Name of the folder-object
-     */
-    public static function object_name($folder, &$folder_ns=null)
-    {
-        self::setup();
-
-        // find custom display name in folder METADATA
-        if ($name = self::custom_displayname($folder)) {
-            return $name;
-        }
-
-        $found     = false;
-        $namespace = self::$imap->get_namespace();
-
-        if (!empty($namespace['shared'])) {
-            foreach ($namespace['shared'] as $ns) {
-                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
-                    $prefix = '';
-                    $folder = substr($folder, strlen($ns[0]));
-                    $delim  = $ns[1];
-                    $found  = true;
-                    $folder_ns = 'shared';
-                    break;
-                }
-            }
-        }
-        if (!$found && !empty($namespace['other'])) {
-            foreach ($namespace['other'] as $ns) {
-                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
-                    // remove namespace prefix
-                    $folder = substr($folder, strlen($ns[0]));
-                    $delim  = $ns[1];
-                    // get username
-                    $pos    = strpos($folder, $delim);
-                    if ($pos) {
-                        $prefix = '('.substr($folder, 0, $pos).')';
-                        $folder = substr($folder, $pos+1);
-                    }
-                    else {
-                        $prefix = '('.$folder.')';
-                        $folder = '';
-                    }
-
-                    $found  = true;
-                    $folder_ns = 'other';
-                    break;
-                }
-            }
-        }
-        if (!$found && !empty($namespace['personal'])) {
-            foreach ($namespace['personal'] as $ns) {
-                if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
-                    // remove namespace prefix
-                    $folder = substr($folder, strlen($ns[0]));
-                    $prefix = '';
-                    $delim  = $ns[1];
-                    $found  = true;
-                    break;
-                }
-            }
-        }
-
-        if (empty($delim))
-            $delim = self::$imap->get_hierarchy_delimiter();
-
-        $folder = rcube_charset::convert($folder, 'UTF7-IMAP');
-        $folder = html::quote($folder);
-        $folder = str_replace(html::quote($delim), ' &raquo; ', $folder);
-
-        if ($prefix)
-            $folder = html::quote($prefix) . ($folder !== '' ? ' ' . $folder : '');
-
-        if (!$folder_ns)
-            $folder_ns = 'personal';
-
-        return $folder;
-    }
-
-    /**
-     * Get custom display name (saved in metadata) for the given folder
-     */
-    public static function custom_displayname($folder)
-    {
-      // find custom display name in folder METADATA
-      if (self::$config->get('kolab_custom_display_names', true)) {
-          $metadata = self::$imap->get_metadata($folder, array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
-          if (($name = $metadata[$folder][self::NAME_KEY_PRIVATE]) || ($name = $metadata[$folder][self::NAME_KEY_SHARED])) {
-              return $name;
-          }
-      }
-
-      return false;
-    }
-
-    /**
-     * Helper method to generate a truncated folder name to display.
-     * Note: $origname is a string returned by self::object_name()
-     */
-    public static function folder_displayname($origname, &$names)
-    {
-        $name = $origname;
-
-        // find folder prefix to truncate
-        for ($i = count($names)-1; $i >= 0; $i--) {
-            if (strpos($name, $names[$i] . ' &raquo; ') === 0) {
-                $length = strlen($names[$i] . ' &raquo; ');
-                $prefix = substr($name, 0, $length);
-                $count  = count(explode(' &raquo; ', $prefix));
-                $diff   = 1;
-
-                // check if prefix folder is in other users namespace
-                for ($n = count($names)-1; $n >= 0; $n--) {
-                    if (strpos($prefix, '(' . $names[$n] . ') ') === 0) {
-                        $diff = 0;
-                        break;
-                    }
-                }
-
-                $name = str_repeat('&nbsp;&nbsp;&nbsp;', $count - $diff) . '&raquo; ' . substr($name, $length);
-                break;
-            }
-            // other users namespace and parent folder exists
-            else if (strpos($name, '(' . $names[$i] . ') ') === 0) {
-                $length = strlen('(' . $names[$i] . ') ');
-                $prefix = substr($name, 0, $length);
-                $count  = count(explode(' &raquo; ', $prefix));
-                $name   = str_repeat('&nbsp;&nbsp;&nbsp;', $count) . '&raquo; ' . substr($name, $length);
-                break;
-            }
-        }
-
-        $names[] = $origname;
-
-        return $name;
-    }
-
-
-    /**
-     * Creates a SELECT field with folders list
-     *
-     * @param string $type    Folder type
-     * @param array  $attrs   SELECT field attributes (e.g. name)
-     * @param string $current The name of current folder (to skip it)
-     *
-     * @return html_select SELECT object
-     */
-    public static function folder_selector($type, $attrs, $current = '')
-    {
-        // get all folders of specified type (sorted)
-        $folders = self::get_folders($type, true);
-
-        $delim = self::$imap->get_hierarchy_delimiter();
-        $names = array();
-        $len   = strlen($current);
-
-        if ($len && ($rpos = strrpos($current, $delim))) {
-            $parent = substr($current, 0, $rpos);
-            $p_len  = strlen($parent);
-        }
-
-        // Filter folders list
-        foreach ($folders as $c_folder) {
-            $name = $c_folder->name;
-
-            // skip current folder and it's subfolders
-            if ($len) {
-                if ($name == $current) {
-                    // Make sure parent folder is listed (might be skipped e.g. if it's namespace root)
-                    if ($p_len && !isset($names[$parent])) {
-                        $names[$parent] = self::object_name($parent);
-                    }
-                    continue;
-                }
-                if (strpos($name, $current.$delim) === 0) {
-                    continue;
-                }
-            }
-
-            // always show the parent of current folder
-            if ($p_len && $name == $parent) {
-            }
-            // skip folders where user have no rights to create subfolders
-            else if ($c_folder->get_owner() != $_SESSION['username']) {
-                $rights = $c_folder->get_myrights();
-                if (!preg_match('/[ck]/', $rights)) {
-                    continue;
-                }
-            }
-
-            $names[$name] = self::object_name($name);
-        }
-
-        // Build SELECT field of parent folder
-        $attrs['is_escaped'] = true;
-        $select = new html_select($attrs);
-        $select->add('---', '');
-
-        $listnames = array();
-        foreach (array_keys($names) as $imap_name) {
-            $name = $origname = $names[$imap_name];
-
-            // find folder prefix to truncate
-            for ($i = count($listnames)-1; $i >= 0; $i--) {
-                if (strpos($name, $listnames[$i].' &raquo; ') === 0) {
-                    $length = strlen($listnames[$i].' &raquo; ');
-                    $prefix = substr($name, 0, $length);
-                    $count  = count(explode(' &raquo; ', $prefix));
-                    $name   = str_repeat('&nbsp;&nbsp;', $count-1) . '&raquo; ' . substr($name, $length);
-                    break;
-                }
-            }
-
-            $listnames[] = $origname;
-            $select->add($name, $imap_name);
-        }
-
-        return $select;
-    }
-
-
-    /**
-     * Returns a list of folder names
-     *
-     * @param string  Optional root folder
-     * @param string  Optional name pattern
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
-     * @param array   Will be filled with folder-types data
-     *
-     * @return array List of folders
-     */
-    public static function list_folders($root = '', $mbox = '*', $filter = null, $subscribed = null, &$folderdata = array())
-    {
-        if (!self::setup()) {
-            return null;
-        }
-
-        // use IMAP subscriptions
-        if ($subscribed === null && self::$config->get('kolab_use_subscriptions')) {
-            $subscribed = true;
-        }
-
-        if (!$filter) {
-            // Get ALL folders list, standard way
-            if ($subscribed) {
-                $folders = self::$imap->list_folders_subscribed($root, $mbox);
-                // add temporarily subscribed folders
-                if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                    $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-                }
-            }
-            else {
-                $folders = self::_imap_list_folders($root, $mbox);
-            }
-
-            return $folders;
-        }
-        $prefix = $root . $mbox;
-        $regexp = '/^' . preg_quote($filter, '/') . '(\..+)?$/';
-
-        // get folders types for all folders
-        if (!$subscribed || $prefix == '*' || !self::$config->get('kolab_skip_namespace')) {
-            $folderdata = self::folders_typedata($prefix);
-        }
-        else {
-            // fetch folder types for the effective list of (subscribed) folders when post-filtering
-            $folderdata = array();
-        }
-
-        if (!is_array($folderdata)) {
-            return array();
-        }
-
-        // In some conditions we can skip LIST command (?)
-        if (!$subscribed && $filter != 'mail' && $prefix == '*') {
-            foreach ($folderdata as $folder => $type) {
-                if (!preg_match($regexp, $type)) {
-                    unset($folderdata[$folder]);
-                }
-            }
-
-            return self::$imap->sort_folder_list(array_keys($folderdata), true);
-        }
-
-        // Get folders list
-        if ($subscribed) {
-            $folders = self::$imap->list_folders_subscribed($root, $mbox);
-
-            // add temporarily subscribed folders
-            if (self::$with_tempsubs && is_array($_SESSION['kolab_subscribed_folders'])) {
-                $folders = array_unique(array_merge($folders, $_SESSION['kolab_subscribed_folders']));
-            }
-        }
-        else {
-            $folders = self::_imap_list_folders($root, $mbox);
-        }
-
-        // In case of an error, return empty list (?)
-        if (!is_array($folders)) {
-            return array();
-        }
-
-        // Filter folders list
-        foreach ($folders as $idx => $folder) {
-            // lookup folder type
-            if (!array_key_exists($folder, $folderdata)) {
-                $folderdata[$folder] = self::folder_type($folder);
-            }
-
-            $type = $folderdata[$folder];
-
-            if ($filter == 'mail' && empty($type)) {
-                continue;
-            }
-            if (empty($type) || !preg_match($regexp, $type)) {
-                unset($folders[$idx]);
-            }
-        }
-
-        return $folders;
-    }
-
-    /**
-     * Wrapper for rcube_imap::list_folders() with optional post-filtering
-     */
-    protected static function _imap_list_folders($root, $mbox)
-    {
-        $postfilter = null;
-
-        // compose a post-filter expression for the excluded namespaces
-        if ($root . $mbox == '*' && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
-            $excludes = array();
-            foreach ((array)$skip_ns as $ns) {
-                if ($ns_root = self::namespace_root($ns)) {
-                    $excludes[] = $ns_root;
-                }
-            }
-
-            if (count($excludes)) {
-                $postfilter = '!^(' . join(')|(', array_map('preg_quote', $excludes)) . ')!';
-            }
-        }
-
-        // use normal LIST command to return all folders, it's fast enough
-        $folders = self::$imap->list_folders($root, $mbox, null, null, !empty($postfilter));
-
-        if (!empty($postfilter)) {
-            $folders = array_filter($folders, function($folder) use ($postfilter) { return !preg_match($postfilter, $folder); });
-            $folders = self::$imap->sort_folder_list($folders);
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Search for shared or otherwise not listed groupware folders the user has access
-     *
-     * @param string Folder type of folders to search for
-     * @param string Search string
-     * @param array  Namespace(s) to exclude results from
-     *
-     * @return array List of matching kolab_storage_folder objects
-     */
-    public static function search_folders($type, $query, $exclude_ns = array())
-    {
-        if (!self::setup()) {
-            return array();
-        }
-
-        $folders = array();
-        $query = str_replace('*', '', $query);
-
-        // find unsubscribed IMAP folders of the given type
-        foreach ((array)self::list_folders('', '*', $type, false, $folderdata) as $foldername) {
-            // FIXME: only consider the last part of the folder path for searching?
-            $realname = strtolower(rcube_charset::convert($foldername, 'UTF7-IMAP'));
-            if (($query == '' || strpos($realname, $query) !== false) &&
-                !self::folder_is_subscribed($foldername, true) &&
-                !in_array(self::$imap->folder_namespace($foldername), (array)$exclude_ns)
-              ) {
-                $folders[] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-            }
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Sort the given list of kolab folders by namespace/name
-     *
-     * @param array List of kolab_storage_folder objects
-     * @return array Sorted list of folders
-     */
-    public static function sort_folders($folders)
-    {
-        $pad     = '  ';
-        $out     = array();
-        $nsnames = array('personal' => array(), 'shared' => array(), 'other' => array());
-
-        foreach ($folders as $folder) {
-            $folders[$folder->name] = $folder;
-            $ns = $folder->get_namespace();
-            $nsnames[$ns][$folder->name] = strtolower(html_entity_decode(self::object_name($folder->name, $ns), ENT_COMPAT, RCUBE_CHARSET)) . $pad;  // decode &raquo;
-        }
-
-        // $folders is a result of get_folders() we can assume folders were already sorted
-        foreach (array_keys($nsnames) as $ns) {
-            asort($nsnames[$ns], SORT_LOCALE_STRING);
-            foreach (array_keys($nsnames[$ns]) as $utf7name) {
-                $out[] = $folders[$utf7name];
-            }
-        }
-
-        return $out;
-    }
-
-
-    /**
-     * Check the folder tree and add the missing parents as virtual folders
-     *
-     * @param array $folders Folders list
-     * @param object $tree   Reference to the root node of the folder tree
-     *
-     * @return array Flat folders list
-     */
-    public static function folder_hierarchy($folders, &$tree = null)
-    {
-        $_folders = array();
-        $delim    = self::$imap->get_hierarchy_delimiter();
-        $other_ns = rtrim(self::namespace_root('other'), $delim);
-        $tree     = new kolab_storage_folder_virtual('', '<root>', '');  // create tree root
-        $refs     = array('' => $tree);
-
-        foreach ($folders as $idx => $folder) {
-            $path = explode($delim, $folder->name);
-            array_pop($path);
-            $folder->parent = join($delim, $path);
-            $folder->children = array();  // reset list
-
-            // skip top folders or ones with a custom displayname
-            if (count($path) < 1 || kolab_storage::custom_displayname($folder->name)) {
-                $tree->children[] = $folder;
-            }
-            else {
-                $parents = array();
-                $depth = $folder->get_namespace() == 'personal' ? 1 : 2;
-
-                while (count($path) >= $depth && ($parent = join($delim, $path))) {
-                    array_pop($path);
-                    $parent_parent = join($delim, $path);
-                    if (!$refs[$parent]) {
-                        if ($folder->type && self::folder_type($parent) == $folder->type) {
-                            $refs[$parent] = new kolab_storage_folder($parent, $folder->type, $folder->type);
-                            $refs[$parent]->parent = $parent_parent;
-                        }
-                        else if ($parent_parent == $other_ns) {
-                            $refs[$parent] = new kolab_storage_folder_user($parent, $parent_parent);
-                        }
-                        else {
-                            $name = kolab_storage::object_name($parent, $folder->get_namespace());
-                            $refs[$parent] = new kolab_storage_folder_virtual($parent, $name, $folder->get_namespace(), $parent_parent);
-                        }
-                        $parents[] = $refs[$parent];
-                    }
-                }
-
-                if (!empty($parents)) {
-                    $parents = array_reverse($parents);
-                    foreach ($parents as $parent) {
-                        $parent_node = $refs[$parent->parent] ?: $tree;
-                        $parent_node->children[] = $parent;
-                        $_folders[] = $parent;
-                    }
-                }
-
-                $parent_node = $refs[$folder->parent] ?: $tree;
-                $parent_node->children[] = $folder;
-            }
-
-            $refs[$folder->name] = $folder;
-            $_folders[] = $folder;
-            unset($folders[$idx]);
-        }
-
-        return $_folders;
-    }
-
-
-    /**
-     * Returns folder types indexed by folder name
-     *
-     * @param string $prefix Folder prefix (Default '*' for all folders)
-     *
-     * @return array|bool List of folders, False on failure
-     */
-    public static function folders_typedata($prefix = '*')
-    {
-        if (!self::setup()) {
-            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
-        if (($prefix == '*' || $prefix == '') && ($skip_ns = self::$config->get('kolab_skip_namespace'))) {
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $folderdata = $blacklist = array();
-            foreach ((array)$skip_ns as $ns) {
-                if ($ns_root = rtrim(self::namespace_root($ns), $delimiter)) {
-                    $blacklist[] = $ns_root;
-                }
-            }
-            foreach (array('personal','other','shared') as $ns) {
-                if (!in_array($ns, (array)$skip_ns)) {
-                    $ns_root = rtrim(self::namespace_root($ns), $delimiter);
-
-                    // list top-level folders and their childs one by one
-                    // GETMETADATA "%" doesn't list shared or other namespace folders but "*" would
-                    if ($ns_root == '') {
-                        foreach ((array)self::$imap->get_metadata('%', $type_keys) as $folder => $metadata) {
-                            if (!in_array($folder, $blacklist)) {
-                                $folderdata[$folder] = $metadata;
-                                $opts = self::$imap->folder_attributes($folder);
-                                if (!in_array('\\HasNoChildren', $opts) && ($data = self::$imap->get_metadata($folder.$delimiter.'*', $type_keys))) {
-                                    $folderdata += $data;
-                                }
-                            }
-                        }
-                    }
-                    else if ($data = self::$imap->get_metadata($ns_root.$delimiter.'*', $type_keys)) {
-                        $folderdata += $data;
-                    }
-                }
-            }
-        }
-        else {
-            $folderdata = self::$imap->get_metadata($prefix, $type_keys);
-        }
-
-        if (!is_array($folderdata)) {
-            return false;
-        }
-
-        // keep list in memory
-        self::$typedata[$prefix] = array_map(array('kolab_storage', 'folder_select_metadata'), $folderdata);
-
-        return self::$typedata[$prefix];
-    }
-
-
-    /**
-     * Callback for array_map to select the correct annotation value
-     */
-    public static function folder_select_metadata($types)
-    {
-        if (!empty($types[self::CTYPE_KEY_PRIVATE])) {
-            return $types[self::CTYPE_KEY_PRIVATE];
-        }
-        else if (!empty($types[self::CTYPE_KEY])) {
-            list($ctype, ) = explode('.', $types[self::CTYPE_KEY]);
-            return $ctype;
-        }
-        return null;
-    }
-
-
-    /**
-     * Returns type of IMAP folder
-     *
-     * @param string $folder Folder name (UTF7-IMAP)
-     *
-     * @return string Folder type
-     */
-    public static function folder_type($folder)
-    {
-        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)) {
-            return null;
-        }
-
-        if (!empty($metadata[$folder])) {
-            return self::folder_select_metadata($metadata[$folder]);
-        }
-
-        return 'mail';
-    }
-
-
-    /**
-     * Sets folder content-type.
-     *
-     * @param string $folder Folder name
-     * @param string $type   Content type
-     *
-     * @return boolean True on success
-     */
-    public static function set_folder_type($folder, $type='mail')
-    {
-        self::setup();
-
-        list($ctype, $subtype) = explode('.', $type);
-
-        $success = self::$imap->set_metadata($folder, array(self::CTYPE_KEY => $ctype, self::CTYPE_KEY_PRIVATE => $subtype ? $type : null));
-
-        if (!$success)  // fallback: only set private annotation
-            $success |= self::$imap->set_metadata($folder, array(self::CTYPE_KEY_PRIVATE => $type));
-
-        return $success;
-    }
-
-
-    /**
-     * Check subscription status of this folder
-     *
-     * @param string $folder Folder name
-     * @param boolean $temp  Include temporary/session subscriptions
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public static function folder_is_subscribed($folder, $temp = false)
-    {
-        if (self::$subscriptions === null) {
-            self::setup();
-            self::$with_tempsubs = false;
-            self::$subscriptions = self::$imap->list_folders_subscribed();
-            self::$with_tempsubs = true;
-        }
-
-        return in_array($folder, self::$subscriptions) ||
-            ($temp && in_array($folder, (array)$_SESSION['kolab_subscribed_folders']));
-    }
-
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param string $folder Folder name
-     * @param boolean $temp  Only subscribe temporarily for the current session
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_subscribe($folder, $temp = false)
-    {
-        self::setup();
-
-        // temporary/session subscription
-        if ($temp) {
-            if (self::folder_is_subscribed($folder)) {
-                return true;
-            }
-            else if (!is_array($_SESSION['kolab_subscribed_folders']) || !in_array($folder, $_SESSION['kolab_subscribed_folders'])) {
-                $_SESSION['kolab_subscribed_folders'][] = $folder;
-                return true;
-            }
-        }
-        else if (self::$imap->subscribe($folder)) {
-            self::$subscriptions = null;
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param string $folder Folder name
-     * @param boolean $temp  Only remove temporary subscription
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_unsubscribe($folder, $temp = false)
-    {
-        self::setup();
-
-        // temporary/session subscription
-        if ($temp) {
-            if (is_array($_SESSION['kolab_subscribed_folders']) && ($i = array_search($folder, $_SESSION['kolab_subscribed_folders'])) !== false) {
-                unset($_SESSION['kolab_subscribed_folders'][$i]);
-            }
-            return true;
-        }
-        else if (self::$imap->unsubscribe($folder)) {
-            self::$subscriptions = null;
-            return true;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Check activation status of this folder
-     *
-     * @param string $folder Folder name
-     *
-     * @return boolean True if active, false if not
-     */
-    public static function folder_is_active($folder)
-    {
-        $active_folders = self::get_states();
-
-        return in_array($folder, $active_folders);
-    }
-
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param string $folder Folder name
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_activate($folder)
-    {
-        // activation implies temporary subscription
-        self::folder_subscribe($folder, true);
-        return self::set_state($folder, true);
-    }
-
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param string $folder Folder name
-     *
-     * @return True on success, false on error
-     */
-    public static function folder_deactivate($folder)
-    {
-        // remove from temp subscriptions, really?
-        self::folder_unsubscribe($folder, true);
-
-        return self::set_state($folder, false);
-    }
-
-
-    /**
-     * Return list of active folders
-     */
-    private static function get_states()
-    {
-        if (self::$states !== null) {
-            return self::$states;
-        }
-
-        $rcube   = rcube::get_instance();
-        $folders = $rcube->config->get('kolab_active_folders');
-
-        if ($folders !== null) {
-            self::$states = !empty($folders) ? explode('**', $folders) : array();
-        }
-        // for backward-compatibility copy server-side subscriptions to activation states
-        else {
-            self::setup();
-            if (self::$subscriptions === null) {
-                self::$with_tempsubs = false;
-                self::$subscriptions = self::$imap->list_folders_subscribed();
-                self::$with_tempsubs = true;
-            }
-            self::$states = self::$subscriptions;
-            $folders = implode(self::$states, '**');
-            $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
-        }
-
-        return self::$states;
-    }
-
-
-    /**
-     * Update list of active folders
-     */
-    private static function set_state($folder, $state)
-    {
-        self::get_states();
-
-        // update in-memory list
-        $idx = array_search($folder, self::$states);
-        if ($state && $idx === false) {
-            self::$states[] = $folder;
-        }
-        else if (!$state && $idx !== false) {
-            unset(self::$states[$idx]);
-        }
-
-        // update user preferences
-        $folders = implode(self::$states, '**');
-        $rcube   = rcube::get_instance();
-        return $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
-    }
-
-    /**
-     * Creates default folder of specified type
-     * To be run when none of subscribed folders (of specified type) is found
-     *
-     * @param string $type  Folder type
-     * @param string $props Folder properties (color, etc)
-     *
-     * @return string Folder name
-     */
-    public static function create_default_folder($type, $props = array())
-    {
-        if (!self::setup()) {
-            return;
-        }
-
-        $folders = self::$imap->get_metadata('*', array(kolab_storage::CTYPE_KEY_PRIVATE));
-
-        // from kolab_folders config
-        $folder_type  = strpos($type, '.') ? str_replace('.', '_', $type) : $type . '_default';
-        $default_name = self::$config->get('kolab_folders_' . $folder_type);
-        $folder_type  = str_replace('_', '.', $folder_type);
-
-        // check if we have any folder in personal namespace
-        // folder(s) may exist but not subscribed
-        foreach ((array)$folders as $f => $data) {
-            if (strpos($data[self::CTYPE_KEY_PRIVATE], $type) === 0) {
-                $folder = $f;
-                break;
-            }
-        }
-
-        if (!$folder) {
-            if (!$default_name) {
-                $default_name = self::$default_folders[$type];
-            }
-
-            if (!$default_name) {
-                return;
-            }
-
-            $folder = rcube_charset::convert($default_name, RCUBE_CHARSET, 'UTF7-IMAP');
-            $prefix = self::$imap->get_namespace('prefix');
-
-            // add personal namespace prefix if needed
-            if ($prefix && strpos($folder, $prefix) !== 0 && $folder != 'INBOX') {
-                $folder = $prefix . $folder;
-            }
-
-            if (!self::$imap->folder_exists($folder)) {
-                if (!self::$imap->create_folder($folder)) {
-                    return;
-                }
-            }
-
-            self::set_folder_type($folder, $folder_type);
-        }
-
-        self::folder_subscribe($folder);
-
-        if ($props['active']) {
-            self::set_state($folder, true);
-        }
-
-        if (!empty($props)) {
-            self::set_folder_props($folder, $props);
-        }
-
-        return $folder;
-    }
-
-    /**
-     * Sets folder metadata properties
-     *
-     * @param string $folder Folder name
-     * @param array  $prop   Folder properties
-     */
-    public static function set_folder_props($folder, &$prop)
-    {
-        if (!self::setup()) {
-            return;
-        }
-
-        // TODO: also save 'showalarams' and other properties here
-        $ns        = self::$imap->folder_namespace($folder);
-        $supported = array(
-            'color'       => array(self::COLOR_KEY_SHARED, self::COLOR_KEY_PRIVATE),
-            'displayname' => array(self::NAME_KEY_SHARED, self::NAME_KEY_PRIVATE),
-        );
-
-        foreach ($supported as $key => $metakeys) {
-            if (array_key_exists($key, $prop)) {
-                $meta_saved = false;
-                if ($ns == 'personal')  // save in shared namespace for personal folders
-                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys[0] => $prop[$key]));
-                if (!$meta_saved)    // try in private namespace
-                    $meta_saved = self::$imap->set_metadata($folder, array($metakeys[1] => $prop[$key]));
-                if ($meta_saved)
-                    unset($prop[$key]);  // unsetting will prevent fallback to local user prefs
-            }
-        }
-    }
-
-
-    /**
-     *
-     * @param mixed   $query    Search value (or array of field => value pairs)
-     * @param int     $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
-     * @param array   $required List of fields that shall ot be empty
-     * @param int     $limit    Maximum number of records
-     * @param int     $count    Returns the number of records found
-     *
-     * @return array List or false on error
-     */
-    public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
-    {
-        $query = str_replace('*', '', $query);
-
-        // requires a working LDAP setup
-        if (!self::ldap() || strlen($query) == 0) {
-            return array();
-        }
-
-        // search users using the configured attributes
-        $results = self::$ldap->dosearch(self::$config->get('kolab_users_search_attrib', array('cn','mail','alias')), $query, $mode, $required, $limit, $count);
-
-        // exclude myself
-        if ($_SESSION['kolab_dn']) {
-            unset($results[$_SESSION['kolab_dn']]);
-        }
-
-        // resolve to IMAP folder name
-        $root = self::namespace_root('other');
-        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
-
-        array_walk($results, function(&$user, $dn) use ($root, $user_attrib) {
-            list($localpart, ) = explode('@', $user[$user_attrib]);
-            $user['kolabtargetfolder'] = $root . $localpart;
-        });
-
-        return $results;
-    }
-
-
-    /**
-     * Returns a list of IMAP folders shared by the given user
-     *
-     * @param array   User entry from LDAP
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Return subscribed folders only (null to use configured subscription mode)
-     * @param array   Will be filled with folder-types data
-     *
-     * @return array List of folders
-     */
-    public static function list_user_folders($user, $type, $subscribed = null, &$folderdata = array())
-    {
-        self::setup();
-
-        $folders = array();
-
-        // use localpart of user attribute as root for folder listing
-        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
-        if (!empty($user[$user_attrib])) {
-            list($mbox) = explode('@', $user[$user_attrib]);
-
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $other_ns = self::namespace_root('other');
-            $folders = self::list_folders($other_ns . $mbox . $delimiter, '*', $type, $subscribed, $folderdata);
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Get a list of (virtual) top-level folders from the other users namespace
-     *
-     * @param string  Data type to list folders for (contact,event,task,journal,file,note,mail,configuration)
-     * @param boolean Enable to return subscribed folders only (null to use configured subscription mode)
-     *
-     * @return array List of kolab_storage_folder_user objects
-     */
-    public static function get_user_folders($type, $subscribed)
-    {
-        $folders = $folderdata = array();
-
-        if (self::setup()) {
-            $delimiter = self::$imap->get_hierarchy_delimiter();
-            $other_ns = rtrim(self::namespace_root('other'), $delimiter);
-            $path_len = count(explode($delimiter, $other_ns));
-
-            foreach ((array)self::list_folders($other_ns . $delimiter, '*', '', $subscribed) as $foldername) {
-                if ($foldername == 'INBOX')  // skip INBOX which is added by default
-                    continue;
-
-                $path = explode($delimiter, $foldername);
-
-                // compare folder type if a subfolder is listed
-                if ($type && count($path) > $path_len + 1 && $type != self::folder_type($foldername)) {
-                    continue;
-                }
-
-                // truncate folder path to top-level folders of the 'other' namespace
-                $foldername = join($delimiter, array_slice($path, 0, $path_len + 1));
-
-                if (!$folders[$foldername]) {
-                    $folders[$foldername] = new kolab_storage_folder_user($foldername, $other_ns);
-                }
-            }
-
-            // for every (subscribed) user folder, list all (unsubscribed) subfolders
-            foreach ($folders as $userfolder) {
-                foreach ((array)self::list_folders($userfolder->name . $delimiter, '*', $type, false, $folderdata) as $foldername) {
-                    if (!$folders[$foldername]) {
-                        $folders[$foldername] = new kolab_storage_folder($foldername, $type, $folderdata[$foldername]);
-                        $userfolder->children[] = $folders[$foldername];
-                    }
-                }
-            }
-        }
-
-        return $folders;
-    }
-
-
-    /**
-     * Handler for user_delete plugin hooks
-     *
-     * Remove all cache data from the local database related to the given user.
-     */
-    public static function delete_user_folders($args)
-    {
-        $db = rcmail::get_instance()->get_dbh();
-        $prefix = 'imap://' . urlencode($args['username']) . '@' . $args['host'] . '/%';
-        $db->query("DELETE FROM " . $db->table_name('kolab_folders', true) . " WHERE `resource` LIKE ?", $prefix);
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache.php Deleted

@@ -1,1135 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012-2013, 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/>.
- */
-
-class kolab_storage_cache
-{
-    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
-
-    public $sync_complete = false;
-
-    protected $db;
-    protected $imap;
-    protected $folder;
-    protected $uid2msg;
-    protected $objects;
-    protected $metadata = array();
-    protected $folder_id;
-    protected $resource_uri;
-    protected $enabled = true;
-    protected $synched = false;
-    protected $synclock = false;
-    protected $ready = false;
-    protected $cache_table;
-    protected $folders_table;
-    protected $max_sql_packet;
-    protected $max_sync_lock_time = 600;
-    protected $binary_items = array();
-    protected $extra_cols = array();
-    protected $order_by = null;
-    protected $limit = null;
-    protected $error = 0;
-
-
-    /**
-     * Factory constructor
-     */
-    public static function factory(kolab_storage_folder $storage_folder)
-    {
-        $subclass = 'kolab_storage_cache_' . $storage_folder->type;
-        if (class_exists($subclass)) {
-            return new $subclass($storage_folder);
-        }
-        else {
-            rcube::raise_error(array(
-                'code' => 900,
-                'type' => 'php',
-                'message' => "No kolab_storage_cache class found for folder '$storage_folder->name' of type '$storage_folder->type'"
-            ), true);
-
-            return new kolab_storage_cache($storage_folder);
-        }
-    }
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct(kolab_storage_folder $storage_folder = null)
-    {
-        $rcmail = rcube::get_instance();
-        $this->db = $rcmail->get_dbh();
-        $this->imap = $rcmail->get_storage();
-        $this->enabled = $rcmail->config->get('kolab_cache', false);
-        $this->folders_table = $this->db->table_name('kolab_folders');
-
-        if ($this->enabled) {
-            // always read folder cache and lock state from DB master
-            $this->db->set_table_dsn('kolab_folders', 'w');
-            // remove sync-lock on script termination
-            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
-        }
-
-        if ($storage_folder)
-            $this->set_folder($storage_folder);
-    }
-
-    /**
-     * Direct access to cache by folder_id
-     * (only for internal use)
-     */
-    public function select_by_id($folder_id)
-    {
-        $sql_arr = $this->db->fetch_assoc($this->db->query("SELECT * FROM `{$this->folders_table}` WHERE `folder_id` = ?", $folder_id));
-        if ($sql_arr) {
-            $this->metadata = $sql_arr;
-            $this->folder_id = $sql_arr['folder_id'];
-            $this->folder = new StdClass;
-            $this->folder->type = $sql_arr['type'];
-            $this->resource_uri = $sql_arr['resource'];
-            $this->cache_table = $this->db->table_name('kolab_cache_' . $sql_arr['type']);
-            $this->ready = true;
-        }
-    }
-
-    /**
-     * Connect cache with a storage folder
-     *
-     * @param kolab_storage_folder The storage folder instance to connect with
-     */
-    public function set_folder(kolab_storage_folder $storage_folder)
-    {
-        $this->folder = $storage_folder;
-
-        if (empty($this->folder->name) || !$this->folder->valid) {
-            $this->ready = false;
-            return;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = $this->folder->get_resource_uri();
-        $this->cache_table = $this->db->table_name('kolab_cache_' . $this->folder->type);
-        $this->ready = $this->enabled && !empty($this->folder->type);
-        $this->folder_id = null;
-    }
-
-    /**
-     * Returns true if this cache supports query by type
-     */
-    public function has_type_col()
-    {
-        return in_array('type', $this->extra_cols);
-    }
-
-    /**
-     * Getter for the numeric ID used in cache tables
-     */
-    public function get_folder_id()
-    {
-        $this->_read_folder_data();
-        return $this->folder_id;
-    }
-
-    /**
-     * Returns code of last error
-     *
-     * @return int Error code
-     */
-    public function get_error()
-    {
-        return $this->error;
-    }
-
-    /**
-     * Synchronize local cache data with remote
-     */
-    public function synchronize()
-    {
-        // only sync once per request cycle
-        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->folder_sync($this->folder->name);
-        }
-        else {
-            // read cached folder metadata
-            $this->_read_folder_data();
-
-            // check cache status hash first ($this->metadata is set in _read_folder_data())
-            if ($this->metadata['ctag'] != $this->folder->get_ctag()) {
-                // lock synchronization for this folder or wait if locked
-                $this->_sync_lock();
-
-                // disable messages cache if configured to do so
-                $this->bypass(true);
-
-                // synchronize IMAP mailbox cache
-                $this->imap->folder_sync($this->folder->name);
-
-                // compare IMAP index with object cache index
-                $imap_index = $this->imap->index($this->folder->name, null, null, true, true);
-
-                // determine objects to fetch or to invalidate
-                if (!$imap_index->is_error()) {
-                    $imap_index = $imap_index->get();
-
-                    // read cache index
-                    $sql_result = $this->db->query(
-                        "SELECT `msguid`, `uid` FROM `{$this->cache_table}` WHERE `folder_id` = ?",
-                        $this->folder_id
-                    );
-
-                    $old_index = array();
-                    while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                        $old_index[] = $sql_arr['msguid'];
-                    }
-
-                    // fetch new objects from imap
-                    $i = 0;
-                    foreach (array_diff($imap_index, $old_index) as $msguid) {
-                        if ($object = $this->folder->read_object($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);
-
-                    // delete invalid entries from local DB
-                    $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
-                        );
-                    }
-
-                    // update ctag value (will be written to database in _sync_unlock())
-                    if ($this->sync_complete) {
-                        $this->metadata['ctag'] = $this->folder->get_ctag();
-                    }
-                }
-
-                $this->bypass(false);
-
-                // remove lock
-                $this->_sync_unlock();
-            }
-        }
-
-        $this->check_error();
-        $this->synched = time();
-    }
-
-
-    /**
-     * Read a single entry from cache or from IMAP directly
-     *
-     * @param string Related IMAP message UID
-     * @param string Object type to read
-     * @param string IMAP folder name the entry relates to
-     * @param array  Hash array with object properties or null if not found
-     */
-    public function get($msguid, $type = null, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            $success = false;
-            if ($targetfolder = kolab_storage::get_folder($foldername)) {
-                $success = $targetfolder->cache->get($msguid, $type);
-                $this->error = $targetfolder->cache->get_error();
-            }
-            return $success;
-        }
-
-        // load object if not in memory
-        if (!isset($this->objects[$msguid])) {
-            if ($this->ready) {
-                $this->_read_folder_data();
-
-                $sql_result = $this->db->query(
-                    "SELECT * FROM `{$this->cache_table}` ".
-                    "WHERE `folder_id` = ? AND `msguid` = ?",
-                    $this->folder_id,
-                    $msguid
-                );
-
-                if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                    $this->objects = array($msguid => $this->_unserialize($sql_arr));  // store only this object in memory (#2827)
-                }
-            }
-
-            // fetch from IMAP if not present in cache
-            if (empty($this->objects[$msguid])) {
-                if ($object = $this->folder->read_object($msguid, $type ?: '*', $foldername)) {
-                    $this->objects = array($msguid => $object);
-                    $this->set($msguid, $object);
-                }
-            }
-        }
-
-        $this->check_error();
-        return $this->objects[$msguid];
-    }
-
-
-    /**
-     * Insert/Update a cache entry
-     *
-     * @param string Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string IMAP folder name the entry relates to
-     */
-    public function set($msguid, $object, $foldername = null)
-    {
-        if (!$msguid) {
-            return;
-        }
-
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-          if ($targetfolder = kolab_storage::get_folder($foldername)) {
-              $targetfolder->cache->set($msguid, $object);
-              $this->error = $targetfolder->cache->get_error();
-          }
-          return;
-        }
-
-        // remove old entry
-        if ($this->ready) {
-            $this->_read_folder_data();
-            $this->db->query("DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ? AND `msguid` = ?",
-                $this->folder_id, $msguid);
-        }
-
-        if ($object) {
-            // insert new object data...
-            $this->save($msguid, $object);
-        }
-        else {
-            // ...or set in-memory cache to false
-            $this->objects[$msguid] = $object;
-        }
-
-        $this->check_error();
-    }
-
-
-    /**
-     * Insert (or update) a cache entry
-     *
-     * @param int    Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param int    Optional old message UID (for update)
-     */
-    public function save($msguid, $object, $olduid = null)
-    {
-        // write to cache
-        if ($this->ready) {
-            $this->_read_folder_data();
-
-            $sql_data = $this->_serialize($object);
-            $sql_data['folder_id'] = $this->folder_id;
-            $sql_data['msguid']    = $msguid;
-            $sql_data['uid']       = $object['uid'];
-
-            $args = array();
-            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'xml', 'tags', 'words');
-            $cols = array_merge($cols, $this->extra_cols);
-
-            foreach ($cols as $idx => $col) {
-                $cols[$idx] = $this->db->quote_identifier($col);
-                $args[]     = $sql_data[$col];
-            }
-
-            if ($olduid) {
-                foreach ($cols as $idx => $col) {
-                    $cols[$idx] = "$col = ?";
-                }
-
-                $query = "UPDATE `{$this->cache_table}` SET " . implode(', ', $cols)
-                    . " WHERE `folder_id` = ? AND `msguid` = ?";
-                $args[] = $this->folder_id;
-                $args[] = $olduid;
-            }
-            else {
-                $query = "INSERT INTO `{$this->cache_table}` (`created`, " . implode(', ', $cols)
-                    . ") VALUES (" . $this->db->now() . str_repeat(', ?', count($cols)) . ")";
-            }
-
-            $result = $this->db->query($query, $args);
-
-            if (!$this->db->affected_rows($result)) {
-                rcube::raise_error(array(
-                    'code' => 900, 'type' => 'php',
-                    'message' => "Failed to write to kolab cache"
-                ), true);
-            }
-        }
-
-        // keep a copy in memory for fast access
-        $this->objects = array($msguid => $object);
-        $this->uid2msg = array($object['uid'] => $msguid);
-
-        $this->check_error();
-    }
-
-
-    /**
-     * Move an existing cache entry to a new resource
-     *
-     * @param string Entry's IMAP message UID
-     * @param string Entry's Object UID
-     * @param object kolab_storage_folder Target storage folder instance
-     */
-    public function move($msguid, $uid, $target)
-    {
-        if ($this->ready) {
-            // clear cached uid mapping and force new lookup
-            unset($target->cache->uid2msg[$uid]);
-
-            // resolve new message UID in target folder
-            if ($new_msguid = $target->cache->uid2msguid($uid)) {
-                $this->_read_folder_data();
-
-                $this->db->query(
-                    "UPDATE `{$this->cache_table}` SET `folder_id` = ?, `msguid` = ? ".
-                    "WHERE `folder_id` = ? AND `msguid` = ?",
-                    $target->cache->get_folder_id(),
-                    $new_msguid,
-                    $this->folder_id,
-                    $msguid
-                );
-
-                $result = $this->db->affected_rows();
-            }
-        }
-
-        if (empty($result)) {
-            // just clear cache entry
-            $this->set($msguid, false);
-        }
-
-        unset($this->uid2msg[$uid]);
-        $this->check_error();
-    }
-
-
-    /**
-     * Remove all objects from local cache
-     */
-    public function purge()
-    {
-        if (!$this->ready) {
-            return true;
-        }
-
-        $this->_read_folder_data();
-
-        $result = $this->db->query(
-            "DELETE FROM `{$this->cache_table}` WHERE `folder_id` = ?",
-            $this->folder_id
-        );
-
-        return $this->db->affected_rows($result);
-    }
-
-    /**
-     * Update resource URI for existing cache entries
-     *
-     * @param string Target IMAP folder to move it to
-     */
-    public function rename($new_folder)
-    {
-        if (!$this->ready) {
-            return;
-        }
-
-        if ($target = kolab_storage::get_folder($new_folder)) {
-            // resolve new message UID in target folder
-            $this->db->query(
-                "UPDATE `{$this->folders_table}` SET `resource` = ? ".
-                "WHERE `resource` = ?",
-                $target->get_resource_uri(),
-                $this->resource_uri
-            );
-
-            $this->check_error();
-        }
-        else {
-            $this->error = kolab_storage::ERROR_IMAP_CONN;
-        }
-    }
-
-    /**
-     * Select Kolab objects filtered by the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
-     * @param boolean Set true to only return UIDs instead of complete objects
-     * @return array List of Kolab data objects (each represented as hash array) or UIDs
-     */
-    public function select($query = array(), $uids = false)
-    {
-        $result = $uids ? array() : new kolab_storage_dataset($this);
-
-        // read from local cache DB (assume it to be synchronized)
-        if ($this->ready) {
-            $this->_read_folder_data();
-
-            // fetch full object data on one query if a small result set is expected
-            $fetchall = !$uids && ($this->limit ? $this->limit[0] : $this->count($query)) < 500;
-            $sql_query = "SELECT " . ($fetchall ? '*' : '`msguid` AS `_msguid`, `uid`') . " FROM `{$this->cache_table}` ".
-                         "WHERE `folder_id` = ? " . $this->_sql_where($query);
-            if (!empty($this->order_by)) {
-                $sql_query .= ' ORDER BY ' . $this->order_by;
-            }
-            $sql_result = $this->limit ?
-                $this->db->limitquery($sql_query, $this->limit[1], $this->limit[0], $this->folder_id) :
-                $this->db->query($sql_query, $this->folder_id);
-
-            if ($this->db->is_error($sql_result)) {
-                if ($uids) {
-                    return null;
-                }
-                $result->set_error(true);
-                return $result;
-            }
-
-            while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                if ($uids) {
-                    $this->uid2msg[$sql_arr['uid']] = $sql_arr['_msguid'];
-                    $result[] = $sql_arr['uid'];
-                }
-                else if ($fetchall && ($object = $this->_unserialize($sql_arr))) {
-                    $result[] = $object;
-                }
-                else if (!$fetchall) {
-                    // only add msguid to dataset index
-                    $result[] = $sql_arr;
-                }
-            }
-        }
-        // use IMAP
-        else {
-            $filter = $this->_query2assoc($query);
-
-            if ($filter['type']) {
-                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
-                $index  = $this->imap->search_once($this->folder->name, $search);
-            }
-            else {
-                $index = $this->imap->index($this->folder->name, null, null, true, true);
-            }
-
-            if ($index->is_error()) {
-                $this->check_error();
-                if ($uids) {
-                    return null;
-                }
-                $result->set_error(true);
-                return $result;
-            }
-
-            $index  = $index->get();
-            $result = $uids ? $index : $this->_fetch($index, $filter['type']);
-
-            // TODO: post-filter result according to query
-        }
-
-        // We don't want to cache big results in-memory, however
-        // if we select only one object here, there's a big chance we will need it later
-        if (!$uids && count($result) == 1) {
-            if ($msguid = $result[0]['_msguid']) {
-                $this->uid2msg[$result[0]['uid']] = $msguid;
-                $this->objects = array($msguid => $result[0]);
-            }
-        }
-
-        $this->check_error();
-
-        return $result;
-    }
-
-
-    /**
-     * Get number of objects mathing the given query
-     *
-     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
-     * @return integer The number of objects of the given type
-     */
-    public function count($query = array())
-    {
-        // read from local cache DB (assume it to be synchronized)
-        if ($this->ready) {
-            $this->_read_folder_data();
-
-            $sql_result = $this->db->query(
-                "SELECT COUNT(*) AS `numrows` FROM `{$this->cache_table}` ".
-                "WHERE `folder_id` = ?" . $this->_sql_where($query),
-                $this->folder_id
-            );
-
-            if ($this->db->is_error($sql_result)) {
-                return null;
-            }
-
-            $sql_arr = $this->db->fetch_assoc($sql_result);
-            $count   = intval($sql_arr['numrows']);
-        }
-        // use IMAP
-        else {
-            $filter = $this->_query2assoc($query);
-
-            if ($filter['type']) {
-                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_format::KTYPE_PREFIX . $filter['type'];
-                $index  = $this->imap->search_once($this->folder->name, $search);
-            }
-            else {
-                $index = $this->imap->index($this->folder->name, null, null, true, true);
-            }
-
-            if ($index->is_error()) {
-                $this->check_error();
-                return null;
-            }
-
-            // TODO: post-filter result according to query
-
-            $count = $index->count();
-        }
-
-        $this->check_error();
-        return $count;
-    }
-
-    /**
-     * Define ORDER BY clause for cache queries
-     */
-    public function set_order_by($sortcols)
-    {
-        if (!empty($sortcols)) {
-            $this->order_by = '`' . join('`, `', (array)$sortcols) . '`';
-        }
-        else {
-            $this->order_by = null;
-        }
-    }
-
-    /**
-     * Define LIMIT clause for cache queries
-     */
-    public function set_limit($length, $offset = 0)
-    {
-        $this->limit = array($length, $offset);
-    }
-
-    /**
-     * Helper method to compose a valid SQL query from pseudo filter triplets
-     */
-    protected function _sql_where($query)
-    {
-        $sql_where = '';
-        foreach ((array) $query as $param) {
-            if (is_array($param[0])) {
-                $subq = array();
-                foreach ($param[0] as $q) {
-                    $subq[] = preg_replace('/^\s*AND\s+/i', '', $this->_sql_where(array($q)));
-                }
-                if (!empty($subq)) {
-                    $sql_where .= ' AND (' . implode($param[1] == 'OR' ? ' OR ' : ' AND ', $subq) . ')';
-                }
-                continue;
-            }
-            else if ($param[1] == '=' && is_array($param[2])) {
-                $qvalue = '(' . join(',', array_map(array($this->db, 'quote'), $param[2])) . ')';
-                $param[1] = 'IN';
-            }
-            else if ($param[1] == '~' || $param[1] == 'LIKE' || $param[1] == '!~' || $param[1] == '!LIKE') {
-                $not = ($param[1] == '!~' || $param[1] == '!LIKE') ? 'NOT ' : '';
-                $param[1] = $not . 'LIKE';
-                $qvalue = $this->db->quote('%'.preg_replace('/(^\^|\$$)/', ' ', $param[2]).'%');
-            }
-            else if ($param[0] == 'tags') {
-                $param[1] = ($param[1] == '!=' ? 'NOT ' : '' ) . 'LIKE';
-                $qvalue = $this->db->quote('% '.$param[2].' %');
-            }
-            else {
-                $qvalue = $this->db->quote($param[2]);
-            }
-
-            $sql_where .= sprintf(' AND %s %s %s',
-                $this->db->quote_identifier($param[0]),
-                $param[1],
-                $qvalue
-            );
-        }
-
-        return $sql_where;
-    }
-
-    /**
-     * Helper method to convert the given pseudo-query triplets into
-     * an associative filter array with 'equals' values only
-     */
-    protected function _query2assoc($query)
-    {
-        // extract object type from query parameter
-        $filter = array();
-        foreach ($query as $param) {
-            if ($param[1] == '=')
-                $filter[$param[0]] = $param[2];
-        }
-        return $filter;
-    }
-
-    /**
-     * Fetch messages from IMAP
-     *
-     * @param array  List of message UIDs to fetch
-     * @param string Requested object type or * for all
-     * @param string IMAP folder to read from
-     * @return array List of parsed Kolab objects
-     */
-    protected function _fetch($index, $type = null, $folder = null)
-    {
-        $results = new kolab_storage_dataset($this);
-        foreach ((array)$index as $msguid) {
-            if ($object = $this->folder->read_object($msguid, $type, $folder)) {
-                $results[] = $object;
-                $this->set($msguid, $object);
-            }
-        }
-
-        return $results;
-    }
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = array('changed' => null, 'xml' => '', 'tags' => '', 'words' => '');
-
-        if ($object['changed']) {
-            $sql_data['changed'] = date('Y-m-d H:i:s', is_object($object['changed']) ? $object['changed']->format('U') : $object['changed']);
-        }
-
-        if ($object['_formatobj']) {
-            $sql_data['xml']   = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write(3.0));
-            $sql_data['tags']  = ' ' . join(' ', $object['_formatobj']->get_tags()) . ' ';  // pad with spaces for strict/prefix search
-            $sql_data['words'] = ' ' . join(' ', $object['_formatobj']->get_words()) . ' ';
-        }
-
-        // extract object data
-        $data = array();
-        foreach ($object as $key => $val) {
-            // skip empty properties
-            if ($val === "" || $val === null) {
-                continue;
-            }
-            // mark binary data to be extracted from xml on unserialize()
-            if (isset($this->binary_items[$key])) {
-                $data[$key] = true;
-            }
-            else if ($key[0] != '_') {
-                $data[$key] = $val;
-            }
-            else if ($key == '_attachments') {
-                foreach ($val as $k => $att) {
-                    unset($att['content'], $att['path']);
-                    if ($att['id'])
-                        $data[$key][$k] = $att;
-                }
-            }
-        }
-
-        // use base64 encoding (Bug #1912, #2662)
-        $sql_data['data'] = base64_encode(serialize($data));
-
-        return $sql_data;
-    }
-
-    /**
-     * Helper method to turn stored cache data into a valid storage object
-     */
-    protected function _unserialize($sql_arr)
-    {
-        // check if data is a base64-encoded string, for backward compat.
-        if (strpos(substr($sql_arr['data'], 0, 64), ':') === false) {
-            $sql_arr['data'] = base64_decode($sql_arr['data']);
-        }
-
-        $object = unserialize($sql_arr['data']);
-
-        // de-serialization failed
-        if ($object === false) {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "Malformed data for {$this->resource_uri}/{$sql_arr['msguid']} object."
-            ), true);
-
-            return null;
-        }
-
-        // decode binary properties
-        foreach ($this->binary_items as $key => $regexp) {
-            if (!empty($object[$key]) && preg_match($regexp, $sql_arr['xml'], $m)) {
-                $object[$key] = base64_decode($m[1]);
-            }
-        }
-
-        $object_type = $sql_arr['type'] ?: $this->folder->type;
-        $format_type = $this->folder->type == 'configuration' ? 'configuration' : $object_type;
-
-        // add meta data
-        $object['_type']      = $object_type;
-        $object['_msguid']    = $sql_arr['msguid'];
-        $object['_mailbox']   = $this->folder->name;
-        $object['_size']      = strlen($sql_arr['xml']);
-        $object['_formatobj'] = kolab_format::factory($format_type, 3.0, $sql_arr['xml']);
-
-        return $object;
-    }
-
-    /**
-     * Write records into cache using extended inserts to reduce the number of queries to be executed
-     *
-     * @param int  Message UID. Set 0 to commit buffered inserts
-     * @param array Kolab object to cache
-     */
-    protected function _extended_insert($msguid, $object)
-    {
-        static $buffer = '';
-
-        $line = '';
-        if ($object) {
-            $sql_data = $this->_serialize($object);
-
-            // Skip multifolder insert for Oracle, we can't put long data inline
-            if ($this->db->db_provider == 'oracle') {
-                $extra_cols = '';
-                if ($this->extra_cols) {
-                    $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
-                    $extra_cols = ', ' . join(', ', $extra_cols);
-                    $extra_args = str_repeat(', ?', count($this->extra_cols));
-                }
-
-                $params = array($this->folder_id, $msguid, $object['uid'], $sql_data['changed'],
-                    $sql_data['data'], $sql_data['xml'], $sql_data['tags'], $sql_data['words']);
-
-                foreach ($this->extra_cols as $col) {
-                    $params[] = $sql_data[$col];
-                }
-
-                $result = $this->db->query(
-                    "INSERT INTO `{$this->cache_table}` "
-                    . " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)"
-                    . " VALUES (?, ?, ?, " . $this->db->now() . ", ?, ?, ?, ?, ? $extra_args)",
-                    $params
-                );
-
-                if (!$this->db->affected_rows($result)) {
-                    rcube::raise_error(array(
-                        'code' => 900, 'type' => 'php',
-                        'message' => "Failed to write to kolab cache"
-                    ), true);
-                }
-
-                return;
-            }
-
-            $values = array(
-                $this->db->quote($this->folder_id),
-                $this->db->quote($msguid),
-                $this->db->quote($object['uid']),
-                $this->db->now(),
-                $this->db->quote($sql_data['changed']),
-                $this->db->quote($sql_data['data']),
-                $this->db->quote($sql_data['xml']),
-                $this->db->quote($sql_data['tags']),
-                $this->db->quote($sql_data['words']),
-            );
-            foreach ($this->extra_cols as $col) {
-                $values[] = $this->db->quote($sql_data[$col]);
-            }
-            $line = '(' . join(',', $values) . ')';
-        }
-
-        if ($buffer && (!$msguid || (strlen($buffer) + strlen($line) > $this->max_sql_packet()))) {
-            $extra_cols = '';
-            if ($this->extra_cols) {
-                $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
-                $extra_cols = ', ' . join(', ', $extra_cols);
-            }
-
-            $result = $this->db->query(
-                "INSERT INTO `{$this->cache_table}` ".
-                " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)".
-                " VALUES $buffer"
-            );
-
-            if (!$this->db->affected_rows($result)) {
-                rcube::raise_error(array(
-                    'code' => 900, 'type' => 'php',
-                    'message' => "Failed to write to kolab cache"
-                ), true);
-            }
-
-            $buffer = '';
-        }
-
-        $buffer .= ($buffer ? ',' : '') . $line;
-    }
-
-    /**
-     * Returns max_allowed_packet from mysql config
-     */
-    protected function max_sql_packet()
-    {
-        if (!$this->max_sql_packet) {
-            // mysql limit or max 4 MB
-            $value = $this->db->get_variable('max_allowed_packet', 1048500);
-            $this->max_sql_packet = min($value, 4*1024*1024) - 2000;
-        }
-
-        return $this->max_sql_packet;
-    }
-
-    /**
-     * Read this folder's ID and cache metadata
-     */
-    protected function _read_folder_data()
-    {
-        // already done
-        if (!empty($this->folder_id) || !$this->ready)
-            return;
-
-        $sql_arr = $this->db->fetch_assoc($this->db->query(
-                "SELECT `folder_id`, `synclock`, `ctag`"
-                . " FROM `{$this->folders_table}` WHERE `resource` = ?",
-                $this->resource_uri
-        ));
-
-        if ($sql_arr) {
-            $this->metadata = $sql_arr;
-            $this->folder_id = $sql_arr['folder_id'];
-        }
-        else {
-            $this->db->query("INSERT INTO `{$this->folders_table}` (`resource`, `type`)"
-                . " VALUES (?, ?)", $this->resource_uri, $this->folder->type);
-
-            $this->folder_id = $this->db->insert_id('kolab_folders');
-            $this->metadata = array();
-        }
-    }
-
-    /**
-     * Check lock record for this folder and wait if locked or set lock
-     */
-    protected function _sync_lock()
-    {
-        if (!$this->ready)
-            return;
-
-        $this->_read_folder_data();
-
-        // abort if database is not set-up
-        if ($this->db->is_error()) {
-            $this->check_error();
-            $this->ready = false;
-            return;
-        }
-
-        $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` = ?";
-
-        // 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()) ||
-            (($res = $this->db->query($write_query, time(), $this->folder_id, intval($this->metadata['synclock']))) &&
-                !($affected = $this->db->affected_rows($res)))
-        ) {
-            usleep(500000);
-            $this->metadata = $this->db->fetch_assoc($this->db->query($read_query, $this->folder_id));
-        }
-
-        $this->synclock = $affected > 0;
-    }
-
-    /**
-     * Remove lock for this folder
-     */
-    public function _sync_unlock()
-    {
-        if (!$this->ready || !$this->synclock)
-            return;
-
-        $this->db->query(
-            "UPDATE `{$this->folders_table}` SET `synclock` = 0, `ctag` = ? WHERE `folder_id` = ?",
-            $this->metadata['ctag'],
-            $this->folder_id
-        );
-
-        $this->synclock = false;
-    }
-
-    /**
-     * Check IMAP connection error state
-     */
-    protected function check_error()
-    {
-        if (($err_code = $this->imap->get_error_code()) < 0) {
-            $this->error = kolab_storage::ERROR_IMAP_CONN;
-            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
-                $this->error = kolab_storage::ERROR_NO_PERMISSION;
-            }
-        }
-        else if ($this->db->is_error()) {
-            $this->error = kolab_storage::ERROR_CACHE_DB;
-        }
-    }
-
-    /**
-     * Resolve an object UID into an IMAP message UID
-     *
-     * @param string  Kolab object UID
-     * @param boolean Include deleted objects
-     * @return int The resolved IMAP message UID
-     */
-    public function uid2msguid($uid, $deleted = false)
-    {
-        // query local database if available
-        if (!isset($this->uid2msg[$uid]) && $this->ready) {
-            $this->_read_folder_data();
-
-            $sql_result = $this->db->query(
-                "SELECT `msguid` FROM `{$this->cache_table}` ".
-                "WHERE `folder_id` = ? AND `uid` = ? ORDER BY `msguid` DESC",
-                $this->folder_id,
-                $uid
-            );
-
-            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                $this->uid2msg[$uid] = $sql_arr['msguid'];
-            }
-        }
-
-        if (!isset($this->uid2msg[$uid])) {
-            // use IMAP SEARCH to get the right message
-            $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') .
-                'HEADER SUBJECT ' . rcube_imap_generic::escape($uid));
-            $results = $index->get();
-            $this->uid2msg[$uid] = end($results);
-        }
-
-        return $this->uid2msg[$uid];
-    }
-
-    /**
-     * Getter for protected member variables
-     */
-    public function __get($name)
-    {
-        if ($name == 'folder_id') {
-            $this->_read_folder_data();
-        }
-
-        return $this->$name;
-    }
-
-    /**
-     * Bypass Roundcube messages cache.
-     * Roundcube cache duplicates information already stored in kolab_cache.
-     *
-     * @param bool $disable True disables, False enables messages cache
-     */
-    public function bypass($disable = false)
-    {
-        // if kolab cache is disabled do nothing
-        if (!$this->enabled) {
-            return;
-        }
-
-        static $messages_cache, $cache_bypass;
-
-        if ($messages_cache === null) {
-            $rcmail = rcube::get_instance();
-            $messages_cache = (bool) $rcmail->config->get('messages_cache');
-            $cache_bypass   = (int) $rcmail->config->get('kolab_messages_cache_bypass');
-        }
-
-        if ($messages_cache) {
-            // handle recurrent (multilevel) bypass() calls
-            if ($disable) {
-                $this->cache_bypassed += 1;
-                if ($this->cache_bypassed > 1) {
-                    return;
-                }
-            }
-            else {
-                $this->cache_bypassed -= 1;
-                if ($this->cache_bypassed > 0) {
-                    return;
-                }
-            }
-
-            switch ($cache_bypass) {
-                case 2:
-                    // Disable messages cache completely
-                    $this->imap->set_messages_caching(!$disable);
-                    break;
-
-                case 1:
-                    // We'll disable messages cache, but keep index cache.
-                    // Default mode is both (MODE_INDEX | MODE_MESSAGE)
-                    $mode = rcube_imap_cache::MODE_INDEX;
-
-                    if (!$disable) {
-                        $mode |= rcube_imap_cache::MODE_MESSAGE;
-                    }
-
-                    $this->imap->set_messages_caching(true, $mode);
-            }
-        }
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_configuration.php Deleted

@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for configuration objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, 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/>.
- */
-
-class kolab_storage_cache_configuration extends kolab_storage_cache
-{
-    protected $extra_cols = array('type');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-        $sql_data['type'] = $object['type'];
-
-        return $sql_data;
-    }
-
-    /**
-     * Select Kolab objects filtered by the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     * @param boolean Set true to only return UIDs instead of complete objects
-     * @return array List of Kolab data objects (each represented as hash array) or UIDs
-     */
-    public function select($query = array(), $uids = false)
-    {
-        // modify query for IMAP search: query param 'type' is actually a subtype
-        if (!$this->ready) {
-            foreach ($query as $i => $tuple) {
-                if ($tuple[0] == 'type') {
-                    $tuple[2] = 'configuration.' . $tuple[2];
-                    $query[$i] = $tuple;
-                }
-            }
-        }
-
-        return parent::select($query, $uids);
-    }
-
-    /**
-     * Helper method to compose a valid SQL query from pseudo filter triplets
-     */
-    protected function _sql_where($query)
-    {
-        if (is_array($query)) {
-            foreach ($query as $idx => $param) {
-                // convert category filter
-                if ($param[0] == 'category') {
-                    $param[2] = array_map(function($n) { return 'category:' . $n; }, (array) $param[2]);
-
-                    $query[$idx][0] = 'tags';
-                    $query[$idx][2] = count($param[2]) > 1 ? $param[2] : $param[2][0];
-                }
-                // convert member filter (we support only = operator with single value)
-                else if ($param[0] == 'member') {
-                    $query[$idx][0] = 'words';
-                    $query[$idx][1] = '~';
-                    $query[$idx][2] = '^' . $param[2] . '$';
-                }
-            }
-        }
-
-        return parent::_sql_where($query);
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_contact.php Deleted

@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for contact objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, 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/>.
- */
-
-class kolab_storage_cache_contact extends kolab_storage_cache
-{
-    protected $extra_cols = array('type','name','firstname','surname','email');
-    protected $binary_items = array(
-        'photo'          => '|<photo><uri>[^;]+;base64,([^<]+)</uri></photo>|i',
-        'pgppublickey'   => '|<key><uri>date:application/pgp-keys;base64,([^<]+)</uri></key>|i',
-        'pkcs7publickey' => '|<key><uri>date:application/pkcs7-mime;base64,([^<]+)</uri></key>|i',
-    );
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-        $sql_data['type'] = $object['_type'];
-
-        // columns for sorting
-        $sql_data['name']      = rcube_charset::clean($object['name'] . $object['prefix']);
-        $sql_data['firstname'] = rcube_charset::clean($object['firstname'] . $object['middlename'] . $object['surname']);
-        $sql_data['surname']   = rcube_charset::clean($object['surname']   . $object['firstname']  . $object['middlename']);
-        $sql_data['email']     = rcube_charset::clean(is_array($object['email']) ? $object['email'][0] : $object['email']);
-
-        if (is_array($sql_data['email'])) {
-            $sql_data['email'] = $sql_data['email']['address'];
-        }
-        // avoid value being null
-        if (empty($sql_data['email'])) {
-            $sql_data['email'] = '';
-        }
-
-        return $sql_data;
-    }
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_event.php Deleted

@@ -1,49 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for calendar event objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, 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/>.
- */
-
-class kolab_storage_cache_event extends kolab_storage_cache
-{
-    protected $extra_cols = array('dtstart','dtend');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-
-        $sql_data['dtstart'] = is_object($object['start']) ? $object['start']->format(self::DB_DATE_FORMAT) : date(self::DB_DATE_FORMAT, $object['start']);
-        $sql_data['dtend']   = is_object($object['end'])   ? $object['end']->format(self::DB_DATE_FORMAT)   : date(self::DB_DATE_FORMAT, $object['end']);
-
-        // extend date range for recurring events
-        if ($object['recurrence'] && $object['_formatobj']) {
-            $recurrence = new kolab_date_recurrence($object['_formatobj']);
-            $dtend = $recurrence->end() ?: new DateTime('now +10 years');
-            $sql_data['dtend'] = $dtend->format(self::DB_DATE_FORMAT);
-        }
-
-        return $sql_data;
-    }
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_file.php Deleted

@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for file objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, 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/>.
- */
-
-class kolab_storage_cache_file extends kolab_storage_cache
-{
-    protected $extra_cols = array('filename');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object);
-
-        if (!empty($object['_attachments'])) {
-            reset($object['_attachments']);
-            $sql_data['filename'] = $object['_attachments'][key($object['_attachments'])]['name'];
-        }
-
-        return $sql_data;
-    }
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_freebusy.php Deleted

@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for freebusy objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, 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/>.
- */
-
-class kolab_storage_cache_freebusy extends kolab_storage_cache
-{
-        protected $extra_cols = array('dtstart','dtend');
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_journal.php Deleted

@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for journal objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, 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/>.
- */
-
-class kolab_storage_cache_journal extends kolab_storage_cache
-{
-    protected $extra_cols = array('dtstart','dtend');
-    
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_mongodb.php Deleted

@@ -1,561 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_storage_cache_mongodb
-{
-    private $db;
-    private $imap;
-    private $folder;
-    private $uid2msg;
-    private $objects;
-    private $index = array();
-    private $resource_uri;
-    private $enabled = true;
-    private $synched = false;
-    private $synclock = false;
-    private $ready = false;
-    private $max_sql_packet = 1046576;  // 1 MB - 2000 bytes
-    private $binary_cols = array('photo','pgppublickey','pkcs7publickey');
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct(kolab_storage_folder $storage_folder = null)
-    {
-        $rcmail = rcube::get_instance();
-        $mongo = new Mongo();
-        $this->db = $mongo->kolab_cache;
-        $this->imap = $rcmail->get_storage();
-        $this->enabled = $rcmail->config->get('kolab_cache', false);
-
-        if ($this->enabled) {
-            // remove sync-lock on script termination
-            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
-        }
-
-        if ($storage_folder)
-            $this->set_folder($storage_folder);
-    }
-
-
-    /**
-     * Connect cache with a storage folder
-     *
-     * @param kolab_storage_folder The storage folder instance to connect with
-     */
-    public function set_folder(kolab_storage_folder $storage_folder)
-    {
-        $this->folder = $storage_folder;
-
-        if (empty($this->folder->name)) {
-            $this->ready = false;
-            return;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = $this->folder->get_resource_uri();
-        $this->ready = $this->enabled;
-    }
-
-
-    /**
-     * Synchronize local cache data with remote
-     */
-    public function synchronize()
-    {
-        // only sync once per request cycle
-        if ($this->synched)
-            return;
-
-        // increase time limit
-        @set_time_limit(500);
-
-        // lock synchronization for this folder or wait if locked
-        $this->_sync_lock();
-
-        // synchronize IMAP mailbox cache
-        $this->imap->folder_sync($this->folder->name);
-
-        // compare IMAP index with object cache index
-        $imap_index = $this->imap->index($this->folder->name);
-        $this->index = $imap_index->get();
-
-        // determine objects to fetch or to invalidate
-        if ($this->ready) {
-            // read cache index
-            $old_index = array();
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri), array('msguid' => 1, 'uid' => 1));
-            foreach ($cursor as $doc) {
-                $old_index[] = $doc['msguid'];
-                $this->uid2msg[$doc['uid']] = $doc['msguid'];
-            }
-
-            // fetch new objects from imap
-            foreach (array_diff($this->index, $old_index) as $msguid) {
-                if ($object = $this->folder->read_object($msguid, '*')) {
-                    try {
-                        $this->db->cache->insert($this->_serialize($object, $msguid));
-                    }
-                    catch (Exception $e) {
-                        rcmail::raise_error(array(
-                            'code' => 900, 'type' => 'php',
-                            'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
-                        ), true);
-                    }
-                }
-            }
-
-            // delete invalid entries from local DB
-            $del_index = array_diff($old_index, $this->index);
-            if (!empty($del_index)) {
-                $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => array('$in' => $del_index)));
-            }
-        }
-
-        // remove lock
-        $this->_sync_unlock();
-
-        $this->synched = time();
-    }
-
-
-    /**
-     * Read a single entry from cache or from IMAP directly
-     *
-     * @param string Related IMAP message UID
-     * @param string Object type to read
-     * @param string IMAP folder name the entry relates to
-     * @param array  Hash array with object properties or null if not found
-     */
-    public function get($msguid, $type = null, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            return kolab_storage::get_folder($foldername)->cache->get($msguid, $object);
-        }
-
-        // load object if not in memory
-        if (!isset($this->objects[$msguid])) {
-            if ($this->ready && ($doc = $this->db->cache->findOne(array('resource' => $this->resource_uri, 'msguid' => $msguid))))
-                $this->objects[$msguid] = $this->_unserialize($doc);
-
-            // fetch from IMAP if not present in cache
-            if (empty($this->objects[$msguid])) {
-                $result = $this->_fetch(array($msguid), $type, $foldername);
-                $this->objects[$msguid] = $result[0];
-            }
-        }
-
-        return $this->objects[$msguid];
-    }
-
-
-    /**
-     * Insert/Update a cache entry
-     *
-     * @param string Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string IMAP folder name the entry relates to
-     */
-    public function set($msguid, $object, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            kolab_storage::get_folder($foldername)->cache->set($msguid, $object);
-            return;
-        }
-
-        // write to cache
-        if ($this->ready) {
-            // remove old entry
-            $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => $msguid));
-
-            // write new object data if not false (wich means deleted)
-            if ($object) {
-                try {
-                    $this->db->cache->insert($this->_serialize($object, $msguid));
-                }
-                catch (Exception $e) {
-                    rcmail::raise_error(array(
-                        'code' => 900, 'type' => 'php',
-                        'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
-                    ), true);
-                }
-            }
-        }
-
-        // keep a copy in memory for fast access
-        $this->objects[$msguid] = $object;
-
-        if ($object)
-            $this->uid2msg[$object['uid']] = $msguid;
-    }
-
-    /**
-     * Move an existing cache entry to a new resource
-     *
-     * @param string Entry's IMAP message UID
-     * @param string Entry's Object UID
-     * @param string Target IMAP folder to move it to
-     */
-    public function move($msguid, $objuid, $target_folder)
-    {
-        $target = kolab_storage::get_folder($target_folder);
-
-        // resolve new message UID in target folder
-        if ($new_msguid = $target->cache->uid2msguid($objuid)) {
-/*
-            $this->db->query(
-                "UPDATE kolab_cache SET resource=?, msguid=? ".
-                "WHERE resource=? AND msguid=? AND type<>?",
-                $target->get_resource_uri(),
-                $new_msguid,
-                $this->resource_uri,
-                $msguid,
-                'lock'
-            );
-*/
-        }
-        else {
-            // just clear cache entry
-            $this->set($msguid, false);
-        }
-
-        unset($this->uid2msg[$uid]);
-    }
-
-
-    /**
-     * Remove all objects from local cache
-     */
-    public function purge($type = null)
-    {
-        return $this->db->cache->remove(array(), array('safe' => true));
-    }
-
-
-    /**
-     * Select Kolab objects filtered by the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
-     * @return array List of Kolab data objects (each represented as hash array)
-     */
-    public function select($query = array())
-    {
-        $result = array();
-
-        // read from local cache DB (assume it to be synchronized)
-        if ($this->ready) {
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
-            foreach ($cursor as $doc) {
-                if ($object = $this->_unserialize($doc))
-                    $result[] = $object;
-            }
-        }
-        else {
-            // extract object type from query parameter
-            $filter = $this->_query2assoc($query);
-
-            // use 'list' for folder's default objects
-            if ($filter['type'] == $this->type) {
-                $index = $this->index;
-            }
-            else {  // search by object type
-                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
-                $index = $this->imap->search_once($this->folder->name, $search)->get();
-            }
-
-            // fetch all messages in $index from IMAP
-            $result = $this->_fetch($index, $filter['type']);
-
-            // TODO: post-filter result according to query
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Get number of objects mathing the given query
-     *
-     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
-     * @return integer The number of objects of the given type
-     */
-    public function count($query = array())
-    {
-        $count = 0;
-
-        // cache is in sync, we can count records in local DB
-        if ($this->synched) {
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
-            $count = $cursor->valid() ? $cursor->count() : 0;
-        }
-        else {
-            // search IMAP by object type
-            $filter = $this->_query2assoc($query);
-            $ctype  = kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
-            $index = $this->imap->search_once($this->folder->name, 'UNDELETED HEADER X-Kolab-Type ' . $ctype);
-            $count = $index->count();
-        }
-
-        return $count;
-    }
-
-    /**
-     * Helper method to convert the pseudo-SQL query into a valid mongodb filter
-     */
-    private function _mongo_filter($query)
-    {
-        $filters = array();
-        foreach ($query as $param) {
-            $filter = array();
-            if ($param[1] == '=' && is_array($param[2])) {
-                $filter[$param[0]] = array('$in' => $param[2]);
-                $filters[] = $filter;
-            }
-            else if ($param[1] == '=') {
-                $filters[] = array($param[0] => $param[2]);
-            }
-            else if ($param[1] == 'LIKE' || $param[1] == '~') {
-                $filter[$param[0]] = array('$regex' => preg_quote($param[2]), '$options' => 'i');
-                $filters[] = $filter;
-            }
-            else if ($param[1] == '!~' || $param[1] == '!LIKE') {
-                $filter[$param[0]] = array('$not' => '/' . preg_quote($param[2]) . '/i');
-                $filters[] = $filter;
-            }
-            else {
-                $op = '';
-                switch ($param[1]) {
-                    case '>':  $op = '$gt';  break;
-                    case '>=': $op = '$gte'; break;
-                    case '<':  $op = '$lt';  break;
-                    case '<=': $op = '$lte'; break;
-                    case '!=':
-                    case '<>': $op = '$gte'; break;
-                }
-                if ($op) {
-                    $filter[$param[0]] = array($op => $param[2]);
-                    $filters[] = $filter;
-                }
-            }
-        }
-
-        return array('$and' => $filters);
-    }
-
-    /**
-     * Helper method to convert the given pseudo-query triplets into
-     * an associative filter array with 'equals' values only
-     */
-    private function _query2assoc($query)
-    {
-        // extract object type from query parameter
-        $filter = array();
-        foreach ($query as $param) {
-            if ($param[1] == '=')
-                $filter[$param[0]] = $param[2];
-        }
-        return $filter;
-    }
-
-    /**
-     * Fetch messages from IMAP
-     *
-     * @param array List of message UIDs to fetch
-     * @return array List of parsed Kolab objects
-     */
-    private function _fetch($index, $type = null, $folder = null)
-    {
-        $results = array();
-        foreach ((array)$index as $msguid) {
-            if ($object = $this->folder->read_object($msguid, $type, $folder)) {
-                $results[] = $object;
-                $this->set($msguid, $object);
-            }
-        }
-
-        return $results;
-    }
-
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     */
-    private function _serialize($object, $msguid)
-    {
-        $bincols = array_flip($this->binary_cols);
-        $doc = array(
-            'resource' => $this->resource_uri,
-            'type'     => $object['_type'] ? $object['_type'] : $this->folder->type,
-            'msguid'   => $msguid,
-            'uid'      => $object['uid'],
-            'xml'      => '',
-            'tags'     => array(),
-            'words'    => array(),
-            'objcols'  => array(),
-        );
-
-        // set type specific values
-        if ($this->folder->type == 'event') {
-            // database runs in server's timezone so using date() is what we want
-            $doc['dtstart'] = date('Y-m-d H:i:s', is_object($object['start']) ? $object['start']->format('U') : $object['start']);
-            $doc['dtend']   = date('Y-m-d H:i:s', is_object($object['end'])   ? $object['end']->format('U')   : $object['end']);
-
-            // extend date range for recurring events
-            if ($object['recurrence']) {
-                $doc['dtend'] = date('Y-m-d H:i:s', $object['recurrence']['UNTIL'] ?: strtotime('now + 2 years'));
-            }
-        }
-
-        if ($object['_formatobj']) {
-            $doc['xml'] = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write());
-            $doc['tags'] = $object['_formatobj']->get_tags();
-            $doc['words'] = $object['_formatobj']->get_words();
-        }
-
-        // extract object data
-        $data = array();
-        foreach ($object as $key => $val) {
-            if ($val === "" || $val === null) {
-                // skip empty properties
-                continue;
-            }
-            if (isset($bincols[$key])) {
-                $data[$key] = base64_encode($val);
-            }
-            else if (is_object($val)) {
-                if (is_a($val, 'DateTime')) {
-                    $data[$key] = array('_class' => 'DateTime', 'date' => $val->format('Y-m-d H:i:s'), 'timezone' => $val->getTimezone()->getName());
-                    $doc['objcols'][] = $key;
-                }
-            }
-            else if ($key[0] != '_') {
-                $data[$key] = $val;
-            }
-            else if ($key == '_attachments') {
-                foreach ($val as $k => $att) {
-                    unset($att['content'], $att['path']);
-                    if ($att['id'])
-                        $data[$key][$k] = $att;
-                }
-            }
-        }
-
-        $doc['data'] = $data;
-        return $doc;
-    }
-
-    /**
-     * Helper method to turn stored cache data into a valid storage object
-     */
-    private function _unserialize($doc)
-    {
-        $object = $doc['data'];
-
-        // decode binary properties
-        foreach ($this->binary_cols as $key) {
-            if (!empty($object[$key]))
-                $object[$key] = base64_decode($object[$key]);
-        }
-
-        // restore serialized objects
-        foreach ((array)$doc['objcols'] as $key) {
-            switch ($object[$key]['_class']) {
-                case 'DateTime':
-                    $val = new DateTime($object[$key]['date'], new DateTimeZone($object[$key]['timezone']));
-                    $object[$key] = $val;
-                    break;
-            }
-        }
-
-        // add meta data
-        $object['_type'] = $doc['type'];
-        $object['_msguid'] = $doc['msguid'];
-        $object['_mailbox'] = $this->folder->name;
-        $object['_formatobj'] = kolab_format::factory($doc['type'], $doc['xml']);
-
-        return $object;
-    }
-
-    /**
-     * Check lock record for this folder and wait if locked or set lock
-     */
-    private function _sync_lock()
-    {
-        if (!$this->ready)
-            return;
-
-        $this->synclock = true;
-        $lock = $this->db->locks->findOne(array('resource' => $this->resource_uri));
-
-        // create lock record if not exists
-        if (!$lock) {
-            $this->db->locks->insert(array('resource' => $this->resource_uri, 'created' => time()));
-        }
-        // wait if locked (expire locks after 10 minutes)
-        else if ((time() - $lock['created']) < 600) {
-            usleep(500000);
-            return $this->_sync_lock();
-        }
-        // set lock
-        else {
-            $lock['created'] = time();
-            $this->db->locks->update(array('_id' => $lock['_id']), $lock, array('safe' => true));
-        }
-    }
-
-    /**
-     * Remove lock for this folder
-     */
-    public function _sync_unlock()
-    {
-        if (!$this->ready || !$this->synclock)
-            return;
-
-        $this->db->locks->remove(array('resource' => $this->resource_uri));
-    }
-
-    /**
-     * Resolve an object UID into an IMAP message UID
-     *
-     * @param string  Kolab object UID
-     * @param boolean Include deleted objects
-     * @return int The resolved IMAP message UID
-     */
-    public function uid2msguid($uid, $deleted = false)
-    {
-        if (!isset($this->uid2msg[$uid])) {
-            // use IMAP SEARCH to get the right message
-            $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') . 'HEADER SUBJECT ' . $uid);
-            $results = $index->get();
-            $this->uid2msg[$uid] = $results[0];
-        }
-
-        return $this->uid2msg[$uid];
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_task.php Deleted

@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class for task objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2013, 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/>.
- */
-
-class kolab_storage_cache_task extends kolab_storage_cache
-{
-    protected $extra_cols = array('dtstart','dtend');
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     *
-     * @override
-     */
-    protected function _serialize($object)
-    {
-        $sql_data = parent::_serialize($object) + array('dtstart' => null, 'dtend' => null);
-
-        if ($object['start'])
-            $sql_data['dtstart'] = is_object($object['start']) ? $object['start']->format(self::DB_DATE_FORMAT) : date(self::DB_DATE_FORMAT, $object['start']);
-        if ($object['due'])
-            $sql_data['dtend']   = is_object($object['due'])   ? $object['due']->format(self::DB_DATE_FORMAT)   : date(self::DB_DATE_FORMAT, $object['due']);
-
-        return $sql_data;
-    }
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_config.php Deleted

@@ -1,866 +0,0 @@
-<?php
-
-/**
- * Kolab storage class providing access to configuration objects on a Kolab server.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012-2014, 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/>.
- */
-
-class kolab_storage_config
-{
-    const FOLDER_TYPE = 'configuration';
-
-
-    /**
-     * Singleton instace of kolab_storage_config
-     *
-     * @var kolab_storage_config
-     */
-    static protected $instance;
-
-    private $folders;
-    private $default;
-    private $enabled;
-
-
-    /**
-     * This implements the 'singleton' design pattern
-     *
-     * @return kolab_storage_config The one and only instance
-     */
-    static function get_instance()
-    {
-        if (!self::$instance) {
-            self::$instance = new kolab_storage_config();
-        }
-
-        return self::$instance;
-    }
-
-    /**
-     * Private constructor (finds default configuration folder as a config source)
-     */
-    private function __construct()
-    {
-        // get all configuration folders
-        $this->folders = kolab_storage::get_folders(self::FOLDER_TYPE, false);
-
-        foreach ($this->folders as $folder) {
-            if ($folder->default) {
-                $this->default = $folder;
-                break;
-            }
-        }
-
-        // if no folder is set as default, choose the first one
-        if (!$this->default) {
-            $this->default = reset($this->folders);
-        }
-
-        // attempt to create a default folder if it does not exist
-        if (!$this->default) {
-            $folder_name = 'Configuration';
-            $folder_type = self::FOLDER_TYPE . '.default';
-
-            if (kolab_storage::folder_create($folder_name, $folder_type, true)) {
-                $this->default = new kolab_storage_folder($folder_name, $folder_type);
-            }
-        }
-
-        // check if configuration folder exist
-        if ($this->default && $this->default->name) {
-            $this->enabled = true;
-        }
-    }
-
-    /**
-     * Check wether any configuration storage (folder) exists
-     *
-     * @return bool
-     */
-    public function is_enabled()
-    {
-        return $this->enabled;
-    }
-
-    /**
-     * Get configuration objects
-     *
-     * @param array $filter  Search filter
-     * @param bool  $default Enable to get objects only from default folder
-     * @param int   $limit   Max. number of records (per-folder)
-     *
-     * @return array List of objects
-     */
-    public function get_objects($filter = array(), $default = false, $limit = 0)
-    {
-        $list = array();
-
-        foreach ($this->folders as $folder) {
-            // we only want to read from default folder
-            if ($default && !$folder->default) {
-                continue;
-            }
-
-            // for better performance it's good to assume max. number of records
-            if ($limit) {
-                $folder->set_order_and_limit(null, $limit);
-            }
-
-            foreach ($folder->select($filter) as $object) {
-                unset($object['_formatobj']);
-                $list[] = $object;
-            }
-        }
-
-        return $list;
-    }
-
-    /**
-     * Get configuration object
-     *
-     * @param string $uid     Object UID
-     * @param bool   $default Enable to get objects only from default folder
-     *
-     * @return array Object data
-     */
-    public function get_object($uid, $default = false)
-    {
-        foreach ($this->folders as $folder) {
-            // we only want to read from default folder
-            if ($default && !$folder->default) {
-                continue;
-            }
-
-            if ($object = $folder->get_object($uid)) {
-                return $object;
-            }
-        }
-    }
-
-    /**
-     * Create/update configuration object
-     *
-     * @param array  $object Object data
-     * @param string $type   Object type
-     *
-     * @return bool True on success, False on failure
-     */
-    public function save(&$object, $type)
-    {
-        if (!$this->enabled) {
-            return false;
-        }
-
-        $folder = $this->find_folder($object);
-
-        if ($type) {
-            $object['type'] = $type;
-        }
-
-        return $folder->save($object, self::FOLDER_TYPE . '.' . $object['type'], $object['uid']);
-    }
-
-    /**
-     * Remove configuration object
-     *
-     * @param string $uid Object UID
-     *
-     * @return bool True on success, False on failure
-     */
-    public function delete($uid)
-    {
-        if (!$this->enabled) {
-            return false;
-        }
-
-        // fetch the object to find folder
-        $object = $this->get_object($uid);
-
-        if (!$object) {
-            return false;
-        }
-
-        $folder = $this->find_folder($object);
-
-        return $folder->delete($uid);
-    }
-
-    /**
-     * Find folder
-     */
-    public function find_folder($object = array())
-    {
-        // find folder object
-        if ($object['_mailbox']) {
-            foreach ($this->folders as $folder) {
-                if ($folder->name == $object['_mailbox']) {
-                    break;
-                }
-            }
-        }
-        else {
-            $folder = $this->default;
-        }
-
-        return $folder;
-    }
-
-    /**
-     * Builds relation member URI
-     *
-     * @param string|array Object UUID or Message folder, UID, Search headers (Message-Id, Date)
-     *
-     * @return string $url Member URI
-     */
-    public static function build_member_url($params)
-    {
-        // param is object UUID
-        if (is_string($params) && !empty($params)) {
-            return 'urn:uuid:' . $params;
-        }
-
-        if (empty($params) || !strlen($params['folder'])) {
-            return null;
-        }
-
-        $rcube   = rcube::get_instance();
-        $storage = $rcube->get_storage();
-
-        // modify folder spec. according to namespace
-        $folder = $params['folder'];
-        $ns     = $storage->folder_namespace($folder);
-
-        if ($ns == 'shared') {
-            // Note: this assumes there's only one shared namespace root
-            if ($ns = $storage->get_namespace('shared')) {
-                if ($prefix = $ns[0][0]) {
-                    $folder = 'shared' . substr($folder, strlen($prefix));
-                }
-            }
-        }
-        else {
-            if ($ns == 'other') {
-                // Note: this assumes there's only one other users namespace root
-                if ($ns = $storage->get_namespace('shared')) {
-                    if ($prefix = $ns[0][0]) {
-                        $folder = 'user' . substr($folder, strlen($prefix));
-                    }
-                }
-            }
-            else {
-                $folder = 'user' . '/' . $rcube->get_user_name() . '/' . $folder;
-            }
-        }
-
-        $folder = implode('/', array_map('rawurlencode', explode('/', $folder)));
-
-        // build URI
-        $url = 'imap:///' . $folder;
-
-        // UID is optional here because sometimes we want
-        // to build just a member uri prefix
-        if ($params['uid']) {
-            $url .= '/' . $params['uid'];
-        }
-
-        unset($params['folder']);
-        unset($params['uid']);
-
-        if (!empty($params)) {
-            $url .= '?' . http_build_query($params, '', '&');
-        }
-
-        return $url;
-    }
-
-    /**
-     * Parses relation member string
-     *
-     * @param string $url Member URI
-     *
-     * @return array Message folder, UID, Search headers (Message-Id, Date)
-     */
-    public static function parse_member_url($url)
-    {
-        // Look for IMAP URI:
-        // imap:///(user/username@domain|shared)/<folder>/<UID>?<search_params>
-        if (strpos($url, 'imap:///') === 0) {
-            $rcube   = rcube::get_instance();
-            $storage = $rcube->get_storage();
-
-            // parse_url does not work with imap:/// prefix
-            $url   = parse_url(substr($url, 8));
-            $path  = explode('/', $url['path']);
-            parse_str($url['query'], $params);
-
-            $uid  = array_pop($path);
-            $ns   = array_shift($path);
-            $path = array_map('rawurldecode', $path);
-
-            // resolve folder name
-            if ($ns == 'shared') {
-                $folder = implode('/', $path);
-                // Note: this assumes there's only one shared namespace root
-                if ($ns = $storage->get_namespace('shared')) {
-                    if ($prefix = $ns[0][0]) {
-                        $folder = $prefix . '/' . $folder;
-                    }
-                }
-            }
-            else if ($ns == 'user') {
-                $username = array_shift($path);
-                $folder   = implode('/', $path);
-
-                if ($username != $rcube->get_user_name()) {
-                    // Note: this assumes there's only one other users namespace root
-                    if ($ns = $storage->get_namespace('other')) {
-                        if ($prefix = $ns[0][0]) {
-                            $folder = $prefix . '/' . $username . '/' . $folder;
-                        }
-                    }
-                }
-                else if (!strlen($folder)) {
-                    $folder = 'INBOX';
-                }
-            }
-            else {
-                return;
-            }
-
-            return array(
-                'folder' => $folder,
-                'uid'    => $uid,
-                'params' => $params,
-            );
-        }
-
-        return false;
-    }
-
-    /**
-     * Build array of member URIs from set of messages
-     *
-     * @param string $folder   Folder name
-     * @param array  $messages Array of rcube_message objects
-     *
-     * @return array List of members (IMAP URIs)
-     */
-    public static function build_members($folder, $messages)
-    {
-        $members = array();
-
-        foreach ((array) $messages as $msg) {
-            $params = array(
-                'folder' => $folder,
-                'uid'    => $msg->uid,
-            );
-
-            // add search parameters:
-            // we don't want to build "invalid" searches e.g. that
-            // will return false positives (more or wrong messages)
-            if (($messageid = $msg->get('message-id', false)) && ($date = $msg->get('date', false))) {
-                $params['message-id'] = $messageid;
-                $params['date']       = $date;
-
-                if ($subject = $msg->get('subject', false)) {
-                    $params['subject'] = substr($subject, 0, 256);
-                }
-            }
-
-            $members[] = self::build_member_url($params);
-        }
-
-        return $members;
-    }
-
-    /**
-     * Resolve/validate/update members (which are IMAP URIs) of relation object.
-     *
-     * @param array $tag   Tag object
-     * @param bool  $force Force members list update
-     *
-     * @return array Folder/UIDs list
-     */
-    public static function resolve_members(&$tag, $force = true)
-    {
-        $result = array();
-
-        foreach ((array) $tag['members'] as $member) {
-            // IMAP URI members
-            if ($url = self::parse_member_url($member)) {
-                $folder = $url['folder'];
-
-                if (!$force) {
-                    $result[$folder][] = $url['uid'];
-                }
-                else {
-                    $result[$folder]['uid'][]    = $url['uid'];
-                    $result[$folder]['params'][] = $url['params'];
-                    $result[$folder]['member'][] = $member;
-                }
-            }
-        }
-
-        if (empty($result) || !$force) {
-            return $result;
-        }
-
-        $rcube   = rcube::get_instance();
-        $storage = $rcube->get_storage();
-        $search  = array();
-        $missing = array();
-
-        // first we search messages by Folder+UID
-        foreach ($result as $folder => $data) {
-            // @FIXME: maybe better use index() which is cached?
-            // @TODO: consider skip_deleted option
-            $index = $storage->search_once($folder, 'UID ' . rcube_imap_generic::compressMessageSet($data['uid']));
-            $uids  = $index->get();
-
-            // messages that were not found need to be searched by search parameters
-            $not_found = array_diff($data['uid'], $uids);
-            if (!empty($not_found)) {
-                foreach ($not_found as $uid) {
-                    $idx = array_search($uid, $data['uid']);
-
-                    if ($p = $data['params'][$idx]) {
-                        $search[] = $p;
-                    }
-
-                    $missing[] = $result[$folder]['member'][$idx];
-
-                    unset($result[$folder]['uid'][$idx]);
-                    unset($result[$folder]['params'][$idx]);
-                    unset($result[$folder]['member'][$idx]);
-                }
-            }
-
-            $result[$folder] = $uids;
-        }
-
-        // search in all subscribed mail folders using search parameters
-        if (!empty($search)) {
-            // remove not found members from the members list
-            $tag['members'] = array_diff($tag['members'], $missing);
-
-            // get subscribed folders
-            $folders = $storage->list_folders_subscribed('', '*', 'mail', null, true);
-
-            // @TODO: do this search in chunks (for e.g. 10 messages)?
-            $search_str = '';
-
-            foreach ($search as $p) {
-                $search_params = array();
-                foreach ($p as $key => $val) {
-                    $key = strtoupper($key);
-                    // don't search by subject, we don't want false-positives
-                    if ($key != 'SUBJECT') {
-                        $search_params[] = 'HEADER ' . $key . ' ' . rcube_imap_generic::escape($val);
-                    }
-                }
-
-                $search_str .= ' (' . implode(' ', $search_params) . ')';
-            }
-
-            $search_str = trim(str_repeat(' OR', count($search)-1) . $search_str);
-
-            // search
-            $search = $storage->search_once($folders, $search_str);
-
-            // handle search result
-            $folders = (array) $search->get_parameters('MAILBOX');
-
-            foreach ($folders as $folder) {
-                $set  = $search->get_set($folder);
-                $uids = $set->get();
-
-                if (!empty($uids)) {
-                    $msgs    = $storage->fetch_headers($folder, $uids, false);
-                    $members = self::build_members($folder, $msgs);
-
-                    // merge new members into the tag members list
-                    $tag['members'] = array_merge($tag['members'], $members);
-
-                    // add UIDs into the result
-                    $result[$folder] = array_unique(array_merge((array)$result[$folder], $uids));
-                }
-            }
-
-            // update tag object with new members list
-            $tag['members'] = array_unique($tag['members']);
-            kolab_storage_config::get_instance()->save($tag, 'relation', false);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Assign tags to kolab objects
-     *
-     * @param array $records List of kolab objects
-     *
-     * @return array List of tags
-     */
-    public function apply_tags(&$records)
-    {
-        // first convert categories into tags
-        foreach ($records as $i => $rec) {
-            if (!empty($rec['categories'])) {
-                $folder = new kolab_storage_folder($rec['_mailbox']);
-                if ($object = $folder->get_object($rec['uid'])) {
-                    $tags = $rec['categories'];
-
-                    unset($object['categories']);
-                    unset($records[$i]['categories']);
-
-                    $this->save_tags($rec['uid'], $tags);
-                    $folder->save($object, $rec['_type'], $rec['uid']);
-                }
-            }
-        }
-
-        $tags = array();
-
-        // assign tags to objects
-        foreach ($this->get_tags() as $tag) {
-            foreach ($records as $idx => $rec) {
-                $uid = self::build_member_url($rec['uid']);
-                if (in_array($uid, (array) $tag['members'])) {
-                    $records[$idx]['tags'][] = $tag['name'];
-                }
-            }
-
-            $tags[] = $tag['name'];
-        }
-
-        $tags = array_unique($tags);
-
-        return $tags;
-    }
-
-    /**
-     * Update object tags
-     *
-     * @param string $uid  Kolab object UID
-     * @param array  $tags List of tag names
-     */
-    public function save_tags($uid, $tags)
-    {
-        $url       = self::build_member_url($uid);
-        $relations = $this->get_tags();
-
-        foreach ($relations as $idx => $relation) {
-            $selected = !empty($tags) && in_array($relation['name'], $tags);
-            $found    = !empty($relation['members']) && in_array($url, $relation['members']);
-            $update   = false;
-
-            // remove member from the relation
-            if ($found && !$selected) {
-                $relation['members'] = array_diff($relation['members'], (array) $url);
-                $update = true;
-            }
-            // add member to the relation
-            else if (!$found && $selected) {
-                $relation['members'][] = $url;
-                $update = true;
-            }
-
-            if ($update) {
-                if ($this->save($relation, 'relation')) {
-                    $this->tags[$idx] = $relation; // update in-memory cache
-                }
-            }
-
-            if ($selected) {
-                $tags = array_diff($tags, (array)$relation['name']);
-            }
-        }
-
-        // create new relations
-        if (!empty($tags)) {
-            foreach ($tags as $tag) {
-                $relation = array(
-                    'name'     => $tag,
-                    'members'  => (array) $url,
-                    'category' => 'tag',
-                );
-
-                if ($this->save($relation, 'relation')) {
-                    $this->tags[] = $relation; // update in-memory cache
-                }
-            }
-        }
-    }
-
-    /**
-     * Get tags (all or referring to specified object)
-     *
-     * @param string $uid Optional object UID
-     *
-     * @return array List of Relation objects
-     */
-    public function get_tags($uid = '*')
-    {
-        if (!isset($this->tags)) {
-            $default = true;
-            $filter  = array(
-                array('type', '=', 'relation'),
-                array('category', '=', 'tag')
-            );
-
-            // use faster method
-            if ($uid && $uid != '*') {
-                $filter[] = array('member', '=', $uid);
-                $tags = $this->get_objects($filter, $default);
-            }
-            else {
-                $this->tags = $tags = $this->get_objects($filter, $default);
-            }
-        }
-        else {
-            $tags = $this->tags;
-        }
-
-        if ($uid === '*') {
-            return $tags;
-        }
-
-        $result = array();
-        $search = self::build_member_url($uid);
-
-        foreach ($tags as $tag) {
-            if (in_array($search, (array) $tag['members'])) {
-                $result[] = $tag;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Find objects linked with the given groupware object through a relation
-     *
-     * @param string Object UUID
-     * @param array List of related URIs
-     */
-    public function get_object_links($uid)
-    {
-        $links = array();
-        $object_uri = self::build_member_url($uid);
-
-        foreach ($this->get_relations_for_member($uid) as $relation) {
-            if (in_array($object_uri, (array) $relation['members'])) {
-                // make relation members up-to-date
-                kolab_storage_config::resolve_members($relation);
-
-                foreach ($relation['members'] as $member) {
-                    if ($member != $object_uri) {
-                        $links[] = $member;
-                    }
-                }
-            }
-        }
-
-        return array_unique($links);
-    }
-
-    /**
-     *
-     */
-    public function save_object_links($uid, $links, $remove = array())
-    {
-        $object_uri = self::build_member_url($uid);
-        $relations = $this->get_relations_for_member($uid);
-        $done = false;
-
-        foreach ($relations as $relation) {
-            // make relation members up-to-date
-            kolab_storage_config::resolve_members($relation);
-
-            // remove and add links
-            $members = array_diff($relation['members'], (array)$remove);
-            $members = array_unique(array_merge($members, $links));
-
-            // make sure the object_uri is still a member
-            if (!in_array($object_uri, $members)) {
-                $members[$object_uri];
-            }
-
-            // remove relation if no other members remain
-            if (count($members) <= 1) {
-                $done = $this->delete($relation['uid']);
-            }
-            // update relation object if members changed
-            else if (count(array_diff($members, $relation['members'])) || count(array_diff($relation['members'], $members))) {
-                $relation['members'] = $members;
-                $done = $this->save($relation, 'relation');
-                $links = array();
-            }
-            // no changes, we're happy
-            else {
-                $done = true;
-                $links = array();
-            }
-        }
-
-        // create a new relation
-        if (!$done && !empty($links)) {
-            $relation = array(
-                'members'  => array_merge($links, array($object_uri)),
-                'category' => 'generic',
-            );
-
-            $ret = $this->save($relation, 'relation');
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Find relation objects referring to specified note
-     */
-    public function get_relations_for_member($uid, $reltype = 'generic')
-    {
-        $default = true;
-        $filter  = array(
-            array('type', '=', 'relation'),
-            array('category', '=', $reltype),
-            array('member', '=', $uid),
-        );
-
-        return $this->get_objects($filter, $default, 100);
-    }
-
-    /**
-     * Find kolab objects assigned to specified e-mail message
-     *
-     * @param rcube_message $message E-mail message
-     * @param string        $folder  Folder name
-     * @param string        $type    Result objects type
-     *
-     * @return array List of kolab objects
-     */
-    public function get_message_relations($message, $folder, $type)
-    {
-        static $_cache = array();
-
-        $result  = array();
-        $uids    = array();
-        $default = true;
-        $uri     = self::get_message_uri($message, $folder);
-        $filter  = array(
-            array('type', '=', 'relation'),
-            array('category', '=', 'generic'),
-        );
-
-        // query by message-id
-        $member_id = $message->get('message-id', false);
-        if (empty($member_id)) {
-            // derive message identifier from URI
-            $member_id = md5($uri);
-        }
-        $filter[] = array('member', '=', $member_id);
-
-        if (!isset($_cache[$uri])) {
-            // get UIDs of related groupware objects
-            foreach ($this->get_objects($filter, $default) as $relation) {
-                // we don't need to update members if the URI is found
-                if (!in_array($uri, $relation['members'])) {
-                    // update members...
-                    $messages = kolab_storage_config::resolve_members($relation);
-                    // ...and check again
-                    if (empty($messages[$folder]) || !in_array($message->uid, $messages[$folder])) {
-                        continue;
-                    }
-                }
-
-                // find groupware object UID(s)
-                foreach ($relation['members'] as $member) {
-                    if (strpos($member, 'urn:uuid:') === 0) {
-                        $uids[] = substr($member, 9);
-                    }
-                }
-            }
-
-            // remember this lookup
-            $_cache[$uri] = $uids;
-        }
-        else {
-            $uids = $_cache[$uri];
-        }
-
-        // get kolab objects of specified type
-        if (!empty($uids)) {
-            $query  = array(array('uid', '=', array_unique($uids)));
-            $result = kolab_storage::select($query, $type);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Build a URI representing the given message reference
-     */
-    public static function get_message_uri($headers, $folder)
-    {
-        $params = array(
-            'folder' => $headers->folder ?: $folder,
-            'uid'    => $headers->uid,
-        );
-
-        if (($messageid = $headers->get('message-id', false)) && ($date = $headers->get('date', false))) {
-            $params['message-id'] = $messageid;
-            $params['date']       = $date;
-
-            if ($subject = $headers->get('subject')) {
-                $params['subject'] = $subject;
-            }
-        }
-
-        return self::build_member_url($params);
-    }
-
-    /**
-     * Resolve the email message reference from the given URI
-     */
-    public function get_message_reference($uri, $rel = null)
-    {
-        if ($linkref = self::parse_member_url($uri)) {
-            $linkref['subject'] = $linkref['params']['subject'];
-            $linkref['uri']     = $uri;
-
-            $rcmail = rcube::get_instance();
-            if (method_exists($rcmail, 'url')) {
-                $linkref['mailurl'] = $rcmail->url(array(
-                    'task'   => 'mail',
-                    'action' => 'show',
-                    'mbox'   => $linkref['folder'],
-                    'uid'    => $linkref['uid'],
-                    'rel'    => $rel,
-                ));
-            }
-
-            unset($linkref['params']);
-        }
-
-        return $linkref;
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_dataset.php Deleted

@@ -1,154 +0,0 @@
-<?php
-
-/**
- * Dataset class providing the results of a select operation on a kolab_storage_folder.
- *
- * Can be used as a normal array as well as an iterator in foreach() loops.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-
-class kolab_storage_dataset implements Iterator, ArrayAccess, Countable
-{
-    private $cache;  // kolab_storage_cache instance to use for fetching data
-    private $memlimit = 0;
-    private $buffer = false;
-    private $index = array();
-    private $data = array();
-    private $iteratorkey = 0;
-    private $error = null;
-
-    /**
-     * Default constructor
-     *
-     * @param object kolab_storage_cache instance to be used for fetching objects upon access
-     */
-    public function __construct($cache)
-    {
-        $this->cache = $cache;
-
-        // enable in-memory buffering up until 1/5 of the available memory
-        if (function_exists('memory_get_usage')) {
-            $this->memlimit = parse_bytes(ini_get('memory_limit')) / 5;
-            $this->buffer = true;
-        }
-    }
-
-    /**
-     * Return error state
-     */
-    public function is_error()
-    {
-        return !empty($this->error);
-    }
-
-    /**
-     * Set error state
-     */
-    public function set_error($err)
-    {
-        $this->error = $err;
-    }
-
-
-    /*** Implement PHP Countable interface ***/
-
-    public function count()
-    {
-        return count($this->index);
-    }
-
-
-    /*** Implement PHP ArrayAccess interface ***/
-
-    public function offsetSet($offset, $value)
-    {
-        $uid = $value['_msguid'];
-
-        if (is_null($offset)) {
-            $offset = count($this->index);
-            $this->index[] = $uid;
-        }
-        else {
-            $this->index[$offset] = $uid;
-        }
-
-        // keep full payload data in memory if possible
-        if ($this->memlimit && $this->buffer && isset($value['_mailbox'])) {
-            $this->data[$offset] = $value;
-
-            // check memory usage and stop buffering
-            if ($offset % 10 == 0) {
-                $this->buffer = memory_get_usage() < $this->memlimit;
-            }
-        }
-    }
-
-    public function offsetExists($offset)
-    {
-        return isset($this->index[$offset]);
-    }
-
-    public function offsetUnset($offset)
-    {
-        unset($this->index[$offset]);
-    }
-
-    public function offsetGet($offset)
-    {
-        if (isset($this->data[$offset])) {
-            return $this->data[$offset];
-        }
-        else if ($msguid = $this->index[$offset]) {
-            return $this->cache->get($msguid);
-        }
-
-        return null;
-    }
-
-
-    /*** Implement PHP Iterator interface ***/
-
-    public function current()
-    {
-        return $this->offsetGet($this->iteratorkey);
-    }
-
-    public function key()
-    {
-        return $this->iteratorkey;
-    }
-
-    public function next()
-    {
-        $this->iteratorkey++;
-        return $this->valid();
-    }
-
-    public function rewind()
-    {
-        $this->iteratorkey = 0;
-    }
-
-    public function valid()
-    {
-        return !empty($this->index[$this->iteratorkey]);
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder.php Deleted

@@ -1,1166 +0,0 @@
-<?php
-
-/**
- * The kolab_storage_folder class represents an IMAP folder on the Kolab server.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2012-2013, 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/>.
- */
-class kolab_storage_folder extends kolab_storage_folder_api
-{
-    /**
-     * The kolab_storage_cache instance for caching operations
-     * @var object
-     */
-    public $cache;
-
-    /**
-     * Indicate validity status
-     * @var boolean
-     */
-    public $valid = false;
-
-    protected $error = 0;
-
-    protected $resource_uri;
-
-
-    /**
-     * Default constructor
-     *
-     * @param string The folder name/path
-     * @param string Expected folder type
-     */
-    function __construct($name, $type = null, $type_annotation = null)
-    {
-        parent::__construct($name);
-        $this->imap->set_options(array('skip_deleted' => true));
-        $this->set_folder($name, $type, $type_annotation);
-    }
-
-
-    /**
-     * Set the IMAP folder this instance connects to
-     *
-     * @param string The folder name/path
-     * @param string Expected folder type
-     * @param string Optional folder type if known
-     */
-    public function set_folder($name, $type = null, $type_annotation = null)
-    {
-        if (empty($type_annotation)) {
-            $type_annotation = kolab_storage::folder_type($name);
-        }
-
-        $oldtype = $this->type;
-        list($this->type, $suffix) = explode('.', $type_annotation);
-        $this->default      = $suffix == 'default';
-        $this->subtype      = $this->default ? '' : $suffix;
-        $this->name         = $name;
-        $this->id           = kolab_storage::folder_id($name);
-        $this->valid        = !empty($this->type) && $this->type != 'mail' && (!$type || $this->type == $type);
-
-        if (!$this->valid) {
-            $this->error = $this->imap->get_error_code() < 0 ? kolab_storage::ERROR_IMAP_CONN : kolab_storage::ERROR_INVALID_FOLDER;
-        }
-
-        // reset cached object properties
-        $this->owner = $this->namespace = $this->resource_uri = $this->info = $this->idata = null;
-
-        // get a new cache instance if folder type changed
-        if (!$this->cache || $this->type != $oldtype)
-            $this->cache = kolab_storage_cache::factory($this);
-        else
-            $this->cache->set_folder($this);
-
-        $this->imap->set_folder($this->name);
-    }
-
-    /**
-     * Returns code of last error
-     *
-     * @return int Error code
-     */
-    public function get_error()
-    {
-        return $this->error ?: $this->cache->get_error();
-    }
-
-    /**
-     * Check IMAP connection error state
-     */
-    public function check_error()
-    {
-        if (($err_code = $this->imap->get_error_code()) < 0) {
-            $this->error = kolab_storage::ERROR_IMAP_CONN;
-            if (($res_code = $this->imap->get_response_code()) !== 0 && in_array($res_code, array(rcube_storage::NOPERM, rcube_storage::READONLY))) {
-                $this->error = kolab_storage::ERROR_NO_PERMISSION;
-            }
-        }
-
-        return $this->error;
-    }
-
-    /**
-     * Compose a unique resource URI for this IMAP folder
-     */
-    public function get_resource_uri()
-    {
-        if (!empty($this->resource_uri))
-            return $this->resource_uri;
-
-        // strip namespace prefix from folder name
-        $ns = $this->get_namespace();
-        $nsdata = $this->imap->get_namespace($ns);
-        if (is_array($nsdata[0]) && strlen($nsdata[0][0]) && strpos($this->name, $nsdata[0][0]) === 0) {
-            $subpath = substr($this->name, strlen($nsdata[0][0]));
-            if ($ns == 'other') {
-                list($user, $suffix) = explode($nsdata[0][1], $subpath, 2);
-                $subpath = $suffix;
-            }
-        }
-        else {
-            $subpath = $this->name;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = 'imap://' . urlencode($this->get_owner(true)) . '@' . $this->imap->options['host'] . '/' . $subpath;
-        return $this->resource_uri;
-    }
-
-    /**
-     * Helper method to extract folder UID metadata
-     *
-     * @return string Folder's UID
-     */
-    public function get_uid()
-    {
-        // UID is defined in folder METADATA
-        $metakeys = array(kolab_storage::UID_KEY_SHARED, kolab_storage::UID_KEY_PRIVATE, kolab_storage::UID_KEY_CYRUS);
-        $metadata = $this->get_metadata($metakeys);
-        foreach ($metakeys as $key) {
-            if (($uid = $metadata[$key])) {
-                return $uid;
-            }
-        }
-
-        // generate a folder UID and set it to IMAP
-        $uid = rtrim(chunk_split(md5($this->name . $this->get_owner() . uniqid('-', true)), 12, '-'), '-');
-        if ($this->set_uid($uid)) {
-            return $uid;
-        }
-
-        // create hash from folder name if we can't write the UID metadata
-        return md5($this->name . $this->get_owner());
-    }
-
-    /**
-     * Helper method to set an UID value to the given IMAP folder instance
-     *
-     * @param string Folder's UID
-     * @return boolean True on succes, False on failure
-     */
-    public function set_uid($uid)
-    {
-        if (!($success = $this->set_metadata(array(kolab_storage::UID_KEY_SHARED => $uid)))) {
-            $success = $this->set_metadata(array(kolab_storage::UID_KEY_PRIVATE => $uid));
-        }
-
-        $this->check_error();
-        return $success;
-    }
-
-    /**
-     * Compose a folder Etag identifier
-     */
-    public function get_ctag()
-    {
-        $fdata = $this->get_imap_data();
-        $this->check_error();
-        return sprintf('%d-%d-%d', $fdata['UIDVALIDITY'], $fdata['HIGHESTMODSEQ'], $fdata['UIDNEXT']);
-    }
-
-    /**
-     * Check activation status of this folder
-     *
-     * @return boolean True if enabled, false if not
-     */
-    public function is_active()
-    {
-        return kolab_storage::folder_is_active($this->name);
-    }
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param boolean The desired subscription status: true = active, false = not active
-     *
-     * @return True on success, false on error
-     */
-    public function activate($active)
-    {
-        return $active ? kolab_storage::folder_activate($this->name) : kolab_storage::folder_deactivate($this->name);
-    }
-
-    /**
-     * Check subscription status of this folder
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public function is_subscribed()
-    {
-        return kolab_storage::folder_is_subscribed($this->name);
-    }
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
-     *
-     * @return True on success, false on error
-     */
-    public function subscribe($subscribed)
-    {
-        return $subscribed ? kolab_storage::folder_subscribe($this->name) : kolab_storage::folder_unsubscribe($this->name);
-    }
-
-    /**
-     * Get number of objects stored in this folder
-     *
-     * @param mixed  Pseudo-SQL query as list of filter parameter triplets
-     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
-     * @return integer The number of objects of the given type
-     * @see self::select()
-     */
-    public function count($query = null)
-    {
-        if (!$this->valid) {
-            return 0;
-        }
-
-        // synchronize cache first
-        $this->cache->synchronize();
-
-        return $this->cache->count($this->_prepare_query($query));
-    }
-
-
-    /**
-     * List all Kolab objects of the given type
-     *
-     * @param string  $type Object type (e.g. contact, event, todo, journal, note, configuration)
-     * @return array  List of Kolab data objects (each represented as hash array)
-     */
-    public function get_objects($type = null)
-    {
-        if (!$type) $type = $this->type;
-
-        if (!$this->valid) {
-            return array();
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        // fetch objects from cache
-        return $this->cache->select($this->_prepare_query($type));
-    }
-
-
-    /**
-     * Select *some* Kolab objects matching the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
-     * @return array List of Kolab data objects (each represented as hash array)
-     */
-    public function select($query = array())
-    {
-        if (!$this->valid) {
-            return array();
-        }
-
-        // check query argument
-        if (empty($query)) {
-            return $this->get_objects();
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        // fetch objects from cache
-        return $this->cache->select($this->_prepare_query($query));
-    }
-
-
-    /**
-     * Getter for object UIDs only
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     * @return array List of Kolab object UIDs
-     */
-    public function get_uids($query = array())
-    {
-        if (!$this->valid) {
-            return array();
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        // fetch UIDs from cache
-        return $this->cache->select($this->_prepare_query($query), true);
-    }
-
-    /**
-     * Setter for ORDER BY and LIMIT parameters for cache queries
-     *
-     * @param array   List of columns to order by
-     * @param integer Limit result set to this length
-     * @param integer Offset row
-     */
-    public function set_order_and_limit($sortcols, $length = null, $offset = 0)
-    {
-        $this->cache->set_order_by($sortcols);
-
-        if ($length !== null) {
-            $this->cache->set_limit($length, $offset);
-        }
-    }
-
-    /**
-     * Helper method to sanitize query arguments
-     */
-    private function _prepare_query($query)
-    {
-        // string equals type query
-        // FIXME: should not be called this way!
-        if (is_string($query)) {
-            return $this->cache->has_type_col() && !empty($query) ? array(array('type','=',$query)) : array();
-        }
-
-        foreach ((array)$query as $i => $param) {
-            if ($param[0] == 'type' && !$this->cache->has_type_col()) {
-                unset($query[$i]);
-            }
-            else if (($param[0] == 'dtstart' || $param[0] == 'dtend' || $param[0] == 'changed')) {
-                if (is_object($param[2]) && is_a($param[2], 'DateTime'))
-                    $param[2] = $param[2]->format('U');
-                if (is_numeric($param[2]))
-                    $query[$i][2] = date('Y-m-d H:i:s', $param[2]);
-            }
-        }
-
-        return $query;
-    }
-
-
-    /**
-     * Getter for a single Kolab object, identified by its UID
-     *
-     * @param string $uid  Object UID
-     * @param string $type Object type (e.g. contact, event, todo, journal, note, configuration)
-     *                     Defaults to folder type
-     *
-     * @return array The Kolab object represented as hash array
-     */
-    public function get_object($uid, $type = null)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        $msguid = $this->cache->uid2msguid($uid);
-
-        if ($msguid && ($object = $this->cache->get($msguid, $type))) {
-            return $object;
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Fetch a Kolab object attachment which is stored in a separate part
-     * of the mail MIME message that represents the Kolab record.
-     *
-     * @param string   Object's UID
-     * @param string   The attachment's mime number
-     * @param string   IMAP folder where message is stored;
-     *                 If set, that also implies that the given UID is an IMAP UID
-     * @param bool     True to print the part content
-     * @param resource File pointer to save the message part
-     * @param boolean  Disables charset conversion
-     *
-     * @return mixed  The attachment content as binary string
-     */
-    public function get_attachment($uid, $part, $mailbox = null, $print = false, $fp = null, $skip_charset_conv = false)
-    {
-        if ($this->valid && ($msguid = ($mailbox ? $uid : $this->cache->uid2msguid($uid)))) {
-            $this->imap->set_folder($mailbox ? $mailbox : $this->name);
-
-            if (substr($part, 0, 2) == 'i:') {
-                // attachment data is stored in XML
-                if ($object = $this->cache->get($msguid)) {
-                    // load data from XML (attachment content is not stored in cache)
-                    if ($object['_formatobj'] && isset($object['_size'])) {
-                        $object['_attachments'] = array();
-                        $object['_formatobj']->get_attachments($object);
-                    }
-
-                    foreach ($object['_attachments'] as $attach) {
-                        if ($attach['id'] == $part) {
-                            if ($print)   echo $attach['content'];
-                            else if ($fp) fwrite($fp, $attach['content']);
-                            else          return $attach['content'];
-                            return true;
-                        }
-                    }
-                }
-            }
-            else {
-                // return message part from IMAP directly
-                return $this->imap->get_message_part($msguid, $part, null, $print, $fp, $skip_charset_conv);
-            }
-        }
-
-        return null;
-    }
-
-
-    /**
-     * Fetch the mime message from the storage server and extract
-     * the Kolab groupware object from it
-     *
-     * @param string The IMAP message UID to fetch
-     * @param string The object type expected (use wildcard '*' to accept all types)
-     * @param string The folder name where the message is stored
-     *
-     * @return mixed Hash array representing the Kolab object, a kolab_format instance or false if not found
-     */
-    public function read_object($msguid, $type = null, $folder = null)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if (!$type) $type = $this->type;
-        if (!$folder) $folder = $this->name;
-
-        $this->imap->set_folder($folder);
-
-        $this->cache->bypass(true);
-        $message = new rcube_message($msguid);
-        $this->cache->bypass(false);
-
-        // Message doesn't exist?
-        if (empty($message->headers)) {
-            return false;
-        }
-
-        // extract the X-Kolab-Type header from the XML attachment part if missing
-        if (empty($message->headers->others['x-kolab-type'])) {
-            foreach ((array)$message->attachments as $part) {
-                if (strpos($part->mimetype, kolab_format::KTYPE_PREFIX) === 0) {
-                    $message->headers->others['x-kolab-type'] = $part->mimetype;
-                    break;
-                }
-            }
-        }
-        // fix buggy messages stating the X-Kolab-Type header twice
-        else if (is_array($message->headers->others['x-kolab-type'])) {
-            $message->headers->others['x-kolab-type'] = reset($message->headers->others['x-kolab-type']);
-        }
-
-        // no object type header found: abort
-        if (empty($message->headers->others['x-kolab-type'])) {
-            rcube::raise_error(array(
-                'code' => 600,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "No X-Kolab-Type information found in message $msguid ($this->name).",
-            ), true);
-            return false;
-        }
-
-        $object_type  = kolab_format::mime2object_type($message->headers->others['x-kolab-type']);
-        $content_type = kolab_format::KTYPE_PREFIX . $object_type;
-
-        // check object type header and abort on mismatch
-        if ($type != '*' && $object_type != $type)
-            return false;
-
-        $attachments = array();
-
-        // get XML part
-        foreach ((array)$message->attachments as $part) {
-            if (!$xml && ($part->mimetype == $content_type || preg_match('!application/([a-z.]+\+)?xml!', $part->mimetype))) {
-                $xml = $message->get_part_body($part->mime_id, true);
-            }
-            else if ($part->filename || $part->content_id) {
-                $key  = $part->content_id ? trim($part->content_id, '<>') : $part->filename;
-                $size = null;
-
-                // Use Content-Disposition 'size' as for the Kolab Format spec.
-                if (isset($part->d_parameters['size'])) {
-                    $size = $part->d_parameters['size'];
-                }
-                // we can trust part size only if it's not encoded
-                else if ($part->encoding == 'binary' || $part->encoding == '7bit' || $part->encoding == '8bit') {
-                    $size = $part->size;
-                }
-
-                $attachments[$key] = array(
-                    'id'       => $part->mime_id,
-                    'name'     => $part->filename,
-                    'mimetype' => $part->mimetype,
-                    'size'     => $size,
-                );
-            }
-        }
-
-        if (!$xml) {
-            rcube::raise_error(array(
-                'code' => 600,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "Could not find Kolab data part in message $msguid ($this->name).",
-            ), true);
-            return false;
-        }
-
-        // check kolab format version
-        $format_version = $message->headers->others['x-kolab-mime-version'];
-        if (empty($format_version)) {
-            list($xmltype, $subtype) = explode('.', $object_type);
-            $xmlhead = substr($xml, 0, 512);
-
-            // detect old Kolab 2.0 format
-            if (strpos($xmlhead, '<' . $xmltype) !== false && strpos($xmlhead, 'xmlns=') === false)
-                $format_version = '2.0';
-            else
-                $format_version = '3.0'; // assume 3.0
-        }
-
-        // get Kolab format handler for the given type
-        $format = kolab_format::factory($object_type, $format_version);
-
-        if (is_a($format, 'PEAR_Error'))
-            return false;
-
-        // load Kolab object from XML part
-        $format->load($xml);
-
-        if ($format->is_valid()) {
-            $object = $format->to_array(array('_attachments' => $attachments));
-            $object['_type']      = $object_type;
-            $object['_msguid']    = $msguid;
-            $object['_mailbox']   = $this->name;
-            $object['_formatobj'] = $format;
-
-            return $object;
-        }
-        else {
-            // try to extract object UID from XML block
-            if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m))
-                $msgadd = " UID = " . trim(strip_tags($m[1]));
-
-            rcube::raise_error(array(
-                'code' => 600,
-                'type' => 'php',
-                'file' => __FILE__,
-                'line' => __LINE__,
-                'message' => "Could not parse Kolab object data in message $msguid ($this->name)." . $msgadd,
-            ), true);
-        }
-
-        return false;
-    }
-
-    /**
-     * Save an object in this folder.
-     *
-     * @param array  $object    The array that holds the data of the object.
-     * @param string $type      The type of the kolab object.
-     * @param string $uid       The UID of the old object if it existed before
-     * @return boolean          True on success, false on error
-     */
-    public function save(&$object, $type = null, $uid = null)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if (!$type)
-            $type = $this->type;
-
-        // copy attachments from old message
-        if (!empty($object['_msguid']) && ($old = $this->cache->get($object['_msguid'], $type, $object['_mailbox']))) {
-            foreach ((array)$old['_attachments'] as $key => $att) {
-                if (!isset($object['_attachments'][$key])) {
-                    $object['_attachments'][$key] = $old['_attachments'][$key];
-                }
-                // unset deleted attachment entries
-                if ($object['_attachments'][$key] == false) {
-                    unset($object['_attachments'][$key]);
-                }
-                // load photo.attachment from old Kolab2 format to be directly embedded in xcard block
-                else if ($type == 'contact' && ($key == 'photo.attachment' || $key == 'kolab-picture.png') && $att['id']) {
-                    if (!isset($object['photo']))
-                        $object['photo'] = $this->get_attachment($object['_msguid'], $att['id'], $object['_mailbox']);
-                    unset($object['_attachments'][$key]);
-                }
-            }
-        }
-
-        // save contact photo to attachment for Kolab2 format
-        if (kolab_storage::$version == '2.0' && $object['photo']) {
-            $attkey = 'kolab-picture.png';  // this file name is hard-coded in libkolab/kolabformatV2/contact.cpp
-            $object['_attachments'][$attkey] = array(
-                'mimetype'=> rcube_mime::image_content_type($object['photo']),
-                'content' => preg_match('![^a-z0-9/=+-]!i', $object['photo']) ? $object['photo'] : base64_decode($object['photo']),
-            );
-        }
-
-        // process attachments
-        if (is_array($object['_attachments'])) {
-            $numatt = count($object['_attachments']);
-            foreach ($object['_attachments'] as $key => $attachment) {
-                // FIXME: kolab_storage and Roundcube attachment hooks use different fields!
-                if (empty($attachment['content']) && !empty($attachment['data'])) {
-                    $attachment['content'] = $attachment['data'];
-                    unset($attachment['data'], $object['_attachments'][$key]['data']);
-                }
-
-                // make sure size is set, so object saved in cache contains this info
-                if (!isset($attachment['size'])) {
-                    if (!empty($attachment['content'])) {
-                        if (is_resource($attachment['content'])) {
-                            // this need to be a seekable resource, otherwise
-                            // fstat() failes and we're unable to determine size
-                            // here nor in rcube_imap_generic before IMAP APPEND
-                            $stat = fstat($attachment['content']);
-                            $attachment['size'] = $stat ? $stat['size'] : 0;
-                        }
-                        else {
-                            $attachment['size'] = strlen($attachment['content']);
-                        }
-                    }
-                    else if (!empty($attachment['path'])) {
-                        $attachment['size'] = filesize($attachment['path']);
-                    }
-                    $object['_attachments'][$key] = $attachment;
-                }
-
-                // generate unique keys (used as content-id) for attachments
-                if (is_numeric($key) && $key < $numatt) {
-                    // derrive content-id from attachment file name
-                    $ext = preg_match('/(\.[a-z0-9]{1,6})$/i', $attachment['name'], $m) ? $m[1] : null;
-                    $basename = preg_replace('/[^a-z0-9_.-]/i', '', basename($attachment['name'], $ext));  // to 7bit ascii
-                    if (!$basename) $basename = 'noname';
-                    $cid = $basename . '.' . microtime(true) . $ext;
-
-                    $object['_attachments'][$cid] = $attachment;
-                    unset($object['_attachments'][$key]);
-                }
-            }
-        }
-
-        // save recurrence exceptions as individual objects due to lack of support in Kolab v2 format
-        if (kolab_storage::$version == '2.0' && $object['recurrence']['EXCEPTIONS']) {
-            $this->save_recurrence_exceptions($object, $type);
-        }
-
-        // check IMAP BINARY extension support for 'file' objects
-        // allow configuration to workaround bug in Cyrus < 2.4.17
-        $rcmail = rcube::get_instance();
-        $binary = $type == 'file' && !$rcmail->config->get('kolab_binary_disable') && $this->imap->get_capability('BINARY');
-
-        // generate and save object message
-        if ($raw_msg = $this->build_message($object, $type, $binary, $body_file)) {
-            // resolve old msguid before saving
-            if ($uid && empty($object['_msguid']) && ($msguid = $this->cache->uid2msguid($uid))) {
-                $object['_msguid'] = $msguid;
-                $object['_mailbox'] = $this->name;
-            }
-
-            $result = $this->imap->save_message($this->name, $raw_msg, null, false, null, null, $binary);
-
-            // update cache with new UID
-            if ($result) {
-                $old_uid = $object['_msguid'];
-
-                $object['_msguid'] = $result;
-                $object['_mailbox'] = $this->name;
-
-                if ($old_uid) {
-                    // delete old message
-                    $this->cache->bypass(true);
-                    $this->imap->delete_message($old_uid, $object['_mailbox']);
-                    $this->cache->bypass(false);
-                }
-
-                // insert/update message in cache
-                $this->cache->save($result, $object, $old_uid);
-            }
-
-            // remove temp file
-            if ($body_file) {
-                @unlink($body_file);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Save recurrence exceptions as individual objects.
-     * The Kolab v2 format doesn't allow us to save fully embedded exception objects.
-     *
-     * @param array Hash array with event properties
-     * @param string Object type
-     */
-    private function save_recurrence_exceptions(&$object, $type = null)
-    {
-        if ($object['recurrence']['EXCEPTIONS']) {
-            $exdates = array();
-            foreach ((array)$object['recurrence']['EXDATE'] as $exdate) {
-                $key = is_a($exdate, 'DateTime') ? $exdate->format('Y-m-d') : strval($exdate);
-                $exdates[$key] = 1;
-            }
-
-            // save every exception as individual object
-            foreach((array)$object['recurrence']['EXCEPTIONS'] as $exception) {
-                $exception['uid'] = self::recurrence_exception_uid($object['uid'], $exception['start']->format('Ymd'));
-                $exception['sequence'] = $object['sequence'] + 1;
-
-                if ($exception['thisandfuture']) {
-                    $exception['recurrence'] = $object['recurrence'];
-
-                    // adjust the recurrence duration of the exception
-                    if ($object['recurrence']['COUNT']) {
-                        $recurrence = new kolab_date_recurrence($object['_formatobj']);
-                        if ($end = $recurrence->end()) {
-                            unset($exception['recurrence']['COUNT']);
-                            $exception['recurrence']['UNTIL'] = $end;
-                        }
-                    }
-
-                    // set UNTIL date if we have a thisandfuture exception
-                    $untildate = clone $exception['start'];
-                    $untildate->sub(new DateInterval('P1D'));
-                    $object['recurrence']['UNTIL'] = $untildate;
-                    unset($object['recurrence']['COUNT']);
-                }
-                else {
-                    if (!$exdates[$exception['start']->format('Y-m-d')])
-                        $object['recurrence']['EXDATE'][] = clone $exception['start'];
-                    unset($exception['recurrence']);
-                }
-
-                unset($exception['recurrence']['EXCEPTIONS'], $exception['_formatobj'], $exception['_msguid']);
-                $this->save($exception, $type, $exception['uid']);
-            }
-
-            unset($object['recurrence']['EXCEPTIONS']);
-        }
-    }
-
-    /**
-     * Generate an object UID with the given recurrence-ID in a way that it is
-     * unique (the original UID is not a substring) but still recoverable.
-     */
-    private static function recurrence_exception_uid($uid, $recurrence_id)
-    {
-        $offset = -2;
-        return substr($uid, 0, $offset) . '-' . $recurrence_id . '-' . substr($uid, $offset);
-    }
-
-    /**
-     * Delete the specified object from this folder.
-     *
-     * @param  mixed   $object  The Kolab object to delete or object UID
-     * @param  boolean $expunge Should the folder be expunged?
-     *
-     * @return boolean True if successful, false on error
-     */
-    public function delete($object, $expunge = true)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        $msguid = is_array($object) ? $object['_msguid'] : $this->cache->uid2msguid($object);
-        $success = false;
-
-        $this->cache->bypass(true);
-
-        if ($msguid && $expunge) {
-            $success = $this->imap->delete_message($msguid, $this->name);
-        }
-        else if ($msguid) {
-            $success = $this->imap->set_flag($msguid, 'DELETED', $this->name);
-        }
-
-        $this->cache->bypass(false);
-
-        if ($success) {
-            $this->cache->set($msguid, false);
-        }
-
-        return $success;
-    }
-
-
-    /**
-     *
-     */
-    public function delete_all()
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        $this->cache->purge();
-        $this->cache->bypass(true);
-        $result = $this->imap->clear_folder($this->name);
-        $this->cache->bypass(false);
-
-        return $result;
-    }
-
-
-    /**
-     * Restore a previously deleted object
-     *
-     * @param string Object UID
-     * @return mixed Message UID on success, false on error
-     */
-    public function undelete($uid)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if ($msguid = $this->cache->uid2msguid($uid, true)) {
-            $this->cache->bypass(true);
-            $result = $this->imap->set_flag($msguid, 'UNDELETED', $this->name);
-            $this->cache->bypass(false);
-
-            if ($result) {
-                return $msguid;
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Move a Kolab object message to another IMAP folder
-     *
-     * @param string Object UID
-     * @param string IMAP folder to move object to
-     * @return boolean True on success, false on failure
-     */
-    public function move($uid, $target_folder)
-    {
-        if (!$this->valid) {
-            return false;
-        }
-
-        if (is_string($target_folder))
-            $target_folder = kolab_storage::get_folder($target_folder);
-
-        if ($msguid = $this->cache->uid2msguid($uid)) {
-            $this->cache->bypass(true);
-            $result = $this->imap->move_message($msguid, $target_folder->name, $this->name);
-            $this->cache->bypass(false);
-
-            if ($result) {
-                $this->cache->move($msguid, $uid, $target_folder);
-                return true;
-            }
-            else {
-                rcube::raise_error(array(
-                    'code' => 600, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(),
-                ), true);
-            }
-        }
-
-        return false;
-    }
-
-
-    /**
-     * Creates source of the configuration object message
-     *
-     * @param array  $object    The array that holds the data of the object.
-     * @param string $type      The type of the kolab object.
-     * @param bool   $binary    Enables use of binary encoding of attachment(s)
-     * @param string $body_file Reference to filename of message body
-     *
-     * @return mixed Message as string or array with two elements
-     *               (one for message file path, second for message headers)
-     */
-    private function build_message(&$object, $type, $binary, &$body_file)
-    {
-        // load old object to preserve data we don't understand/process
-        if (is_object($object['_formatobj']))
-            $format = $object['_formatobj'];
-        else if ($object['_msguid'] && ($old = $this->cache->get($object['_msguid'], $type, $object['_mailbox'])))
-            $format = $old['_formatobj'];
-
-        // create new kolab_format instance
-        if (!$format)
-            $format = kolab_format::factory($type, kolab_storage::$version);
-
-        if (PEAR::isError($format))
-            return false;
-
-        $format->set($object);
-        $xml = $format->write(kolab_storage::$version);
-        $object['uid'] = $format->uid;  // read UID from format
-        $object['_formatobj'] = $format;
-
-        if (empty($xml) || !$format->is_valid() || empty($object['uid'])) {
-            return false;
-        }
-
-        $mime     = new Mail_mime("\r\n");
-        $rcmail   = rcube::get_instance();
-        $headers  = array();
-        $files    = array();
-        $part_id  = 1;
-        $encoding = $binary ? 'binary' : 'base64';
-
-        if ($user_email = $rcmail->get_user_email()) {
-            $headers['From'] = $user_email;
-            $headers['To'] = $user_email;
-        }
-        $headers['Date'] = date('r');
-        $headers['X-Kolab-Type'] = kolab_format::KTYPE_PREFIX . $type;
-        $headers['X-Kolab-Mime-Version'] = kolab_storage::$version;
-        $headers['Subject'] = $object['uid'];
-//        $headers['Message-ID'] = $rcmail->gen_message_id();
-        $headers['User-Agent'] = $rcmail->config->get('useragent');
-
-        // Check if we have enough memory to handle the message in it
-        // It's faster than using files, so we'll do this if we only can
-        if (!empty($object['_attachments']) && ($mem_limit = parse_bytes(ini_get('memory_limit'))) > 0) {
-            $memory = function_exists('memory_get_usage') ? memory_get_usage() : 16*1024*1024; // safe value: 16MB
-
-            foreach ($object['_attachments'] as $attachment) {
-                $memory += $attachment['size'];
-            }
-
-            // 1.33 is for base64, we need at least 4x more memory than the message size
-            if ($memory * ($binary ? 1 : 1.33) * 4 > $mem_limit) {
-                $marker   = '%%%~~~' . md5(microtime(true) . $memory) . '~~~%%%';
-                $is_file  = true;
-                $temp_dir = unslashify($rcmail->config->get('temp_dir'));
-                $mime->setParam('delay_file_io', true);
-            }
-        }
-
-        $mime->headers($headers);
-        $mime->setTXTBody("This is a Kolab Groupware object. "
-            . "To view this object you will need an email client that understands the Kolab Groupware format. "
-            . "For a list of such email clients please visit http://www.kolab.org/\n\n");
-
-        $ctype = kolab_storage::$version == '2.0' ? $format->CTYPEv2 : $format->CTYPE;
-        // Convert new lines to \r\n, to wrokaround "NO Message contains bare newlines"
-        // when APPENDing from temp file
-        $xml = preg_replace('/\r?\n/', "\r\n", $xml);
-
-        $mime->addAttachment($xml,  // file
-            $ctype,                 // content-type
-            'kolab.xml',            // filename
-            false,                  // is_file
-            '8bit',                 // encoding
-            'attachment',           // disposition
-            RCUBE_CHARSET           // charset
-        );
-        $part_id++;
-
-        // save object attachments as separate parts
-        foreach ((array)$object['_attachments'] as $key => $att) {
-            if (empty($att['content']) && !empty($att['id'])) {
-                // @TODO: use IMAP CATENATE to skip attachment fetch+push operation
-                $msguid = !empty($object['_msguid']) ? $object['_msguid'] : $object['uid'];
-                if ($is_file) {
-                    $att['path'] = tempnam($temp_dir, 'rcmAttmnt');
-                    if (($fp = fopen($att['path'], 'w')) && $this->get_attachment($msguid, $att['id'], $object['_mailbox'], false, $fp, true)) {
-                        fclose($fp);
-                    }
-                    else {
-                        return false;
-                    }
-                }
-                else {
-                    $att['content'] = $this->get_attachment($msguid, $att['id'], $object['_mailbox'], false, null, true);
-                }
-            }
-
-            $headers = array('Content-ID' => Mail_mimePart::encodeHeader('Content-ID', '<' . $key . '>', RCUBE_CHARSET, 'quoted-printable'));
-            $name = !empty($att['name']) ? $att['name'] : $key;
-
-            // To store binary files we can use faster method
-            // without writting full message content to a temporary file but
-            // directly to IMAP, see rcube_imap_generic::append().
-            // I.e. use file handles where possible
-            if (!empty($att['path'])) {
-                if ($is_file && $binary) {
-                    $files[] = fopen($att['path'], 'r');
-                    $mime->addAttachment($marker, $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-                else {
-                    $mime->addAttachment($att['path'], $att['mimetype'], $name, true, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-            }
-            else {
-                if (is_resource($att['content']) && $is_file && $binary) {
-                    $files[] = $att['content'];
-                    $mime->addAttachment($marker, $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-                else {
-                    if (is_resource($att['content'])) {
-                        @rewind($att['content']);
-                        $att['content'] = stream_get_contents($att['content']);
-                    }
-                    $mime->addAttachment($att['content'], $att['mimetype'], $name, false, $encoding, 'attachment', '', '', '', null, null, '', RCUBE_CHARSET, $headers);
-                }
-            }
-
-            $object['_attachments'][$key]['id'] = ++$part_id;
-        }
-
-        if (!$is_file || !empty($files)) {
-            $message = $mime->getMessage();
-        }
-
-        // parse message and build message array with
-        // attachment file pointers in place of file markers
-        if (!empty($files)) {
-            $message = explode($marker, $message);
-            $tmp     = array();
-
-            foreach ($message as $msg_part) {
-                $tmp[] = $msg_part;
-                if ($file = array_shift($files)) {
-                    $tmp[] = $file;
-                }
-            }
-            $message = $tmp;
-        }
-        // write complete message body into temp file
-        else if ($is_file) {
-            // use common temp dir
-            $body_file = tempnam($temp_dir, 'rcmMsg');
-
-            if (PEAR::isError($mime_result = $mime->saveMessageBody($body_file))) {
-                self::raise_error(array('code' => 650, 'type' => 'php',
-                    'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not create message: ".$mime_result->getMessage()),
-                    true, false);
-                return false;
-            }
-
-            $message = array(trim($mime->txtHeaders()) . "\r\n\r\n", fopen($body_file, 'r'));
-        }
-
-        return $message;
-    }
-
-
-    /**
-     * Triggers any required updates after changes within the
-     * folder. This is currently only required for handling free/busy
-     * information with Kolab.
-     *
-     * @return boolean|PEAR_Error True if successfull.
-     */
-    public function trigger()
-    {
-        $owner = $this->get_owner();
-        $result = false;
-
-        switch($this->type) {
-        case 'event':
-            if ($this->get_namespace() == 'personal') {
-                $result = $this->trigger_url(
-                    sprintf('%s/trigger/%s/%s.pfb',
-                        kolab_storage::get_freebusy_server(),
-                        urlencode($owner),
-                        urlencode($this->imap->mod_folder($this->name))
-                    ),
-                    $this->imap->options['user'],
-                    $this->imap->options['password']
-                );
-            }
-            break;
-
-        default:
-            return true;
-        }
-
-        if ($result && is_object($result) && is_a($result, 'PEAR_Error')) {
-            return PEAR::raiseError(sprintf("Failed triggering folder %s. Error was: %s",
-                                            $this->name, $result->getMessage()));
-        }
-
-        return $result;
-    }
-
-    /**
-     * Triggers a URL.
-     *
-     * @param string $url          The URL to be triggered.
-     * @param string $auth_user    Username to authenticate with
-     * @param string $auth_passwd  Password for basic auth
-     * @return boolean|PEAR_Error  True if successfull.
-     */
-    private function trigger_url($url, $auth_user = null, $auth_passwd = null)
-    {
-        try {
-            $request = libkolab::http_request($url);
-
-            // set authentication credentials
-            if ($auth_user && $auth_passwd)
-                $request->setAuth($auth_user, $auth_passwd);
-
-            $result = $request->send();
-            // rcube::write_log('trigger', $result->getBody());
-        }
-        catch (Exception $e) {
-            return PEAR::raiseError($e->getMessage());
-        }
-
-        return true;
-    }
-
-}
-

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_api.php Deleted

@@ -1,351 +0,0 @@
-<?php
-
-/**
- * Abstract interface class for Kolab storage IMAP folder objects
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-abstract class kolab_storage_folder_api
-{
-    /**
-     * Folder identifier
-     * @var string
-     */
-    public $id;
-
-    /**
-     * The folder name.
-     * @var string
-     */
-    public $name;
-
-    /**
-     * The type of this folder.
-     * @var string
-     */
-    public $type;
-
-    /**
-     * The subtype of this folder.
-     * @var string
-     */
-    public $subtype;
-
-    /**
-     * Is this folder set to be the default for its type
-     * @var boolean
-     */
-    public $default = false;
-
-    /**
-     * List of direct child folders
-     * @var array
-     */
-    public $children = array();
-    
-    /**
-     * Name of the parent folder
-     * @var string
-     */
-    public $parent = '';
-
-    protected $imap;
-    protected $owner;
-    protected $info;
-    protected $idata;
-    protected $namespace;
-
-
-    /**
-     * Private constructor
-     */
-    protected function __construct($name)
-    {
-      $this->name = $name;
-      $this->id   = kolab_storage::folder_id($name);
-      $this->imap = rcube::get_instance()->get_storage();
-    }
-
-
-    /**
-     * Returns the owner of the folder.
-     *
-     * @param boolean  Return a fully qualified owner name (i.e. including domain for shared folders)
-     * @return string  The owner of this folder.
-     */
-    public function get_owner($fully_qualified = false)
-    {
-        // return cached value
-        if (isset($this->owner))
-            return $this->owner;
-
-        $info = $this->get_folder_info();
-        $rcmail = rcube::get_instance();
-
-        switch ($info['namespace']) {
-        case 'personal':
-            $this->owner = $rcmail->get_user_name();
-            break;
-
-        case 'shared':
-            $this->owner = 'anonymous';
-            break;
-
-        default:
-            list($prefix, $this->owner) = explode($this->imap->get_hierarchy_delimiter(), $info['name']);
-            $fully_qualified = true;  // enforce email addresses (backwards compatibility)
-            break;
-        }
-
-        if ($fully_qualified && strpos($this->owner, '@') === false) {
-            // extract domain from current user name
-            $domain = strstr($rcmail->get_user_name(), '@');
-            // fall back to mail_domain config option
-            if (empty($domain) && ($mdomain = $rcmail->config->mail_domain($this->imap->options['host']))) {
-                $domain = '@' . $mdomain;
-            }
-            $this->owner .= $domain;
-        }
-
-        return $this->owner;
-    }
-
-
-    /**
-     * 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()
-    {
-        if (!isset($this->namespace))
-            $this->namespace = $this->imap->folder_namespace($this->name);
-        return $this->namespace;
-    }
-
-
-    /**
-     * Get the display name value of this folder
-     *
-     * @return string Folder name
-     */
-    public function get_name()
-    {
-        return kolab_storage::object_name($this->name, $this->get_namespace());
-    }
-
-
-    /**
-     * Getter for the top-end folder name (not the entire path)
-     *
-     * @return string Name of this folder
-     */
-    public function get_foldername()
-    {
-        $parts = explode('/', $this->name);
-        return rcube_charset::convert(end($parts), 'UTF7-IMAP');
-    }
-
-    /**
-     * Getter for parent folder path
-     *
-     * @return string Full path to parent folder
-     */
-    public function get_parent()
-    {
-        $path = explode('/', $this->name);
-        array_pop($path);
-
-        // don't list top-level namespace folder
-        if (count($path) == 1 && in_array($this->get_namespace(), array('other', 'shared'))) {
-            $path = array();
-        }
-
-        return join('/', $path);
-    }
-
-    /**
-     * Getter for the Cyrus mailbox identifier corresponding to this folder
-     * (e.g. user/john.doe/Calendar/Personal@example.org)
-     *
-     * @return string Mailbox ID
-     */
-    public function get_mailbox_id()
-    {
-        $info = $this->get_folder_info();
-        $owner = $this->get_owner();
-        list($user, $domain) = explode('@', $owner);
-
-        switch ($info['namespace']) {
-        case 'personal':
-            return sprintf('user/%s/%s@%s', $user, $this->name, $domain);
-
-        case 'shared':
-            $ns = $this->imap->get_namespace('shared');
-            $prefix = is_array($ns) ? $ns[0][0] : '';
-            list(, $domain) = explode('@', rcube::get_instance()->get_user_name());
-            return substr($this->name, strlen($prefix)) . '@' . $domain;
-
-        default:
-            $ns = $this->imap->get_namespace('other');
-            $prefix = is_array($ns) ? $ns[0][0] : '';
-            list($user, $folder) = explode($this->imap->get_hierarchy_delimiter(), substr($info['name'], strlen($prefix)), 2);
-            if (strpos($user, '@')) {
-                list($user, $domain) = explode('@', $user);
-            }
-            return sprintf('user/%s/%s@%s', $user, $folder, $domain);
-        }
-    }
-
-    /**
-     * Get the color value stored in metadata
-     *
-     * @param string Default color value to return if not set
-     * @return mixed Color value from IMAP metadata or $default is not set
-     */
-    public function get_color($default = null)
-    {
-        // color is defined in folder METADATA
-        $metadata = $this->get_metadata(array(kolab_storage::COLOR_KEY_PRIVATE, kolab_storage::COLOR_KEY_SHARED));
-        if (($color = $metadata[kolab_storage::COLOR_KEY_PRIVATE]) || ($color = $metadata[kolab_storage::COLOR_KEY_SHARED])) {
-            return $color;
-        }
-
-        return $default;
-    }
-
-
-    /**
-     * Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
-     *
-     * @param array List of metadata keys to read
-     * @return array Metadata entry-value hash array on success, NULL on error
-     */
-    public function get_metadata($keys)
-    {
-        $metadata = rcube::get_instance()->get_storage()->get_metadata($this->name, (array)$keys);
-        return $metadata[$this->name];
-    }
-
-
-    /**
-     * Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
-     *
-     * @param array  $entries Entry-value array (use NULL value as NIL)
-     * @return boolean True on success, False on failure
-     */
-    public function set_metadata($entries)
-    {
-        return $this->imap->set_metadata($this->name, $entries);
-    }
-
-
-    /**
-     *
-     */
-    public function get_folder_info()
-    {
-        if (!isset($this->info))
-            $this->info = $this->imap->folder_info($this->name);
-
-        return $this->info;
-    }
-
-    /**
-     * Make IMAP folder data available for this folder
-     */
-    public function get_imap_data()
-    {
-        if (!isset($this->idata))
-            $this->idata = $this->imap->folder_data($this->name);
-
-        return $this->idata;
-    }
-
-
-    /**
-     * Get IMAP ACL information for this folder
-     *
-     * @return string  Permissions as string
-     */
-    public function get_myrights()
-    {
-        $rights = $this->info['rights'];
-
-        if (!is_array($rights))
-            $rights = $this->imap->my_rights($this->name);
-
-        return join('', (array)$rights);
-    }
-
-
-    /**
-     * Check activation status of this folder
-     *
-     * @return boolean True if enabled, false if not
-     */
-    public function is_active()
-    {
-        return kolab_storage::folder_is_active($this->name);
-    }
-
-    /**
-     * Change activation status of this folder
-     *
-     * @param boolean The desired subscription status: true = active, false = not active
-     *
-     * @return True on success, false on error
-     */
-    public function activate($active)
-    {
-        return $active ? kolab_storage::folder_activate($this->name) : kolab_storage::folder_deactivate($this->name);
-    }
-
-    /**
-     * Check subscription status of this folder
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public function is_subscribed()
-    {
-        return kolab_storage::folder_is_subscribed($this->name);
-    }
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
-     *
-     * @return True on success, false on error
-     */
-    public function subscribe($subscribed)
-    {
-        return $subscribed ? kolab_storage::folder_subscribe($this->name) : kolab_storage::folder_unsubscribe($this->name);
-    }
-
-    /**
-     * Return folder name as string representation of this object
-     *
-     * @return string Full IMAP folder name
-     */
-    public function __toString()
-    {
-        return $this->name;
-    }
-}
-

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_user.php Deleted

@@ -1,135 +0,0 @@
-<?php
-
-/**
- * Class that represents a (virtual) folder in the 'other' namespace
- * implementing a subset of the kolab_storage_folder API.
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-class kolab_storage_folder_user extends kolab_storage_folder_virtual
-{
-    protected static $ldapcache = array();
-
-    public $ldaprec;
-    public $type;
-
-    /**
-     * Default constructor
-     */
-    public function __construct($name, $parent = '', $ldaprec = null)
-    {
-        parent::__construct($name, $name, 'other', $parent);
-
-        if (!empty($ldaprec)) {
-            self::$ldapcache[$name] = $this->ldaprec = $ldaprec;
-        }
-        // use value cached in memory for repeated lookups
-        else if (array_key_exists($name, self::$ldapcache)) {
-            $this->ldaprec = self::$ldapcache[$name];
-        }
-        // lookup user in LDAP and set $this->ldaprec
-        else if ($ldap = kolab_storage::ldap()) {
-            // get domain from current user
-            list(,$domain) = explode('@', rcube::get_instance()->get_user_name());
-            $this->ldaprec = $ldap->get_user_record(parent::get_foldername($this->name) . '@' . $domain, $_SESSION['imap_host']);
-            if (!empty($this->ldaprec)) {
-                $this->ldaprec['kolabtargetfolder'] = $name;
-            }
-            self::$ldapcache[$name] = $this->ldaprec;
-        }
-    }
-
-    /**
-     * Getter for the top-end folder name to be displayed
-     *
-     * @return string Name of this folder
-     */
-    public function get_foldername()
-    {
-        return $this->ldaprec ? ($this->ldaprec['displayname'] ?: $this->ldaprec['name']) :
-            parent::get_foldername();
-    }
-
-    /**
-     * Getter for a more informative title of this user folder
-     *
-     * @return string Title for the given user record
-     */
-    public function get_title()
-    {
-      return trim($this->ldaprec['displayname'] . '; ' . $this->ldaprec['mail'], '; ');
-    }
-
-    /**
-     * Returns the owner of the folder.
-     *
-     * @return string  The owner of this folder.
-     */
-    public function get_owner()
-    {
-        return $this->ldaprec['mail'];
-    }
-
-    /**
-     * Check subscription status of this folder.
-     * Subscription of a virtual user folder depends on the subscriptions of subfolders.
-     *
-     * @return boolean True if subscribed, false if not
-     */
-    public function is_subscribed()
-    {
-        if (!empty($this->type)) {
-            $children = $subscribed = 0;
-            $delimiter = $this->imap->get_hierarchy_delimiter();
-            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
-                if (kolab_storage::folder_is_subscribed($subfolder)) {
-                    $subscribed++;
-                }
-                $children++;
-            }
-            if ($subscribed > 0) {
-                return $subscribed == $children ? true : 2;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Change subscription status of this folder
-     *
-     * @param boolean The desired subscription status: true = subscribed, false = not subscribed
-     *
-     * @return True on success, false on error
-     */
-    public function subscribe($subscribed)
-    {
-        $success = false;
-
-        // (un)subscribe all subfolders of a given type
-        if (!empty($this->type)) {
-            $delimiter = $this->imap->get_hierarchy_delimiter();
-            foreach ((array)kolab_storage::list_folders($this->name . $delimiter, '*', $this->type, false) as $subfolder) {
-                $success |= ($subscribed ? kolab_storage::folder_subscribe($subfolder) : kolab_storage::folder_unsubscribe($subfolder));
-            }
-        }
-
-        return $success;
-    }
-
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_folder_virtual.php Deleted

@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Helper class that represents a virtual IMAP folder
- * with a subset of the kolab_storage_folder API.
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2014, 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/>.
- */
-class kolab_storage_folder_virtual extends kolab_storage_folder_api
-{
-    public $virtual = true;
-
-    protected $displayname;
-
-    public function __construct($name, $dispname, $ns, $parent = '')
-    {
-        parent::__construct($name);
-
-        $this->namespace = $ns;
-        $this->parent    = $parent;
-        $this->displayname = $dispname;
-    }
-
-    /**
-     * Get the display name value of this folder
-     *
-     * @return string Folder name
-     */
-    public function get_name()
-    {
-        return $this->displayname ?: parent::get_name();
-    }
-
-    /**
-     * Get the color value stored in metadata
-     *
-     * @param string Default color value to return if not set
-     * @return mixed Color value from IMAP metadata or $default is not set
-     */
-    public function get_color($default = null)
-    {
-        return $default;
-    }
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/libkolab.php Deleted

@@ -1,138 +0,0 @@
-<?php
-
-/**
- * Kolab core library
- *
- * Plugin to setup a basic environment for the interaction with a Kolab server.
- * Other Kolab-related plugins will depend on it and can use the library classes
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class libkolab extends rcube_plugin
-{
-    static $http_requests = array();
-
-    /**
-     * Required startup method of a Roundcube plugin
-     */
-    public function init()
-    {
-        // load local config
-        $this->load_config();
-
-        // extend include path to load bundled lib classes
-        $include_path = $this->home . '/lib' . PATH_SEPARATOR . ini_get('include_path');
-        set_include_path($include_path);
-
-        $this->add_hook('storage_init', array($this, 'storage_init'));
-        $this->add_hook('user_delete', array('kolab_storage', 'delete_user_folders'));
-
-        $rcmail = rcube::get_instance();
-        try {
-            kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
-        }
-        catch (Exception $e) {
-            rcube::raise_error($e, true);
-            kolab_format::$timezone = new DateTimeZone('GMT');
-        }
-    }
-
-    /**
-     * Hook into IMAP FETCH HEADER.FIELDS command and request Kolab-specific headers
-     */
-    function storage_init($p)
-    {
-        $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION');
-        return $p;
-    }
-
-    /**
-     * Wrapper function to load and initalize the HTTP_Request2 Object
-     *
-     * @param string|Net_Url2 Request URL
-     * @param string          Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
-     * @param array           Configuration for this Request instance, that will be merged
-     *                        with default configuration
-     *
-     * @return HTTP_Request2 Request object
-     */
-    public static function http_request($url = '', $method = 'GET', $config = array())
-    {
-        $rcube       = rcube::get_instance();
-        $http_config = (array) $rcube->config->get('kolab_http_request');
-
-        // deprecated configuration options
-        if (empty($http_config)) {
-            foreach (array('ssl_verify_peer', 'ssl_verify_host') as $option) {
-                $value = $rcube->config->get('kolab_' . $option, true);
-                if (is_bool($value)) {
-                    $http_config[$option] = $value;
-                }
-            }
-        }
-
-        if (!empty($config)) {
-            $http_config = array_merge($http_config, $config);
-        }
-
-        $key = md5(serialize($http_config));
-
-        if (!($request = self::$http_requests[$key])) {
-            // load HTTP_Request2
-            require_once 'HTTP/Request2.php';
-
-            try {
-                $request = new HTTP_Request2();
-                $request->setConfig($http_config);
-            }
-            catch (Exception $e) {
-                rcube::raise_error($e, true, true);
-            }
-
-            // proxy User-Agent string
-            $request->setHeader('user-agent', $_SERVER['HTTP_USER_AGENT']);
-
-            self::$http_requests[$key] = $request;
-        }
-
-        // cleanup
-        try {
-            $request->setBody('');
-            $request->setUrl($url);
-            $request->setMethod($method);
-        }
-        catch (Exception $e) {
-            rcube::raise_error($e, true, true);
-        }
-
-        return $request;
-    }
-
-    /**
-     * Wrapper function for generating a html diff using the FineDiff class by Raymond Hill
-     */
-    public static function html_diff($from, $to)
-    {
-      include_once __dir__ . '/vendor/finediff.php';
-
-      $diff = new FineDiff($from, $to, FineDiff::$wordGranularity);
-      return $diff->renderDiffToHTML();
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/vendor Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/vendor/finediff.php Deleted

@@ -1,688 +0,0 @@
-<?php
-/**
-* FINE granularity DIFF
-*
-* Computes a set of instructions to convert the content of
-* one string into another.
-*
-* Copyright (c) 2011 Raymond Hill (http://raymondhill.net/blog/?p=441)
-*
-* Licensed under The MIT License
-* 
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*
-* @copyright Copyright 2011 (c) Raymond Hill (http://raymondhill.net/blog/?p=441)
-* @link http://www.raymondhill.net/finediff/
-* @version 0.6
-* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
-*/
-
-/**
-* Usage (simplest):
-*
-*   include 'finediff.php';
-*
-*   // for the stock stack, granularity values are:
-*   // FineDiff::$paragraphGranularity = paragraph/line level
-*   // FineDiff::$sentenceGranularity = sentence level
-*   // FineDiff::$wordGranularity = word level
-*   // FineDiff::$characterGranularity = character level [default]
-*
-*   $opcodes = FineDiff::getDiffOpcodes($from_text, $to_text [, $granularityStack = null] );
-*   // store opcodes for later use...
-*
-*   ...
-*
-*   // restore $to_text from $from_text + $opcodes
-*   include 'finediff.php';
-*   $to_text = FineDiff::renderToTextFromOpcodes($from_text, $opcodes);
-*
-*   ...
-*/
-
-/**
-* Persisted opcodes (string) are a sequence of atomic opcode.
-* A single opcode can be one of the following:
-*   c | c{n} | d | d{n} | i:{c} | i{length}:{s}
-*   'c'        = copy one character from source
-*   'c{n}'     = copy n characters from source
-*   'd'        = skip one character from source
-*   'd{n}'     = skip n characters from source
-*   'i:{c}     = insert character 'c'
-*   'i{n}:{s}' = insert string s, which is of length n
-*
-* Do not exist as of now, under consideration:
-*   'm{n}:{o}  = move n characters from source o characters ahead.
-*   It would be essentially a shortcut for a delete->copy->insert
-*   command (swap) for when the inserted segment is exactly the same
-*   as the deleted one, and with only a copy operation in between.
-*   TODO: How often this case occurs? Is it worth it? Can only
-*   be done as a postprocessing method (->optimize()?)
-*/
-abstract class FineDiffOp {
-	abstract public function getFromLen();
-	abstract public function getToLen();
-	abstract public function getOpcode();
-	}
-
-class FineDiffDeleteOp extends FineDiffOp {
-	public function __construct($len) {
-		$this->fromLen = $len;
-		}
-	public function getFromLen() {
-		return $this->fromLen;
-		}
-	public function getToLen() {
-		return 0;
-		}
-	public function getOpcode() {
-		if ( $this->fromLen === 1 ) {
-			return 'd';
-			}
-		return "d{$this->fromLen}";
-		}
-	}
-
-class FineDiffInsertOp extends FineDiffOp {
-	public function __construct($text) {
-		$this->text = $text;
-		}
-	public function getFromLen() {
-		return 0;
-		}
-	public function getToLen() {
-		return strlen($this->text);
-		}
-	public function getText() {
-		return $this->text;
-		}
-	public function getOpcode() {
-		$to_len = strlen($this->text);
-		if ( $to_len === 1 ) {
-			return "i:{$this->text}";
-			}
-		return "i{$to_len}:{$this->text}";
-		}
-	}
-
-class FineDiffReplaceOp extends FineDiffOp {
-	public function __construct($fromLen, $text) {
-		$this->fromLen = $fromLen;
-		$this->text = $text;
-		}
-	public function getFromLen() {
-		return $this->fromLen;
-		}
-	public function getToLen() {
-		return strlen($this->text);
-		}
-	public function getText() {
-		return $this->text;
-		}
-	public function getOpcode() {
-		if ( $this->fromLen === 1 ) {
-			$del_opcode = 'd';
-			}
-		else {
-			$del_opcode = "d{$this->fromLen}";
-			}
-		$to_len = strlen($this->text);
-		if ( $to_len === 1 ) {
-			return "{$del_opcode}i:{$this->text}";
-			}
-		return "{$del_opcode}i{$to_len}:{$this->text}";
-		}
-	}
-
-class FineDiffCopyOp extends FineDiffOp {
-	public function __construct($len) {
-		$this->len = $len;
-		}
-	public function getFromLen() {
-		return $this->len;
-		}
-	public function getToLen() {
-		return $this->len;
-		}
-	public function getOpcode() {
-		if ( $this->len === 1 ) {
-			return 'c';
-			}
-		return "c{$this->len}";
-		}
-	public function increase($size) {
-		return $this->len += $size;
-		}
-	}
-
-/**
-* FineDiff ops
-*
-* Collection of ops
-*/
-class FineDiffOps {
-	public function appendOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' ) {
-			$edits[] = new FineDiffCopyOp($from_len);
-			}
-		else if ( $opcode === 'd' ) {
-			$edits[] = new FineDiffDeleteOp($from_len);
-			}
-		else /* if ( $opcode === 'i' ) */ {
-			$edits[] = new FineDiffInsertOp(substr($from, $from_offset, $from_len));
-			}
-		}
-	public $edits = array();
-	}
-
-/**
-* FineDiff class
-*
-* TODO: Document
-*
-*/
-class FineDiff {
-
-	/**------------------------------------------------------------------------
-	*
-	* Public section
-	*
-	*/
-
-	/**
-	* Constructor
-	* ...
-	* The $granularityStack allows FineDiff to be configurable so that
-	* a particular stack tailored to the specific content of a document can
-	* be passed.
-	*/
-	public function __construct($from_text = '', $to_text = '', $granularityStack = null) {
-		// setup stack for generic text documents by default
-		$this->granularityStack = $granularityStack ? $granularityStack : FineDiff::$characterGranularity;
-		$this->edits = array();
-		$this->from_text = $from_text;
-		$this->doDiff($from_text, $to_text);
-		}
-
-	public function getOps() {
-		return $this->edits;
-		}
-
-	public function getOpcodes() {
-		$opcodes = array();
-		foreach ( $this->edits as $edit ) {
-			$opcodes[] = $edit->getOpcode();
-			}
-		return implode('', $opcodes);
-		}
-
-	public function renderDiffToHTML() {
-		$in_offset = 0;
-		$html = '';
-		foreach ( $this->edits as $edit ) {
-			$n = $edit->getFromLen();
-			if ( $edit instanceof FineDiffCopyOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
-				}
-			else if ( $edit instanceof FineDiffDeleteOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-				}
-			else if ( $edit instanceof FineDiffInsertOp ) {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-				}
-			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-				}
-			$in_offset += $n;
-			}
-		return $html;
-		}
-
-	/**------------------------------------------------------------------------
-	* Return an opcodes string describing the diff between a "From" and a
-	* "To" string
-	*/
-	public static function getDiffOpcodes($from, $to, $granularities = null) {
-		$diff = new FineDiff($from, $to, $granularities);
-		return $diff->getOpcodes();
-		}
-
-	/**------------------------------------------------------------------------
-	* Return an iterable collection of diff ops from an opcodes string
-	*/
-	public static function getDiffOpsFromOpcodes($opcodes) {
-		$diffops = new FineDiffOps();
-		FineDiff::renderFromOpcodes(null, $opcodes, array($diffops,'appendOpcode'));
-		return $diffops->edits;
-		}
-
-	/**------------------------------------------------------------------------
-	* Re-create the "To" string from the "From" string and an "Opcodes" string
-	*/
-	public static function renderToTextFromOpcodes($from, $opcodes) {
-		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
-		}
-
-	/**------------------------------------------------------------------------
-	* Render the diff to an HTML string
-	*/
-	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
-		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
-		}
-
-	/**------------------------------------------------------------------------
-	* Generic opcodes parser, user must supply callback for handling
-	* single opcode
-	*/
-	public static function renderFromOpcodes($from, $opcodes, $callback) {
-		if ( !is_callable($callback) ) {
-			return '';
-			}
-		$out = '';
-		$opcodes_len = strlen($opcodes);
-		$from_offset = $opcodes_offset = 0;
-		while ( $opcodes_offset <  $opcodes_len ) {
-			$opcode = substr($opcodes, $opcodes_offset, 1);
-			$opcodes_offset++;
-			$n = intval(substr($opcodes, $opcodes_offset));
-			if ( $n ) {
-				$opcodes_offset += strlen(strval($n));
-				}
-			else {
-				$n = 1;
-				}
-			if ( $opcode === 'c' ) { // copy n characters from source
-				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
-				$from_offset += $n;
-				}
-			else if ( $opcode === 'd' ) { // delete n characters from source
-				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
-				$from_offset += $n;
-				}
-			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
-				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
-				$opcodes_offset += 1 + $n;
-				}
-			}
-		return $out;
-		}
-
-	/**
-	* Stock granularity stacks and delimiters
-	*/
-
-	const paragraphDelimiters = "\n\r";
-	public static $paragraphGranularity = array(
-		FineDiff::paragraphDelimiters
-		);
-	const sentenceDelimiters = ".\n\r";
-	public static $sentenceGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters
-		);
-	const wordDelimiters = " \t.\n\r";
-	public static $wordGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters,
-		FineDiff::wordDelimiters
-		);
-	const characterDelimiters = "";
-	public static $characterGranularity = array(
-		FineDiff::paragraphDelimiters,
-		FineDiff::sentenceDelimiters,
-		FineDiff::wordDelimiters,
-		FineDiff::characterDelimiters
-		);
-
-	public static $textStack = array(
-		".",
-		" \t.\n\r",
-		""
-		);
-
-	/**------------------------------------------------------------------------
-	*
-	* Private section
-	*
-	*/
-
-	/**
-	* Entry point to compute the diff.
-	*/
-	private function doDiff($from_text, $to_text) {
-		$this->last_edit = false;
-		$this->stackpointer = 0;
-		$this->from_text = $from_text;
-		$this->from_offset = 0;
-		// can't diff without at least one granularity specifier
-		if ( empty($this->granularityStack) ) {
-			return;
-			}
-		$this->_processGranularity($from_text, $to_text);
-		}
-
-	/**
-	* This is the recursive function which is responsible for
-	* handling/increasing granularity.
-	*
-	* Incrementally increasing the granularity is key to compute the
-	* overall diff in a very efficient way.
-	*/
-	private function _processGranularity($from_segment, $to_segment) {
-		$delimiters = $this->granularityStack[$this->stackpointer++];
-		$has_next_stage = $this->stackpointer < count($this->granularityStack);
-		foreach ( FineDiff::doFragmentDiff($from_segment, $to_segment, $delimiters) as $fragment_edit ) {
-			// increase granularity
-			if ( $fragment_edit instanceof FineDiffReplaceOp && $has_next_stage ) {
-				$this->_processGranularity(
-					substr($this->from_text, $this->from_offset, $fragment_edit->getFromLen()),
-					$fragment_edit->getText()
-					);
-				}
-			// fuse copy ops whenever possible
-			else if ( $fragment_edit instanceof FineDiffCopyOp && $this->last_edit instanceof FineDiffCopyOp ) {
-				$this->edits[count($this->edits)-1]->increase($fragment_edit->getFromLen());
-				$this->from_offset += $fragment_edit->getFromLen();
-				}
-			else {
-				/* $fragment_edit instanceof FineDiffCopyOp */
-				/* $fragment_edit instanceof FineDiffDeleteOp */
-				/* $fragment_edit instanceof FineDiffInsertOp */
-				$this->edits[] = $this->last_edit = $fragment_edit;
-				$this->from_offset += $fragment_edit->getFromLen();
-				}
-			}
-		$this->stackpointer--;
-		}
-
-	/**
-	* This is the core algorithm which actually perform the diff itself,
-	* fragmenting the strings as per specified delimiters.
-	*
-	* This function is naturally recursive, however for performance purpose
-	* a local job queue is used instead of outright recursivity.
-	*/
-	private static function doFragmentDiff($from_text, $to_text, $delimiters) {
-		// Empty delimiter means character-level diffing.
-		// In such case, use code path optimized for character-level
-		// diffing.
-		if ( empty($delimiters) ) {
-			return FineDiff::doCharDiff($from_text, $to_text);
-			}
-
-		$result = array();
-
-		// fragment-level diffing
-		$from_text_len = strlen($from_text);
-		$to_text_len = strlen($to_text);
-		$from_fragments = FineDiff::extractFragments($from_text, $delimiters);
-		$to_fragments = FineDiff::extractFragments($to_text, $delimiters);
-
-		$jobs = array(array(0, $from_text_len, 0, $to_text_len));
-
-		$cached_array_keys = array();
-
-		while ( $job = array_pop($jobs) ) {
-
-			// get the segments which must be diff'ed
-			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
-
-			// catch easy cases first
-			$from_segment_length = $from_segment_end - $from_segment_start;
-			$to_segment_length = $to_segment_end - $to_segment_start;
-			if ( !$from_segment_length || !$to_segment_length ) {
-				if ( $from_segment_length ) {
-					$result[$from_segment_start * 4] = new FineDiffDeleteOp($from_segment_length);
-					}
-				else if ( $to_segment_length ) {
-					$result[$from_segment_start * 4 + 1] = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_length));
-					}
-				continue;
-				}
-
-			// find longest copy operation for the current segments
-			$best_copy_length = 0;
-
-			$from_base_fragment_index = $from_segment_start;
-
-			$cached_array_keys_for_current_segment = array();
-
-			while ( $from_base_fragment_index < $from_segment_end ) {
-				$from_base_fragment = $from_fragments[$from_base_fragment_index];
-				$from_base_fragment_length = strlen($from_base_fragment);
-				// performance boost: cache array keys
-				if ( !isset($cached_array_keys_for_current_segment[$from_base_fragment]) ) {
-					if ( !isset($cached_array_keys[$from_base_fragment]) ) {
-						$to_all_fragment_indices = $cached_array_keys[$from_base_fragment] = array_keys($to_fragments, $from_base_fragment, true);
-						}
-					else {
-						$to_all_fragment_indices = $cached_array_keys[$from_base_fragment];
-						}
-					// get only indices which falls within current segment
-					if ( $to_segment_start > 0 || $to_segment_end < $to_text_len ) {
-						$to_fragment_indices = array();
-						foreach ( $to_all_fragment_indices as $to_fragment_index ) {
-							if ( $to_fragment_index < $to_segment_start ) { continue; }
-							if ( $to_fragment_index >= $to_segment_end ) { break; }
-							$to_fragment_indices[] = $to_fragment_index;
-							}
-						$cached_array_keys_for_current_segment[$from_base_fragment] = $to_fragment_indices;
-						}
-					else {
-						$to_fragment_indices = $to_all_fragment_indices;
-						}
-					}
-				else {
-					$to_fragment_indices = $cached_array_keys_for_current_segment[$from_base_fragment];
-					}
-				// iterate through collected indices
-				foreach ( $to_fragment_indices as $to_base_fragment_index ) {
-					$fragment_index_offset = $from_base_fragment_length;
-					// iterate until no more match
-					for (;;) {
-						$fragment_from_index = $from_base_fragment_index + $fragment_index_offset;
-						if ( $fragment_from_index >= $from_segment_end ) {
-							break;
-							}
-						$fragment_to_index = $to_base_fragment_index + $fragment_index_offset;
-						if ( $fragment_to_index >= $to_segment_end ) {
-							break;
-							}
-						if ( $from_fragments[$fragment_from_index] !== $to_fragments[$fragment_to_index] ) {
-							break;
-							}
-						$fragment_length = strlen($from_fragments[$fragment_from_index]);
-						$fragment_index_offset += $fragment_length;
-						}
-					if ( $fragment_index_offset > $best_copy_length ) {
-						$best_copy_length = $fragment_index_offset;
-						$best_from_start = $from_base_fragment_index;
-						$best_to_start = $to_base_fragment_index;
-						}
-					}
-				$from_base_fragment_index += strlen($from_base_fragment);
-				// If match is larger than half segment size, no point trying to find better
-				// TODO: Really?
-				if ( $best_copy_length >= $from_segment_length / 2) {
-					break;
-					}
-				// no point to keep looking if what is left is less than
-				// current best match
-				if ( $from_base_fragment_index + $best_copy_length >= $from_segment_end ) {
-					break;
-					}
-				}
-
-			if ( $best_copy_length ) {
-				$jobs[] = array($from_segment_start, $best_from_start, $to_segment_start, $best_to_start);
-				$result[$best_from_start * 4 + 2] = new FineDiffCopyOp($best_copy_length);
-				$jobs[] = array($best_from_start + $best_copy_length, $from_segment_end, $best_to_start + $best_copy_length, $to_segment_end);
-				}
-			else {
-				$result[$from_segment_start * 4 ] = new FineDiffReplaceOp($from_segment_length, substr($to_text, $to_segment_start, $to_segment_length));
-				}
-			}
-
-		ksort($result, SORT_NUMERIC);
-		return array_values($result);
-		}
-
-	/**
-	* Perform a character-level diff.
-	*
-	* The algorithm is quite similar to doFragmentDiff(), except that
-	* the code path is optimized for character-level diff -- strpos() is
-	* used to find out the longest common subequence of characters.
-	*
-	* We try to find a match using the longest possible subsequence, which
-	* is at most the length of the shortest of the two strings, then incrementally
-	* reduce the size until a match is found.
-	*
-	* I still need to study more the performance of this function. It
-	* appears that for long strings, the generic doFragmentDiff() is more
-	* performant. For word-sized strings, doCharDiff() is somewhat more
-	* performant.
-	*/
-	private static function doCharDiff($from_text, $to_text) {
-		$result = array();
-		$jobs = array(array(0, strlen($from_text), 0, strlen($to_text)));
-		while ( $job = array_pop($jobs) ) {
-			// get the segments which must be diff'ed
-			list($from_segment_start, $from_segment_end, $to_segment_start, $to_segment_end) = $job;
-			$from_segment_len = $from_segment_end - $from_segment_start;
-			$to_segment_len = $to_segment_end - $to_segment_start;
-
-			// catch easy cases first
-			if ( !$from_segment_len || !$to_segment_len ) {
-				if ( $from_segment_len ) {
-					$result[$from_segment_start * 4 + 0] = new FineDiffDeleteOp($from_segment_len);
-					}
-				else if ( $to_segment_len ) {
-					$result[$from_segment_start * 4 + 1] = new FineDiffInsertOp(substr($to_text, $to_segment_start, $to_segment_len));
-					}
-				continue;
-				}
-			if ( $from_segment_len >= $to_segment_len ) {
-				$copy_len = $to_segment_len;
-				while ( $copy_len ) {
-					$to_copy_start = $to_segment_start;
-					$to_copy_start_max = $to_segment_end - $copy_len;
-					while ( $to_copy_start <= $to_copy_start_max ) {
-						$from_copy_start = strpos(substr($from_text, $from_segment_start, $from_segment_len), substr($to_text, $to_copy_start, $copy_len));
-						if ( $from_copy_start !== false ) {
-							$from_copy_start += $from_segment_start;
-							break 2;
-							}
-						$to_copy_start++;
-						}
-					$copy_len--;
-					}
-				}
-			else {
-				$copy_len = $from_segment_len;
-				while ( $copy_len ) {
-					$from_copy_start = $from_segment_start;
-					$from_copy_start_max = $from_segment_end - $copy_len;
-					while ( $from_copy_start <= $from_copy_start_max ) {
-						$to_copy_start = strpos(substr($to_text, $to_segment_start, $to_segment_len), substr($from_text, $from_copy_start, $copy_len));
-						if ( $to_copy_start !== false ) {
-							$to_copy_start += $to_segment_start;
-							break 2;
-							}
-						$from_copy_start++;
-						}
-					$copy_len--;
-					}
-				}
-			// match found
-			if ( $copy_len ) {
-				$jobs[] = array($from_segment_start, $from_copy_start, $to_segment_start, $to_copy_start);
-				$result[$from_copy_start * 4 + 2] = new FineDiffCopyOp($copy_len);
-				$jobs[] = array($from_copy_start + $copy_len, $from_segment_end, $to_copy_start + $copy_len, $to_segment_end);
-				}
-			// no match,  so delete all, insert all
-			else {
-				$result[$from_segment_start * 4] = new FineDiffReplaceOp($from_segment_len, substr($to_text, $to_segment_start, $to_segment_len));
-				}
-			}
-		ksort($result, SORT_NUMERIC);
-		return array_values($result);
-		}
-
-	/**
-	* Efficiently fragment the text into an array according to
-	* specified delimiters.
-	* No delimiters means fragment into single character.
-	* The array indices are the offset of the fragments into
-	* the input string.
-	* A sentinel empty fragment is always added at the end.
-	* Careful: No check is performed as to the validity of the
-	* delimiters.
-	*/
-	private static function extractFragments($text, $delimiters) {
-		// special case: split into characters
-		if ( empty($delimiters) ) {
-			$chars = str_split($text, 1);
-			$chars[strlen($text)] = '';
-			return $chars;
-			}
-		$fragments = array();
-		$start = $end = 0;
-		for (;;) {
-			$end += strcspn($text, $delimiters, $end);
-			$end += strspn($text, $delimiters, $end);
-			if ( $end === $start ) {
-				break;
-				}
-			$fragments[$start] = substr($text, $start, $end - $start);
-			$start = $end;
-			}
-		$fragments[$start] = '';
-		return $fragments;
-		}
-
-	/**
-	* Stock opcode renderers
-	*/
-	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' || $opcode === 'i' ) {
-			return substr($from, $from_offset, $from_len);
-			}
-		return '';
-		}
-
-	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
-		if ( $opcode === 'c' ) {
-			return htmlentities(substr($from, $from_offset, $from_len));
-			}
-		else if ( $opcode === 'd' ) {
-			$deletion = substr($from, $from_offset, $from_len);
-			if ( strcspn($deletion, " \n\r") === 0 ) {
-				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
-				}
-			return '<del>' . htmlentities($deletion) . '</del>';
-			}
-		else /* if ( $opcode === 'i' ) */ {
- 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
-			}
-		return '';
-		}
-	}
-

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/vendor/finediff_modifications.diff Deleted

@@ -1,121 +0,0 @@
---- finediff.php.orig	2014-07-29 14:24:10.000000000 +0200
-+++ finediff.php	2014-07-29 14:30:38.000000000 +0200
-@@ -234,25 +234,25 @@
- 
- 	public function renderDiffToHTML() {
- 		$in_offset = 0;
--		ob_start();
-+		$html = '';
- 		foreach ( $this->edits as $edit ) {
- 			$n = $edit->getFromLen();
- 			if ( $edit instanceof FineDiffCopyOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('c', $this->from_text, $in_offset, $n);
- 				}
- 			else if ( $edit instanceof FineDiffDeleteOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
- 				}
- 			else if ( $edit instanceof FineDiffInsertOp ) {
--				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
- 				}
- 			else /* if ( $edit instanceof FineDiffReplaceOp ) */ {
--				FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
--				FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('d', $this->from_text, $in_offset, $n);
-+				$html .= FineDiff::renderDiffToHTMLFromOpcode('i', $edit->getText(), 0, $edit->getToLen());
- 				}
- 			$in_offset += $n;
- 			}
--		return ob_get_clean();
-+		return $html;
- 		}
- 
- 	/**------------------------------------------------------------------------
-@@ -277,18 +277,14 @@
- 	* Re-create the "To" string from the "From" string and an "Opcodes" string
- 	*/
- 	public static function renderToTextFromOpcodes($from, $opcodes) {
--		ob_start();
--		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
--		return ob_get_clean();
-+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderToTextFromOpcode'));
- 		}
- 
- 	/**------------------------------------------------------------------------
- 	* Render the diff to an HTML string
- 	*/
- 	public static function renderDiffToHTMLFromOpcodes($from, $opcodes) {
--		ob_start();
--		FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
--		return ob_get_clean();
-+		return FineDiff::renderFromOpcodes($from, $opcodes, array('FineDiff','renderDiffToHTMLFromOpcode'));
- 		}
- 
- 	/**------------------------------------------------------------------------
-@@ -297,8 +293,9 @@
- 	*/
- 	public static function renderFromOpcodes($from, $opcodes, $callback) {
- 		if ( !is_callable($callback) ) {
--			return;
-+			return '';
- 			}
-+		$out = '';
- 		$opcodes_len = strlen($opcodes);
- 		$from_offset = $opcodes_offset = 0;
- 		while ( $opcodes_offset <  $opcodes_len ) {
-@@ -312,18 +309,19 @@
- 				$n = 1;
- 				}
- 			if ( $opcode === 'c' ) { // copy n characters from source
--				call_user_func($callback, 'c', $from, $from_offset, $n, '');
-+				$out .= call_user_func($callback, 'c', $from, $from_offset, $n, '');
- 				$from_offset += $n;
- 				}
- 			else if ( $opcode === 'd' ) { // delete n characters from source
--				call_user_func($callback, 'd', $from, $from_offset, $n, '');
-+				$out .= call_user_func($callback, 'd', $from, $from_offset, $n, '');
- 				$from_offset += $n;
- 				}
- 			else /* if ( $opcode === 'i' ) */ { // insert n characters from opcodes
--				call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
-+				$out .= call_user_func($callback, 'i', $opcodes, $opcodes_offset + 1, $n);
- 				$opcodes_offset += 1 + $n;
- 				}
- 			}
-+		return $out;
- 		}
- 
- 	/**
-@@ -665,24 +663,26 @@
- 	*/
- 	private static function renderToTextFromOpcode($opcode, $from, $from_offset, $from_len) {
- 		if ( $opcode === 'c' || $opcode === 'i' ) {
--			echo substr($from, $from_offset, $from_len);
-+			return substr($from, $from_offset, $from_len);
- 			}
-+		return '';
- 		}
- 
- 	private static function renderDiffToHTMLFromOpcode($opcode, $from, $from_offset, $from_len) {
- 		if ( $opcode === 'c' ) {
--			echo htmlentities(substr($from, $from_offset, $from_len));
-+			return htmlentities(substr($from, $from_offset, $from_len));
- 			}
- 		else if ( $opcode === 'd' ) {
- 			$deletion = substr($from, $from_offset, $from_len);
- 			if ( strcspn($deletion, " \n\r") === 0 ) {
- 				$deletion = str_replace(array("\n","\r"), array('\n','\r'), $deletion);
- 				}
--			echo '<del>', htmlentities($deletion), '</del>';
-+			return '<del>' . htmlentities($deletion) . '</del>';
- 			}
- 		else /* if ( $opcode === 'i' ) */ {
-- 			echo '<ins>', htmlentities(substr($from, $from_offset, $from_len)), '</ins>';
-+ 			return '<ins>' . htmlentities(substr($from, $from_offset, $from_len)) . '</ins>';
- 			}
-+		return '';
- 		}
- 	}
-

iRony-0.4.2.tar.gz/lib/FileAPI/ext Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL.php Deleted

@@ -1,104 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Client implementation of various SASL mechanisms 
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('PEAR.php');
-
-class Auth_SASL
-{
-    /**
-    * Factory class. Returns an object of the request
-    * type.
-    *
-    * @param string $type One of: Anonymous
-    *                             Plain
-    *                             CramMD5
-    *                             DigestMD5
-    *                     Types are not case sensitive
-    */
-    function &factory($type)
-    {
-        switch (strtolower($type)) {
-            case 'anonymous':
-                $filename  = 'Auth/SASL/Anonymous.php';
-                $classname = 'Auth_SASL_Anonymous';
-                break;
-
-            case 'login':
-                $filename  = 'Auth/SASL/Login.php';
-                $classname = 'Auth_SASL_Login';
-                break;
-
-            case 'plain':
-                $filename  = 'Auth/SASL/Plain.php';
-                $classname = 'Auth_SASL_Plain';
-                break;
-
-            case 'external':
-                $filename  = 'Auth/SASL/External.php';
-                $classname = 'Auth_SASL_External';
-                break;
-
-            case 'crammd5':
-                $filename  = 'Auth/SASL/CramMD5.php';
-                $classname = 'Auth_SASL_CramMD5';
-                break;
-
-            case 'digestmd5':
-                $filename  = 'Auth/SASL/DigestMD5.php';
-                $classname = 'Auth_SASL_DigestMD5';
-                break;
-
-            default:
-                return PEAR::raiseError('Invalid SASL mechanism type');
-                break;
-        }
-
-        require_once($filename);
-        $obj = new $classname();
-        return $obj;
-    }
-}
-
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL/Anonymous.php Deleted

@@ -1,71 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of ANONYMOUS SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_Anonymous extends Auth_SASL_Common
-{
-    /**
-    * Not much to do here except return the token supplied.
-    * No encoding, hashing or encryption takes place for this
-    * mechanism, simply one of:
-    *  o An email address
-    *  o An opaque string not containing "@" that can be interpreted
-    *    by the sysadmin
-    *  o Nothing
-    *
-    * We could have some logic here for the second option, but this
-    * would by no means create something interpretable.
-    *
-    * @param  string $token Optional email address or string to provide
-    *                       as trace information.
-    * @return string        The unaltered input token
-    */
-    function getResponse($token = '')
-    {
-        return $token;
-    }
-}
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL/Common.php Deleted

@@ -1,74 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Common functionality to SASL mechanisms
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-class Auth_SASL_Common
-{
-    /**
-    * Function which implements HMAC MD5 digest
-    *
-    * @param  string $key  The secret key
-    * @param  string $data The data to protect
-    * @return string       The HMAC MD5 digest
-    */
-    function _HMAC_MD5($key, $data)
-    {
-        if (strlen($key) > 64) {
-            $key = pack('H32', md5($key));
-        }
-
-        if (strlen($key) < 64) {
-            $key = str_pad($key, 64, chr(0));
-        }
-
-        $k_ipad = substr($key, 0, 64) ^ str_repeat(chr(0x36), 64);
-        $k_opad = substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64);
-
-        $inner  = pack('H32', md5($k_ipad . $data));
-        $digest = md5($k_opad . $inner);
-
-        return $digest;
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL/CramMD5.php Deleted

@@ -1,68 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of CRAM-MD5 SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_CramMD5 extends Auth_SASL_Common
-{
-    /**
-    * Implements the CRAM-MD5 SASL mechanism
-    * This DOES NOT base64 encode the return value,
-    * you will need to do that yourself.
-    *
-    * @param string $user      Username
-    * @param string $pass      Password
-    * @param string $challenge The challenge supplied by the server.
-    *                          this should be already base64_decoded.
-    *
-    * @return string The string to pass back to the server, of the form
-    *                "<user> <digest>". This is NOT base64_encoded.
-    */
-    function getResponse($user, $pass, $challenge)
-    {
-        return $user . ' ' . $this->_HMAC_MD5($pass, $challenge);
-    }
-}
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL/DigestMD5.php Deleted

@@ -1,197 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of DIGEST-MD5 SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_DigestMD5 extends Auth_SASL_Common
-{
-    /**
-    * Provides the (main) client response for DIGEST-MD5
-    * requires a few extra parameters than the other
-    * mechanisms, which are unavoidable.
-    * 
-    * @param  string $authcid   Authentication id (username)
-    * @param  string $pass      Password
-    * @param  string $challenge The digest challenge sent by the server
-    * @param  string $hostname  The hostname of the machine you're connecting to
-    * @param  string $service   The servicename (eg. imap, pop, acap etc)
-    * @param  string $authzid   Authorization id (username to proxy as)
-    * @return string            The digest response (NOT base64 encoded)
-    * @access public
-    */
-    function getResponse($authcid, $pass, $challenge, $hostname, $service, $authzid = '')
-    {
-        $challenge = $this->_parseChallenge($challenge);
-        $authzid_string = '';
-        if ($authzid != '') {
-            $authzid_string = ',authzid="' . $authzid . '"'; 
-        }
-
-        if (!empty($challenge)) {
-            $cnonce         = $this->_getCnonce();
-            $digest_uri     = sprintf('%s/%s', $service, $hostname);
-            $response_value = $this->_getResponseValue($authcid, $pass, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $authzid);
-
-            if ($challenge['realm']) {
-                return sprintf('username="%s",realm="%s"' . $authzid_string  .
-',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['realm'], $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
-            } else {
-                return sprintf('username="%s"' . $authzid_string  . ',nonce="%s",cnonce="%s",nc=00000001,qop=auth,digest-uri="%s",response=%s,maxbuf=%d', $authcid, $challenge['nonce'], $cnonce, $digest_uri, $response_value, $challenge['maxbuf']);
-            }
-        } else {
-            return PEAR::raiseError('Invalid digest challenge');
-        }
-    }
-    
-    /**
-    * Parses and verifies the digest challenge*
-    *
-    * @param  string $challenge The digest challenge
-    * @return array             The parsed challenge as an assoc
-    *                           array in the form "directive => value".
-    * @access private
-    */
-    function _parseChallenge($challenge)
-    {
-        $tokens = array();
-        while (preg_match('/^([a-z-]+)=("[^"]+(?<!\\\)"|[^,]+)/i', $challenge, $matches)) {
-
-            // Ignore these as per rfc2831
-            if ($matches[1] == 'opaque' OR $matches[1] == 'domain') {
-                $challenge = substr($challenge, strlen($matches[0]) + 1);
-                continue;
-            }
-
-            // Allowed multiple "realm" and "auth-param"
-            if (!empty($tokens[$matches[1]]) AND ($matches[1] == 'realm' OR $matches[1] == 'auth-param')) {
-                if (is_array($tokens[$matches[1]])) {
-                    $tokens[$matches[1]][] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-                } else {
-                    $tokens[$matches[1]] = array($tokens[$matches[1]], preg_replace('/^"(.*)"$/', '\\1', $matches[2]));
-                }
-
-            // Any other multiple instance = failure
-            } elseif (!empty($tokens[$matches[1]])) {
-                $tokens = array();
-                break;
-
-            } else {
-                $tokens[$matches[1]] = preg_replace('/^"(.*)"$/', '\\1', $matches[2]);
-            }
-
-            // Remove the just parsed directive from the challenge
-            $challenge = substr($challenge, strlen($matches[0]) + 1);
-        }
-
-        /**
-        * Defaults and required directives
-        */
-        // Realm
-        if (empty($tokens['realm'])) {
-            $tokens['realm'] = "";
-        }
-
-        // Maxbuf
-        if (empty($tokens['maxbuf'])) {
-            $tokens['maxbuf'] = 65536;
-        }
-
-        // Required: nonce, algorithm
-        if (empty($tokens['nonce']) OR empty($tokens['algorithm'])) {
-            return array();
-        }
-
-        return $tokens;
-    }
-
-    /**
-    * Creates the response= part of the digest response
-    *
-    * @param  string $authcid    Authentication id (username)
-    * @param  string $pass       Password
-    * @param  string $realm      Realm as provided by the server
-    * @param  string $nonce      Nonce as provided by the server
-    * @param  string $cnonce     Client nonce
-    * @param  string $digest_uri The digest-uri= value part of the response
-    * @param  string $authzid    Authorization id
-    * @return string             The response= part of the digest response
-    * @access private
-    */    
-    function _getResponseValue($authcid, $pass, $realm, $nonce, $cnonce, $digest_uri, $authzid = '')
-    {
-        if ($authzid == '') {
-            $A1 = sprintf('%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce);
-        } else {
-            $A1 = sprintf('%s:%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $authcid, $realm, $pass))), $nonce, $cnonce, $authzid);
-        }
-        $A2 = 'AUTHENTICATE:' . $digest_uri;
-        return md5(sprintf('%s:%s:00000001:%s:auth:%s', md5($A1), $nonce, $cnonce, md5($A2)));
-    }
-
-    /**
-    * Creates the client nonce for the response
-    *
-    * @return string  The cnonce value
-    * @access private
-    */
-    function _getCnonce()
-    {
-        if (@file_exists('/dev/urandom') && $fd = @fopen('/dev/urandom', 'r')) {
-            return base64_encode(fread($fd, 32));
-
-        } elseif (@file_exists('/dev/random') && $fd = @fopen('/dev/random', 'r')) {
-            return base64_encode(fread($fd, 32));
-
-        } else {
-            $str = '';
-            for ($i=0; $i<32; $i++) {
-                $str .= chr(mt_rand(0, 255));
-            }
-            
-            return base64_encode($str);
-        }
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL/External.php Deleted

@@ -1,63 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2008 Christoph Schulz                                   | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Christoph Schulz <develop@kristov.de>                         | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id: External.php 286825 2009-08-05 06:23:42Z cweiske $
-
-/**
-* Implmentation of EXTERNAL SASL mechanism
-*
-* @author  Christoph Schulz <develop@kristov.de>
-* @access  public
-* @version 1.0.3
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_External extends Auth_SASL_Common
-{
-    /**
-    * Returns EXTERNAL response
-    *
-    * @param  string $authcid   Authentication id (username)
-    * @param  string $pass      Password
-    * @param  string $authzid   Autorization id
-    * @return string            EXTERNAL Response
-    */
-    function getResponse($authcid, $pass, $authzid = '')
-    {
-        return $authzid;
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL/Login.php Deleted

@@ -1,65 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* This is technically not a SASL mechanism, however
-* it's used by Net_Sieve, Net_Cyrus and potentially
-* other protocols , so here is a good place to abstract
-* it.
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_Login extends Auth_SASL_Common
-{
-    /**
-    * Pseudo SASL LOGIN mechanism
-    *
-    * @param  string $user Username
-    * @param  string $pass Password
-    * @return string       LOGIN string
-    */
-    function getResponse($user, $pass)
-    {
-        return sprintf('LOGIN %s %s', $user, $pass);
-    }
-}
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Auth/SASL/Plain.php Deleted

@@ -1,63 +0,0 @@
-<?php
-// +-----------------------------------------------------------------------+ 
-// | Copyright (c) 2002-2003 Richard Heyes                                 | 
-// | All rights reserved.                                                  | 
-// |                                                                       | 
-// | Redistribution and use in source and binary forms, with or without    | 
-// | modification, are permitted provided that the following conditions    | 
-// | are met:                                                              | 
-// |                                                                       | 
-// | o Redistributions of source code must retain the above copyright      | 
-// |   notice, this list of conditions and the following disclaimer.       | 
-// | o Redistributions in binary form must reproduce the above copyright   | 
-// |   notice, this list of conditions and the following disclaimer in the | 
-// |   documentation and/or other materials provided with the distribution.| 
-// | o The names of the authors may not be used to endorse or promote      | 
-// |   products derived from this software without specific prior written  | 
-// |   permission.                                                         | 
-// |                                                                       | 
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   | 
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     | 
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  | 
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      | 
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   | 
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  | 
-// |                                                                       | 
-// +-----------------------------------------------------------------------+ 
-// | Author: Richard Heyes <richard@php.net>                               | 
-// +-----------------------------------------------------------------------+ 
-// 
-// $Id$
-
-/**
-* Implmentation of PLAIN SASL mechanism
-*
-* @author  Richard Heyes <richard@php.net>
-* @access  public
-* @version 1.0
-* @package Auth_SASL
-*/
-
-require_once('Auth/SASL/Common.php');
-
-class Auth_SASL_Plain extends Auth_SASL_Common
-{
-    /**
-    * Returns PLAIN response
-    *
-    * @param  string $authcid   Authentication id (username)
-    * @param  string $pass      Password
-    * @param  string $authzid   Autorization id
-    * @return string            PLAIN Response
-    */
-    function getResponse($authcid, $pass, $authzid = '')
-    {
-        return $authzid . chr(0) . $authcid . chr(0) . $pass;
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2 Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2.php Deleted

@@ -1,1015 +0,0 @@
-<?php
-/**
- * Class representing a HTTP request message
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Request2.php 315409 2011-08-24 07:29:23Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * A class representing an URL as per RFC 3986.
- */
-require_once 'Net/URL2.php';
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * Class representing a HTTP request message
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- * @link       http://tools.ietf.org/html/rfc2616#section-5
- */
-class HTTP_Request2 implements SplSubject
-{
-   /**#@+
-    * Constants for HTTP request methods
-    *
-    * @link http://tools.ietf.org/html/rfc2616#section-5.1.1
-    */
-    const METHOD_OPTIONS = 'OPTIONS';
-    const METHOD_GET     = 'GET';
-    const METHOD_HEAD    = 'HEAD';
-    const METHOD_POST    = 'POST';
-    const METHOD_PUT     = 'PUT';
-    const METHOD_DELETE  = 'DELETE';
-    const METHOD_TRACE   = 'TRACE';
-    const METHOD_CONNECT = 'CONNECT';
-   /**#@-*/
-
-   /**#@+
-    * Constants for HTTP authentication schemes
-    *
-    * @link http://tools.ietf.org/html/rfc2617
-    */
-    const AUTH_BASIC  = 'basic';
-    const AUTH_DIGEST = 'digest';
-   /**#@-*/
-
-   /**
-    * Regular expression used to check for invalid symbols in RFC 2616 tokens
-    * @link http://pear.php.net/bugs/bug.php?id=15630
-    */
-    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';
-
-   /**
-    * Regular expression used to check for invalid symbols in cookie strings
-    * @link http://pear.php.net/bugs/bug.php?id=15630
-    * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
-    */
-    const REGEXP_INVALID_COOKIE = '/[\s,;]/';
-
-   /**
-    * Fileinfo magic database resource
-    * @var  resource
-    * @see  detectMimeType()
-    */
-    private static $_fileinfoDb;
-
-   /**
-    * Observers attached to the request (instances of SplObserver)
-    * @var  array
-    */
-    protected $observers = array();
-
-   /**
-    * Request URL
-    * @var  Net_URL2
-    */
-    protected $url;
-
-   /**
-    * Request method
-    * @var  string
-    */
-    protected $method = self::METHOD_GET;
-
-   /**
-    * Authentication data
-    * @var  array
-    * @see  getAuth()
-    */
-    protected $auth;
-
-   /**
-    * Request headers
-    * @var  array
-    */
-    protected $headers = array();
-
-   /**
-    * Configuration parameters
-    * @var  array
-    * @see  setConfig()
-    */
-    protected $config = array(
-        'adapter'           => 'HTTP_Request2_Adapter_Socket',
-        'connect_timeout'   => 10,
-        'timeout'           => 0,
-        'use_brackets'      => true,
-        'protocol_version'  => '1.1',
-        'buffer_size'       => 16384,
-        'store_body'        => true,
-
-        'proxy_host'        => '',
-        'proxy_port'        => '',
-        'proxy_user'        => '',
-        'proxy_password'    => '',
-        'proxy_auth_scheme' => self::AUTH_BASIC,
-
-        'ssl_verify_peer'   => true,
-        'ssl_verify_host'   => true,
-        'ssl_cafile'        => null,
-        'ssl_capath'        => null,
-        'ssl_local_cert'    => null,
-        'ssl_passphrase'    => null,
-
-        'digest_compat_ie'  => false,
-
-        'follow_redirects'  => false,
-        'max_redirects'     => 5,
-        'strict_redirects'  => false
-    );
-
-   /**
-    * Last event in request / response handling, intended for observers
-    * @var  array
-    * @see  getLastEvent()
-    */
-    protected $lastEvent = array(
-        'name' => 'start',
-        'data' => null
-    );
-
-   /**
-    * Request body
-    * @var  string|resource
-    * @see  setBody()
-    */
-    protected $body = '';
-
-   /**
-    * Array of POST parameters
-    * @var  array
-    */
-    protected $postParams = array();
-
-   /**
-    * Array of file uploads (for multipart/form-data POST requests)
-    * @var  array
-    */
-    protected $uploads = array();
-
-   /**
-    * Adapter used to perform actual HTTP request
-    * @var  HTTP_Request2_Adapter
-    */
-    protected $adapter;
-
-   /**
-    * Cookie jar to persist cookies between requests
-    * @var HTTP_Request2_CookieJar
-    */
-    protected $cookieJar = null;
-
-   /**
-    * Constructor. Can set request URL, method and configuration array.
-    *
-    * Also sets a default value for User-Agent header.
-    *
-    * @param    string|Net_Url2     Request URL
-    * @param    string              Request method
-    * @param    array               Configuration for this Request instance
-    */
-    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
-    {
-        $this->setConfig($config);
-        if (!empty($url)) {
-            $this->setUrl($url);
-        }
-        if (!empty($method)) {
-            $this->setMethod($method);
-        }
-        $this->setHeader('user-agent', 'HTTP_Request2/2.0.0 ' .
-                         '(http://pear.php.net/package/http_request2) ' .
-                         'PHP/' . phpversion());
-    }
-
-   /**
-    * Sets the URL for this request
-    *
-    * If the URL has userinfo part (username & password) these will be removed
-    * and converted to auth data. If the URL does not have a path component,
-    * that will be set to '/'.
-    *
-    * @param    string|Net_URL2 Request URL
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setUrl($url)
-    {
-        if (is_string($url)) {
-            $url = new Net_URL2(
-                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
-            );
-        }
-        if (!$url instanceof Net_URL2) {
-            throw new HTTP_Request2_LogicException(
-                'Parameter is not a valid HTTP URL',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        // URL contains username / password?
-        if ($url->getUserinfo()) {
-            $username = $url->getUser();
-            $password = $url->getPassword();
-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
-            $url->setUserinfo('');
-        }
-        if ('' == $url->getPath()) {
-            $url->setPath('/');
-        }
-        $this->url = $url;
-
-        return $this;
-    }
-
-   /**
-    * Returns the request URL
-    *
-    * @return   Net_URL2
-    */
-    public function getUrl()
-    {
-        return $this->url;
-    }
-
-   /**
-    * Sets the request method
-    *
-    * @param    string
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException if the method name is invalid
-    */
-    public function setMethod($method)
-    {
-        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
-        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid request method '{$method}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $this->method = $method;
-
-        return $this;
-    }
-
-   /**
-    * Returns the request method
-    *
-    * @return   string
-    */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-   /**
-    * Sets the configuration parameter(s)
-    *
-    * The following parameters are available:
-    * <ul>
-    *   <li> 'adapter'           - adapter to use (string)</li>
-    *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>
-    *   <li> 'timeout'           - Total number of seconds a request can take.
-    *                              Use 0 for no limit, should be greater than
-    *                              'connect_timeout' if set (integer)</li>
-    *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>
-    *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>
-    *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>
-    *   <li> 'store_body'        - Whether to store response body in response object.
-    *                              Set to false if receiving a huge response and
-    *                              using an Observer to save it (boolean)</li>
-    *   <li> 'proxy_host'        - Proxy server host (string)</li>
-    *   <li> 'proxy_port'        - Proxy server port (integer)</li>
-    *   <li> 'proxy_user'        - Proxy auth username (string)</li>
-    *   <li> 'proxy_password'    - Proxy auth password (string)</li>
-    *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>
-    *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>
-    *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL
-    *                              certificate matches host name (bool)</li>
-    *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer
-    *                              with (use with 'ssl_verify_peer') (string)</li>
-    *   <li> 'ssl_capath'        - Directory holding multiple Certificate
-    *                              Authority files (string)</li>
-    *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>
-    *   <li> 'ssl_passphrase'    - Passphrase with which local certificate
-    *                              was encoded (string)</li>
-    *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6
-    *                              in using URL without query string in digest
-    *                              authentication (boolean)</li>
-    *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>
-    *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>
-    *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and
-    *                              302 (true, needed for compatibility with RFC 2616)
-    *                              or switch to GET (false, needed for compatibility with most
-    *                              browsers) (boolean)</li>
-    * </ul>
-    *
-    * @param    string|array    configuration parameter name or array
-    *                           ('parameter name' => 'parameter value')
-    * @param    mixed           parameter value if $nameOrConfig is not an array
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException If the parameter is unknown
-    */
-    public function setConfig($nameOrConfig, $value = null)
-    {
-        if (is_array($nameOrConfig)) {
-            foreach ($nameOrConfig as $name => $value) {
-                $this->setConfig($name, $value);
-            }
-
-        } else {
-            if (!array_key_exists($nameOrConfig, $this->config)) {
-                throw new HTTP_Request2_LogicException(
-                    "Unknown configuration parameter '{$nameOrConfig}'",
-                    HTTP_Request2_Exception::INVALID_ARGUMENT
-                );
-            }
-            $this->config[$nameOrConfig] = $value;
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the value(s) of the configuration parameter(s)
-    *
-    * @param    string  parameter name
-    * @return   mixed   value of $name parameter, array of all configuration
-    *                   parameters if $name is not given
-    * @throws   HTTP_Request2_LogicException If the parameter is unknown
-    */
-    public function getConfig($name = null)
-    {
-        if (null === $name) {
-            return $this->config;
-        } elseif (!array_key_exists($name, $this->config)) {
-            throw new HTTP_Request2_LogicException(
-                "Unknown configuration parameter '{$name}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        return $this->config[$name];
-    }
-
-   /**
-    * Sets the autentification data
-    *
-    * @param    string  user name
-    * @param    string  password
-    * @param    string  authentication scheme
-    * @return   HTTP_Request2
-    */
-    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
-    {
-        if (empty($user)) {
-            $this->auth = null;
-        } else {
-            $this->auth = array(
-                'user'     => (string)$user,
-                'password' => (string)$password,
-                'scheme'   => $scheme
-            );
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the authentication data
-    *
-    * The array has the keys 'user', 'password' and 'scheme', where 'scheme'
-    * is one of the HTTP_Request2::AUTH_* constants.
-    *
-    * @return   array
-    */
-    public function getAuth()
-    {
-        return $this->auth;
-    }
-
-   /**
-    * Sets request header(s)
-    *
-    * The first parameter may be either a full header string 'header: value' or
-    * header name. In the former case $value parameter is ignored, in the latter
-    * the header's value will either be set to $value or the header will be
-    * removed if $value is null. The first parameter can also be an array of
-    * headers, in that case method will be called recursively.
-    *
-    * Note that headers are treated case insensitively as per RFC 2616.
-    *
-    * <code>
-    * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'
-    * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'
-    * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'
-    * $req->setHeader('FOO'); // removes 'Foo' header from request
-    * </code>
-    *
-    * @param    string|array    header name, header string ('Header: value')
-    *                           or an array of headers
-    * @param    string|array|null header value if $name is not an array,
-    *                           header will be removed if value is null
-    * @param    bool            whether to replace previous header with the
-    *                           same name or append to its value
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setHeader($name, $value = null, $replace = true)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v) {
-                if (is_string($k)) {
-                    $this->setHeader($k, $v, $replace);
-                } else {
-                    $this->setHeader($v, null, $replace);
-                }
-            }
-        } else {
-            if (null === $value && strpos($name, ':')) {
-                list($name, $value) = array_map('trim', explode(':', $name, 2));
-            }
-            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
-            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
-                throw new HTTP_Request2_LogicException(
-                    "Invalid header name '{$name}'",
-                    HTTP_Request2_Exception::INVALID_ARGUMENT
-                );
-            }
-            // Header names are case insensitive anyway
-            $name = strtolower($name);
-            if (null === $value) {
-                unset($this->headers[$name]);
-
-            } else {
-                if (is_array($value)) {
-                    $value = implode(', ', array_map('trim', $value));
-                } elseif (is_string($value)) {
-                    $value = trim($value);
-                }
-                if (!isset($this->headers[$name]) || $replace) {
-                    $this->headers[$name] = $value;
-                } else {
-                    $this->headers[$name] .= ', ' . $value;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the request headers
-    *
-    * The array is of the form ('header name' => 'header value'), header names
-    * are lowercased
-    *
-    * @return   array
-    */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-   /**
-    * Adds a cookie to the request
-    *
-    * If the request does not have a CookieJar object set, this method simply
-    * appends a cookie to "Cookie:" header.
-    *
-    * If a CookieJar object is available, the cookie is stored in that object.
-    * Data from request URL will be used for setting its 'domain' and 'path'
-    * parameters, 'expires' and 'secure' will be set to null and false,
-    * respectively. If you need further control, use CookieJar's methods.
-    *
-    * @param    string  cookie name
-    * @param    string  cookie value
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    * @see      setCookieJar()
-    */
-    public function addCookie($name, $value)
-    {
-        if (!empty($this->cookieJar)) {
-            $this->cookieJar->store(array('name' => $name, 'value' => $value),
-                                    $this->url);
-
-        } else {
-            $cookie = $name . '=' . $value;
-            if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
-                throw new HTTP_Request2_LogicException(
-                    "Invalid cookie: '{$cookie}'",
-                    HTTP_Request2_Exception::INVALID_ARGUMENT
-                );
-            }
-            $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
-            $this->setHeader('cookie', $cookies . $cookie);
-        }
-
-        return $this;
-    }
-
-   /**
-    * Sets the request body
-    *
-    * If you provide file pointer rather than file name, it should support
-    * fstat() and rewind() operations.
-    *
-    * @param    string|resource|HTTP_Request2_MultipartBody  Either a string
-    *               with the body or filename containing body or pointer to
-    *               an open file or object with multipart body data
-    * @param    bool    Whether first parameter is a filename
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setBody($body, $isFilename = false)
-    {
-        if (!$isFilename && !is_resource($body)) {
-            if (!$body instanceof HTTP_Request2_MultipartBody) {
-                $this->body = (string)$body;
-            } else {
-                $this->body = $body;
-            }
-        } else {
-            $fileData = $this->fopenWrapper($body, empty($this->headers['content-type']));
-            $this->body = $fileData['fp'];
-            if (empty($this->headers['content-type'])) {
-                $this->setHeader('content-type', $fileData['type']);
-            }
-        }
-        $this->postParams = $this->uploads = array();
-
-        return $this;
-    }
-
-   /**
-    * Returns the request body
-    *
-    * @return   string|resource|HTTP_Request2_MultipartBody
-    */
-    public function getBody()
-    {
-        if (self::METHOD_POST == $this->method &&
-            (!empty($this->postParams) || !empty($this->uploads))
-        ) {
-            if (0 === strpos($this->headers['content-type'], 'application/x-www-form-urlencoded')) {
-                $body = http_build_query($this->postParams, '', '&');
-                if (!$this->getConfig('use_brackets')) {
-                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);
-                }
-                // support RFC 3986 by not encoding '~' symbol (request #15368)
-                return str_replace('%7E', '~', $body);
-
-            } elseif (0 === strpos($this->headers['content-type'], 'multipart/form-data')) {
-                require_once 'HTTP/Request2/MultipartBody.php';
-                return new HTTP_Request2_MultipartBody(
-                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')
-                );
-            }
-        }
-        return $this->body;
-    }
-
-   /**
-    * Adds a file to form-based file upload
-    *
-    * Used to emulate file upload via a HTML form. The method also sets
-    * Content-Type of HTTP request to 'multipart/form-data'.
-    *
-    * If you just want to send the contents of a file as the body of HTTP
-    * request you should use setBody() method.
-    *
-    * If you provide file pointers rather than file names, they should support
-    * fstat() and rewind() operations.
-    *
-    * @param    string  name of file-upload field
-    * @param    string|resource|array   full name of local file, pointer to
-    *               open file or an array of files
-    * @param    string  filename to send in the request
-    * @param    string  content-type of file being uploaded
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function addUpload($fieldName, $filename, $sendFilename = null,
-                              $contentType = null)
-    {
-        if (!is_array($filename)) {
-            $fileData = $this->fopenWrapper($filename, empty($contentType));
-            $this->uploads[$fieldName] = array(
-                'fp'        => $fileData['fp'],
-                'filename'  => !empty($sendFilename)? $sendFilename
-                                :(is_string($filename)? basename($filename): 'anonymous.blob') ,
-                'size'      => $fileData['size'],
-                'type'      => empty($contentType)? $fileData['type']: $contentType
-            );
-        } else {
-            $fps = $names = $sizes = $types = array();
-            foreach ($filename as $f) {
-                if (!is_array($f)) {
-                    $f = array($f);
-                }
-                $fileData = $this->fopenWrapper($f[0], empty($f[2]));
-                $fps[]   = $fileData['fp'];
-                $names[] = !empty($f[1])? $f[1]
-                            :(is_string($f[0])? basename($f[0]): 'anonymous.blob');
-                $sizes[] = $fileData['size'];
-                $types[] = empty($f[2])? $fileData['type']: $f[2];
-            }
-            $this->uploads[$fieldName] = array(
-                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
-            );
-        }
-        if (empty($this->headers['content-type']) ||
-            'application/x-www-form-urlencoded' == $this->headers['content-type']
-        ) {
-            $this->setHeader('content-type', 'multipart/form-data');
-        }
-
-        return $this;
-    }
-
-   /**
-    * Adds POST parameter(s) to the request.
-    *
-    * @param    string|array    parameter name or array ('name' => 'value')
-    * @param    mixed           parameter value (can be an array)
-    * @return   HTTP_Request2
-    */
-    public function addPostParameter($name, $value = null)
-    {
-        if (!is_array($name)) {
-            $this->postParams[$name] = $value;
-        } else {
-            foreach ($name as $k => $v) {
-                $this->addPostParameter($k, $v);
-            }
-        }
-        if (empty($this->headers['content-type'])) {
-            $this->setHeader('content-type', 'application/x-www-form-urlencoded');
-        }
-
-        return $this;
-    }
-
-   /**
-    * Attaches a new observer
-    *
-    * @param    SplObserver
-    */
-    public function attach(SplObserver $observer)
-    {
-        foreach ($this->observers as $attached) {
-            if ($attached === $observer) {
-                return;
-            }
-        }
-        $this->observers[] = $observer;
-    }
-
-   /**
-    * Detaches an existing observer
-    *
-    * @param    SplObserver
-    */
-    public function detach(SplObserver $observer)
-    {
-        foreach ($this->observers as $key => $attached) {
-            if ($attached === $observer) {
-                unset($this->observers[$key]);
-                return;
-            }
-        }
-    }
-
-   /**
-    * Notifies all observers
-    */
-    public function notify()
-    {
-        foreach ($this->observers as $observer) {
-            $observer->update($this);
-        }
-    }
-
-   /**
-    * Sets the last event
-    *
-    * Adapters should use this method to set the current state of the request
-    * and notify the observers.
-    *
-    * @param    string  event name
-    * @param    mixed   event data
-    */
-    public function setLastEvent($name, $data = null)
-    {
-        $this->lastEvent = array(
-            'name' => $name,
-            'data' => $data
-        );
-        $this->notify();
-    }
-
-   /**
-    * Returns the last event
-    *
-    * Observers should use this method to access the last change in request.
-    * The following event names are possible:
-    * <ul>
-    *   <li>'connect'                 - after connection to remote server,
-    *                                   data is the destination (string)</li>
-    *   <li>'disconnect'              - after disconnection from server</li>
-    *   <li>'sentHeaders'             - after sending the request headers,
-    *                                   data is the headers sent (string)</li>
-    *   <li>'sentBodyPart'            - after sending a part of the request body,
-    *                                   data is the length of that part (int)</li>
-    *   <li>'sentBody'                - after sending the whole request body,
-    *                                   data is request body length (int)</li>
-    *   <li>'receivedHeaders'         - after receiving the response headers,
-    *                                   data is HTTP_Request2_Response object</li>
-    *   <li>'receivedBodyPart'        - after receiving a part of the response
-    *                                   body, data is that part (string)</li>
-    *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still
-    *                                   encoded by Content-Encoding</li>
-    *   <li>'receivedBody'            - after receiving the complete response
-    *                                   body, data is HTTP_Request2_Response object</li>
-    * </ul>
-    * Different adapters may not send all the event types. Mock adapter does
-    * not send any events to the observers.
-    *
-    * @return   array   The array has two keys: 'name' and 'data'
-    */
-    public function getLastEvent()
-    {
-        return $this->lastEvent;
-    }
-
-   /**
-    * Sets the adapter used to actually perform the request
-    *
-    * You can pass either an instance of a class implementing HTTP_Request2_Adapter
-    * or a class name. The method will only try to include a file if the class
-    * name starts with HTTP_Request2_Adapter_, it will also try to prepend this
-    * prefix to the class name if it doesn't contain any underscores, so that
-    * <code>
-    * $request->setAdapter('curl');
-    * </code>
-    * will work.
-    *
-    * @param    string|HTTP_Request2_Adapter
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_LogicException
-    */
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            if (!class_exists($adapter, false)) {
-                if (false === strpos($adapter, '_')) {
-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
-                }
-                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
-                }
-                if (!class_exists($adapter, false)) {
-                    throw new HTTP_Request2_LogicException(
-                        "Class {$adapter} not found",
-                        HTTP_Request2_Exception::MISSING_VALUE
-                    );
-                }
-            }
-            $adapter = new $adapter;
-        }
-        if (!$adapter instanceof HTTP_Request2_Adapter) {
-            throw new HTTP_Request2_LogicException(
-                'Parameter is not a HTTP request adapter',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $this->adapter = $adapter;
-
-        return $this;
-    }
-
-   /**
-    * Sets the cookie jar
-    *
-    * A cookie jar is used to maintain cookies across HTTP requests and
-    * responses. Cookies from jar will be automatically added to the request
-    * headers based on request URL.
-    *
-    * @param HTTP_Request2_CookieJar|bool   Existing CookieJar object, true to
-    *                                       create a new one, false to remove
-    */
-    public function setCookieJar($jar = true)
-    {
-        if (!class_exists('HTTP_Request2_CookieJar', false)) {
-            require_once 'HTTP/Request2/CookieJar.php';
-        }
-
-        if ($jar instanceof HTTP_Request2_CookieJar) {
-            $this->cookieJar = $jar;
-        } elseif (true === $jar) {
-            $this->cookieJar = new HTTP_Request2_CookieJar();
-        } elseif (!$jar) {
-            $this->cookieJar = null;
-        } else {
-            throw new HTTP_Request2_LogicException(
-                'Invalid parameter passed to setCookieJar()',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns current CookieJar object or null if none
-    *
-    * @return HTTP_Request2_CookieJar|null
-    */
-    public function getCookieJar()
-    {
-        return $this->cookieJar;
-    }
-
-   /**
-    * Sends the request and returns the response
-    *
-    * @throws   HTTP_Request2_Exception
-    * @return   HTTP_Request2_Response
-    */
-    public function send()
-    {
-        // Sanity check for URL
-        if (!$this->url instanceof Net_URL2
-            || !$this->url->isAbsolute()
-            || !in_array(strtolower($this->url->getScheme()), array('https', 'http'))
-        ) {
-            throw new HTTP_Request2_LogicException(
-                'HTTP_Request2 needs an absolute HTTP(S) request URL, '
-                . ($this->url instanceof Net_URL2
-                   ? "'" . $this->url->__toString() . "'" : 'none')
-                . ' given',
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        if (empty($this->adapter)) {
-            $this->setAdapter($this->getConfig('adapter'));
-        }
-        // magic_quotes_runtime may break file uploads and chunked response
-        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.
-        if ($magicQuotes = get_magic_quotes_runtime()) {
-            set_magic_quotes_runtime(false);
-        }
-        // force using single byte encoding if mbstring extension overloads
-        // strlen() and substr(); see bug #1781, bug #10605
-        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-
-        try {
-            $response = $this->adapter->sendRequest($this);
-        } catch (Exception $e) {
-        }
-        // cleanup in either case (poor man's "finally" clause)
-        if ($magicQuotes) {
-            set_magic_quotes_runtime(true);
-        }
-        if (!empty($oldEncoding)) {
-            mb_internal_encoding($oldEncoding);
-        }
-        // rethrow the exception
-        if (!empty($e)) {
-            throw $e;
-        }
-        return $response;
-    }
-
-   /**
-    * Wrapper around fopen()/fstat() used by setBody() and addUpload()
-    *
-    * @param  string|resource file name or pointer to open file
-    * @param  bool            whether to try autodetecting MIME type of file,
-    *                         will only work if $file is a filename, not pointer
-    * @return array array('fp' => file pointer, 'size' => file size, 'type' => MIME type)
-    * @throws HTTP_Request2_LogicException
-    */
-    protected function fopenWrapper($file, $detectType = false)
-    {
-        if (!is_string($file) && !is_resource($file)) {
-            throw new HTTP_Request2_LogicException(
-                "Filename or file pointer resource expected",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $fileData = array(
-            'fp'   => is_string($file)? null: $file,
-            'type' => 'application/octet-stream',
-            'size' => 0
-        );
-        if (is_string($file)) {
-            $track = @ini_set('track_errors', 1);
-            if (!($fileData['fp'] = @fopen($file, 'rb'))) {
-                $e = new HTTP_Request2_LogicException(
-                    $php_errormsg, HTTP_Request2_Exception::READ_ERROR
-                );
-            }
-            @ini_set('track_errors', $track);
-            if (isset($e)) {
-                throw $e;
-            }
-            if ($detectType) {
-                $fileData['type'] = self::detectMimeType($file);
-            }
-        }
-        if (!($stat = fstat($fileData['fp']))) {
-            throw new HTTP_Request2_LogicException(
-                "fstat() call failed", HTTP_Request2_Exception::READ_ERROR
-            );
-        }
-        $fileData['size'] = $stat['size'];
-
-        return $fileData;
-    }
-
-   /**
-    * Tries to detect MIME type of a file
-    *
-    * The method will try to use fileinfo extension if it is available,
-    * deprecated mime_content_type() function in the other case. If neither
-    * works, default 'application/octet-stream' MIME type is returned
-    *
-    * @param    string  filename
-    * @return   string  file MIME type
-    */
-    protected static function detectMimeType($filename)
-    {
-        // finfo extension from PECL available
-        if (function_exists('finfo_open')) {
-            if (!isset(self::$_fileinfoDb)) {
-                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
-            }
-            if (self::$_fileinfoDb) {
-                $info = finfo_file(self::$_fileinfoDb, $filename);
-            }
-        }
-        // (deprecated) mime_content_type function available
-        if (empty($info) && function_exists('mime_content_type')) {
-            return mime_content_type($filename);
-        }
-        return empty($info)? 'application/octet-stream': $info;
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter.php Deleted

@@ -1,154 +0,0 @@
-<?php
-/**
- * Base class for HTTP_Request2 adapters
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Adapter.php 308322 2011-02-14 13:58:03Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Class representing a HTTP response
- */
-require_once 'HTTP/Request2/Response.php';
-
-/**
- * Base class for HTTP_Request2 adapters
- *
- * HTTP_Request2 class itself only defines methods for aggregating the request
- * data, all actual work of sending the request to the remote server and
- * receiving its response is performed by adapters.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- */
-abstract class HTTP_Request2_Adapter
-{
-   /**
-    * A list of methods that MUST NOT have a request body, per RFC 2616
-    * @var  array
-    */
-    protected static $bodyDisallowed = array('TRACE');
-
-   /**
-    * Methods having defined semantics for request body
-    *
-    * Content-Length header (indicating that the body follows, section 4.3 of
-    * RFC 2616) will be sent for these methods even if no body was added
-    *
-    * @var  array
-    * @link http://pear.php.net/bugs/bug.php?id=12900
-    * @link http://pear.php.net/bugs/bug.php?id=14740
-    */
-    protected static $bodyRequired = array('POST', 'PUT');
-
-   /**
-    * Request being sent
-    * @var  HTTP_Request2
-    */
-    protected $request;
-
-   /**
-    * Request body
-    * @var  string|resource|HTTP_Request2_MultipartBody
-    * @see  HTTP_Request2::getBody()
-    */
-    protected $requestBody;
-
-   /**
-    * Length of the request body
-    * @var  integer
-    */
-    protected $contentLength;
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    abstract public function sendRequest(HTTP_Request2 $request);
-
-   /**
-    * Calculates length of the request body, adds proper headers
-    *
-    * @param    array   associative array of request headers, this method will
-    *                   add proper 'Content-Length' and 'Content-Type' headers
-    *                   to this array (or remove them if not needed)
-    */
-    protected function calculateRequestLength(&$headers)
-    {
-        $this->requestBody = $this->request->getBody();
-
-        if (is_string($this->requestBody)) {
-            $this->contentLength = strlen($this->requestBody);
-        } elseif (is_resource($this->requestBody)) {
-            $stat = fstat($this->requestBody);
-            $this->contentLength = $stat['size'];
-            rewind($this->requestBody);
-        } else {
-            $this->contentLength = $this->requestBody->getLength();
-            $headers['content-type'] = 'multipart/form-data; boundary=' .
-                                       $this->requestBody->getBoundary();
-            $this->requestBody->rewind();
-        }
-
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            // No body: send a Content-Length header nonetheless (request #12900),
-            // but do that only for methods that require a body (bug #14740)
-            if (in_array($this->request->getMethod(), self::$bodyRequired)) {
-                $headers['content-length'] = 0;
-            } else {
-                unset($headers['content-length']);
-                // if the method doesn't require a body and doesn't have a
-                // body, don't send a Content-Type header. (request #16799)
-                unset($headers['content-type']);
-            }
-        } else {
-            if (empty($headers['content-type'])) {
-                $headers['content-type'] = 'application/x-www-form-urlencoded';
-            }
-            $headers['content-length'] = $this->contentLength;
-        }
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter/Curl.php Deleted

@@ -1,560 +0,0 @@
-<?php
-/**
- * Adapter for HTTP_Request2 wrapping around cURL extension
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Curl.php 310800 2011-05-06 07:29:56Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Adapter for HTTP_Request2 wrapping around cURL extension
- *
- * @category    HTTP
- * @package     HTTP_Request2
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 2.0.0
- */
-class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
-{
-   /**
-    * Mapping of header names to cURL options
-    * @var  array
-    */
-    protected static $headerMap = array(
-        'accept-encoding' => CURLOPT_ENCODING,
-        'cookie'          => CURLOPT_COOKIE,
-        'referer'         => CURLOPT_REFERER,
-        'user-agent'      => CURLOPT_USERAGENT
-    );
-
-   /**
-    * Mapping of SSL context options to cURL options
-    * @var  array
-    */
-    protected static $sslContextMap = array(
-        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,
-        'ssl_cafile'      => CURLOPT_CAINFO,
-        'ssl_capath'      => CURLOPT_CAPATH,
-        'ssl_local_cert'  => CURLOPT_SSLCERT,
-        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
-   );
-
-   /**
-    * Mapping of CURLE_* constants to Exception subclasses and error codes
-    * @var  array
-    */
-    protected static $errorMap = array(
-        CURLE_UNSUPPORTED_PROTOCOL  => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
-        CURLE_COULDNT_RESOLVE_PROXY => array('HTTP_Request2_ConnectionException'),
-        CURLE_COULDNT_RESOLVE_HOST  => array('HTTP_Request2_ConnectionException'),
-        CURLE_COULDNT_CONNECT       => array('HTTP_Request2_ConnectionException'),
-        // error returned from write callback
-        CURLE_WRITE_ERROR           => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
-        CURLE_OPERATION_TIMEOUTED   => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::TIMEOUT),
-        CURLE_HTTP_RANGE_ERROR      => array('HTTP_Request2_MessageException'),
-        CURLE_SSL_CONNECT_ERROR     => array('HTTP_Request2_ConnectionException'),
-        CURLE_LIBRARY_NOT_FOUND     => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_FUNCTION_NOT_FOUND    => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_ABORTED_BY_CALLBACK   => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::NON_HTTP_REDIRECT),
-        CURLE_TOO_MANY_REDIRECTS    => array('HTTP_Request2_MessageException',
-                                             HTTP_Request2_Exception::TOO_MANY_REDIRECTS),
-        CURLE_SSL_PEER_CERTIFICATE  => array('HTTP_Request2_ConnectionException'),
-        CURLE_GOT_NOTHING           => array('HTTP_Request2_MessageException'),
-        CURLE_SSL_ENGINE_NOTFOUND   => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_SSL_ENGINE_SETFAILED  => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::MISCONFIGURATION),
-        CURLE_SEND_ERROR            => array('HTTP_Request2_MessageException'),
-        CURLE_RECV_ERROR            => array('HTTP_Request2_MessageException'),
-        CURLE_SSL_CERTPROBLEM       => array('HTTP_Request2_LogicException',
-                                             HTTP_Request2_Exception::INVALID_ARGUMENT),
-        CURLE_SSL_CIPHER            => array('HTTP_Request2_ConnectionException'),
-        CURLE_SSL_CACERT            => array('HTTP_Request2_ConnectionException'),
-        CURLE_BAD_CONTENT_ENCODING  => array('HTTP_Request2_MessageException'),
-    );
-
-   /**
-    * Response being received
-    * @var  HTTP_Request2_Response
-    */
-    protected $response;
-
-   /**
-    * Whether 'sentHeaders' event was sent to observers
-    * @var  boolean
-    */
-    protected $eventSentHeaders = false;
-
-   /**
-    * Whether 'receivedHeaders' event was sent to observers
-    * @var boolean
-    */
-    protected $eventReceivedHeaders = false;
-
-   /**
-    * Position within request body
-    * @var  integer
-    * @see  callbackReadBody()
-    */
-    protected $position = 0;
-
-   /**
-    * Information about last transfer, as returned by curl_getinfo()
-    * @var  array
-    */
-    protected $lastInfo;
-
-   /**
-    * Creates a subclass of HTTP_Request2_Exception from curl error data
-    *
-    * @param resource curl handle
-    * @return HTTP_Request2_Exception
-    */
-    protected static function wrapCurlError($ch)
-    {
-        $nativeCode = curl_errno($ch);
-        $message    = 'Curl error: ' . curl_error($ch);
-        if (!isset(self::$errorMap[$nativeCode])) {
-            return new HTTP_Request2_Exception($message, 0, $nativeCode);
-        } else {
-            $class = self::$errorMap[$nativeCode][0];
-            $code  = empty(self::$errorMap[$nativeCode][1])
-                     ? 0 : self::$errorMap[$nativeCode][1];
-            return new $class($message, $code, $nativeCode);
-        }
-    }
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (!extension_loaded('curl')) {
-            throw new HTTP_Request2_LogicException(
-                'cURL extension not available', HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-
-        $this->request              = $request;
-        $this->response             = null;
-        $this->position             = 0;
-        $this->eventSentHeaders     = false;
-        $this->eventReceivedHeaders = false;
-
-        try {
-            if (false === curl_exec($ch = $this->createCurlHandle())) {
-                $e = self::wrapCurlError($ch);
-            }
-        } catch (Exception $e) {
-        }
-        if (isset($ch)) {
-            $this->lastInfo = curl_getinfo($ch);
-            curl_close($ch);
-        }
-
-        $response = $this->response;
-        unset($this->request, $this->requestBody, $this->response);
-
-        if (!empty($e)) {
-            throw $e;
-        }
-
-        if ($jar = $request->getCookieJar()) {
-            $jar->addCookiesFromResponse($response, $request->getUrl());
-        }
-
-        if (0 < $this->lastInfo['size_download']) {
-            $request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
-
-   /**
-    * Returns information about last transfer
-    *
-    * @return   array   associative array as returned by curl_getinfo()
-    */
-    public function getInfo()
-    {
-        return $this->lastInfo;
-    }
-
-   /**
-    * Creates a new cURL handle and populates it with data from the request
-    *
-    * @return   resource    a cURL handle, as created by curl_init()
-    * @throws   HTTP_Request2_LogicException
-    */
-    protected function createCurlHandle()
-    {
-        $ch = curl_init();
-
-        curl_setopt_array($ch, array(
-            // setup write callbacks
-            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
-            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
-            // buffer size
-            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
-            // connection timeout
-            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
-            // save full outgoing headers, in case someone is interested
-            CURLINFO_HEADER_OUT    => true,
-            // request url
-            CURLOPT_URL            => $this->request->getUrl()->getUrl()
-        ));
-
-        // set up redirects
-        if (!$this->request->getConfig('follow_redirects')) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-        } else {
-            if (!@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true)) {
-                throw new HTTP_Request2_LogicException(
-                    'Redirect support in curl is unavailable due to open_basedir or safe_mode setting',
-                    HTTP_Request2_Exception::MISCONFIGURATION
-                );
-            }
-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
-            // limit redirects to http(s), works in 5.2.10+
-            if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-            }
-            // works in 5.3.2+, http://bugs.php.net/bug.php?id=49571
-            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR')) {
-                curl_setopt($ch, CURLOPT_POSTREDIR, 3);
-            }
-        }
-
-        // request timeout
-        if ($timeout = $this->request->getConfig('timeout')) {
-            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-        }
-
-        // set HTTP version
-        switch ($this->request->getConfig('protocol_version')) {
-            case '1.0':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-                break;
-            case '1.1':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-        }
-
-        // set request method
-        switch ($this->request->getMethod()) {
-            case HTTP_Request2::METHOD_GET:
-                curl_setopt($ch, CURLOPT_HTTPGET, true);
-                break;
-            case HTTP_Request2::METHOD_POST:
-                curl_setopt($ch, CURLOPT_POST, true);
-                break;
-            case HTTP_Request2::METHOD_HEAD:
-                curl_setopt($ch, CURLOPT_NOBODY, true);
-                break;
-            case HTTP_Request2::METHOD_PUT:
-                curl_setopt($ch, CURLOPT_UPLOAD, true);
-                break;
-            default:
-                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
-        }
-
-        // set proxy, if needed
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_LogicException(
-                    'Proxy port not provided', HTTP_Request2_Exception::MISSING_VALUE
-                );
-            }
-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
-            if ($user = $this->request->getConfig('proxy_user')) {
-                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
-                            $this->request->getConfig('proxy_password'));
-                switch ($this->request->getConfig('proxy_auth_scheme')) {
-                    case HTTP_Request2::AUTH_BASIC:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
-                        break;
-                    case HTTP_Request2::AUTH_DIGEST:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
-                }
-            }
-        }
-
-        // set authentication data
-        if ($auth = $this->request->getAuth()) {
-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
-            switch ($auth['scheme']) {
-                case HTTP_Request2::AUTH_BASIC:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-                    break;
-                case HTTP_Request2::AUTH_DIGEST:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-            }
-        }
-
-        // set SSL options
-        foreach ($this->request->getConfig() as $name => $value) {
-            if ('ssl_verify_host' == $name && null !== $value) {
-                curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
-            } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
-                curl_setopt($ch, self::$sslContextMap[$name], $value);
-            }
-        }
-
-        $headers = $this->request->getHeaders();
-        // make cURL automagically send proper header
-        if (!isset($headers['accept-encoding'])) {
-            $headers['accept-encoding'] = '';
-        }
-
-        if (($jar = $this->request->getCookieJar())
-            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
-        ) {
-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
-        }
-
-        // set headers having special cURL keys
-        foreach (self::$headerMap as $name => $option) {
-            if (isset($headers[$name])) {
-                curl_setopt($ch, $option, $headers[$name]);
-                unset($headers[$name]);
-            }
-        }
-
-        $this->calculateRequestLength($headers);
-        if (isset($headers['content-length'])) {
-            $this->workaroundPhpBug47204($ch, $headers);
-        }
-
-        // set headers not having special keys
-        $headersFmt = array();
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersFmt[]  = $canonicalName . ': ' . $value;
-        }
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
-
-        return $ch;
-    }
-
-   /**
-    * Workaround for PHP bug #47204 that prevents rewinding request body
-    *
-    * The workaround consists of reading the entire request body into memory
-    * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large
-    * file uploads, use Socket adapter instead.
-    *
-    * @param    resource    cURL handle
-    * @param    array       Request headers
-    */
-    protected function workaroundPhpBug47204($ch, &$headers)
-    {
-        // no redirects, no digest auth -> probably no rewind needed
-        if (!$this->request->getConfig('follow_redirects')
-            && (!($auth = $this->request->getAuth())
-                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
-        ) {
-            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
-
-        // rewind may be needed, read the whole body into memory
-        } else {
-            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
-                $this->requestBody = $this->requestBody->__toString();
-
-            } elseif (is_resource($this->requestBody)) {
-                $fp = $this->requestBody;
-                $this->requestBody = '';
-                while (!feof($fp)) {
-                    $this->requestBody .= fread($fp, 16384);
-                }
-            }
-            // curl hangs up if content-length is present
-            unset($headers['content-length']);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
-        }
-    }
-
-   /**
-    * Callback function called by cURL for reading the request body
-    *
-    * @param    resource    cURL handle
-    * @param    resource    file descriptor (not used)
-    * @param    integer     maximum length of data to return
-    * @return   string      part of the request body, up to $length bytes
-    */
-    protected function callbackReadBody($ch, $fd, $length)
-    {
-        if (!$this->eventSentHeaders) {
-            $this->request->setLastEvent(
-                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-            );
-            $this->eventSentHeaders = true;
-        }
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength || $this->position >= $this->contentLength
-        ) {
-            return '';
-        }
-        if (is_string($this->requestBody)) {
-            $string = substr($this->requestBody, $this->position, $length);
-        } elseif (is_resource($this->requestBody)) {
-            $string = fread($this->requestBody, $length);
-        } else {
-            $string = $this->requestBody->read($length);
-        }
-        $this->request->setLastEvent('sentBodyPart', strlen($string));
-        $this->position += strlen($string);
-        return $string;
-    }
-
-   /**
-    * Callback function called by cURL for saving the response headers
-    *
-    * @param    resource    cURL handle
-    * @param    string      response header (with trailing CRLF)
-    * @return   integer     number of bytes saved
-    * @see      HTTP_Request2_Response::parseHeaderLine()
-    */
-    protected function callbackWriteHeader($ch, $string)
-    {
-        // we may receive a second set of headers if doing e.g. digest auth
-        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {
-            // don't bother with 100-Continue responses (bug #15785)
-            if (!$this->eventSentHeaders ||
-                $this->response->getStatus() >= 200
-            ) {
-                $this->request->setLastEvent(
-                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-                );
-            }
-            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
-            // if body wasn't read by a callback, send event with total body size
-            if ($upload > $this->position) {
-                $this->request->setLastEvent(
-                    'sentBodyPart', $upload - $this->position
-                );
-                $this->position = $upload;
-            }
-            if ($upload && (!$this->eventSentHeaders
-                            || $this->response->getStatus() >= 200)
-            ) {
-                $this->request->setLastEvent('sentBody', $upload);
-            }
-            $this->eventSentHeaders = true;
-            // we'll need a new response object
-            if ($this->eventReceivedHeaders) {
-                $this->eventReceivedHeaders = false;
-                $this->response             = null;
-            }
-        }
-        if (empty($this->response)) {
-            $this->response = new HTTP_Request2_Response(
-                $string, false, curl_getinfo($ch, CURLINFO_EFFECTIVE_URL)
-            );
-        } else {
-            $this->response->parseHeaderLine($string);
-            if ('' == trim($string)) {
-                // don't bother with 100-Continue responses (bug #15785)
-                if (200 <= $this->response->getStatus()) {
-                    $this->request->setLastEvent('receivedHeaders', $this->response);
-                }
-
-                if ($this->request->getConfig('follow_redirects') && $this->response->isRedirect()) {
-                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));
-
-                    // for versions lower than 5.2.10, check the redirection URL protocol
-                    if (!defined('CURLOPT_REDIR_PROTOCOLS') && $redirectUrl->isAbsolute()
-                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-                    ) {
-                        return -1;
-                    }
-
-                    if ($jar = $this->request->getCookieJar()) {
-                        $jar->addCookiesFromResponse($this->response, $this->request->getUrl());
-                        if (!$redirectUrl->isAbsolute()) {
-                            $redirectUrl = $this->request->getUrl()->resolve($redirectUrl);
-                        }
-                        if ($cookies = $jar->getMatching($redirectUrl, true)) {
-                            curl_setopt($ch, CURLOPT_COOKIE, $cookies);
-                        }
-                    }
-                }
-                $this->eventReceivedHeaders = true;
-            }
-        }
-        return strlen($string);
-    }
-
-   /**
-    * Callback function called by cURL for saving the response body
-    *
-    * @param    resource    cURL handle (not used)
-    * @param    string      part of the response body
-    * @return   integer     number of bytes saved
-    * @see      HTTP_Request2_Response::appendBody()
-    */
-    protected function callbackWriteBody($ch, $string)
-    {
-        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
-        // response doesn't start with proper HTTP status line (see bug #15716)
-        if (empty($this->response)) {
-            throw new HTTP_Request2_MessageException(
-                "Malformed response: {$string}",
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
-            );
-        }
-        if ($this->request->getConfig('store_body')) {
-            $this->response->appendBody($string);
-        }
-        $this->request->setLastEvent('receivedBodyPart', $string);
-        return strlen($string);
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter/Mock.php Deleted

@@ -1,171 +0,0 @@
-<?php
-/**
- * Mock adapter intended for testing
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Mock.php 308322 2011-02-14 13:58:03Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Mock adapter intended for testing
- *
- * Can be used to test applications depending on HTTP_Request2 package without
- * actually performing any HTTP requests. This adapter will return responses
- * previously added via addResponse()
- * <code>
- * $mock = new HTTP_Request2_Adapter_Mock();
- * $mock->addResponse("HTTP/1.1 ... ");
- *
- * $request = new HTTP_Request2();
- * $request->setAdapter($mock);
- *
- * // This will return the response set above
- * $response = $req->send();
- * </code>
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
-{
-   /**
-    * A queue of responses to be returned by sendRequest()
-    * @var  array
-    */
-    protected $responses = array();
-
-   /**
-    * Returns the next response from the queue built by addResponse()
-    *
-    * If the queue is empty it will return default empty response with status 400,
-    * if an Exception object was added to the queue it will be thrown.
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (count($this->responses) > 0) {
-            $response = array_shift($this->responses);
-            if ($response instanceof HTTP_Request2_Response) {
-                return $response;
-            } else {
-                // rethrow the exception
-                $class   = get_class($response);
-                $message = $response->getMessage();
-                $code    = $response->getCode();
-                throw new $class($message, $code);
-            }
-        } else {
-            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
-        }
-    }
-
-   /**
-    * Adds response to the queue
-    *
-    * @param    mixed   either a string, a pointer to an open file,
-    *                   an instance of HTTP_Request2_Response or Exception
-    * @throws   HTTP_Request2_Exception
-    */
-    public function addResponse($response)
-    {
-        if (is_string($response)) {
-            $response = self::createResponseFromString($response);
-        } elseif (is_resource($response)) {
-            $response = self::createResponseFromFile($response);
-        } elseif (!$response instanceof HTTP_Request2_Response &&
-                  !$response instanceof Exception
-        ) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid response');
-        }
-        $this->responses[] = $response;
-    }
-
-   /**
-    * Creates a new HTTP_Request2_Response object from a string
-    *
-    * @param    string
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public static function createResponseFromString($str)
-    {
-        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
-        $headerLines = explode("\n", $parts[0]);
-        $response    = new HTTP_Request2_Response(array_shift($headerLines));
-        foreach ($headerLines as $headerLine) {
-            $response->parseHeaderLine($headerLine);
-        }
-        $response->parseHeaderLine('');
-        if (isset($parts[1])) {
-            $response->appendBody($parts[1]);
-        }
-        return $response;
-    }
-
-   /**
-    * Creates a new HTTP_Request2_Response object from a file
-    *
-    * @param    resource    file pointer returned by fopen()
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public static function createResponseFromFile($fp)
-    {
-        $response = new HTTP_Request2_Response(fgets($fp));
-        do {
-            $headerLine = fgets($fp);
-            $response->parseHeaderLine($headerLine);
-        } while ('' != trim($headerLine));
-
-        while (!feof($fp)) {
-            $response->appendBody(fread($fp, 8192));
-        }
-        return $response;
-    }
-}
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Adapter/Socket.php Deleted

@@ -1,1084 +0,0 @@
-<?php
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Socket.php 309921 2011-04-03 16:43:02Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * This adapter uses only PHP sockets and will work on almost any PHP
- * environment. Code is based on original HTTP_Request PEAR package.
- *
- * @category    HTTP
- * @package     HTTP_Request2
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 2.0.0
- */
-class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
-{
-   /**
-    * Regular expression for 'token' rule from RFC 2616
-    */
-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
-
-   /**
-    * Regular expression for 'quoted-string' rule from RFC 2616
-    */
-    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
-
-   /**
-    * Connected sockets, needed for Keep-Alive support
-    * @var  array
-    * @see  connect()
-    */
-    protected static $sockets = array();
-
-   /**
-    * Data for digest authentication scheme
-    *
-    * The keys for the array are URL prefixes.
-    *
-    * The values are associative arrays with data (realm, nonce, nonce-count,
-    * opaque...) needed for digest authentication. Stored here to prevent making
-    * duplicate requests to digest-protected resources after we have already
-    * received the challenge.
-    *
-    * @var  array
-    */
-    protected static $challenges = array();
-
-   /**
-    * Connected socket
-    * @var  resource
-    * @see  connect()
-    */
-    protected $socket;
-
-   /**
-    * Challenge used for server digest authentication
-    * @var  array
-    */
-    protected $serverChallenge;
-
-   /**
-    * Challenge used for proxy digest authentication
-    * @var  array
-    */
-    protected $proxyChallenge;
-
-   /**
-    * Sum of start time and global timeout, exception will be thrown if request continues past this time
-    * @var  integer
-    */
-    protected $deadline = null;
-
-   /**
-    * Remaining length of the current chunk, when reading chunked response
-    * @var  integer
-    * @see  readChunked()
-    */
-    protected $chunkLength = 0;
-
-   /**
-    * Remaining amount of redirections to follow
-    *
-    * Starts at 'max_redirects' configuration parameter and is reduced on each
-    * subsequent redirect. An Exception will be thrown once it reaches zero.
-    *
-    * @var  integer
-    */
-    protected $redirectCountdown = null;
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        $this->request = $request;
-
-        // Use global request timeout if given, see feature requests #5735, #8964
-        if ($timeout = $request->getConfig('timeout')) {
-            $this->deadline = time() + $timeout;
-        } else {
-            $this->deadline = null;
-        }
-
-        try {
-            $keepAlive = $this->connect();
-            $headers   = $this->prepareHeaders();
-            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
-                throw new HTTP_Request2_MessageException('Error writing request');
-            }
-            // provide request headers to the observer, see request #7633
-            $this->request->setLastEvent('sentHeaders', $headers);
-            $this->writeBody();
-
-            if ($this->deadline && time() > $this->deadline) {
-                throw new HTTP_Request2_MessageException(
-                    'Request timed out after ' .
-                    $request->getConfig('timeout') . ' second(s)',
-                    HTTP_Request2_Exception::TIMEOUT
-                );
-            }
-
-            $response = $this->readResponse();
-
-            if ($jar = $request->getCookieJar()) {
-                $jar->addCookiesFromResponse($response, $request->getUrl());
-            }
-
-            if (!$this->canKeepAlive($keepAlive, $response)) {
-                $this->disconnect();
-            }
-
-            if ($this->shouldUseProxyDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($this->shouldUseServerDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($authInfo = $response->getHeader('authentication-info')) {
-                $this->updateChallenge($this->serverChallenge, $authInfo);
-            }
-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
-            }
-
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-
-        unset($this->request, $this->requestBody);
-
-        if (!empty($e)) {
-            $this->redirectCountdown = null;
-            throw $e;
-        }
-
-        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
-            $this->redirectCountdown = null;
-            return $response;
-        } else {
-            return $this->handleRedirect($request, $response);
-        }
-    }
-
-   /**
-    * Connects to the remote server
-    *
-    * @return   bool    whether the connection can be persistent
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function connect()
-    {
-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $headers = $this->request->getHeaders();
-        $reqHost = $this->request->getUrl()->getHost();
-        if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
-        }
-
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_LogicException(
-                    'Proxy port not provided',
-                    HTTP_Request2_Exception::MISSING_VALUE
-                );
-            }
-            $proxy = true;
-        } else {
-            $host  = $reqHost;
-            $port  = $reqPort;
-            $proxy = false;
-        }
-
-        if ($tunnel && !$proxy) {
-            throw new HTTP_Request2_LogicException(
-                "Trying to perform CONNECT request without proxy",
-                HTTP_Request2_Exception::MISSING_VALUE
-            );
-        }
-        if ($secure && !in_array('ssl', stream_get_transports())) {
-            throw new HTTP_Request2_LogicException(
-                'Need OpenSSL support for https:// requests',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
-        // connection token to a proxy server...
-        if ($proxy && !$secure &&
-            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
-        ) {
-            $this->request->setHeader('connection');
-        }
-
-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
-                      empty($headers['connection'])) ||
-                     (!empty($headers['connection']) &&
-                      'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
-
-        $options = array();
-        if ($secure || $tunnel) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
-                    if ('ssl_verify_host' == $name) {
-                        if ($value) {
-                            $options['CN_match'] = $reqHost;
-                        }
-                    } else {
-                        $options[substr($name, 4)] = $value;
-                    }
-                }
-            }
-            ksort($options);
-        }
-
-        // Changing SSL context options after connection is established does *not*
-        // work, we need a new connection if options change
-        $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
-        unset($this->socket);
-
-        // We use persistent connections and have a connected socket?
-        // Ensure that the socket is still connected, see bug #16149
-        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
-            !feof(self::$sockets[$socketKey])
-        ) {
-            $this->socket =& self::$sockets[$socketKey];
-
-        } elseif ($secure && $proxy && !$tunnel) {
-            $this->establishTunnel();
-            $this->request->setLastEvent(
-                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
-            );
-            self::$sockets[$socketKey] =& $this->socket;
-
-        } else {
-            // Set SSL context options if doing HTTPS request or creating a tunnel
-            $context = stream_context_create();
-            foreach ($options as $name => $value) {
-                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
-                    throw new HTTP_Request2_LogicException(
-                        "Error setting SSL context option '{$name}'"
-                    );
-                }
-            }
-            $track = @ini_set('track_errors', 1);
-            $this->socket = @stream_socket_client(
-                $remote, $errno, $errstr,
-                $this->request->getConfig('connect_timeout'),
-                STREAM_CLIENT_CONNECT, $context
-            );
-            if (!$this->socket) {
-                $e = new HTTP_Request2_ConnectionException(
-                    "Unable to connect to {$remote}. Error: "
-                     . (empty($errstr)? $php_errormsg: $errstr), 0, $errno
-                );
-            }
-            @ini_set('track_errors', $track);
-            if (isset($e)) {
-                throw $e;
-            }
-            $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
-        }
-        return $keepAlive;
-    }
-
-   /**
-    * Establishes a tunnel to a secure remote server via HTTP CONNECT request
-    *
-    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP
-    * sees that we are connected to a proxy server (duh!) rather than the server
-    * that presents its certificate.
-    *
-    * @link     http://tools.ietf.org/html/rfc2817#section-5.2
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function establishTunnel()
-    {
-        $donor   = new self;
-        $connect = new HTTP_Request2(
-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
-            array_merge($this->request->getConfig(),
-                        array('adapter' => $donor))
-        );
-        $response = $connect->send();
-        // Need any successful (2XX) response
-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
-            throw new HTTP_Request2_ConnectionException(
-                'Failed to connect via HTTPS proxy. Proxy response: ' .
-                $response->getStatus() . ' ' . $response->getReasonPhrase()
-            );
-        }
-        $this->socket = $donor->socket;
-
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
-
-        foreach ($modes as $mode) {
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
-                return;
-            }
-        }
-        throw new HTTP_Request2_ConnectionException(
-            'Failed to enable secure connection when connecting through proxy'
-        );
-    }
-
-   /**
-    * Checks whether current connection may be reused or should be closed
-    *
-    * @param    boolean                 whether connection could be persistent
-    *                                   in the first place
-    * @param    HTTP_Request2_Response  response object to check
-    * @return   boolean
-    */
-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
-    {
-        // Do not close socket on successful CONNECT request
-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-            200 <= $response->getStatus() && 300 > $response->getStatus()
-        ) {
-            return true;
-        }
-
-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding'))
-                       || null !== $response->getHeader('content-length')
-                       // no body possible for such responses, see also request #17031
-                       || HTTP_Request2::METHOD_HEAD == $this->request->getMethod()
-                       || in_array($response->getStatus(), array(204, 304));
-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
-                       (null === $response->getHeader('connection') &&
-                        '1.1' == $response->getVersion());
-        return $requestKeepAlive && $lengthKnown && $persistent;
-    }
-
-   /**
-    * Disconnects from the remote server
-    */
-    protected function disconnect()
-    {
-        if (is_resource($this->socket)) {
-            fclose($this->socket);
-            $this->socket = null;
-            $this->request->setLastEvent('disconnect');
-        }
-    }
-
-   /**
-    * Handles HTTP redirection
-    *
-    * This method will throw an Exception if redirect to a non-HTTP(S) location
-    * is attempted, also if number of redirects performed already is equal to
-    * 'max_redirects' configuration parameter.
-    *
-    * @param    HTTP_Request2               Original request
-    * @param    HTTP_Request2_Response      Response containing redirect
-    * @return   HTTP_Request2_Response      Response from a new location
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function handleRedirect(HTTP_Request2 $request,
-                                      HTTP_Request2_Response $response)
-    {
-        if (is_null($this->redirectCountdown)) {
-            $this->redirectCountdown = $request->getConfig('max_redirects');
-        }
-        if (0 == $this->redirectCountdown) {
-            $this->redirectCountdown = null;
-            // Copying cURL behaviour
-            throw new HTTP_Request2_MessageException (
-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed',
-                HTTP_Request2_Exception::TOO_MANY_REDIRECTS
-            );
-        }
-        $redirectUrl = new Net_URL2(
-            $response->getHeader('location'),
-            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
-        );
-        // refuse non-HTTP redirect
-        if ($redirectUrl->isAbsolute()
-            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-        ) {
-            $this->redirectCountdown = null;
-            throw new HTTP_Request2_MessageException(
-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString(),
-                HTTP_Request2_Exception::NON_HTTP_REDIRECT
-            );
-        }
-        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
-        // but in practice it is often not
-        if (!$redirectUrl->isAbsolute()) {
-            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
-        }
-        $redirect = clone $request;
-        $redirect->setUrl($redirectUrl);
-        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
-             && in_array($response->getStatus(), array(301, 302)))
-        ) {
-            $redirect->setMethod(HTTP_Request2::METHOD_GET);
-            $redirect->setBody('');
-        }
-
-        if (0 < $this->redirectCountdown) {
-            $this->redirectCountdown--;
-        }
-        return $this->sendRequest($redirect);
-    }
-
-   /**
-    * Checks whether another request should be performed with server digest auth
-    *
-    * Several conditions should be satisfied for it to return true:
-    *   - response status should be 401
-    *   - auth credentials should be set in the request object
-    *   - response should contain WWW-Authenticate header with digest challenge
-    *   - there is either no challenge stored for this URL or new challenge
-    *     contains stale=true parameter (in other case we probably just failed
-    *     due to invalid username / password)
-    *
-    * The method stores challenge values in $challenges static property
-    *
-    * @param    HTTP_Request2_Response  response to check
-    * @return   boolean whether another request should be performed
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
-    */
-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
-    {
-        // no sense repeating a request if we don't have credentials
-        if (401 != $response->getStatus() || !$this->request->getAuth()) {
-            return false;
-        }
-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
-            return false;
-        }
-
-        $url    = $this->request->getUrl();
-        $scheme = $url->getScheme();
-        $host   = $scheme . '://' . $url->getHost();
-        if ($port = $url->getPort()) {
-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
-                (0 == strcasecmp($scheme, 'https') && 443 != $port)
-            ) {
-                $host .= ':' . $port;
-            }
-        }
-
-        if (!empty($challenge['domain'])) {
-            $prefixes = array();
-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
-                // don't bother with different servers
-                if ('/' == substr($prefix, 0, 1)) {
-                    $prefixes[] = $host . $prefix;
-                }
-            }
-        }
-        if (empty($prefixes)) {
-            $prefixes = array($host . '/');
-        }
-
-        $ret = true;
-        foreach ($prefixes as $prefix) {
-            if (!empty(self::$challenges[$prefix]) &&
-                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-            ) {
-                // probably credentials are invalid
-                $ret = false;
-            }
-            self::$challenges[$prefix] =& $challenge;
-        }
-        return $ret;
-    }
-
-   /**
-    * Checks whether another request should be performed with proxy digest auth
-    *
-    * Several conditions should be satisfied for it to return true:
-    *   - response status should be 407
-    *   - proxy auth credentials should be set in the request object
-    *   - response should contain Proxy-Authenticate header with digest challenge
-    *   - there is either no challenge stored for this proxy or new challenge
-    *     contains stale=true parameter (in other case we probably just failed
-    *     due to invalid username / password)
-    *
-    * The method stores challenge values in $challenges static property
-    *
-    * @param    HTTP_Request2_Response  response to check
-    * @return   boolean whether another request should be performed
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
-    */
-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
-    {
-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
-            return false;
-        }
-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
-            return false;
-        }
-
-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
-               ':' . $this->request->getConfig('proxy_port');
-
-        if (!empty(self::$challenges[$key]) &&
-            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-        ) {
-            $ret = false;
-        } else {
-            $ret = true;
-        }
-        self::$challenges[$key] = $challenge;
-        return $ret;
-    }
-
-   /**
-    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
-    *
-    * There is a problem with implementation of RFC 2617: several of the parameters
-    * are defined as quoted-string there and thus may contain backslash escaped
-    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
-    * just value of quoted-string X without surrounding quotes, it doesn't speak
-    * about removing backslash escaping.
-    *
-    * Now realm parameter is user-defined and human-readable, strange things
-    * happen when it contains quotes:
-    *   - Apache allows quotes in realm, but apparently uses realm value without
-    *     backslashes for digest computation
-    *   - Squid allows (manually escaped) quotes there, but it is impossible to
-    *     authorize with either escaped or unescaped quotes used in digest,
-    *     probably it can't parse the response (?)
-    *   - Both IE and Firefox display realm value with backslashes in
-    *     the password popup and apparently use the same value for digest
-    *
-    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
-    * quoted-string handling, unfortunately that means failure to authorize
-    * sometimes
-    *
-    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header
-    * @return   mixed   associative array with challenge parameters, false if
-    *                   no challenge is present in header value
-    * @throws   HTTP_Request2_NotImplementedException in case of unsupported challenge parameters
-    */
-    protected function parseDigestChallenge($headerValue)
-    {
-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
-        if (!preg_match($challenge, $headerValue, $matches)) {
-            return false;
-        }
-
-        preg_match_all('!' . $authParam . '!', $matches[0], $params);
-        $paramsAry   = array();
-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
-                             'algorithm', 'qop');
-        for ($i = 0; $i < count($params[0]); $i++) {
-            // section 3.2.1: Any unrecognized directive MUST be ignored.
-            if (in_array($params[1][$i], $knownParams)) {
-                if ('"' == substr($params[2][$i], 0, 1)) {
-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-                } else {
-                    $paramsAry[$params[1][$i]] = $params[2][$i];
-                }
-            }
-        }
-        // we only support qop=auth
-        if (!empty($paramsAry['qop']) &&
-            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
-        ) {
-            throw new HTTP_Request2_NotImplementedException(
-                "Only 'auth' qop is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['qop']}'"
-            );
-        }
-        // we only support algorithm=MD5
-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
-            throw new HTTP_Request2_NotImplementedException(
-                "Only 'MD5' algorithm is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['algorithm']}'"
-            );
-        }
-
-        return $paramsAry;
-    }
-
-   /**
-    * Parses [Proxy-]Authentication-Info header value and updates challenge
-    *
-    * @param    array   challenge to update
-    * @param    string  value of [Proxy-]Authentication-Info header
-    * @todo     validate server rspauth response
-    */
-    protected function updateChallenge(&$challenge, $headerValue)
-    {
-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
-        $paramsAry   = array();
-
-        preg_match_all($authParam, $headerValue, $params);
-        for ($i = 0; $i < count($params[0]); $i++) {
-            if ('"' == substr($params[2][$i], 0, 1)) {
-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-            } else {
-                $paramsAry[$params[1][$i]] = $params[2][$i];
-            }
-        }
-        // for now, just update the nonce value
-        if (!empty($paramsAry['nextnonce'])) {
-            $challenge['nonce'] = $paramsAry['nextnonce'];
-            $challenge['nc']    = 1;
-        }
-    }
-
-   /**
-    * Creates a value for [Proxy-]Authorization header when using digest authentication
-    *
-    * @param    string  user name
-    * @param    string  password
-    * @param    string  request URL
-    * @param    array   digest challenge parameters
-    * @return   string  value of [Proxy-]Authorization request header
-    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
-    */
-    protected function createDigestResponse($user, $password, $url, &$challenge)
-    {
-        if (false !== ($q = strpos($url, '?')) &&
-            $this->request->getConfig('digest_compat_ie')
-        ) {
-            $url = substr($url, 0, $q);
-        }
-
-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
-        $a2 = md5($this->request->getMethod() . ':' . $url);
-
-        if (empty($challenge['qop'])) {
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
-        } else {
-            $challenge['cnonce'] = 'Req2.' . rand();
-            if (empty($challenge['nc'])) {
-                $challenge['nc'] = 1;
-            }
-            $nc     = sprintf('%08x', $challenge['nc']++);
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
-                          $challenge['cnonce'] . ':auth:' . $a2);
-        }
-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
-               'realm="' . $challenge['realm'] . '", ' .
-               'nonce="' . $challenge['nonce'] . '", ' .
-               'uri="' . $url . '", ' .
-               'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
-    }
-
-   /**
-    * Adds 'Authorization' header (if needed) to request headers array
-    *
-    * @param    array   request headers
-    * @param    string  request host (needed for digest authentication)
-    * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_NotImplementedException
-    */
-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
-    {
-        if (!($auth = $this->request->getAuth())) {
-            return;
-        }
-        switch ($auth['scheme']) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['authorization'] =
-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
-                           $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
-                foreach (array_keys(self::$challenges) as $key) {
-                    if ($key == substr($fullUrl, 0, strlen($key))) {
-                        $headers['authorization'] = $this->createDigestResponse(
-                            $auth['user'], $auth['password'],
-                            $requestUrl, self::$challenges[$key]
-                        );
-                        $this->serverChallenge =& self::$challenges[$key];
-                        break;
-                    }
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_NotImplementedException(
-                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
-                );
-        }
-    }
-
-   /**
-    * Adds 'Proxy-Authorization' header (if needed) to request headers array
-    *
-    * @param    array   request headers
-    * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_NotImplementedException
-    */
-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
-    {
-        if (!$this->request->getConfig('proxy_host') ||
-            !($user = $this->request->getConfig('proxy_user')) ||
-            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
-             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
-        ) {
-            return;
-        }
-
-        $password = $this->request->getConfig('proxy_password');
-        switch ($this->request->getConfig('proxy_auth_scheme')) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['proxy-authorization'] =
-                    'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->proxyChallenge);
-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
-                            ':' . $this->request->getConfig('proxy_port');
-                if (!empty(self::$challenges[$proxyUrl])) {
-                    $headers['proxy-authorization'] = $this->createDigestResponse(
-                        $user, $password,
-                        $requestUrl, self::$challenges[$proxyUrl]
-                    );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_NotImplementedException(
-                    "Unknown HTTP authentication scheme '" .
-                    $this->request->getConfig('proxy_auth_scheme') . "'"
-                );
-        }
-    }
-
-
-   /**
-    * Creates the string with the Request-Line and request headers
-    *
-    * @return   string
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function prepareHeaders()
-    {
-        $headers = $this->request->getHeaders();
-        $url     = $this->request->getUrl();
-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $host    = $url->getHost();
-
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
-        }
-        // Do not overwrite explicitly set 'Host' header, see bug #16146
-        if (!isset($headers['host'])) {
-            $headers['host'] = $host;
-        }
-
-        if ($connect) {
-            $requestUrl = $host;
-
-        } else {
-            if (!$this->request->getConfig('proxy_host') ||
-                0 == strcasecmp($url->getScheme(), 'https')
-            ) {
-                $requestUrl = '';
-            } else {
-                $requestUrl = $url->getScheme() . '://' . $host;
-            }
-            $path        = $url->getPath();
-            $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
-        }
-
-        if ('1.1' == $this->request->getConfig('protocol_version') &&
-            extension_loaded('zlib') && !isset($headers['accept-encoding'])
-        ) {
-            $headers['accept-encoding'] = 'gzip, deflate';
-        }
-        if (($jar = $this->request->getCookieJar())
-            && ($cookies = $jar->getMatching($this->request->getUrl(), true))
-        ) {
-            $headers['cookie'] = (empty($headers['cookie'])? '': $headers['cookie'] . '; ') . $cookies;
-        }
-
-        $this->addAuthorizationHeader($headers, $host, $requestUrl);
-        $this->addProxyAuthorizationHeader($headers, $requestUrl);
-        $this->calculateRequestLength($headers);
-
-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
-                      $this->request->getConfig('protocol_version') . "\r\n";
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
-        }
-        return $headersStr . "\r\n";
-    }
-
-   /**
-    * Sends the request body
-    *
-    * @throws   HTTP_Request2_MessageException
-    */
-    protected function writeBody()
-    {
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            return;
-        }
-
-        $position   = 0;
-        $bufferSize = $this->request->getConfig('buffer_size');
-        while ($position < $this->contentLength) {
-            if (is_string($this->requestBody)) {
-                $str = substr($this->requestBody, $position, $bufferSize);
-            } elseif (is_resource($this->requestBody)) {
-                $str = fread($this->requestBody, $bufferSize);
-            } else {
-                $str = $this->requestBody->read($bufferSize);
-            }
-            if (false === @fwrite($this->socket, $str, strlen($str))) {
-                throw new HTTP_Request2_MessageException('Error writing request');
-            }
-            // Provide the length of written string to the observer, request #7630
-            $this->request->setLastEvent('sentBodyPart', strlen($str));
-            $position += strlen($str);
-        }
-        $this->request->setLastEvent('sentBody', $this->contentLength);
-    }
-
-   /**
-    * Reads the remote server's response
-    *
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function readResponse()
-    {
-        $bufferSize = $this->request->getConfig('buffer_size');
-
-        do {
-            $response = new HTTP_Request2_Response(
-                $this->readLine($bufferSize), true, $this->request->getUrl()
-            );
-            do {
-                $headerLine = $this->readLine($bufferSize);
-                $response->parseHeaderLine($headerLine);
-            } while ('' != $headerLine);
-        } while (in_array($response->getStatus(), array(100, 101)));
-
-        $this->request->setLastEvent('receivedHeaders', $response);
-
-        // No body possible in such responses
-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
-            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
-            in_array($response->getStatus(), array(204, 304))
-        ) {
-            return $response;
-        }
-
-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
-        $length  = $response->getHeader('content-length');
-        $hasBody = false;
-        if ($chunked || null === $length || 0 < intval($length)) {
-            // RFC 2616, section 4.4:
-            // 3. ... If a message is received with both a
-            // Transfer-Encoding header field and a Content-Length header field,
-            // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
-            $this->chunkLength = 0;
-
-            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
-                if ($chunked) {
-                    $data = $this->readChunked($bufferSize);
-                } elseif (is_null($toRead)) {
-                    $data = $this->fread($bufferSize);
-                } else {
-                    $data    = $this->fread(min($toRead, $bufferSize));
-                    $toRead -= strlen($data);
-                }
-                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
-                    break;
-                }
-
-                $hasBody = true;
-                if ($this->request->getConfig('store_body')) {
-                    $response->appendBody($data);
-                }
-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
-                } else {
-                    $this->request->setLastEvent('receivedBodyPart', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            $this->request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
-
-   /**
-    * Reads until either the end of the socket or a newline, whichever comes first
-    *
-    * Strips the trailing newline from the returned data, handles global
-    * request timeout. Method idea borrowed from Net_Socket PEAR package.
-    *
-    * @param    int     buffer size to use for reading
-    * @return   Available data up to the newline (not including newline)
-    * @throws   HTTP_Request2_MessageException     In case of timeout
-    */
-    protected function readLine($bufferSize)
-    {
-        $line = '';
-        while (!feof($this->socket)) {
-            if ($this->deadline) {
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-            }
-            $line .= @fgets($this->socket, $bufferSize);
-            $info  = stream_get_meta_data($this->socket);
-            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-                $reason = $this->deadline
-                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                          : 'due to default_socket_timeout php.ini setting';
-                throw new HTTP_Request2_MessageException(
-                    "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
-                );
-            }
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
-
-   /**
-    * Wrapper around fread(), handles global request timeout
-    *
-    * @param    int     Reads up to this number of bytes
-    * @return   Data read from socket
-    * @throws   HTTP_Request2_MessageException     In case of timeout
-    */
-    protected function fread($length)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $data = fread($this->socket, $length);
-        $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-            $reason = $this->deadline
-                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                      : 'due to default_socket_timeout php.ini setting';
-            throw new HTTP_Request2_MessageException(
-                "Request timed out {$reason}", HTTP_Request2_Exception::TIMEOUT
-            );
-        }
-        return $data;
-    }
-
-   /**
-    * Reads a part of response body encoded with chunked Transfer-Encoding
-    *
-    * @param    int     buffer size to use for reading
-    * @return   string
-    * @throws   HTTP_Request2_MessageException
-    */
-    protected function readChunked($bufferSize)
-    {
-        // at start of the next chunk?
-        if (0 == $this->chunkLength) {
-            $line = $this->readLine($bufferSize);
-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                throw new HTTP_Request2_MessageException(
-                    "Cannot decode chunked response, invalid chunk length '{$line}'",
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            } else {
-                $this->chunkLength = hexdec($matches[1]);
-                // Chunk with zero length indicates the end
-                if (0 == $this->chunkLength) {
-                    $this->readLine($bufferSize);
-                    return '';
-                }
-            }
-        }
-        $data = $this->fread(min($this->chunkLength, $bufferSize));
-        $this->chunkLength -= strlen($data);
-        if (0 == $this->chunkLength) {
-            $this->readLine($bufferSize); // Trailing CRLF
-        }
-        return $data;
-    }
-}
-
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/CookieJar.php Deleted

@@ -1,499 +0,0 @@
-<?php
-/**
- * Stores cookies and passes them between HTTP requests
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: CookieJar.php 308629 2011-02-24 17:34:24Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/** Class representing a HTTP request message */
-require_once 'HTTP/Request2.php';
-
-/**
- * Stores cookies and passes them between HTTP requests
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: @package_version@
- */
-class HTTP_Request2_CookieJar implements Serializable
-{
-   /**
-    * Array of stored cookies
-    *
-    * The array is indexed by domain, path and cookie name
-    *   .example.com
-    *     /
-    *       some_cookie => cookie data
-    *     /subdir
-    *       other_cookie => cookie data
-    *   .example.org
-    *     ...
-    *
-    * @var array
-    */
-    protected $cookies = array();
-
-   /**
-    * Whether session cookies should be serialized when serializing the jar
-    * @var bool
-    */
-    protected $serializeSession = false;
-
-   /**
-    * Whether Public Suffix List should be used for domain matching
-    * @var bool
-    */
-    protected $useList = true;
-
-   /**
-    * Array with Public Suffix List data
-    * @var  array
-    * @link http://publicsuffix.org/
-    */
-    protected static $psl = array();
-
-   /**
-    * Class constructor, sets various options
-    *
-    * @param bool Controls serializing session cookies, see {@link serializeSessionCookies()}
-    * @param bool Controls using Public Suffix List, see {@link usePublicSuffixList()}
-    */
-    public function __construct($serializeSessionCookies = false, $usePublicSuffixList = true)
-    {
-        $this->serializeSessionCookies($serializeSessionCookies);
-        $this->usePublicSuffixList($usePublicSuffixList);
-    }
-
-   /**
-    * Returns current time formatted in ISO-8601 at UTC timezone
-    *
-    * @return string
-    */
-    protected function now()
-    {
-        $dt = new DateTime();
-        $dt->setTimezone(new DateTimeZone('UTC'));
-        return $dt->format(DateTime::ISO8601);
-    }
-
-   /**
-    * Checks cookie array for correctness, possibly updating its 'domain', 'path' and 'expires' fields
-    *
-    * The checks are as follows:
-    *   - cookie array should contain 'name' and 'value' fields;
-    *   - name and value should not contain disallowed symbols;
-    *   - 'expires' should be either empty parseable by DateTime;
-    *   - 'domain' and 'path' should be either not empty or an URL where
-    *     cookie was set should be provided.
-    *   - if $setter is provided, then document at that URL should be allowed
-    *     to set a cookie for that 'domain'. If $setter is not provided,
-    *     then no domain checks will be made.
-    *
-    * 'expires' field will be converted to ISO8601 format from COOKIE format,
-    * 'domain' and 'path' will be set from setter URL if empty.
-    *
-    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
-    * @param    Net_URL2 URL of the document that sent Set-Cookie header
-    * @return   array    Updated cookie array
-    * @throws   HTTP_Request2_LogicException
-    * @throws   HTTP_Request2_MessageException
-    */
-    protected function checkAndUpdateFields(array $cookie, Net_URL2 $setter = null)
-    {
-        if ($missing = array_diff(array('name', 'value'), array_keys($cookie))) {
-            throw new HTTP_Request2_LogicException(
-                "Cookie array should contain 'name' and 'value' fields",
-                HTTP_Request2_Exception::MISSING_VALUE
-            );
-        }
-        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['name'])) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid cookie name: '{$cookie['name']}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        if (preg_match(HTTP_Request2::REGEXP_INVALID_COOKIE, $cookie['value'])) {
-            throw new HTTP_Request2_LogicException(
-                "Invalid cookie value: '{$cookie['value']}'",
-                HTTP_Request2_Exception::INVALID_ARGUMENT
-            );
-        }
-        $cookie += array('domain' => '', 'path' => '', 'expires' => null, 'secure' => false);
-
-        // Need ISO-8601 date @ UTC timezone
-        if (!empty($cookie['expires'])
-            && !preg_match('/^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\+0000$/', $cookie['expires'])
-        ) {
-            try {
-                $dt = new DateTime($cookie['expires']);
-                $dt->setTimezone(new DateTimeZone('UTC'));
-                $cookie['expires'] = $dt->format(DateTime::ISO8601);
-            } catch (Exception $e) {
-                throw new HTTP_Request2_LogicException($e->getMessage());
-            }
-        }
-
-        if (empty($cookie['domain']) || empty($cookie['path'])) {
-            if (!$setter) {
-                throw new HTTP_Request2_LogicException(
-                    'Cookie misses domain and/or path component, cookie setter URL needed',
-                    HTTP_Request2_Exception::MISSING_VALUE
-                );
-            }
-            if (empty($cookie['domain'])) {
-                if ($host = $setter->getHost()) {
-                    $cookie['domain'] = $host;
-                } else {
-                    throw new HTTP_Request2_LogicException(
-                        'Setter URL does not contain host part, can\'t set cookie domain',
-                        HTTP_Request2_Exception::MISSING_VALUE
-                    );
-                }
-            }
-            if (empty($cookie['path'])) {
-                $path = $setter->getPath();
-                $cookie['path'] = empty($path)? '/': substr($path, 0, strrpos($path, '/') + 1);
-            }
-        }
-
-        if ($setter && !$this->domainMatch($setter->getHost(), $cookie['domain'])) {
-            throw new HTTP_Request2_MessageException(
-                "Domain " . $setter->getHost() . " cannot set cookies for "
-                . $cookie['domain']
-            );
-        }
-
-        return $cookie;
-    }
-
-   /**
-    * Stores a cookie in the jar
-    *
-    * @param    array    cookie data, as returned by {@link HTTP_Request2_Response::getCookies()}
-    * @param    Net_URL2 URL of the document that sent Set-Cookie header
-    * @throws   HTTP_Request2_Exception
-    */
-    public function store(array $cookie, Net_URL2 $setter = null)
-    {
-        $cookie = $this->checkAndUpdateFields($cookie, $setter);
-
-        if (strlen($cookie['value'])
-            && (is_null($cookie['expires']) || $cookie['expires'] > $this->now())
-        ) {
-            if (!isset($this->cookies[$cookie['domain']])) {
-                $this->cookies[$cookie['domain']] = array();
-            }
-            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
-                $this->cookies[$cookie['domain']][$cookie['path']] = array();
-            }
-            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
-
-        } elseif (isset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']])) {
-            unset($this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']]);
-        }
-    }
-
-   /**
-    * Adds cookies set in HTTP response to the jar
-    *
-    * @param HTTP_Request2_Response response
-    * @param Net_URL2               original request URL, needed for setting
-    *                               default domain/path
-    */
-    public function addCookiesFromResponse(HTTP_Request2_Response $response, Net_URL2 $setter)
-    {
-        foreach ($response->getCookies() as $cookie) {
-            $this->store($cookie, $setter);
-        }
-    }
-
-   /**
-    * Returns all cookies matching a given request URL
-    *
-    * The following checks are made:
-    *   - cookie domain should match request host
-    *   - cookie path should be a prefix for request path
-    *   - 'secure' cookies will only be sent for HTTPS requests
-    *
-    * @param  Net_URL2
-    * @param  bool      Whether to return cookies as string for "Cookie: " header
-    * @return array
-    */
-    public function getMatching(Net_URL2 $url, $asString = false)
-    {
-        $host   = $url->getHost();
-        $path   = $url->getPath();
-        $secure = 0 == strcasecmp($url->getScheme(), 'https');
-
-        $matched = $ret = array();
-        foreach (array_keys($this->cookies) as $domain) {
-            if ($this->domainMatch($host, $domain)) {
-                foreach (array_keys($this->cookies[$domain]) as $cPath) {
-                    if (0 === strpos($path, $cPath)) {
-                        foreach ($this->cookies[$domain][$cPath] as $name => $cookie) {
-                            if (!$cookie['secure'] || $secure) {
-                                $matched[$name][strlen($cookie['path'])] = $cookie;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        foreach ($matched as $cookies) {
-            krsort($cookies);
-            $ret = array_merge($ret, $cookies);
-        }
-        if (!$asString) {
-            return $ret;
-        } else {
-            $str = '';
-            foreach ($ret as $c) {
-                $str .= (empty($str)? '': '; ') . $c['name'] . '=' . $c['value'];
-            }
-            return $str;
-        }
-    }
-
-   /**
-    * Returns all cookies stored in a jar
-    *
-    * @return array
-    */
-    public function getAll()
-    {
-        $cookies = array();
-        foreach (array_keys($this->cookies) as $domain) {
-            foreach (array_keys($this->cookies[$domain]) as $path) {
-                foreach ($this->cookies[$domain][$path] as $name => $cookie) {
-                    $cookies[] = $cookie;
-                }
-            }
-        }
-        return $cookies;
-    }
-
-   /**
-    * Sets whether session cookies should be serialized when serializing the jar
-    *
-    * @param    boolean
-    */
-    public function serializeSessionCookies($serialize)
-    {
-        $this->serializeSession = (bool)$serialize;
-    }
-
-   /**
-    * Sets whether Public Suffix List should be used for restricting cookie-setting
-    *
-    * Without PSL {@link domainMatch()} will only prevent setting cookies for
-    * top-level domains like '.com' or '.org'. However, it will not prevent
-    * setting a cookie for '.co.uk' even though only third-level registrations
-    * are possible in .uk domain.
-    *
-    * With the List it is possible to find the highest level at which a domain
-    * may be registered for a particular top-level domain and consequently
-    * prevent cookies set for '.co.uk' or '.msk.ru'. The same list is used by
-    * Firefox, Chrome and Opera browsers to restrict cookie setting.
-    *
-    * Note that PSL is licensed differently to HTTP_Request2 package (refer to
-    * the license information in public-suffix-list.php), so you can disable
-    * its use if this is an issue for you.
-    *
-    * @param    boolean
-    * @link     http://publicsuffix.org/learn/
-    */
-    public function usePublicSuffixList($useList)
-    {
-        $this->useList = (bool)$useList;
-    }
-
-   /**
-    * Returns string representation of object
-    *
-    * @return string
-    * @see    Serializable::serialize()
-    */
-    public function serialize()
-    {
-        $cookies = $this->getAll();
-        if (!$this->serializeSession) {
-            for ($i = count($cookies) - 1; $i >= 0; $i--) {
-                if (empty($cookies[$i]['expires'])) {
-                    unset($cookies[$i]);
-                }
-            }
-        }
-        return serialize(array(
-            'cookies'          => $cookies,
-            'serializeSession' => $this->serializeSession,
-            'useList'          => $this->useList
-        ));
-    }
-
-   /**
-    * Constructs the object from serialized string
-    *
-    * @param string  string representation
-    * @see   Serializable::unserialize()
-    */
-    public function unserialize($serialized)
-    {
-        $data = unserialize($serialized);
-        $now  = $this->now();
-        $this->serializeSessionCookies($data['serializeSession']);
-        $this->usePublicSuffixList($data['useList']);
-        foreach ($data['cookies'] as $cookie) {
-            if (!empty($cookie['expires']) && $cookie['expires'] <= $now) {
-                continue;
-            }
-            if (!isset($this->cookies[$cookie['domain']])) {
-                $this->cookies[$cookie['domain']] = array();
-            }
-            if (!isset($this->cookies[$cookie['domain']][$cookie['path']])) {
-                $this->cookies[$cookie['domain']][$cookie['path']] = array();
-            }
-            $this->cookies[$cookie['domain']][$cookie['path']][$cookie['name']] = $cookie;
-        }
-    }
-
-   /**
-    * Checks whether a cookie domain matches a request host.
-    *
-    * The method is used by {@link store()} to check for whether a document
-    * at given URL can set a cookie with a given domain attribute and by
-    * {@link getMatching()} to find cookies matching the request URL.
-    *
-    * @param    string  request host
-    * @param    string  cookie domain
-    * @return   bool    match success
-    */
-    public function domainMatch($requestHost, $cookieDomain)
-    {
-        if ($requestHost == $cookieDomain) {
-            return true;
-        }
-        // IP address, we require exact match
-        if (preg_match('/^(?:\d{1,3}\.){3}\d{1,3}$/', $requestHost)) {
-            return false;
-        }
-        if ('.' != $cookieDomain[0]) {
-            $cookieDomain = '.' . $cookieDomain;
-        }
-        // prevents setting cookies for '.com' and similar domains
-        if (!$this->useList && substr_count($cookieDomain, '.') < 2
-            || $this->useList && !self::getRegisteredDomain($cookieDomain)
-        ) {
-            return false;
-        }
-        return substr('.' . $requestHost, -strlen($cookieDomain)) == $cookieDomain;
-    }
-
-   /**
-    * Removes subdomains to get the registered domain (the first after top-level)
-    *
-    * The method will check Public Suffix List to find out where top-level
-    * domain ends and registered domain starts. It will remove domain parts
-    * to the left of registered one.
-    *
-    * @param  string        domain name
-    * @return string|bool   registered domain, will return false if $domain is
-    *                       either invalid or a TLD itself
-    */
-    public static function getRegisteredDomain($domain)
-    {
-        $domainParts = explode('.', ltrim($domain, '.'));
-
-        // load the list if needed
-        if (empty(self::$psl)) {
-            $path = '@data_dir@' . DIRECTORY_SEPARATOR . 'HTTP_Request2';
-            if (0 === strpos($path, '@' . 'data_dir@')) {
-                $path = realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR . '..'
-                                 . DIRECTORY_SEPARATOR . 'data');
-            }
-            self::$psl = include_once $path . DIRECTORY_SEPARATOR . 'public-suffix-list.php';
-        }
-
-        if (!($result = self::checkDomainsList($domainParts, self::$psl))) {
-            // known TLD, invalid domain name
-            return false;
-        }
-
-        // unknown TLD
-        if (!strpos($result, '.')) {
-            // fallback to checking that domain "has at least two dots"
-            if (2 > ($count = count($domainParts))) {
-                return false;
-            }
-            return $domainParts[$count - 2] . '.' . $domainParts[$count - 1];
-        }
-        return $result;
-    }
-
-   /**
-    * Recursive helper method for {@link getRegisteredDomain()}
-    *
-    * @param  array         remaining domain parts
-    * @param  mixed         node in {@link HTTP_Request2_CookieJar::$psl} to check
-    * @return string|null   concatenated domain parts, null in case of error
-    */
-    protected static function checkDomainsList(array $domainParts, $listNode)
-    {
-        $sub    = array_pop($domainParts);
-        $result = null;
-
-        if (!is_array($listNode) || is_null($sub)
-            || array_key_exists('!' . $sub, $listNode)
-         ) {
-            return $sub;
-
-        } elseif (array_key_exists($sub, $listNode)) {
-            $result = self::checkDomainsList($domainParts, $listNode[$sub]);
-
-        } elseif (array_key_exists('*', $listNode)) {
-            $result = self::checkDomainsList($domainParts, $listNode['*']);
-
-        } else {
-            return $sub;
-        }
-
-        return (strlen($result) > 0) ? ($result . '.' . $sub) : null;
-    }
-}
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Exception.php Deleted

@@ -1,160 +0,0 @@
-<?php
-/**
- * Exception classes for HTTP_Request2 package
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Exception.php 308629 2011-02-24 17:34:24Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for exceptions in PEAR
- */
-require_once 'PEAR/Exception.php';
-
-/**
- * Base exception class for HTTP_Request2 package
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- * @link       http://pear.php.net/pepr/pepr-proposal-show.php?id=132
- */
-class HTTP_Request2_Exception extends PEAR_Exception
-{
-    /** An invalid argument was passed to a method */
-    const INVALID_ARGUMENT   = 1;
-    /** Some required value was not available */
-    const MISSING_VALUE      = 2;
-    /** Request cannot be processed due to errors in PHP configuration */
-    const MISCONFIGURATION   = 3;
-    /** Error reading the local file */
-    const READ_ERROR         = 4;
-
-    /** Server returned a response that does not conform to HTTP protocol */
-    const MALFORMED_RESPONSE = 10;
-    /** Failure decoding Content-Encoding or Transfer-Encoding of response */
-    const DECODE_ERROR       = 20;
-    /** Operation timed out */
-    const TIMEOUT            = 30;
-    /** Number of redirects exceeded 'max_redirects' configuration parameter */
-    const TOO_MANY_REDIRECTS = 40;
-    /** Redirect to a protocol other than http(s):// */
-    const NON_HTTP_REDIRECT  = 50;
-
-   /**
-    * Native error code
-    * @var int
-    */
-    private $_nativeCode;
-
-   /**
-    * Constructor, can set package error code and native error code
-    *
-    * @param string exception message
-    * @param int    package error code, one of class constants
-    * @param int    error code from underlying PHP extension
-    */
-    public function __construct($message = null, $code = null, $nativeCode = null)
-    {
-        parent::__construct($message, $code);
-        $this->_nativeCode = $nativeCode;
-    }
-
-   /**
-    * Returns error code produced by underlying PHP extension
-    *
-    * For Socket Adapter this may contain error number returned by
-    * stream_socket_client(), for Curl Adapter this will contain error number
-    * returned by curl_errno()
-    *
-    * @return integer
-    */
-    public function getNativeCode()
-    {
-        return $this->_nativeCode;
-    }
-}
-
-/**
- * Exception thrown in case of missing features
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_NotImplementedException extends HTTP_Request2_Exception {}
-
-/**
- * Exception that represents error in the program logic
- *
- * This exception usually implies a programmer's error, like passing invalid
- * data to methods or trying to use PHP extensions that weren't installed or
- * enabled. Usually exceptions of this kind will be thrown before request even
- * starts.
- *
- * The exception will usually contain a package error code.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_LogicException extends HTTP_Request2_Exception {}
-
-/**
- * Exception thrown when connection to a web or proxy server fails
- *
- * The exception will not contain a package error code, but will contain
- * native error code, as returned by stream_socket_client() or curl_errno().
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_ConnectionException extends HTTP_Request2_Exception {}
-
-/**
- * Exception thrown when sending or receiving HTTP message fails
- *
- * The exception may contain both package error code and native error code.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 2.0.0
- */
-class HTTP_Request2_MessageException extends HTTP_Request2_Exception {}
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/MultipartBody.php Deleted

@@ -1,274 +0,0 @@
-<?php
-/**
- * Helper class for building multipart/form-data request body
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: MultipartBody.php 308322 2011-02-14 13:58:03Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Class for building multipart/form-data request body
- *
- * The class helps to reduce memory consumption by streaming large file uploads
- * from disk, it also allows monitoring of upload progress (see request #7630)
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- * @link       http://tools.ietf.org/html/rfc1867
- */
-class HTTP_Request2_MultipartBody
-{
-   /**
-    * MIME boundary
-    * @var  string
-    */
-    private $_boundary;
-
-   /**
-    * Form parameters added via {@link HTTP_Request2::addPostParameter()}
-    * @var  array
-    */
-    private $_params = array();
-
-   /**
-    * File uploads added via {@link HTTP_Request2::addUpload()}
-    * @var  array
-    */
-    private $_uploads = array();
-
-   /**
-    * Header for parts with parameters
-    * @var  string
-    */
-    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
-
-   /**
-    * Header for parts with uploads
-    * @var  string
-    */
-    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
-
-   /**
-    * Current position in parameter and upload arrays
-    *
-    * First number is index of "current" part, second number is position within
-    * "current" part
-    *
-    * @var  array
-    */
-    private $_pos = array(0, 0);
-
-
-   /**
-    * Constructor. Sets the arrays with POST data.
-    *
-    * @param    array   values of form fields set via {@link HTTP_Request2::addPostParameter()}
-    * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}
-    * @param    bool    whether to append brackets to array variable names
-    */
-    public function __construct(array $params, array $uploads, $useBrackets = true)
-    {
-        $this->_params = self::_flattenArray('', $params, $useBrackets);
-        foreach ($uploads as $fieldName => $f) {
-            if (!is_array($f['fp'])) {
-                $this->_uploads[] = $f + array('name' => $fieldName);
-            } else {
-                for ($i = 0; $i < count($f['fp']); $i++) {
-                    $upload = array(
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
-                    );
-                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
-                        $upload[$key] = $f[$key][$i];
-                    }
-                    $this->_uploads[] = $upload;
-                }
-            }
-        }
-    }
-
-   /**
-    * Returns the length of the body to use in Content-Length header
-    *
-    * @return   integer
-    */
-    public function getLength()
-    {
-        $boundaryLength     = strlen($this->getBoundary());
-        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
-        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
-        $length             = $boundaryLength + 6;
-        foreach ($this->_params as $p) {
-            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
-        }
-        foreach ($this->_uploads as $u) {
-            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
-                       strlen($u['filename']) + $u['size'] + 2;
-        }
-        return $length;
-    }
-
-   /**
-    * Returns the boundary to use in Content-Type header
-    *
-    * @return   string
-    */
-    public function getBoundary()
-    {
-        if (empty($this->_boundary)) {
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
-        }
-        return $this->_boundary;
-    }
-
-   /**
-    * Returns next chunk of request body
-    *
-    * @param    integer Amount of bytes to read
-    * @return   string  Up to $length bytes of data, empty string if at end
-    */
-    public function read($length)
-    {
-        $ret         = '';
-        $boundary    = $this->getBoundary();
-        $paramCount  = count($this->_params);
-        $uploadCount = count($this->_uploads);
-        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
-            $oldLength = $length;
-            if ($this->_pos[0] < $paramCount) {
-                $param = sprintf($this->_headerParam, $boundary,
-                                 $this->_params[$this->_pos[0]][0]) .
-                         $this->_params[$this->_pos[0]][1] . "\r\n";
-                $ret    .= substr($param, $this->_pos[1], $length);
-                $length -= min(strlen($param) - $this->_pos[1], $length);
-
-            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
-                $pos    = $this->_pos[0] - $paramCount;
-                $header = sprintf($this->_headerUpload, $boundary,
-                                  $this->_uploads[$pos]['name'],
-                                  $this->_uploads[$pos]['filename'],
-                                  $this->_uploads[$pos]['type']);
-                if ($this->_pos[1] < strlen($header)) {
-                    $ret    .= substr($header, $this->_pos[1], $length);
-                    $length -= min(strlen($header) - $this->_pos[1], $length);
-                }
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
-                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
-                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);
-                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
-                }
-                if ($length > 0) {
-                    $start   = $this->_pos[1] + ($oldLength - $length) -
-                               strlen($header) - $this->_uploads[$pos]['size'];
-                    $ret    .= substr("\r\n", $start, $length);
-                    $length -= min(2 - $start, $length);
-                }
-
-            } else {
-                $closing  = '--' . $boundary . "--\r\n";
-                $ret     .= substr($closing, $this->_pos[1], $length);
-                $length  -= min(strlen($closing) - $this->_pos[1], $length);
-            }
-            if ($length > 0) {
-                $this->_pos     = array($this->_pos[0] + 1, 0);
-            } else {
-                $this->_pos[1] += $oldLength;
-            }
-        }
-        return $ret;
-    }
-
-   /**
-    * Sets the current position to the start of the body
-    *
-    * This allows reusing the same body in another request
-    */
-    public function rewind()
-    {
-        $this->_pos = array(0, 0);
-        foreach ($this->_uploads as $u) {
-            rewind($u['fp']);
-        }
-    }
-
-   /**
-    * Returns the body as string
-    *
-    * Note that it reads all file uploads into memory so it is a good idea not
-    * to use this method with large file uploads and rely on read() instead.
-    *
-    * @return   string
-    */
-    public function __toString()
-    {
-        $this->rewind();
-        return $this->read($this->getLength());
-    }
-
-
-   /**
-    * Helper function to change the (probably multidimensional) associative array
-    * into the simple one.
-    *
-    * @param    string  name for item
-    * @param    mixed   item's values
-    * @param    bool    whether to append [] to array variables' names
-    * @return   array   array with the following items: array('item name', 'item value');
-    */
-    private static function _flattenArray($name, $values, $useBrackets)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
-            }
-            return $ret;
-        }
-    }
-}
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Observer Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Observer/Log.php Deleted

@@ -1,215 +0,0 @@
-<?php
-/**
- * An observer useful for debugging / testing.
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   David Jean Louis <izi@php.net>
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  SVN: $Id: Log.php 308680 2011-02-25 17:40:17Z avb $
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * A debug observer useful for debugging / testing.
- *
- * This observer logs to a log target data corresponding to the various request
- * and response events, it logs by default to php://output but can be configured
- * to log to a file or via the PEAR Log package.
- *
- * A simple example:
- * <code>
- * require_once 'HTTP/Request2.php';
- * require_once 'HTTP/Request2/Observer/Log.php';
- *
- * $request  = new HTTP_Request2('http://www.example.com');
- * $observer = new HTTP_Request2_Observer_Log();
- * $request->attach($observer);
- * $request->send();
- * </code>
- *
- * A more complex example with PEAR Log:
- * <code>
- * require_once 'HTTP/Request2.php';
- * require_once 'HTTP/Request2/Observer/Log.php';
- * require_once 'Log.php';
- *
- * $request  = new HTTP_Request2('http://www.example.com');
- * // we want to log with PEAR log
- * $observer = new HTTP_Request2_Observer_Log(Log::factory('console'));
- *
- * // we only want to log received headers
- * $observer->events = array('receivedHeaders');
- *
- * $request->attach($observer);
- * $request->send();
- * </code>
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   David Jean Louis <izi@php.net>
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  Release: 2.0.0
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-class HTTP_Request2_Observer_Log implements SplObserver
-{
-    // properties {{{
-
-    /**
-     * The log target, it can be a a resource or a PEAR Log instance.
-     *
-     * @var resource|Log $target
-     */
-    protected $target = null;
-
-    /**
-     * The events to log.
-     *
-     * @var array $events
-     */
-    public $events = array(
-        'connect',
-        'sentHeaders',
-        'sentBody',
-        'receivedHeaders',
-        'receivedBody',
-        'disconnect',
-    );
-
-    // }}}
-    // __construct() {{{
-
-    /**
-     * Constructor.
-     *
-     * @param mixed $target Can be a file path (default: php://output), a resource,
-     *                      or an instance of the PEAR Log class.
-     * @param array $events Array of events to listen to (default: all events)
-     *
-     * @return void
-     */
-    public function __construct($target = 'php://output', array $events = array())
-    {
-        if (!empty($events)) {
-            $this->events = $events;
-        }
-        if (is_resource($target) || $target instanceof Log) {
-            $this->target = $target;
-        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
-            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
-        }
-    }
-
-    // }}}
-    // update() {{{
-
-    /**
-     * Called when the request notifies us of an event.
-     *
-     * @param HTTP_Request2 $subject The HTTP_Request2 instance
-     *
-     * @return void
-     */
-    public function update(SplSubject $subject)
-    {
-        $event = $subject->getLastEvent();
-        if (!in_array($event['name'], $this->events)) {
-            return;
-        }
-
-        switch ($event['name']) {
-        case 'connect':
-            $this->log('* Connected to ' . $event['data']);
-            break;
-        case 'sentHeaders':
-            $headers = explode("\r\n", $event['data']);
-            array_pop($headers);
-            foreach ($headers as $header) {
-                $this->log('> ' . $header);
-            }
-            break;
-        case 'sentBody':
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
-            break;
-        case 'receivedHeaders':
-            $this->log(sprintf('< HTTP/%s %s %s',
-                $event['data']->getVersion(),
-                $event['data']->getStatus(),
-                $event['data']->getReasonPhrase()));
-            $headers = $event['data']->getHeader();
-            foreach ($headers as $key => $val) {
-                $this->log('< ' . $key . ': ' . $val);
-            }
-            $this->log('< ');
-            break;
-        case 'receivedBody':
-            $this->log($event['data']->getBody());
-            break;
-        case 'disconnect':
-            $this->log('* Disconnected');
-            break;
-        }
-    }
-
-    // }}}
-    // log() {{{
-
-    /**
-     * Logs the given message to the configured target.
-     *
-     * @param string $message Message to display
-     *
-     * @return void
-     */
-    protected function log($message)
-    {
-        if ($this->target instanceof Log) {
-            $this->target->debug($message);
-        } elseif (is_resource($this->target)) {
-            fwrite($this->target, $message . "\r\n");
-        }
-    }
-
-    // }}}
-}
-
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/HTTP/Request2/Response.php Deleted

@@ -1,643 +0,0 @@
-<?php
-/**
- * Class representing a HTTP response
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008-2011, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Response.php 317591 2011-10-01 08:37:49Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * Class representing a HTTP response
- *
- * The class is designed to be used in "streaming" scenario, building the
- * response as it is being received:
- * <code>
- * $statusLine = read_status_line();
- * $response = new HTTP_Request2_Response($statusLine);
- * do {
- *     $headerLine = read_header_line();
- *     $response->parseHeaderLine($headerLine);
- * } while ($headerLine != '');
- *
- * while ($chunk = read_body()) {
- *     $response->appendBody($chunk);
- * }
- *
- * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());
- * </code>
- *
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 2.0.0
- * @link       http://tools.ietf.org/html/rfc2616#section-6
- */
-class HTTP_Request2_Response
-{
-   /**
-    * HTTP protocol version (e.g. 1.0, 1.1)
-    * @var  string
-    */
-    protected $version;
-
-   /**
-    * Status code
-    * @var  integer
-    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-    */
-    protected $code;
-
-   /**
-    * Reason phrase
-    * @var  string
-    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-    */
-    protected $reasonPhrase;
-
-   /**
-    * Effective URL (may be different from original request URL in case of redirects)
-    * @var  string
-    */
-    protected $effectiveUrl;
-
-   /**
-    * Associative array of response headers
-    * @var  array
-    */
-    protected $headers = array();
-
-   /**
-    * Cookies set in the response
-    * @var  array
-    */
-    protected $cookies = array();
-
-   /**
-    * Name of last header processed by parseHederLine()
-    *
-    * Used to handle the headers that span multiple lines
-    *
-    * @var  string
-    */
-    protected $lastHeader = null;
-
-   /**
-    * Response body
-    * @var  string
-    */
-    protected $body = '';
-
-   /**
-    * Whether the body is still encoded by Content-Encoding
-    *
-    * cURL provides the decoded body to the callback; if we are reading from
-    * socket the body is still gzipped / deflated
-    *
-    * @var  bool
-    */
-    protected $bodyEncoded;
-
-   /**
-    * Associative array of HTTP status code / reason phrase.
-    *
-    * @var  array
-    * @link http://tools.ietf.org/html/rfc2616#section-10
-    */
-    protected static $phrases = array(
-
-        // 1xx: Informational - Request received, continuing process
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-
-        // 2xx: Success - The action was successfully received, understood and
-        // accepted
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        // 3xx: Redirection - Further action must be taken in order to complete
-        // the request
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-
-        // 4xx: Client Error - The request contains bad syntax or cannot be
-        // fulfilled
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        // 5xx: Server Error - The server failed to fulfill an apparently
-        // valid request
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        509 => 'Bandwidth Limit Exceeded',
-
-    );
-
-   /**
-    * Returns the default reason phrase for the given code or all reason phrases
-    *
-    * @param  int $code         Response code
-    * @return string|array|null Default reason phrase for $code if $code is given
-    *                           (null if no phrase is available), array of all
-    *                           reason phrases if $code is null
-    * @link   http://pear.php.net/bugs/18716
-    */
-    public static function getDefaultReasonPhrase($code = null)
-    {
-        if (null === $code) {
-            return self::$phrases;
-        } else {
-            return isset(self::$phrases[$code]) ? self::$phrases[$code] : null;
-        }
-    }
-
-   /**
-    * Constructor, parses the response status line
-    *
-    * @param    string Response status line (e.g. "HTTP/1.1 200 OK")
-    * @param    bool   Whether body is still encoded by Content-Encoding
-    * @param    string Effective URL of the response
-    * @throws   HTTP_Request2_MessageException if status line is invalid according to spec
-    */
-    public function __construct($statusLine, $bodyEncoded = true, $effectiveUrl = null)
-    {
-        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
-            throw new HTTP_Request2_MessageException(
-                "Malformed response: {$statusLine}",
-                HTTP_Request2_Exception::MALFORMED_RESPONSE
-            );
-        }
-        $this->version      = $m[1];
-        $this->code         = intval($m[2]);
-        $this->reasonPhrase = !empty($m[3]) ? trim($m[3]) : self::getDefaultReasonPhrase($this->code);
-        $this->bodyEncoded  = (bool)$bodyEncoded;
-        $this->effectiveUrl = (string)$effectiveUrl;
-    }
-
-   /**
-    * Parses the line from HTTP response filling $headers array
-    *
-    * The method should be called after reading the line from socket or receiving
-    * it into cURL callback. Passing an empty string here indicates the end of
-    * response headers and triggers additional processing, so be sure to pass an
-    * empty string in the end.
-    *
-    * @param    string  Line from HTTP response
-    */
-    public function parseHeaderLine($headerLine)
-    {
-        $headerLine = trim($headerLine, "\r\n");
-
-        // empty string signals the end of headers, process the received ones
-        if ('' == $headerLine) {
-            if (!empty($this->headers['set-cookie'])) {
-                $cookies = is_array($this->headers['set-cookie'])?
-                           $this->headers['set-cookie']:
-                           array($this->headers['set-cookie']);
-                foreach ($cookies as $cookieString) {
-                    $this->parseCookie($cookieString);
-                }
-                unset($this->headers['set-cookie']);
-            }
-            foreach (array_keys($this->headers) as $k) {
-                if (is_array($this->headers[$k])) {
-                    $this->headers[$k] = implode(', ', $this->headers[$k]);
-                }
-            }
-
-        // string of the form header-name: header value
-        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
-            $name  = strtolower($m[1]);
-            $value = trim($m[2]);
-            if (empty($this->headers[$name])) {
-                $this->headers[$name] = $value;
-            } else {
-                if (!is_array($this->headers[$name])) {
-                    $this->headers[$name] = array($this->headers[$name]);
-                }
-                $this->headers[$name][] = $value;
-            }
-            $this->lastHeader = $name;
-
-        // continuation of a previous header
-        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
-            if (!is_array($this->headers[$this->lastHeader])) {
-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
-            } else {
-                $key = count($this->headers[$this->lastHeader]) - 1;
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
-            }
-        }
-    }
-
-   /**
-    * Parses a Set-Cookie header to fill $cookies array
-    *
-    * @param    string    value of Set-Cookie header
-    * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
-    */
-    protected function parseCookie($cookieString)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($cookieString, ';')) {
-            $pos = strpos($cookieString, '=');
-            $cookie['name']  = trim(substr($cookieString, 0, $pos));
-            $cookie['value'] = trim(substr($cookieString, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $cookieString);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->cookies[] = $cookie;
-    }
-
-   /**
-    * Appends a string to the response body
-    * @param    string
-    */
-    public function appendBody($bodyChunk)
-    {
-        $this->body .= $bodyChunk;
-    }
-
-   /**
-    * Returns the effective URL of the response
-    *
-    * This may be different from the request URL if redirects were followed.
-    *
-    * @return string
-    * @link   http://pear.php.net/bugs/bug.php?id=18412
-    */
-    public function getEffectiveUrl()
-    {
-        return $this->effectiveUrl;
-    }
-
-   /**
-    * Returns the status code
-    * @return   integer
-    */
-    public function getStatus()
-    {
-        return $this->code;
-    }
-
-   /**
-    * Returns the reason phrase
-    * @return   string
-    */
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-   /**
-    * Whether response is a redirect that can be automatically handled by HTTP_Request2
-    * @return   bool
-    */
-    public function isRedirect()
-    {
-        return in_array($this->code, array(300, 301, 302, 303, 307))
-               && isset($this->headers['location']);
-    }
-
-   /**
-    * Returns either the named header or all response headers
-    *
-    * @param    string          Name of header to return
-    * @return   string|array    Value of $headerName header (null if header is
-    *                           not present), array of all response headers if
-    *                           $headerName is null
-    */
-    public function getHeader($headerName = null)
-    {
-        if (null === $headerName) {
-            return $this->headers;
-        } else {
-            $headerName = strtolower($headerName);
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
-        }
-    }
-
-   /**
-    * Returns cookies set in response
-    *
-    * @return   array
-    */
-    public function getCookies()
-    {
-        return $this->cookies;
-    }
-
-   /**
-    * Returns the body of the response
-    *
-    * @return   string
-    * @throws   HTTP_Request2_Exception if body cannot be decoded
-    */
-    public function getBody()
-    {
-        if (0 == strlen($this->body) || !$this->bodyEncoded ||
-            !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
-        ) {
-            return $this->body;
-
-        } else {
-            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-                $oldEncoding = mb_internal_encoding();
-                mb_internal_encoding('iso-8859-1');
-            }
-
-            try {
-                switch (strtolower($this->getHeader('content-encoding'))) {
-                    case 'gzip':
-                        $decoded = self::decodeGzip($this->body);
-                        break;
-                    case 'deflate':
-                        $decoded = self::decodeDeflate($this->body);
-                }
-            } catch (Exception $e) {
-            }
-
-            if (!empty($oldEncoding)) {
-                mb_internal_encoding($oldEncoding);
-            }
-            if (!empty($e)) {
-                throw $e;
-            }
-            return $decoded;
-        }
-    }
-
-   /**
-    * Get the HTTP version of the response
-    *
-    * @return   string
-    */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-   /**
-    * Decodes the message-body encoded by gzip
-    *
-    * The real decoding work is done by gzinflate() built-in function, this
-    * method only parses the header and checks data for compliance with
-    * RFC 1952
-    *
-    * @param    string  gzip-encoded data
-    * @return   string  decoded data
-    * @throws   HTTP_Request2_LogicException
-    * @throws   HTTP_Request2_MessageException
-    * @link     http://tools.ietf.org/html/rfc1952
-    */
-    public static function decodeGzip($data)
-    {
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        if (!function_exists('gzinflate')) {
-            throw new HTTP_Request2_LogicException(
-                'Unable to decode body: gzip extension not available',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            throw new HTTP_Request2_MessageException(
-                'Error parsing gzip header: unknown compression method',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            throw new HTTP_Request2_MessageException(
-                'Error parsing gzip header: reserved bits are set',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 2) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_MessageException(
-                    'Error parsing gzip header: data too short',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                throw new HTTP_Request2_MessageException(
-                    'Header CRC check failed',
-                    HTTP_Request2_Exception::DECODE_ERROR
-                );
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
-        $unpacked = gzinflate(substr($data, $headerLength, -8));
-        if (false === $unpacked) {
-            throw new HTTP_Request2_MessageException(
-                'gzinflate() call failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        } elseif ($dataSize != strlen($unpacked)) {
-            throw new HTTP_Request2_MessageException(
-                'Data size check failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            throw new HTTP_Request2_Exception(
-                'Data CRC check failed',
-                HTTP_Request2_Exception::DECODE_ERROR
-            );
-        }
-        return $unpacked;
-    }
-
-   /**
-    * Decodes the message-body encoded by deflate
-    *
-    * @param    string  deflate-encoded data
-    * @return   string  decoded data
-    * @throws   HTTP_Request2_LogicException
-    */
-    public static function decodeDeflate($data)
-    {
-        if (!function_exists('gzuncompress')) {
-            throw new HTTP_Request2_LogicException(
-                'Unable to decode body: gzip extension not available',
-                HTTP_Request2_Exception::MISCONFIGURATION
-            );
-        }
-        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
-        // while many applications send raw deflate stream from RFC 1951.
-        // We should check for presence of zlib header and use gzuncompress() or
-        // gzinflate() as needed. See bug #15305
-        $header = unpack('n', substr($data, 0, 2));
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
-    }
-}
-?>
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Mail Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Mail/mime.php Deleted

@@ -1,1476 +0,0 @@
-<?php
-/**
- * The Mail_Mime class is used to create MIME E-mail messages
- *
- * The Mail_Mime class provides an OO interface to create MIME
- * enabled email messages. This way you can create emails that
- * contain plain-text bodies, HTML bodies, attachments, inline
- * images and specific headers.
- *
- * Compatible with PHP versions 4 and 5
- *
- * LICENSE: This LICENSE is in the BSD license style.
- * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
- * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the authors, nor the names of its contributors 
- *   may be used to endorse or promote products derived from this 
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Tomas V.V. Cox <cox@idecnet.com>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @author    Aleksander Machniak <alec@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- *
- *            This class is based on HTML Mime Mail class from
- *            Richard Heyes <richard@phpguru.org> which was based also
- *            in the mime_mail.class by Tobias Ratschiller <tobias@dnet.it>
- *            and Sascha Schumann <sascha@schumann.cx>
- */
-
-
-/**
- * require PEAR
- *
- * This package depends on PEAR to raise errors.
- */
-require_once 'PEAR.php';
-
-/**
- * require Mail_mimePart
- *
- * Mail_mimePart contains the code required to
- * create all the different parts a mail can
- * consist of.
- */
-require_once 'Mail/mimePart.php';
-
-
-/**
- * The Mail_Mime class provides an OO interface to create MIME
- * enabled email messages. This way you can create emails that
- * contain plain-text bodies, HTML bodies, attachments, inline
- * images and specific headers.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Tomas V.V. Cox <cox@idecnet.com>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   Release: 1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- */
-class Mail_mime
-{
-    /**
-     * Contains the plain text part of the email
-     *
-     * @var string
-     * @access private
-     */
-    var $_txtbody;
-
-    /**
-     * Contains the html part of the email
-     *
-     * @var string
-     * @access private
-     */
-    var $_htmlbody;
-
-    /**
-     * list of the attached images
-     *
-     * @var array
-     * @access private
-     */
-    var $_html_images = array();
-
-    /**
-     * list of the attachements
-     *
-     * @var array
-     * @access private
-     */
-    var $_parts = array();
-
-    /**
-     * Headers for the mail
-     *
-     * @var array
-     * @access private
-     */
-    var $_headers = array();
-
-    /**
-     * Build parameters
-     *
-     * @var array
-     * @access private
-     */
-    var $_build_params = array(
-        // What encoding to use for the headers
-        // Options: quoted-printable or base64
-        'head_encoding' => 'quoted-printable',
-        // What encoding to use for plain text
-        // Options: 7bit, 8bit, base64, or quoted-printable
-        'text_encoding' => 'quoted-printable',
-        // What encoding to use for html
-        // Options: 7bit, 8bit, base64, or quoted-printable
-        'html_encoding' => 'quoted-printable',
-        // The character set to use for html
-        'html_charset'  => 'ISO-8859-1',
-        // The character set to use for text
-        'text_charset'  => 'ISO-8859-1',
-        // The character set to use for headers
-        'head_charset'  => 'ISO-8859-1',
-        // End-of-line sequence
-        'eol'           => "\r\n",
-        // Delay attachment files IO until building the message
-        'delay_file_io' => false
-    );
-
-    /**
-     * Constructor function
-     *
-     * @param mixed $params Build parameters that change the way the email
-     *                      is built. Should be an associative array.
-     *                      See $_build_params.
-     *
-     * @return void
-     * @access public
-     */
-    function Mail_mime($params = array())
-    {
-        // Backward-compatible EOL setting
-        if (is_string($params)) {
-            $this->_build_params['eol'] = $params;
-        } else if (defined('MAIL_MIME_CRLF') && !isset($params['eol'])) {
-            $this->_build_params['eol'] = MAIL_MIME_CRLF;
-        }
-
-        // Update build parameters
-        if (!empty($params) && is_array($params)) {
-            while (list($key, $value) = each($params)) {
-                $this->_build_params[$key] = $value;
-            }
-        }
-    }
-
-    /**
-     * Set build parameter value
-     *
-     * @param string $name  Parameter name
-     * @param string $value Parameter value
-     *
-     * @return void
-     * @access public
-     * @since 1.6.0
-     */
-    function setParam($name, $value)
-    {
-        $this->_build_params[$name] = $value;
-    }
-
-    /**
-     * Get build parameter value
-     *
-     * @param string $name Parameter name
-     *
-     * @return mixed Parameter value
-     * @access public
-     * @since 1.6.0
-     */
-    function getParam($name)
-    {
-        return isset($this->_build_params[$name]) ? $this->_build_params[$name] : null;
-    }
-
-    /**
-     * Accessor function to set the body text. Body text is used if
-     * it's not an html mail being sent or else is used to fill the
-     * text/plain part that emails clients who don't support
-     * html should show.
-     *
-     * @param string $data   Either a string or
-     *                       the file name with the contents
-     * @param bool   $isfile If true the first param should be treated
-     *                       as a file name, else as a string (default)
-     * @param bool   $append If true the text or file is appended to
-     *                       the existing body, else the old body is
-     *                       overwritten
-     *
-     * @return mixed         True on success or PEAR_Error object
-     * @access public
-     */
-    function setTXTBody($data, $isfile = false, $append = false)
-    {
-        if (!$isfile) {
-            if (!$append) {
-                $this->_txtbody = $data;
-            } else {
-                $this->_txtbody .= $data;
-            }
-        } else {
-            $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
-                return $cont;
-            }
-            if (!$append) {
-                $this->_txtbody = $cont;
-            } else {
-                $this->_txtbody .= $cont;
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Get message text body
-     *
-     * @return string Text body
-     * @access public
-     * @since 1.6.0
-     */
-    function getTXTBody()
-    {
-        return $this->_txtbody;
-    }
-
-    /**
-     * Adds a html part to the mail.
-     *
-     * @param string $data   Either a string or the file name with the
-     *                       contents
-     * @param bool   $isfile A flag that determines whether $data is a
-     *                       filename, or a string(false, default)
-     *
-     * @return bool          True on success
-     * @access public
-     */
-    function setHTMLBody($data, $isfile = false)
-    {
-        if (!$isfile) {
-            $this->_htmlbody = $data;
-        } else {
-            $cont = $this->_file2str($data);
-            if (PEAR::isError($cont)) {
-                return $cont;
-            }
-            $this->_htmlbody = $cont;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get message HTML body
-     *
-     * @return string HTML body
-     * @access public
-     * @since 1.6.0
-     */
-    function getHTMLBody()
-    {
-        return $this->_htmlbody;
-    }
-
-    /**
-     * Adds an image to the list of embedded images.
-     *
-     * @param string $file       The image file name OR image data itself
-     * @param string $c_type     The content type
-     * @param string $name       The filename of the image.
-     *                           Only used if $file is the image data.
-     * @param bool   $isfile     Whether $file is a filename or not.
-     *                           Defaults to true
-     * @param string $content_id Desired Content-ID of MIME part
-     *                           Defaults to generated unique ID
-     *
-     * @return bool          True on success
-     * @access public
-     */
-    function addHTMLImage($file,
-        $c_type='application/octet-stream',
-        $name = '',
-        $isfile = true,
-        $content_id = null
-    ) {
-        $bodyfile = null;
-
-        if ($isfile) {
-            // Don't load file into memory
-            if ($this->_build_params['delay_file_io']) {
-                $filedata = null;
-                $bodyfile = $file;
-            } else {
-                if (PEAR::isError($filedata = $this->_file2str($file))) {
-                    return $filedata;
-                }
-            }
-            $filename = ($name ? $name : $file);
-        } else {
-            $filedata = $file;
-            $filename = $name;
-        }
-
-        if (!$content_id) {
-            $content_id = md5(uniqid(time()));
-        }
-
-        $this->_html_images[] = array(
-            'body'      => $filedata,
-            'body_file' => $bodyfile,
-            'name'      => $filename,
-            'c_type'    => $c_type,
-            'cid'       => $content_id
-        );
-
-        return true;
-    }
-
-    /**
-     * Adds a file to the list of attachments.
-     *
-     * @param string $file        The file name of the file to attach
-     *                            or the file contents itself
-     * @param string $c_type      The content type
-     * @param string $name        The filename of the attachment
-     *                            Only use if $file is the contents
-     * @param bool   $isfile      Whether $file is a filename or not. Defaults to true
-     * @param string $encoding    The type of encoding to use. Defaults to base64.
-     *                            Possible values: 7bit, 8bit, base64 or quoted-printable.
-     * @param string $disposition The content-disposition of this file
-     *                            Defaults to attachment.
-     *                            Possible values: attachment, inline.
-     * @param string $charset     The character set of attachment's content.
-     * @param string $language    The language of the attachment
-     * @param string $location    The RFC 2557.4 location of the attachment
-     * @param string $n_encoding  Encoding of the attachment's name in Content-Type
-     *                            By default filenames are encoded using RFC2231 method
-     *                            Here you can set RFC2047 encoding (quoted-printable
-     *                            or base64) instead
-     * @param string $f_encoding  Encoding of the attachment's filename
-     *                            in Content-Disposition header.
-     * @param string $description Content-Description header
-     * @param string $h_charset   The character set of the headers e.g. filename
-     *                            If not specified, $charset will be used
-     * @param array  $add_headers Additional part headers. Array keys can be in form
-     *                            of <header_name>:<parameter_name>
-     *
-     * @return mixed              True on success or PEAR_Error object
-     * @access public
-     */
-    function addAttachment($file,
-        $c_type      = 'application/octet-stream',
-        $name        = '',
-        $isfile      = true,
-        $encoding    = 'base64',
-        $disposition = 'attachment',
-        $charset     = '',
-        $language    = '',
-        $location    = '',
-        $n_encoding  = null,
-        $f_encoding  = null,
-        $description = '',
-        $h_charset   = null,
-        $add_headers = array()
-    ) {
-        $bodyfile = null;
-
-        if ($isfile) {
-            // Don't load file into memory
-            if ($this->_build_params['delay_file_io']) {
-                $filedata = null;
-                $bodyfile = $file;
-            } else {
-                if (PEAR::isError($filedata = $this->_file2str($file))) {
-                    return $filedata;
-                }
-            }
-            // Force the name the user supplied, otherwise use $file
-            $filename = ($name ? $name : $file);
-        } else {
-            $filedata = $file;
-            $filename = $name;
-        }
-
-        if (!strlen($filename)) {
-            $msg = "The supplied filename for the attachment can't be empty";
-            $err = PEAR::raiseError($msg);
-            return $err;
-        }
-        $filename = $this->_basename($filename);
-
-        $this->_parts[] = array(
-            'body'        => $filedata,
-            'body_file'   => $bodyfile,
-            'name'        => $filename,
-            'c_type'      => $c_type,
-            'charset'     => $charset,
-            'encoding'    => $encoding,
-            'language'    => $language,
-            'location'    => $location,
-            'disposition' => $disposition,
-            'description' => $description,
-            'add_headers' => $add_headers,
-            'name_encoding'     => $n_encoding,
-            'filename_encoding' => $f_encoding,
-            'headers_charset'   => $h_charset,
-        );
-
-        return true;
-    }
-
-    /**
-     * Get the contents of the given file name as string
-     *
-     * @param string $file_name Path of file to process
-     *
-     * @return string           Contents of $file_name
-     * @access private
-     */
-    function &_file2str($file_name)
-    {
-        // Check state of file and raise an error properly
-        if (!file_exists($file_name)) {
-            $err = PEAR::raiseError('File not found: ' . $file_name);
-            return $err;
-        }
-        if (!is_file($file_name)) {
-            $err = PEAR::raiseError('Not a regular file: ' . $file_name);
-            return $err;
-        }
-        if (!is_readable($file_name)) {
-            $err = PEAR::raiseError('File is not readable: ' . $file_name);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-        $cont = file_get_contents($file_name);
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        return $cont;
-    }
-
-    /**
-     * Adds a text subpart to the mimePart object and
-     * returns it during the build process.
-     *
-     * @param mixed  &$obj The object to add the part to, or
-     *                     null if a new object is to be created.
-     * @param string $text The text to add.
-     *
-     * @return object      The text mimePart object
-     * @access private
-     */
-    function &_addTextPart(&$obj, $text)
-    {
-        $params['content_type'] = 'text/plain';
-        $params['encoding']     = $this->_build_params['text_encoding'];
-        $params['charset']      = $this->_build_params['text_charset'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart($text, $params);
-            return $ret;
-        } else {
-            $ret = new Mail_mimePart($text, $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Adds a html subpart to the mimePart object and
-     * returns it during the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created.
-     *
-     * @return object     The html mimePart object
-     * @access private
-     */
-    function &_addHtmlPart(&$obj)
-    {
-        $params['content_type'] = 'text/html';
-        $params['encoding']     = $this->_build_params['html_encoding'];
-        $params['charset']      = $this->_build_params['html_charset'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            $ret = $obj->addSubpart($this->_htmlbody, $params);
-            return $ret;
-        } else {
-            $ret = new Mail_mimePart($this->_htmlbody, $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Creates a new mimePart object, using multipart/mixed as
-     * the initial content-type and returns it during the
-     * build process.
-     *
-     * @return object The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addMixedPart()
-    {
-        $params                 = array();
-        $params['content_type'] = 'multipart/mixed';
-        $params['eol']          = $this->_build_params['eol'];
-
-        // Create empty multipart/mixed Mail_mimePart object to return
-        $ret = new Mail_mimePart('', $params);
-        return $ret;
-    }
-
-    /**
-     * Adds a multipart/alternative part to a mimePart
-     * object (or creates one), and returns it during
-     * the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created.
-     *
-     * @return object     The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addAlternativePart(&$obj)
-    {
-        $params['content_type'] = 'multipart/alternative';
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            return $obj->addSubpart('', $params);
-        } else {
-            $ret = new Mail_mimePart('', $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Adds a multipart/related part to a mimePart
-     * object (or creates one), and returns it during
-     * the build process.
-     *
-     * @param mixed &$obj The object to add the part to, or
-     *                    null if a new object is to be created
-     *
-     * @return object     The multipart/mixed mimePart object
-     * @access private
-     */
-    function &_addRelatedPart(&$obj)
-    {
-        $params['content_type'] = 'multipart/related';
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (is_object($obj)) {
-            return $obj->addSubpart('', $params);
-        } else {
-            $ret = new Mail_mimePart('', $params);
-            return $ret;
-        }
-    }
-
-    /**
-     * Adds an html image subpart to a mimePart object
-     * and returns it during the build process.
-     *
-     * @param object &$obj  The mimePart to add the image to
-     * @param array  $value The image information
-     *
-     * @return object       The image mimePart object
-     * @access private
-     */
-    function &_addHtmlImagePart(&$obj, $value)
-    {
-        $params['content_type'] = $value['c_type'];
-        $params['encoding']     = 'base64';
-        $params['disposition']  = 'inline';
-        $params['filename']     = $value['name'];
-        $params['cid']          = $value['cid'];
-        $params['body_file']    = $value['body_file'];
-        $params['eol']          = $this->_build_params['eol'];
-
-        if (!empty($value['name_encoding'])) {
-            $params['name_encoding'] = $value['name_encoding'];
-        }
-        if (!empty($value['filename_encoding'])) {
-            $params['filename_encoding'] = $value['filename_encoding'];
-        }
-
-        $ret = $obj->addSubpart($value['body'], $params);
-        return $ret;
-    }
-
-    /**
-     * Adds an attachment subpart to a mimePart object
-     * and returns it during the build process.
-     *
-     * @param object &$obj  The mimePart to add the image to
-     * @param array  $value The attachment information
-     *
-     * @return object       The image mimePart object
-     * @access private
-     */
-    function &_addAttachmentPart(&$obj, $value)
-    {
-        $params['eol']          = $this->_build_params['eol'];
-        $params['filename']     = $value['name'];
-        $params['encoding']     = $value['encoding'];
-        $params['content_type'] = $value['c_type'];
-        $params['body_file']    = $value['body_file'];
-        $params['disposition']  = isset($value['disposition']) ? 
-                                  $value['disposition'] : 'attachment';
-
-        // content charset
-        if (!empty($value['charset'])) {
-            $params['charset'] = $value['charset'];
-        }
-        // headers charset (filename, description)
-        if (!empty($value['headers_charset'])) {
-            $params['headers_charset'] = $value['headers_charset'];
-        }
-        if (!empty($value['language'])) {
-            $params['language'] = $value['language'];
-        }
-        if (!empty($value['location'])) {
-            $params['location'] = $value['location'];
-        }
-        if (!empty($value['name_encoding'])) {
-            $params['name_encoding'] = $value['name_encoding'];
-        }
-        if (!empty($value['filename_encoding'])) {
-            $params['filename_encoding'] = $value['filename_encoding'];
-        }
-        if (!empty($value['description'])) {
-            $params['description'] = $value['description'];
-        }
-        if (is_array($value['add_headers'])) {
-            $params['headers'] = $value['add_headers'];
-        }
-
-        $ret = $obj->addSubpart($value['body'], $params);
-        return $ret;
-    }
-
-    /**
-     * Returns the complete e-mail, ready to send using an alternative
-     * mail delivery method. Note that only the mailpart that is made
-     * with Mail_Mime is created. This means that,
-     * YOU WILL HAVE NO TO: HEADERS UNLESS YOU SET IT YOURSELF 
-     * using the $headers parameter!
-     * 
-     * @param string $separation The separation between these two parts.
-     * @param array  $params     The Build parameters passed to the
-     *                           &get() function. See &get for more info.
-     * @param array  $headers    The extra headers that should be passed
-     *                           to the &headers() function.
-     *                           See that function for more info.
-     * @param bool   $overwrite  Overwrite the existing headers with new.
-     *
-     * @return mixed The complete e-mail or PEAR error object
-     * @access public
-     */
-    function getMessage($separation = null, $params = null, $headers = null,
-        $overwrite = false
-    ) {
-        if ($separation === null) {
-            $separation = $this->_build_params['eol'];
-        }
-
-        $body = $this->get($params);
-
-        if (PEAR::isError($body)) {
-            return $body;
-        }
-
-        $head = $this->txtHeaders($headers, $overwrite);
-        $mail = $head . $separation . $body;
-        return $mail;
-    }
-
-    /**
-     * Returns the complete e-mail body, ready to send using an alternative
-     * mail delivery method.
-     * 
-     * @param array $params The Build parameters passed to the
-     *                      &get() function. See &get for more info.
-     *
-     * @return mixed The e-mail body or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function getMessageBody($params = null)
-    {
-        return $this->get($params, null, true);
-    }
-
-    /**
-     * Writes (appends) the complete e-mail into file.
-     * 
-     * @param string $filename  Output file location
-     * @param array  $params    The Build parameters passed to the
-     *                          &get() function. See &get for more info.
-     * @param array  $headers   The extra headers that should be passed
-     *                          to the &headers() function.
-     *                          See that function for more info.
-     * @param bool   $overwrite Overwrite the existing headers with new.
-     *
-     * @return mixed True or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function saveMessage($filename, $params = null, $headers = null, $overwrite = false)
-    {
-        // Check state of file and raise an error properly
-        if (file_exists($filename) && !is_writable($filename)) {
-            $err = PEAR::raiseError('File is not writable: ' . $filename);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            $err = PEAR::raiseError('Unable to open file: ' . $filename);
-            return $err;
-        }
-
-        // Write message headers into file (skipping Content-* headers)
-        $head = $this->txtHeaders($headers, $overwrite, true);
-        if (fwrite($fh, $head) === false) {
-            $err = PEAR::raiseError('Error writing to file: ' . $filename);
-            return $err;
-        }
-
-        fclose($fh);
-
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        // Write the rest of the message into file
-        $res = $this->get($params, $filename);
-
-        return $res ? $res : true;
-    }
-
-    /**
-     * Writes (appends) the complete e-mail body into file.
-     * 
-     * @param string $filename Output file location
-     * @param array  $params   The Build parameters passed to the
-     *                         &get() function. See &get for more info.
-     *
-     * @return mixed True or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function saveMessageBody($filename, $params = null)
-    {
-        // Check state of file and raise an error properly
-        if (file_exists($filename) && !is_writable($filename)) {
-            $err = PEAR::raiseError('File is not writable: ' . $filename);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime and read file contents
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            $err = PEAR::raiseError('Unable to open file: ' . $filename);
-            return $err;
-        }
-
-        // Write the rest of the message into file
-        $res = $this->get($params, $filename, true);
-
-        return $res ? $res : true;
-    }
-
-    /**
-     * Builds the multipart message from the list ($this->_parts) and
-     * returns the mime content.
-     *
-     * @param array    $params    Build parameters that change the way the email
-     *                            is built. Should be associative. See $_build_params.
-     * @param resource $filename  Output file where to save the message instead of
-     *                            returning it
-     * @param boolean  $skip_head True if you want to return/save only the message
-     *                            without headers
-     *
-     * @return mixed The MIME message content string, null or PEAR error object
-     * @access public
-     */
-    function &get($params = null, $filename = null, $skip_head = false)
-    {
-        if (isset($params)) {
-            while (list($key, $value) = each($params)) {
-                $this->_build_params[$key] = $value;
-            }
-        }
-
-        if (isset($this->_headers['From'])) {
-            // Bug #11381: Illegal characters in domain ID
-            if (preg_match('#(@[0-9a-zA-Z\-\.]+)#', $this->_headers['From'], $matches)) {
-                $domainID = $matches[1];
-            } else {
-                $domainID = '@localhost';
-            }
-            foreach ($this->_html_images as $i => $img) {
-                $cid = $this->_html_images[$i]['cid']; 
-                if (!preg_match('#'.preg_quote($domainID).'$#', $cid)) {
-                    $this->_html_images[$i]['cid'] = $cid . $domainID;
-                }
-            }
-        }
-
-        if (count($this->_html_images) && isset($this->_htmlbody)) {
-            foreach ($this->_html_images as $key => $value) {
-                $regex   = array();
-                $regex[] = '#(\s)((?i)src|background|href(?-i))\s*=\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\3#';
-                $regex[] = '#(?i)url(?-i)$\s*(["\']?)' .
-                            preg_quote($value['name'], '#') . '\1\s*$#';
-
-                $rep   = array();
-                $rep[] = '\1\2=\3cid:' . $value['cid'] .'\3';
-                $rep[] = 'url(\1cid:' . $value['cid'] . '\1)';
-
-                $this->_htmlbody = preg_replace($regex, $rep, $this->_htmlbody);
-                $this->_html_images[$key]['name']
-                    = $this->_basename($this->_html_images[$key]['name']);
-            }
-        }
-
-        $this->_checkParams();
-
-        $null        = null;
-        $attachments = count($this->_parts)                 ? true : false;
-        $html_images = count($this->_html_images)           ? true : false;
-        $html        = strlen($this->_htmlbody)             ? true : false;
-        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
-
-        switch (true) {
-        case $text && !$attachments:
-            $message =& $this->_addTextPart($null, $this->_txtbody);
-            break;
-
-        case !$text && !$html && $attachments:
-            $message =& $this->_addMixedPart();
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $text && $attachments:
-            $message =& $this->_addMixedPart();
-            $this->_addTextPart($message, $this->_txtbody);
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $html && !$attachments && !$html_images:
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
-                $this->_addTextPart($message, $this->_txtbody);
-                $this->_addHtmlPart($message);
-            } else {
-                $message =& $this->_addHtmlPart($null);
-            }
-            break;
-
-        case $html && !$attachments && $html_images:
-            // * Content-Type: multipart/alternative;
-            //    * text
-            //    * Content-Type: multipart/related;
-            //       * html
-            //       * image...
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
-                $this->_addTextPart($message, $this->_txtbody);
-
-                $ht =& $this->_addRelatedPart($message);
-                $this->_addHtmlPart($ht);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
-                }
-            } else {
-                // * Content-Type: multipart/related;
-                //    * html
-                //    * image...
-                $message =& $this->_addRelatedPart($null);
-                $this->_addHtmlPart($message);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($message, $this->_html_images[$i]);
-                }
-            }
-            /*
-            // #13444, #9725: the code below was a non-RFC compliant hack
-            // * Content-Type: multipart/related;
-            //    * Content-Type: multipart/alternative;
-            //        * text
-            //        * html
-            //    * image...
-            $message =& $this->_addRelatedPart($null);
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $this->_addHtmlPart($alt);
-            } else {
-                $this->_addHtmlPart($message);
-            }
-            for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($message, $this->_html_images[$i]);
-            }
-            */
-            break;
-
-        case $html && $attachments && !$html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $this->_addHtmlPart($alt);
-            } else {
-                $this->_addHtmlPart($message);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $html && $attachments && $html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $rel =& $this->_addRelatedPart($alt);
-            } else {
-                $rel =& $this->_addRelatedPart($message);
-            }
-            $this->_addHtmlPart($rel);
-            for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        }
-
-        if (!isset($message)) {
-            $ret = null;
-            return $ret;
-        }
-
-        // Use saved boundary
-        if (!empty($this->_build_params['boundary'])) {
-            $boundary = $this->_build_params['boundary'];
-        } else {
-            $boundary = null;
-        }
-
-        // Write output to file
-        if ($filename) {
-            // Append mimePart message headers and body into file
-            $headers = $message->encodeToFile($filename, $boundary, $skip_head);
-            if (PEAR::isError($headers)) {
-                return $headers;
-            }
-            $this->_headers = array_merge($this->_headers, $headers);
-            $ret = null;
-            return $ret;
-        } else {
-            $output = $message->encode($boundary, $skip_head);
-            if (PEAR::isError($output)) {
-                return $output;
-            }
-            $this->_headers = array_merge($this->_headers, $output['headers']);
-            $body = $output['body'];
-            return $body;
-        }
-    }
-
-    /**
-     * Returns an array with the headers needed to prepend to the email
-     * (MIME-Version and Content-Type). Format of argument is:
-     * $array['header-name'] = 'header-value';
-     *
-     * @param array $xtra_headers Assoc array with any extra headers (optional)
-     *                            (Don't set Content-Type for multipart messages here!)
-     * @param bool  $overwrite    Overwrite already existing headers.
-     * @param bool  $skip_content Don't return content headers: Content-Type,
-     *                            Content-Disposition and Content-Transfer-Encoding
-     * 
-     * @return array              Assoc array with the mime headers
-     * @access public
-     */
-    function &headers($xtra_headers = null, $overwrite = false, $skip_content = false)
-    {
-        // Add mime version header
-        $headers['MIME-Version'] = '1.0';
-
-        // Content-Type and Content-Transfer-Encoding headers should already
-        // be present if get() was called, but we'll re-set them to make sure
-        // we got them when called before get() or something in the message
-        // has been changed after get() [#14780]
-        if (!$skip_content) {
-            $headers += $this->_contentHeaders();
-        }
-
-        if (!empty($xtra_headers)) {
-            $headers = array_merge($headers, $xtra_headers);
-        }
-
-        if ($overwrite) {
-            $this->_headers = array_merge($this->_headers, $headers);
-        } else {
-            $this->_headers = array_merge($headers, $this->_headers);
-        }
-
-        $headers = $this->_headers;
-
-        if ($skip_content) {
-            unset($headers['Content-Type']);
-            unset($headers['Content-Transfer-Encoding']);
-            unset($headers['Content-Disposition']);
-        } else if (!empty($this->_build_params['ctype'])) {
-            $headers['Content-Type'] = $this->_build_params['ctype'];
-        }
-
-        $encodedHeaders = $this->_encodeHeaders($headers);
-        return $encodedHeaders;
-    }
-
-    /**
-     * Get the text version of the headers
-     * (useful if you want to use the PHP mail() function)
-     *
-     * @param array $xtra_headers Assoc array with any extra headers (optional)
-     *                            (Don't set Content-Type for multipart messages here!)
-     * @param bool  $overwrite    Overwrite the existing headers with new.
-     * @param bool  $skip_content Don't return content headers: Content-Type,
-     *                            Content-Disposition and Content-Transfer-Encoding
-     *
-     * @return string             Plain text headers
-     * @access public
-     */
-    function txtHeaders($xtra_headers = null, $overwrite = false, $skip_content = false)
-    {
-        $headers = $this->headers($xtra_headers, $overwrite, $skip_content);
-
-        // Place Received: headers at the beginning of the message
-        // Spam detectors often flag messages with it after the Subject: as spam
-        if (isset($headers['Received'])) {
-            $received = $headers['Received'];
-            unset($headers['Received']);
-            $headers = array('Received' => $received) + $headers;
-        }
-
-        $ret = '';
-        $eol = $this->_build_params['eol'];
-
-        foreach ($headers as $key => $val) {
-            if (is_array($val)) {
-                foreach ($val as $value) {
-                    $ret .= "$key: $value" . $eol;
-                }
-            } else {
-                $ret .= "$key: $val" . $eol;
-            }
-        }
-
-        return $ret;
-    }
-
-    /**
-     * Sets message Content-Type header.
-     * Use it to build messages with various content-types e.g. miltipart/raport
-     * not supported by _contentHeaders() function.
-     *
-     * @param string $type   Type name
-     * @param array  $params Hash array of header parameters
-     *
-     * @return void
-     * @access public
-     * @since 1.7.0
-     */
-    function setContentType($type, $params = array())
-    {
-        $header = $type;
-
-        $eol = !empty($this->_build_params['eol'])
-            ? $this->_build_params['eol'] : "\r\n";
-
-        // add parameters
-        $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
-            . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
-        if (is_array($params)) {
-            foreach ($params as $name => $value) {
-                if ($name == 'boundary') {
-                    $this->_build_params['boundary'] = $value;
-                }
-                if (!preg_match($token_regexp, $value)) {
-                    $header .= ";$eol $name=$value";
-                } else {
-                    $value = addcslashes($value, '\\"');
-                    $header .= ";$eol $name=\"$value\"";
-                }
-            }
-        }
-
-        // add required boundary parameter if not defined
-        if (preg_match('/^multipart\//i', $type)) {
-            if (empty($this->_build_params['boundary'])) {
-                $this->_build_params['boundary'] = '=_' . md5(rand() . microtime());
-            }
-
-            $header .= ";$eol boundary=\"".$this->_build_params['boundary']."\"";
-        }
-
-        $this->_build_params['ctype'] = $header;
-    }
-
-    /**
-     * Sets the Subject header
-     *
-     * @param string $subject String to set the subject to.
-     *
-     * @return void
-     * @access public
-     */
-    function setSubject($subject)
-    {
-        $this->_headers['Subject'] = $subject;
-    }
-
-    /**
-     * Set an email to the From (the sender) header
-     *
-     * @param string $email The email address to use
-     *
-     * @return void
-     * @access public
-     */
-    function setFrom($email)
-    {
-        $this->_headers['From'] = $email;
-    }
-
-    /**
-     * Add an email to the To header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addTo($email)
-    {
-        if (isset($this->_headers['To'])) {
-            $this->_headers['To'] .= ", $email";
-        } else {
-            $this->_headers['To'] = $email;
-        }
-    }
-
-    /**
-     * Add an email to the Cc (carbon copy) header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addCc($email)
-    {
-        if (isset($this->_headers['Cc'])) {
-            $this->_headers['Cc'] .= ", $email";
-        } else {
-            $this->_headers['Cc'] = $email;
-        }
-    }
-
-    /**
-     * Add an email to the Bcc (blank carbon copy) header
-     * (multiple calls to this method are allowed)
-     *
-     * @param string $email The email direction to add
-     *
-     * @return void
-     * @access public
-     */
-    function addBcc($email)
-    {
-        if (isset($this->_headers['Bcc'])) {
-            $this->_headers['Bcc'] .= ", $email";
-        } else {
-            $this->_headers['Bcc'] = $email;
-        }
-    }
-
-    /**
-     * Since the PHP send function requires you to specify
-     * recipients (To: header) separately from the other
-     * headers, the To: header is not properly encoded.
-     * To fix this, you can use this public method to 
-     * encode your recipients before sending to the send
-     * function
-     *
-     * @param string $recipients A comma-delimited list of recipients
-     *
-     * @return string            Encoded data
-     * @access public
-     */
-    function encodeRecipients($recipients)
-    {
-        $input = array("To" => $recipients);
-        $retval = $this->_encodeHeaders($input);
-        return $retval["To"] ;
-    }
-
-    /**
-     * Encodes headers as per RFC2047
-     *
-     * @param array $input  The header data to encode
-     * @param array $params Extra build parameters
-     *
-     * @return array        Encoded data
-     * @access private
-     */
-    function _encodeHeaders($input, $params = array())
-    {
-        $build_params = $this->_build_params;
-        while (list($key, $value) = each($params)) {
-            $build_params[$key] = $value;
-        }
-
-        foreach ($input as $hdr_name => $hdr_value) {
-            if (is_array($hdr_value)) {
-                foreach ($hdr_value as $idx => $value) {
-                    $input[$hdr_name][$idx] = $this->encodeHeader(
-                        $hdr_name, $value,
-                        $build_params['head_charset'], $build_params['head_encoding']
-                    );
-                }
-            } else {
-                $input[$hdr_name] = $this->encodeHeader(
-                    $hdr_name, $hdr_value,
-                    $build_params['head_charset'], $build_params['head_encoding']
-                );
-            }
-        }
-
-        return $input;
-    }
-
-    /**
-     * Encodes a header as per RFC2047
-     *
-     * @param string $name     The header name
-     * @param string $value    The header data to encode
-     * @param string $charset  Character set name
-     * @param string $encoding Encoding name (base64 or quoted-printable)
-     *
-     * @return string          Encoded header data (without a name)
-     * @access public
-     * @since 1.5.3
-     */
-    function encodeHeader($name, $value, $charset, $encoding)
-    {
-        $mime_part = new Mail_mimePart;
-        return $mime_part->encodeHeader(
-            $name, $value, $charset, $encoding, $this->_build_params['eol']
-        );
-    }
-
-    /**
-     * Get file's basename (locale independent) 
-     *
-     * @param string $filename Filename
-     *
-     * @return string          Basename
-     * @access private
-     */
-    function _basename($filename)
-    {
-        // basename() is not unicode safe and locale dependent
-        if (stristr(PHP_OS, 'win') || stristr(PHP_OS, 'netware')) {
-            return preg_replace('/^.*[\\\\\\/]/', '', $filename);
-        } else {
-            return preg_replace('/^.*[\/]/', '', $filename);
-        }
-    }
-
-    /**
-     * Get Content-Type and Content-Transfer-Encoding headers of the message
-     *
-     * @return array Headers array
-     * @access private
-     */
-    function _contentHeaders()
-    {
-        $attachments = count($this->_parts)                 ? true : false;
-        $html_images = count($this->_html_images)           ? true : false;
-        $html        = strlen($this->_htmlbody)             ? true : false;
-        $text        = (!$html && strlen($this->_txtbody))  ? true : false;
-        $headers     = array();
-
-        // See get()
-        switch (true) {
-        case $text && !$attachments:
-            $headers['Content-Type'] = 'text/plain';
-            break;
-
-        case !$text && !$html && $attachments:
-        case $text && $attachments:
-        case $html && $attachments && !$html_images:
-        case $html && $attachments && $html_images:
-            $headers['Content-Type'] = 'multipart/mixed';
-            break;
-
-        case $html && !$attachments && !$html_images && isset($this->_txtbody):
-        case $html && !$attachments && $html_images && isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/alternative';
-            break;
-
-        case $html && !$attachments && !$html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'text/html';
-            break;
-
-        case $html && !$attachments && $html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/related';
-            break;
-
-        default:
-            return $headers;
-        }
-
-        $this->_checkParams();
-
-        $eol = !empty($this->_build_params['eol'])
-            ? $this->_build_params['eol'] : "\r\n";
-
-        if ($headers['Content-Type'] == 'text/plain') {
-            // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['text_charset'];
-            // place charset parameter in the same line, if possible
-            // 26 = strlen("Content-Type: text/plain; ")
-            $headers['Content-Type']
-                .= (strlen($charset) + 26 <= 76) ? "; $charset" : ";$eol $charset";
-            $headers['Content-Transfer-Encoding']
-                = $this->_build_params['text_encoding'];
-        } else if ($headers['Content-Type'] == 'text/html') {
-            // single-part message: add charset and encoding
-            $charset = 'charset=' . $this->_build_params['html_charset'];
-            // place charset parameter in the same line, if possible
-            $headers['Content-Type']
-                .= (strlen($charset) + 25 <= 76) ? "; $charset" : ";$eol $charset";
-            $headers['Content-Transfer-Encoding']
-                = $this->_build_params['html_encoding'];
-        } else {
-            // multipart message: and boundary
-            if (!empty($this->_build_params['boundary'])) {
-                $boundary = $this->_build_params['boundary'];
-            } else if (!empty($this->_headers['Content-Type'])
-                && preg_match('/boundary="([^"]+)"/', $this->_headers['Content-Type'], $m)
-            ) {
-                $boundary = $m[1];
-            } else {
-                $boundary = '=_' . md5(rand() . microtime());
-            }
-
-            $this->_build_params['boundary'] = $boundary;
-            $headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-        }
-
-        return $headers;
-    }
-
-    /**
-     * Validate and set build parameters
-     *
-     * @return void
-     * @access private
-     */
-    function _checkParams()
-    {
-        $encodings = array('7bit', '8bit', 'base64', 'quoted-printable');
-
-        $this->_build_params['text_encoding']
-            = strtolower($this->_build_params['text_encoding']);
-        $this->_build_params['html_encoding']
-            = strtolower($this->_build_params['html_encoding']);
-
-        if (!in_array($this->_build_params['text_encoding'], $encodings)) {
-            $this->_build_params['text_encoding'] = '7bit';
-        }
-        if (!in_array($this->_build_params['html_encoding'], $encodings)) {
-            $this->_build_params['html_encoding'] = '7bit';
-        }
-
-        // text body
-        if ($this->_build_params['text_encoding'] == '7bit'
-            && !preg_match('/ascii/i', $this->_build_params['text_charset'])
-            && preg_match('/[^\x00-\x7F]/', $this->_txtbody)
-        ) {
-            $this->_build_params['text_encoding'] = 'quoted-printable';
-        }
-        // html body
-        if ($this->_build_params['html_encoding'] == '7bit'
-            && !preg_match('/ascii/i', $this->_build_params['html_charset'])
-            && preg_match('/[^\x00-\x7F]/', $this->_htmlbody)
-        ) {
-            $this->_build_params['html_encoding'] = 'quoted-printable';
-        }
-    }
-
-} // End of class

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Mail/mimeDecode.php Deleted

@@ -1,1003 +0,0 @@
-<?php
-/**
- * The Mail_mimeDecode class is used to decode mail/mime messages
- *
- * This class will parse a raw mime email and return
- * the structure. Returned structure is similar to
- * that returned by imap_fetchstructure().
- *
- *  +----------------------------- IMPORTANT ------------------------------+
- *  | Usage of this class compared to native php extensions such as        |
- *  | mailparse or imap, is slow and may be feature deficient. If available|
- *  | you are STRONGLY recommended to use the php extensions.              |
- *  +----------------------------------------------------------------------+
- *
- * Compatible with PHP versions 4 and 5
- *
- * LICENSE: This LICENSE is in the BSD license style.
- * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
- * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the authors, nor the names of its contributors 
- *   may be used to endorse or promote products derived from this 
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   Mail
- * @package    Mail_Mime
- * @author     Richard Heyes  <richard@phpguru.org>
- * @author     George Schlossnagle <george@omniti.com>
- * @author     Cipriano Groenendal <cipri@php.net>
- * @author     Sean Coates <sean@php.net>
- * @copyright  2003-2006 PEAR <pear-group@php.net>
- * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/Mail_mime
- */
-
-
-/**
- * require PEAR
- *
- * This package depends on PEAR to raise errors.
- */
-require_once 'PEAR.php';
-
-
-/**
- * The Mail_mimeDecode class is used to decode mail/mime messages
- *
- * This class will parse a raw mime email and return the structure.
- * Returned structure is similar to that returned by imap_fetchstructure().
- *
- *  +----------------------------- IMPORTANT ------------------------------+
- *  | Usage of this class compared to native php extensions such as        |
- *  | mailparse or imap, is slow and may be feature deficient. If available|
- *  | you are STRONGLY recommended to use the php extensions.              |
- *  +----------------------------------------------------------------------+
- *
- * @category   Mail
- * @package    Mail_Mime
- * @author     Richard Heyes  <richard@phpguru.org>
- * @author     George Schlossnagle <george@omniti.com>
- * @author     Cipriano Groenendal <cipri@php.net>
- * @author     Sean Coates <sean@php.net>
- * @copyright  2003-2006 PEAR <pear-group@php.net>
- * @license    http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version    Release: @package_version@
- * @link       http://pear.php.net/package/Mail_mime
- */
-class Mail_mimeDecode extends PEAR
-{
-    /**
-     * The raw email to decode
-     *
-     * @var    string
-     * @access private
-     */
-    var $_input;
-
-    /**
-     * The header part of the input
-     *
-     * @var    string
-     * @access private
-     */
-    var $_header;
-
-    /**
-     * The body part of the input
-     *
-     * @var    string
-     * @access private
-     */
-    var $_body;
-
-    /**
-     * If an error occurs, this is used to store the message
-     *
-     * @var    string
-     * @access private
-     */
-    var $_error;
-
-    /**
-     * Flag to determine whether to include bodies in the
-     * returned object.
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_include_bodies;
-
-    /**
-     * Flag to determine whether to decode bodies
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_decode_bodies;
-
-    /**
-     * Flag to determine whether to decode headers
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_decode_headers;
-
-    /**
-     * Flag to determine whether to include attached messages
-     * as body in the returned object. Depends on $_include_bodies
-     *
-     * @var    boolean
-     * @access private
-     */
-    var $_rfc822_bodies;
-
-    /**
-     * Constructor.
-     *
-     * Sets up the object, initialise the variables, and splits and
-     * stores the header and body of the input.
-     *
-     * @param string The input to decode
-     * @access public
-     */
-    function Mail_mimeDecode($input)
-    {
-        list($header, $body)   = $this->_splitBodyHeader($input);
-
-        $this->_input          = $input;
-        $this->_header         = $header;
-        $this->_body           = $body;
-        $this->_decode_bodies  = false;
-        $this->_include_bodies = true;
-        $this->_rfc822_bodies  = false;
-    }
-
-    /**
-     * Begins the decoding process. If called statically
-     * it will create an object and call the decode() method
-     * of it.
-     *
-     * @param array An array of various parameters that determine
-     *              various things:
-     *              include_bodies - Whether to include the body in the returned
-     *                               object.
-     *              decode_bodies  - Whether to decode the bodies
-     *                               of the parts. (Transfer encoding)
-     *              decode_headers - Whether to decode headers
-     *              input          - If called statically, this will be treated
-     *                               as the input
-     * @return object Decoded results
-     * @access public
-     */
-    function decode($params = null)
-    {
-        // determine if this method has been called statically
-        $isStatic = empty($this) || !is_a($this, __CLASS__);
-
-        // Have we been called statically?
-	// If so, create an object and pass details to that.
-        if ($isStatic AND isset($params['input'])) {
-
-            $obj = new Mail_mimeDecode($params['input']);
-            $structure = $obj->decode($params);
-
-        // Called statically but no input
-        } elseif ($isStatic) {
-            return PEAR::raiseError('Called statically and no input given');
-
-        // Called via an object
-        } else {
-            $this->_include_bodies = isset($params['include_bodies']) ?
-	                             $params['include_bodies'] : false;
-            $this->_decode_bodies  = isset($params['decode_bodies']) ?
-	                             $params['decode_bodies']  : false;
-            $this->_decode_headers = isset($params['decode_headers']) ?
-	                             $params['decode_headers'] : false;
-            $this->_rfc822_bodies  = isset($params['rfc_822bodies']) ?
-	                             $params['rfc_822bodies']  : false;
-
-            $structure = $this->_decode($this->_header, $this->_body);
-            if ($structure === false) {
-                $structure = $this->raiseError($this->_error);
-            }
-        }
-
-        return $structure;
-    }
-
-    /**
-     * Performs the decoding. Decodes the body string passed to it
-     * If it finds certain content-types it will call itself in a
-     * recursive fashion
-     *
-     * @param string Header section
-     * @param string Body section
-     * @return object Results of decoding process
-     * @access private
-     */
-    function _decode($headers, $body, $default_ctype = 'text/plain')
-    {
-        $return = new stdClass;
-        $return->headers = array();
-        $headers = $this->_parseHeaders($headers);
-
-        foreach ($headers as $value) {
-            $value['value'] = $this->_decode_headers ? $this->_decodeHeader($value['value']) : $value['value'];
-            if (isset($return->headers[strtolower($value['name'])]) AND !is_array($return->headers[strtolower($value['name'])])) {
-                $return->headers[strtolower($value['name'])]   = array($return->headers[strtolower($value['name'])]);
-                $return->headers[strtolower($value['name'])][] = $value['value'];
-
-            } elseif (isset($return->headers[strtolower($value['name'])])) {
-                $return->headers[strtolower($value['name'])][] = $value['value'];
-
-            } else {
-                $return->headers[strtolower($value['name'])] = $value['value'];
-            }
-        }
-
-
-        foreach ($headers as $key => $value) {
-            $headers[$key]['name'] = strtolower($headers[$key]['name']);
-            switch ($headers[$key]['name']) {
-
-                case 'content-type':
-                    $content_type = $this->_parseHeaderValue($headers[$key]['value']);
-
-                    if (preg_match('/([0-9a-z+.-]+)\/([0-9a-z+.-]+)/i', $content_type['value'], $regs)) {
-                        $return->ctype_primary   = $regs[1];
-                        $return->ctype_secondary = $regs[2];
-                    }
-
-                    if (isset($content_type['other'])) {
-                        foreach($content_type['other'] as $p_name => $p_value) {
-                            $return->ctype_parameters[$p_name] = $p_value;
-                        }
-                    }
-                    break;
-
-                case 'content-disposition':
-                    $content_disposition = $this->_parseHeaderValue($headers[$key]['value']);
-                    $return->disposition   = $content_disposition['value'];
-                    if (isset($content_disposition['other'])) {
-                        foreach($content_disposition['other'] as $p_name => $p_value) {
-                            $return->d_parameters[$p_name] = $p_value;
-                        }
-                    }
-                    break;
-
-                case 'content-transfer-encoding':
-                    $content_transfer_encoding = $this->_parseHeaderValue($headers[$key]['value']);
-                    break;
-            }
-        }
-
-        if (isset($content_type)) {
-            switch (strtolower($content_type['value'])) {
-                case 'text/plain':
-                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
-                    break;
-
-                case 'text/html':
-                    $encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body) : null;
-                    break;
-
-                case 'multipart/parallel':
-                case 'multipart/appledouble': // Appledouble mail
-                case 'multipart/report': // RFC1892
-                case 'multipart/signed': // PGP
-                case 'multipart/digest':
-                case 'multipart/alternative':
-                case 'multipart/related':
-                case 'multipart/mixed':
-                case 'application/vnd.wap.multipart.related':
-                    if(!isset($content_type['other']['boundary'])){
-                        $this->_error = 'No boundary found for ' . $content_type['value'] . ' part';
-                        return false;
-                    }
-
-                    $default_ctype = (strtolower($content_type['value']) === 'multipart/digest') ? 'message/rfc822' : 'text/plain';
-
-                    $parts = $this->_boundarySplit($body, $content_type['other']['boundary']);
-                    for ($i = 0; $i < count($parts); $i++) {
-                        list($part_header, $part_body) = $this->_splitBodyHeader($parts[$i]);
-                        $part = $this->_decode($part_header, $part_body, $default_ctype);
-                        if($part === false)
-                            $part = $this->raiseError($this->_error);
-                        $return->parts[] = $part;
-                    }
-                    break;
-
-                case 'message/rfc822':
-					if ($this->_rfc822_bodies) {
-						$encoding = isset($content_transfer_encoding) ? $content_transfer_encoding['value'] : '7bit';
-						$return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $encoding) : $body);
-					}
-                    $obj = new Mail_mimeDecode($body);
-                    $return->parts[] = $obj->decode(array('include_bodies' => $this->_include_bodies,
-					                                      'decode_bodies'  => $this->_decode_bodies,
-														  'decode_headers' => $this->_decode_headers));
-                    unset($obj);
-                    break;
-
-                default:
-                    if(!isset($content_transfer_encoding['value']))
-                        $content_transfer_encoding['value'] = '7bit';
-                    $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body, $content_transfer_encoding['value']) : $body) : null;
-                    break;
-            }
-
-        } else {
-            $ctype = explode('/', $default_ctype);
-            $return->ctype_primary   = $ctype[0];
-            $return->ctype_secondary = $ctype[1];
-            $this->_include_bodies ? $return->body = ($this->_decode_bodies ? $this->_decodeBody($body) : $body) : null;
-        }
-
-        return $return;
-    }
-
-    /**
-     * Given the output of the above function, this will return an
-     * array of references to the parts, indexed by mime number.
-     *
-     * @param  object $structure   The structure to go through
-     * @param  string $mime_number Internal use only.
-     * @return array               Mime numbers
-     */
-    function &getMimeNumbers(&$structure, $no_refs = false, $mime_number = '', $prepend = '')
-    {
-        $return = array();
-        if (!empty($structure->parts)) {
-            if ($mime_number != '') {
-                $structure->mime_id = $prepend . $mime_number;
-                $return[$prepend . $mime_number] = &$structure;
-            }
-            for ($i = 0; $i < count($structure->parts); $i++) {
-
-            
-                if (!empty($structure->headers['content-type']) AND substr(strtolower($structure->headers['content-type']), 0, 8) == 'message/') {
-                    $prepend      = $prepend . $mime_number . '.';
-                    $_mime_number = '';
-                } else {
-                    $_mime_number = ($mime_number == '' ? $i + 1 : sprintf('%s.%s', $mime_number, $i + 1));
-                }
-
-                $arr = &Mail_mimeDecode::getMimeNumbers($structure->parts[$i], $no_refs, $_mime_number, $prepend);
-                foreach ($arr as $key => $val) {
-                    $no_refs ? $return[$key] = '' : $return[$key] = &$arr[$key];
-                }
-            }
-        } else {
-            if ($mime_number == '') {
-                $mime_number = '1';
-            }
-            $structure->mime_id = $prepend . $mime_number;
-            $no_refs ? $return[$prepend . $mime_number] = '' : $return[$prepend . $mime_number] = &$structure;
-        }
-        
-        return $return;
-    }
-
-    /**
-     * Given a string containing a header and body
-     * section, this function will split them (at the first
-     * blank line) and return them.
-     *
-     * @param string Input to split apart
-     * @return array Contains header and body section
-     * @access private
-     */
-    function _splitBodyHeader($input)
-    {
-        if (preg_match("/^(.*?)\r?\n\r?\n(.*)/s", $input, $match)) {
-            return array($match[1], $match[2]);
-        }
-        // bug #17325 - empty bodies are allowed. - we just check that at least one line 
-        // of headers exist..
-        if (count(explode("\n",$input))) {
-            return array($input, '');
-        }
-        $this->_error = 'Could not split header and body';
-        return false;
-    }
-
-    /**
-     * Parse headers given in $input and return
-     * as assoc array.
-     *
-     * @param string Headers to parse
-     * @return array Contains parsed headers
-     * @access private
-     */
-    function _parseHeaders($input)
-    {
-
-        if ($input !== '') {
-            // Unfold the input
-            $input   = preg_replace("/\r?\n/", "\r\n", $input);
-            //#7065 - wrapping.. with encoded stuff.. - probably not needed,
-            // wrapping space should only get removed if the trailing item on previous line is a 
-            // encoded character
-            $input   = preg_replace("/=\r\n(\t| )+/", '=', $input);
-            $input   = preg_replace("/\r\n(\t| )+/", ' ', $input);
-            
-            $headers = explode("\r\n", trim($input));
-
-            foreach ($headers as $value) {
-                $hdr_name = substr($value, 0, $pos = strpos($value, ':'));
-                $hdr_value = substr($value, $pos+1);
-                if($hdr_value[0] == ' ')
-                    $hdr_value = substr($hdr_value, 1);
-
-                $return[] = array(
-                                  'name'  => $hdr_name,
-                                  'value' =>  $hdr_value
-                                 );
-            }
-        } else {
-            $return = array();
-        }
-
-        return $return;
-    }
-
-    /**
-     * Function to parse a header value,
-     * extract first part, and any secondary
-     * parts (after ;) This function is not as
-     * robust as it could be. Eg. header comments
-     * in the wrong place will probably break it.
-     *
-     * @param string Header value to parse
-     * @return array Contains parsed result
-     * @access private
-     */
-    function _parseHeaderValue($input)
-    {
-
-        if (($pos = strpos($input, ';')) === false) {
-            $input = $this->_decode_headers ? $this->_decodeHeader($input) : $input;
-            $return['value'] = trim($input);
-            return $return;
-        }
-
-
-
-        $value = substr($input, 0, $pos);
-        $value = $this->_decode_headers ? $this->_decodeHeader($value) : $value;
-        $return['value'] = trim($value);
-        $input = trim(substr($input, $pos+1));
-
-        if (!strlen($input) > 0) {
-            return $return;
-        }
-        // at this point input contains xxxx=".....";zzzz="...."
-        // since we are dealing with quoted strings, we need to handle this properly..
-        $i = 0;
-        $l = strlen($input);
-        $key = '';
-        $val = false; // our string - including quotes..
-        $q = false; // in quote..
-        $lq = ''; // last quote..
-
-        while ($i < $l) {
-            
-            $c = $input[$i];
-            //var_dump(array('i'=>$i,'c'=>$c,'q'=>$q, 'lq'=>$lq, 'key'=>$key, 'val' =>$val));
-
-            $escaped = false;
-            if ($c == '\\') {
-                $i++;
-                if ($i == $l-1) { // end of string.
-                    break;
-                }
-                $escaped = true;
-                $c = $input[$i];
-            }            
-
-
-            // state - in key..
-            if ($val === false) {
-                if (!$escaped && $c == '=') {
-                    $val = '';
-                    $key = trim($key);
-                    $i++;
-                    continue;
-                }
-                if (!$escaped && $c == ';') {
-                    if ($key) { // a key without a value..
-                        $key= trim($key);
-                        $return['other'][$key] = '';
-                        $return['other'][strtolower($key)] = '';
-                    }
-                    $key = '';
-                }
-                $key .= $c;
-                $i++;
-                continue;
-            }
-                     
-            // state - in value.. (as $val is set..)
-
-            if ($q === false) {
-                // not in quote yet.
-                if ((!strlen($val) || $lq !== false) && $c == ' ' ||  $c == "\t") {
-                    $i++;
-                    continue; // skip leading spaces after '=' or after '"'
-                }
-                if (!$escaped && ($c == '"' || $c == "'")) {
-                    // start quoted area..
-                    $q = $c;
-                    // in theory should not happen raw text in value part..
-                    // but we will handle it as a merged part of the string..
-                    $val = !strlen(trim($val)) ? '' : trim($val);
-                    $i++;
-                    continue;
-                }
-                // got end....
-                if (!$escaped && $c == ';') {
-
-                    $val = trim($val);
-                    $added = false;
-                    if (preg_match('/\*[0-9]+$/', $key)) {
-                        // this is the extended aaa*0=...;aaa*1=.... code
-                        // it assumes the pieces arrive in order, and are valid...
-                        $key = preg_replace('/\*[0-9]+$/', '', $key);
-                        if (isset($return['other'][$key])) {
-                            $return['other'][$key] .= $val;
-                            if (strtolower($key) != $key) {
-                                $return['other'][strtolower($key)] .= $val;
-                            }
-                            $added = true;
-                        }
-                        // continue and use standard setters..
-                    }
-                    if (!$added) {
-                        $return['other'][$key] = $val;
-                        $return['other'][strtolower($key)] = $val;
-                    }
-                    $val = false;
-                    $key = '';
-                    $lq = false;
-                    $i++;
-                    continue;
-                }
-
-                $val .= $c;
-                $i++;
-                continue;
-            }
-            
-            // state - in quote..
-            if (!$escaped && $c == $q) {  // potential exit state..
-
-                // end of quoted string..
-                $lq = $q;
-                $q = false;
-                $i++;
-                continue;
-            }
-                
-            // normal char inside of quoted string..
-            $val.= $c;
-            $i++;
-        }
-        
-        // do we have anything left..
-        if (strlen(trim($key)) || $val !== false) {
-           
-            $val = trim($val);
-            $added = false;
-            if ($val !== false && preg_match('/\*[0-9]+$/', $key)) {
-                // no dupes due to our crazy regexp.
-                $key = preg_replace('/\*[0-9]+$/', '', $key);
-                if (isset($return['other'][$key])) {
-                    $return['other'][$key] .= $val;
-                    if (strtolower($key) != $key) {
-                        $return['other'][strtolower($key)] .= $val;
-                    }
-                    $added = true;
-                }
-                // continue and use standard setters..
-            }
-            if (!$added) {
-                $return['other'][$key] = $val;
-                $return['other'][strtolower($key)] = $val;
-            }
-        }
-        // decode values.
-        foreach($return['other'] as $key =>$val) {
-            $return['other'][$key] = $this->_decode_headers ? $this->_decodeHeader($val) : $val;
-        }
-       //print_r($return);
-        return $return;
-    }
-
-    /**
-     * This function splits the input based
-     * on the given boundary
-     *
-     * @param string Input to parse
-     * @return array Contains array of resulting mime parts
-     * @access private
-     */
-    function _boundarySplit($input, $boundary)
-    {
-        $parts = array();
-
-        $bs_possible = substr($boundary, 2, -2);
-        $bs_check = '\"' . $bs_possible . '\"';
-
-        if ($boundary == $bs_check) {
-            $boundary = $bs_possible;
-        }
-        $tmp = preg_split("/--".preg_quote($boundary, '/')."((?=\s)|--)/", $input);
-
-        $len = count($tmp) -1;
-        for ($i = 1; $i < $len; $i++) {
-            if (strlen(trim($tmp[$i]))) {
-                $parts[] = $tmp[$i];
-            }
-        }
-        
-        // add the last part on if it does not end with the 'closing indicator'
-        if (!empty($tmp[$len]) && strlen(trim($tmp[$len])) && $tmp[$len][0] != '-') {
-            $parts[] = $tmp[$len];
-        }
-        return $parts;
-    }
-
-    /**
-     * Given a header, this function will decode it
-     * according to RFC2047. Probably not *exactly*
-     * conformant, but it does pass all the given
-     * examples (in RFC2047).
-     *
-     * @param string Input header value to decode
-     * @return string Decoded header value
-     * @access private
-     */
-    function _decodeHeader($input)
-    {
-        // Remove white space between encoded-words
-        $input = preg_replace('/(=\?[^?]+\?(q|b)\?[^?]*\?=)(\s)+=\?/i', '\1=?', $input);
-
-        // For each encoded-word...
-        while (preg_match('/(=\?([^?]+)\?(q|b)\?([^?]*)\?=)/i', $input, $matches)) {
-
-            $encoded  = $matches[1];
-            $charset  = $matches[2];
-            $encoding = $matches[3];
-            $text     = $matches[4];
-
-            switch (strtolower($encoding)) {
-                case 'b':
-                    $text = base64_decode($text);
-                    break;
-
-                case 'q':
-                    $text = str_replace('_', ' ', $text);
-                    preg_match_all('/=([a-f0-9]{2})/i', $text, $matches);
-                    foreach($matches[1] as $value)
-                        $text = str_replace('='.$value, chr(hexdec($value)), $text);
-                    break;
-            }
-
-            $input = str_replace($encoded, $text, $input);
-        }
-
-        return $input;
-    }
-
-    /**
-     * Given a body string and an encoding type,
-     * this function will decode and return it.
-     *
-     * @param  string Input body to decode
-     * @param  string Encoding type to use.
-     * @return string Decoded body
-     * @access private
-     */
-    function _decodeBody($input, $encoding = '7bit')
-    {
-        switch (strtolower($encoding)) {
-            case '7bit':
-                return $input;
-                break;
-
-            case 'quoted-printable':
-                return $this->_quotedPrintableDecode($input);
-                break;
-
-            case 'base64':
-                return base64_decode($input);
-                break;
-
-            default:
-                return $input;
-        }
-    }
-
-    /**
-     * Given a quoted-printable string, this
-     * function will decode and return it.
-     *
-     * @param  string Input body to decode
-     * @return string Decoded body
-     * @access private
-     */
-    function _quotedPrintableDecode($input)
-    {
-        // Remove soft line breaks
-        $input = preg_replace("/=\r?\n/", '', $input);
-
-        // Replace encoded characters
-		$input = preg_replace('/=([a-f0-9]{2})/ie', "chr(hexdec('\\1'))", $input);
-
-        return $input;
-    }
-
-    /**
-     * Checks the input for uuencoded files and returns
-     * an array of them. Can be called statically, eg:
-     *
-     * $files =& Mail_mimeDecode::uudecode($some_text);
-     *
-     * It will check for the begin 666 ... end syntax
-     * however and won't just blindly decode whatever you
-     * pass it.
-     *
-     * @param  string Input body to look for attahcments in
-     * @return array  Decoded bodies, filenames and permissions
-     * @access public
-     * @author Unknown
-     */
-    function &uudecode($input)
-    {
-        // Find all uuencoded sections
-        preg_match_all("/begin ([0-7]{3}) (.+)\r?\n(.+)\r?\nend/Us", $input, $matches);
-
-        for ($j = 0; $j < count($matches[3]); $j++) {
-
-            $str      = $matches[3][$j];
-            $filename = $matches[2][$j];
-            $fileperm = $matches[1][$j];
-
-            $file = '';
-            $str = preg_split("/\r?\n/", trim($str));
-            $strlen = count($str);
-
-            for ($i = 0; $i < $strlen; $i++) {
-                $pos = 1;
-                $d = 0;
-                $len=(int)(((ord(substr($str[$i],0,1)) -32) - ' ') & 077);
-
-                while (($d + 3 <= $len) AND ($pos + 4 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
-                    $c3 = (ord(substr($str[$i],$pos+3,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
-
-                    $file .= chr(((($c2 - ' ') & 077) << 6) |  (($c3 - ' ') & 077));
-
-                    $pos += 4;
-                    $d += 3;
-                }
-
-                if (($d + 2 <= $len) && ($pos + 3 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $c2 = (ord(substr($str[$i],$pos+2,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                    $file .= chr(((($c1 - ' ') & 077) << 4) | ((($c2 - ' ') & 077) >> 2));
-
-                    $pos += 3;
-                    $d += 2;
-                }
-
-                if (($d + 1 <= $len) && ($pos + 2 <= strlen($str[$i]))) {
-                    $c0 = (ord(substr($str[$i],$pos,1)) ^ 0x20);
-                    $c1 = (ord(substr($str[$i],$pos+1,1)) ^ 0x20);
-                    $file .= chr(((($c0 - ' ') & 077) << 2) | ((($c1 - ' ') & 077) >> 4));
-
-                }
-            }
-            $files[] = array('filename' => $filename, 'fileperm' => $fileperm, 'filedata' => $file);
-        }
-
-        return $files;
-    }
-
-    /**
-     * getSendArray() returns the arguments required for Mail::send()
-     * used to build the arguments for a mail::send() call 
-     *
-     * Usage:
-     * $mailtext = Full email (for example generated by a template)
-     * $decoder = new Mail_mimeDecode($mailtext);
-     * $parts =  $decoder->getSendArray();
-     * if (!PEAR::isError($parts) {
-     *     list($recipents,$headers,$body) = $parts;
-     *     $mail = Mail::factory('smtp');
-     *     $mail->send($recipents,$headers,$body);
-     * } else {
-     *     echo $parts->message;
-     * }
-     * @return mixed   array of recipeint, headers,body or Pear_Error
-     * @access public
-     * @author Alan Knowles <alan@akbkhome.com>
-     */
-    function getSendArray()
-    {
-        // prevent warning if this is not set
-        $this->_decode_headers = FALSE;
-        $headerlist =$this->_parseHeaders($this->_header);
-        $to = "";
-        if (!$headerlist) {
-            return $this->raiseError("Message did not contain headers");
-        }
-        foreach($headerlist as $item) {
-            $header[$item['name']] = $item['value'];
-            switch (strtolower($item['name'])) {
-                case "to":
-                case "cc":
-                case "bcc":
-                    $to .= ",".$item['value'];
-                default:
-                   break;
-            }
-        }
-        if ($to == "") {
-            return $this->raiseError("Message did not contain any recipents");
-        }
-        $to = substr($to,1);
-        return array($to,$header,$this->_body);
-    } 
-
-    /**
-     * Returns a xml copy of the output of
-     * Mail_mimeDecode::decode. Pass the output in as the
-     * argument. This function can be called statically. Eg:
-     *
-     * $output = $obj->decode();
-     * $xml    = Mail_mimeDecode::getXML($output);
-     *
-     * The DTD used for this should have been in the package. Or
-     * alternatively you can get it from cvs, or here:
-     * http://www.phpguru.org/xmail/xmail.dtd.
-     *
-     * @param  object Input to convert to xml. This should be the
-     *                output of the Mail_mimeDecode::decode function
-     * @return string XML version of input
-     * @access public
-     */
-    function getXML($input)
-    {
-        $crlf    =  "\r\n";
-        $output  = '<?xml version=\'1.0\'?>' . $crlf .
-                   '<!DOCTYPE email SYSTEM "http://www.phpguru.org/xmail/xmail.dtd">' . $crlf .
-                   '<email>' . $crlf .
-                   Mail_mimeDecode::_getXML($input) .
-                   '</email>';
-
-        return $output;
-    }
-
-    /**
-     * Function that does the actual conversion to xml. Does a single
-     * mimepart at a time.
-     *
-     * @param  object  Input to convert to xml. This is a mimepart object.
-     *                 It may or may not contain subparts.
-     * @param  integer Number of tabs to indent
-     * @return string  XML version of input
-     * @access private
-     */
-    function _getXML($input, $indent = 1)
-    {
-        $htab    =  "\t";
-        $crlf    =  "\r\n";
-        $output  =  '';
-        $headers = @(array)$input->headers;
-
-        foreach ($headers as $hdr_name => $hdr_value) {
-
-            // Multiple headers with this name
-            if (is_array($headers[$hdr_name])) {
-                for ($i = 0; $i < count($hdr_value); $i++) {
-                    $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value[$i], $indent);
-                }
-
-            // Only one header of this sort
-            } else {
-                $output .= Mail_mimeDecode::_getXML_helper($hdr_name, $hdr_value, $indent);
-            }
-        }
-
-        if (!empty($input->parts)) {
-            for ($i = 0; $i < count($input->parts); $i++) {
-                $output .= $crlf . str_repeat($htab, $indent) . '<mimepart>' . $crlf .
-                           Mail_mimeDecode::_getXML($input->parts[$i], $indent+1) .
-                           str_repeat($htab, $indent) . '</mimepart>' . $crlf;
-            }
-        } elseif (isset($input->body)) {
-            $output .= $crlf . str_repeat($htab, $indent) . '<body><![CDATA[' .
-                       $input->body . ']]></body>' . $crlf;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Helper function to _getXML(). Returns xml of a header.
-     *
-     * @param  string  Name of header
-     * @param  string  Value of header
-     * @param  integer Number of tabs to indent
-     * @return string  XML version of input
-     * @access private
-     */
-    function _getXML_helper($hdr_name, $hdr_value, $indent)
-    {
-        $htab   = "\t";
-        $crlf   = "\r\n";
-        $return = '';
-
-        $new_hdr_value = ($hdr_name != 'received') ? Mail_mimeDecode::_parseHeaderValue($hdr_value) : array('value' => $hdr_value);
-        $new_hdr_name  = str_replace(' ', '-', ucwords(str_replace('-', ' ', $hdr_name)));
-
-        // Sort out any parameters
-        if (!empty($new_hdr_value['other'])) {
-            foreach ($new_hdr_value['other'] as $paramname => $paramvalue) {
-                $params[] = str_repeat($htab, $indent) . $htab . '<parameter>' . $crlf .
-                            str_repeat($htab, $indent) . $htab . $htab . '<paramname>' . htmlspecialchars($paramname) . '</paramname>' . $crlf .
-                            str_repeat($htab, $indent) . $htab . $htab . '<paramvalue>' . htmlspecialchars($paramvalue) . '</paramvalue>' . $crlf .
-                            str_repeat($htab, $indent) . $htab . '</parameter>' . $crlf;
-            }
-
-            $params = implode('', $params);
-        } else {
-            $params = '';
-        }
-
-        $return = str_repeat($htab, $indent) . '<header>' . $crlf .
-                  str_repeat($htab, $indent) . $htab . '<headername>' . htmlspecialchars($new_hdr_name) . '</headername>' . $crlf .
-                  str_repeat($htab, $indent) . $htab . '<headervalue>' . htmlspecialchars($new_hdr_value['value']) . '</headervalue>' . $crlf .
-                  $params .
-                  str_repeat($htab, $indent) . '</header>' . $crlf;
-
-        return $return;
-    }
-
-} // End of class

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Mail/mimePart.php Deleted

@@ -1,1228 +0,0 @@
-<?php
-/**
- * The Mail_mimePart class is used to create MIME E-mail messages
- *
- * This class enables you to manipulate and build a mime email
- * from the ground up. The Mail_Mime class is a userfriendly api
- * to this class for people who aren't interested in the internals
- * of mime mail.
- * This class however allows full control over the email.
- *
- * Compatible with PHP versions 4 and 5
- *
- * LICENSE: This LICENSE is in the BSD license style.
- * Copyright (c) 2002-2003, Richard Heyes <richard@phpguru.org>
- * Copyright (c) 2003-2006, PEAR <pear-group@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - Neither the name of the authors, nor the names of its contributors 
- *   may be used to endorse or promote products derived from this 
- *   software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @author    Aleksander Machniak <alec@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- */
-
-
-/**
- * The Mail_mimePart class is used to create MIME E-mail messages
- *
- * This class enables you to manipulate and build a mime email
- * from the ground up. The Mail_Mime class is a userfriendly api
- * to this class for people who aren't interested in the internals
- * of mime mail.
- * This class however allows full control over the email.
- *
- * @category  Mail
- * @package   Mail_Mime
- * @author    Richard Heyes  <richard@phpguru.org>
- * @author    Cipriano Groenendal <cipri@php.net>
- * @author    Sean Coates <sean@php.net>
- * @author    Aleksander Machniak <alec@php.net>
- * @copyright 2003-2006 PEAR <pear-group@php.net>
- * @license   http://www.opensource.org/licenses/bsd-license.php BSD License
- * @version   Release: 1.8.5
- * @link      http://pear.php.net/package/Mail_mime
- */
-class Mail_mimePart
-{
-    /**
-    * The encoding type of this part
-    *
-    * @var string
-    * @access private
-    */
-    var $_encoding;
-
-    /**
-    * An array of subparts
-    *
-    * @var array
-    * @access private
-    */
-    var $_subparts;
-
-    /**
-    * The output of this part after being built
-    *
-    * @var string
-    * @access private
-    */
-    var $_encoded;
-
-    /**
-    * Headers for this part
-    *
-    * @var array
-    * @access private
-    */
-    var $_headers;
-
-    /**
-    * The body of this part (not encoded)
-    *
-    * @var string
-    * @access private
-    */
-    var $_body;
-
-    /**
-    * The location of file with body of this part (not encoded)
-    *
-    * @var string
-    * @access private
-    */
-    var $_body_file;
-
-    /**
-    * The end-of-line sequence
-    *
-    * @var string
-    * @access private
-    */
-    var $_eol = "\r\n";
-
-
-    /**
-    * Constructor.
-    *
-    * Sets up the object.
-    *
-    * @param string $body   The body of the mime part if any.
-    * @param array  $params An associative array of optional parameters:
-    *     content_type      - The content type for this part eg multipart/mixed
-    *     encoding          - The encoding to use, 7bit, 8bit,
-    *                         base64, or quoted-printable
-    *     charset           - Content character set
-    *     cid               - Content ID to apply
-    *     disposition       - Content disposition, inline or attachment
-    *     filename          - Filename parameter for content disposition
-    *     description       - Content description
-    *     name_encoding     - Encoding of the attachment name (Content-Type)
-    *                         By default filenames are encoded using RFC2231
-    *                         Here you can set RFC2047 encoding (quoted-printable
-    *                         or base64) instead
-    *     filename_encoding - Encoding of the attachment filename (Content-Disposition)
-    *                         See 'name_encoding'
-    *     headers_charset   - Charset of the headers e.g. filename, description.
-    *                         If not set, 'charset' will be used
-    *     eol               - End of line sequence. Default: "\r\n"
-    *     headers           - Hash array with additional part headers. Array keys can be
-    *                         in form of <header_name>:<parameter_name>
-    *     body_file         - Location of file with part's body (instead of $body)
-    *
-    * @access public
-    */
-    function Mail_mimePart($body = '', $params = array())
-    {
-        if (!empty($params['eol'])) {
-            $this->_eol = $params['eol'];
-        } else if (defined('MAIL_MIMEPART_CRLF')) { // backward-copat.
-            $this->_eol = MAIL_MIMEPART_CRLF;
-        }
-
-        // Additional part headers
-        if (!empty($params['headers']) && is_array($params['headers'])) {
-            $headers = $params['headers'];
-        }
-
-        foreach ($params as $key => $value) {
-            switch ($key) {
-            case 'encoding':
-                $this->_encoding = $value;
-                $headers['Content-Transfer-Encoding'] = $value;
-                break;
-
-            case 'cid':
-                $headers['Content-ID'] = '<' . $value . '>';
-                break;
-
-            case 'location':
-                $headers['Content-Location'] = $value;
-                break;
-
-            case 'body_file':
-                $this->_body_file = $value;
-                break;
-
-            // for backward compatibility
-            case 'dfilename':
-                $params['filename'] = $value;
-                break;
-            }
-        }
-
-        // Default content-type
-        if (empty($params['content_type'])) {
-            $params['content_type'] = 'text/plain';
-        }
-
-        // Content-Type
-        $headers['Content-Type'] = $params['content_type'];
-        if (!empty($params['charset'])) {
-            $charset = "charset={$params['charset']}";
-            // place charset parameter in the same line, if possible
-            if ((strlen($headers['Content-Type']) + strlen($charset) + 16) <= 76) {
-                $headers['Content-Type'] .= '; ';
-            } else {
-                $headers['Content-Type'] .= ';' . $this->_eol . ' ';
-            }
-            $headers['Content-Type'] .= $charset;
-
-            // Default headers charset
-            if (!isset($params['headers_charset'])) {
-                $params['headers_charset'] = $params['charset'];
-            }
-        }
-
-        // header values encoding parameters
-        $h_charset  = !empty($params['headers_charset']) ? $params['headers_charset'] : 'US-ASCII';
-        $h_language = !empty($params['language']) ? $params['language'] : null;
-        $h_encoding = !empty($params['name_encoding']) ? $params['name_encoding'] : null;
-
-
-        if (!empty($params['filename'])) {
-            $headers['Content-Type'] .= ';' . $this->_eol;
-            $headers['Content-Type'] .= $this->_buildHeaderParam(
-                'name', $params['filename'], $h_charset, $h_language, $h_encoding
-            );
-        }
-
-        // Content-Disposition
-        if (!empty($params['disposition'])) {
-            $headers['Content-Disposition'] = $params['disposition'];
-            if (!empty($params['filename'])) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol;
-                $headers['Content-Disposition'] .= $this->_buildHeaderParam(
-                    'filename', $params['filename'], $h_charset, $h_language,
-                    !empty($params['filename_encoding']) ? $params['filename_encoding'] : null
-                );
-            }
-
-            // add attachment size
-            $size = $this->_body_file ? filesize($this->_body_file) : strlen($body);
-            if ($size) {
-                $headers['Content-Disposition'] .= ';' . $this->_eol . ' size=' . $size;
-            }
-        }
-
-        if (!empty($params['description'])) {
-            $headers['Content-Description'] = $this->encodeHeader(
-                'Content-Description', $params['description'], $h_charset, $h_encoding,
-                $this->_eol
-            );
-        }
-
-        // Search and add existing headers' parameters
-        foreach ($headers as $key => $value) {
-            $items = explode(':', $key);
-            if (count($items) == 2) {
-                $header = $items[0];
-                $param  = $items[1];
-                if (isset($headers[$header])) {
-                    $headers[$header] .= ';' . $this->_eol;
-                }
-                $headers[$header] .= $this->_buildHeaderParam(
-                    $param, $value, $h_charset, $h_language, $h_encoding
-                );
-                unset($headers[$key]);
-            }
-        }
-
-        // Default encoding
-        if (!isset($this->_encoding)) {
-            $this->_encoding = '7bit';
-        }
-
-        // Assign stuff to member variables
-        $this->_encoded  = array();
-        $this->_headers  = $headers;
-        $this->_body     = $body;
-    }
-
-    /**
-     * Encodes and returns the email. Also stores
-     * it in the encoded member variable
-     *
-     * @param string $boundary Pre-defined boundary string
-     *
-     * @return An associative array containing two elements,
-     *         body and headers. The headers element is itself
-     *         an indexed array. On error returns PEAR error object.
-     * @access public
-     */
-    function encode($boundary=null)
-    {
-        $encoded =& $this->_encoded;
-
-        if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
-            $eol = $this->_eol;
-
-            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-
-            $encoded['body'] = ''; 
-
-            for ($i = 0; $i < count($this->_subparts); $i++) {
-                $encoded['body'] .= '--' . $boundary . $eol;
-                $tmp = $this->_subparts[$i]->encode();
-                if (PEAR::isError($tmp)) {
-                    return $tmp;
-                }
-                foreach ($tmp['headers'] as $key => $value) {
-                    $encoded['body'] .= $key . ': ' . $value . $eol;
-                }
-                $encoded['body'] .= $eol . $tmp['body'] . $eol;
-            }
-
-            $encoded['body'] .= '--' . $boundary . '--' . $eol;
-
-        } else if ($this->_body) {
-            $encoded['body'] = $this->_getEncodedData($this->_body, $this->_encoding);
-        } else if ($this->_body_file) {
-            // Temporarily reset magic_quotes_runtime for file reads and writes
-            if ($magic_quote_setting = get_magic_quotes_runtime()) {
-                @ini_set('magic_quotes_runtime', 0);
-            }
-            $body = $this->_getEncodedDataFromFile($this->_body_file, $this->_encoding);
-            if ($magic_quote_setting) {
-                @ini_set('magic_quotes_runtime', $magic_quote_setting);
-            }
-
-            if (PEAR::isError($body)) {
-                return $body;
-            }
-            $encoded['body'] = $body;
-        } else {
-            $encoded['body'] = '';
-        }
-
-        // Add headers to $encoded
-        $encoded['headers'] =& $this->_headers;
-
-        return $encoded;
-    }
-
-    /**
-     * Encodes and saves the email into file. File must exist.
-     * Data will be appended to the file.
-     *
-     * @param string  $filename  Output file location
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
-     *
-     * @return array An associative array containing message headers
-     *               or PEAR error object
-     * @access public
-     * @since 1.6.0
-     */
-    function encodeToFile($filename, $boundary=null, $skip_head=false)
-    {
-        if (file_exists($filename) && !is_writable($filename)) {
-            $err = PEAR::raiseError('File is not writeable: ' . $filename);
-            return $err;
-        }
-
-        if (!($fh = fopen($filename, 'ab'))) {
-            $err = PEAR::raiseError('Unable to open file: ' . $filename);
-            return $err;
-        }
-
-        // Temporarily reset magic_quotes_runtime for file reads and writes
-        if ($magic_quote_setting = get_magic_quotes_runtime()) {
-            @ini_set('magic_quotes_runtime', 0);
-        }
-
-        $res = $this->_encodePartToFile($fh, $boundary, $skip_head);
-
-        fclose($fh);
-
-        if ($magic_quote_setting) {
-            @ini_set('magic_quotes_runtime', $magic_quote_setting);
-        }
-
-        return PEAR::isError($res) ? $res : $this->_headers;
-    }
-
-    /**
-     * Encodes given email part into file
-     *
-     * @param string  $fh        Output file handle
-     * @param string  $boundary  Pre-defined boundary string
-     * @param boolean $skip_head True if you don't want to save headers
-     *
-     * @return array True on sucess or PEAR error object
-     * @access private
-     */
-    function _encodePartToFile($fh, $boundary=null, $skip_head=false)
-    {
-        $eol = $this->_eol;
-
-        if (count($this->_subparts)) {
-            $boundary = $boundary ? $boundary : '=_' . md5(rand() . microtime());
-            $this->_headers['Content-Type'] .= ";$eol boundary=\"$boundary\"";
-        }
-
-        if (!$skip_head) {
-            foreach ($this->_headers as $key => $value) {
-                fwrite($fh, $key . ': ' . $value . $eol);
-            }
-            $f_eol = $eol;
-        } else {
-            $f_eol = '';
-        }
-
-        if (count($this->_subparts)) {
-            for ($i = 0; $i < count($this->_subparts); $i++) {
-                fwrite($fh, $f_eol . '--' . $boundary . $eol);
-                $res = $this->_subparts[$i]->_encodePartToFile($fh);
-                if (PEAR::isError($res)) {
-                    return $res;
-                }
-                $f_eol = $eol;
-            }
-
-            fwrite($fh, $eol . '--' . $boundary . '--' . $eol);
-
-        } else if ($this->_body) {
-            fwrite($fh, $f_eol . $this->_getEncodedData($this->_body, $this->_encoding));
-        } else if ($this->_body_file) {
-            fwrite($fh, $f_eol);
-            $res = $this->_getEncodedDataFromFile(
-                $this->_body_file, $this->_encoding, $fh
-            );
-            if (PEAR::isError($res)) {
-                return $res;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Adds a subpart to current mime part and returns
-     * a reference to it
-     *
-     * @param string $body   The body of the subpart, if any.
-     * @param array  $params The parameters for the subpart, same
-     *                       as the $params argument for constructor.
-     *
-     * @return Mail_mimePart A reference to the part you just added. It is
-     *                       crucial if using multipart/* in your subparts that
-     *                       you use =& in your script when calling this function,
-     *                       otherwise you will not be able to add further subparts.
-     * @access public
-     */
-    function &addSubpart($body, $params)
-    {
-        $this->_subparts[] = new Mail_mimePart($body, $params);
-        return $this->_subparts[count($this->_subparts) - 1];
-    }
-
-    /**
-     * Returns encoded data based upon encoding passed to it
-     *
-     * @param string $data     The data to encode.
-     * @param string $encoding The encoding type to use, 7bit, base64,
-     *                         or quoted-printable.
-     *
-     * @return string
-     * @access private
-     */
-    function _getEncodedData($data, $encoding)
-    {
-        switch ($encoding) {
-        case 'quoted-printable':
-            return $this->_quotedPrintableEncode($data);
-            break;
-
-        case 'base64':
-            return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-            return $data;
-        }
-    }
-
-    /**
-     * Returns encoded data based upon encoding passed to it
-     *
-     * @param string   $filename Data file location
-     * @param string   $encoding The encoding type to use, 7bit, base64,
-     *                           or quoted-printable.
-     * @param resource $fh       Output file handle. If set, data will be
-     *                           stored into it instead of returning it
-     *
-     * @return string Encoded data or PEAR error object
-     * @access private
-     */
-    function _getEncodedDataFromFile($filename, $encoding, $fh=null)
-    {
-        if (!is_readable($filename)) {
-            $err = PEAR::raiseError('Unable to read file: ' . $filename);
-            return $err;
-        }
-
-        if (!($fd = fopen($filename, 'rb'))) {
-            $err = PEAR::raiseError('Could not open file: ' . $filename);
-            return $err;
-        }
-
-        $data = '';
-
-        switch ($encoding) {
-        case 'quoted-printable':
-            while (!feof($fd)) {
-                $buffer = $this->_quotedPrintableEncode(fgets($fd));
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-            break;
-
-        case 'base64':
-            while (!feof($fd)) {
-                // Should read in a multiple of 57 bytes so that
-                // the output is 76 bytes per line. Don't use big chunks
-                // because base64 encoding is memory expensive
-                $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
-                $buffer = base64_encode($buffer);
-                $buffer = chunk_split($buffer, 76, $this->_eol);
-                if (feof($fd)) {
-                    $buffer = rtrim($buffer);
-                }
-
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-            while (!feof($fd)) {
-                $buffer = fread($fd, 1048576); // 1 MB
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-        }
-
-        fclose($fd);
-
-        if (!$fh) {
-            return $data;
-        }
-    }
-
-    /**
-     * Encodes data to quoted-printable standard.
-     *
-     * @param string $input    The data to encode
-     * @param int    $line_max Optional max line length. Should
-     *                         not be more than 76 chars
-     *
-     * @return string Encoded data
-     *
-     * @access private
-     */
-    function _quotedPrintableEncode($input , $line_max = 76)
-    {
-        $eol = $this->_eol;
-        /*
-        // imap_8bit() is extremely fast, but doesn't handle properly some characters
-        if (function_exists('imap_8bit') && $line_max == 76) {
-            $input = preg_replace('/\r?\n/', "\r\n", $input);
-            $input = imap_8bit($input);
-            if ($eol != "\r\n") {
-                $input = str_replace("\r\n", $eol, $input);
-            }
-            return $input;
-        }
-        */
-        $lines  = preg_split("/\r?\n/", $input);
-        $escape = '=';
-        $output = '';
-
-        while (list($idx, $line) = each($lines)) {
-            $newline = '';
-            $i = 0;
-
-            while (isset($line[$i])) {
-                $char = $line[$i];
-                $dec  = ord($char);
-                $i++;
-
-                if (($dec == 32) && (!isset($line[$i]))) {
-                    // convert space at eol only
-                    $char = '=20';
-                } elseif ($dec == 9 && isset($line[$i])) {
-                    ; // Do nothing if a TAB is not on eol
-                } elseif (($dec == 61) || ($dec < 32) || ($dec > 126)) {
-                    $char = $escape . sprintf('%02X', $dec);
-                } elseif (($dec == 46) && (($newline == '')
-                    || ((strlen($newline) + strlen("=2E")) >= $line_max))
-                ) {
-                    // Bug #9722: convert full-stop at bol,
-                    // some Windows servers need this, won't break anything (cipri)
-                    // Bug #11731: full-stop at bol also needs to be encoded
-                    // if this line would push us over the line_max limit.
-                    $char = '=2E';
-                }
-
-                // Note, when changing this line, also change the ($dec == 46)
-                // check line, as it mimics this line due to Bug #11731
-                // EOL is not counted
-                if ((strlen($newline) + strlen($char)) >= $line_max) {
-                    // soft line break; " =\r\n" is okay
-                    $output  .= $newline . $escape . $eol;
-                    $newline  = '';
-                }
-                $newline .= $char;
-            } // end of for
-            $output .= $newline . $eol;
-            unset($lines[$idx]);
-        }
-        // Don't want last crlf
-        $output = substr($output, 0, -1 * strlen($eol));
-        return $output;
-    }
-
-    /**
-     * Encodes the parameter of a header.
-     *
-     * @param string $name      The name of the header-parameter
-     * @param string $value     The value of the paramter
-     * @param string $charset   The characterset of $value
-     * @param string $language  The language used in $value
-     * @param string $encoding  Parameter encoding. If not set, parameter value
-     *                          is encoded according to RFC2231
-     * @param int    $maxLength The maximum length of a line. Defauls to 75
-     *
-     * @return string
-     *
-     * @access private
-     */
-    function _buildHeaderParam($name, $value, $charset=null, $language=null,
-        $encoding=null, $maxLength=75
-    ) {
-        // RFC 2045:
-        // value needs encoding if contains non-ASCII chars or is longer than 78 chars
-        if (!preg_match('#[^\x20-\x7E]#', $value)) {
-            $token_regexp = '#([^\x21\x23-\x27\x2A\x2B\x2D'
-                . '\x2E\x30-\x39\x41-\x5A\x5E-\x7E])#';
-            if (!preg_match($token_regexp, $value)) {
-                // token
-                if (strlen($name) + strlen($value) + 3 <= $maxLength) {
-                    return " {$name}={$value}";
-                }
-            } else {
-                // quoted-string
-                $quoted = addcslashes($value, '\\"');
-                if (strlen($name) + strlen($quoted) + 5 <= $maxLength) {
-                    return " {$name}=\"{$quoted}\"";
-                }
-            }
-        }
-
-        // RFC2047: use quoted-printable/base64 encoding
-        if ($encoding == 'quoted-printable' || $encoding == 'base64') {
-            return $this->_buildRFC2047Param($name, $value, $charset, $encoding);
-        }
-
-        // RFC2231:
-        $encValue = preg_replace_callback(
-            '/([^\x21\x23\x24\x26\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E])/',
-            array($this, '_encodeReplaceCallback'), $value
-        );
-        $value = "$charset'$language'$encValue";
-
-        $header = " {$name}*={$value}";
-        if (strlen($header) <= $maxLength) {
-            return $header;
-        }
-
-        $preLength = strlen(" {$name}*0*=");
-        $maxLength = max(16, $maxLength - $preLength - 3);
-        $maxLengthReg = "|(.{0,$maxLength}[^\%][^\%])|";
-
-        $headers = array();
-        $headCount = 0;
-        while ($value) {
-            $matches = array();
-            $found = preg_match($maxLengthReg, $value, $matches);
-            if ($found) {
-                $headers[] = " {$name}*{$headCount}*={$matches[0]}";
-                $value = substr($value, strlen($matches[0]));
-            } else {
-                $headers[] = " {$name}*{$headCount}*={$value}";
-                $value = '';
-            }
-            $headCount++;
-        }
-
-        $headers = implode(';' . $this->_eol, $headers);
-        return $headers;
-    }
-
-    /**
-     * Encodes header parameter as per RFC2047 if needed
-     *
-     * @param string $name      The parameter name
-     * @param string $value     The parameter value
-     * @param string $charset   The parameter charset
-     * @param string $encoding  Encoding type (quoted-printable or base64)
-     * @param int    $maxLength Encoded parameter max length. Default: 76
-     *
-     * @return string Parameter line
-     * @access private
-     */
-    function _buildRFC2047Param($name, $value, $charset,
-        $encoding='quoted-printable', $maxLength=76
-    ) {
-        // WARNING: RFC 2047 says: "An 'encoded-word' MUST NOT be used in
-        // parameter of a MIME Content-Type or Content-Disposition field",
-        // but... it's supported by many clients/servers
-        $quoted = '';
-
-        if ($encoding == 'base64') {
-            $value = base64_encode($value);
-            $prefix = '=?' . $charset . '?B?';
-            $suffix = '?=';
-
-            // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
-            $len = $add_len + strlen($value);
-
-            while ($len > $maxLength) { 
-                // We can cut base64-encoded string every 4 characters
-                $real_len = floor(($maxLength - $add_len) / 4) * 4;
-                $_quote = substr($value, 0, $real_len);
-                $value = substr($value, $real_len);
-
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
-                $len = strlen($value) + $add_len;
-            }
-            $quoted .= $prefix . $value . $suffix;
-
-        } else {
-            // quoted-printable
-            $value = $this->encodeQP($value);
-            $prefix = '=?' . $charset . '?Q?';
-            $suffix = '?=';
-
-            // 2 x SPACE, 2 x '"', '=', ';'
-            $add_len = strlen($prefix . $suffix) + strlen($name) + 6;
-            $len = $add_len + strlen($value);
-
-            while ($len > $maxLength) {
-                $length = $maxLength - $add_len;
-                // don't break any encoded letters
-                if (preg_match("/^(.{0,$length}[^\=][^\=])/", $value, $matches)) {
-                    $_quote = $matches[1];
-                }
-
-                $quoted .= $prefix . $_quote . $suffix . $this->_eol . ' ';
-                $value = substr($value, strlen($_quote));
-                $add_len = strlen($prefix . $suffix) + 4; // 2 x SPACE, '"', ';'
-                $len = strlen($value) + $add_len;
-            }
-
-            $quoted .= $prefix . $value . $suffix;
-        }
-
-        return " {$name}=\"{$quoted}\"";
-    }
-
-    /**
-     * Encodes a header as per RFC2047
-     *
-     * @param string $name     The header name
-     * @param string $value    The header data to encode
-     * @param string $charset  Character set name
-     * @param string $encoding Encoding name (base64 or quoted-printable)
-     * @param string $eol      End-of-line sequence. Default: "\r\n"
-     *
-     * @return string          Encoded header data (without a name)
-     * @access public
-     * @since 1.6.1
-     */
-    function encodeHeader($name, $value, $charset='ISO-8859-1',
-        $encoding='quoted-printable', $eol="\r\n"
-    ) {
-        // Structured headers
-        $comma_headers = array(
-            'from', 'to', 'cc', 'bcc', 'sender', 'reply-to',
-            'resent-from', 'resent-to', 'resent-cc', 'resent-bcc',
-            'resent-sender', 'resent-reply-to',
-            'return-receipt-to', 'disposition-notification-to',
-        );
-        $other_headers = array(
-            'references', 'in-reply-to', 'message-id', 'resent-message-id',
-        );
-
-        $name = strtolower($name);
-
-        if (in_array($name, $comma_headers)) {
-            $separator = ',';
-        } else if (in_array($name, $other_headers)) {
-            $separator = ' ';
-        }
-
-        if (!$charset) {
-            $charset = 'ISO-8859-1';
-        }
-
-        // Structured header (make sure addr-spec inside is not encoded)
-        if (!empty($separator)) {
-            // Simple e-mail address regexp
-            $email_regexp = '([^\s<]+|("[^\r\n"]+"))@\S+';
-
-            $parts = Mail_mimePart::_explodeQuotedString($separator, $value);
-            $value = '';
-
-            foreach ($parts as $part) {
-                $part = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $part);
-                $part = trim($part);
-
-                if (!$part) {
-                    continue;
-                }
-                if ($value) {
-                    $value .= $separator==',' ? $separator.' ' : ' ';
-                } else {
-                    $value = $name . ': ';
-                }
-
-                // let's find phrase (name) and/or addr-spec
-                if (preg_match('/^<' . $email_regexp . '>$/', $part)) {
-                    $value .= $part;
-                } else if (preg_match('/^' . $email_regexp . '$/', $part)) {
-                    // address without brackets and without name
-                    $value .= $part;
-                } else if (preg_match('/<*' . $email_regexp . '>*$/', $part, $matches)) {
-                    // address with name (handle name)
-                    $address = $matches[0];
-                    $word = str_replace($address, '', $part);
-                    $word = trim($word);
-                    // check if phrase requires quoting
-                    if ($word) {
-                        // non-ASCII: require encoding
-                        if (preg_match('#([\x80-\xFF]){1}#', $word)) {
-                            if ($word[0] == '"' && $word[strlen($word)-1] == '"') {
-                                // de-quote quoted-string, encoding changes
-                                // string to atom
-                                $search = array("\\\"", "\\\\");
-                                $replace = array("\"", "\\");
-                                $word = str_replace($search, $replace, $word);
-                                $word = substr($word, 1, -1);
-                            }
-                            // find length of last line
-                            if (($pos = strrpos($value, $eol)) !== false) {
-                                $last_len = strlen($value) - $pos;
-                            } else {
-                                $last_len = strlen($value);
-                            }
-                            $word = Mail_mimePart::encodeHeaderValue(
-                                $word, $charset, $encoding, $last_len, $eol
-                            );
-                        } else if (($word[0] != '"' || $word[strlen($word)-1] != '"')
-                            && preg_match('/[\<\>\\\.\[\]@,;:"]/', $word)
-                        ) {
-                            // ASCII: quote string if needed
-                            $word = '"'.addcslashes($word, '\\"').'"';
-                        }
-                    }
-                    $value .= $word.' '.$address;
-                } else {
-                    // addr-spec not found, don't encode (?)
-                    $value .= $part;
-                }
-
-                // RFC2822 recommends 78 characters limit, use 76 from RFC2047
-                $value = wordwrap($value, 76, $eol . ' ');
-            }
-
-            // remove header name prefix (there could be EOL too)
-            $value = preg_replace(
-                '/^'.$name.':('.preg_quote($eol, '/').')* /', '', $value
-            );
-
-        } else {
-            // Unstructured header
-            // non-ASCII: require encoding
-            if (preg_match('#([\x80-\xFF]){1}#', $value)) {
-                if ($value[0] == '"' && $value[strlen($value)-1] == '"') {
-                    // de-quote quoted-string, encoding changes
-                    // string to atom
-                    $search = array("\\\"", "\\\\");
-                    $replace = array("\"", "\\");
-                    $value = str_replace($search, $replace, $value);
-                    $value = substr($value, 1, -1);
-                }
-                $value = Mail_mimePart::encodeHeaderValue(
-                    $value, $charset, $encoding, strlen($name) + 2, $eol
-                );
-            } else if (strlen($name.': '.$value) > 78) {
-                // ASCII: check if header line isn't too long and use folding
-                $value = preg_replace('/\r?\n[\s\t]*/', $eol . ' ', $value);
-                $tmp = wordwrap($name.': '.$value, 78, $eol . ' ');
-                $value = preg_replace('/^'.$name.':\s*/', '', $tmp);
-                // hard limit 998 (RFC2822)
-                $value = wordwrap($value, 998, $eol . ' ', true);
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Explode quoted string
-     *
-     * @param string $delimiter Delimiter expression string for preg_match()
-     * @param string $string    Input string
-     *
-     * @return array            String tokens array
-     * @access private
-     */
-    function _explodeQuotedString($delimiter, $string)
-    {
-        $result = array();
-        $strlen = strlen($string);
-
-        for ($q=$p=$i=0; $i < $strlen; $i++) {
-            if ($string[$i] == "\""
-                && (empty($string[$i-1]) || $string[$i-1] != "\\")
-            ) {
-                $q = $q ? false : true;
-            } else if (!$q && preg_match("/$delimiter/", $string[$i])) {
-                $result[] = substr($string, $p, $i - $p);
-                $p = $i + 1;
-            }
-        }
-
-        $result[] = substr($string, $p);
-        return $result;
-    }
-
-    /**
-     * Encodes a header value as per RFC2047
-     *
-     * @param string $value      The header data to encode
-     * @param string $charset    Character set name
-     * @param string $encoding   Encoding name (base64 or quoted-printable)
-     * @param int    $prefix_len Prefix length. Default: 0
-     * @param string $eol        End-of-line sequence. Default: "\r\n"
-     *
-     * @return string            Encoded header data
-     * @access public
-     * @since 1.6.1
-     */
-    function encodeHeaderValue($value, $charset, $encoding, $prefix_len=0, $eol="\r\n")
-    {
-        // #17311: Use multibyte aware method (requires mbstring extension)
-        if ($result = Mail_mimePart::encodeMB($value, $charset, $encoding, $prefix_len, $eol)) {
-            return $result;
-        }
-
-        // Generate the header using the specified params and dynamicly
-        // determine the maximum length of such strings.
-        // 75 is the value specified in the RFC.
-        $encoding = $encoding == 'base64' ? 'B' : 'Q';
-        $prefix = '=?' . $charset . '?' . $encoding .'?';
-        $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
-        $maxLength1stLine = $maxLength - $prefix_len;
-
-        if ($encoding == 'B') {
-            // Base64 encode the entire string
-            $value = base64_encode($value);
-
-            // We can cut base64 every 4 characters, so the real max
-            // we can get must be rounded down.
-            $maxLength = $maxLength - ($maxLength % 4);
-            $maxLength1stLine = $maxLength1stLine - ($maxLength1stLine % 4);
-
-            $cutpoint = $maxLength1stLine;
-            $output = '';
-
-            while ($value) {
-                // Split translated string at every $maxLength
-                $part = substr($value, 0, $cutpoint);
-                $value = substr($value, $cutpoint);
-                $cutpoint = $maxLength;
-                // RFC 2047 specifies that any split header should
-                // be seperated by a CRLF SPACE.
-                if ($output) {
-                    $output .= $eol . ' ';
-                }
-                $output .= $prefix . $part . $suffix;
-            }
-            $value = $output;
-        } else {
-            // quoted-printable encoding has been selected
-            $value = Mail_mimePart::encodeQP($value);
-
-            // This regexp will break QP-encoded text at every $maxLength
-            // but will not break any encoded letters.
-            $reg1st = "|(.{0,$maxLength1stLine}[^\=][^\=])|";
-            $reg2nd = "|(.{0,$maxLength}[^\=][^\=])|";
-
-            if (strlen($value) > $maxLength1stLine) {
-                // Begin with the regexp for the first line.
-                $reg = $reg1st;
-                $output = '';
-                while ($value) {
-                    // Split translated string at every $maxLength
-                    // But make sure not to break any translated chars.
-                    $found = preg_match($reg, $value, $matches);
-
-                    // After this first line, we need to use a different
-                    // regexp for the first line.
-                    $reg = $reg2nd;
-
-                    // Save the found part and encapsulate it in the
-                    // prefix & suffix. Then remove the part from the
-                    // $value_out variable.
-                    if ($found) {
-                        $part = $matches[0];
-                        $len = strlen($matches[0]);
-                        $value = substr($value, $len);
-                    } else {
-                        $part = $value;
-                        $value = '';
-                    }
-
-                    // RFC 2047 specifies that any split header should
-                    // be seperated by a CRLF SPACE
-                    if ($output) {
-                        $output .= $eol . ' ';
-                    }
-                    $output .= $prefix . $part . $suffix;
-                }
-                $value = $output;
-            } else {
-                $value = $prefix . $value . $suffix;
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Encodes the given string using quoted-printable
-     *
-     * @param string $str String to encode
-     *
-     * @return string     Encoded string
-     * @access public
-     * @since 1.6.0
-     */
-    function encodeQP($str)
-    {
-        // Bug #17226 RFC 2047 restricts some characters
-        // if the word is inside a phrase, permitted chars are only:
-        // ASCII letters, decimal digits, "!", "*", "+", "-", "/", "=", and "_"
-
-        // "=",  "_",  "?" must be encoded
-        $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
-        $str = preg_replace_callback(
-            $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $str
-        );
-
-        return str_replace(' ', '_', $str);
-    }
-
-    /**
-     * Encodes the given string using base64 or quoted-printable.
-     * This method makes sure that encoded-word represents an integral
-     * number of characters as per RFC2047.
-     *
-     * @param string $str        String to encode
-     * @param string $charset    Character set name
-     * @param string $encoding   Encoding name (base64 or quoted-printable)
-     * @param int    $prefix_len Prefix length. Default: 0
-     * @param string $eol        End-of-line sequence. Default: "\r\n"
-     *
-     * @return string     Encoded string
-     * @access public
-     * @since 1.8.0
-     */
-    function encodeMB($str, $charset, $encoding, $prefix_len=0, $eol="\r\n")
-    {
-        if (!function_exists('mb_substr') || !function_exists('mb_strlen')) {
-            return;
-        }
-
-        $encoding = $encoding == 'base64' ? 'B' : 'Q';
-        // 75 is the value specified in the RFC
-        $prefix = '=?' . $charset . '?'.$encoding.'?';
-        $suffix = '?=';
-        $maxLength = 75 - strlen($prefix . $suffix);
-
-        // A multi-octet character may not be split across adjacent encoded-words
-        // So, we'll loop over each character
-        // mb_stlen() with wrong charset will generate a warning here and return null
-        $length      = mb_strlen($str, $charset);
-        $result      = '';
-        $line_length = $prefix_len;
-
-        if ($encoding == 'B') {
-            // base64
-            $start = 0;
-            $prev  = '';
-
-            for ($i=1; $i<=$length; $i++) {
-                // See #17311
-                $chunk = mb_substr($str, $start, $i-$start, $charset);
-                $chunk = base64_encode($chunk);
-                $chunk_len = strlen($chunk);
-
-                if ($line_length + $chunk_len == $maxLength || $i == $length) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    $result .= $chunk;
-                    $line_length = 0;
-                    $start = $i;
-                } else if ($line_length + $chunk_len > $maxLength) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    if ($prev) {
-                        $result .= $prev;
-                    }
-                    $line_length = 0;
-                    $start = $i - 1;
-                } else {
-                    $prev = $chunk;
-                }
-            }
-        } else {
-            // quoted-printable
-            // see encodeQP()
-            $regexp = '/([\x22-\x29\x2C\x2E\x3A-\x40\x5B-\x60\x7B-\x7E\x80-\xFF])/';
-
-            for ($i=0; $i<=$length; $i++) {
-                $char = mb_substr($str, $i, 1, $charset);
-                // RFC recommends underline (instead of =20) in place of the space
-                // that's one of the reasons why we're not using iconv_mime_encode()
-                if ($char == ' ') {
-                    $char = '_';
-                    $char_len = 1;
-                } else {
-                    $char = preg_replace_callback(
-                        $regexp, array('Mail_mimePart', '_qpReplaceCallback'), $char
-                    );
-                    $char_len = strlen($char);
-                }
-
-                if ($line_length + $char_len > $maxLength) {
-                    if ($result) {
-                        $result .= "\n";
-                    }
-                    $line_length = 0;
-                }
-
-                $result      .= $char;
-                $line_length += $char_len;
-            }
-        }
-
-        if ($result) {
-            $result = $prefix
-                .str_replace("\n", $suffix.$eol.' '.$prefix, $result).$suffix;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Callback function to replace extended characters (\x80-xFF) with their
-     * ASCII values (RFC2047: quoted-printable)
-     *
-     * @param array $matches Preg_replace's matches array
-     *
-     * @return string        Encoded character string
-     * @access private
-     */
-    function _qpReplaceCallback($matches)
-    {
-        return sprintf('=%02X', ord($matches[1]));
-    }
-
-    /**
-     * Callback function to replace extended characters (\x80-xFF) with their
-     * ASCII values (RFC2231)
-     *
-     * @param array $matches Preg_replace's matches array
-     *
-     * @return string        Encoded character string
-     * @access private
-     */
-    function _encodeReplaceCallback($matches)
-    {
-        return sprintf('%%%02X', ord($matches[1]));
-    }
-
-} // End of class

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/IDNA2 Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/IDNA2.php Deleted

@@ -1,3402 +0,0 @@
-<?php
-
-// {{{ license
-
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4 foldmethod=marker: */
-//
-// +----------------------------------------------------------------------+
-// | This library is free software; you can redistribute it and/or modify |
-// | it under the terms of the GNU Lesser General Public License as       |
-// | published by the Free Software Foundation; either version 2.1 of the |
-// | License, or (at your option) any later version.                      |
-// |                                                                      |
-// | This library 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    |
-// | Lesser General Public License for more details.                      |
-// |                                                                      |
-// | You should have received a copy of the GNU Lesser General Public     |
-// | License along with this library; if not, write to the Free Software  |
-// | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 |
-// | USA.                                                                 |
-// +----------------------------------------------------------------------+
-//
-
-// }}}
-require_once 'Net/IDNA2/Exception.php';
-require_once 'Net/IDNA2/Exception/Nameprep.php';
-
-/**
- * Encode/decode Internationalized Domain Names.
- *
- * The class allows to convert internationalized domain names
- * (see RFC 3490 for details) as they can be used with various registries worldwide
- * to be translated between their original (localized) form and their encoded form
- * as it will be used in the DNS (Domain Name System).
- *
- * The class provides two public methods, encode() and decode(), which do exactly
- * what you would expect them to do. You are allowed to use complete domain names,
- * simple strings and complete email addresses as well. That means, that you might
- * use any of the following notations:
- *
- * - www.n�rgler.com
- * - xn--nrgler-wxa
- * - xn--brse-5qa.xn--knrz-1ra.info
- *
- * Unicode input might be given as either UTF-8 string, UCS-4 string or UCS-4
- * array. Unicode output is available in the same formats.
- * You can select your preferred format via {@link set_paramter()}.
- *
- * ACE input and output is always expected to be ASCII.
- *
- * @package Net
- * @author  Markus Nix <mnix@docuverse.de>
- * @author  Matthias Sommerfeld <mso@phlylabs.de>
- * @author  Stefan Neufeind <pear.neufeind@speedpartner.de>
- * @version $Id: IDNA2.php 305344 2010-11-14 23:52:42Z neufeind $
- */
-class Net_IDNA2
-{
-    // {{{ npdata
-    /**
-     * These Unicode codepoints are
-     * mapped to nothing, See RFC3454 for details
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_map_nothing = array(
-        0xAD,
-        0x34F,
-        0x1806,
-        0x180B,
-        0x180C,
-        0x180D,
-        0x200B,
-        0x200C,
-        0x200D,
-        0x2060,
-        0xFE00,
-        0xFE01,
-        0xFE02,
-        0xFE03,
-        0xFE04,
-        0xFE05,
-        0xFE06,
-        0xFE07,
-        0xFE08,
-        0xFE09,
-        0xFE0A,
-        0xFE0B,
-        0xFE0C,
-        0xFE0D,
-        0xFE0E,
-        0xFE0F,
-        0xFEFF
-    );
-
-    /**
-     * Prohibited codepints
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_general_prohibited = array(
-        0,
-        1,
-        2,
-        3,
-        4,
-        5,
-        6,
-        7,
-        8,
-        9,
-        0xA,
-        0xB,
-        0xC,
-        0xD,
-        0xE,
-        0xF,
-        0x10,
-        0x11,
-        0x12,
-        0x13,
-        0x14,
-        0x15,
-        0x16,
-        0x17,
-        0x18,
-        0x19,
-        0x1A,
-        0x1B,
-        0x1C,
-        0x1D,
-        0x1E,
-        0x1F,
-        0x20,
-        0x21,
-        0x22,
-        0x23,
-        0x24,
-        0x25,
-        0x26,
-        0x27,
-        0x28,
-        0x29,
-        0x2A,
-        0x2B,
-        0x2C,
-        0x2F,
-        0x3B,
-        0x3C,
-        0x3D,
-        0x3E,
-        0x3F,
-        0x40,
-        0x5B,
-        0x5C,
-        0x5D,
-        0x5E,
-        0x5F,
-        0x60,
-        0x7B,
-        0x7C,
-        0x7D,
-        0x7E,
-        0x7F,
-        0x3002
-    );
-
-    /**
-     * Codepints prohibited by Nameprep
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_prohibit = array(
-        0xA0,
-        0x1680,
-        0x2000,
-        0x2001,
-        0x2002,
-        0x2003,
-        0x2004,
-        0x2005,
-        0x2006,
-        0x2007,
-        0x2008,
-        0x2009,
-        0x200A,
-        0x200B,
-        0x202F,
-        0x205F,
-        0x3000,
-        0x6DD,
-        0x70F,
-        0x180E,
-        0x200C,
-        0x200D,
-        0x2028,
-        0x2029,
-        0xFEFF,
-        0xFFF9,
-        0xFFFA,
-        0xFFFB,
-        0xFFFC,
-        0xFFFE,
-        0xFFFF,
-        0x1FFFE,
-        0x1FFFF,
-        0x2FFFE,
-        0x2FFFF,
-        0x3FFFE,
-        0x3FFFF,
-        0x4FFFE,
-        0x4FFFF,
-        0x5FFFE,
-        0x5FFFF,
-        0x6FFFE,
-        0x6FFFF,
-        0x7FFFE,
-        0x7FFFF,
-        0x8FFFE,
-        0x8FFFF,
-        0x9FFFE,
-        0x9FFFF,
-        0xAFFFE,
-        0xAFFFF,
-        0xBFFFE,
-        0xBFFFF,
-        0xCFFFE,
-        0xCFFFF,
-        0xDFFFE,
-        0xDFFFF,
-        0xEFFFE,
-        0xEFFFF,
-        0xFFFFE,
-        0xFFFFF,
-        0x10FFFE,
-        0x10FFFF,
-        0xFFF9,
-        0xFFFA,
-        0xFFFB,
-        0xFFFC,
-        0xFFFD,
-        0x340,
-        0x341,
-        0x200E,
-        0x200F,
-        0x202A,
-        0x202B,
-        0x202C,
-        0x202D,
-        0x202E,
-        0x206A,
-        0x206B,
-        0x206C,
-        0x206D,
-        0x206E,
-        0x206F,
-        0xE0001
-    );
-
-    /**
-     * Codepoint ranges prohibited by nameprep
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_prohibit_ranges = array(
-        array(0x80,     0x9F    ),
-        array(0x2060,   0x206F  ),
-        array(0x1D173,  0x1D17A ),
-        array(0xE000,   0xF8FF  ),
-        array(0xF0000,  0xFFFFD ),
-        array(0x100000, 0x10FFFD),
-        array(0xFDD0,   0xFDEF  ),
-        array(0xD800,   0xDFFF  ),
-        array(0x2FF0,   0x2FFB  ),
-        array(0xE0020,  0xE007F )
-    );
-
-    /**
-     * Replacement mappings (casemapping, replacement sequences, ...)
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_replacemaps = array(
-        0x41    => array(0x61),
-        0x42    => array(0x62),
-        0x43    => array(0x63),
-        0x44    => array(0x64),
-        0x45    => array(0x65),
-        0x46    => array(0x66),
-        0x47    => array(0x67),
-        0x48    => array(0x68),
-        0x49    => array(0x69),
-        0x4A    => array(0x6A),
-        0x4B    => array(0x6B),
-        0x4C    => array(0x6C),
-        0x4D    => array(0x6D),
-        0x4E    => array(0x6E),
-        0x4F    => array(0x6F),
-        0x50    => array(0x70),
-        0x51    => array(0x71),
-        0x52    => array(0x72),
-        0x53    => array(0x73),
-        0x54    => array(0x74),
-        0x55    => array(0x75),
-        0x56    => array(0x76),
-        0x57    => array(0x77),
-        0x58    => array(0x78),
-        0x59    => array(0x79),
-        0x5A    => array(0x7A),
-        0xB5    => array(0x3BC),
-        0xC0    => array(0xE0),
-        0xC1    => array(0xE1),
-        0xC2    => array(0xE2),
-        0xC3    => array(0xE3),
-        0xC4    => array(0xE4),
-        0xC5    => array(0xE5),
-        0xC6    => array(0xE6),
-        0xC7    => array(0xE7),
-        0xC8    => array(0xE8),
-        0xC9    => array(0xE9),
-        0xCA    => array(0xEA),
-        0xCB    => array(0xEB),
-        0xCC    => array(0xEC),
-        0xCD    => array(0xED),
-        0xCE    => array(0xEE),
-        0xCF    => array(0xEF),
-        0xD0    => array(0xF0),
-        0xD1    => array(0xF1),
-        0xD2    => array(0xF2),
-        0xD3    => array(0xF3),
-        0xD4    => array(0xF4),
-        0xD5    => array(0xF5),
-        0xD6    => array(0xF6),
-        0xD8    => array(0xF8),
-        0xD9    => array(0xF9),
-        0xDA    => array(0xFA),
-        0xDB    => array(0xFB),
-        0xDC    => array(0xFC),
-        0xDD    => array(0xFD),
-        0xDE    => array(0xFE),
-        0xDF    => array(0x73, 0x73),
-        0x100   => array(0x101),
-        0x102   => array(0x103),
-        0x104   => array(0x105),
-        0x106   => array(0x107),
-        0x108   => array(0x109),
-        0x10A   => array(0x10B),
-        0x10C   => array(0x10D),
-        0x10E   => array(0x10F),
-        0x110   => array(0x111),
-        0x112   => array(0x113),
-        0x114   => array(0x115),
-        0x116   => array(0x117),
-        0x118   => array(0x119),
-        0x11A   => array(0x11B),
-        0x11C   => array(0x11D),
-        0x11E   => array(0x11F),
-        0x120   => array(0x121),
-        0x122   => array(0x123),
-        0x124   => array(0x125),
-        0x126   => array(0x127),
-        0x128   => array(0x129),
-        0x12A   => array(0x12B),
-        0x12C   => array(0x12D),
-        0x12E   => array(0x12F),
-        0x130   => array(0x69, 0x307),
-        0x132   => array(0x133),
-        0x134   => array(0x135),
-        0x136   => array(0x137),
-        0x139   => array(0x13A),
-        0x13B   => array(0x13C),
-        0x13D   => array(0x13E),
-        0x13F   => array(0x140),
-        0x141   => array(0x142),
-        0x143   => array(0x144),
-        0x145   => array(0x146),
-        0x147   => array(0x148),
-        0x149   => array(0x2BC, 0x6E),
-        0x14A   => array(0x14B),
-        0x14C   => array(0x14D),
-        0x14E   => array(0x14F),
-        0x150   => array(0x151),
-        0x152   => array(0x153),
-        0x154   => array(0x155),
-        0x156   => array(0x157),
-        0x158   => array(0x159),
-        0x15A   => array(0x15B),
-        0x15C   => array(0x15D),
-        0x15E   => array(0x15F),
-        0x160   => array(0x161),
-        0x162   => array(0x163),
-        0x164   => array(0x165),
-        0x166   => array(0x167),
-        0x168   => array(0x169),
-        0x16A   => array(0x16B),
-        0x16C   => array(0x16D),
-        0x16E   => array(0x16F),
-        0x170   => array(0x171),
-        0x172   => array(0x173),
-        0x174   => array(0x175),
-        0x176   => array(0x177),
-        0x178   => array(0xFF),
-        0x179   => array(0x17A),
-        0x17B   => array(0x17C),
-        0x17D   => array(0x17E),
-        0x17F   => array(0x73),
-        0x181   => array(0x253),
-        0x182   => array(0x183),
-        0x184   => array(0x185),
-        0x186   => array(0x254),
-        0x187   => array(0x188),
-        0x189   => array(0x256),
-        0x18A   => array(0x257),
-        0x18B   => array(0x18C),
-        0x18E   => array(0x1DD),
-        0x18F   => array(0x259),
-        0x190   => array(0x25B),
-        0x191   => array(0x192),
-        0x193   => array(0x260),
-        0x194   => array(0x263),
-        0x196   => array(0x269),
-        0x197   => array(0x268),
-        0x198   => array(0x199),
-        0x19C   => array(0x26F),
-        0x19D   => array(0x272),
-        0x19F   => array(0x275),
-        0x1A0   => array(0x1A1),
-        0x1A2   => array(0x1A3),
-        0x1A4   => array(0x1A5),
-        0x1A6   => array(0x280),
-        0x1A7   => array(0x1A8),
-        0x1A9   => array(0x283),
-        0x1AC   => array(0x1AD),
-        0x1AE   => array(0x288),
-        0x1AF   => array(0x1B0),
-        0x1B1   => array(0x28A),
-        0x1B2   => array(0x28B),
-        0x1B3   => array(0x1B4),
-        0x1B5   => array(0x1B6),
-        0x1B7   => array(0x292),
-        0x1B8   => array(0x1B9),
-        0x1BC   => array(0x1BD),
-        0x1C4   => array(0x1C6),
-        0x1C5   => array(0x1C6),
-        0x1C7   => array(0x1C9),
-        0x1C8   => array(0x1C9),
-        0x1CA   => array(0x1CC),
-        0x1CB   => array(0x1CC),
-        0x1CD   => array(0x1CE),
-        0x1CF   => array(0x1D0),
-        0x1D1   => array(0x1D2),
-        0x1D3   => array(0x1D4),
-        0x1D5   => array(0x1D6),
-        0x1D7   => array(0x1D8),
-        0x1D9   => array(0x1DA),
-        0x1DB   => array(0x1DC),
-        0x1DE   => array(0x1DF),
-        0x1E0   => array(0x1E1),
-        0x1E2   => array(0x1E3),
-        0x1E4   => array(0x1E5),
-        0x1E6   => array(0x1E7),
-        0x1E8   => array(0x1E9),
-        0x1EA   => array(0x1EB),
-        0x1EC   => array(0x1ED),
-        0x1EE   => array(0x1EF),
-        0x1F0   => array(0x6A, 0x30C),
-        0x1F1   => array(0x1F3),
-        0x1F2   => array(0x1F3),
-        0x1F4   => array(0x1F5),
-        0x1F6   => array(0x195),
-        0x1F7   => array(0x1BF),
-        0x1F8   => array(0x1F9),
-        0x1FA   => array(0x1FB),
-        0x1FC   => array(0x1FD),
-        0x1FE   => array(0x1FF),
-        0x200   => array(0x201),
-        0x202   => array(0x203),
-        0x204   => array(0x205),
-        0x206   => array(0x207),
-        0x208   => array(0x209),
-        0x20A   => array(0x20B),
-        0x20C   => array(0x20D),
-        0x20E   => array(0x20F),
-        0x210   => array(0x211),
-        0x212   => array(0x213),
-        0x214   => array(0x215),
-        0x216   => array(0x217),
-        0x218   => array(0x219),
-        0x21A   => array(0x21B),
-        0x21C   => array(0x21D),
-        0x21E   => array(0x21F),
-        0x220   => array(0x19E),
-        0x222   => array(0x223),
-        0x224   => array(0x225),
-        0x226   => array(0x227),
-        0x228   => array(0x229),
-        0x22A   => array(0x22B),
-        0x22C   => array(0x22D),
-        0x22E   => array(0x22F),
-        0x230   => array(0x231),
-        0x232   => array(0x233),
-        0x345   => array(0x3B9),
-        0x37A   => array(0x20, 0x3B9),
-        0x386   => array(0x3AC),
-        0x388   => array(0x3AD),
-        0x389   => array(0x3AE),
-        0x38A   => array(0x3AF),
-        0x38C   => array(0x3CC),
-        0x38E   => array(0x3CD),
-        0x38F   => array(0x3CE),
-        0x390   => array(0x3B9, 0x308, 0x301),
-        0x391   => array(0x3B1),
-        0x392   => array(0x3B2),
-        0x393   => array(0x3B3),
-        0x394   => array(0x3B4),
-        0x395   => array(0x3B5),
-        0x396   => array(0x3B6),
-        0x397   => array(0x3B7),
-        0x398   => array(0x3B8),
-        0x399   => array(0x3B9),
-        0x39A   => array(0x3BA),
-        0x39B   => array(0x3BB),
-        0x39C   => array(0x3BC),
-        0x39D   => array(0x3BD),
-        0x39E   => array(0x3BE),
-        0x39F   => array(0x3BF),
-        0x3A0   => array(0x3C0),
-        0x3A1   => array(0x3C1),
-        0x3A3   => array(0x3C3),
-        0x3A4   => array(0x3C4),
-        0x3A5   => array(0x3C5),
-        0x3A6   => array(0x3C6),
-        0x3A7   => array(0x3C7),
-        0x3A8   => array(0x3C8),
-        0x3A9   => array(0x3C9),
-        0x3AA   => array(0x3CA),
-        0x3AB   => array(0x3CB),
-        0x3B0   => array(0x3C5, 0x308, 0x301),
-        0x3C2   => array(0x3C3),
-        0x3D0   => array(0x3B2),
-        0x3D1   => array(0x3B8),
-        0x3D2   => array(0x3C5),
-        0x3D3   => array(0x3CD),
-        0x3D4   => array(0x3CB),
-        0x3D5   => array(0x3C6),
-        0x3D6   => array(0x3C0),
-        0x3D8   => array(0x3D9),
-        0x3DA   => array(0x3DB),
-        0x3DC   => array(0x3DD),
-        0x3DE   => array(0x3DF),
-        0x3E0   => array(0x3E1),
-        0x3E2   => array(0x3E3),
-        0x3E4   => array(0x3E5),
-        0x3E6   => array(0x3E7),
-        0x3E8   => array(0x3E9),
-        0x3EA   => array(0x3EB),
-        0x3EC   => array(0x3ED),
-        0x3EE   => array(0x3EF),
-        0x3F0   => array(0x3BA),
-        0x3F1   => array(0x3C1),
-        0x3F2   => array(0x3C3),
-        0x3F4   => array(0x3B8),
-        0x3F5   => array(0x3B5),
-        0x400   => array(0x450),
-        0x401   => array(0x451),
-        0x402   => array(0x452),
-        0x403   => array(0x453),
-        0x404   => array(0x454),
-        0x405   => array(0x455),
-        0x406   => array(0x456),
-        0x407   => array(0x457),
-        0x408   => array(0x458),
-        0x409   => array(0x459),
-        0x40A   => array(0x45A),
-        0x40B   => array(0x45B),
-        0x40C   => array(0x45C),
-        0x40D   => array(0x45D),
-        0x40E   => array(0x45E),
-        0x40F   => array(0x45F),
-        0x410   => array(0x430),
-        0x411   => array(0x431),
-        0x412   => array(0x432),
-        0x413   => array(0x433),
-        0x414   => array(0x434),
-        0x415   => array(0x435),
-        0x416   => array(0x436),
-        0x417   => array(0x437),
-        0x418   => array(0x438),
-        0x419   => array(0x439),
-        0x41A   => array(0x43A),
-        0x41B   => array(0x43B),
-        0x41C   => array(0x43C),
-        0x41D   => array(0x43D),
-        0x41E   => array(0x43E),
-        0x41F   => array(0x43F),
-        0x420   => array(0x440),
-        0x421   => array(0x441),
-        0x422   => array(0x442),
-        0x423   => array(0x443),
-        0x424   => array(0x444),
-        0x425   => array(0x445),
-        0x426   => array(0x446),
-        0x427   => array(0x447),
-        0x428   => array(0x448),
-        0x429   => array(0x449),
-        0x42A   => array(0x44A),
-        0x42B   => array(0x44B),
-        0x42C   => array(0x44C),
-        0x42D   => array(0x44D),
-        0x42E   => array(0x44E),
-        0x42F   => array(0x44F),
-        0x460   => array(0x461),
-        0x462   => array(0x463),
-        0x464   => array(0x465),
-        0x466   => array(0x467),
-        0x468   => array(0x469),
-        0x46A   => array(0x46B),
-        0x46C   => array(0x46D),
-        0x46E   => array(0x46F),
-        0x470   => array(0x471),
-        0x472   => array(0x473),
-        0x474   => array(0x475),
-        0x476   => array(0x477),
-        0x478   => array(0x479),
-        0x47A   => array(0x47B),
-        0x47C   => array(0x47D),
-        0x47E   => array(0x47F),
-        0x480   => array(0x481),
-        0x48A   => array(0x48B),
-        0x48C   => array(0x48D),
-        0x48E   => array(0x48F),
-        0x490   => array(0x491),
-        0x492   => array(0x493),
-        0x494   => array(0x495),
-        0x496   => array(0x497),
-        0x498   => array(0x499),
-        0x49A   => array(0x49B),
-        0x49C   => array(0x49D),
-        0x49E   => array(0x49F),
-        0x4A0   => array(0x4A1),
-        0x4A2   => array(0x4A3),
-        0x4A4   => array(0x4A5),
-        0x4A6   => array(0x4A7),
-        0x4A8   => array(0x4A9),
-        0x4AA   => array(0x4AB),
-        0x4AC   => array(0x4AD),
-        0x4AE   => array(0x4AF),
-        0x4B0   => array(0x4B1),
-        0x4B2   => array(0x4B3),
-        0x4B4   => array(0x4B5),
-        0x4B6   => array(0x4B7),
-        0x4B8   => array(0x4B9),
-        0x4BA   => array(0x4BB),
-        0x4BC   => array(0x4BD),
-        0x4BE   => array(0x4BF),
-        0x4C1   => array(0x4C2),
-        0x4C3   => array(0x4C4),
-        0x4C5   => array(0x4C6),
-        0x4C7   => array(0x4C8),
-        0x4C9   => array(0x4CA),
-        0x4CB   => array(0x4CC),
-        0x4CD   => array(0x4CE),
-        0x4D0   => array(0x4D1),
-        0x4D2   => array(0x4D3),
-        0x4D4   => array(0x4D5),
-        0x4D6   => array(0x4D7),
-        0x4D8   => array(0x4D9),
-        0x4DA   => array(0x4DB),
-        0x4DC   => array(0x4DD),
-        0x4DE   => array(0x4DF),
-        0x4E0   => array(0x4E1),
-        0x4E2   => array(0x4E3),
-        0x4E4   => array(0x4E5),
-        0x4E6   => array(0x4E7),
-        0x4E8   => array(0x4E9),
-        0x4EA   => array(0x4EB),
-        0x4EC   => array(0x4ED),
-        0x4EE   => array(0x4EF),
-        0x4F0   => array(0x4F1),
-        0x4F2   => array(0x4F3),
-        0x4F4   => array(0x4F5),
-        0x4F8   => array(0x4F9),
-        0x500   => array(0x501),
-        0x502   => array(0x503),
-        0x504   => array(0x505),
-        0x506   => array(0x507),
-        0x508   => array(0x509),
-        0x50A   => array(0x50B),
-        0x50C   => array(0x50D),
-        0x50E   => array(0x50F),
-        0x531   => array(0x561),
-        0x532   => array(0x562),
-        0x533   => array(0x563),
-        0x534   => array(0x564),
-        0x535   => array(0x565),
-        0x536   => array(0x566),
-        0x537   => array(0x567),
-        0x538   => array(0x568),
-        0x539   => array(0x569),
-        0x53A   => array(0x56A),
-        0x53B   => array(0x56B),
-        0x53C   => array(0x56C),
-        0x53D   => array(0x56D),
-        0x53E   => array(0x56E),
-        0x53F   => array(0x56F),
-        0x540   => array(0x570),
-        0x541   => array(0x571),
-        0x542   => array(0x572),
-        0x543   => array(0x573),
-        0x544   => array(0x574),
-        0x545   => array(0x575),
-        0x546   => array(0x576),
-        0x547   => array(0x577),
-        0x548   => array(0x578),
-        0x549   => array(0x579),
-        0x54A   => array(0x57A),
-        0x54B   => array(0x57B),
-        0x54C   => array(0x57C),
-        0x54D   => array(0x57D),
-        0x54E   => array(0x57E),
-        0x54F   => array(0x57F),
-        0x550   => array(0x580),
-        0x551   => array(0x581),
-        0x552   => array(0x582),
-        0x553   => array(0x583),
-        0x554   => array(0x584),
-        0x555   => array(0x585),
-        0x556   => array(0x586),
-        0x587   => array(0x565, 0x582),
-        0x1E00  => array(0x1E01),
-        0x1E02  => array(0x1E03),
-        0x1E04  => array(0x1E05),
-        0x1E06  => array(0x1E07),
-        0x1E08  => array(0x1E09),
-        0x1E0A  => array(0x1E0B),
-        0x1E0C  => array(0x1E0D),
-        0x1E0E  => array(0x1E0F),
-        0x1E10  => array(0x1E11),
-        0x1E12  => array(0x1E13),
-        0x1E14  => array(0x1E15),
-        0x1E16  => array(0x1E17),
-        0x1E18  => array(0x1E19),
-        0x1E1A  => array(0x1E1B),
-        0x1E1C  => array(0x1E1D),
-        0x1E1E  => array(0x1E1F),
-        0x1E20  => array(0x1E21),
-        0x1E22  => array(0x1E23),
-        0x1E24  => array(0x1E25),
-        0x1E26  => array(0x1E27),
-        0x1E28  => array(0x1E29),
-        0x1E2A  => array(0x1E2B),
-        0x1E2C  => array(0x1E2D),
-        0x1E2E  => array(0x1E2F),
-        0x1E30  => array(0x1E31),
-        0x1E32  => array(0x1E33),
-        0x1E34  => array(0x1E35),
-        0x1E36  => array(0x1E37),
-        0x1E38  => array(0x1E39),
-        0x1E3A  => array(0x1E3B),
-        0x1E3C  => array(0x1E3D),
-        0x1E3E  => array(0x1E3F),
-        0x1E40  => array(0x1E41),
-        0x1E42  => array(0x1E43),
-        0x1E44  => array(0x1E45),
-        0x1E46  => array(0x1E47),
-        0x1E48  => array(0x1E49),
-        0x1E4A  => array(0x1E4B),
-        0x1E4C  => array(0x1E4D),
-        0x1E4E  => array(0x1E4F),
-        0x1E50  => array(0x1E51),
-        0x1E52  => array(0x1E53),
-        0x1E54  => array(0x1E55),
-        0x1E56  => array(0x1E57),
-        0x1E58  => array(0x1E59),
-        0x1E5A  => array(0x1E5B),
-        0x1E5C  => array(0x1E5D),
-        0x1E5E  => array(0x1E5F),
-        0x1E60  => array(0x1E61),
-        0x1E62  => array(0x1E63),
-        0x1E64  => array(0x1E65),
-        0x1E66  => array(0x1E67),
-        0x1E68  => array(0x1E69),
-        0x1E6A  => array(0x1E6B),
-        0x1E6C  => array(0x1E6D),
-        0x1E6E  => array(0x1E6F),
-        0x1E70  => array(0x1E71),
-        0x1E72  => array(0x1E73),
-        0x1E74  => array(0x1E75),
-        0x1E76  => array(0x1E77),
-        0x1E78  => array(0x1E79),
-        0x1E7A  => array(0x1E7B),
-        0x1E7C  => array(0x1E7D),
-        0x1E7E  => array(0x1E7F),
-        0x1E80  => array(0x1E81),
-        0x1E82  => array(0x1E83),
-        0x1E84  => array(0x1E85),
-        0x1E86  => array(0x1E87),
-        0x1E88  => array(0x1E89),
-        0x1E8A  => array(0x1E8B),
-        0x1E8C  => array(0x1E8D),
-        0x1E8E  => array(0x1E8F),
-        0x1E90  => array(0x1E91),
-        0x1E92  => array(0x1E93),
-        0x1E94  => array(0x1E95),
-        0x1E96  => array(0x68, 0x331),
-        0x1E97  => array(0x74, 0x308),
-        0x1E98  => array(0x77, 0x30A),
-        0x1E99  => array(0x79, 0x30A),
-        0x1E9A  => array(0x61, 0x2BE),
-        0x1E9B  => array(0x1E61),
-        0x1EA0  => array(0x1EA1),
-        0x1EA2  => array(0x1EA3),
-        0x1EA4  => array(0x1EA5),
-        0x1EA6  => array(0x1EA7),
-        0x1EA8  => array(0x1EA9),
-        0x1EAA  => array(0x1EAB),
-        0x1EAC  => array(0x1EAD),
-        0x1EAE  => array(0x1EAF),
-        0x1EB0  => array(0x1EB1),
-        0x1EB2  => array(0x1EB3),
-        0x1EB4  => array(0x1EB5),
-        0x1EB6  => array(0x1EB7),
-        0x1EB8  => array(0x1EB9),
-        0x1EBA  => array(0x1EBB),
-        0x1EBC  => array(0x1EBD),
-        0x1EBE  => array(0x1EBF),
-        0x1EC0  => array(0x1EC1),
-        0x1EC2  => array(0x1EC3),
-        0x1EC4  => array(0x1EC5),
-        0x1EC6  => array(0x1EC7),
-        0x1EC8  => array(0x1EC9),
-        0x1ECA  => array(0x1ECB),
-        0x1ECC  => array(0x1ECD),
-        0x1ECE  => array(0x1ECF),
-        0x1ED0  => array(0x1ED1),
-        0x1ED2  => array(0x1ED3),
-        0x1ED4  => array(0x1ED5),
-        0x1ED6  => array(0x1ED7),
-        0x1ED8  => array(0x1ED9),
-        0x1EDA  => array(0x1EDB),
-        0x1EDC  => array(0x1EDD),
-        0x1EDE  => array(0x1EDF),
-        0x1EE0  => array(0x1EE1),
-        0x1EE2  => array(0x1EE3),
-        0x1EE4  => array(0x1EE5),
-        0x1EE6  => array(0x1EE7),
-        0x1EE8  => array(0x1EE9),
-        0x1EEA  => array(0x1EEB),
-        0x1EEC  => array(0x1EED),
-        0x1EEE  => array(0x1EEF),
-        0x1EF0  => array(0x1EF1),
-        0x1EF2  => array(0x1EF3),
-        0x1EF4  => array(0x1EF5),
-        0x1EF6  => array(0x1EF7),
-        0x1EF8  => array(0x1EF9),
-        0x1F08  => array(0x1F00),
-        0x1F09  => array(0x1F01),
-        0x1F0A  => array(0x1F02),
-        0x1F0B  => array(0x1F03),
-        0x1F0C  => array(0x1F04),
-        0x1F0D  => array(0x1F05),
-        0x1F0E  => array(0x1F06),
-        0x1F0F  => array(0x1F07),
-        0x1F18  => array(0x1F10),
-        0x1F19  => array(0x1F11),
-        0x1F1A  => array(0x1F12),
-        0x1F1B  => array(0x1F13),
-        0x1F1C  => array(0x1F14),
-        0x1F1D  => array(0x1F15),
-        0x1F28  => array(0x1F20),
-        0x1F29  => array(0x1F21),
-        0x1F2A  => array(0x1F22),
-        0x1F2B  => array(0x1F23),
-        0x1F2C  => array(0x1F24),
-        0x1F2D  => array(0x1F25),
-        0x1F2E  => array(0x1F26),
-        0x1F2F  => array(0x1F27),
-        0x1F38  => array(0x1F30),
-        0x1F39  => array(0x1F31),
-        0x1F3A  => array(0x1F32),
-        0x1F3B  => array(0x1F33),
-        0x1F3C  => array(0x1F34),
-        0x1F3D  => array(0x1F35),
-        0x1F3E  => array(0x1F36),
-        0x1F3F  => array(0x1F37),
-        0x1F48  => array(0x1F40),
-        0x1F49  => array(0x1F41),
-        0x1F4A  => array(0x1F42),
-        0x1F4B  => array(0x1F43),
-        0x1F4C  => array(0x1F44),
-        0x1F4D  => array(0x1F45),
-        0x1F50  => array(0x3C5, 0x313),
-        0x1F52  => array(0x3C5, 0x313, 0x300),
-        0x1F54  => array(0x3C5, 0x313, 0x301),
-        0x1F56  => array(0x3C5, 0x313, 0x342),
-        0x1F59  => array(0x1F51),
-        0x1F5B  => array(0x1F53),
-        0x1F5D  => array(0x1F55),
-        0x1F5F  => array(0x1F57),
-        0x1F68  => array(0x1F60),
-        0x1F69  => array(0x1F61),
-        0x1F6A  => array(0x1F62),
-        0x1F6B  => array(0x1F63),
-        0x1F6C  => array(0x1F64),
-        0x1F6D  => array(0x1F65),
-        0x1F6E  => array(0x1F66),
-        0x1F6F  => array(0x1F67),
-        0x1F80  => array(0x1F00, 0x3B9),
-        0x1F81  => array(0x1F01, 0x3B9),
-        0x1F82  => array(0x1F02, 0x3B9),
-        0x1F83  => array(0x1F03, 0x3B9),
-        0x1F84  => array(0x1F04, 0x3B9),
-        0x1F85  => array(0x1F05, 0x3B9),
-        0x1F86  => array(0x1F06, 0x3B9),
-        0x1F87  => array(0x1F07, 0x3B9),
-        0x1F88  => array(0x1F00, 0x3B9),
-        0x1F89  => array(0x1F01, 0x3B9),
-        0x1F8A  => array(0x1F02, 0x3B9),
-        0x1F8B  => array(0x1F03, 0x3B9),
-        0x1F8C  => array(0x1F04, 0x3B9),
-        0x1F8D  => array(0x1F05, 0x3B9),
-        0x1F8E  => array(0x1F06, 0x3B9),
-        0x1F8F  => array(0x1F07, 0x3B9),
-        0x1F90  => array(0x1F20, 0x3B9),
-        0x1F91  => array(0x1F21, 0x3B9),
-        0x1F92  => array(0x1F22, 0x3B9),
-        0x1F93  => array(0x1F23, 0x3B9),
-        0x1F94  => array(0x1F24, 0x3B9),
-        0x1F95  => array(0x1F25, 0x3B9),
-        0x1F96  => array(0x1F26, 0x3B9),
-        0x1F97  => array(0x1F27, 0x3B9),
-        0x1F98  => array(0x1F20, 0x3B9),
-        0x1F99  => array(0x1F21, 0x3B9),
-        0x1F9A  => array(0x1F22, 0x3B9),
-        0x1F9B  => array(0x1F23, 0x3B9),
-        0x1F9C  => array(0x1F24, 0x3B9),
-        0x1F9D  => array(0x1F25, 0x3B9),
-        0x1F9E  => array(0x1F26, 0x3B9),
-        0x1F9F  => array(0x1F27, 0x3B9),
-        0x1FA0  => array(0x1F60, 0x3B9),
-        0x1FA1  => array(0x1F61, 0x3B9),
-        0x1FA2  => array(0x1F62, 0x3B9),
-        0x1FA3  => array(0x1F63, 0x3B9),
-        0x1FA4  => array(0x1F64, 0x3B9),
-        0x1FA5  => array(0x1F65, 0x3B9),
-        0x1FA6  => array(0x1F66, 0x3B9),
-        0x1FA7  => array(0x1F67, 0x3B9),
-        0x1FA8  => array(0x1F60, 0x3B9),
-        0x1FA9  => array(0x1F61, 0x3B9),
-        0x1FAA  => array(0x1F62, 0x3B9),
-        0x1FAB  => array(0x1F63, 0x3B9),
-        0x1FAC  => array(0x1F64, 0x3B9),
-        0x1FAD  => array(0x1F65, 0x3B9),
-        0x1FAE  => array(0x1F66, 0x3B9),
-        0x1FAF  => array(0x1F67, 0x3B9),
-        0x1FB2  => array(0x1F70, 0x3B9),
-        0x1FB3  => array(0x3B1, 0x3B9),
-        0x1FB4  => array(0x3AC, 0x3B9),
-        0x1FB6  => array(0x3B1, 0x342),
-        0x1FB7  => array(0x3B1, 0x342, 0x3B9),
-        0x1FB8  => array(0x1FB0),
-        0x1FB9  => array(0x1FB1),
-        0x1FBA  => array(0x1F70),
-        0x1FBB  => array(0x1F71),
-        0x1FBC  => array(0x3B1, 0x3B9),
-        0x1FBE  => array(0x3B9),
-        0x1FC2  => array(0x1F74, 0x3B9),
-        0x1FC3  => array(0x3B7, 0x3B9),
-        0x1FC4  => array(0x3AE, 0x3B9),
-        0x1FC6  => array(0x3B7, 0x342),
-        0x1FC7  => array(0x3B7, 0x342, 0x3B9),
-        0x1FC8  => array(0x1F72),
-        0x1FC9  => array(0x1F73),
-        0x1FCA  => array(0x1F74),
-        0x1FCB  => array(0x1F75),
-        0x1FCC  => array(0x3B7, 0x3B9),
-        0x1FD2  => array(0x3B9, 0x308, 0x300),
-        0x1FD3  => array(0x3B9, 0x308, 0x301),
-        0x1FD6  => array(0x3B9, 0x342),
-        0x1FD7  => array(0x3B9, 0x308, 0x342),
-        0x1FD8  => array(0x1FD0),
-        0x1FD9  => array(0x1FD1),
-        0x1FDA  => array(0x1F76),
-        0x1FDB  => array(0x1F77),
-        0x1FE2  => array(0x3C5, 0x308, 0x300),
-        0x1FE3  => array(0x3C5, 0x308, 0x301),
-        0x1FE4  => array(0x3C1, 0x313),
-        0x1FE6  => array(0x3C5, 0x342),
-        0x1FE7  => array(0x3C5, 0x308, 0x342),
-        0x1FE8  => array(0x1FE0),
-        0x1FE9  => array(0x1FE1),
-        0x1FEA  => array(0x1F7A),
-        0x1FEB  => array(0x1F7B),
-        0x1FEC  => array(0x1FE5),
-        0x1FF2  => array(0x1F7C, 0x3B9),
-        0x1FF3  => array(0x3C9, 0x3B9),
-        0x1FF4  => array(0x3CE, 0x3B9),
-        0x1FF6  => array(0x3C9, 0x342),
-        0x1FF7  => array(0x3C9, 0x342, 0x3B9),
-        0x1FF8  => array(0x1F78),
-        0x1FF9  => array(0x1F79),
-        0x1FFA  => array(0x1F7C),
-        0x1FFB  => array(0x1F7D),
-        0x1FFC  => array(0x3C9, 0x3B9),
-        0x20A8  => array(0x72, 0x73),
-        0x2102  => array(0x63),
-        0x2103  => array(0xB0, 0x63),
-        0x2107  => array(0x25B),
-        0x2109  => array(0xB0, 0x66),
-        0x210B  => array(0x68),
-        0x210C  => array(0x68),
-        0x210D  => array(0x68),
-        0x2110  => array(0x69),
-        0x2111  => array(0x69),
-        0x2112  => array(0x6C),
-        0x2115  => array(0x6E),
-        0x2116  => array(0x6E, 0x6F),
-        0x2119  => array(0x70),
-        0x211A  => array(0x71),
-        0x211B  => array(0x72),
-        0x211C  => array(0x72),
-        0x211D  => array(0x72),
-        0x2120  => array(0x73, 0x6D),
-        0x2121  => array(0x74, 0x65, 0x6C),
-        0x2122  => array(0x74, 0x6D),
-        0x2124  => array(0x7A),
-        0x2126  => array(0x3C9),
-        0x2128  => array(0x7A),
-        0x212A  => array(0x6B),
-        0x212B  => array(0xE5),
-        0x212C  => array(0x62),
-        0x212D  => array(0x63),
-        0x2130  => array(0x65),
-        0x2131  => array(0x66),
-        0x2133  => array(0x6D),
-        0x213E  => array(0x3B3),
-        0x213F  => array(0x3C0),
-        0x2145  => array(0x64),
-        0x2160  => array(0x2170),
-        0x2161  => array(0x2171),
-        0x2162  => array(0x2172),
-        0x2163  => array(0x2173),
-        0x2164  => array(0x2174),
-        0x2165  => array(0x2175),
-        0x2166  => array(0x2176),
-        0x2167  => array(0x2177),
-        0x2168  => array(0x2178),
-        0x2169  => array(0x2179),
-        0x216A  => array(0x217A),
-        0x216B  => array(0x217B),
-        0x216C  => array(0x217C),
-        0x216D  => array(0x217D),
-        0x216E  => array(0x217E),
-        0x216F  => array(0x217F),
-        0x24B6  => array(0x24D0),
-        0x24B7  => array(0x24D1),
-        0x24B8  => array(0x24D2),
-        0x24B9  => array(0x24D3),
-        0x24BA  => array(0x24D4),
-        0x24BB  => array(0x24D5),
-        0x24BC  => array(0x24D6),
-        0x24BD  => array(0x24D7),
-        0x24BE  => array(0x24D8),
-        0x24BF  => array(0x24D9),
-        0x24C0  => array(0x24DA),
-        0x24C1  => array(0x24DB),
-        0x24C2  => array(0x24DC),
-        0x24C3  => array(0x24DD),
-        0x24C4  => array(0x24DE),
-        0x24C5  => array(0x24DF),
-        0x24C6  => array(0x24E0),
-        0x24C7  => array(0x24E1),
-        0x24C8  => array(0x24E2),
-        0x24C9  => array(0x24E3),
-        0x24CA  => array(0x24E4),
-        0x24CB  => array(0x24E5),
-        0x24CC  => array(0x24E6),
-        0x24CD  => array(0x24E7),
-        0x24CE  => array(0x24E8),
-        0x24CF  => array(0x24E9),
-        0x3371  => array(0x68, 0x70, 0x61),
-        0x3373  => array(0x61, 0x75),
-        0x3375  => array(0x6F, 0x76),
-        0x3380  => array(0x70, 0x61),
-        0x3381  => array(0x6E, 0x61),
-        0x3382  => array(0x3BC, 0x61),
-        0x3383  => array(0x6D, 0x61),
-        0x3384  => array(0x6B, 0x61),
-        0x3385  => array(0x6B, 0x62),
-        0x3386  => array(0x6D, 0x62),
-        0x3387  => array(0x67, 0x62),
-        0x338A  => array(0x70, 0x66),
-        0x338B  => array(0x6E, 0x66),
-        0x338C  => array(0x3BC, 0x66),
-        0x3390  => array(0x68, 0x7A),
-        0x3391  => array(0x6B, 0x68, 0x7A),
-        0x3392  => array(0x6D, 0x68, 0x7A),
-        0x3393  => array(0x67, 0x68, 0x7A),
-        0x3394  => array(0x74, 0x68, 0x7A),
-        0x33A9  => array(0x70, 0x61),
-        0x33AA  => array(0x6B, 0x70, 0x61),
-        0x33AB  => array(0x6D, 0x70, 0x61),
-        0x33AC  => array(0x67, 0x70, 0x61),
-        0x33B4  => array(0x70, 0x76),
-        0x33B5  => array(0x6E, 0x76),
-        0x33B6  => array(0x3BC, 0x76),
-        0x33B7  => array(0x6D, 0x76),
-        0x33B8  => array(0x6B, 0x76),
-        0x33B9  => array(0x6D, 0x76),
-        0x33BA  => array(0x70, 0x77),
-        0x33BB  => array(0x6E, 0x77),
-        0x33BC  => array(0x3BC, 0x77),
-        0x33BD  => array(0x6D, 0x77),
-        0x33BE  => array(0x6B, 0x77),
-        0x33BF  => array(0x6D, 0x77),
-        0x33C0  => array(0x6B, 0x3C9),
-        0x33C1  => array(0x6D, 0x3C9),
-        /* 0x33C2  => array(0x61, 0x2E, 0x6D, 0x2E), */
-        0x33C3  => array(0x62, 0x71),
-        0x33C6  => array(0x63, 0x2215, 0x6B, 0x67),
-        0x33C7  => array(0x63, 0x6F, 0x2E),
-        0x33C8  => array(0x64, 0x62),
-        0x33C9  => array(0x67, 0x79),
-        0x33CB  => array(0x68, 0x70),
-        0x33CD  => array(0x6B, 0x6B),
-        0x33CE  => array(0x6B, 0x6D),
-        0x33D7  => array(0x70, 0x68),
-        0x33D9  => array(0x70, 0x70, 0x6D),
-        0x33DA  => array(0x70, 0x72),
-        0x33DC  => array(0x73, 0x76),
-        0x33DD  => array(0x77, 0x62),
-        0xFB00  => array(0x66, 0x66),
-        0xFB01  => array(0x66, 0x69),
-        0xFB02  => array(0x66, 0x6C),
-        0xFB03  => array(0x66, 0x66, 0x69),
-        0xFB04  => array(0x66, 0x66, 0x6C),
-        0xFB05  => array(0x73, 0x74),
-        0xFB06  => array(0x73, 0x74),
-        0xFB13  => array(0x574, 0x576),
-        0xFB14  => array(0x574, 0x565),
-        0xFB15  => array(0x574, 0x56B),
-        0xFB16  => array(0x57E, 0x576),
-        0xFB17  => array(0x574, 0x56D),
-        0xFF21  => array(0xFF41),
-        0xFF22  => array(0xFF42),
-        0xFF23  => array(0xFF43),
-        0xFF24  => array(0xFF44),
-        0xFF25  => array(0xFF45),
-        0xFF26  => array(0xFF46),
-        0xFF27  => array(0xFF47),
-        0xFF28  => array(0xFF48),
-        0xFF29  => array(0xFF49),
-        0xFF2A  => array(0xFF4A),
-        0xFF2B  => array(0xFF4B),
-        0xFF2C  => array(0xFF4C),
-        0xFF2D  => array(0xFF4D),
-        0xFF2E  => array(0xFF4E),
-        0xFF2F  => array(0xFF4F),
-        0xFF30  => array(0xFF50),
-        0xFF31  => array(0xFF51),
-        0xFF32  => array(0xFF52),
-        0xFF33  => array(0xFF53),
-        0xFF34  => array(0xFF54),
-        0xFF35  => array(0xFF55),
-        0xFF36  => array(0xFF56),
-        0xFF37  => array(0xFF57),
-        0xFF38  => array(0xFF58),
-        0xFF39  => array(0xFF59),
-        0xFF3A  => array(0xFF5A),
-        0x10400 => array(0x10428),
-        0x10401 => array(0x10429),
-        0x10402 => array(0x1042A),
-        0x10403 => array(0x1042B),
-        0x10404 => array(0x1042C),
-        0x10405 => array(0x1042D),
-        0x10406 => array(0x1042E),
-        0x10407 => array(0x1042F),
-        0x10408 => array(0x10430),
-        0x10409 => array(0x10431),
-        0x1040A => array(0x10432),
-        0x1040B => array(0x10433),
-        0x1040C => array(0x10434),
-        0x1040D => array(0x10435),
-        0x1040E => array(0x10436),
-        0x1040F => array(0x10437),
-        0x10410 => array(0x10438),
-        0x10411 => array(0x10439),
-        0x10412 => array(0x1043A),
-        0x10413 => array(0x1043B),
-        0x10414 => array(0x1043C),
-        0x10415 => array(0x1043D),
-        0x10416 => array(0x1043E),
-        0x10417 => array(0x1043F),
-        0x10418 => array(0x10440),
-        0x10419 => array(0x10441),
-        0x1041A => array(0x10442),
-        0x1041B => array(0x10443),
-        0x1041C => array(0x10444),
-        0x1041D => array(0x10445),
-        0x1041E => array(0x10446),
-        0x1041F => array(0x10447),
-        0x10420 => array(0x10448),
-        0x10421 => array(0x10449),
-        0x10422 => array(0x1044A),
-        0x10423 => array(0x1044B),
-        0x10424 => array(0x1044C),
-        0x10425 => array(0x1044D),
-        0x1D400 => array(0x61),
-        0x1D401 => array(0x62),
-        0x1D402 => array(0x63),
-        0x1D403 => array(0x64),
-        0x1D404 => array(0x65),
-        0x1D405 => array(0x66),
-        0x1D406 => array(0x67),
-        0x1D407 => array(0x68),
-        0x1D408 => array(0x69),
-        0x1D409 => array(0x6A),
-        0x1D40A => array(0x6B),
-        0x1D40B => array(0x6C),
-        0x1D40C => array(0x6D),
-        0x1D40D => array(0x6E),
-        0x1D40E => array(0x6F),
-        0x1D40F => array(0x70),
-        0x1D410 => array(0x71),
-        0x1D411 => array(0x72),
-        0x1D412 => array(0x73),
-        0x1D413 => array(0x74),
-        0x1D414 => array(0x75),
-        0x1D415 => array(0x76),
-        0x1D416 => array(0x77),
-        0x1D417 => array(0x78),
-        0x1D418 => array(0x79),
-        0x1D419 => array(0x7A),
-        0x1D434 => array(0x61),
-        0x1D435 => array(0x62),
-        0x1D436 => array(0x63),
-        0x1D437 => array(0x64),
-        0x1D438 => array(0x65),
-        0x1D439 => array(0x66),
-        0x1D43A => array(0x67),
-        0x1D43B => array(0x68),
-        0x1D43C => array(0x69),
-        0x1D43D => array(0x6A),
-        0x1D43E => array(0x6B),
-        0x1D43F => array(0x6C),
-        0x1D440 => array(0x6D),
-        0x1D441 => array(0x6E),
-        0x1D442 => array(0x6F),
-        0x1D443 => array(0x70),
-        0x1D444 => array(0x71),
-        0x1D445 => array(0x72),
-        0x1D446 => array(0x73),
-        0x1D447 => array(0x74),
-        0x1D448 => array(0x75),
-        0x1D449 => array(0x76),
-        0x1D44A => array(0x77),
-        0x1D44B => array(0x78),
-        0x1D44C => array(0x79),
-        0x1D44D => array(0x7A),
-        0x1D468 => array(0x61),
-        0x1D469 => array(0x62),
-        0x1D46A => array(0x63),
-        0x1D46B => array(0x64),
-        0x1D46C => array(0x65),
-        0x1D46D => array(0x66),
-        0x1D46E => array(0x67),
-        0x1D46F => array(0x68),
-        0x1D470 => array(0x69),
-        0x1D471 => array(0x6A),
-        0x1D472 => array(0x6B),
-        0x1D473 => array(0x6C),
-        0x1D474 => array(0x6D),
-        0x1D475 => array(0x6E),
-        0x1D476 => array(0x6F),
-        0x1D477 => array(0x70),
-        0x1D478 => array(0x71),
-        0x1D479 => array(0x72),
-        0x1D47A => array(0x73),
-        0x1D47B => array(0x74),
-        0x1D47C => array(0x75),
-        0x1D47D => array(0x76),
-        0x1D47E => array(0x77),
-        0x1D47F => array(0x78),
-        0x1D480 => array(0x79),
-        0x1D481 => array(0x7A),
-        0x1D49C => array(0x61),
-        0x1D49E => array(0x63),
-        0x1D49F => array(0x64),
-        0x1D4A2 => array(0x67),
-        0x1D4A5 => array(0x6A),
-        0x1D4A6 => array(0x6B),
-        0x1D4A9 => array(0x6E),
-        0x1D4AA => array(0x6F),
-        0x1D4AB => array(0x70),
-        0x1D4AC => array(0x71),
-        0x1D4AE => array(0x73),
-        0x1D4AF => array(0x74),
-        0x1D4B0 => array(0x75),
-        0x1D4B1 => array(0x76),
-        0x1D4B2 => array(0x77),
-        0x1D4B3 => array(0x78),
-        0x1D4B4 => array(0x79),
-        0x1D4B5 => array(0x7A),
-        0x1D4D0 => array(0x61),
-        0x1D4D1 => array(0x62),
-        0x1D4D2 => array(0x63),
-        0x1D4D3 => array(0x64),
-        0x1D4D4 => array(0x65),
-        0x1D4D5 => array(0x66),
-        0x1D4D6 => array(0x67),
-        0x1D4D7 => array(0x68),
-        0x1D4D8 => array(0x69),
-        0x1D4D9 => array(0x6A),
-        0x1D4DA => array(0x6B),
-        0x1D4DB => array(0x6C),
-        0x1D4DC => array(0x6D),
-        0x1D4DD => array(0x6E),
-        0x1D4DE => array(0x6F),
-        0x1D4DF => array(0x70),
-        0x1D4E0 => array(0x71),
-        0x1D4E1 => array(0x72),
-        0x1D4E2 => array(0x73),
-        0x1D4E3 => array(0x74),
-        0x1D4E4 => array(0x75),
-        0x1D4E5 => array(0x76),
-        0x1D4E6 => array(0x77),
-        0x1D4E7 => array(0x78),
-        0x1D4E8 => array(0x79),
-        0x1D4E9 => array(0x7A),
-        0x1D504 => array(0x61),
-        0x1D505 => array(0x62),
-        0x1D507 => array(0x64),
-        0x1D508 => array(0x65),
-        0x1D509 => array(0x66),
-        0x1D50A => array(0x67),
-        0x1D50D => array(0x6A),
-        0x1D50E => array(0x6B),
-        0x1D50F => array(0x6C),
-        0x1D510 => array(0x6D),
-        0x1D511 => array(0x6E),
-        0x1D512 => array(0x6F),
-        0x1D513 => array(0x70),
-        0x1D514 => array(0x71),
-        0x1D516 => array(0x73),
-        0x1D517 => array(0x74),
-        0x1D518 => array(0x75),
-        0x1D519 => array(0x76),
-        0x1D51A => array(0x77),
-        0x1D51B => array(0x78),
-        0x1D51C => array(0x79),
-        0x1D538 => array(0x61),
-        0x1D539 => array(0x62),
-        0x1D53B => array(0x64),
-        0x1D53C => array(0x65),
-        0x1D53D => array(0x66),
-        0x1D53E => array(0x67),
-        0x1D540 => array(0x69),
-        0x1D541 => array(0x6A),
-        0x1D542 => array(0x6B),
-        0x1D543 => array(0x6C),
-        0x1D544 => array(0x6D),
-        0x1D546 => array(0x6F),
-        0x1D54A => array(0x73),
-        0x1D54B => array(0x74),
-        0x1D54C => array(0x75),
-        0x1D54D => array(0x76),
-        0x1D54E => array(0x77),
-        0x1D54F => array(0x78),
-        0x1D550 => array(0x79),
-        0x1D56C => array(0x61),
-        0x1D56D => array(0x62),
-        0x1D56E => array(0x63),
-        0x1D56F => array(0x64),
-        0x1D570 => array(0x65),
-        0x1D571 => array(0x66),
-        0x1D572 => array(0x67),
-        0x1D573 => array(0x68),
-        0x1D574 => array(0x69),
-        0x1D575 => array(0x6A),
-        0x1D576 => array(0x6B),
-        0x1D577 => array(0x6C),
-        0x1D578 => array(0x6D),
-        0x1D579 => array(0x6E),
-        0x1D57A => array(0x6F),
-        0x1D57B => array(0x70),
-        0x1D57C => array(0x71),
-        0x1D57D => array(0x72),
-        0x1D57E => array(0x73),
-        0x1D57F => array(0x74),
-        0x1D580 => array(0x75),
-        0x1D581 => array(0x76),
-        0x1D582 => array(0x77),
-        0x1D583 => array(0x78),
-        0x1D584 => array(0x79),
-        0x1D585 => array(0x7A),
-        0x1D5A0 => array(0x61),
-        0x1D5A1 => array(0x62),
-        0x1D5A2 => array(0x63),
-        0x1D5A3 => array(0x64),
-        0x1D5A4 => array(0x65),
-        0x1D5A5 => array(0x66),
-        0x1D5A6 => array(0x67),
-        0x1D5A7 => array(0x68),
-        0x1D5A8 => array(0x69),
-        0x1D5A9 => array(0x6A),
-        0x1D5AA => array(0x6B),
-        0x1D5AB => array(0x6C),
-        0x1D5AC => array(0x6D),
-        0x1D5AD => array(0x6E),
-        0x1D5AE => array(0x6F),
-        0x1D5AF => array(0x70),
-        0x1D5B0 => array(0x71),
-        0x1D5B1 => array(0x72),
-        0x1D5B2 => array(0x73),
-        0x1D5B3 => array(0x74),
-        0x1D5B4 => array(0x75),
-        0x1D5B5 => array(0x76),
-        0x1D5B6 => array(0x77),
-        0x1D5B7 => array(0x78),
-        0x1D5B8 => array(0x79),
-        0x1D5B9 => array(0x7A),
-        0x1D5D4 => array(0x61),
-        0x1D5D5 => array(0x62),
-        0x1D5D6 => array(0x63),
-        0x1D5D7 => array(0x64),
-        0x1D5D8 => array(0x65),
-        0x1D5D9 => array(0x66),
-        0x1D5DA => array(0x67),
-        0x1D5DB => array(0x68),
-        0x1D5DC => array(0x69),
-        0x1D5DD => array(0x6A),
-        0x1D5DE => array(0x6B),
-        0x1D5DF => array(0x6C),
-        0x1D5E0 => array(0x6D),
-        0x1D5E1 => array(0x6E),
-        0x1D5E2 => array(0x6F),
-        0x1D5E3 => array(0x70),
-        0x1D5E4 => array(0x71),
-        0x1D5E5 => array(0x72),
-        0x1D5E6 => array(0x73),
-        0x1D5E7 => array(0x74),
-        0x1D5E8 => array(0x75),
-        0x1D5E9 => array(0x76),
-        0x1D5EA => array(0x77),
-        0x1D5EB => array(0x78),
-        0x1D5EC => array(0x79),
-        0x1D5ED => array(0x7A),
-        0x1D608 => array(0x61),
-        0x1D609 => array(0x62),
-        0x1D60A => array(0x63),
-        0x1D60B => array(0x64),
-        0x1D60C => array(0x65),
-        0x1D60D => array(0x66),
-        0x1D60E => array(0x67),
-        0x1D60F => array(0x68),
-        0x1D610 => array(0x69),
-        0x1D611 => array(0x6A),
-        0x1D612 => array(0x6B),
-        0x1D613 => array(0x6C),
-        0x1D614 => array(0x6D),
-        0x1D615 => array(0x6E),
-        0x1D616 => array(0x6F),
-        0x1D617 => array(0x70),
-        0x1D618 => array(0x71),
-        0x1D619 => array(0x72),
-        0x1D61A => array(0x73),
-        0x1D61B => array(0x74),
-        0x1D61C => array(0x75),
-        0x1D61D => array(0x76),
-        0x1D61E => array(0x77),
-        0x1D61F => array(0x78),
-        0x1D620 => array(0x79),
-        0x1D621 => array(0x7A),
-        0x1D63C => array(0x61),
-        0x1D63D => array(0x62),
-        0x1D63E => array(0x63),
-        0x1D63F => array(0x64),
-        0x1D640 => array(0x65),
-        0x1D641 => array(0x66),
-        0x1D642 => array(0x67),
-        0x1D643 => array(0x68),
-        0x1D644 => array(0x69),
-        0x1D645 => array(0x6A),
-        0x1D646 => array(0x6B),
-        0x1D647 => array(0x6C),
-        0x1D648 => array(0x6D),
-        0x1D649 => array(0x6E),
-        0x1D64A => array(0x6F),
-        0x1D64B => array(0x70),
-        0x1D64C => array(0x71),
-        0x1D64D => array(0x72),
-        0x1D64E => array(0x73),
-        0x1D64F => array(0x74),
-        0x1D650 => array(0x75),
-        0x1D651 => array(0x76),
-        0x1D652 => array(0x77),
-        0x1D653 => array(0x78),
-        0x1D654 => array(0x79),
-        0x1D655 => array(0x7A),
-        0x1D670 => array(0x61),
-        0x1D671 => array(0x62),
-        0x1D672 => array(0x63),
-        0x1D673 => array(0x64),
-        0x1D674 => array(0x65),
-        0x1D675 => array(0x66),
-        0x1D676 => array(0x67),
-        0x1D677 => array(0x68),
-        0x1D678 => array(0x69),
-        0x1D679 => array(0x6A),
-        0x1D67A => array(0x6B),
-        0x1D67B => array(0x6C),
-        0x1D67C => array(0x6D),
-        0x1D67D => array(0x6E),
-        0x1D67E => array(0x6F),
-        0x1D67F => array(0x70),
-        0x1D680 => array(0x71),
-        0x1D681 => array(0x72),
-        0x1D682 => array(0x73),
-        0x1D683 => array(0x74),
-        0x1D684 => array(0x75),
-        0x1D685 => array(0x76),
-        0x1D686 => array(0x77),
-        0x1D687 => array(0x78),
-        0x1D688 => array(0x79),
-        0x1D689 => array(0x7A),
-        0x1D6A8 => array(0x3B1),
-        0x1D6A9 => array(0x3B2),
-        0x1D6AA => array(0x3B3),
-        0x1D6AB => array(0x3B4),
-        0x1D6AC => array(0x3B5),
-        0x1D6AD => array(0x3B6),
-        0x1D6AE => array(0x3B7),
-        0x1D6AF => array(0x3B8),
-        0x1D6B0 => array(0x3B9),
-        0x1D6B1 => array(0x3BA),
-        0x1D6B2 => array(0x3BB),
-        0x1D6B3 => array(0x3BC),
-        0x1D6B4 => array(0x3BD),
-        0x1D6B5 => array(0x3BE),
-        0x1D6B6 => array(0x3BF),
-        0x1D6B7 => array(0x3C0),
-        0x1D6B8 => array(0x3C1),
-        0x1D6B9 => array(0x3B8),
-        0x1D6BA => array(0x3C3),
-        0x1D6BB => array(0x3C4),
-        0x1D6BC => array(0x3C5),
-        0x1D6BD => array(0x3C6),
-        0x1D6BE => array(0x3C7),
-        0x1D6BF => array(0x3C8),
-        0x1D6C0 => array(0x3C9),
-        0x1D6D3 => array(0x3C3),
-        0x1D6E2 => array(0x3B1),
-        0x1D6E3 => array(0x3B2),
-        0x1D6E4 => array(0x3B3),
-        0x1D6E5 => array(0x3B4),
-        0x1D6E6 => array(0x3B5),
-        0x1D6E7 => array(0x3B6),
-        0x1D6E8 => array(0x3B7),
-        0x1D6E9 => array(0x3B8),
-        0x1D6EA => array(0x3B9),
-        0x1D6EB => array(0x3BA),
-        0x1D6EC => array(0x3BB),
-        0x1D6ED => array(0x3BC),
-        0x1D6EE => array(0x3BD),
-        0x1D6EF => array(0x3BE),
-        0x1D6F0 => array(0x3BF),
-        0x1D6F1 => array(0x3C0),
-        0x1D6F2 => array(0x3C1),
-        0x1D6F3 => array(0x3B8),
-        0x1D6F4 => array(0x3C3),
-        0x1D6F5 => array(0x3C4),
-        0x1D6F6 => array(0x3C5),
-        0x1D6F7 => array(0x3C6),
-        0x1D6F8 => array(0x3C7),
-        0x1D6F9 => array(0x3C8),
-        0x1D6FA => array(0x3C9),
-        0x1D70D => array(0x3C3),
-        0x1D71C => array(0x3B1),
-        0x1D71D => array(0x3B2),
-        0x1D71E => array(0x3B3),
-        0x1D71F => array(0x3B4),
-        0x1D720 => array(0x3B5),
-        0x1D721 => array(0x3B6),
-        0x1D722 => array(0x3B7),
-        0x1D723 => array(0x3B8),
-        0x1D724 => array(0x3B9),
-        0x1D725 => array(0x3BA),
-        0x1D726 => array(0x3BB),
-        0x1D727 => array(0x3BC),
-        0x1D728 => array(0x3BD),
-        0x1D729 => array(0x3BE),
-        0x1D72A => array(0x3BF),
-        0x1D72B => array(0x3C0),
-        0x1D72C => array(0x3C1),
-        0x1D72D => array(0x3B8),
-        0x1D72E => array(0x3C3),
-        0x1D72F => array(0x3C4),
-        0x1D730 => array(0x3C5),
-        0x1D731 => array(0x3C6),
-        0x1D732 => array(0x3C7),
-        0x1D733 => array(0x3C8),
-        0x1D734 => array(0x3C9),
-        0x1D747 => array(0x3C3),
-        0x1D756 => array(0x3B1),
-        0x1D757 => array(0x3B2),
-        0x1D758 => array(0x3B3),
-        0x1D759 => array(0x3B4),
-        0x1D75A => array(0x3B5),
-        0x1D75B => array(0x3B6),
-        0x1D75C => array(0x3B7),
-        0x1D75D => array(0x3B8),
-        0x1D75E => array(0x3B9),
-        0x1D75F => array(0x3BA),
-        0x1D760 => array(0x3BB),
-        0x1D761 => array(0x3BC),
-        0x1D762 => array(0x3BD),
-        0x1D763 => array(0x3BE),
-        0x1D764 => array(0x3BF),
-        0x1D765 => array(0x3C0),
-        0x1D766 => array(0x3C1),
-        0x1D767 => array(0x3B8),
-        0x1D768 => array(0x3C3),
-        0x1D769 => array(0x3C4),
-        0x1D76A => array(0x3C5),
-        0x1D76B => array(0x3C6),
-        0x1D76C => array(0x3C7),
-        0x1D76D => array(0x3C8),
-        0x1D76E => array(0x3C9),
-        0x1D781 => array(0x3C3),
-        0x1D790 => array(0x3B1),
-        0x1D791 => array(0x3B2),
-        0x1D792 => array(0x3B3),
-        0x1D793 => array(0x3B4),
-        0x1D794 => array(0x3B5),
-        0x1D795 => array(0x3B6),
-        0x1D796 => array(0x3B7),
-        0x1D797 => array(0x3B8),
-        0x1D798 => array(0x3B9),
-        0x1D799 => array(0x3BA),
-        0x1D79A => array(0x3BB),
-        0x1D79B => array(0x3BC),
-        0x1D79C => array(0x3BD),
-        0x1D79D => array(0x3BE),
-        0x1D79E => array(0x3BF),
-        0x1D79F => array(0x3C0),
-        0x1D7A0 => array(0x3C1),
-        0x1D7A1 => array(0x3B8),
-        0x1D7A2 => array(0x3C3),
-        0x1D7A3 => array(0x3C4),
-        0x1D7A4 => array(0x3C5),
-        0x1D7A5 => array(0x3C6),
-        0x1D7A6 => array(0x3C7),
-        0x1D7A7 => array(0x3C8),
-        0x1D7A8 => array(0x3C9),
-        0x1D7BB => array(0x3C3),
-        0x3F9   => array(0x3C3),
-        0x1D2C  => array(0x61),
-        0x1D2D  => array(0xE6),
-        0x1D2E  => array(0x62),
-        0x1D30  => array(0x64),
-        0x1D31  => array(0x65),
-        0x1D32  => array(0x1DD),
-        0x1D33  => array(0x67),
-        0x1D34  => array(0x68),
-        0x1D35  => array(0x69),
-        0x1D36  => array(0x6A),
-        0x1D37  => array(0x6B),
-        0x1D38  => array(0x6C),
-        0x1D39  => array(0x6D),
-        0x1D3A  => array(0x6E),
-        0x1D3C  => array(0x6F),
-        0x1D3D  => array(0x223),
-        0x1D3E  => array(0x70),
-        0x1D3F  => array(0x72),
-        0x1D40  => array(0x74),
-        0x1D41  => array(0x75),
-        0x1D42  => array(0x77),
-        0x213B  => array(0x66, 0x61, 0x78),
-        0x3250  => array(0x70, 0x74, 0x65),
-        0x32CC  => array(0x68, 0x67),
-        0x32CE  => array(0x65, 0x76),
-        0x32CF  => array(0x6C, 0x74, 0x64),
-        0x337A  => array(0x69, 0x75),
-        0x33DE  => array(0x76, 0x2215, 0x6D),
-        0x33DF  => array(0x61, 0x2215, 0x6D)
-    );
-
-    /**
-     * Normalization Combining Classes; Code Points not listed
-     * got Combining Class 0.
-     *
-     * @static
-     * @var array
-     * @access private
-     */
-    private static $_np_norm_combcls = array(
-        0x334   => 1,
-        0x335   => 1,
-        0x336   => 1,
-        0x337   => 1,
-        0x338   => 1,
-        0x93C   => 7,
-        0x9BC   => 7,
-        0xA3C   => 7,
-        0xABC   => 7,
-        0xB3C   => 7,
-        0xCBC   => 7,
-        0x1037  => 7,
-        0x3099  => 8,
-        0x309A  => 8,
-        0x94D   => 9,
-        0x9CD   => 9,
-        0xA4D   => 9,
-        0xACD   => 9,
-        0xB4D   => 9,
-        0xBCD   => 9,
-        0xC4D   => 9,
-        0xCCD   => 9,
-        0xD4D   => 9,
-        0xDCA   => 9,
-        0xE3A   => 9,
-        0xF84   => 9,
-        0x1039  => 9,
-        0x1714  => 9,
-        0x1734  => 9,
-        0x17D2  => 9,
-        0x5B0   => 10,
-        0x5B1   => 11,
-        0x5B2   => 12,
-        0x5B3   => 13,
-        0x5B4   => 14,
-        0x5B5   => 15,
-        0x5B6   => 16,
-        0x5B7   => 17,
-        0x5B8   => 18,
-        0x5B9   => 19,
-        0x5BB   => 20,
-        0x5Bc   => 21,
-        0x5BD   => 22,
-        0x5BF   => 23,
-        0x5C1   => 24,
-        0x5C2   => 25,
-        0xFB1E  => 26,
-        0x64B   => 27,
-        0x64C   => 28,
-        0x64D   => 29,
-        0x64E   => 30,
-        0x64F   => 31,
-        0x650   => 32,
-        0x651   => 33,
-        0x652   => 34,
-        0x670   => 35,
-        0x711   => 36,
-        0xC55   => 84,
-        0xC56   => 91,
-        0xE38   => 103,
-        0xE39   => 103,
-        0xE48   => 107,
-        0xE49   => 107,
-        0xE4A   => 107,
-        0xE4B   => 107,
-        0xEB8   => 118,
-        0xEB9   => 118,
-        0xEC8   => 122,
-        0xEC9   => 122,
-        0xECA   => 122,
-        0xECB   => 122,
-        0xF71   => 129,
-        0xF72   => 130,
-        0xF7A   => 130,
-        0xF7B   => 130,
-        0xF7C   => 130,
-        0xF7D   => 130,
-        0xF80   => 130,
-        0xF74   => 132,
-        0x321   => 202,
-        0x322   => 202,
-        0x327   => 202,
-        0x328   => 202,
-        0x31B   => 216,
-        0xF39   => 216,
-        0x1D165 => 216,
-        0x1D166 => 216,
-        0x1D16E => 216,
-        0x1D16F => 216,
-        0x1D170 => 216,
-        0x1D171 => 216,
-        0x1D172 => 216,
-        0x302A  => 218,
-        0x316   => 220,
-        0x317   => 220,
-        0x318   => 220,
-        0x319   => 220,
-        0x31C   => 220,
-        0x31D   => 220,
-        0x31E   => 220,
-        0x31F   => 220,
-        0x320   => 220,
-        0x323   => 220,
-        0x324   => 220,
-        0x325   => 220,
-        0x326   => 220,
-        0x329   => 220,
-        0x32A   => 220,
-        0x32B   => 220,
-        0x32C   => 220,
-        0x32D   => 220,
-        0x32E   => 220,
-        0x32F   => 220,
-        0x330   => 220,
-        0x331   => 220,
-        0x332   => 220,
-        0x333   => 220,
-        0x339   => 220,
-        0x33A   => 220,
-        0x33B   => 220,
-        0x33C   => 220,
-        0x347   => 220,
-        0x348   => 220,
-        0x349   => 220,
-        0x34D   => 220,
-        0x34E   => 220,
-        0x353   => 220,
-        0x354   => 220,
-        0x355   => 220,
-        0x356   => 220,
-        0x591   => 220,
-        0x596   => 220,
-        0x59B   => 220,
-        0x5A3   => 220,
-        0x5A4   => 220,
-        0x5A5   => 220,
-        0x5A6   => 220,
-        0x5A7   => 220,
-        0x5AA   => 220,
-        0x655   => 220,
-        0x656   => 220,
-        0x6E3   => 220,
-        0x6EA   => 220,
-        0x6ED   => 220,
-        0x731   => 220,
-        0x734   => 220,
-        0x737   => 220,
-        0x738   => 220,
-        0x739   => 220,
-        0x73B   => 220,
-        0x73C   => 220,
-        0x73E   => 220,
-        0x742   => 220,
-        0x744   => 220,
-        0x746   => 220,
-        0x748   => 220,
-        0x952   => 220,
-        0xF18   => 220,
-        0xF19   => 220,
-        0xF35   => 220,
-        0xF37   => 220,
-        0xFC6   => 220,
-        0x193B  => 220,
-        0x20E8  => 220,
-        0x1D17B => 220,
-        0x1D17C => 220,
-        0x1D17D => 220,
-        0x1D17E => 220,
-        0x1D17F => 220,
-        0x1D180 => 220,
-        0x1D181 => 220,
-        0x1D182 => 220,
-        0x1D18A => 220,
-        0x1D18B => 220,
-        0x59A   => 222,
-        0x5AD   => 222,
-        0x1929  => 222,
-        0x302D  => 222,
-        0x302E  => 224,
-        0x302F  => 224,
-        0x1D16D => 226,
-        0x5AE   => 228,
-        0x18A9  => 228,
-        0x302B  => 228,
-        0x300   => 230,
-        0x301   => 230,
-        0x302   => 230,
-        0x303   => 230,
-        0x304   => 230,
-        0x305   => 230,
-        0x306   => 230,
-        0x307   => 230,
-        0x308   => 230,
-        0x309   => 230,
-        0x30A   => 230,
-        0x30B   => 230,
-        0x30C   => 230,
-        0x30D   => 230,
-        0x30E   => 230,
-        0x30F   => 230,
-        0x310   => 230,
-        0x311   => 230,
-        0x312   => 230,
-        0x313   => 230,
-        0x314   => 230,
-        0x33D   => 230,
-        0x33E   => 230,
-        0x33F   => 230,
-        0x340   => 230,
-        0x341   => 230,
-        0x342   => 230,
-        0x343   => 230,
-        0x344   => 230,
-        0x346   => 230,
-        0x34A   => 230,
-        0x34B   => 230,
-        0x34C   => 230,
-        0x350   => 230,
-        0x351   => 230,
-        0x352   => 230,
-        0x357   => 230,
-        0x363   => 230,
-        0x364   => 230,
-        0x365   => 230,
-        0x366   => 230,
-        0x367   => 230,
-        0x368   => 230,
-        0x369   => 230,
-        0x36A   => 230,
-        0x36B   => 230,
-        0x36C   => 230,
-        0x36D   => 230,
-        0x36E   => 230,
-        0x36F   => 230,
-        0x483   => 230,
-        0x484   => 230,
-        0x485   => 230,
-        0x486   => 230,
-        0x592   => 230,
-        0x593   => 230,
-        0x594   => 230,
-        0x595   => 230,
-        0x597   => 230,
-        0x598   => 230,
-        0x599   => 230,
-        0x59C   => 230,
-        0x59D   => 230,
-        0x59E   => 230,
-        0x59F   => 230,
-        0x5A0   => 230,
-        0x5A1   => 230,
-        0x5A8   => 230,
-        0x5A9   => 230,
-        0x5AB   => 230,
-        0x5AC   => 230,
-        0x5AF   => 230,
-        0x5C4   => 230,
-        0x610   => 230,
-        0x611   => 230,
-        0x612   => 230,
-        0x613   => 230,
-        0x614   => 230,
-        0x615   => 230,
-        0x653   => 230,
-        0x654   => 230,
-        0x657   => 230,
-        0x658   => 230,
-        0x6D6   => 230,
-        0x6D7   => 230,
-        0x6D8   => 230,
-        0x6D9   => 230,
-        0x6DA   => 230,
-        0x6DB   => 230,
-        0x6DC   => 230,
-        0x6DF   => 230,
-        0x6E0   => 230,
-        0x6E1   => 230,
-        0x6E2   => 230,
-        0x6E4   => 230,
-        0x6E7   => 230,
-        0x6E8   => 230,
-        0x6EB   => 230,
-        0x6EC   => 230,
-        0x730   => 230,
-        0x732   => 230,
-        0x733   => 230,
-        0x735   => 230,
-        0x736   => 230,
-        0x73A   => 230,
-        0x73D   => 230,
-        0x73F   => 230,
-        0x740   => 230,
-        0x741   => 230,
-        0x743   => 230,
-        0x745   => 230,
-        0x747   => 230,
-        0x749   => 230,
-        0x74A   => 230,
-        0x951   => 230,
-        0x953   => 230,
-        0x954   => 230,
-        0xF82   => 230,
-        0xF83   => 230,
-        0xF86   => 230,
-        0xF87   => 230,
-        0x170D  => 230,
-        0x193A  => 230,
-        0x20D0  => 230,
-        0x20D1  => 230,
-        0x20D4  => 230,
-        0x20D5  => 230,
-        0x20D6  => 230,
-        0x20D7  => 230,
-        0x20DB  => 230,
-        0x20DC  => 230,
-        0x20E1  => 230,
-        0x20E7  => 230,
-        0x20E9  => 230,
-        0xFE20  => 230,
-        0xFE21  => 230,
-        0xFE22  => 230,
-        0xFE23  => 230,
-        0x1D185 => 230,
-        0x1D186 => 230,
-        0x1D187 => 230,
-        0x1D189 => 230,
-        0x1D188 => 230,
-        0x1D1AA => 230,
-        0x1D1AB => 230,
-        0x1D1AC => 230,
-        0x1D1AD => 230,
-        0x315   => 232,
-        0x31A   => 232,
-        0x302C  => 232,
-        0x35F   => 233,
-        0x362   => 233,
-        0x35D   => 234,
-        0x35E   => 234,
-        0x360   => 234,
-        0x361   => 234,
-        0x345   => 240
-    );
-    // }}}
-
-    // {{{ properties
-    /**
-     * @var string
-     * @access private
-     */
-    private $_punycode_prefix = 'xn--';
-
-    /**
-     * @access private
-     */
-    private $_invalid_ucs = 0x80000000;
-
-    /**
-     * @access private
-     */
-    private $_max_ucs = 0x10FFFF;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_base = 36;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_tmin = 1;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_tmax = 26;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_skew = 38;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_damp = 700;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_initial_bias = 72;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_initial_n = 0x80;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_slast;
-
-    /**
-     * @access private
-     */
-    private $_sbase = 0xAC00;
-
-    /**
-     * @access private
-     */
-    private $_lbase = 0x1100;
-
-    /**
-     * @access private
-     */
-    private $_vbase = 0x1161;
-
-    /**
-     * @access private
-     */
-    private $_tbase = 0x11a7;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_lcount = 19;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_vcount = 21;
-
-    /**
-     * @var int
-     * @access private
-     */
-    private $_tcount = 28;
-
-    /**
-     * vcount * tcount
-     *
-     * @var int
-     * @access private
-     */
-    private $_ncount = 588;
-
-    /**
-     * lcount * tcount * vcount
-     *
-     * @var int
-     * @access private
-     */
-    private $_scount = 11172;
-
-    /**
-     * Default encoding for encode()'s input and decode()'s output is UTF-8;
-     * Other possible encodings are ucs4_string and ucs4_array
-     * See {@link setParams()} for how to select these
-     *
-     * @var bool
-     * @access private
-     */
-    private $_api_encoding = 'utf8';
-
-    /**
-     * Overlong UTF-8 encodings are forbidden
-     *
-     * @var bool
-     * @access private
-     */
-    private $_allow_overlong = false;
-
-    /**
-     * Behave strict or not
-     *
-     * @var bool
-     * @access private
-     */
-    private $_strict_mode = false;
-
-    /**
-     * IDNA-version to use
-     *
-     * Values are "2003" and "2008".
-     * Defaults to "2003", since that was the original version and for
-     * compatibility with previous versions of this library.
-     * If you need to encode "new" characters like the German "Eszett",
-     * please switch to 2008 first before encoding.
-     *
-     * @var bool
-     * @access private
-     */
-    private $_version = '2003';
-
-    /**
-     * Cached value indicating whether or not mbstring function overloading is
-     * on for strlen
-     *
-     * This is cached for optimal performance.
-     *
-     * @var boolean
-     * @see Net_IDNA2::_byteLength()
-     */
-    private static $_mb_string_overload = null;
-    // }}}
-
-
-    // {{{ constructor
-    /**
-     * Constructor
-     *
-     * @param array $options Options to initialise the object with
-     *
-     * @access public
-     * @see    setParams()
-     */
-    public function __construct($options = null)
-    {
-        $this->_slast = $this->_sbase + $this->_lcount * $this->_vcount * $this->_tcount;
-
-        if (is_array($options)) {
-            $this->setParams($options);
-        }
-
-        // populate mbstring overloading cache if not set
-        if (self::$_mb_string_overload === null) {
-            self::$_mb_string_overload = (extension_loaded('mbstring')
-                && (ini_get('mbstring.func_overload') & 0x02) === 0x02);
-        }
-    }
-    // }}}
-
-
-    /**
-     * Sets a new option value. Available options and values:
-     *
-     * [utf8 -     Use either UTF-8 or ISO-8859-1 as input (true for UTF-8, false
-     *             otherwise); The output is always UTF-8]
-     * [overlong - Unicode does not allow unnecessarily long encodings of chars,
-     *             to allow this, set this parameter to true, else to false;
-     *             default is false.]
-     * [strict -   true: strict mode, good for registration purposes - Causes errors
-     *             on failures; false: loose mode, ideal for "wildlife" applications
-     *             by silently ignoring errors and returning the original input instead]
-     *
-     * @param mixed  $option Parameter to set (string: single parameter; array of Parameter => Value pairs)
-     * @param string $value  Value to use (if parameter 1 is a string)
-     *
-     * @return boolean       true on success, false otherwise
-     * @access public
-     */
-    public function setParams($option, $value = false)
-    {
-        if (!is_array($option)) {
-            $option = array($option => $value);
-        }
-
-        foreach ($option as $k => $v) {
-            switch ($k) {
-            case 'encoding':
-                switch ($v) {
-                case 'utf8':
-                case 'ucs4_string':
-                case 'ucs4_array':
-                    $this->_api_encoding = $v;
-                    break;
-
-                default:
-                    throw new InvalidArgumentException('Set Parameter: Unknown parameter '.$v.' for option '.$k);
-                }
-
-                break;
-
-            case 'overlong':
-                $this->_allow_overlong = ($v) ? true : false;
-                break;
-
-            case 'strict':
-                $this->_strict_mode = ($v) ? true : false;
-                break;
-
-            case 'version':
-                if (in_array($v, array('2003', '2008'))) {
-                    $this->_version = $v;
-                } else {
-                    throw new InvalidArgumentException('Set Parameter: Invalid parameter '.$v.' for option '.$k);
-                }
-                break;
-
-            default:
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Encode a given UTF-8 domain name.
-     *
-     * @param string $decoded           Domain name (UTF-8 or UCS-4)
-     * @param string $one_time_encoding Desired input encoding, see {@link set_parameter}
-     *                                  If not given will use default-encoding
-     *
-     * @return string Encoded Domain name (ACE string)
-     * @return mixed  processed string
-     * @throws Exception
-     * @access public
-     */
-    public function encode($decoded, $one_time_encoding = false)
-    {
-        // Forcing conversion of input to UCS4 array
-        // If one time encoding is given, use this, else the objects property
-        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            $decoded = $this->_utf8_to_ucs4($decoded);
-            break;
-        case 'ucs4_string':
-            $decoded = $this->_ucs4_string_to_ucs4($decoded);
-        case 'ucs4_array': // No break; before this line. Catch case, but do nothing
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported input format');
-        }
-
-        // No input, no output, what else did you expect?
-        if (empty($decoded)) return '';
-
-        // Anchors for iteration
-        $last_begin = 0;
-        // Output string
-        $output = '';
-
-        foreach ($decoded as $k => $v) {
-            // Make sure to use just the plain dot
-            switch($v) {
-            case 0x3002:
-            case 0xFF0E:
-            case 0xFF61:
-                $decoded[$k] = 0x2E;
-                // It's right, no break here
-                // The codepoints above have to be converted to dots anyway
-
-            // Stumbling across an anchoring character
-            case 0x2E:
-            case 0x2F:
-            case 0x3A:
-            case 0x3F:
-            case 0x40:
-                // Neither email addresses nor URLs allowed in strict mode
-                if ($this->_strict_mode) {
-                    throw new InvalidArgumentException('Neither email addresses nor URLs are allowed in strict mode.');
-                }
-                // Skip first char
-                if ($k) {
-                    $encoded = '';
-                    $encoded = $this->_encode(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                    if ($encoded) {
-                        $output .= $encoded;
-                    } else {
-                        $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($k)-$last_begin)));
-                    }
-                    $output .= chr($decoded[$k]);
-                }
-                $last_begin = $k + 1;
-            }
-        }
-        // Catch the rest of the string
-        if ($last_begin) {
-            $inp_len = sizeof($decoded);
-            $encoded = '';
-            $encoded = $this->_encode(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
-            if ($encoded) {
-                $output .= $encoded;
-            } else {
-                $output .= $this->_ucs4_to_utf8(array_slice($decoded, $last_begin, (($inp_len)-$last_begin)));
-            }
-            return $output;
-        }
-
-        if ($output = $this->_encode($decoded)) {
-            return $output;
-        }
-
-        return $this->_ucs4_to_utf8($decoded);
-    }
-
-    /**
-     * Decode a given ACE domain name.
-     *
-     * @param string $input             Domain name (ACE string)
-     * @param string $one_time_encoding Desired output encoding, see {@link set_parameter}
-     *
-     * @return string                   Decoded Domain name (UTF-8 or UCS-4)
-     * @throws Exception
-     * @access public
-     */
-    public function decode($input, $one_time_encoding = false)
-    {
-        // Optionally set
-        if ($one_time_encoding) {
-            switch ($one_time_encoding) {
-            case 'utf8':
-            case 'ucs4_string':
-            case 'ucs4_array':
-                break;
-            default:
-                throw new InvalidArgumentException('Unknown encoding '.$one_time_encoding);
-            }
-        }
-        // Make sure to drop any newline characters around
-        $input = trim($input);
-
-        // Negotiate input and try to determine, wether it is a plain string,
-        // an email address or something like a complete URL
-        if (strpos($input, '@')) { // Maybe it is an email address
-            // No no in strict mode
-            if ($this->_strict_mode) {
-                throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
-            }
-            list($email_pref, $input) = explode('@', $input, 2);
-            $arr = explode('.', $input);
-            foreach ($arr as $k => $v) {
-                $conv = $this->_decode($v);
-                if ($conv) $arr[$k] = $conv;
-            }
-            $return = $email_pref . '@' . join('.', $arr);
-        } elseif (preg_match('![:\./]!', $input)) { // Or a complete domain name (with or without paths / parameters)
-            // No no in strict mode
-            if ($this->_strict_mode) {
-                throw new InvalidArgumentException('Only simple domain name parts can be handled in strict mode');
-            }
-
-            $parsed = parse_url($input);
-            if (isset($parsed['host'])) {
-                $arr = explode('.', $parsed['host']);
-                foreach ($arr as $k => $v) {
-                    $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
-                }
-                $parsed['host'] = join('.', $arr);
-                if (isset($parsed['scheme'])) {
-                    $parsed['scheme'] .= (strtolower($parsed['scheme']) == 'mailto') ? ':' : '://';
-                }
-                $return = $this->_unparse_url($parsed);
-            } else { // parse_url seems to have failed, try without it
-                $arr = explode('.', $input);
-                foreach ($arr as $k => $v) {
-                    $conv = $this->_decode($v);
-                    if ($conv) $arr[$k] = $conv;
-                }
-                $return = join('.', $arr);
-            }
-        } else { // Otherwise we consider it being a pure domain name string
-            $return = $this->_decode($input);
-        }
-        // The output is UTF-8 by default, other output formats need conversion here
-        // If one time encoding is given, use this, else the objects property
-        switch (($one_time_encoding) ? $one_time_encoding : $this->_api_encoding) {
-        case 'utf8':
-            return $return;
-            break;
-        case 'ucs4_string':
-            return $this->_ucs4_to_ucs4_string($this->_utf8_to_ucs4($return));
-            break;
-        case 'ucs4_array':
-            return $this->_utf8_to_ucs4($return);
-            break;
-        default:
-            throw new InvalidArgumentException('Unsupported output format');
-        }
-    }
-
-
-    // {{{ private
-    /**
-     * Opposite function to parse_url()
-     *
-     * Inspired by code from comments of php.net-documentation for parse_url()
-     *
-     * @param array $parts_arr parts (strings) as returned by parse_url()
-     *
-     * @return string
-     * @access private
-     */
-    private function _unparse_url($parts_arr)
-    {
-        if (!empty($parts_arr['scheme'])) {
-            $ret_url = $parts_arr['scheme'];
-        }
-        if (!empty($parts_arr['user'])) {
-            $ret_url .= $parts_arr['user'];
-            if (!empty($parts_arr['pass'])) {
-                $ret_url .= ':' . $parts_arr['pass'];
-            }
-            $ret_url .= '@';
-        }
-        $ret_url .= $parts_arr['host'];
-        if (!empty($parts_arr['port'])) {
-            $ret_url .= ':' . $parts_arr['port'];
-        }
-        $ret_url .= $parts_arr['path'];
-        if (!empty($parts_arr['query'])) {
-            $ret_url .= '?' . $parts_arr['query'];
-        }
-        if (!empty($parts_arr['fragment'])) {
-            $ret_url .= '#' . $parts_arr['fragment'];
-        }
-        return $ret_url;
-    }
-
-    /**
-     * The actual encoding algorithm.
-     *
-     * @param string $decoded Decoded string which should be encoded
-     *
-     * @return string         Encoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _encode($decoded)
-    {
-        // We cannot encode a domain name containing the Punycode prefix
-        $extract = self::_byteLength($this->_punycode_prefix);
-        $check_pref = $this->_utf8_to_ucs4($this->_punycode_prefix);
-        $check_deco = array_slice($decoded, 0, $extract);
-
-        if ($check_pref == $check_deco) {
-            throw new InvalidArgumentException('This is already a punycode string');
-        }
-
-        // We will not try to encode strings consisting of basic code points only
-        $encodable = false;
-        foreach ($decoded as $k => $v) {
-            if ($v > 0x7a) {
-                $encodable = true;
-                break;
-            }
-        }
-        if (!$encodable) {
-            if ($this->_strict_mode) {
-                throw new InvalidArgumentException('The given string does not contain encodable chars');
-            }
-
-            return false;
-        }
-
-        // Do NAMEPREP
-        $decoded = $this->_nameprep($decoded);
-
-        $deco_len = count($decoded);
-
-        // Empty array
-        if (!$deco_len) {
-            return false;
-        }
-
-        // How many chars have been consumed
-        $codecount = 0;
-
-        // Start with the prefix; copy it to output
-        $encoded = $this->_punycode_prefix;
-
-        $encoded = '';
-        // Copy all basic code points to output
-        for ($i = 0; $i < $deco_len; ++$i) {
-            $test = $decoded[$i];
-            // Will match [0-9a-zA-Z-]
-            if ((0x2F < $test && $test < 0x40)
-                || (0x40 < $test && $test < 0x5B)
-                || (0x60 < $test && $test <= 0x7B)
-                || (0x2D == $test)
-            ) {
-                $encoded .= chr($decoded[$i]);
-                $codecount++;
-            }
-        }
-
-        // All codepoints were basic ones
-        if ($codecount == $deco_len) {
-            return $encoded;
-        }
-
-        // Start with the prefix; copy it to output
-        $encoded = $this->_punycode_prefix . $encoded;
-
-        // If we have basic code points in output, add an hyphen to the end
-        if ($codecount) {
-            $encoded .= '-';
-        }
-
-        // Now find and encode all non-basic code points
-        $is_first  = true;
-        $cur_code  = $this->_initial_n;
-        $bias      = $this->_initial_bias;
-        $delta     = 0;
-
-        while ($codecount < $deco_len) {
-            // Find the smallest code point >= the current code point and
-            // remember the last ouccrence of it in the input
-            for ($i = 0, $next_code = $this->_max_ucs; $i < $deco_len; $i++) {
-                if ($decoded[$i] >= $cur_code && $decoded[$i] <= $next_code) {
-                    $next_code = $decoded[$i];
-                }
-            }
-
-            $delta += ($next_code - $cur_code) * ($codecount + 1);
-            $cur_code = $next_code;
-
-            // Scan input again and encode all characters whose code point is $cur_code
-            for ($i = 0; $i < $deco_len; $i++) {
-                if ($decoded[$i] < $cur_code) {
-                    $delta++;
-                } else if ($decoded[$i] == $cur_code) {
-                    for ($q = $delta, $k = $this->_base; 1; $k += $this->_base) {
-                        $t = ($k <= $bias)?
-                            $this->_tmin :
-                            (($k >= $bias + $this->_tmax)? $this->_tmax : $k - $bias);
-
-                        if ($q < $t) {
-                            break;
-                        }
-
-                        $encoded .= $this->_encodeDigit(ceil($t + (($q - $t) % ($this->_base - $t))));
-                        $q = ($q - $t) / ($this->_base - $t);
-                    }
-
-                    $encoded .= $this->_encodeDigit($q);
-                    $bias = $this->_adapt($delta, $codecount + 1, $is_first);
-                    $codecount++;
-                    $delta = 0;
-                    $is_first = false;
-                }
-            }
-
-            $delta++;
-            $cur_code++;
-        }
-
-        return $encoded;
-    }
-
-    /**
-     * The actual decoding algorithm.
-     *
-     * @param string $encoded Encoded string which should be decoded
-     *
-     * @return string         Decoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _decode($encoded)
-    {
-        // We do need to find the Punycode prefix
-        if (!preg_match('!^' . preg_quote($this->_punycode_prefix, '!') . '!', $encoded)) {
-            return false;
-        }
-
-        $encode_test = preg_replace('!^' . preg_quote($this->_punycode_prefix, '!') . '!', '', $encoded);
-
-        // If nothing left after removing the prefix, it is hopeless
-        if (!$encode_test) {
-            return false;
-        }
-
-        // Find last occurence of the delimiter
-        $delim_pos = strrpos($encoded, '-');
-
-        if ($delim_pos > self::_byteLength($this->_punycode_prefix)) {
-            for ($k = self::_byteLength($this->_punycode_prefix); $k < $delim_pos; ++$k) {
-                $decoded[] = ord($encoded{$k});
-            }
-        } else {
-            $decoded = array();
-        }
-
-        $deco_len = count($decoded);
-        $enco_len = self::_byteLength($encoded);
-
-        // Wandering through the strings; init
-        $is_first = true;
-        $bias     = $this->_initial_bias;
-        $idx      = 0;
-        $char     = $this->_initial_n;
-
-        for ($enco_idx = ($delim_pos)? ($delim_pos + 1) : 0; $enco_idx < $enco_len; ++$deco_len) {
-            for ($old_idx = $idx, $w = 1, $k = $this->_base; 1 ; $k += $this->_base) {
-                $digit = $this->_decodeDigit($encoded{$enco_idx++});
-                $idx += $digit * $w;
-
-                $t = ($k <= $bias) ?
-                    $this->_tmin :
-                    (($k >= $bias + $this->_tmax)? $this->_tmax : ($k - $bias));
-
-                if ($digit < $t) {
-                    break;
-                }
-
-                $w = (int)($w * ($this->_base - $t));
-            }
-
-            $bias      = $this->_adapt($idx - $old_idx, $deco_len + 1, $is_first);
-            $is_first  = false;
-            $char     += (int) ($idx / ($deco_len + 1));
-            $idx      %= ($deco_len + 1);
-
-            if ($deco_len > 0) {
-                // Make room for the decoded char
-                for ($i = $deco_len; $i > $idx; $i--) {
-                    $decoded[$i] = $decoded[($i - 1)];
-                }
-            }
-
-            $decoded[$idx++] = $char;
-        }
-
-        return $this->_ucs4_to_utf8($decoded);
-    }
-
-    /**
-     * Adapt the bias according to the current code point and position.
-     *
-     * @param int     $delta    ...
-     * @param int     $npoints  ...
-     * @param boolean $is_first ...
-     *
-     * @return int
-     * @access private
-     */
-    private function _adapt($delta, $npoints, $is_first)
-    {
-        $delta = (int) ($is_first ? ($delta / $this->_damp) : ($delta / 2));
-        $delta += (int) ($delta / $npoints);
-
-        for ($k = 0; $delta > (($this->_base - $this->_tmin) * $this->_tmax) / 2; $k += $this->_base) {
-            $delta = (int) ($delta / ($this->_base - $this->_tmin));
-        }
-
-        return (int) ($k + ($this->_base - $this->_tmin + 1) * $delta / ($delta + $this->_skew));
-    }
-
-    /**
-     * Encoding a certain digit.
-     *
-     * @param int $d One digit to encode
-     *
-     * @return char  Encoded digit
-     * @access private
-     */
-    private function _encodeDigit($d)
-    {
-        return chr($d + 22 + 75 * ($d < 26));
-    }
-
-    /**
-     * Decode a certain digit.
-     *
-     * @param char $cp One digit (character) to decode
-     *
-     * @return int     Decoded digit
-     * @access private
-     */
-    private function _decodeDigit($cp)
-    {
-        $cp = ord($cp);
-        return ($cp - 48 < 10)? $cp - 22 : (($cp - 65 < 26)? $cp - 65 : (($cp - 97 < 26)? $cp - 97 : $this->_base));
-    }
-
-    /**
-     * Do Nameprep according to RFC3491 and RFC3454.
-     *
-     * @param array $input Unicode Characters
-     *
-     * @return string      Unicode Characters, Nameprep'd
-     * @throws Exception
-     * @access private
-     */
-    private function _nameprep($input)
-    {
-        $output = array();
-
-        // Walking through the input array, performing the required steps on each of
-        // the input chars and putting the result into the output array
-        // While mapping required chars we apply the cannonical ordering
-
-        foreach ($input as $v) {
-            // Map to nothing == skip that code point
-            if (in_array($v, self::$_np_map_nothing)) {
-                continue;
-            }
-
-            // Try to find prohibited input
-            if (in_array($v, self::$_np_prohibit) || in_array($v, self::$_general_prohibited)) {
-                throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
-            }
-
-            foreach (self::$_np_prohibit_ranges as $range) {
-                if ($range[0] <= $v && $v <= $range[1]) {
-                    throw new Net_IDNA2_Exception_Nameprep('Prohibited input U+' . sprintf('%08X', $v));
-                }
-            }
-
-            // Hangul syllable decomposition
-            if (0xAC00 <= $v && $v <= 0xD7AF) {
-                foreach ($this->_hangulDecompose($v) as $out) {
-                    $output[] = $out;
-                }
-            } else if (($this->_version == '2003') && isset(self::$_np_replacemaps[$v])) {
-                // There's a decomposition mapping for that code point
-                // Decompositions only in version 2003 (original) of IDNA
-                foreach ($this->_applyCannonicalOrdering(self::$_np_replacemaps[$v]) as $out) {
-                    $output[] = $out;
-                }
-            } else {
-                $output[] = $v;
-            }
-        }
-
-        // Combine code points
-
-        $last_class   = 0;
-        $last_starter = 0;
-        $out_len      = count($output);
-
-        for ($i = 0; $i < $out_len; ++$i) {
-            $class = $this->_getCombiningClass($output[$i]);
-
-            if ((!$last_class || $last_class != $class) && $class) {
-                // Try to match
-                $seq_len = $i - $last_starter;
-                $out = $this->_combine(array_slice($output, $last_starter, $seq_len));
-
-                // On match: Replace the last starter with the composed character and remove
-                // the now redundant non-starter(s)
-                if ($out) {
-                    $output[$last_starter] = $out;
-
-                    if (count($out) != $seq_len) {
-                        for ($j = $i + 1; $j < $out_len; ++$j) {
-                            $output[$j - 1] = $output[$j];
-                        }
-
-                        unset($output[$out_len]);
-                    }
-
-                    // Rewind the for loop by one, since there can be more possible compositions
-                    $i--;
-                    $out_len--;
-                    $last_class = ($i == $last_starter)? 0 : $this->_getCombiningClass($output[$i - 1]);
-
-                    continue;
-                }
-            }
-
-            // The current class is 0
-            if (!$class) {
-                $last_starter = $i;
-            }
-
-            $last_class = $class;
-        }
-
-        return $output;
-    }
-
-    /**
-     * Decomposes a Hangul syllable
-     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
-     *
-     * @param integer $char 32bit UCS4 code point
-     *
-     * @return array        Either Hangul Syllable decomposed or original 32bit
-     *                      value as one value array
-     * @access private
-     */
-    private function _hangulDecompose($char)
-    {
-        $sindex = $char - $this->_sbase;
-
-        if ($sindex < 0 || $sindex >= $this->_scount) {
-            return array($char);
-        }
-
-        $result   = array();
-        $T        = $this->_tbase + $sindex % $this->_tcount;
-        $result[] = (int)($this->_lbase +  $sindex / $this->_ncount);
-        $result[] = (int)($this->_vbase + ($sindex % $this->_ncount) / $this->_tcount);
-
-        if ($T != $this->_tbase) {
-            $result[] = $T;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Ccomposes a Hangul syllable
-     * (see http://www.unicode.org/unicode/reports/tr15/#Hangul).
-     *
-     * @param array $input Decomposed UCS4 sequence
-     *
-     * @return array       UCS4 sequence with syllables composed
-     * @access private
-     */
-    private function _hangulCompose($input)
-    {
-        $inp_len = count($input);
-
-        if (!$inp_len) {
-            return array();
-        }
-
-        $result   = array();
-        $last     = $input[0];
-        $result[] = $last; // copy first char from input to output
-
-        for ($i = 1; $i < $inp_len; ++$i) {
-            $char = $input[$i];
-
-            // Find out, wether two current characters from L and V
-            $lindex = $last - $this->_lbase;
-
-            if (0 <= $lindex && $lindex < $this->_lcount) {
-                $vindex = $char - $this->_vbase;
-
-                if (0 <= $vindex && $vindex < $this->_vcount) {
-                    // create syllable of form LV
-                    $last    = ($this->_sbase + ($lindex * $this->_vcount + $vindex) * $this->_tcount);
-                    $out_off = count($result) - 1;
-                    $result[$out_off] = $last; // reset last
-
-                    // discard char
-                    continue;
-                }
-            }
-
-            // Find out, wether two current characters are LV and T
-            $sindex = $last - $this->_sbase;
-
-            if (0 <= $sindex && $sindex < $this->_scount && ($sindex % $this->_tcount) == 0) {
-                $tindex = $char - $this->_tbase;
-
-                if (0 <= $tindex && $tindex <= $this->_tcount) {
-                    // create syllable of form LVT
-                    $last += $tindex;
-                    $out_off = count($result) - 1;
-                    $result[$out_off] = $last; // reset last
-
-                    // discard char
-                    continue;
-                }
-            }
-
-            // if neither case was true, just add the character
-            $last = $char;
-            $result[] = $char;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the combining class of a certain wide char.
-     *
-     * @param integer $char Wide char to check (32bit integer)
-     *
-     * @return integer      Combining class if found, else 0
-     * @access private
-     */
-    private function _getCombiningClass($char)
-    {
-        return isset(self::$_np_norm_combcls[$char])? self::$_np_norm_combcls[$char] : 0;
-    }
-
-    /**
-     * Apllies the cannonical ordering of a decomposed UCS4 sequence.
-     *
-     * @param array $input Decomposed UCS4 sequence
-     *
-     * @return array       Ordered USC4 sequence
-     * @access private
-     */
-    private function _applyCannonicalOrdering($input)
-    {
-        $swap = true;
-        $size = count($input);
-
-        while ($swap) {
-            $swap = false;
-            $last = $this->_getCombiningClass($input[0]);
-
-            for ($i = 0; $i < $size - 1; ++$i) {
-                $next = $this->_getCombiningClass($input[$i + 1]);
-
-                if ($next != 0 && $last > $next) {
-                    // Move item leftward until it fits
-                    for ($j = $i + 1; $j > 0; --$j) {
-                        if ($this->_getCombiningClass($input[$j - 1]) <= $next) {
-                            break;
-                        }
-
-                        $t = $input[$j];
-                        $input[$j] = $input[$j - 1];
-                        $input[$j - 1] = $t;
-                        $swap = 1;
-                    }
-
-                    // Reentering the loop looking at the old character again
-                    $next = $last;
-                }
-
-                $last = $next;
-            }
-        }
-
-        return $input;
-    }
-
-    /**
-     * Do composition of a sequence of starter and non-starter.
-     *
-     * @param array $input UCS4 Decomposed sequence
-     *
-     * @return array       Ordered USC4 sequence
-     * @access private
-     */
-    private function _combine($input)
-    {
-        $inp_len = count($input);
-
-        // Is it a Hangul syllable?
-        if (1 != $inp_len) {
-            $hangul = $this->_hangulCompose($input);
-
-            // This place is probably wrong
-            if (count($hangul) != $inp_len) {
-                return $hangul;
-            }
-        }
-
-        foreach (self::$_np_replacemaps as $np_src => $np_target) {
-            if ($np_target[0] != $input[0]) {
-                continue;
-            }
-
-            if (count($np_target) != $inp_len) {
-                continue;
-            }
-
-            $hit = false;
-
-            foreach ($input as $k2 => $v2) {
-                if ($v2 == $np_target[$k2]) {
-                    $hit = true;
-                } else {
-                    $hit = false;
-                    break;
-                }
-            }
-
-            if ($hit) {
-                return $np_src;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * This converts an UTF-8 encoded string to its UCS-4 (array) representation
-     * By talking about UCS-4 we mean arrays of 32bit integers representing
-     * each of the "chars". This is due to PHP not being able to handle strings with
-     * bit depth different from 8. This applies to the reverse method _ucs4_to_utf8(), too.
-     * The following UTF-8 encodings are supported:
-     *
-     * bytes bits  representation
-     * 1        7  0xxxxxxx
-     * 2       11  110xxxxx 10xxxxxx
-     * 3       16  1110xxxx 10xxxxxx 10xxxxxx
-     * 4       21  11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-     * 5       26  111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-     * 6       31  1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-     *
-     * Each x represents a bit that can be used to store character data.
-     *
-     * @param string $input utf8-encoded string
-     *
-     * @return array        ucs4-encoded array
-     * @throws Exception
-     * @access private
-     */
-    private function _utf8_to_ucs4($input)
-    {
-        $output = array();
-        $out_len = 0;
-        $inp_len = self::_byteLength($input, '8bit');
-        $mode = 'next';
-        $test = 'none';
-        for ($k = 0; $k < $inp_len; ++$k) {
-            $v = ord($input{$k}); // Extract byte from input string
-
-            if ($v < 128) { // We found an ASCII char - put into stirng as is
-                $output[$out_len] = $v;
-                ++$out_len;
-                if ('add' == $mode) {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
-                }
-                continue;
-            }
-            if ('next' == $mode) { // Try to find the next start byte; determine the width of the Unicode char
-                $start_byte = $v;
-                $mode = 'add';
-                $test = 'range';
-                if ($v >> 5 == 6) { // &110xxxxx 10xxxxx
-                    $next_byte = 0; // Tells, how many times subsequent bitmasks must rotate 6bits to the left
-                    $v = ($v - 192) << 6;
-                } elseif ($v >> 4 == 14) { // &1110xxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 1;
-                    $v = ($v - 224) << 12;
-                } elseif ($v >> 3 == 30) { // &11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 2;
-                    $v = ($v - 240) << 18;
-                } elseif ($v >> 2 == 62) { // &111110xx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 3;
-                    $v = ($v - 248) << 24;
-                } elseif ($v >> 1 == 126) { // &1111110x 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx 10xxxxxx
-                    $next_byte = 4;
-                    $v = ($v - 252) << 30;
-                } else {
-                    throw new UnexpectedValueException('This might be UTF-8, but I don\'t understand it at byte '.$k);
-                }
-                if ('add' == $mode) {
-                    $output[$out_len] = (int) $v;
-                    ++$out_len;
-                    continue;
-                }
-            }
-            if ('add' == $mode) {
-                if (!$this->_allow_overlong && $test == 'range') {
-                    $test = 'none';
-                    if (($v < 0xA0 && $start_byte == 0xE0) || ($v < 0x90 && $start_byte == 0xF0) || ($v > 0x8F && $start_byte == 0xF4)) {
-                        throw new OutOfRangeException('Bogus UTF-8 character detected (out of legal range) at byte '.$k);
-                    }
-                }
-                if ($v >> 6 == 2) { // Bit mask must be 10xxxxxx
-                    $v = ($v - 128) << ($next_byte * 6);
-                    $output[($out_len - 1)] += $v;
-                    --$next_byte;
-                } else {
-                    throw new UnexpectedValueException('Conversion from UTF-8 to UCS-4 failed: malformed input at byte '.$k);
-                }
-                if ($next_byte < 0) {
-                    $mode = 'next';
-                }
-            }
-        } // for
-        return $output;
-    }
-
-    /**
-     * Convert UCS-4 array into UTF-8 string
-     *
-     * @param array $input ucs4-encoded array
-     *
-     * @return string      utf8-encoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _ucs4_to_utf8($input)
-    {
-        $output = '';
-
-        foreach ($input as $v) {
-            // $v = ord($v);
-
-            if ($v < 128) {
-                // 7bit are transferred literally
-                $output .= chr($v);
-            } else if ($v < 1 << 11) {
-                // 2 bytes
-                $output .= chr(192 + ($v >> 6))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 16) {
-                // 3 bytes
-                $output .= chr(224 + ($v >> 12))
-                    . chr(128 + (($v >> 6) & 63))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 21) {
-                // 4 bytes
-                $output .= chr(240 + ($v >> 18))
-                    . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 26) {
-                // 5 bytes
-                $output .= chr(248 + ($v >> 24))
-                    . chr(128 + (($v >> 18) & 63))
-                    . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
-                    . chr(128 + ($v & 63));
-            } else if ($v < 1 << 31) {
-                // 6 bytes
-                $output .= chr(252 + ($v >> 30))
-                    . chr(128 + (($v >> 24) & 63))
-                    . chr(128 + (($v >> 18) & 63))
-                    . chr(128 + (($v >> 12) & 63))
-                    . chr(128 + (($v >>  6) & 63))
-                    . chr(128 + ($v & 63));
-            } else {
-                throw new UnexpectedValueException('Conversion from UCS-4 to UTF-8 failed: malformed input');
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Convert UCS-4 array into UCS-4 string
-     *
-     * @param array $input ucs4-encoded array
-     *
-     * @return string      ucs4-encoded string
-     * @throws Exception
-     * @access private
-     */
-    private function _ucs4_to_ucs4_string($input)
-    {
-        $output = '';
-        // Take array values and split output to 4 bytes per value
-        // The bit mask is 255, which reads &11111111
-        foreach ($input as $v) {
-            $output .= ($v & (255 << 24) >> 24) . ($v & (255 << 16) >> 16) . ($v & (255 << 8) >> 8) . ($v & 255);
-        }
-        return $output;
-    }
-
-    /**
-     * Convert UCS-4 string into UCS-4 array
-     *
-     * @param string $input ucs4-encoded string
-     *
-     * @return array        ucs4-encoded array
-     * @throws InvalidArgumentException
-     * @access private
-     */
-    private function _ucs4_string_to_ucs4($input)
-    {
-        $output = array();
-
-        $inp_len = self::_byteLength($input);
-        // Input length must be dividable by 4
-        if ($inp_len % 4) {
-            throw new InvalidArgumentException('Input UCS4 string is broken');
-        }
-
-        // Empty input - return empty output
-        if (!$inp_len) {
-            return $output;
-        }
-
-        for ($i = 0, $out_len = -1; $i < $inp_len; ++$i) {
-            // Increment output position every 4 input bytes
-            if (!$i % 4) {
-                $out_len++;
-                $output[$out_len] = 0;
-            }
-            $output[$out_len] += ord($input{$i}) << (8 * (3 - ($i % 4) ) );
-        }
-        return $output;
-    }
-
-    /**
-     * Echo hex representation of UCS4 sequence.
-     *
-     * @param array   $input       UCS4 sequence
-     * @param boolean $include_bit Include bitmask in output
-     *
-     * @return void
-     * @static
-     * @access private
-     */
-    private static function _showHex($input, $include_bit = false)
-    {
-        foreach ($input as $k => $v) {
-            echo '[', $k, '] => ', sprintf('%X', $v);
-
-            if ($include_bit) {
-                echo ' (', Net_IDNA2::_showBitmask($v), ')';
-            }
-
-            echo "\n";
-        }
-    }
-
-    /**
-     * Gives you a bit representation of given Byte (8 bits), Word (16 bits) or DWord (32 bits)
-     * Output width is automagically determined
-     *
-     * @param int $octet ...
-     *
-     * @return string    Bitmask-representation
-     * @static
-     * @access private
-     */
-    private static function _showBitmask($octet)
-    {
-        if ($octet >= (1 << 16)) {
-            $w = 31;
-        } else if ($octet >= (1 << 8)) {
-            $w = 15;
-        } else {
-            $w = 7;
-        }
-
-        $return = '';
-
-        for ($i = $w; $i > -1; $i--) {
-            $return .= ($octet & (1 << $i))? '1' : '0';
-        }
-
-        return $return;
-    }
-
-    /**
-     * Gets the length of a string in bytes even if mbstring function
-     * overloading is turned on
-     *
-     * @param string $string the string for which to get the length.
-     *
-     * @return integer the length of the string in bytes.
-     *
-     * @see Net_IDNA2::$_mb_string_overload
-     */
-    private static function _byteLength($string)
-    {
-        if (self::$_mb_string_overload) {
-            return mb_strlen($string, '8bit');
-        }
-        return strlen((binary)$string);
-    }
-
-    // }}}}
-
-    // {{{ factory
-    /**
-     * Attempts to return a concrete IDNA instance for either php4 or php5.
-     *
-     * @param array $params Set of paramaters
-     *
-     * @return Net_IDNA2
-     * @access public
-     */
-    function getInstance($params = array())
-    {
-        return new Net_IDNA2($params);
-    }
-    // }}}
-
-    // {{{ singleton
-    /**
-     * Attempts to return a concrete IDNA instance for either php4 or php5,
-     * only creating a new instance if no IDNA instance with the same
-     * parameters currently exists.
-     *
-     * @param array $params Set of paramaters
-     *
-     * @return object Net_IDNA2
-     * @access public
-     */
-    function singleton($params = array())
-    {
-        static $instances;
-        if (!isset($instances)) {
-            $instances = array();
-        }
-
-        $signature = serialize($params);
-        if (!isset($instances[$signature])) {
-            $instances[$signature] = Net_IDNA2::getInstance($params);
-        }
-
-        return $instances[$signature];
-    }
-    // }}}
-}
-
-?>

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/IDNA2/Exception Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/IDNA2/Exception.php Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/IDNA2/Exception/Nameprep.php Deleted

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/SMTP.php Deleted

@@ -1,1342 +0,0 @@
-<?php
-/* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Chuck Hagenbuch <chuck@horde.org>                           |
-// |          Jon Parise <jon@php.net>                                    |
-// |          Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>      |
-// +----------------------------------------------------------------------+
-//
-// $Id$
-
-require_once 'PEAR.php';
-require_once 'Net/Socket.php';
-
-/**
- * Provides an implementation of the SMTP protocol using PEAR's
- * Net_Socket:: class.
- *
- * @package Net_SMTP
- * @author  Chuck Hagenbuch <chuck@horde.org>
- * @author  Jon Parise <jon@php.net>
- * @author  Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>
- *
- * @example basic.php   A basic implementation of the Net_SMTP package.
- */
-class Net_SMTP
-{
-    /**
-     * The server to connect to.
-     * @var string
-     * @access public
-     */
-    var $host = 'localhost';
-
-    /**
-     * The port to connect to.
-     * @var int
-     * @access public
-     */
-    var $port = 25;
-
-    /**
-     * The value to give when sending EHLO or HELO.
-     * @var string
-     * @access public
-     */
-    var $localhost = 'localhost';
-
-    /**
-     * List of supported authentication methods, in preferential order.
-     * @var array
-     * @access public
-     */
-    var $auth_methods = array();
-
-    /**
-     * Use SMTP command pipelining (specified in RFC 2920) if the SMTP
-     * server supports it.
-     *
-     * When pipeling is enabled, rcptTo(), mailFrom(), sendFrom(),
-     * somlFrom() and samlFrom() do not wait for a response from the
-     * SMTP server but return immediately.
-     *
-     * @var bool
-     * @access public
-     */
-    var $pipelining = false;
-
-    /**
-     * Number of pipelined commands.
-     * @var int
-     * @access private
-     */
-    var $_pipelined_commands = 0;
-
-    /**
-     * Should debugging output be enabled?
-     * @var boolean
-     * @access private
-     */
-    var $_debug = false;
-
-    /**
-     * Debug output handler.
-     * @var callback
-     * @access private
-     */
-    var $_debug_handler = null;
-
-    /**
-     * The socket resource being used to connect to the SMTP server.
-     * @var resource
-     * @access private
-     */
-    var $_socket = null;
-
-    /**
-     * Array of socket options that will be passed to Net_Socket::connect().
-     * @see stream_context_create()
-     * @var array
-     * @access private
-     */
-    var $_socket_options = null;
-
-    /**
-     * The socket I/O timeout value in seconds.
-     * @var int
-     * @access private
-     */
-    var $_timeout = 0;
-
-    /**
-     * The most recent server response code.
-     * @var int
-     * @access private
-     */
-    var $_code = -1;
-
-    /**
-     * The most recent server response arguments.
-     * @var array
-     * @access private
-     */
-    var $_arguments = array();
-
-    /**
-     * Stores the SMTP server's greeting string.
-     * @var string
-     * @access private
-     */
-    var $_greeting = null;
-
-    /**
-     * Stores detected features of the SMTP server.
-     * @var array
-     * @access private
-     */
-    var $_esmtp = array();
-
-    /**
-     * Instantiates a new Net_SMTP object, overriding any defaults
-     * with parameters that are passed in.
-     *
-     * If you have SSL support in PHP, you can connect to a server
-     * over SSL using an 'ssl://' prefix:
-     *
-     *   // 465 is a common smtps port.
-     *   $smtp = new Net_SMTP('ssl://mail.host.com', 465);
-     *   $smtp->connect();
-     *
-     * @param string  $host       The server to connect to.
-     * @param integer $port       The port to connect to.
-     * @param string  $localhost  The value to give when sending EHLO or HELO.
-     * @param boolean $pipeling   Use SMTP command pipelining
-     * @param integer $timeout    Socket I/O timeout in seconds.
-     * @param array   $socket_options Socket stream_context_create() options.
-     *
-     * @access  public
-     * @since   1.0
-     */
-    function Net_SMTP($host = null, $port = null, $localhost = null,
-        $pipelining = false, $timeout = 0, $socket_options = null)
-    {
-        if (isset($host)) {
-            $this->host = $host;
-        }
-        if (isset($port)) {
-            $this->port = $port;
-        }
-        if (isset($localhost)) {
-            $this->localhost = $localhost;
-        }
-        $this->pipelining = $pipelining;
-
-        $this->_socket = new Net_Socket();
-        $this->_socket_options = $socket_options;
-        $this->_timeout = $timeout;
-
-        /* Include the Auth_SASL package.  If the package is available, we 
-         * enable the authentication methods that depend upon it. */
-        if ((@include_once 'Auth/SASL.php') === true) {
-            $this->setAuthMethod('CRAM-MD5', array($this, '_authCram_MD5'));
-            $this->setAuthMethod('DIGEST-MD5', array($this, '_authDigest_MD5'));
-        }
-
-        /* These standard authentication methods are always available. */
-        $this->setAuthMethod('LOGIN', array($this, '_authLogin'), false);
-        $this->setAuthMethod('PLAIN', array($this, '_authPlain'), false);
-    }
-
-    /**
-     * Set the socket I/O timeout value in seconds plus microseconds.
-     *
-     * @param   integer $seconds        Timeout value in seconds.
-     * @param   integer $microseconds   Additional value in microseconds.
-     *
-     * @access  public
-     * @since   1.5.0
-     */
-    function setTimeout($seconds, $microseconds = 0) {
-        return $this->_socket->setTimeout($seconds, $microseconds);
-    }
-
-    /**
-     * Set the value of the debugging flag.
-     *
-     * @param   boolean $debug      New value for the debugging flag.
-     *
-     * @access  public
-     * @since   1.1.0
-     */
-    function setDebug($debug, $handler = null)
-    {
-        $this->_debug = $debug;
-        $this->_debug_handler = $handler;
-    }
-
-    /**
-     * Write the given debug text to the current debug output handler.
-     *
-     * @param   string  $message    Debug mesage text.
-     *
-     * @access  private
-     * @since   1.3.3
-     */
-    function _debug($message)
-    {
-        if ($this->_debug) {
-            if ($this->_debug_handler) {
-                call_user_func_array($this->_debug_handler,
-                                     array(&$this, $message));
-            } else {
-                echo "DEBUG: $message\n";
-            }
-        }
-    }
-
-    /**
-     * Send the given string of data to the server.
-     *
-     * @param   string  $data       The string of data to send.
-     *
-     * @return  mixed   The number of bytes that were actually written,
-     *                  or a PEAR_Error object on failure.
-     *
-     * @access  private
-     * @since   1.1.0
-     */
-    function _send($data)
-    {
-        $this->_debug("Send: $data");
-
-        $result = $this->_socket->write($data);
-        if (!$result || PEAR::isError($result)) {
-            $msg = ($result) ? $result->getMessage() : "unknown error";
-            return PEAR::raiseError("Failed to write to socket: $msg",
-                                    null, PEAR_ERROR_RETURN);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Send a command to the server with an optional string of
-     * arguments.  A carriage return / linefeed (CRLF) sequence will
-     * be appended to each command string before it is sent to the
-     * SMTP server - an error will be thrown if the command string
-     * already contains any newline characters. Use _send() for
-     * commands that must contain newlines.
-     *
-     * @param   string  $command    The SMTP command to send to the server.
-     * @param   string  $args       A string of optional arguments to append
-     *                              to the command.
-     *
-     * @return  mixed   The result of the _send() call.
-     *
-     * @access  private
-     * @since   1.1.0
-     */
-    function _put($command, $args = '')
-    {
-        if (!empty($args)) {
-            $command .= ' ' . $args;
-        }
-
-        if (strcspn($command, "\r\n") !== strlen($command)) {
-            return PEAR::raiseError('Commands cannot contain newlines',
-                                    null, PEAR_ERROR_RETURN);
-        }
-
-        return $this->_send($command . "\r\n");
-    }
-
-    /**
-     * Read a reply from the SMTP server.  The reply consists of a response
-     * code and a response message.
-     *
-     * @param   mixed   $valid      The set of valid response codes.  These
-     *                              may be specified as an array of integer
-     *                              values or as a single integer value.
-     * @param   bool    $later      Do not parse the response now, but wait
-     *                              until the last command in the pipelined
-     *                              command group
-     *
-     * @return  mixed   True if the server returned a valid response code or
-     *                  a PEAR_Error object is an error condition is reached.
-     *
-     * @access  private
-     * @since   1.1.0
-     *
-     * @see     getResponse
-     */
-    function _parseResponse($valid, $later = false)
-    {
-        $this->_code = -1;
-        $this->_arguments = array();
-
-        if ($later) {
-            $this->_pipelined_commands++;
-            return true;
-        }
-
-        for ($i = 0; $i <= $this->_pipelined_commands; $i++) {
-            while ($line = $this->_socket->readLine()) {
-                $this->_debug("Recv: $line");
-
-                /* If we receive an empty line, the connection was closed. */
-                if (empty($line)) {
-                    $this->disconnect();
-                    return PEAR::raiseError('Connection was closed',
-                                            null, PEAR_ERROR_RETURN);
-                }
-
-                /* Read the code and store the rest in the arguments array. */
-                $code = substr($line, 0, 3);
-                $this->_arguments[] = trim(substr($line, 4));
-
-                /* Check the syntax of the response code. */
-                if (is_numeric($code)) {
-                    $this->_code = (int)$code;
-                } else {
-                    $this->_code = -1;
-                    break;
-                }
-
-                /* If this is not a multiline response, we're done. */
-                if (substr($line, 3, 1) != '-') {
-                    break;
-                }
-            }
-        }
-
-        $this->_pipelined_commands = 0;
-
-        /* Compare the server's response code with the valid code/codes. */
-        if (is_int($valid) && ($this->_code === $valid)) {
-            return true;
-        } elseif (is_array($valid) && in_array($this->_code, $valid, true)) {
-            return true;
-        }
-
-        return PEAR::raiseError('Invalid response code received from server',
-                                $this->_code, PEAR_ERROR_RETURN);
-    }
-
-    /**
-     * Issue an SMTP command and verify its response.
-     *
-     * @param   string  $command    The SMTP command string or data.
-     * @param   mixed   $valid      The set of valid response codes.  These
-     *                              may be specified as an array of integer
-     *                              values or as a single integer value.
-     *
-     * @return  mixed   True on success or a PEAR_Error object on failure.
-     *
-     * @access  public
-     * @since   1.6.0
-     */
-    function command($command, $valid)
-    {
-        if (PEAR::isError($error = $this->_put($command))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse($valid))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return a 2-tuple containing the last response from the SMTP server.
-     *
-     * @return  array   A two-element array: the first element contains the
-     *                  response code as an integer and the second element
-     *                  contains the response's arguments as a string.
-     *
-     * @access  public
-     * @since   1.1.0
-     */
-    function getResponse()
-    {
-        return array($this->_code, join("\n", $this->_arguments));
-    }
-
-    /**
-     * Return the SMTP server's greeting string.
-     *
-     * @return  string  A string containing the greeting string, or null if a 
-     *                  greeting has not been received.
-     *
-     * @access  public
-     * @since   1.3.3
-     */
-    function getGreeting()
-    {
-        return $this->_greeting;
-    }
-
-    /**
-     * Attempt to connect to the SMTP server.
-     *
-     * @param   int     $timeout    The timeout value (in seconds) for the
-     *                              socket connection attempt.
-     * @param   bool    $persistent Should a persistent socket connection
-     *                              be used?
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function connect($timeout = null, $persistent = false)
-    {
-        $this->_greeting = null;
-        $result = $this->_socket->connect($this->host, $this->port,
-                                          $persistent, $timeout,
-                                          $this->_socket_options);
-        if (PEAR::isError($result)) {
-            return PEAR::raiseError('Failed to connect socket: ' .
-                                    $result->getMessage());
-        }
-
-        /*
-         * Now that we're connected, reset the socket's timeout value for 
-         * future I/O operations.  This allows us to have different socket 
-         * timeout values for the initial connection (our $timeout parameter) 
-         * and all other socket operations.
-         */
-        if ($this->_timeout > 0) {
-            if (PEAR::isError($error = $this->setTimeout($this->_timeout))) {
-                return $error;
-            }
-        }
-
-        if (PEAR::isError($error = $this->_parseResponse(220))) {
-            return $error;
-        }
-
-        /* Extract and store a copy of the server's greeting string. */
-        list(, $this->_greeting) = $this->getResponse();
-
-        if (PEAR::isError($error = $this->_negotiate())) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Attempt to disconnect from the SMTP server.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function disconnect()
-    {
-        if (PEAR::isError($error = $this->_put('QUIT'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(221))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_socket->disconnect())) {
-            return PEAR::raiseError('Failed to disconnect socket: ' .
-                                    $error->getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Attempt to send the EHLO command and obtain a list of ESMTP
-     * extensions available, and failing that just send HELO.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access private
-     * @since  1.1.0
-     */
-    function _negotiate()
-    {
-        if (PEAR::isError($error = $this->_put('EHLO', $this->localhost))) {
-            return $error;
-        }
-
-        if (PEAR::isError($this->_parseResponse(250))) {
-            /* If we receive a 503 response, we're already authenticated. */
-            if ($this->_code === 503) {
-                return true;
-            }
-
-            /* If the EHLO failed, try the simpler HELO command. */
-            if (PEAR::isError($error = $this->_put('HELO', $this->localhost))) {
-                return $error;
-            }
-            if (PEAR::isError($this->_parseResponse(250))) {
-                return PEAR::raiseError('HELO was not accepted: ', $this->_code,
-                                        PEAR_ERROR_RETURN);
-            }
-
-            return true;
-        }
-
-        foreach ($this->_arguments as $argument) {
-            $verb = strtok($argument, ' ');
-            $arguments = substr($argument, strlen($verb) + 1,
-                                strlen($argument) - strlen($verb) - 1);
-            $this->_esmtp[$verb] = $arguments;
-        }
-
-        if (!isset($this->_esmtp['PIPELINING'])) {
-            $this->pipelining = false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the name of the best authentication method that the server
-     * has advertised.
-     *
-     * @return mixed    Returns a string containing the name of the best
-     *                  supported authentication method or a PEAR_Error object
-     *                  if a failure condition is encountered.
-     * @access private
-     * @since  1.1.0
-     */
-    function _getBestAuthMethod()
-    {
-        $available_methods = explode(' ', $this->_esmtp['AUTH']);
-
-        foreach ($this->auth_methods as $method => $callback) {
-            if (in_array($method, $available_methods)) {
-                return $method;
-            }
-        }
-
-        return PEAR::raiseError('No supported authentication methods',
-                                null, PEAR_ERROR_RETURN);
-    }
-
-    /**
-     * Attempt to do SMTP authentication.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The requested authentication method.  If none is
-     *               specified, the best supported method will be used.
-     * @param bool   Flag indicating whether or not TLS should be attempted.
-     * @param string An optional authorization identifier.  If specified, this
-     *               identifier will be used as the authorization proxy.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function auth($uid, $pwd , $method = '', $tls = true, $authz = '')
-    {
-        /* We can only attempt a TLS connection if one has been requested,
-         * we're running PHP 5.1.0 or later, have access to the OpenSSL 
-         * extension, are connected to an SMTP server which supports the 
-         * STARTTLS extension, and aren't already connected over a secure 
-         * (SSL) socket connection. */
-        if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') &&
-            extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) &&
-            strncasecmp($this->host, 'ssl://', 6) !== 0) {
-            /* Start the TLS connection attempt. */
-            if (PEAR::isError($result = $this->_put('STARTTLS'))) {
-                return $result;
-            }
-            if (PEAR::isError($result = $this->_parseResponse(220))) {
-                return $result;
-            }
-            if (PEAR::isError($result = $this->_socket->enableCrypto(true, STREAM_CRYPTO_METHOD_TLS_CLIENT))) {
-                return $result;
-            } elseif ($result !== true) {
-                return PEAR::raiseError('STARTTLS failed');
-            }
-
-            /* Send EHLO again to recieve the AUTH string from the
-             * SMTP server. */
-            $this->_negotiate();
-        }
-
-        if (empty($this->_esmtp['AUTH'])) {
-            return PEAR::raiseError('SMTP server does not support authentication');
-        }
-
-        /* If no method has been specified, get the name of the best
-         * supported method advertised by the SMTP server. */
-        if (empty($method)) {
-            if (PEAR::isError($method = $this->_getBestAuthMethod())) {
-                /* Return the PEAR_Error object from _getBestAuthMethod(). */
-                return $method;
-            }
-        } else {
-            $method = strtoupper($method);
-            if (!array_key_exists($method, $this->auth_methods)) {
-                return PEAR::raiseError("$method is not a supported authentication method");
-            }
-        }
-
-        if (!isset($this->auth_methods[$method])) {
-            return PEAR::raiseError("$method is not a supported authentication method");
-        }
-
-        if (!is_callable($this->auth_methods[$method], false)) {
-            return PEAR::raiseError("$method authentication method cannot be called");
-        }
-
-        if (is_array($this->auth_methods[$method])) {
-            list($object, $method) = $this->auth_methods[$method];
-            $result = $object->{$method}($uid, $pwd, $authz, $this);
-        } else {
-            $func =  $this->auth_methods[$method];
-            $result = $func($uid, $pwd, $authz, $this);
-         }
-
-        /* If an error was encountered, return the PEAR_Error object. */
-        if (PEAR::isError($result)) {
-            return $result;
-        }
-
-        return true;
-    }
-
-    /**
-     * Add a new authentication method.
-     *
-     * @param string    The authentication method name (e.g. 'PLAIN')
-     * @param mixed     The authentication callback (given as the name of a 
-     *                  function or as an (object, method name) array).
-     * @param bool      Should the new method be prepended to the list of 
-     *                  available methods?  This is the default behavior, 
-     *                  giving the new method the highest priority.
-     *
-     * @return  mixed   True on success or a PEAR_Error object on failure.
-     *
-     * @access public
-     * @since  1.6.0
-     */
-    function setAuthMethod($name, $callback, $prepend = true)
-    {
-        if (!is_string($name)) {
-            return PEAR::raiseError('Method name is not a string');
-        }
-
-        if (!is_string($callback) && !is_array($callback)) {
-            return PEAR::raiseError('Method callback must be string or array');
-        }
-
-        if (is_array($callback)) {
-            if (!is_object($callback[0]) || !is_string($callback[1]))
-                return PEAR::raiseError('Bad mMethod callback array');
-        }
-
-        if ($prepend) {
-            $this->auth_methods = array_merge(array($name => $callback),
-                                              $this->auth_methods);
-        } else {
-            $this->auth_methods[$name] = $callback;
-        }
-
-        return true;
-    }
-
-    /**
-     * Authenticates the user using the DIGEST-MD5 method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authDigest_MD5($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'DIGEST-MD5'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        $challenge = base64_decode($this->_arguments[0]);
-        $digest = &Auth_SASL::factory('digestmd5');
-        $auth_str = base64_encode($digest->getResponse($uid, $pwd, $challenge,
-                                                       $this->host, "smtp",
-                                                       $authz));
-
-        if (PEAR::isError($error = $this->_put($auth_str))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            return $error;
-        }
-
-        /* We don't use the protocol's third step because SMTP doesn't
-         * allow subsequent authentication, so we just silently ignore
-         * it. */
-        if (PEAR::isError($error = $this->_put(''))) {
-            return $error;
-        }
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-    }
-
-    /**
-     * Authenticates the user using the CRAM-MD5 method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authCRAM_MD5($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'CRAM-MD5'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        $challenge = base64_decode($this->_arguments[0]);
-        $cram = &Auth_SASL::factory('crammd5');
-        $auth_str = base64_encode($cram->getResponse($uid, $pwd, $challenge));
-
-        if (PEAR::isError($error = $this->_put($auth_str))) {
-            return $error;
-        }
-
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-    }
-
-    /**
-     * Authenticates the user using the LOGIN method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authLogin($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'LOGIN'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        if (PEAR::isError($error = $this->_put(base64_encode($uid)))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            return $error;
-        }
-
-        if (PEAR::isError($error = $this->_put(base64_encode($pwd)))) {
-            return $error;
-        }
-
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Authenticates the user using the PLAIN method.
-     *
-     * @param string The userid to authenticate as.
-     * @param string The password to authenticate with.
-     * @param string The optional authorization proxy identifier.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access private
-     * @since  1.1.0
-     */
-    function _authPlain($uid, $pwd, $authz = '')
-    {
-        if (PEAR::isError($error = $this->_put('AUTH', 'PLAIN'))) {
-            return $error;
-        }
-        /* 334: Continue authentication request */
-        if (PEAR::isError($error = $this->_parseResponse(334))) {
-            /* 503: Error: already authenticated */
-            if ($this->_code === 503) {
-                return true;
-            }
-            return $error;
-        }
-
-        $auth_str = base64_encode($authz . chr(0) . $uid . chr(0) . $pwd);
-
-        if (PEAR::isError($error = $this->_put($auth_str))) {
-            return $error;
-        }
-
-        /* 235: Authentication successful */
-        if (PEAR::isError($error = $this->_parseResponse(235))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the HELO command.
-     *
-     * @param string The domain name to say we are.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function helo($domain)
-    {
-        if (PEAR::isError($error = $this->_put('HELO', $domain))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return the list of SMTP service extensions advertised by the server.
-     *
-     * @return array The list of SMTP service extensions.
-     * @access public
-     * @since 1.3
-     */
-    function getServiceExtensions()
-    {
-        return $this->_esmtp;
-    }
-
-    /**
-     * Send the MAIL FROM: command.
-     *
-     * @param string $sender    The sender (reverse path) to set.
-     * @param string $params    String containing additional MAIL parameters,
-     *                          such as the NOTIFY flags defined by RFC 1891
-     *                          or the VERP protocol.
-     *
-     *                          If $params is an array, only the 'verp' option
-     *                          is supported.  If 'verp' is true, the XVERP
-     *                          parameter is appended to the MAIL command.  If
-     *                          the 'verp' value is a string, the full
-     *                          XVERP=value parameter is appended.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function mailFrom($sender, $params = null)
-    {
-        $args = "FROM:<$sender>";
-
-        /* Support the deprecated array form of $params. */
-        if (is_array($params) && isset($params['verp'])) {
-            /* XVERP */
-            if ($params['verp'] === true) {
-                $args .= ' XVERP';
-
-            /* XVERP=something */
-            } elseif (trim($params['verp'])) {
-                $args .= ' XVERP=' . $params['verp'];
-            }
-        } elseif (is_string($params) && !empty($params)) {
-            $args .= ' ' . $params;
-        }
-
-        if (PEAR::isError($error = $this->_put('MAIL', $args))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the RCPT TO: command.
-     *
-     * @param string $recipient The recipient (forward path) to add.
-     * @param string $params    String containing additional RCPT parameters,
-     *                          such as the NOTIFY flags defined by RFC 1891.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access public
-     * @since  1.0
-     */
-    function rcptTo($recipient, $params = null)
-    {
-        $args = "TO:<$recipient>";
-        if (is_string($params)) {
-            $args .= ' ' . $params;
-        }
-
-        if (PEAR::isError($error = $this->_put('RCPT', $args))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(array(250, 251), $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Quote the data so that it meets SMTP standards.
-     *
-     * This is provided as a separate public function to facilitate
-     * easier overloading for the cases where it is desirable to
-     * customize the quoting behavior.
-     *
-     * @param string $data  The message text to quote. The string must be passed
-     *                      by reference, and the text will be modified in place.
-     *
-     * @access public
-     * @since  1.2
-     */
-    function quotedata(&$data)
-    {
-        /* Change Unix (\n) and Mac (\r) linefeeds into
-         * Internet-standard CRLF (\r\n) linefeeds. */
-        $data = preg_replace(array('/(?<!\r)\n/','/\r(?!\n)/'), "\r\n", $data);
-
-        /* Because a single leading period (.) signifies an end to the
-         * data, legitimate leading periods need to be "doubled"
-         * (e.g. '..'). */
-        $data = str_replace("\n.", "\n..", $data);
-    }
-
-    /**
-     * Send the DATA command.
-     *
-     * @param mixed $data     The message data, either as a string or an open
-     *                        file resource.
-     * @param string $headers The message headers.  If $headers is provided,
-     *                        $data is assumed to contain only body data.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function data($data, $headers = null)
-    {
-        /* Verify that $data is a supported type. */
-        if (!is_string($data) && !is_resource($data)) {
-            return PEAR::raiseError('Expected a string or file resource');
-        }
-
-        /* Start by considering the size of the optional headers string.  We
-         * also account for the addition 4 character "\r\n\r\n" separator
-         * sequence. */
-        $size = (is_null($headers)) ? 0 : strlen($headers) + 4;
-
-        if (is_resource($data)) {
-            $stat = fstat($data);
-            if ($stat === false) {
-                return PEAR::raiseError('Failed to get file size');
-            }
-            $size += $stat['size'];
-        } else {
-            $size += strlen($data);
-        }
-
-        /* RFC 1870, section 3, subsection 3 states "a value of zero indicates
-         * that no fixed maximum message size is in force".  Furthermore, it
-         * says that if "the parameter is omitted no information is conveyed
-         * about the server's fixed maximum message size". */
-        $limit = (isset($this->_esmtp['SIZE'])) ? $this->_esmtp['SIZE'] : 0;
-        if ($limit > 0 && $size >= $limit) {
-            $this->disconnect();
-            return PEAR::raiseError('Message size exceeds server limit');
-        }
-
-        /* Initiate the DATA command. */
-        if (PEAR::isError($error = $this->_put('DATA'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(354))) {
-            return $error;
-        }
-
-        /* If we have a separate headers string, send it first. */
-        if (!is_null($headers)) {
-            $this->quotedata($headers);
-            if (PEAR::isError($result = $this->_send($headers . "\r\n\r\n"))) {
-                return $result;
-            }
-        }
-
-        /* Now we can send the message body data. */
-        if (is_resource($data)) {
-            /* Stream the contents of the file resource out over our socket 
-             * connection, line by line.  Each line must be run through the 
-             * quoting routine. */
-            while (strlen($line = fread($data, 8192)) > 0) {
-                /* If the last character is an newline, we need to grab the
-                 * next character to check to see if it is a period. */
-                while (!feof($data)) {
-                    $char = fread($data, 1);
-                    $line .= $char;
-                    if ($char != "\n") {
-                        break;
-                    }
-                }
-                $this->quotedata($line);
-                if (PEAR::isError($result = $this->_send($line))) {
-                    return $result;
-                }
-            }
-        } else {
-            /*
-             * Break up the data by sending one chunk (up to 512k) at a time.  
-             * This approach reduces our peak memory usage.
-             */
-            for ($offset = 0; $offset < $size;) {
-                $end = $offset + 512000;
-
-                /*
-                 * Ensure we don't read beyond our data size or span multiple 
-                 * lines.  quotedata() can't properly handle character data 
-                 * that's split across two line break boundaries.
-                 */
-                if ($end >= $size) {
-                    $end = $size;
-                } else {
-                    for (; $end < $size; $end++) {
-                        if ($data[$end] != "\n") {
-                            break;
-                        }
-                    }
-                }
-
-                /* Extract our chunk and run it through the quoting routine. */
-                $chunk = substr($data, $offset, $end - $offset);
-                $this->quotedata($chunk);
-
-                /* If we run into a problem along the way, abort. */
-                if (PEAR::isError($result = $this->_send($chunk))) {
-                    return $result;
-                }
-
-                /* Advance the offset to the end of this chunk. */
-                $offset = $end;
-            }
-        }
-
-        /* Finally, send the DATA terminator sequence. */
-        if (PEAR::isError($result = $this->_send("\r\n.\r\n"))) {
-            return $result;
-        }
-
-        /* Verify that the data was successfully received by the server. */
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the SEND FROM: command.
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.2.6
-     */
-    function sendFrom($path)
-    {
-        if (PEAR::isError($error = $this->_put('SEND', "FROM:<$path>"))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility wrapper for sendFrom().
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access      public
-     * @since       1.0
-     * @deprecated  1.2.6
-     */
-    function send_from($path)
-    {
-        return sendFrom($path);
-    }
-
-    /**
-     * Send the SOML FROM: command.
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.2.6
-     */
-    function somlFrom($path)
-    {
-        if (PEAR::isError($error = $this->_put('SOML', "FROM:<$path>"))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility wrapper for somlFrom().
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access      public
-     * @since       1.0
-     * @deprecated  1.2.6
-     */
-    function soml_from($path)
-    {
-        return somlFrom($path);
-    }
-
-    /**
-     * Send the SAML FROM: command.
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.2.6
-     */
-    function samlFrom($path)
-    {
-        if (PEAR::isError($error = $this->_put('SAML', "FROM:<$path>"))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility wrapper for samlFrom().
-     *
-     * @param string The reverse path to send.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     *
-     * @access      public
-     * @since       1.0
-     * @deprecated  1.2.6
-     */
-    function saml_from($path)
-    {
-        return samlFrom($path);
-    }
-
-    /**
-     * Send the RSET command.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function rset()
-    {
-        if (PEAR::isError($error = $this->_put('RSET'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250, $this->pipelining))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the VRFY command.
-     *
-     * @param string The string to verify
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function vrfy($string)
-    {
-        /* Note: 251 is also a valid response code */
-        if (PEAR::isError($error = $this->_put('VRFY', $string))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(array(250, 252)))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Send the NOOP command.
-     *
-     * @return mixed Returns a PEAR_Error with an error message on any
-     *               kind of failure, or true on success.
-     * @access public
-     * @since  1.0
-     */
-    function noop()
-    {
-        if (PEAR::isError($error = $this->_put('NOOP'))) {
-            return $error;
-        }
-        if (PEAR::isError($error = $this->_parseResponse(250))) {
-            return $error;
-        }
-
-        return true;
-    }
-
-    /**
-     * Backwards-compatibility method.  identifySender()'s functionality is
-     * now handled internally.
-     *
-     * @return  boolean     This method always return true.
-     *
-     * @access  public
-     * @since   1.0
-     */
-    function identifySender()
-    {
-        return true;
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/Socket.php Deleted

@@ -1,653 +0,0 @@
-<?php
-/**
- * Net_Socket
- *
- * PHP Version 4
- *
- * Copyright (c) 1997-2003 The PHP Group
- *
- * This source file is subject to version 2.0 of the PHP license,
- * that is bundled with this package in the file LICENSE, and is
- * available at through the world-wide-web at
- * http://www.php.net/license/2_02.txt.
- * If you did not receive a copy of the PHP license and are unable to
- * obtain it through the world-wide-web, please send a note to
- * license@php.net so we can mail you a copy immediately.
- *
- * Authors: Stig Bakken <ssb@php.net>
- *          Chuck Hagenbuch <chuck@horde.org>
- *
- * @category  Net
- * @package   Net_Socket
- * @author    Stig Bakken <ssb@php.net>
- * @author    Chuck Hagenbuch <chuck@horde.org>
- * @copyright 1997-2003 The PHP Group
- * @license   http://www.php.net/license/2_02.txt PHP 2.02
- * @version   CVS: $Id$
- * @link      http://pear.php.net/packages/Net_Socket
- */
-
-require_once 'PEAR.php';
-
-define('NET_SOCKET_READ', 1);
-define('NET_SOCKET_WRITE', 2);
-define('NET_SOCKET_ERROR', 4);
-
-/**
- * Generalized Socket class.
- *
- * @category  Net
- * @package   Net_Socket
- * @author    Stig Bakken <ssb@php.net>
- * @author    Chuck Hagenbuch <chuck@horde.org>
- * @copyright 1997-2003 The PHP Group
- * @license   http://www.php.net/license/2_02.txt PHP 2.02
- * @link      http://pear.php.net/packages/Net_Socket
- */
-class Net_Socket extends PEAR
-{
-    /**
-     * Socket file pointer.
-     * @var resource $fp
-     */
-    var $fp = null;
-
-    /**
-     * Whether the socket is blocking. Defaults to true.
-     * @var boolean $blocking
-     */
-    var $blocking = true;
-
-    /**
-     * Whether the socket is persistent. Defaults to false.
-     * @var boolean $persistent
-     */
-    var $persistent = false;
-
-    /**
-     * The IP address to connect to.
-     * @var string $addr
-     */
-    var $addr = '';
-
-    /**
-     * The port number to connect to.
-     * @var integer $port
-     */
-    var $port = 0;
-
-    /**
-     * Number of seconds to wait on socket connections before assuming
-     * there's no more data. Defaults to no timeout.
-     * @var integer $timeout
-     */
-    var $timeout = false;
-
-    /**
-     * Number of bytes to read at a time in readLine() and
-     * readAll(). Defaults to 2048.
-     * @var integer $lineLength
-     */
-    var $lineLength = 2048;
-
-    /**
-     * The string to use as a newline terminator. Usually "\r\n" or "\n".
-     * @var string $newline
-     */
-    var $newline = "\r\n";
-
-    /**
-     * Connect to the specified port. If called when the socket is
-     * already connected, it disconnects and connects again.
-     *
-     * @param string  $addr       IP address or host name.
-     * @param integer $port       TCP port number.
-     * @param boolean $persistent (optional) Whether the connection is
-     *                            persistent (kept open between requests
-     *                            by the web server).
-     * @param integer $timeout    (optional) How long to wait for data.
-     * @param array   $options    See options for stream_context_create.
-     *
-     * @access public
-     *
-     * @return boolean | PEAR_Error  True on success or a PEAR_Error on failure.
-     */
-    function connect($addr, $port = 0, $persistent = null,
-                     $timeout = null, $options = null)
-    {
-        if (is_resource($this->fp)) {
-            @fclose($this->fp);
-            $this->fp = null;
-        }
-
-        if (!$addr) {
-            return $this->raiseError('$addr cannot be empty');
-        } elseif (strspn($addr, '.0123456789') == strlen($addr) ||
-                  strstr($addr, '/') !== false) {
-            $this->addr = $addr;
-        } else {
-            $this->addr = @gethostbyname($addr);
-        }
-
-        $this->port = $port % 65536;
-
-        if ($persistent !== null) {
-            $this->persistent = $persistent;
-        }
-
-        if ($timeout !== null) {
-            $this->timeout = $timeout;
-        }
-
-        $openfunc = $this->persistent ? 'pfsockopen' : 'fsockopen';
-        $errno    = 0;
-        $errstr   = '';
-
-        $old_track_errors = @ini_set('track_errors', 1);
-
-        if ($options && function_exists('stream_context_create')) {
-            if ($this->timeout) {
-                $timeout = $this->timeout;
-            } else {
-                $timeout = 0;
-            }
-            $context = stream_context_create($options);
-
-            // Since PHP 5 fsockopen doesn't allow context specification
-            if (function_exists('stream_socket_client')) {
-                $flags = STREAM_CLIENT_CONNECT;
-
-                if ($this->persistent) {
-                    $flags = STREAM_CLIENT_PERSISTENT;
-                }
-
-                $addr = $this->addr . ':' . $this->port;
-                $fp   = stream_socket_client($addr, $errno, $errstr,
-                                             $timeout, $flags, $context);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno,
-                                 $errstr, $timeout, $context);
-            }
-        } else {
-            if ($this->timeout) {
-                $fp = @$openfunc($this->addr, $this->port, $errno,
-                                 $errstr, $this->timeout);
-            } else {
-                $fp = @$openfunc($this->addr, $this->port, $errno, $errstr);
-            }
-        }
-
-        if (!$fp) {
-            if ($errno == 0 && !strlen($errstr) && isset($php_errormsg)) {
-                $errstr = $php_errormsg;
-            }
-            @ini_set('track_errors', $old_track_errors);
-            return $this->raiseError($errstr, $errno);
-        }
-
-        @ini_set('track_errors', $old_track_errors);
-        $this->fp = $fp;
-
-        return $this->setBlocking($this->blocking);
-    }
-
-    /**
-     * Disconnects from the peer, closes the socket.
-     *
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    function disconnect()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        @fclose($this->fp);
-        $this->fp = null;
-        return true;
-    }
-
-    /**
-     * Set the newline character/sequence to use.
-     *
-     * @param string $newline  Newline character(s)
-     * @return boolean True
-     */
-    function setNewline($newline)
-    {
-        $this->newline = $newline;
-        return true;
-    }
-
-    /**
-     * Find out if the socket is in blocking mode.
-     *
-     * @access public
-     * @return boolean  The current blocking mode.
-     */
-    function isBlocking()
-    {
-        return $this->blocking;
-    }
-
-    /**
-     * Sets whether the socket connection should be blocking or
-     * not. A read call to a non-blocking socket will return immediately
-     * if there is no data available, whereas it will block until there
-     * is data for blocking sockets.
-     *
-     * @param boolean $mode True for blocking sockets, false for nonblocking.
-     *
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    function setBlocking($mode)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $this->blocking = $mode;
-        stream_set_blocking($this->fp, (int)$this->blocking);
-        return true;
-    }
-
-    /**
-     * Sets the timeout value on socket descriptor,
-     * expressed in the sum of seconds and microseconds
-     *
-     * @param integer $seconds      Seconds.
-     * @param integer $microseconds Microseconds.
-     *
-     * @access public
-     * @return mixed true on success or a PEAR_Error instance otherwise
-     */
-    function setTimeout($seconds, $microseconds)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_set_timeout($this->fp, $seconds, $microseconds);
-    }
-
-    /**
-     * Sets the file buffering size on the stream.
-     * See php's stream_set_write_buffer for more information.
-     *
-     * @param integer $size Write buffer size.
-     *
-     * @access public
-     * @return mixed on success or an PEAR_Error object otherwise
-     */
-    function setWriteBuffer($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $returned = stream_set_write_buffer($this->fp, $size);
-        if ($returned == 0) {
-            return true;
-        }
-        return $this->raiseError('Cannot set write buffer.');
-    }
-
-    /**
-     * Returns information about an existing socket resource.
-     * Currently returns four entries in the result array:
-     *
-     * <p>
-     * timed_out (bool) - The socket timed out waiting for data<br>
-     * blocked (bool) - The socket was blocked<br>
-     * eof (bool) - Indicates EOF event<br>
-     * unread_bytes (int) - Number of bytes left in the socket buffer<br>
-     * </p>
-     *
-     * @access public
-     * @return mixed Array containing information about existing socket
-     *               resource or a PEAR_Error instance otherwise
-     */
-    function getStatus()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return socket_get_status($this->fp);
-    }
-
-    /**
-     * Get a specified line of data
-     *
-     * @param int $size ??
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function gets($size = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($size)) {
-            return @fgets($this->fp);
-        } else {
-            return @fgets($this->fp, $size);
-        }
-    }
-
-    /**
-     * Read a specified amount of data. This is guaranteed to return,
-     * and has the added benefit of getting everything in one fread()
-     * chunk; if you know the size of the data you're getting
-     * beforehand, this is definitely the way to go.
-     *
-     * @param integer $size The number of bytes to read from the socket.
-     *
-     * @access public
-     * @return $size bytes of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function read($size)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return @fread($this->fp, $size);
-    }
-
-    /**
-     * Write a specified amount of data.
-     *
-     * @param string  $data      Data to write.
-     * @param integer $blocksize Amount of data to write at once.
-     *                           NULL means all at once.
-     *
-     * @access public
-     * @return mixed If the socket is not connected, returns an instance of
-     *               PEAR_Error
-     *               If the write succeeds, returns the number of bytes written
-     *               If the write fails, returns false.
-     */
-    function write($data, $blocksize = null)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        if (is_null($blocksize) && !OS_WINDOWS) {
-            return @fwrite($this->fp, $data);
-        } else {
-            if (is_null($blocksize)) {
-                $blocksize = 1024;
-            }
-
-            $pos  = 0;
-            $size = strlen($data);
-            while ($pos < $size) {
-                $written = @fwrite($this->fp, substr($data, $pos, $blocksize));
-                if (!$written) {
-                    return $written;
-                }
-                $pos += $written;
-            }
-
-            return $pos;
-        }
-    }
-
-    /**
-     * Write a line of data to the socket, followed by a trailing newline.
-     *
-     * @param string $data Data to write
-     *
-     * @access public
-     * @return mixed fputs result, or an error
-     */
-    function writeLine($data)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return fwrite($this->fp, $data . $this->newline);
-    }
-
-    /**
-     * Tests for end-of-file on a socket descriptor.
-     *
-     * Also returns true if the socket is disconnected.
-     *
-     * @access public
-     * @return bool
-     */
-    function eof()
-    {
-        return (!is_resource($this->fp) || feof($this->fp));
-    }
-
-    /**
-     * Reads a byte of data
-     *
-     * @access public
-     * @return 1 byte of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readByte()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        return ord(@fread($this->fp, 1));
-    }
-
-    /**
-     * Reads a word of data
-     *
-     * @access public
-     * @return 1 word of data from the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readWord()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 2);
-        return (ord($buf[0]) + (ord($buf[1]) << 8));
-    }
-
-    /**
-     * Reads an int of data
-     *
-     * @access public
-     * @return integer  1 int of data from the socket, or a PEAR_Error if
-     *                  not connected.
-     */
-    function readInt()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return (ord($buf[0]) + (ord($buf[1]) << 8) +
-                (ord($buf[2]) << 16) + (ord($buf[3]) << 24));
-    }
-
-    /**
-     * Reads a zero-terminated string of data
-     *
-     * @access public
-     * @return string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readString()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $string = '';
-        while (($char = @fread($this->fp, 1)) != "\x00") {
-            $string .= $char;
-        }
-        return $string;
-    }
-
-    /**
-     * Reads an IP Address and returns it in a dot formatted string
-     *
-     * @access public
-     * @return Dot formatted string, or a PEAR_Error if
-     *         not connected.
-     */
-    function readIPAddress()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $buf = @fread($this->fp, 4);
-        return sprintf('%d.%d.%d.%d', ord($buf[0]), ord($buf[1]),
-                       ord($buf[2]), ord($buf[3]));
-    }
-
-    /**
-     * Read until either the end of the socket or a newline, whichever
-     * comes first. Strips the trailing newline from the returned data.
-     *
-     * @access public
-     * @return All available data up to a newline, without that
-     *         newline, or until the end of the socket, or a PEAR_Error if
-     *         not connected.
-     */
-    function readLine()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $line = '';
-
-        $timeout = time() + $this->timeout;
-
-        while (!feof($this->fp) && (!$this->timeout || time() < $timeout)) {
-            $line .= @fgets($this->fp, $this->lineLength);
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, $this->newline);
-            }
-        }
-        return $line;
-    }
-
-    /**
-     * Read until the socket closes, or until there is no more data in
-     * the inner PHP buffer. If the inner buffer is empty, in blocking
-     * mode we wait for at least 1 byte of data. Therefore, in
-     * blocking mode, if there is no data at all to be read, this
-     * function will never exit (unless the socket is closed on the
-     * remote end).
-     *
-     * @access public
-     *
-     * @return string  All data until the socket closes, or a PEAR_Error if
-     *                 not connected.
-     */
-    function readAll()
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $data = '';
-        while (!feof($this->fp)) {
-            $data .= @fread($this->fp, $this->lineLength);
-        }
-        return $data;
-    }
-
-    /**
-     * Runs the equivalent of the select() system call on the socket
-     * with a timeout specified by tv_sec and tv_usec.
-     *
-     * @param integer $state   Which of read/write/error to check for.
-     * @param integer $tv_sec  Number of seconds for timeout.
-     * @param integer $tv_usec Number of microseconds for timeout.
-     *
-     * @access public
-     * @return False if select fails, integer describing which of read/write/error
-     *         are ready, or PEAR_Error if not connected.
-     */
-    function select($state, $tv_sec, $tv_usec = 0)
-    {
-        if (!is_resource($this->fp)) {
-            return $this->raiseError('not connected');
-        }
-
-        $read   = null;
-        $write  = null;
-        $except = null;
-        if ($state & NET_SOCKET_READ) {
-            $read[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_WRITE) {
-            $write[] = $this->fp;
-        }
-        if ($state & NET_SOCKET_ERROR) {
-            $except[] = $this->fp;
-        }
-        if (false === ($sr = stream_select($read, $write, $except,
-                                          $tv_sec, $tv_usec))) {
-            return false;
-        }
-
-        $result = 0;
-        if (count($read)) {
-            $result |= NET_SOCKET_READ;
-        }
-        if (count($write)) {
-            $result |= NET_SOCKET_WRITE;
-        }
-        if (count($except)) {
-            $result |= NET_SOCKET_ERROR;
-        }
-        return $result;
-    }
-
-    /**
-     * Turns encryption on/off on a connected socket.
-     *
-     * @param bool    $enabled Set this parameter to true to enable encryption
-     *                         and false to disable encryption.
-     * @param integer $type    Type of encryption. See stream_socket_enable_crypto()
-     *                         for values.
-     *
-     * @see    http://se.php.net/manual/en/function.stream-socket-enable-crypto.php
-     * @access public
-     * @return false on error, true on success and 0 if there isn't enough data
-     *         and the user should try again (non-blocking sockets only).
-     *         A PEAR_Error object is returned if the socket is not
-     *         connected
-     */
-    function enableCrypto($enabled, $type)
-    {
-        if (version_compare(phpversion(), "5.1.0", ">=")) {
-            if (!is_resource($this->fp)) {
-                return $this->raiseError('not connected');
-            }
-            return @stream_socket_enable_crypto($this->fp, $enabled, $type);
-        } else {
-            $msg = 'Net_Socket::enableCrypto() requires php version >= 5.1.0';
-            return $this->raiseError($msg);
-        }
-    }
-
-}

iRony-0.4.2.tar.gz/lib/FileAPI/ext/Net/URL2.php Deleted

@@ -1,942 +0,0 @@
-<?php
-/**
- * Net_URL2, a class representing a URL as per RFC 3986.
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2007-2009, Peytz & Co. A/S
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the distribution.
- *   * Neither the name of the Net_URL2 nor the names of its contributors may
- *     be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category  Networking
- * @package   Net_URL2
- * @author    Christian Schmidt <schmidt@php.net>
- * @copyright 2007-2009 Peytz & Co. A/S
- * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version   CVS: $Id: URL2.php 309223 2011-03-14 14:26:32Z till $
- * @link      http://www.rfc-editor.org/rfc/rfc3986.txt
- */
-
-/**
- * Represents a URL as per RFC 3986.
- *
- * @category  Networking
- * @package   Net_URL2
- * @author    Christian Schmidt <schmidt@php.net>
- * @copyright 2007-2009 Peytz & Co. A/S
- * @license   http://www.opensource.org/licenses/bsd-license.php New BSD License
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/Net_URL2
- */
-class Net_URL2
-{
-    /**
-     * Do strict parsing in resolve() (see RFC 3986, section 5.2.2). Default
-     * is true.
-     */
-    const OPTION_STRICT = 'strict';
-
-    /**
-     * Represent arrays in query using PHP's [] notation. Default is true.
-     */
-    const OPTION_USE_BRACKETS = 'use_brackets';
-
-    /**
-     * URL-encode query variable keys. Default is true.
-     */
-    const OPTION_ENCODE_KEYS = 'encode_keys';
-
-    /**
-     * Query variable separators when parsing the query string. Every character
-     * is considered a separator. Default is "&".
-     */
-    const OPTION_SEPARATOR_INPUT = 'input_separator';
-
-    /**
-     * Query variable separator used when generating the query string. Default
-     * is "&".
-     */
-    const OPTION_SEPARATOR_OUTPUT = 'output_separator';
-
-    /**
-     * Default options corresponds to how PHP handles $_GET.
-     */
-    private $_options = array(
-        self::OPTION_STRICT           => true,
-        self::OPTION_USE_BRACKETS     => true,
-        self::OPTION_ENCODE_KEYS      => true,
-        self::OPTION_SEPARATOR_INPUT  => '&',
-        self::OPTION_SEPARATOR_OUTPUT => '&',
-        );
-
-    /**
-     * @var  string|bool
-     */
-    private $_scheme = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_userinfo = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_host = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_port = false;
-
-    /**
-     * @var  string
-     */
-    private $_path = '';
-
-    /**
-     * @var  string|bool
-     */
-    private $_query = false;
-
-    /**
-     * @var  string|bool
-     */
-    private $_fragment = false;
-
-    /**
-     * Constructor.
-     *
-     * @param string $url     an absolute or relative URL
-     * @param array  $options an array of OPTION_xxx constants
-     *
-     * @return $this
-     * @uses   self::parseUrl()
-     */
-    public function __construct($url, array $options = array())
-    {
-        foreach ($options as $optionName => $value) {
-            if (array_key_exists($optionName, $this->_options)) {
-                $this->_options[$optionName] = $value;
-            }
-        }
-
-        $this->parseUrl($url);
-    }
-
-    /**
-     * Magic Setter.
-     *
-     * This method will magically set the value of a private variable ($var)
-     * with the value passed as the args
-     *
-     * @param  string $var      The private variable to set.
-     * @param  mixed  $arg      An argument of any type.
-     * @return void
-     */
-    public function __set($var, $arg)
-    {
-        $method = 'set' . $var;
-        if (method_exists($this, $method)) {
-            $this->$method($arg);
-        }
-    }
-
-    /**
-     * Magic Getter.
-     *
-     * This is the magic get method to retrieve the private variable
-     * that was set by either __set() or it's setter...
-     *
-     * @param  string $var         The property name to retrieve.
-     * @return mixed  $this->$var  Either a boolean false if the
-     *                             property is not set or the value
-     *                             of the private property.
-     */
-    public function __get($var)
-    {
-        $method = 'get' . $var;
-        if (method_exists($this, $method)) {
-            return $this->$method();
-        }
-
-        return false;
-    }
-
-    /**
-     * Returns the scheme, e.g. "http" or "urn", or false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @return  string|bool
-     */
-    public function getScheme()
-    {
-        return $this->_scheme;
-    }
-
-    /**
-     * Sets the scheme, e.g. "http" or "urn". Specify false if there is no
-     * scheme specified, i.e. if this is a relative URL.
-     *
-     * @param string|bool $scheme e.g. "http" or "urn", or false if there is no
-     *                            scheme specified, i.e. if this is a relative
-     *                            URL
-     *
-     * @return $this
-     * @see    getScheme()
-     */
-    public function setScheme($scheme)
-    {
-        $this->_scheme = $scheme;
-        return $this;
-    }
-
-    /**
-     * Returns the user part of the userinfo part (the part preceding the first
-     *  ":"), or false if there is no userinfo part.
-     *
-     * @return  string|bool
-     */
-    public function getUser()
-    {
-        return $this->_userinfo !== false
-            ? preg_replace('@:.*$@', '', $this->_userinfo)
-            : false;
-    }
-
-    /**
-     * Returns the password part of the userinfo part (the part after the first
-     *  ":"), or false if there is no userinfo part (i.e. the URL does not
-     * contain "@" in front of the hostname) or the userinfo part does not
-     * contain ":".
-     *
-     * @return  string|bool
-     */
-    public function getPassword()
-    {
-        return $this->_userinfo !== false
-            ? substr(strstr($this->_userinfo, ':'), 1)
-            : false;
-    }
-
-    /**
-     * Returns the userinfo part, or false if there is none, i.e. if the
-     * authority part does not contain "@".
-     *
-     * @return  string|bool
-     */
-    public function getUserinfo()
-    {
-        return $this->_userinfo;
-    }
-
-    /**
-     * Sets the userinfo part. If two arguments are passed, they are combined
-     * in the userinfo part as username ":" password.
-     *
-     * @param string|bool $userinfo userinfo or username
-     * @param string|bool $password optional password, or false
-     *
-     * @return $this
-     */
-    public function setUserinfo($userinfo, $password = false)
-    {
-        $this->_userinfo = $userinfo;
-        if ($password !== false) {
-            $this->_userinfo .= ':' . $password;
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the host part, or false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @return  string|bool a hostname, an IP address, or false
-     */
-    public function getHost()
-    {
-        return $this->_host;
-    }
-
-    /**
-     * Sets the host part. Specify false if there is no authority part, e.g.
-     * relative URLs.
-     *
-     * @param string|bool $host a hostname, an IP address, or false
-     *
-     * @return $this
-     */
-    public function setHost($host)
-    {
-        $this->_host = $host;
-        return $this;
-    }
-
-    /**
-     * Returns the port number, or false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @return  string|bool
-     */
-    public function getPort()
-    {
-        return $this->_port;
-    }
-
-    /**
-     * Sets the port number. Specify false if there is no port number specified,
-     * i.e. if the default port is to be used.
-     *
-     * @param string|bool $port a port number, or false
-     *
-     * @return $this
-     */
-    public function setPort($port)
-    {
-        $this->_port = $port;
-        return $this;
-    }
-
-    /**
-     * Returns the authority part, i.e. [ userinfo "@" ] host [ ":" port ], or
-     * false if there is no authority.
-     *
-     * @return string|bool
-     */
-    public function getAuthority()
-    {
-        if (!$this->_host) {
-            return false;
-        }
-
-        $authority = '';
-
-        if ($this->_userinfo !== false) {
-            $authority .= $this->_userinfo . '@';
-        }
-
-        $authority .= $this->_host;
-
-        if ($this->_port !== false) {
-            $authority .= ':' . $this->_port;
-        }
-
-        return $authority;
-    }
-
-    /**
-     * Sets the authority part, i.e. [ userinfo "@" ] host [ ":" port ]. Specify
-     * false if there is no authority.
-     *
-     * @param string|false $authority a hostname or an IP addresse, possibly
-     *                                with userinfo prefixed and port number
-     *                                appended, e.g. "foo:bar@example.org:81".
-     *
-     * @return $this
-     */
-    public function setAuthority($authority)
-    {
-        $this->_userinfo = false;
-        $this->_host     = false;
-        $this->_port     = false;
-        if (preg_match('@^(([^\@]*)\@)?([^:]+)(:(\d*))?$@', $authority, $reg)) {
-            if ($reg[1]) {
-                $this->_userinfo = $reg[2];
-            }
-
-            $this->_host = $reg[3];
-            if (isset($reg[5])) {
-                $this->_port = $reg[5];
-            }
-        }
-        return $this;
-    }
-
-    /**
-     * Returns the path part (possibly an empty string).
-     *
-     * @return string
-     */
-    public function getPath()
-    {
-        return $this->_path;
-    }
-
-    /**
-     * Sets the path part (possibly an empty string).
-     *
-     * @param string $path a path
-     *
-     * @return $this
-     */
-    public function setPath($path)
-    {
-        $this->_path = $path;
-        return $this;
-    }
-
-    /**
-     * Returns the query string (excluding the leading "?"), or false if "?"
-     * is not present in the URL.
-     *
-     * @return  string|bool
-     * @see     self::getQueryVariables()
-     */
-    public function getQuery()
-    {
-        return $this->_query;
-    }
-
-    /**
-     * Sets the query string (excluding the leading "?"). Specify false if "?"
-     * is not present in the URL.
-     *
-     * @param string|bool $query a query string, e.g. "foo=1&bar=2"
-     *
-     * @return $this
-     * @see    self::setQueryVariables()
-     */
-    public function setQuery($query)
-    {
-        $this->_query = $query;
-        return $this;
-    }
-
-    /**
-     * Returns the fragment name, or false if "#" is not present in the URL.
-     *
-     * @return  string|bool
-     */
-    public function getFragment()
-    {
-        return $this->_fragment;
-    }
-
-    /**
-     * Sets the fragment name. Specify false if "#" is not present in the URL.
-     *
-     * @param string|bool $fragment a fragment excluding the leading "#", or
-     *                              false
-     *
-     * @return $this
-     */
-    public function setFragment($fragment)
-    {
-        $this->_fragment = $fragment;
-        return $this;
-    }
-
-    /**
-     * Returns the query string like an array as the variables would appear in
-     * $_GET in a PHP script. If the URL does not contain a "?", an empty array
-     * is returned.
-     *
-     * @return  array
-     */
-    public function getQueryVariables()
-    {
-        $pattern = '/[' .
-                   preg_quote($this->getOption(self::OPTION_SEPARATOR_INPUT), '/') .
-                   ']/';
-        $parts   = preg_split($pattern, $this->_query, -1, PREG_SPLIT_NO_EMPTY);
-        $return  = array();
-
-        foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
-                list($key, $value) = explode('=', $part, 2);
-            } else {
-                $key   = $part;
-                $value = null;
-            }
-
-            if ($this->getOption(self::OPTION_ENCODE_KEYS)) {
-                $key = rawurldecode($key);
-            }
-            $value = rawurldecode($value);
-
-            if ($this->getOption(self::OPTION_USE_BRACKETS) &&
-                preg_match('#^(.*)\[([0-9a-z_-]*)\]#i', $key, $matches)) {
-
-                $key = $matches[1];
-                $idx = $matches[2];
-
-                // Ensure is an array
-                if (empty($return[$key]) || !is_array($return[$key])) {
-                    $return[$key] = array();
-                }
-
-                // Add data
-                if ($idx === '') {
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key][$idx] = $value;
-                }
-            } elseif (!$this->getOption(self::OPTION_USE_BRACKETS)
-                      && !empty($return[$key])
-            ) {
-                $return[$key]   = (array) $return[$key];
-                $return[$key][] = $value;
-            } else {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-     * Sets the query string to the specified variable in the query string.
-     *
-     * @param array $array (name => value) array
-     *
-     * @return $this
-     */
-    public function setQueryVariables(array $array)
-    {
-        if (!$array) {
-            $this->_query = false;
-        } else {
-            $this->_query = $this->buildQuery(
-                $array,
-                $this->getOption(self::OPTION_SEPARATOR_OUTPUT)
-            );
-        }
-        return $this;
-    }
-
-    /**
-     * Sets the specified variable in the query string.
-     *
-     * @param string $name  variable name
-     * @param mixed  $value variable value
-     *
-     * @return $this
-     */
-    public function setQueryVariable($name, $value)
-    {
-        $array = $this->getQueryVariables();
-        $array[$name] = $value;
-        $this->setQueryVariables($array);
-        return $this;
-    }
-
-    /**
-     * Removes the specifed variable from the query string.
-     *
-     * @param string $name a query string variable, e.g. "foo" in "?foo=1"
-     *
-     * @return void
-     */
-    public function unsetQueryVariable($name)
-    {
-        $array = $this->getQueryVariables();
-        unset($array[$name]);
-        $this->setQueryVariables($array);
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return  string
-     */
-    public function getURL()
-    {
-        // See RFC 3986, section 5.3
-        $url = "";
-
-        if ($this->_scheme !== false) {
-            $url .= $this->_scheme . ':';
-        }
-
-        $authority = $this->getAuthority();
-        if ($authority !== false) {
-            $url .= '//' . $authority;
-        }
-        $url .= $this->_path;
-
-        if ($this->_query !== false) {
-            $url .= '?' . $this->_query;
-        }
-
-        if ($this->_fragment !== false) {
-            $url .= '#' . $this->_fragment;
-        }
-    
-        return $url;
-    }
-
-    /**
-     * Returns a string representation of this URL.
-     *
-     * @return  string
-     * @see toString()
-     */
-    public function __toString()
-    {
-        return $this->getURL();
-    }
-
-    /** 
-     * Returns a normalized string representation of this URL. This is useful
-     * for comparison of URLs.
-     *
-     * @return  string
-     */
-    public function getNormalizedURL()
-    {
-        $url = clone $this;
-        $url->normalize();
-        return $url->getUrl();
-    }
-
-    /** 
-     * Returns a normalized Net_URL2 instance.
-     *
-     * @return  Net_URL2
-     */
-    public function normalize()
-    {
-        // See RFC 3886, section 6
-
-        // Schemes are case-insensitive
-        if ($this->_scheme) {
-            $this->_scheme = strtolower($this->_scheme);
-        }
-
-        // Hostnames are case-insensitive
-        if ($this->_host) {
-            $this->_host = strtolower($this->_host);
-        }
-
-        // Remove default port number for known schemes (RFC 3986, section 6.2.3)
-        if ($this->_port &&
-            $this->_scheme &&
-            $this->_port == getservbyname($this->_scheme, 'tcp')) {
-
-            $this->_port = false;
-        }
-
-        // Normalize case of %XX percentage-encodings (RFC 3986, section 6.2.2.1)
-        foreach (array('_userinfo', '_host', '_path') as $part) {
-            if ($this->$part) {
-                $this->$part = preg_replace('/%[0-9a-f]{2}/ie',
-                                            'strtoupper("\0")',
-                                            $this->$part);
-            }
-        }
-
-        // Path segment normalization (RFC 3986, section 6.2.2.3)
-        $this->_path = self::removeDotSegments($this->_path);
-
-        // Scheme based normalization (RFC 3986, section 6.2.3)
-        if ($this->_host && !$this->_path) {
-            $this->_path = '/';
-        }
-    }
-
-    /**
-     * Returns whether this instance represents an absolute URL.
-     *
-     * @return  bool
-     */
-    public function isAbsolute()
-    {
-        return (bool) $this->_scheme;
-    }
-
-    /**
-     * Returns an Net_URL2 instance representing an absolute URL relative to
-     * this URL.
-     *
-     * @param Net_URL2|string $reference relative URL
-     *
-     * @return Net_URL2
-     */
-    public function resolve($reference)
-    {
-        if (!$reference instanceof Net_URL2) {
-            $reference = new self($reference);
-        }
-        if (!$this->isAbsolute()) {
-            throw new Exception('Base-URL must be absolute');
-        }
-
-        // A non-strict parser may ignore a scheme in the reference if it is
-        // identical to the base URI's scheme.
-        if (!$this->getOption(self::OPTION_STRICT) && $reference->_scheme == $this->_scheme) {
-            $reference->_scheme = false;
-        }
-
-        $target = new self('');
-        if ($reference->_scheme !== false) {
-            $target->_scheme = $reference->_scheme;
-            $target->setAuthority($reference->getAuthority());
-            $target->_path  = self::removeDotSegments($reference->_path);
-            $target->_query = $reference->_query;
-        } else {
-            $authority = $reference->getAuthority();
-            if ($authority !== false) {
-                $target->setAuthority($authority);
-                $target->_path  = self::removeDotSegments($reference->_path);
-                $target->_query = $reference->_query;
-            } else {
-                if ($reference->_path == '') {
-                    $target->_path = $this->_path;
-                    if ($reference->_query !== false) {
-                        $target->_query = $reference->_query;
-                    } else {
-                        $target->_query = $this->_query;
-                    }
-                } else {
-                    if (substr($reference->_path, 0, 1) == '/') {
-                        $target->_path = self::removeDotSegments($reference->_path);
-                    } else {
-                        // Merge paths (RFC 3986, section 5.2.3)
-                        if ($this->_host !== false && $this->_path == '') {
-                            $target->_path = '/' . $this->_path;
-                        } else {
-                            $i = strrpos($this->_path, '/');
-                            if ($i !== false) {
-                                $target->_path = substr($this->_path, 0, $i + 1);
-                            }
-                            $target->_path .= $reference->_path;
-                        }
-                        $target->_path = self::removeDotSegments($target->_path);
-                    }
-                    $target->_query = $reference->_query;
-                }
-                $target->setAuthority($this->getAuthority());
-            }
-            $target->_scheme = $this->_scheme;
-        }
-
-        $target->_fragment = $reference->_fragment;
-
-        return $target;
-    }
-
-    /**
-     * Removes dots as described in RFC 3986, section 5.2.4, e.g.
-     * "/foo/../bar/baz" => "/bar/baz"
-     *
-     * @param string $path a path
-     *
-     * @return string a path
-     */
-    public static function removeDotSegments($path)
-    {
-        $output = '';
-
-        // Make sure not to be trapped in an infinite loop due to a bug in this
-        // method
-        $j = 0;
-        while ($path && $j++ < 100) {
-            if (substr($path, 0, 2) == './') {
-                // Step 2.A
-                $path = substr($path, 2);
-            } elseif (substr($path, 0, 3) == '../') {
-                // Step 2.A
-                $path = substr($path, 3);
-            } elseif (substr($path, 0, 3) == '/./' || $path == '/.') {
-                // Step 2.B
-                $path = '/' . substr($path, 3);
-            } elseif (substr($path, 0, 4) == '/../' || $path == '/..') {
-                // Step 2.C
-                $path   = '/' . substr($path, 4);
-                $i      = strrpos($output, '/');
-                $output = $i === false ? '' : substr($output, 0, $i);
-            } elseif ($path == '.' || $path == '..') {
-                // Step 2.D
-                $path = '';
-            } else {
-                // Step 2.E
-                $i = strpos($path, '/');
-                if ($i === 0) {
-                    $i = strpos($path, '/', 1);
-                }
-                if ($i === false) {
-                    $i = strlen($path);
-                }
-                $output .= substr($path, 0, $i);
-                $path = substr($path, $i);
-            }
-        }
-
-        return $output;
-    }
-
-    /**
-     * Percent-encodes all non-alphanumeric characters except these: _ . - ~
-     * Similar to PHP's rawurlencode(), except that it also encodes ~ in PHP
-     * 5.2.x and earlier.
-     *
-     * @param  $raw the string to encode
-     * @return string
-     */
-    public static function urlencode($string)
-    {
-    	$encoded = rawurlencode($string);
-
-        // This is only necessary in PHP < 5.3.
-        $encoded = str_replace('%7E', '~', $encoded);
-        return $encoded;
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the canonical URL of the
-     * currently executing PHP script.
-     *
-     * @return  string
-     */
-    public static function getCanonical()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['PHP_SELF']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        $url->_host   = $_SERVER['SERVER_NAME'];
-        $port = $_SERVER['SERVER_PORT'];
-        if ($url->_scheme == 'http' && $port != 80 ||
-            $url->_scheme == 'https' && $port != 443) {
-
-            $url->_port = $port;
-        }
-        return $url;
-    }
-
-    /**
-     * Returns the URL used to retrieve the current request.
-     *
-     * @return  string
-     */
-    public static function getRequestedURL()
-    {
-        return self::getRequested()->getUrl();
-    }
-
-    /**
-     * Returns a Net_URL2 instance representing the URL used to retrieve the
-     * current request.
-     *
-     * @return  Net_URL2
-     */
-    public static function getRequested()
-    {
-        if (!isset($_SERVER['REQUEST_METHOD'])) {
-            // ALERT - no current URL
-            throw new Exception('Script was not called through a webserver');
-        }
-
-        // Begin with a relative URL
-        $url = new self($_SERVER['REQUEST_URI']);
-        $url->_scheme = isset($_SERVER['HTTPS']) ? 'https' : 'http';
-        // Set host and possibly port
-        $url->setAuthority($_SERVER['HTTP_HOST']);
-        return $url;
-    }
-
-    /**
-     * Returns the value of the specified option.
-     *
-     * @param string $optionName The name of the option to retrieve
-     *
-     * @return  mixed
-     */
-    public function getOption($optionName)
-    {
-        return isset($this->_options[$optionName])
-            ? $this->_options[$optionName] : false;
-    }
-
-    /**
-     * A simple version of http_build_query in userland. The encoded string is
-     * percentage encoded according to RFC 3986.
-     *
-     * @param array  $data      An array, which has to be converted into
-     *                          QUERY_STRING. Anything is possible.
-     * @param string $seperator See {@link self::OPTION_SEPARATOR_OUTPUT}
-     * @param string $key       For stacked values (arrays in an array).
-     *
-     * @return string
-     */
-    protected function buildQuery(array $data, $separator, $key = null)
-    {
-        $query = array();
-        foreach ($data as $name => $value) {
-            if ($this->getOption(self::OPTION_ENCODE_KEYS) === true) {
-                $name = rawurlencode($name);
-            }
-            if ($key !== null) {
-                if ($this->getOption(self::OPTION_USE_BRACKETS) === true) {
-                    $name = $key . '[' . $name . ']';
-                } else {
-                    $name = $key;
-                }
-            }
-            if (is_array($value)) {
-                $query[] = $this->buildQuery($value, $separator, $name);
-            } else {
-                $query[] = $name . '=' . rawurlencode($value);
-            }
-        }
-        return implode($separator, $query);
-    }
-
-    /**
-     * This method uses a funky regex to parse the url into the designated parts.
-     *
-     * @param string $url
-     *
-     * @return void
-     * @uses   self::$_scheme, self::setAuthority(), self::$_path, self::$_query,
-     *         self::$_fragment
-     * @see    self::__construct()
-     */
-    protected function parseUrl($url)
-    {
-        // The regular expression is copied verbatim from RFC 3986, appendix B.
-        // The expression does not validate the URL but matches any string.
-        preg_match('!^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?!',
-                   $url,
-                   $matches);
-
-        // "path" is always present (possibly as an empty string); the rest
-        // are optional.
-        $this->_scheme   = !empty($matches[1]) ? $matches[2] : false;
-        $this->setAuthority(!empty($matches[3]) ? $matches[4] : false);
-        $this->_path     = $matches[5];
-        $this->_query    = !empty($matches[6]) ? $matches[7] : false;
-        $this->_fragment = !empty($matches[8]) ? $matches[9] : false;
-    }
-}

iRony-0.4.2.tar.gz/lib/FileAPI/ext/PEAR.php Deleted

@@ -1,1137 +0,0 @@
-<?php
-/**
- * PEAR, the PHP Extension and Application Repository
- *
- * PEAR class and PEAR_Error class
- *
- * PHP versions 4 and 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Sterling Hughes <sterling@php.net>
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V.Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2009 The Authors
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id$
- * @link       http://pear.php.net/package/PEAR
- * @since      File available since Release 0.1
- */
-
-/**#@+
- * ERROR constants
- */
-define('PEAR_ERROR_RETURN',     1);
-define('PEAR_ERROR_PRINT',      2);
-define('PEAR_ERROR_TRIGGER',    4);
-define('PEAR_ERROR_DIE',        8);
-define('PEAR_ERROR_CALLBACK',  16);
-/**
- * WARNING: obsolete
- * @deprecated
- */
-define('PEAR_ERROR_EXCEPTION', 32);
-/**#@-*/
-define('PEAR_ZE2', (function_exists('version_compare') &&
-                    version_compare(zend_version(), "2-dev", "ge")));
-
-if (substr(PHP_OS, 0, 3) == 'WIN') {
-    define('OS_WINDOWS', true);
-    define('OS_UNIX',    false);
-    define('PEAR_OS',    'Windows');
-} else {
-    define('OS_WINDOWS', false);
-    define('OS_UNIX',    true);
-    define('PEAR_OS',    'Unix'); // blatant assumption
-}
-
-$GLOBALS['_PEAR_default_error_mode']     = PEAR_ERROR_RETURN;
-$GLOBALS['_PEAR_default_error_options']  = E_USER_NOTICE;
-$GLOBALS['_PEAR_destructor_object_list'] = array();
-$GLOBALS['_PEAR_shutdown_funcs']         = array();
-$GLOBALS['_PEAR_error_handler_stack']    = array();
-
-@ini_set('track_errors', true);
-
-/**
- * Base class for other PEAR classes.  Provides rudimentary
- * emulation of destructors.
- *
- * If you want a destructor in your class, inherit PEAR and make a
- * destructor method called _yourclassname (same name as the
- * constructor, but with a "_" prefix).  Also, in your constructor you
- * have to call the PEAR constructor: $this->PEAR();.
- * The destructor method will be called without parameters.  Note that
- * at in some SAPI implementations (such as Apache), any output during
- * the request shutdown (in which destructors are called) seems to be
- * discarded.  If you need to get any debug information from your
- * destructor, use error_log(), syslog() or something similar.
- *
- * IMPORTANT! To use the emulated destructors you need to create the
- * objects by reference: $obj =& new PEAR_child;
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/package/PEAR
- * @see        PEAR_Error
- * @since      Class available since PHP 4.0.2
- * @link        http://pear.php.net/manual/en/core.pear.php#core.pear.pear
- */
-class PEAR
-{
-    // {{{ properties
-
-    /**
-     * Whether to enable internal debug messages.
-     *
-     * @var     bool
-     * @access  private
-     */
-    var $_debug = false;
-
-    /**
-     * Default error mode for this object.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_mode = null;
-
-    /**
-     * Default error options used for this object when error mode
-     * is PEAR_ERROR_TRIGGER.
-     *
-     * @var     int
-     * @access  private
-     */
-    var $_default_error_options = null;
-
-    /**
-     * Default error handler (callback) for this object, if error mode is
-     * PEAR_ERROR_CALLBACK.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_default_error_handler = '';
-
-    /**
-     * Which class to use for error objects.
-     *
-     * @var     string
-     * @access  private
-     */
-    var $_error_class = 'PEAR_Error';
-
-    /**
-     * An array of expected errors.
-     *
-     * @var     array
-     * @access  private
-     */
-    var $_expected_errors = array();
-
-    // }}}
-
-    // {{{ constructor
-
-    /**
-     * Constructor.  Registers this object in
-     * $_PEAR_destructor_object_list for destructor emulation if a
-     * destructor object exists.
-     *
-     * @param string $error_class  (optional) which class to use for
-     *        error objects, defaults to PEAR_Error.
-     * @access public
-     * @return void
-     */
-    function PEAR($error_class = null)
-    {
-        $classname = strtolower(get_class($this));
-        if ($this->_debug) {
-            print "PEAR constructor called, class=$classname\n";
-        }
-        if ($error_class !== null) {
-            $this->_error_class = $error_class;
-        }
-        while ($classname && strcasecmp($classname, "pear")) {
-            $destructor = "_$classname";
-            if (method_exists($this, $destructor)) {
-                global $_PEAR_destructor_object_list;
-                $_PEAR_destructor_object_list[] = &$this;
-                if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-                    register_shutdown_function("_PEAR_call_destructors");
-                    $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-                }
-                break;
-            } else {
-                $classname = get_parent_class($classname);
-            }
-        }
-    }
-
-    // }}}
-    // {{{ destructor
-
-    /**
-     * Destructor (the emulated type of...).  Does nothing right now,
-     * but is included for forward compatibility, so subclass
-     * destructors should always call it.
-     *
-     * See the note in the class desciption about output from
-     * destructors.
-     *
-     * @access public
-     * @return void
-     */
-    function _PEAR() {
-        if ($this->_debug) {
-            printf("PEAR destructor called, class=%s\n", strtolower(get_class($this)));
-        }
-    }
-
-    // }}}
-    // {{{ getStaticProperty()
-
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-
-    // }}}
-    // {{{ registerShutdownFunc()
-
-    /**
-    * Use this function to register a shutdown method for static
-    * classes.
-    *
-    * @access public
-    * @param  mixed $func  The function name (or array of class/method) to call
-    * @param  mixed $args  The arguments to pass to the function
-    * @return void
-    */
-    function registerShutdownFunc($func, $args = array())
-    {
-        // if we are called statically, there is a potential
-        // that no shutdown func is registered.  Bug #6445
-        if (!isset($GLOBALS['_PEAR_SHUTDOWN_REGISTERED'])) {
-            register_shutdown_function("_PEAR_call_destructors");
-            $GLOBALS['_PEAR_SHUTDOWN_REGISTERED'] = true;
-        }
-        $GLOBALS['_PEAR_shutdown_funcs'][] = array($func, $args);
-    }
-
-    // }}}
-    // {{{ isError()
-
-    /**
-     * Tell whether a value is a PEAR error.
-     *
-     * @param   mixed $data   the value to test
-     * @param   int   $code   if $data is an error object, return true
-     *                        only if $code is a string and
-     *                        $obj->getMessage() == $code or
-     *                        $code is an integer and $obj->getCode() == $code
-     * @access  public
-     * @return  bool    true if parameter is an error
-     */
-    static function isError($data, $code = null)
-    {
-        if (!is_object($data) || !is_a($data, 'PEAR_Error')) {
-            return false;
-        }
-
-        if (is_null($code)) {
-            return true;
-        } elseif (is_string($code)) {
-            return $data->getMessage() == $code;
-        }
-
-        return $data->getCode() == $code;
-    }
-
-    // }}}
-    // {{{ setErrorHandling()
-
-    /**
-     * Sets how errors generated by this object should be handled.
-     * Can be invoked both in objects and statically.  If called
-     * statically, setErrorHandling sets the default behaviour for all
-     * PEAR objects.  If called in an object, setErrorHandling sets
-     * the default behaviour for that object.
-     *
-     * @param int $mode
-     *        One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *        PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *        PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options
-     *        When $mode is PEAR_ERROR_TRIGGER, this is the error level (one
-     *        of E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *
-     *        When $mode is PEAR_ERROR_CALLBACK, this parameter is expected
-     *        to be the callback function or method.  A callback
-     *        function is a string with the name of the function, a
-     *        callback method is an array of two elements: the element
-     *        at index 0 is the object, and the element at index 1 is
-     *        the name of the method to call in the object.
-     *
-     *        When $mode is PEAR_ERROR_PRINT or PEAR_ERROR_DIE, this is
-     *        a printf format string used when printing the error
-     *        message.
-     *
-     * @access public
-     * @return void
-     * @see PEAR_ERROR_RETURN
-     * @see PEAR_ERROR_PRINT
-     * @see PEAR_ERROR_TRIGGER
-     * @see PEAR_ERROR_DIE
-     * @see PEAR_ERROR_CALLBACK
-     * @see PEAR_ERROR_EXCEPTION
-     *
-     * @since PHP 4.0.5
-     */
-
-    function setErrorHandling($mode = null, $options = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $setmode     = &$this->_default_error_mode;
-            $setoptions  = &$this->_default_error_options;
-        } else {
-            $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-            $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        }
-
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-    }
-
-    // }}}
-    // {{{ expectError()
-
-    /**
-     * This method is used to tell which errors you expect to get.
-     * Expected errors are always returned with error mode
-     * PEAR_ERROR_RETURN.  Expected error codes are stored in a stack,
-     * and this method pushes a new element onto it.  The list of
-     * expected errors are in effect until they are popped off the
-     * stack with the popExpect() method.
-     *
-     * Note that this method can not be called statically
-     *
-     * @param mixed $code a single error code or an array of error codes to expect
-     *
-     * @return int     the new depth of the "expected errors" stack
-     * @access public
-     */
-    function expectError($code = '*')
-    {
-        if (is_array($code)) {
-            array_push($this->_expected_errors, $code);
-        } else {
-            array_push($this->_expected_errors, array($code));
-        }
-        return sizeof($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ popExpect()
-
-    /**
-     * This method pops one element off the expected error codes
-     * stack.
-     *
-     * @return array   the list of error codes that were popped
-     */
-    function popExpect()
-    {
-        return array_pop($this->_expected_errors);
-    }
-
-    // }}}
-    // {{{ _checkDelExpect()
-
-    /**
-     * This method checks unsets an error code if available
-     *
-     * @param mixed error code
-     * @return bool true if the error code was unset, false otherwise
-     * @access private
-     * @since PHP 4.3.0
-     */
-    function _checkDelExpect($error_code)
-    {
-        $deleted = false;
-
-        foreach ($this->_expected_errors AS $key => $error_array) {
-            if (in_array($error_code, $error_array)) {
-                unset($this->_expected_errors[$key][array_search($error_code, $error_array)]);
-                $deleted = true;
-            }
-
-            // clean up empty arrays
-            if (0 == count($this->_expected_errors[$key])) {
-                unset($this->_expected_errors[$key]);
-            }
-        }
-        return $deleted;
-    }
-
-    // }}}
-    // {{{ delExpect()
-
-    /**
-     * This method deletes all occurences of the specified element from
-     * the expected error codes stack.
-     *
-     * @param  mixed $error_code error code that should be deleted
-     * @return mixed list of error codes that were deleted or error
-     * @access public
-     * @since PHP 4.3.0
-     */
-    function delExpect($error_code)
-    {
-        $deleted = false;
-        if ((is_array($error_code) && (0 != count($error_code)))) {
-            // $error_code is a non-empty array here;
-            // we walk through it trying to unset all
-            // values
-            foreach($error_code as $key => $error) {
-                if ($this->_checkDelExpect($error)) {
-                    $deleted =  true;
-                } else {
-                    $deleted = false;
-                }
-            }
-            return $deleted ? true : PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-        } elseif (!empty($error_code)) {
-            // $error_code comes alone, trying to unset it
-            if ($this->_checkDelExpect($error_code)) {
-                return true;
-            } else {
-                return PEAR::raiseError("The expected error you submitted does not exist"); // IMPROVE ME
-            }
-        }
-
-        // $error_code is empty
-        return PEAR::raiseError("The expected error you submitted is empty"); // IMPROVE ME
-    }
-
-    // }}}
-    // {{{ raiseError()
-
-    /**
-     * This method is a wrapper that returns an instance of the
-     * configured error class with this object's default error
-     * handling applied.  If the $mode and $options parameters are not
-     * specified, the object's defaults are used.
-     *
-     * @param mixed $message a text error message or a PEAR error object
-     *
-     * @param int $code      a numeric error code (it is up to your class
-     *                  to define these if you want to use codes)
-     *
-     * @param int $mode      One of PEAR_ERROR_RETURN, PEAR_ERROR_PRINT,
-     *                  PEAR_ERROR_TRIGGER, PEAR_ERROR_DIE,
-     *                  PEAR_ERROR_CALLBACK, PEAR_ERROR_EXCEPTION.
-     *
-     * @param mixed $options If $mode is PEAR_ERROR_TRIGGER, this parameter
-     *                  specifies the PHP-internal error level (one of
-     *                  E_USER_NOTICE, E_USER_WARNING or E_USER_ERROR).
-     *                  If $mode is PEAR_ERROR_CALLBACK, this
-     *                  parameter specifies the callback function or
-     *                  method.  In other error modes this parameter
-     *                  is ignored.
-     *
-     * @param string $userinfo If you need to pass along for example debug
-     *                  information, this parameter is meant for that.
-     *
-     * @param string $error_class The returned error object will be
-     *                  instantiated from this class, if specified.
-     *
-     * @param bool $skipmsg If true, raiseError will only pass error codes,
-     *                  the error message parameter will be dropped.
-     *
-     * @access public
-     * @return object   a PEAR error object
-     * @see PEAR::setErrorHandling
-     * @since PHP 4.0.5
-     */
-    function &raiseError($message = null,
-                         $code = null,
-                         $mode = null,
-                         $options = null,
-                         $userinfo = null,
-                         $error_class = null,
-                         $skipmsg = false)
-    {
-        // The error is yet a PEAR error object
-        if (is_object($message)) {
-            $code        = $message->getCode();
-            $userinfo    = $message->getUserInfo();
-            $error_class = $message->getType();
-            $message->error_message_prefix = '';
-            $message     = $message->getMessage();
-        }
-
-        if (isset($this) && isset($this->_expected_errors) && sizeof($this->_expected_errors) > 0 && sizeof($exp = end($this->_expected_errors))) {
-            if ($exp[0] == "*" ||
-                (is_int(reset($exp)) && in_array($code, $exp)) ||
-                (is_string(reset($exp)) && in_array($message, $exp))) {
-                $mode = PEAR_ERROR_RETURN;
-            }
-        }
-
-        // No mode given, try global ones
-        if ($mode === null) {
-            // Class error handler
-            if (isset($this) && isset($this->_default_error_mode)) {
-                $mode    = $this->_default_error_mode;
-                $options = $this->_default_error_options;
-            // Global error handler
-            } elseif (isset($GLOBALS['_PEAR_default_error_mode'])) {
-                $mode    = $GLOBALS['_PEAR_default_error_mode'];
-                $options = $GLOBALS['_PEAR_default_error_options'];
-            }
-        }
-
-        if ($error_class !== null) {
-            $ec = $error_class;
-        } elseif (isset($this) && isset($this->_error_class)) {
-            $ec = $this->_error_class;
-        } else {
-            $ec = 'PEAR_Error';
-        }
-
-        if (intval(PHP_VERSION) < 5) {
-            // little non-eval hack to fix bug #12147
-            include 'PEAR/FixPHP5PEARWarnings.php';
-            return $a;
-        }
-
-        if ($skipmsg) {
-            $a = new $ec($code, $mode, $options, $userinfo);
-        } else {
-            $a = new $ec($message, $code, $mode, $options, $userinfo);
-        }
-
-        return $a;
-    }
-
-    // }}}
-    // {{{ throwError()
-
-    /**
-     * Simpler form of raiseError with fewer options.  In most cases
-     * message, code and userinfo are enough.
-     *
-     * @param string $message
-     *
-     */
-    function &throwError($message = null,
-                         $code = null,
-                         $userinfo = null)
-    {
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $a = &$this->raiseError($message, $code, null, null, $userinfo);
-            return $a;
-        }
-
-        $a = &PEAR::raiseError($message, $code, null, null, $userinfo);
-        return $a;
-    }
-
-    // }}}
-    function staticPushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-        $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        $stack[] = array($def_mode, $def_options);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $def_mode = $mode;
-                $def_options = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $def_mode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $def_options = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    function staticPopErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        $setmode     = &$GLOBALS['_PEAR_default_error_mode'];
-        $setoptions  = &$GLOBALS['_PEAR_default_error_options'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        switch ($mode) {
-            case PEAR_ERROR_EXCEPTION:
-            case PEAR_ERROR_RETURN:
-            case PEAR_ERROR_PRINT:
-            case PEAR_ERROR_TRIGGER:
-            case PEAR_ERROR_DIE:
-            case null:
-                $setmode = $mode;
-                $setoptions = $options;
-                break;
-
-            case PEAR_ERROR_CALLBACK:
-                $setmode = $mode;
-                // class/object method callback
-                if (is_callable($options)) {
-                    $setoptions = $options;
-                } else {
-                    trigger_error("invalid error callback", E_USER_WARNING);
-                }
-                break;
-
-            default:
-                trigger_error("invalid error mode", E_USER_WARNING);
-                break;
-        }
-        return true;
-    }
-
-    // {{{ pushErrorHandling()
-
-    /**
-     * Push a new error handler on top of the error handler options stack. With this
-     * you can easily override the actual error handler for some code and restore
-     * it later with popErrorHandling.
-     *
-     * @param mixed $mode (same as setErrorHandling)
-     * @param mixed $options (same as setErrorHandling)
-     *
-     * @return bool Always true
-     *
-     * @see PEAR::setErrorHandling
-     */
-    function pushErrorHandling($mode, $options = null)
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $def_mode    = &$this->_default_error_mode;
-            $def_options = &$this->_default_error_options;
-        } else {
-            $def_mode    = &$GLOBALS['_PEAR_default_error_mode'];
-            $def_options = &$GLOBALS['_PEAR_default_error_options'];
-        }
-        $stack[] = array($def_mode, $def_options);
-
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        $stack[] = array($mode, $options);
-        return true;
-    }
-
-    // }}}
-    // {{{ popErrorHandling()
-
-    /**
-    * Pop the last error handler used
-    *
-    * @return bool Always true
-    *
-    * @see PEAR::pushErrorHandling
-    */
-    function popErrorHandling()
-    {
-        $stack = &$GLOBALS['_PEAR_error_handler_stack'];
-        array_pop($stack);
-        list($mode, $options) = $stack[sizeof($stack) - 1];
-        array_pop($stack);
-        if (isset($this) && is_a($this, 'PEAR')) {
-            $this->setErrorHandling($mode, $options);
-        } else {
-            PEAR::setErrorHandling($mode, $options);
-        }
-        return true;
-    }
-
-    // }}}
-    // {{{ loadExtension()
-
-    /**
-    * OS independant PHP extension load. Remember to take care
-    * on the correct extension name for case sensitive OSes.
-    *
-    * @param string $ext The extension name
-    * @return bool Success or not on the dl() call
-    */
-    function loadExtension($ext)
-    {
-        if (!extension_loaded($ext)) {
-            // if either returns true dl() will produce a FATAL error, stop that
-            if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
-                return false;
-            }
-
-            if (OS_WINDOWS) {
-                $suffix = '.dll';
-            } elseif (PHP_OS == 'HP-UX') {
-                $suffix = '.sl';
-            } elseif (PHP_OS == 'AIX') {
-                $suffix = '.a';
-            } elseif (PHP_OS == 'OSX') {
-                $suffix = '.bundle';
-            } else {
-                $suffix = '.so';
-            }
-
-            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
-        }
-
-        return true;
-    }
-
-    // }}}
-}
-
-if (PEAR_ZE2) {
-    include_once 'PEAR5.php';
-}
-
-// {{{ _PEAR_call_destructors()
-
-function _PEAR_call_destructors()
-{
-    global $_PEAR_destructor_object_list;
-    if (is_array($_PEAR_destructor_object_list) &&
-        sizeof($_PEAR_destructor_object_list))
-    {
-        reset($_PEAR_destructor_object_list);
-        if (PEAR_ZE2) {
-            $destructLifoExists = PEAR5::getStaticProperty('PEAR', 'destructlifo');
-        } else {
-            $destructLifoExists = PEAR::getStaticProperty('PEAR', 'destructlifo');
-        }
-
-        if ($destructLifoExists) {
-            $_PEAR_destructor_object_list = array_reverse($_PEAR_destructor_object_list);
-        }
-
-        while (list($k, $objref) = each($_PEAR_destructor_object_list)) {
-            $classname = get_class($objref);
-            while ($classname) {
-                $destructor = "_$classname";
-                if (method_exists($objref, $destructor)) {
-                    $objref->$destructor();
-                    break;
-                } else {
-                    $classname = get_parent_class($classname);
-                }
-            }
-        }
-        // Empty the object list to ensure that destructors are
-        // not called more than once.
-        $_PEAR_destructor_object_list = array();
-    }
-
-    // Now call the shutdown functions
-    if (isset($GLOBALS['_PEAR_shutdown_funcs']) AND is_array($GLOBALS['_PEAR_shutdown_funcs']) AND !empty($GLOBALS['_PEAR_shutdown_funcs'])) {
-        foreach ($GLOBALS['_PEAR_shutdown_funcs'] as $value) {
-            call_user_func_array($value[0], $value[1]);
-        }
-    }
-}
-
-// }}}
-/**
- * Standard PEAR error class for PHP 4
- *
- * This class is supserseded by {@link PEAR_Exception} in PHP 5
- *
- * @category   pear
- * @package    PEAR
- * @author     Stig Bakken <ssb@php.net>
- * @author     Tomas V.V. Cox <cox@idecnet.com>
- * @author     Gregory Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.9.0
- * @link       http://pear.php.net/manual/en/core.pear.pear-error.php
- * @see        PEAR::raiseError(), PEAR::throwError()
- * @since      Class available since PHP 4.0.2
- */
-class PEAR_Error
-{
-    // {{{ properties
-
-    var $error_message_prefix = '';
-    var $mode                 = PEAR_ERROR_RETURN;
-    var $level                = E_USER_NOTICE;
-    var $code                 = -1;
-    var $message              = '';
-    var $userinfo             = '';
-    var $backtrace            = null;
-
-    // }}}
-    // {{{ constructor
-
-    /**
-     * PEAR_Error constructor
-     *
-     * @param string $message  message
-     *
-     * @param int $code     (optional) error code
-     *
-     * @param int $mode     (optional) error mode, one of: PEAR_ERROR_RETURN,
-     * PEAR_ERROR_PRINT, PEAR_ERROR_DIE, PEAR_ERROR_TRIGGER,
-     * PEAR_ERROR_CALLBACK or PEAR_ERROR_EXCEPTION
-     *
-     * @param mixed $options   (optional) error level, _OR_ in the case of
-     * PEAR_ERROR_CALLBACK, the callback function or object/method
-     * tuple.
-     *
-     * @param string $userinfo (optional) additional user/debug info
-     *
-     * @access public
-     *
-     */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
-        if ($mode === null) {
-            $mode = PEAR_ERROR_RETURN;
-        }
-        $this->message   = $message;
-        $this->code      = $code;
-        $this->mode      = $mode;
-        $this->userinfo  = $userinfo;
-
-        if (PEAR_ZE2) {
-            $skiptrace = PEAR5::getStaticProperty('PEAR_Error', 'skiptrace');
-        } else {
-            $skiptrace = PEAR::getStaticProperty('PEAR_Error', 'skiptrace');
-        }
-
-        if (!$skiptrace) {
-            $this->backtrace = debug_backtrace();
-            if (isset($this->backtrace[0]) && isset($this->backtrace[0]['object'])) {
-                unset($this->backtrace[0]['object']);
-            }
-        }
-
-        if ($mode & PEAR_ERROR_CALLBACK) {
-            $this->level = E_USER_NOTICE;
-            $this->callback = $options;
-        } else {
-            if ($options === null) {
-                $options = E_USER_NOTICE;
-            }
-
-            $this->level = $options;
-            $this->callback = null;
-        }
-
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-            } else {
-                $format = $options;
-            }
-
-            printf($format, $this->getMessage());
-        }
-
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            trigger_error($this->getMessage(), $this->level);
-        }
-
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $msg = $this->getMessage();
-            if (is_null($options) || is_int($options)) {
-                $format = "%s";
-                if (substr($msg, -1) != "\n") {
-                    $msg .= "\n";
-                }
-            } else {
-                $format = $options;
-            }
-            die(sprintf($format, $msg));
-        }
-
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_callable($this->callback)) {
-                call_user_func($this->callback, $this);
-            }
-        }
-
-        if ($this->mode & PEAR_ERROR_EXCEPTION) {
-            trigger_error("PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions", E_USER_WARNING);
-            eval('$e = new Exception($this->message, $this->code);throw($e);');
-        }
-    }
-
-    // }}}
-    // {{{ getMode()
-
-    /**
-     * Get the error mode from an error object.
-     *
-     * @return int error mode
-     * @access public
-     */
-    function getMode() {
-        return $this->mode;
-    }
-
-    // }}}
-    // {{{ getCallback()
-
-    /**
-     * Get the callback function/method from an error object.
-     *
-     * @return mixed callback function or object/method array
-     * @access public
-     */
-    function getCallback() {
-        return $this->callback;
-    }
-
-    // }}}
-    // {{{ getMessage()
-
-
-    /**
-     * Get the error message from an error object.
-     *
-     * @return  string  full error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return ($this->error_message_prefix . $this->message);
-    }
-
-
-    // }}}
-    // {{{ getCode()
-
-    /**
-     * Get error code from an error object
-     *
-     * @return int error code
-     * @access public
-     */
-     function getCode()
-     {
-        return $this->code;
-     }
-
-    // }}}
-    // {{{ getType()
-
-    /**
-     * Get the name of this error/exception.
-     *
-     * @return string error/exception name (type)
-     * @access public
-     */
-    function getType()
-    {
-        return get_class($this);
-    }
-
-    // }}}
-    // {{{ getUserInfo()
-
-    /**
-     * Get additional user-supplied information.
-     *
-     * @return string user-supplied information
-     * @access public
-     */
-    function getUserInfo()
-    {
-        return $this->userinfo;
-    }
-
-    // }}}
-    // {{{ getDebugInfo()
-
-    /**
-     * Get additional debug information supplied by the application.
-     *
-     * @return string debug information
-     * @access public
-     */
-    function getDebugInfo()
-    {
-        return $this->getUserInfo();
-    }
-
-    // }}}
-    // {{{ getBacktrace()
-
-    /**
-     * Get the call backtrace from where the error was generated.
-     * Supported with PHP 4.3.0 or newer.
-     *
-     * @param int $frame (optional) what frame to fetch
-     * @return array Backtrace, or NULL if not available.
-     * @access public
-     */
-    function getBacktrace($frame = null)
-    {
-        if (defined('PEAR_IGNORE_BACKTRACE')) {
-            return null;
-        }
-        if ($frame === null) {
-            return $this->backtrace;
-        }
-        return $this->backtrace[$frame];
-    }
-
-    // }}}
-    // {{{ addUserInfo()
-
-    function addUserInfo($info)
-    {
-        if (empty($this->userinfo)) {
-            $this->userinfo = $info;
-        } else {
-            $this->userinfo .= " ** $info";
-        }
-    }
-
-    // }}}
-    // {{{ toString()
-    function __toString()
-    {
-        return $this->getMessage();
-    }
-    // }}}
-    // {{{ toString()
-
-    /**
-     * Make a string representation of this object.
-     *
-     * @return string a string with an object summary
-     * @access public
-     */
-    function toString() {
-        $modes = array();
-        $levels = array(E_USER_NOTICE  => 'notice',
-                        E_USER_WARNING => 'warning',
-                        E_USER_ERROR   => 'error');
-        if ($this->mode & PEAR_ERROR_CALLBACK) {
-            if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ?
-                    strtolower(get_class($this->callback[0])) :
-                    $this->callback[0]) . '::' .
-                    $this->callback[1];
-            } else {
-                $callback = $this->callback;
-            }
-            return sprintf('[%s: message="%s" code=%d mode=callback '.
-                           'callback=%s prefix="%s" info="%s"]',
-                           strtolower(get_class($this)), $this->message, $this->code,
-                           $callback, $this->error_message_prefix,
-                           $this->userinfo);
-        }
-        if ($this->mode & PEAR_ERROR_PRINT) {
-            $modes[] = 'print';
-        }
-        if ($this->mode & PEAR_ERROR_TRIGGER) {
-            $modes[] = 'trigger';
-        }
-        if ($this->mode & PEAR_ERROR_DIE) {
-            $modes[] = 'die';
-        }
-        if ($this->mode & PEAR_ERROR_RETURN) {
-            $modes[] = 'return';
-        }
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.
-                       'prefix="%s" info="%s"]',
-                       strtolower(get_class($this)), $this->message, $this->code,
-                       implode("|", $modes), $levels[$this->level],
-                       $this->error_message_prefix,
-                       $this->userinfo);
-    }
-
-    // }}}
-}
-
-/*
- * Local Variables:
- * mode: php
- * tab-width: 4
- * c-basic-offset: 4
- * End:
- */

iRony-0.4.2.tar.gz/lib/FileAPI/ext/PEAR5.php Deleted

@@ -1,33 +0,0 @@
-<?php
-/**
- * This is only meant for PHP 5 to get rid of certain strict warning
- * that doesn't get hidden since it's in the shutdown function
- */
-class PEAR5
-{
-    /**
-    * If you have a class that's mostly/entirely static, and you need static
-    * properties, you can use this method to simulate them. Eg. in your method(s)
-    * do this: $myVar = &PEAR5::getStaticProperty('myclass', 'myVar');
-    * You MUST use a reference, or they will not persist!
-    *
-    * @access public
-    * @param  string $class  The calling classname, to prevent clashes
-    * @param  string $var    The variable to retrieve.
-    * @return mixed   A reference to the variable. If not set it will be
-    *                 auto initialised to NULL.
-    */
-    static function &getStaticProperty($class, $var)
-    {
-        static $properties;
-        if (!isset($properties[$class])) {
-            $properties[$class] = array();
-        }
-
-        if (!array_key_exists($var, $properties[$class])) {
-            $properties[$class][$var] = null;
-        }
-
-        return $properties[$class][$var];
-    }
-}
\ No newline at end of file

iRony-0.4.2.tar.gz/lib/plugins/calendar/.gitignore Deleted

iRony-0.4.2.tar.gz/lib/plugins/calendar/TODO Deleted

@@ -1,48 +0,0 @@
-+ Edit: 3.12: Subject
-+ Edit: 3.13: Location
-+ Edit: 3.14: Start / End / All Day
-+ Edit: 3.15: Show time as: Busy, Free, Out of office
-+ Edit: 3.16: Reminder set
-+ Edit: 3.17: Priority: High/Low
-+ Edit: 3.18: Recurrence (in line with Kontact)
-+ Edit: 3.19: Attachment Upload
-+ Edit: 3.20: Print
-+ Add/Manage Attendees
-  + Edit: 3.21: Required / Optional / Resource specification
-  + Edit: 3.22: Conflict Handling (Free/Busy Check for attendees)
-+ View: 3.3: Display modes (agenda / day / week / month)
-  + Day / Week / Month
-  + List (Agenda) view
-    + Add selection for date range
-  - Individual days selection
-+ Show list of calendars in a (hideable) drawer
-  + View: 3.1: Folder list
-  + View: 3.2: Add / Remove / Rename / Share Folders
-  + View: 3.6: Combined calendar view (Turn calendars on/off)
-  + View: 3.7: Small month overview calendar
-+ View: 3.5: Search
-  - Filter by categories (similar to mail)
-+ View: 3.9: Alter event with drag/drop
-+ Option: 4.12: Set default reminder time
-+ Option: 3.23: Specify folder for new event (prefs)
-+ Option: Set date/time format in prefs
-+ Receive: 1.20: Invitation handling
-  - Jump to calendar view from mail ("Show event")
-  - Allow to re-send invitations
-  - Implement iTIP delegation
-
-+ View: 3.4: Fish-Eye View For Busy Days
-+ View: 3.8: Color according to calendar and category (similar to Kontact)
-
-+ Support for multiple calendars (replace categories)
-+ Allow user to create/edit/delete calendars
-+ Colors for calendars should be user-configurable
-+ ICS parser/generator (http://code.google.com/p/qcal/)
-
-- Script to send event alarms by email (in cronjob)
-- Export *with* attachments
-- Remember last visited view
-- Create/manage invdividual views
-+ Importing ICS files (upload, drag & drop)
-
-

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/bg.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/he_IL.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/vi_VN.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/zh_TW.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/bg.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/de_AT.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/el_GR.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/en_GB.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/fa_IR.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/fr_CH.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/hu.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/ko.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/ku_IQ.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/ro.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/sr_RS.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/tr.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/tr_TR.inc Deleted

iRony-0.4.2.tar.gz/lib/plugins/kolab_auth/kolab_auth_ldap.php Deleted

@@ -1,480 +0,0 @@
-<?php
-
-/**
- * Kolab Authentication
- *
- * @version @package_version@
- * @author Aleksander Machniak <machniak@kolabsys.com>
- *
- * Copyright (C) 2011-2013, 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/>.
- */
-
-/**
- * Wrapper class for rcube_ldap_generic
- */
-class kolab_auth_ldap extends rcube_ldap_generic
-{
-    private $conf     = array();
-    private $fieldmap = array();
-
-
-    function __construct($p)
-    {
-        $rcmail = rcube::get_instance();
-
-        $this->conf = $p;
-        $this->conf['kolab_auth_user_displayname'] = $rcmail->config->get('kolab_auth_user_displayname', '{name}');
-
-        $this->fieldmap = $p['fieldmap'];
-        $this->fieldmap['uid'] = 'uid';
-
-        $p['attributes'] = array_values($this->fieldmap);
-        $p['debug']      = (bool) $rcmail->config->get('ldap_debug');
-
-        // Connect to the server (with bind)
-        parent::__construct($p);
-        $this->_connect();
-
-        $rcmail->add_shutdown_function(array($this, 'close'));
-    }
-
-    /**
-    * Establish a connection to the LDAP server
-    */
-    private function _connect()
-    {
-        // try to connect + bind for every host configured
-        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
-        // see http://www.php.net/manual/en/function.ldap-connect.php
-        foreach ((array)$this->config['hosts'] as $host) {
-            // skip host if connection failed
-            if (!$this->connect($host)) {
-                continue;
-            }
-
-            $bind_pass = $this->config['bind_pass'];
-            $bind_user = $this->config['bind_user'];
-            $bind_dn   = $this->config['bind_dn'];
-
-            if (empty($bind_pass)) {
-                $this->ready = true;
-            }
-            else {
-                if (!empty($bind_dn)) {
-                    $this->ready = $this->bind($bind_dn, $bind_pass);
-                }
-                else if (!empty($this->config['auth_cid'])) {
-                    $this->ready = $this->sasl_bind($this->config['auth_cid'], $bind_pass, $bind_user);
-                }
-                else {
-                    $this->ready = $this->sasl_bind($bind_user, $bind_pass);
-                }
-            }
-
-            // connection established, we're done here
-            if ($this->ready) {
-                break;
-            }
-
-        }  // end foreach hosts
-
-        if (!is_resource($this->conn)) {
-            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
-                'file' => __FILE__, 'line' => __LINE__,
-                'message' => "Could not connect to any LDAP server, last tried $host"), true);
-
-            $this->ready = false;
-        }
-
-        return $this->ready;
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_record($user, $host)
-    {
-        $rcmail  = rcube::get_instance();
-        $filter  = $rcmail->config->get('kolab_auth_filter');
-        $filter  = $this->parse_vars($filter, $user, $host);
-        $base_dn = $this->parse_vars($this->config['base_dn'], $user, $host);
-        $scope   = $this->config['scope'];
-
-        // @TODO: print error if filter is empty
-
-        // get record
-        if ($result = parent::search($base_dn, $filter, $scope, $this->attributes)) {
-            if ($result->count() == 1) {
-                $entries = $result->entries(true);
-                $dn      = key($entries);
-                $entry   = array_pop($entries);
-                $entry   = $this->field_mapping($dn, $entry);
-
-                return $entry;
-            }
-        }
-    }
-
-    /**
-     * Fetches user data from LDAP addressbook
-     */
-    function get_user_groups($dn, $user, $host)
-    {
-        if (empty($dn) || empty($this->config['groups'])) {
-            return array();
-        }
-
-        $base_dn     = $this->parse_vars($this->config['groups']['base_dn'], $user, $host);
-        $name_attr   = $this->config['groups']['name_attr'] ? $this->config['groups']['name_attr'] : 'cn';
-        $member_attr = $this->get_group_member_attr();
-        $filter      = "(member=$dn)(uniqueMember=$dn)";
-
-        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
-            $filter .= "($member_attr=$dn)";
-        $filter = strtr("(|$filter)", array("\\" => "\\\\"));
-
-        $result = parent::search($base_dn, $filter, 'sub', array('dn', $name_attr));
-
-        if (!$result) {
-            return array();
-        }
-
-        $groups = array();
-        foreach ($result as $entry) {
-            $dn    = $entry['dn'];
-            $entry = rcube_ldap_generic::normalize_entry($entry);
-
-            $groups[$dn] = $entry[$name_attr];
-        }
-
-        return $groups;
-    }
-
-    /**
-     * Get a specific LDAP record
-     *
-     * @param string DN
-     *
-     * @return array Record data
-     */
-    function get_record($dn)
-    {
-        if (!$this->ready) {
-            return;
-        }
-
-        if ($rec = $this->get_entry($dn)) {
-            $rec = rcube_ldap_generic::normalize_entry($rec);
-            $rec = $this->field_mapping($dn, $rec);
-        }
-
-        return $rec;
-    }
-
-    /**
-     * Replace LDAP record data items
-     *
-     * @param string $dn    DN
-     * @param array  $entry LDAP entry
-     *
-     * return bool True on success, False on failure
-     */
-    function replace($dn, $entry)
-    {
-        // fields mapping
-        foreach ($this->fieldmap as $field => $attr) {
-            if (array_key_exists($field, $entry)) {
-                $entry[$attr] = $entry[$field];
-                if ($attr != $field) {
-                    unset($entry[$field]);
-                }
-            }
-        }
-
-        return $this->mod_replace($dn, $entry);
-    }
-
-    /**
-     * Search records (simplified version of rcube_ldap::search)
-     *
-     * @param mixed   $fields   The field name or array of field names to search in
-     * @param string  $value    Search value
-     * @param int     $mode     Matching mode:
-     *                          0 - partial (*abc*),
-     *                          1 - strict (=),
-     *                          2 - prefix (abc*)
-     * @param array   $required List of fields that cannot be empty
-     * @param int     $limit    Number of records
-     * @param int     $count    Returns the number of records found
-     *
-     * @return array List or false on error
-     */
-    function dosearch($fields, $value, $mode=1, $required = array(), $limit = 0, &$count = 0)
-    {
-        if (empty($fields)) {
-            return array();
-        }
-
-        $mode  = intval($mode);
-
-        // try to resolve field names into ldap attributes
-        $fieldmap = $this->fieldmap;
-        $attrs = array_map(function($f) use ($fieldmap) {
-            return array_key_exists($f, $fieldmap) ? $fieldmap[$f] : $f;
-        }, (array)$fields);
-
-        // compose a full-text-search-like filter
-        if (count($attrs) > 1 || $mode != 1) {
-            $filter = self::fulltext_search_filter($value, $attrs, $mode);
-        }
-        // direct search
-        else {
-            $field  = $attrs[0];
-            $filter = "($field=" . self::quote_string($value) . ")";
-        }
-
-        // add required (non empty) fields filter
-        $req_filter = '';
-
-        foreach ((array)$required as $field) {
-            $attr = array_key_exists($field, $this->fieldmap) ? $this->fieldmap[$field] : $field;
-
-            // only add if required field is not already in search filter
-            if (!in_array($attr, $attrs)) {
-                $req_filter .= "($attr=*)";
-            }
-        }
-
-        if (!empty($req_filter)) {
-            $filter = '(&' . $req_filter . $filter . ')';
-        }
-
-        // avoid double-wildcard if $value is empty
-        $filter = preg_replace('/\*+/', '*', $filter);
-
-        // add general filter to query
-        if (!empty($this->config['filter'])) {
-            $filter = '(&(' . preg_replace('/^$|$$/', '', $this->config['filter']) . ')' . $filter . ')';
-        }
-
-        $base_dn = $this->parse_vars($this->config['base_dn']);
-        $scope   = $this->config['scope'];
-        $attrs   = array_values($this->fieldmap);
-        $list    = array();
-
-        if ($result = $this->search($base_dn, $filter, $scope, $attrs)) {
-            $count = $result->count();
-            $i = 0;
-            foreach ($result as $entry) {
-                if ($limit && $limit <= $i) {
-                    break;
-                }
-
-                $dn        = $entry['dn'];
-                $entry     = rcube_ldap_generic::normalize_entry($entry);
-                $list[$dn] = $this->field_mapping($dn, $entry);
-                $i++;
-            }
-        }
-
-        return $list;
-    }
-
-    /**
-     * Set filter used in search()
-     */
-    function set_filter($filter)
-    {
-        $this->config['filter'] = $filter;
-    }
-
-    /**
-     * Maps LDAP attributes to defined fields
-     */
-    protected function field_mapping($dn, $entry)
-    {
-        $entry['dn'] = $dn;
-
-        // fields mapping
-        foreach ($this->fieldmap as $field => $attr) {
-            // $entry might be indexed by lower-case attribute names
-            $attr_lc = strtolower($attr);
-            if (isset($entry[$attr_lc])) {
-                $entry[$field] = $entry[$attr_lc];
-            }
-            else if (isset($entry[$attr])) {
-                $entry[$field] = $entry[$attr];
-            }
-        }
-
-        // compose display name according to config
-        if (empty($this->fieldmap['displayname'])) {
-            $entry['displayname'] = rcube_addressbook::compose_search_name(
-                $entry,
-                $entry['email'],
-                $entry['name'],
-                $this->conf['kolab_auth_user_displayname']
-            );
-        }
-
-        return $entry;
-    }
-
-    /**
-     * Detects group member attribute name
-     */
-    private function get_group_member_attr($object_classes = array())
-    {
-        if (empty($object_classes)) {
-            $object_classes = $this->config['groups']['object_classes'];
-        }
-        if (!empty($object_classes)) {
-            foreach ((array)$object_classes as $oc) {
-                switch (strtolower($oc)) {
-                    case 'group':
-                    case 'groupofnames':
-                    case 'kolabgroupofnames':
-                        $member_attr = 'member';
-                        break;
-
-                    case 'groupofuniquenames':
-                    case 'kolabgroupofuniquenames':
-                        $member_attr = 'uniqueMember';
-                        break;
-                }
-            }
-        }
-
-        if (!empty($member_attr)) {
-            return $member_attr;
-        }
-
-        if (!empty($this->config['groups']['member_attr'])) {
-            return $this->config['groups']['member_attr'];
-        }
-
-        return 'member';
-    }
-
-    /**
-     * Prepares filter query for LDAP search
-     */
-    function parse_vars($str, $user = null, $host = null)
-    {
-        // When authenticating user $user is always set
-        // if not set it means we use this LDAP object for other
-        // purposes, e.g. kolab_delegation, then username with
-        // correct domain is in a session
-        if (!$user) {
-            $user = $_SESSION['username'];
-        }
-
-        if (isset($this->icache[$user])) {
-            list($user, $dc) = $this->icache[$user];
-        }
-        else {
-            $orig_user = $user;
-            $rcmail = rcube::get_instance();
-
-            // get default domain
-            if ($username_domain = $rcmail->config->get('username_domain')) {
-                if ($host && is_array($username_domain) && isset($username_domain[$host])) {
-                    $domain = rcube_utils::parse_host($username_domain[$host], $host);
-                }
-                else if (is_string($username_domain)) {
-                    $domain = rcube_utils::parse_host($username_domain, $host);
-                }
-            }
-
-            // realmed username (with domain)
-            if (strpos($user, '@')) {
-                list($usr, $dom) = explode('@', $user);
-
-                // unrealm domain, user login can contain a domain alias
-                if ($dom != $domain && ($dc = $this->domain_root_dn($dom))) {
-                    // @FIXME: we should replace domain in $user, I suppose
-                }
-            }
-            else if ($domain) {
-                $user .= '@' . $domain;
-            }
-
-            $this->icache[$orig_user] = array($user, $dc);
-        }
-
-        // replace variables in filter
-        list($u, $d) = explode('@', $user);
-
-        // hierarchal domain string
-        if (empty($dc)) {
-            $dc = 'dc=' . strtr($d, array('.' => ',dc='));
-        }
-
-        $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u);
-
-        $this->parse_replaces = $replaces;
-
-        return strtr($str, $replaces);
-    }
-
-    /**
-     * Returns variables used for replacement in (last) parse_vars() call
-     *
-     * @return array Variable-value hash array
-     */
-    public function get_parse_vars()
-    {
-        return $this->parse_replaces;
-    }
-
-    /**
-     * Register additional fields
-     */
-    public function extend_fieldmap($map)
-    {
-        foreach ((array)$map as $name => $attr) {
-            if (!in_array($attr, $this->attributes)) {
-                $this->attributes[]    = $attr;
-                $this->fieldmap[$name] = $attr;
-            }
-        }
-    }
-
-    /**
-     * HTML-safe DN string encoding
-     *
-     * @param string $str DN string
-     *
-     * @return string Encoded HTML identifier string
-     */
-    static function dn_encode($str)
-    {
-        return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
-    }
-
-    /**
-     * Decodes DN string encoded with _dn_encode()
-     *
-     * @param string $str Encoded HTML identifier string
-     *
-     * @return string DN string
-     */
-    static function dn_decode($str)
-    {
-        $str = str_pad(strtr($str, '-_', '+/'), strlen($str) % 4, '=', STR_PAD_RIGHT);
-        return base64_decode($str);
-    }
-}

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/tests/resources/invalid-event.ics Deleted

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_mongodb.php Deleted

@@ -1,561 +0,0 @@
-<?php
-
-/**
- * Kolab storage cache class providing a local caching layer for Kolab groupware objects.
- *
- * @version @package_version@
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * Copyright (C) 2012, 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/>.
- */
-
-class kolab_storage_cache_mongodb
-{
-    private $db;
-    private $imap;
-    private $folder;
-    private $uid2msg;
-    private $objects;
-    private $index = array();
-    private $resource_uri;
-    private $enabled = true;
-    private $synched = false;
-    private $synclock = false;
-    private $ready = false;
-    private $max_sql_packet = 1046576;  // 1 MB - 2000 bytes
-    private $binary_cols = array('photo','pgppublickey','pkcs7publickey');
-
-
-    /**
-     * Default constructor
-     */
-    public function __construct(kolab_storage_folder $storage_folder = null)
-    {
-        $rcmail = rcube::get_instance();
-        $mongo = new Mongo();
-        $this->db = $mongo->kolab_cache;
-        $this->imap = $rcmail->get_storage();
-        $this->enabled = $rcmail->config->get('kolab_cache', false);
-
-        if ($this->enabled) {
-            // remove sync-lock on script termination
-            $rcmail->add_shutdown_function(array($this, '_sync_unlock'));
-        }
-
-        if ($storage_folder)
-            $this->set_folder($storage_folder);
-    }
-
-
-    /**
-     * Connect cache with a storage folder
-     *
-     * @param kolab_storage_folder The storage folder instance to connect with
-     */
-    public function set_folder(kolab_storage_folder $storage_folder)
-    {
-        $this->folder = $storage_folder;
-
-        if (empty($this->folder->name)) {
-            $this->ready = false;
-            return;
-        }
-
-        // compose fully qualified ressource uri for this instance
-        $this->resource_uri = $this->folder->get_resource_uri();
-        $this->ready = $this->enabled;
-    }
-
-
-    /**
-     * Synchronize local cache data with remote
-     */
-    public function synchronize()
-    {
-        // only sync once per request cycle
-        if ($this->synched)
-            return;
-
-        // increase time limit
-        @set_time_limit(500);
-
-        // lock synchronization for this folder or wait if locked
-        $this->_sync_lock();
-
-        // synchronize IMAP mailbox cache
-        $this->imap->folder_sync($this->folder->name);
-
-        // compare IMAP index with object cache index
-        $imap_index = $this->imap->index($this->folder->name);
-        $this->index = $imap_index->get();
-
-        // determine objects to fetch or to invalidate
-        if ($this->ready) {
-            // read cache index
-            $old_index = array();
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri), array('msguid' => 1, 'uid' => 1));
-            foreach ($cursor as $doc) {
-                $old_index[] = $doc['msguid'];
-                $this->uid2msg[$doc['uid']] = $doc['msguid'];
-            }
-
-            // fetch new objects from imap
-            foreach (array_diff($this->index, $old_index) as $msguid) {
-                if ($object = $this->folder->read_object($msguid, '*')) {
-                    try {
-                        $this->db->cache->insert($this->_serialize($object, $msguid));
-                    }
-                    catch (Exception $e) {
-                        rcmail::raise_error(array(
-                            'code' => 900, 'type' => 'php',
-                            'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
-                        ), true);
-                    }
-                }
-            }
-
-            // delete invalid entries from local DB
-            $del_index = array_diff($old_index, $this->index);
-            if (!empty($del_index)) {
-                $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => array('$in' => $del_index)));
-            }
-        }
-
-        // remove lock
-        $this->_sync_unlock();
-
-        $this->synched = time();
-    }
-
-
-    /**
-     * Read a single entry from cache or from IMAP directly
-     *
-     * @param string Related IMAP message UID
-     * @param string Object type to read
-     * @param string IMAP folder name the entry relates to
-     * @param array  Hash array with object properties or null if not found
-     */
-    public function get($msguid, $type = null, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            return kolab_storage::get_folder($foldername)->cache->get($msguid, $object);
-        }
-
-        // load object if not in memory
-        if (!isset($this->objects[$msguid])) {
-            if ($this->ready && ($doc = $this->db->cache->findOne(array('resource' => $this->resource_uri, 'msguid' => $msguid))))
-                $this->objects[$msguid] = $this->_unserialize($doc);
-
-            // fetch from IMAP if not present in cache
-            if (empty($this->objects[$msguid])) {
-                $result = $this->_fetch(array($msguid), $type, $foldername);
-                $this->objects[$msguid] = $result[0];
-            }
-        }
-
-        return $this->objects[$msguid];
-    }
-
-
-    /**
-     * Insert/Update a cache entry
-     *
-     * @param string Related IMAP message UID
-     * @param mixed  Hash array with object properties to save or false to delete the cache entry
-     * @param string IMAP folder name the entry relates to
-     */
-    public function set($msguid, $object, $foldername = null)
-    {
-        // delegate to another cache instance
-        if ($foldername && $foldername != $this->folder->name) {
-            kolab_storage::get_folder($foldername)->cache->set($msguid, $object);
-            return;
-        }
-
-        // write to cache
-        if ($this->ready) {
-            // remove old entry
-            $this->db->cache->remove(array('resource' => $this->resource_uri, 'msguid' => $msguid));
-
-            // write new object data if not false (wich means deleted)
-            if ($object) {
-                try {
-                    $this->db->cache->insert($this->_serialize($object, $msguid));
-                }
-                catch (Exception $e) {
-                    rcmail::raise_error(array(
-                        'code' => 900, 'type' => 'php',
-                        'message' => "Failed to write to mongodb cache: " . $e->getMessage(),
-                    ), true);
-                }
-            }
-        }
-
-        // keep a copy in memory for fast access
-        $this->objects[$msguid] = $object;
-
-        if ($object)
-            $this->uid2msg[$object['uid']] = $msguid;
-    }
-
-    /**
-     * Move an existing cache entry to a new resource
-     *
-     * @param string Entry's IMAP message UID
-     * @param string Entry's Object UID
-     * @param string Target IMAP folder to move it to
-     */
-    public function move($msguid, $objuid, $target_folder)
-    {
-        $target = kolab_storage::get_folder($target_folder);
-
-        // resolve new message UID in target folder
-        if ($new_msguid = $target->cache->uid2msguid($objuid)) {
-/*
-            $this->db->query(
-                "UPDATE kolab_cache SET resource=?, msguid=? ".
-                "WHERE resource=? AND msguid=? AND type<>?",
-                $target->get_resource_uri(),
-                $new_msguid,
-                $this->resource_uri,
-                $msguid,
-                'lock'
-            );
-*/
-        }
-        else {
-            // just clear cache entry
-            $this->set($msguid, false);
-        }
-
-        unset($this->uid2msg[$uid]);
-    }
-
-
-    /**
-     * Remove all objects from local cache
-     */
-    public function purge($type = null)
-    {
-        return $this->db->cache->remove(array(), array('safe' => true));
-    }
-
-
-    /**
-     * Select Kolab objects filtered by the given query
-     *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
-     *   triplet: array('<colname>', '<comparator>', '<value>')
-     * @return array List of Kolab data objects (each represented as hash array)
-     */
-    public function select($query = array())
-    {
-        $result = array();
-
-        // read from local cache DB (assume it to be synchronized)
-        if ($this->ready) {
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
-            foreach ($cursor as $doc) {
-                if ($object = $this->_unserialize($doc))
-                    $result[] = $object;
-            }
-        }
-        else {
-            // extract object type from query parameter
-            $filter = $this->_query2assoc($query);
-
-            // use 'list' for folder's default objects
-            if ($filter['type'] == $this->type) {
-                $index = $this->index;
-            }
-            else {  // search by object type
-                $search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
-                $index = $this->imap->search_once($this->folder->name, $search)->get();
-            }
-
-            // fetch all messages in $index from IMAP
-            $result = $this->_fetch($index, $filter['type']);
-
-            // TODO: post-filter result according to query
-        }
-
-        return $result;
-    }
-
-
-    /**
-     * Get number of objects mathing the given query
-     *
-     * @param array  $query Pseudo-SQL query as list of filter parameter triplets
-     * @return integer The number of objects of the given type
-     */
-    public function count($query = array())
-    {
-        $count = 0;
-
-        // cache is in sync, we can count records in local DB
-        if ($this->synched) {
-            $cursor = $this->db->cache->find(array('resource' => $this->resource_uri) + $this->_mongo_filter($query));
-            $count = $cursor->valid() ? $cursor->count() : 0;
-        }
-        else {
-            // search IMAP by object type
-            $filter = $this->_query2assoc($query);
-            $ctype  = kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
-            $index = $this->imap->search_once($this->folder->name, 'UNDELETED HEADER X-Kolab-Type ' . $ctype);
-            $count = $index->count();
-        }
-
-        return $count;
-    }
-
-    /**
-     * Helper method to convert the pseudo-SQL query into a valid mongodb filter
-     */
-    private function _mongo_filter($query)
-    {
-        $filters = array();
-        foreach ($query as $param) {
-            $filter = array();
-            if ($param[1] == '=' && is_array($param[2])) {
-                $filter[$param[0]] = array('$in' => $param[2]);
-                $filters[] = $filter;
-            }
-            else if ($param[1] == '=') {
-                $filters[] = array($param[0] => $param[2]);
-            }
-            else if ($param[1] == 'LIKE' || $param[1] == '~') {
-                $filter[$param[0]] = array('$regex' => preg_quote($param[2]), '$options' => 'i');
-                $filters[] = $filter;
-            }
-            else if ($param[1] == '!~' || $param[1] == '!LIKE') {
-                $filter[$param[0]] = array('$not' => '/' . preg_quote($param[2]) . '/i');
-                $filters[] = $filter;
-            }
-            else {
-                $op = '';
-                switch ($param[1]) {
-                    case '>':  $op = '$gt';  break;
-                    case '>=': $op = '$gte'; break;
-                    case '<':  $op = '$lt';  break;
-                    case '<=': $op = '$lte'; break;
-                    case '!=':
-                    case '<>': $op = '$gte'; break;
-                }
-                if ($op) {
-                    $filter[$param[0]] = array($op => $param[2]);
-                    $filters[] = $filter;
-                }
-            }
-        }
-
-        return array('$and' => $filters);
-    }
-
-    /**
-     * Helper method to convert the given pseudo-query triplets into
-     * an associative filter array with 'equals' values only
-     */
-    private function _query2assoc($query)
-    {
-        // extract object type from query parameter
-        $filter = array();
-        foreach ($query as $param) {
-            if ($param[1] == '=')
-                $filter[$param[0]] = $param[2];
-        }
-        return $filter;
-    }
-
-    /**
-     * Fetch messages from IMAP
-     *
-     * @param array List of message UIDs to fetch
-     * @return array List of parsed Kolab objects
-     */
-    private function _fetch($index, $type = null, $folder = null)
-    {
-        $results = array();
-        foreach ((array)$index as $msguid) {
-            if ($object = $this->folder->read_object($msguid, $type, $folder)) {
-                $results[] = $object;
-                $this->set($msguid, $object);
-            }
-        }
-
-        return $results;
-    }
-
-
-    /**
-     * Helper method to convert the given Kolab object into a dataset to be written to cache
-     */
-    private function _serialize($object, $msguid)
-    {
-        $bincols = array_flip($this->binary_cols);
-        $doc = array(
-            'resource' => $this->resource_uri,
-            'type'     => $object['_type'] ? $object['_type'] : $this->folder->type,
-            'msguid'   => $msguid,
-            'uid'      => $object['uid'],
-            'xml'      => '',
-            'tags'     => array(),
-            'words'    => array(),
-            'objcols'  => array(),
-        );
-
-        // set type specific values
-        if ($this->folder->type == 'event') {
-            // database runs in server's timezone so using date() is what we want
-            $doc['dtstart'] = date('Y-m-d H:i:s', is_object($object['start']) ? $object['start']->format('U') : $object['start']);
-            $doc['dtend']   = date('Y-m-d H:i:s', is_object($object['end'])   ? $object['end']->format('U')   : $object['end']);
-
-            // extend date range for recurring events
-            if ($object['recurrence']) {
-                $doc['dtend'] = date('Y-m-d H:i:s', $object['recurrence']['UNTIL'] ?: strtotime('now + 2 years'));
-            }
-        }
-
-        if ($object['_formatobj']) {
-            $doc['xml'] = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write());
-            $doc['tags'] = $object['_formatobj']->get_tags();
-            $doc['words'] = $object['_formatobj']->get_words();
-        }
-
-        // extract object data
-        $data = array();
-        foreach ($object as $key => $val) {
-            if ($val === "" || $val === null) {
-                // skip empty properties
-                continue;
-            }
-            if (isset($bincols[$key])) {
-                $data[$key] = base64_encode($val);
-            }
-            else if (is_object($val)) {
-                if (is_a($val, 'DateTime')) {
-                    $data[$key] = array('_class' => 'DateTime', 'date' => $val->format('Y-m-d H:i:s'), 'timezone' => $val->getTimezone()->getName());
-                    $doc['objcols'][] = $key;
-                }
-            }
-            else if ($key[0] != '_') {
-                $data[$key] = $val;
-            }
-            else if ($key == '_attachments') {
-                foreach ($val as $k => $att) {
-                    unset($att['content'], $att['path']);
-                    if ($att['id'])
-                        $data[$key][$k] = $att;
-                }
-            }
-        }
-
-        $doc['data'] = $data;
-        return $doc;
-    }
-
-    /**
-     * Helper method to turn stored cache data into a valid storage object
-     */
-    private function _unserialize($doc)
-    {
-        $object = $doc['data'];
-
-        // decode binary properties
-        foreach ($this->binary_cols as $key) {
-            if (!empty($object[$key]))
-                $object[$key] = base64_decode($object[$key]);
-        }
-
-        // restore serialized objects
-        foreach ((array)$doc['objcols'] as $key) {
-            switch ($object[$key]['_class']) {
-                case 'DateTime':
-                    $val = new DateTime($object[$key]['date'], new DateTimeZone($object[$key]['timezone']));
-                    $object[$key] = $val;
-                    break;
-            }
-        }
-
-        // add meta data
-        $object['_type'] = $doc['type'];
-        $object['_msguid'] = $doc['msguid'];
-        $object['_mailbox'] = $this->folder->name;
-        $object['_formatobj'] = kolab_format::factory($doc['type'], $doc['xml']);
-
-        return $object;
-    }
-
-    /**
-     * Check lock record for this folder and wait if locked or set lock
-     */
-    private function _sync_lock()
-    {
-        if (!$this->ready)
-            return;
-
-        $this->synclock = true;
-        $lock = $this->db->locks->findOne(array('resource' => $this->resource_uri));
-
-        // create lock record if not exists
-        if (!$lock) {
-            $this->db->locks->insert(array('resource' => $this->resource_uri, 'created' => time()));
-        }
-        // wait if locked (expire locks after 10 minutes)
-        else if ((time() - $lock['created']) < 600) {
-            usleep(500000);
-            return $this->_sync_lock();
-        }
-        // set lock
-        else {
-            $lock['created'] = time();
-            $this->db->locks->update(array('_id' => $lock['_id']), $lock, array('safe' => true));
-        }
-    }
-
-    /**
-     * Remove lock for this folder
-     */
-    public function _sync_unlock()
-    {
-        if (!$this->ready || !$this->synclock)
-            return;
-
-        $this->db->locks->remove(array('resource' => $this->resource_uri));
-    }
-
-    /**
-     * Resolve an object UID into an IMAP message UID
-     *
-     * @param string  Kolab object UID
-     * @param boolean Include deleted objects
-     * @return int The resolved IMAP message UID
-     */
-    public function uid2msguid($uid, $deleted = false)
-    {
-        if (!isset($this->uid2msg[$uid])) {
-            // use IMAP SEARCH to get the right message
-            $index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') . 'HEADER SUBJECT ' . $uid);
-            $results = $index->get();
-            $this->uid2msg[$uid] = $results[0];
-        }
-
-        return $this->uid2msg[$uid];
-    }
-
-}

iRony-0.4.2.tar.gz/lib/plugins/tasklist/.gitignore Deleted

iRony-0.4.2.tar.gz/composer.lock -> iRony-0.4.3.tar.gz/composer.lock Changed

@@ -252,27 +252,29 @@
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.1.0",
+            "version": "1.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1",
+                "reference": "ae466f726242e637cebdd526a7d991b9433bacf1",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^6.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
+                "phpbench/phpbench": "^0.13",
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpstan/phpstan-shim": "^0.11",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
@@ -297,12 +299,12 @@
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-07-22T11:58:36+00:00"
+            "time": "2019-10-21T16:45:58+00:00"
         },
         {
             "name": "kolab/net_ldap3",
@@ -310,7 +312,7 @@
             "source": {
                 "type": "git",
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
-                "reference": "373ff2401c134c5689ef01c778199ddefbd5eeb1"
+                "reference": "e1835e36fa5d3434f9804670fc3cdd16992ec66a"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
@@ -349,7 +351,7 @@
                 "pear",
                 "vlv"
             ],
-            "time": "2018-06-20T09:07:17+00:00"
+            "time": "2019-10-21T11:18:59+00:00"
         },
         {
             "name": "pear/auth_sasl",
@@ -406,16 +408,16 @@
         },
         {
             "name": "pear/console_getopt",
-            "version": "v1.4.2",
+            "version": "v1.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Console_Getopt.git",
-                "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0"
+                "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/6c77aeb625b32bd752e89ee17972d103588b90c0",
-                "reference": "6c77aeb625b32bd752e89ee17972d103588b90c0",
+                "url": "https://api.github.com/repos/pear/Console_Getopt/zipball/a41f8d3e668987609178c7c4a9fe48fecac53fa0",
+                "reference": "a41f8d3e668987609178c7c4a9fe48fecac53fa0",
                 "shasum": ""
             },
             "type": "library",
@@ -433,11 +435,6 @@
             ],
             "authors": [
                 {
-                    "name": "Greg Beaver",
-                    "email": "cellog@php.net",
-                    "role": "Helper"
-                },
-                {
                     "name": "Andrei Zmievski",
                     "email": "andrei@php.net",
                     "role": "Lead"
@@ -446,23 +443,28 @@
                     "name": "Stig Bakken",
                     "email": "stig@php.net",
                     "role": "Developer"
+                },
+                {
+                    "name": "Greg Beaver",
+                    "email": "cellog@php.net",
+                    "role": "Helper"
                 }
             ],
             "description": "More info available on: http://pear.php.net/package/Console_Getopt",
-            "time": "2019-02-06T16:52:33+00:00"
+            "time": "2019-11-20T18:27:48+00:00"
         },
         {
             "name": "pear/mail_mime",
-            "version": "1.10.2",
+            "version": "1.10.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail_Mime.git",
-                "reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a"
+                "reference": "36ab96ff17c098f65f58adb31c089beb12868ece"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/7b2f93fa5219da99e9997f497b916b5bb27eb57a",
-                "reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a",
+                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/36ab96ff17c098f65f58adb31c089beb12868ece",
+                "reference": "36ab96ff17c098f65f58adb31c089beb12868ece",
                 "shasum": ""
             },
             "require": {
@@ -495,7 +497,7 @@
             ],
             "description": "Mail_Mime provides classes to create MIME messages",
             "homepage": "http://pear.php.net/package/Mail_Mime",
-            "time": "2017-11-17T09:21:45+00:00"
+            "time": "2019-10-13T09:02:10+00:00"
         },
         {
             "name": "pear/net_idna2",
@@ -632,7 +634,7 @@
                 {
                     "name": "Chuck Hagenbuch",
                     "email": "chuck@horde.org",
-                    "role": "lead"
+                    "role": "Lead"
                 }
             ],
             "description": "An implementation of the SMTP protocol",
@@ -681,7 +683,7 @@
                 {
                     "name": "Chuck Hagenbuch",
                     "email": "chuck@horde.org",
-                    "role": "lead"
+                    "role": "Lead"
                 },
                 {
                     "name": "Aleksander Machniak",
@@ -699,16 +701,16 @@
         },
         {
             "name": "pear/pear-core-minimal",
-            "version": "v1.10.9",
+            "version": "v1.10.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/pear-core-minimal.git",
-                "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f"
+                "reference": "625a3c429d9b2c1546438679074cac1b089116a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/742be8dd68c746a01e4b0a422258e9c9cae1c37f",
-                "reference": "742be8dd68c746a01e4b0a422258e9c9cae1c37f",
+                "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/625a3c429d9b2c1546438679074cac1b089116a7",
+                "reference": "625a3c429d9b2c1546438679074cac1b089116a7",
                 "shasum": ""
             },
             "require": {
@@ -739,20 +741,20 @@
                 }
             ],
             "description": "Minimal set of PEAR core files to be used as composer dependency",
-            "time": "2019-03-13T18:15:44+00:00"
+            "time": "2019-11-19T19:00:24+00:00"
         },
         {
             "name": "pear/pear_exception",
-            "version": "v1.0.0",
+            "version": "v1.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/PEAR_Exception.git",
-                "reference": "8c18719fdae000b690e3912be401c76e406dd13b"
+                "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/8c18719fdae000b690e3912be401c76e406dd13b",
-                "reference": "8c18719fdae000b690e3912be401c76e406dd13b",
+                "url": "https://api.github.com/repos/pear/PEAR_Exception/zipball/dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
+                "reference": "dbb42a5a0e45f3adcf99babfb2a1ba77b8ac36a7",
                 "shasum": ""
             },
             "require": {
@@ -768,9 +770,9 @@
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "PEAR": ""
-                }
+                "classmap": [
+                    "PEAR/"
+                ]
             },
             "notification-url": "https://packagist.org/downloads/",
             "include-path": [
@@ -794,7 +796,7 @@
             "keywords": [
                 "exception"
             ],
-            "time": "2015-02-10T20:07:52+00:00"
+            "time": "2019-12-10T10:24:42+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -1545,16 +1547,16 @@
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
+            "version": "v1.13.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
+                "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3",
                 "shasum": ""
             },
             "require": {
@@ -1566,7 +1568,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.13-dev"
                 }
             },
             "autoload": {
@@ -1583,12 +1585,12 @@
             ],
             "authors": [
                 {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
                 },
                 {
-                    "name": "Gert de Pagter",
-                    "email": "backendtea@gmail.com"
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -1599,11 +1601,11 @@
                 "polyfill",
                 "portable"
             ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-11-27T13:56:44+00:00"
         },
         {
             "name": "symfony/yaml",
-            "version": "v2.8.49",
+            "version": "v2.8.52",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",

iRony-0.4.3.tar.gz/lib/FileAPI/api/autocomplete.php Added

@@ -0,0 +1,57 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2018, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_api_autocomplete extends file_api_common
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        parent::handle();
+
+        if (!isset($this->args['search']) || $this->args['search'] === '') {
+            throw new Exception("Missing search keyword", file_api_core::ERROR_CODE);
+        }
+
+        if (isset($this->args['folder']) && $this->args['folder'] !== '') {
+            list($driver, $path) = $this->api->get_driver($this->args['folder']);
+        }
+        else {
+            $driver = $this->api->get_backend();
+        }
+
+        if (!empty($this->args['mode'])) {
+            $mode = 0;
+            $mode += stripos($this->args['mode'], 'user') !== false ? file_storage::SEARCH_USER : 0;
+            $mode += stripos($this->args['mode'], 'group') !== false ? file_storage::SEARCH_GROUP : 0;
+        }
+
+        if (empty($mode)) {
+            $mode = file_storage::SEARCH_USER;
+        }
+
+        return $driver->autocomplete($this->args['search'], $mode);
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/api/common.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/common.php Changed

@@ -29,10 +29,11 @@
     protected $args = array();
 
 
-    public function __construct($api)
+    public function __construct($api, $args = array())
     {
-        $this->rc  = rcube::get_instance();
-        $this->api = $api;
+        $this->rc   = rcube::get_instance();
+        $this->api  = $api;
+        $this->args = (array) $args;
     }
 
     /**
@@ -41,7 +42,11 @@
     public function handle()
     {
         // GET arguments
-        $this->args = &$_GET;
+        if (!empty($_GET)) {
+            foreach (array_keys($_GET) as $key) {
+                $this->args[$key] = &$_GET[$key];
+            }
+        }
 
         // POST arguments (JSON)
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -51,7 +56,7 @@
         }
 
         // disable script execution time limit, so we can handle big files
-        @set_time_limit(0);
+        @set_time_limit(360);
     }
 
     /**
@@ -102,22 +107,30 @@
      */
     protected function find_viewer($mimetype)
     {
-        $dir = RCUBE_INSTALL_PATH . 'lib/viewers';
+        $dir   = RCUBE_INSTALL_PATH . 'lib/viewers';
+        $files = array();
 
+        // First get viewers and sort by name to get priority
         if ($handle = opendir($dir)) {
             while (false !== ($file = readdir($handle))) {
                 if (preg_match('/^([a-z0-9_]+)\.php$/i', $file, $matches)) {
-                    include_once $dir . '/' . $file;
-                    $class  = 'file_viewer_' . $matches[1];
-                    $viewer = new $class($this->api);
-
-                    if ($viewer->supports($mimetype)) {
-                        return $viewer;
-                    }
+                    $files[$matches[1]] = $dir . '/' . $file;
                 }
             }
             closedir($handle);
         }
+
+        ksort($files);
+
+        foreach ($files as $name => $file) {
+            include_once $file;
+            $class  = 'file_viewer_' . $name;
+            $viewer = new $class($this->api);
+
+            if ($viewer->supports($mimetype)) {
+                return $viewer;
+            }
+        }
     }
 
     /**
@@ -140,4 +153,125 @@
 
         return $metadata;
     }
+
+    /**
+     * Get folder rights
+     */
+    protected function folder_rights($folder)
+    {
+        list($driver, $path) = $this->api->get_driver($folder);
+
+        $rights = $driver->folder_rights($path);
+        $result = array();
+        $map    = array(
+            file_storage::ACL_READ  => 'read',
+            file_storage::ACL_WRITE => 'write',
+        );
+
+        foreach ($map as $key => $value) {
+            if ($rights & $key) {
+                $result[] = $value;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Collect folder list request parameters
+     */
+    protected function folder_list_params()
+    {
+        $params = array('type' => 0);
+
+        if (!empty($this->args['unsubscribed']) && rcube_utils::get_boolean((string) $this->args['unsubscribed'])) {
+            $params['type'] |= file_storage::FILTER_UNSUBSCRIBED;
+        }
+
+        if (!empty($this->args['writable']) && rcube_utils::get_boolean((string) $this->args['writable'])) {
+            $params['type'] |= file_storage::FILTER_WRITABLE;
+        }
+
+        if (isset($this->args['search']) && strlen($this->args['search'])) {
+            $params['search'] = $this->args['search'];
+        }
+
+        if (!empty($this->args['permissions']) && rcube_utils::get_boolean((string) $this->args['permissions'])) {
+            $params['extended']    = true;
+            $params['permissions'] = true;
+        }
+
+        if (!empty($this->args['level']) && ($level = intval($this->args['level']))) {
+            if ($level < 0) {
+                $level *= -1;
+                $params['auto_level'] = true;
+            }
+
+            $params['level'] = $level;
+        }
+
+        return $params;
+    }
+
+    /**
+     * Wrapper for folder_list() method on specified driver
+     */
+    protected function folder_list($driver, $params, $relative_level = false)
+    {
+        $caps = $driver->capabilities();
+
+        if ($params['type'] & file_storage::FILTER_UNSUBSCRIBED) {
+            if (empty($caps[file_storage::CAPS_SUBSCRIPTIONS])) {
+                return array();
+            }
+        }
+
+        // If the driver has fast way to get the whole folders hierarchy
+        // we'll return all folders, despite the requested level, when requested
+        if (!empty($params['auto_level']) & !empty($caps[file_storage::CAPS_FAST_FOLDER_LIST])) {
+            unset($params['level']);
+        }
+
+        $prefix = $driver->title() . file_storage::SEPARATOR;
+
+        if (strlen($prefix) > 1 && !$relative_level && $params['level'] && (!is_string($params['path']) || $params['path'] === '')) {
+            $params['level'] -= 1;
+        }
+
+        $folders = $driver->folder_list($params);
+
+        if (!empty($folders) && strlen($prefix) > 1) {
+            foreach ($folders as $idx => $folder) {
+                if (is_array($folder)) {
+                    $folders[$idx]['folder'] = $prefix . $folder['folder'];
+                }
+                else {
+                    $folders[$idx] = $prefix . $folder;
+                }
+            }
+        }
+
+        return $folders;
+    }
+
+    /**
+     * Update document session on file/folder move
+     */
+    protected function session_uri_update($from, $to, $is_folder = false)
+    {
+        // check Manticore/WOPI support. Note: we don't use config->get('fileapi_manticore')
+        // here as it may be not properly set if backend driver wasn't initialized yet
+        $capabilities = $this->api->capabilities(false);
+
+        if (!empty($capabilities['WOPI'])) {
+            $document = new file_wopi($this->api);
+        }
+        else if (!empty($capabilities['MANTICORE'])) {
+            $document = new file_manticore($this->api);
+        }
+
+        if (!empty($document)) {
+            $document->session_uri_update($from, $to, $is_folder);
+        }
+    }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/api/document.php Added

@@ -0,0 +1,345 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2015, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_api_document extends file_api_common
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        $method     = $_SERVER['REQUEST_METHOD'];
+        $this->args = $_GET;
+
+        if ($method == 'POST' && !empty($_SERVER['HTTP_X_HTTP_METHOD'])) {
+            $method = $_SERVER['HTTP_X_HTTP_METHOD'];
+        }
+
+        // Invitation notifications
+        if ($this->args['method'] == 'invitations') {
+            return $this->invitations();
+        }
+
+        // Sessions list
+        if ($this->args['method'] == 'sessions') {
+            return $this->sessions();
+        }
+
+        // Session and invitations management
+        if (strpos($this->args['method'], 'document_') === 0) {
+            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+                $post = file_get_contents('php://input');
+                $this->args += (array) json_decode($post, true);
+                unset($post);
+            }
+
+            if (empty($this->args['id'])) {
+                throw new Exception("Missing document ID.", file_api_core::ERROR_CODE);
+            }
+
+            switch ($this->args['method']) {
+                case 'document_delete':
+                case 'document_invite':
+                case 'document_request':
+                case 'document_decline':
+                case 'document_accept':
+                case 'document_cancel':
+                case 'document_info':
+                    return $this->{$this->args['method']}($this->args['id']);
+            }
+        }
+        // Document content actions for Manticore
+        else if ($method == 'PUT' || $method == 'GET') {
+            if (empty($this->args['id'])) {
+                throw new Exception("Missing document ID.", file_api_core::ERROR_CODE);
+            }
+
+            return $this->{'document_' . strtolower($method)}($this->args['id']);
+        }
+
+        throw new Exception("Unknown method", file_api_core::ERROR_INVALID);
+    }
+
+    /**
+     * Get file path from manticore session identifier
+     */
+    protected function get_file_path($id)
+    {
+        $document = new file_document($this->api);
+
+        $file = $document->session_file($id);
+
+        return $file['file'];
+    }
+
+    /**
+     * Get invitations list
+     */
+    protected function invitations()
+    {
+        $timestamp = new DateTime('now', new DateTimeZone('UTC'));
+        $timestamp = $timestamp->format('U');
+
+        // Initial tracking request, return just the current timestamp
+        if ($this->args['timestamp'] == -1) {
+            return array('timestamp' => $timestamp);
+            // @TODO: in this mode we should likely return all invitations
+            // that require user action, otherwise we may skip some unintentionally
+        }
+
+        $document = new file_document($this->api);
+        $filter   = array();
+
+        if ($this->args['timestamp']) {
+            $filter['timestamp'] = $this->args['timestamp'];
+        }
+
+        $list = $document->invitations_list($filter);
+
+        return array(
+            'list'      => $list,
+            'timestamp' => $timestamp,
+        );
+    }
+
+    /**
+     * Get sessions list
+     */
+    protected function sessions()
+    {
+        $document = new file_document($this->api);
+
+        $params = array(
+            'reverse' => rcube_utils::get_boolean((string) $this->args['reverse']),
+        );
+
+        if (!empty($this->args['sort'])) {
+            $params['sort'] = strtolower($this->args['sort']);
+        }
+
+        return $document->sessions_list($params);
+    }
+
+    /**
+     * Close (delete) manticore session
+     */
+    protected function document_delete($id)
+    {
+        $document = file_document::get_handler($this->api, $id);
+
+        if (!$document->session_delete($id)) {
+            throw new Exception("Failed deleting the document session.", file_api_core::ERROR_CODE);
+        }
+    }
+
+    /**
+     * Invite/add a session participant(s)
+     */
+    protected function document_invite($id)
+    {
+        $document = file_document::get_handler($this->api, $id);
+        $users    = $this->args['users'];
+        $comment  = $this->args['comment'];
+
+        if (empty($users)) {
+            throw new Exception("Invalid arguments.", file_api_core::ERROR_CODE);
+        }
+
+        foreach ((array) $users as $user) {
+            if (!empty($user['user'])) {
+                $document->invitation_create($id, $user['user'], file_document::STATUS_INVITED, $comment, $user['name']);
+
+                $result[] = array(
+                    'session_id' => $id,
+                    'user'       => $user['user'],
+                    'user_name'  => $user['name'],
+                    'status'     => file_document::STATUS_INVITED,
+                );
+            }
+        }
+
+        return array(
+            'list' => $result,
+        );
+    }
+
+    /**
+     * Request an invitation to a session
+     */
+    protected function document_request($id)
+    {
+        $document = file_document::get_handler($this->api, $id);
+        $document->invitation_create($id, null, file_document::STATUS_REQUESTED, $this->args['comment']);
+    }
+
+    /**
+     * Decline an invitation to a session
+     */
+    protected function document_decline($id)
+    {
+        $document = file_document::get_handler($this->api, $id);
+        $document->invitation_update($id, $this->args['user'], file_document::STATUS_DECLINED, $this->args['comment']);
+    }
+
+    /**
+     * Accept an invitation to a session
+     */
+    protected function document_accept($id)
+    {
+        $document = file_document::get_handler($this->api, $id);
+        $document->invitation_update($id, $this->args['user'], file_document::STATUS_ACCEPTED, $this->args['comment']);
+    }
+
+    /**
+     * Remove a session participant(s) - cancel invitations
+     */
+    protected function document_cancel($id)
+    {
+        $document = file_document::get_handler($this->api, $id);
+        $users    = $this->args['users'];
+
+        if (empty($users)) {
+            throw new Exception("Invalid arguments.", file_api_core::ERROR_CODE);
+        }
+
+        foreach ((array) $users as $user) {
+            $document->invitation_delete($id, $user);
+            $result[] = $user;
+        }
+
+        return array(
+            'list' => $result,
+        );
+    }
+
+    /**
+     * Return document informations
+     */
+    protected function document_info($id, $extended = true)
+    {
+        $document = file_document::get_handler($this->api, $id);
+        $file     = $document->session_file($id);
+        $rcube    = rcube::get_instance();
+
+        try {
+            list($driver, $path) = $this->api->get_driver($file['file']);
+            $result = $driver->file_info($path);
+        }
+        catch (Exception $e) {
+            // invited users may have no permission,
+            // use file data from the session
+            $result = array(
+                'size'     => $file['size'],
+                'name'     => $file['name'],
+                'modified' => $file['modified'],
+                'type'     => $file['type'],
+            );
+        }
+
+        if ($extended) {
+            $session = $document->session_info($id);
+
+            $result['owner']      = $session['owner'];
+            $result['owner_name'] = $session['owner_name'];
+            $result['user']       = $rcube->user->get_username();
+            $result['readonly']   = !empty($session['readonly']);
+            $result['origin']     = $session['origin'];
+
+            if ($result['owner'] == $result['user']) {
+                $result['user_name'] = $result['owner_name'];
+            }
+            else {
+                $result['user_name'] = $this->api->resolve_user($result['user']) ?: '';
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Update document file content
+     */
+    protected function document_put($id)
+    {
+        $file = $this->get_file_path($id);
+        list($driver, $path) = $this->api->get_driver($file);
+
+        $length   = rcube_utils::request_header('Content-Length');
+        $tmp_dir  = unslashify($this->api->config->get('temp_dir'));
+        $tmp_path = tempnam($tmp_dir, 'chwalaUpload');
+
+        // Create stream to copy input into a temp file
+        $input    = fopen('php://input', 'r');
+        $tmp_file = fopen($tmp_path, 'w');
+
+        if (!$input || !$tmp_file) {
+            throw new Exception("Failed opening input or temp file stream.", file_api_core::ERROR_CODE);
+        }
+
+        // Create temp file from the input
+        $copied = stream_copy_to_stream($input, $tmp_file);
+
+        fclose($input);
+        fclose($tmp_file);
+
+        if ($copied < $length) {
+            throw new Exception("Failed writing to temp file.", file_api_core::ERROR_CODE);
+        }
+
+        $file_data = array(
+            'path' => $tmp_path,
+            'type' => rcube_mime::file_content_type($tmp_path, $file),
+        );
+
+        $driver->file_update($path, $file_data);
+
+        // remove the temp file
+        unlink($tmp_path);
+
+        // Update the file metadata in session
+        $file_data = $driver->file_info($file);
+        $document  = file_document::get_handler($this->api, $this->args['id']);
+        $document->session_update($this->args['id'], $file_data);
+    }
+
+    /**
+     * Return document file content
+     */
+    protected function document_get($id)
+    {
+        $file = $this->get_file_path($id);
+        list($driver, $path) = $this->api->get_driver($file);
+
+        try {
+            $params = array('force-type' => 'application/vnd.oasis.opendocument.text');
+
+            $driver->file_get($path, $params);
+        }
+        catch (Exception $e) {
+            header("HTTP/1.0 " . file_api_core::ERROR_CODE . " " . $e->getMessage());
+        }
+
+        $this->api->output_send();
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/api/file_create.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/file_create.php Changed

@@ -52,14 +52,30 @@
             $chunk = $this->args['content'];
         }
 
+        $ctype = $this->args['content-type'];
+        if ($ctype && !preg_match('/^[a-z_-]+\/[a-z._-]+$/', $ctype)) {
+            $ctype = '';
+        }
+
         $request = $this instanceof file_api_file_update ? 'file_update' : 'file_create';
         $file    = array(
             'content' => $this->args['content'],
             'path'    => $this->args['path'],
-            'type'    => rcube_mime::file_content_type($chunk,
-                $this->args['file'], $this->args['content-type'], !$is_file),
+            'type'    => rcube_mime::file_content_type($chunk, $this->args['file'], $ctype, !$is_file),
         );
 
+        if (strpos($file['type'], 'empty') !== false && $ctype) {
+            $file['type'] = $ctype;
+        }
+        else if (empty($file['type'])) {
+            $file['type'] = 'application/octet-stream';
+        }
+
+        // Get file content from a template
+        if ($request == 'file_create' && empty($file['path']) && empty($file['content'])) {
+            $this->use_file_template($file);
+        }
+
         list($driver, $path) = $this->api->get_driver($this->args['file']);
 
         $driver->$request($path, $file);
@@ -68,4 +84,26 @@
             return $driver->file_info($path);
         }
     }
+
+    /**
+     * Use templates when creating empty files
+     */
+    protected function use_file_template(&$file)
+    {
+        if ($ext = array_search($file['type'], file_utils::$ext_map)) {
+            // find the template
+            $ext = ".$ext";
+            if ($handle = opendir(__DIR__ . '/../templates')) {
+                while (false !== ($entry = readdir($handle))) {
+                    if (substr($entry, -strlen($ext)) == $ext) {
+                        // set path to the template file
+                        $file['path'] = __DIR__ . '/../templates/' . $entry;
+                        break;
+                    }
+                }
+
+                closedir($handle);
+            }
+        }
+    }
 }

iRony-0.4.2.tar.gz/lib/FileAPI/api/file_get.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/file_get.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/api/file_info.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/file_info.php Changed

@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------------+
  | This file is part of the Kolab File API                                  |
  |                                                                          |
- | Copyright (C) 2012-2014, Kolab Systems AG                                |
+ | Copyright (C) 2012-2015, Kolab Systems AG                                |
  |                                                                          |
  | 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 |
@@ -31,16 +31,69 @@
     {
         parent::handle();
 
+        // check Manticore support. Note: we don't use config->get('fileapi_manticore')
+        // here as it may be not properly set if backend driver wasn't initialized yet
+        $capabilities = $this->api->capabilities(false);
+        $manticore    = $capabilities['MANTICORE'];
+        $wopi         = $capabilities['WOPI'];
+
+        // support file_info by session ID
         if (!isset($this->args['file']) || $this->args['file'] === '') {
-            throw new Exception("Missing file name", file_api_core::ERROR_CODE);
+            if (($manticore || $wopi) && !empty($this->args['session'])) {
+                if ($info = $this->file_document_file($this->args['session'])) {
+                    $this->args['file'] = $info['file'];
+                }
+            }
+            else {
+                throw new Exception("Missing file name", file_api_core::ERROR_CODE);
+            }
         }
 
-        list($driver, $path) = $this->api->get_driver($this->args['file']);
+        if ($this->args['file'] !== null) {
+            try {
+                list($driver, $path) = $this->api->get_driver($this->args['file']);
 
-        $info = $driver->file_info($path);
+                $info = $driver->file_info($path);
+                $info['file'] = $this->args['file'];
+            }
+            catch (Exception $e) {
+                // Invited user may have no access to the file,
+                // ignore errors if session exists
+                if (!$this->args['viewer'] || !$this->args['session']) {
+                    throw $e;
+                }
+            }
+        }
+
+        // Possible 'viewer' types are defined in files_api.js:file_type_supported()
+        // 1 - Native browser support
+        // 2 - Chwala viewer exists
+        // 4 - Editor exists (manticore/wopi)
 
         if (rcube_utils::get_boolean((string) $this->args['viewer'])) {
-            $this->file_viewer_info($this->args['file'], $info);
+            if ($this->args['file'] !== null) {
+                $this->file_viewer_info($info);
+            }
+
+            if ((intval($this->args['viewer']) & 4)) {
+                // @TODO: Chwala client should have a possibility to select
+                //        between wopi and manticore?
+                if (!$wopi || !$this->file_wopi_handler($info)) {
+                    if ($manticore) {
+                        $this->file_manticore_handler($info);
+                    }
+                }
+            }
+        }
+
+        // check writable flag
+        if ($this->args['file'] !== null) {
+            $path = explode(file_storage::SEPARATOR, $path);
+            array_pop($path);
+            $path = implode(file_storage::SEPARATOR, $path);
+            $acl  = $driver->folder_rights($path);
+
+            $info['writable'] = ($acl & file_storage::ACL_WRITE) != 0;
         }
 
         return $info;
@@ -49,9 +102,12 @@
     /**
      * Merge file viewer data into file info
      */
-    protected function file_viewer_info($file, &$info)
+    protected function file_viewer_info(&$info)
     {
-        if ($viewer = $this->find_viewer($info['type'])) {
+        $file   = $this->args['file'];
+        $viewer = $this->find_viewer($info['type']);
+
+        if ($viewer) {
             $info['viewer'] = array();
             if ($frame = $viewer->frame($file, $info['type'])) {
                 $info['viewer']['frame'] = $frame;
@@ -61,4 +117,64 @@
             }
         }
     }
+
+    /**
+     * Get file from manticore/wopi session
+     */
+    protected function file_document_file($session_id)
+    {
+        $document = file_document::get_handler($this->api, $session_id);
+
+        return $document->session_file($session_id, true);
+    }
+
+    /**
+     * Merge manticore session data into file info
+     */
+    protected function file_manticore_handler(&$info)
+    {
+        $manticore = new file_manticore($this->api);
+        $file      = $this->args['file'];
+        $session   = $this->args['session'];
+
+        if (in_array_nocase($info['type'], $manticore->supported_filetypes(true))) {
+            $info['viewer']['manticore'] = true;
+        }
+        else {
+            return false;
+        }
+
+        if ($uri = $manticore->session_start($file, $info, $session)) {
+            $info['viewer']['href'] = $uri;
+            $info['viewer']['post'] = $manticore->editor_post_params($info);
+            $info['session']        = $manticore->session_info($session, true);
+        }
+
+        return true;
+    }
+
+    /**
+     * Merge WOPI session data into file info
+     */
+    protected function file_wopi_handler(&$info)
+    {
+        $wopi    = new file_wopi($this->api);
+        $file    = $this->args['file'];
+        $session = $this->args['session'];
+
+        if (in_array_nocase($info['type'], $wopi->supported_filetypes(true))) {
+            $info['viewer']['wopi'] = true;
+        }
+        else {
+            return false;
+        }
+
+        if ($uri = $wopi->session_start($file, $info, $session)) {
+            $info['viewer']['href'] = $uri;
+            $info['viewer']['post'] = $wopi->editor_post_params($info);
+            $info['session']        = $wopi->session_info($session, true);
+        }
+
+        return true;
+    }
 }

iRony-0.4.2.tar.gz/lib/FileAPI/api/file_list.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/file_list.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/api/file_move.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/file_move.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/api/folder_auth.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_auth.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/api/folder_create.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_create.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_info.php Added

@@ -0,0 +1,61 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2015, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_api_folder_info extends file_api_common
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        parent::handle();
+
+        if (!isset($this->args['folder']) || $this->args['folder'] === '') {
+            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);
+        }
+
+        $result = array(
+            'folder' => $this->args['folder'],
+        );
+
+        if (!empty($this->args['rights']) && rcube_utils::get_boolean((string) $this->args['rights'])) {
+            $result['rights'] = $this->folder_rights($this->args['folder']);
+        }
+
+        if (!empty($this->args['sessions']) && rcube_utils::get_boolean((string) $this->args['sessions'])) {
+             $result['sessions'] = $this->folder_sessions($this->args['folder']);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get editing sessions
+     */
+    protected function folder_sessions($folder)
+    {
+        $manticore = new file_manticore($this->api);
+        return $manticore->session_find($folder);
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/api/folder_list.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_list.php Changed

@@ -31,46 +31,90 @@
     {
         parent::handle();
 
-        // get folders from main driver
-        $backend = $this->api->get_backend();
-        $folders = $backend->folder_list();
+        $params   = $this->folder_list_params();
+        $search   = isset($params['search']) ? mb_strtoupper($params['search']) : null;
+        $drivers  = $this->api->get_drivers(true, $admin_drivers);
+        $errors   = array();
+        $has_more = false;
+
+        if (isset($this->args['folder']) && strlen($this->args['folder'])) {
+            list($driver, $path) = $this->api->get_driver($this->args['folder']);
+
+            $title          = $driver->title();
+            $params['path'] = $path;
+
+            try {
+                $folders = $this->folder_list($driver, $params, true);
+            }
+            catch (Exception $e) {
+                $folders = array();
+                if ($e->getCode() == file_storage::ERROR_NOAUTH) {
+                    if (!in_array($title, $admin_drivers)) {
+                        // inform UI about to ask user for credentials
+                        $errors[$title] = $this->parse_metadata($driver->driver_metadata());
+                    }
+                    else {
+                        $errors[$title] = array('error' => file_storage::ERROR_NOAUTH);
+                    }
+                }
+            }
+
+            $drivers = array();
+        }
+        else {
+            $backend = $this->api->get_backend();
+
+            // get folders from default driver
+            if (!$this->rc->config->get('fileapi_backend_storage_disabled')) {
+                $folders = $this->folder_list($backend, $params);
+            }
+        }
 
         // old result format
         if ($this->api->client_version() < 2) {
             return $folders;
         }
 
-        $drivers  = $this->api->get_drivers(true);
-        $has_more = false;
-        $errors   = array();
-
         // get folders from external sources
         foreach ($drivers as $driver) {
             $title  = $driver->title();
             $prefix = $title . file_storage::SEPARATOR;
 
             // folder exists in main source, replace it with external one
-            if (($idx = array_search($title, $folders)) !== false) {
-                foreach ($folders as $idx => $folder) {
-                    if ($folder == $title || strpos($folder, $prefix) === 0) {
-                        unset($folders[$idx]);
-                    }
+            foreach ($folders as $idx => $folder) {
+                if (is_array($folder)) {
+                    $folder = $folder['folder'];
+                }
+                if ($folder == $title || strpos($folder, $prefix) === 0) {
+                    unset($folders[$idx]);
                 }
             }
 
-            $folders[] = $title;
-            $has_more  = true;
+            if ($search === null || strpos(mb_strtoupper($title), $search) !== false) {
+                if ($folder = $this->driver_root_folder($driver, $params)) {
+                    $has_more  = $has_more || count($folders) > 0;
+                    $folders[] = $folder;
+                }
+            }
 
-            if ($driver != $backend) {
+            if ($driver != $backend && $params['level'] != 1) {
                 try {
-                    foreach ($driver->folder_list() as $folder) {
-                        $folders[] = $prefix . $folder;
+                    $_folders = $this->folder_list($driver, $params);
+                    if (!empty($_folders)) {
+                        $folders  = array_merge($folders, $_folders);
+                        $has_more = true;
+                        unset($_folders);
                     }
                 }
                 catch (Exception $e) {
                     if ($e->getCode() == file_storage::ERROR_NOAUTH) {
-                        // inform UI about to ask user for credentials
-                        $errors[$title] = $this->parse_metadata($driver->driver_metadata());
+                        if (!in_array($title, $admin_drivers)) {
+                            // inform UI about to ask user for credentials
+                            $errors[$title] = $this->parse_metadata($driver->driver_metadata());
+                        }
+                        else {
+                            $errors[$title] = array('error' => file_storage::ERROR_NOAUTH);
+                        }
                     }
                 }
             }
@@ -78,32 +122,33 @@
 
         // re-sort the list
         if ($has_more) {
-            usort($folders, array($this, 'sort_folder_comparator'));
+            usort($folders, array('file_utils', 'sort_folder_comparator'));
         }
 
         return array(
-            'list'        => $folders,
+            'list'        => array_values($folders),
             'auth_errors' => $errors,
         );
     }
 
-    /**
-     * Callback for uasort() that implements correct
-     * locale-aware case-sensitive sorting
-     */
-    protected function sort_folder_comparator($str1, $str2)
+    protected function driver_root_folder($driver, $params)
     {
-        $path1 = explode(file_storage::SEPARATOR, $str1);
-        $path2 = explode(file_storage::SEPARATOR, $str2);
+        $title  = $driver->title();
+        $folder = $params['extended'] ? array('folder' => $title) : $title;
 
-        foreach ($path1 as $idx => $folder1) {
-            $folder2 = $path2[$idx];
-
-            if ($folder1 === $folder2) {
-                continue;
+        if ($params['permissions'] || ($params['type'] & file_storage::FILTER_WRITABLE)) {
+            if ($readonly = !($driver->folder_rights('') & file_storage::ACL_WRITE)) {
+                if ($params['permissions']) {
+                    $folder['readonly'] = true;
+                }
             }
+        }
+        else {
+            $readonly = false;
+        }
 
-            return strcoll($folder1, $folder2);
+        if (!$readonly || !($params['type'] & file_storage::FILTER_WRITABLE)) {
+            return $folder;
         }
     }
 }

iRony-0.4.2.tar.gz/lib/FileAPI/api/folder_move.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_move.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_subscribe.php Added

@@ -0,0 +1,48 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2015, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_api_folder_subscribe extends file_api_common
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        parent::handle();
+
+        if (!isset($this->args['folder']) || $this->args['folder'] === '') {
+            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);
+        }
+
+        list($driver, $path) = $this->api->get_driver($this->args['folder']);
+
+        // subscribe mount point?
+        if ($driver->title() === $this->args['folder']) {
+            throw new Exception("Mount point is subscribed by default", file_api_core::ERROR_CODE);
+        }
+
+        // subscribe folder...
+        $driver->folder_subscribe($path);
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/api/folder_types.php -> iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_types.php Changed

@@ -32,6 +32,7 @@
         parent::handle();
 
         $drivers = $this->rc->config->get('fileapi_drivers');
+        $presets = (array) $this->rc->config->get('fileapi_presets');
         $result  = array();
 
         if (!empty($drivers)) {
@@ -39,20 +40,22 @@
                 if ($driver_name != 'kolab' && !isset($result[$driver_name])) {
                     $driver = $this->api->load_driver_object($driver_name);
                     $meta   = $driver->driver_metadata();
+                    $meta   = $this->parse_metadata($meta);
 
-                    $result[$driver_name] = $this->parse_metadata($meta);
+                    if (!empty($presets[$driver_name]) && empty($meta['form_values'])) {
+                        $meta['form_values'] = (array) $presets[$driver_name];
+                        $user = $this->rc->get_user_name();
+
+                        foreach ($meta['form_values'] as $key => $val) {
+                            $meta['form_values'][$key] = str_replace('%u', $user, $val);
+                        }
+                    }
+
+                    $result[$driver_name] = $meta;
                 }
             }
         }
-/*
-        // add local storage to the list
-        if (!empty($result)) {
-            $backend = $this->api->get_backend();
-            $meta = $backend->driver_metadata();
 
-            $result = array_merge(array('default' => $this->parse_metadata($meta, true)), $result);
-        }
-*/
         return $result;
     }
 }

iRony-0.4.3.tar.gz/lib/FileAPI/api/folder_unsubscribe.php Added

@@ -0,0 +1,48 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2015, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_api_folder_unsubscribe extends file_api_common
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        parent::handle();
+
+        if (!isset($this->args['folder']) || $this->args['folder'] === '') {
+            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);
+        }
+
+        list($driver, $path) = $this->api->get_driver($this->args['folder']);
+
+        // subscribe mount point?
+        if ($driver->title() === $this->args['folder']) {
+            throw new Exception("Mount point cannot be unsubscribed", file_api_core::ERROR_CODE);
+        }
+
+        // unsubscribe folder...
+        $driver->folder_unsubscribe($path);
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/api/sharing.php Added

@@ -0,0 +1,84 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2018, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_api_sharing extends file_api_common
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        parent::handle();
+
+        if (!isset($this->args['folder']) || $this->args['folder'] === '') {
+            throw new Exception("Missing folder name", file_api_core::ERROR_CODE);
+        }
+
+        list($driver, $path) = $this->api->get_driver($this->args['folder']);
+
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            // Required arguments:
+            // - action: 'submit', 'update', 'delete'
+            // - mode: depends on the storage driver
+            return $driver->sharing($path, file_storage::SHARING_MODE_UPDATE, $this->args);
+        }
+
+        $form = $driver->sharing($path, file_storage::SHARING_MODE_FORM);
+
+        if (empty($form)) {
+            throw new Exception("Sharing not supported", file_api_core::ERROR_UNSUPPORTED);
+        }
+
+        $rights = $driver->sharing($path, file_storage::SHARING_MODE_RIGHTS);
+
+        $this->localize_form_data($form);
+
+        $result = array(
+            'form'   => $form,
+            'rights' => (array) $rights,
+        );
+
+        return $result;
+    }
+
+    /**
+     * Recurrent function to localize form data entries
+     */
+    protected function localize_form_data(&$data, $key = null, $self = null)
+    {
+        if (!$self) {
+            $self = $this;
+        }
+
+        if (in_array($key, array('title', 'placeholder', 'label', 'list_column_label'))) {
+            $data = $self->api->translate($data);
+        }
+        else if ($key == 'options') {
+            $data = array_map(array($self->api, 'translate'), $data);
+        }
+        else if (is_array($data)) {
+            array_walk($data, array($self, 'localize_form_data'), $self);
+        }
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/kolab/kolab_file_autocomplete.php Added

@@ -0,0 +1,221 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2018, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class kolab_file_autocomplete
+{
+    private $rc;
+    private $ldap;
+
+    /**
+     * Class constructor
+     */
+    public function __construct()
+    {
+        $this->rc = rcube::get_instance();
+    }
+
+    /**
+     * Search users/groups
+     */
+    public function search($search, $with_groups = false)
+    {
+        if (!$this->init_ldap()) {
+            return false;
+        }
+
+        $max  = (int) $this->rc->config->get('autocomplete_max', 15);
+        $mode = (int) $this->rc->config->get('addressbook_search_mode');
+        $me   = $this->rc->get_user_name();
+
+        $this->ldap->set_pagesize($max);
+
+        $result = $this->ldap->search('*', $search, $mode);
+        $users  = array();
+        $index  = array();
+
+        foreach ($result->records as $record) {
+            $user = $record['uid'];
+
+            if (is_array($user)) {
+                $user = array_filter($user);
+                $user = $user[0];
+            }
+
+            if (in_array($me, rcube_addressbook::get_col_values('email', $record, true))) {
+                continue;
+            }
+
+            if ($user) {
+                $display = rcube_addressbook::compose_search_name($record);
+                $user    = array('name' => $user, 'display' => $display);
+                $users[] = $user;
+                $index[] = $display ?: $user['name'];
+            }
+        }
+
+        $group_support = $this->rc->config->get('fileapi_groups');
+        $group_prefix  = $this->rc->config->get('fileapi_group_prefix');
+        $group_field   = $this->rc->config->get('fileapi_group_field', 'name');
+
+        if ($with_groups && $group_support && $group_field) {
+            $result = $this->ldap->list_groups($search, $mode);
+
+            foreach ($result as $record) {
+                $group    = $record['name'];
+                $group_id = is_array($record[$group_field]) ? $record[$group_field][0] : $record[$group_field];
+
+                if ($group) {
+                    $users[] = array('name' => ($group_prefix ? $group_prefix : '') . $group_id, 'display' => $group, 'type' => 'group');
+                    $index[] = $group;
+                }
+            }
+        }
+
+        if (count($users)) {
+            array_multisort($index, SORT_ASC, SORT_LOCALE_STRING, $users);
+        }
+
+        if (count($users) > $max) {
+            $users = array_slice($users, 0, $max);
+        }
+
+        return $users;
+    }
+
+    /**
+     * Resolve acl identifier to user/group name
+     */
+    public function resolve_uid($id, &$title = null)
+    {
+        $groups      = $this->rc->config->get('acl_groups');
+        $prefix      = $this->rc->config->get('acl_group_prefix');
+        $group_field = $this->rc->config->get('acl_group_field', 'name');
+
+        if ($groups && $prefix && strpos($id, $prefix) === 0) {
+            $gid = substr($id, strlen($prefix));
+
+            // Unfortunately this works only if group_field=name,
+            // list_groups() allows searching by group name only
+            if ($group_field === 'name' && $this->init_ldap()) {
+                $result = $this->ldap->list_groups($gid, rcube_addressbook::SEARCH_STRICT);
+
+                if (count($result) === 1 && ($record = $result[0])) {
+                    if ($record[$group_field] === $gid) {
+                        $display = $record['name'];
+                        if ($display != $gid) {
+                            $title = sprintf('%s (%s)', $display, $gid);
+                        }
+
+                        return $display;
+                    }
+                }
+            }
+
+            return $gid;
+        }
+
+        if ($this->init_ldap()) {
+            $this->ldap->set_pagesize('2');
+            // Note: 'uid' works here because we overwrite fieldmap in init_ldap() above
+            $result = $this->ldap->search('uid', $id, rcube_addressbook::SEARCH_STRICT);
+
+            if ($result->count === 1 && ($record = $result->first())) {
+                if ($record['uid'] === $id) {
+                    $title   = rcube_addressbook::compose_search_name($record);
+                    $display = rcube_addressbook::compose_list_name($record);
+
+                    return $display;
+                }
+            }
+        }
+
+        return $id;
+    }
+
+    /**
+     * Initializes autocomplete LDAP backend
+     */
+    private function init_ldap()
+    {
+        if ($this->ldap) {
+            return $this->ldap->ready;
+        }
+
+        // get LDAP config
+        $config = $this->rc->config->get('fileapi_users_source');
+
+        if (empty($config)) {
+            return false;
+        }
+
+        // not an array, use configured ldap_public source
+        if (!is_array($config)) {
+            $ldap_config = (array) $this->rc->config->get('ldap_public');
+            $config      = $ldap_config[$config];
+        }
+
+        $uid_field = $this->rc->config->get('fileapi_users_field', 'mail');
+        $filter    = $this->rc->config->get('fileapi_users_filter');
+        $debug     = $this->rc->config->get('ldap_debug');
+        $domain    = $this->rc->config->mail_domain($_SESSION['imap_host']);
+
+        if (empty($uid_field) || empty($config)) {
+            return false;
+        }
+
+        // get name attribute
+        if (!empty($config['fieldmap'])) {
+            $name_field = $config['fieldmap']['name'];
+        }
+        // ... no fieldmap, use the old method
+        if (empty($name_field)) {
+            $name_field = $config['name_field'];
+        }
+
+        // add UID field to fieldmap, so it will be returned in a record with name
+        $config['fieldmap']['name'] = $name_field;
+        $config['fieldmap']['uid']  = $uid_field;
+
+        // search in UID and name fields
+        // $name_field can be in a form of <field>:<modifier> (#1490591)
+        $name_field = preg_replace('/:.*$/', '', $name_field);
+        $search     = array_unique(array($name_field, $uid_field));
+
+        $config['search_fields']   = $search;
+        $config['required_fields'] = array($uid_field);
+
+        // set search filter
+        if ($filter) {
+            $config['filter'] = $filter;
+        }
+
+        // disable vlv
+        $config['vlv'] = false;
+
+        // Initialize LDAP connection
+        $this->ldap = new rcube_ldap($config, $debug, $domain);
+
+        return $this->ldap->ready;
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/kolab/kolab_file_storage.php -> iRony-0.4.3.tar.gz/lib/FileAPI/drivers/kolab/kolab_file_storage.php Changed

@@ -44,6 +44,10 @@
      */
     protected $title;
 
+    /**
+     * @var array
+     */
+    protected $icache = array();
 
     /**
      * Class constructor
@@ -56,8 +60,8 @@
         // WARNING: We can use only plugins that are prepared for this
         //          e.g. are not using output or rcmail objects or
         //          doesn't throw errors when using them
-        $plugins  = (array)$this->rc->config->get('fileapi_plugins', array('kolab_auth'));
-        $required = array('libkolab');
+        $plugins = (array) $this->rc->config->get('fileapi_plugins', array('kolab_auth', 'kolab_folders'));
+        $plugins = array_unique(array_merge($plugins, array('libkolab')));
 
         // Kolab WebDAV server supports plugins, no need to overwrite object
         if (!is_a($this->rc->plugins, 'rcube_plugin_api')) {
@@ -66,7 +70,11 @@
             $this->rc->plugins->init($this, '');
         }
 
-        $this->rc->plugins->load_plugins($plugins, $required);
+        // this way we're compatible with Roundcube Framework 1.2
+        // we can't use load_plugins() here
+        foreach ($plugins as $plugin) {
+            $this->rc->plugins->load_plugin($plugin, true);
+        }
 
         $this->init();
     }
@@ -90,10 +98,16 @@
 
         // Authenticate - get Roundcube user ID
         if ($auth['valid'] && !$auth['abort']
-            && ($this->login($auth['user'], $auth['pass'], $auth['host']))) {
+            && ($this->login($auth['user'], $auth['pass'], $auth['host'], $err))) {
             return true;
         }
 
+        if ($err) {
+            $err_str = $this->rc->get_storage()->get_error_str();
+        }
+
+        kolab_auth::log_login_error($auth['user'], $err_str ?: $err);
+
         $this->rc->plugins->exec_hook('login_failed', array(
             'host' => $auth['host'],
             'user' => $auth['user'],
@@ -151,7 +165,7 @@
     /**
      * Authenticates a user in IMAP
      */
-    private function login($username, $password, $host)
+    private function login($username, $password, $host, &$error = null)
     {
         if (empty($username)) {
             return false;
@@ -203,6 +217,7 @@
         // authenticate user in IMAP
         $storage = $this->rc->get_storage();
         if (!$storage->connect($host, $username, $password, $port, $ssl)) {
+            $error = $storage->get_error_code();
             return false;
         }
 
@@ -240,13 +255,16 @@
         $this->init($user);
 
         // force reloading of mailboxes list/data
-        $storage->clear_cache('mailboxes', true);
+        // Roundcube already does that (T1050)
+        //$storage->clear_cache('mailboxes', true);
 
         return true;
     }
 
     protected function init($user = null)
     {
+        $this->rc->plugins->exec_hook('startup');
+
         if ($_SESSION['user_id'] || $user) {
             // overwrite config with user preferences
             $this->rc->user = $user ? $user : new rcube_user($_SESSION['user_id']);
@@ -299,9 +317,12 @@
         $quota   = $storage->get_capability('QUOTA');
 
         return array(
-            file_storage::CAPS_MAX_UPLOAD => $max_filesize,
-            file_storage::CAPS_QUOTA      => $quota,
-            file_storage::CAPS_LOCKS      => true,
+            file_storage::CAPS_MAX_UPLOAD    => $max_filesize,
+            file_storage::CAPS_QUOTA         => $quota,
+            file_storage::CAPS_LOCKS         => true,
+            file_storage::CAPS_SUBSCRIPTIONS => true,
+            file_storage::CAPS_ACL           => true,
+            file_storage::CAPS_FAST_FOLDER_LIST => true,
         );
     }
 
@@ -460,7 +481,7 @@
      */
     public function file_create($file_name, $file)
     {
-        $exists = $this->get_file_object($file_name, $folder);
+        $exists = $this->get_file_object_fast($file_name, $folder);
         if (!empty($exists)) {
             throw new Exception("Storage error. File exists.", file_storage::ERROR);
         }
@@ -533,7 +554,7 @@
      */
     public function file_delete($file_name)
     {
-        $file = $this->get_file_object($file_name, $folder);
+        $file = $this->get_file_object_fast($file_name, $folder);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -561,7 +582,7 @@
      */
     public function file_get($file_name, $params = array(), $fp = null)
     {
-        $file = $this->get_file_object($file_name, $folder);
+        $file = $this->get_file_object_fast($file_name, $folder, true);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -605,7 +626,7 @@
         header("Content-Length: " . $file['size']);
         header("Content-Disposition: $disposition; filename=\"$filename\"");
 
-        if ($file['size']) {
+        if ($file['size'] && empty($params['head'])) {
             $folder->get_attachment($file['_msguid'], $file['fileid'], $file['_mailbox'], true);
         }
     }
@@ -619,7 +640,7 @@
      */
     public function file_info($file_name)
     {
-        $file = $this->get_file_object($file_name, $folder);
+        $file = $this->get_file_object_fast($file_name, $folder, true);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -630,8 +651,8 @@
             'name'     => $file['name'],
             'size'     => (int) $file['size'],
             'type'     => (string) $file['type'],
-            'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
-            'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
+            'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
+            'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
             'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
             'created'  => $file['created'] ? $file['created']->format('U') : 0,
         );
@@ -667,8 +688,7 @@
         }
 
         // get files list
-        $folder = $this->get_folder_object($folder_name);
-        $files  = $folder->select($filter);
+        $files  = $this->get_files($folder_name, $filter);
         $result = array();
 
         // convert to kolab_storage files list data format
@@ -685,8 +705,8 @@
                 'name'     => $file['name'],
                 'size'     => (int) $file['size'],
                 'type'     => (string) $file['type'],
-                'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
-                'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
+                'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
+                'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
                 'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
                 'created'  => $file['created'] ? $file['created']->format('U') : 0,
             );
@@ -732,7 +752,7 @@
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
 
-        $new = $this->get_file_object($new_name, $new_folder);
+        $new = $this->get_file_object_fast($new_name, $new_folder);
         if (!empty($new)) {
             throw new Exception("Storage error. File exists.", file_storage::ERROR_FILE_EXISTS);
         }
@@ -761,7 +781,7 @@
         // Update object
         $file['_attachments'] = array(
             0 => array(
-                'name'     => $file['name'],
+                'name'     => $new_name,
                 'path'     => $file_path,
                 'mimetype' => $file['type'],
                 'size'     => $file['size'],
@@ -800,7 +820,7 @@
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
 
-        $new = $this->get_file_object($new_name, $new_folder);
+        $new = $this->get_file_object_fast($new_name, $new_folder);
         if (!empty($new)) {
             throw new Exception("Storage error. File exists.", file_storage::ERROR_FILE_EXISTS);
         }
@@ -852,11 +872,11 @@
      */
     public function folder_create($folder_name)
     {
-        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
-        $success     = kolab_storage::folder_create($folder_name, 'file');
+        $folder_name = $this->folder_in($folder_name);
+        $success     = kolab_storage::folder_create($folder_name, 'file', true);
 
         if (!$success) {
-            throw new Exception("Storage error. Unable to create folder", file_storage::ERROR);
+            throw new Exception("Storage error. Unable to create the folder", file_storage::ERROR);
         }
     }
 
@@ -869,11 +889,11 @@
      */
     public function folder_delete($folder_name)
     {
-        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
+        $folder_name = $this->folder_in($folder_name);
         $success     = kolab_storage::folder_delete($folder_name);
 
         if (!$success) {
-            throw new Exception("Storage error. Unable to delete folder.", file_storage::ERROR);
+            throw new Exception("Storage error. Unable to delete the folder.", file_storage::ERROR);
         }
     }
 
@@ -887,44 +907,211 @@
      */
     public function folder_move($folder_name, $new_name)
     {
-        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
-        $new_name    = rcube_charset::convert($new_name, RCUBE_CHARSET, 'UTF7-IMAP');
+        $folder_name = $this->folder_in($folder_name);
+        $new_name    = $this->folder_in($new_name);
         $success     = kolab_storage::folder_rename($folder_name, $new_name);
 
         if (!$success) {
-            throw new Exception("Storage error. Unable to rename folder", file_storage::ERROR);
+            throw new Exception("Storage error. Unable to rename the folder", file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Subscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_subscribe($folder_name)
+    {
+        $folder_name = $this->folder_in($folder_name);
+        $storage     = $this->rc->get_storage();
+
+        if (!$storage->subscribe($folder_name)) {
+            throw new Exception("Storage error. Unable to subscribe the folder", file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Unsubscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_unsubscribe($folder_name)
+    {
+        $folder_name = $this->folder_in($folder_name);
+        $storage     = $this->rc->get_storage();
+
+        if (!$storage->unsubscribe($folder_name)) {
+            throw new Exception("Storage error. Unable to unsubsribe the folder", file_storage::ERROR);
         }
     }
 
     /**
      * Returns list of folders.
      *
+     * @param array $params List parameters ('type', 'search', 'extended', 'permissions', 'level', 'path')
+     *
      * @return array List of folders
      * @throws Exception
      */
-    public function folder_list()
+    public function folder_list($params = array())
     {
-        $folders = kolab_storage::list_folders('', '*', 'file', false);
+        $unsubscribed = $params['type'] & file_storage::FILTER_UNSUBSCRIBED;
+        $rights       = ($params['type'] & file_storage::FILTER_WRITABLE) ? 'w' : null;
+        $imap         = $this->rc->get_storage();
+        $separator    = $imap->get_hierarchy_delimiter();
+        $root         = isset($params['path']) && strlen($params['path']) ? $this->folder_in($params['path']) . '/' : '';
+        $folders      = $imap->list_folders_subscribed($root, '*', 'file', $rights);
 
         if (!is_array($folders)) {
             throw new Exception("Storage error. Unable to get folders list.", file_storage::ERROR);
         }
 
-        // create 'Files' folder in case there's no folder of type 'file'
-        if (empty($folders)) {
-            if (kolab_storage::folder_create('Files', 'file')) {
-                $folders[] = 'Files';
+        // create/subscribe 'Files' folder in case there's no folder of type 'file'
+        if (empty($folders) && !$unsubscribed && !strlen($root)) {
+            $default = 'Files';
+
+            // the folder may exist but be unsubscribed
+            if (!$imap->folder_exists($default)) {
+                if (kolab_storage::folder_create($default, 'file', true)) {
+                    $folders[] = $default;
+                }
+            }
+            else if (kolab_storage::folder_type($default) == 'file') {
+                if ($imap->subscribe($default)) {
+                    $folders[] = $default;
+                }
             }
         }
         else {
-            $callback = function($folder) { return rcube_charset::convert($folder, 'UTF7-IMAP', RCUBE_CHARSET); };
-            $folders  = array_map($callback, $folders);
+            if ($unsubscribed) {
+                $subscribed = $folders;
+                $folders    = $imap->list_folders($root, '*', 'file', $rights);
+                $folders    = array_diff($folders, $subscribed);
+            }
+
+            $folders = array_map(array($this, 'folder_out'), $folders);
+        }
+
+        // This could probably be optimized by doing a direct
+        // IMAP LIST command with prepared second argument, but
+        // it would make caching not optimal
+        if ($params['level'] > 0) {
+            $offset = isset($params['path']) && strlen($params['path']) ? strlen($params['path']) + 1 : 0;
+            foreach ($folders as $idx => $folder) {
+                if (substr_count($folder, $separator, $offset) >= $params['level']) {
+                    unset($folders[$idx]);
+                }
+            }
+        }
+
+        // searching
+        if (isset($params['search'])) {
+            $search  = mb_strtoupper($params['search']);
+            $prefix  = null;
+            $ns      = $imap->get_namespace('other');
+
+            if (!empty($ns)) {
+                $prefix = rcube_charset::convert($ns[0][0], 'UTF7-IMAP', RCUBE_CHARSET);
+            }
+
+            $folders = array_filter($folders, function($folder) use ($search, $prefix) {
+                $path = explode('/', $folder);
+
+                // search in folder name not the full path
+                if (strpos(mb_strtoupper($path[count($path)-1]), $search) !== false) {
+                    return true;
+                }
+                // if it is an other user folder, we'll match the user name
+                // and return all folders of the matching user
+                else if (strpos($folder, $prefix) === 0 && strpos(mb_strtoupper($path[1]), $search) !== false) {
+                    return true;
+                }
+
+                return false;
+            });
+        }
+
+        $folders = array_values($folders);
+
+        // In extended format we return array of arrays
+        if ($params['extended']) {
+            if (!$rights && $params['permissions']) {
+                // get list of known writable folders from cache
+                $cache_key   = 'mailboxes.permissions';
+                $permissions = (array) $imap->get_cache($cache_key);
+            }
+
+            foreach ($folders as $idx => $folder_name) {
+                $folder = array('folder' => $folder_name);
+
+                // check if folder is readonly
+                if (isset($permissions)) {
+                    if (!array_key_exists($folder_name, $permissions)) {
+                        $acl = $this->folder_rights($folder_name);
+                        $permissions[$folder_name] = $acl;
+                    }
+
+                    if (!($permissions[$folder_name] & file_storage::ACL_WRITE)) {
+                        $folder['readonly'] = true;
+                    }
+                }
+
+                $folders[$idx] = $folder;
+            }
+
+            if ($cache_key) {
+                $imap->update_cache($cache_key, $permissions);
+            }
         }
 
         return $folders;
     }
 
     /**
+     * Check folder rights.
+     *
+     * @param string $folder Folder name
+     *
+     * @return int Folder rights (sum of file_storage::ACL_*)
+     */
+    public function folder_rights($folder)
+    {
+        $storage = $this->rc->get_storage();
+        $folder  = $this->folder_in($folder);
+        $rights  = file_storage::ACL_READ;
+
+        // get list of known writable folders from cache
+        $cache_key   = 'mailboxes.permissions';
+        $permissions = (array) $storage->get_cache($cache_key);
+
+        if (array_key_exists($folder, $permissions)) {
+            return $permissions[$folder];
+        }
+
+        // For better performance, assume personal folders are writeable
+        if ($storage->folder_namespace($folder) == 'personal') {
+            $rights |= file_storage::ACL_WRITE;
+        }
+        else {
+            $myrights = $storage->my_rights($folder);
+
+            if (in_array('t', (array) $myrights)) {
+                $rights |= file_storage::ACL_WRITE;
+            }
+
+            $permissions[$folder] = $rights;
+            $storage->update_cache($cache_key, $permissions);
+        }
+
+        return $rights;
+    }
+
+    /**
      * Returns a list of locks
      *
      * This method should return all the locks for a particular URI, including
@@ -933,25 +1120,25 @@
      * If child_locks is set to true, this method should also look for
      * any locks in the subtree of the URI for locks.
      *
-     * @param string $uri         URI
+     * @param string $path        File/folder path
      * @param bool   $child_locks Enables subtree checks
      *
      * @return array List of locks
      * @throws Exception
      */
-    public function lock_list($uri, $child_locks = false)
+    public function lock_list($path, $child_locks = false)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->uri2resource($uri);
+        $uri = $this->path2uri($path);
 
         // get locks list
         $list = $this->lock_db->lock_list($uri, $child_locks);
 
         // convert back resource string into URIs
         foreach ($list as $idx => $lock) {
-            $list[$idx]['uri'] = $this->resource2uri($lock['uri']);
+            $list[$idx]['uri'] = $this->uri2path($lock['uri']);
         }
 
         return $list;
@@ -960,7 +1147,7 @@
     /**
      * Locks a URI
      *
-     * @param string $uri  URI
+     * @param string $path File/folder path
      * @param array  $lock Lock data
      *                     - depth: 0/'infinite'
      *                     - scope: 'shared'/'exclusive'
@@ -970,12 +1157,12 @@
      *
      * @throws Exception
      */
-    public function lock($uri, $lock)
+    public function lock($path, $lock)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->uri2resource($uri);
+        $uri = $this->path2uri($path);
 
         if (!$this->lock_db->lock($uri, $lock)) {
             throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR);
@@ -985,17 +1172,17 @@
     /**
      * Removes a lock from a URI
      *
-     * @param string $path URI
+     * @param string $path File/folder path
      * @param array  $lock Lock data
      *
      * @throws Exception
      */
-    public function unlock($uri, $lock)
+    public function unlock($path, $lock)
     {
         $this->init_lock_db();
 
-        // convert URI to global resource string
-        $uri = $this->uri2resource($uri);
+        // convert path to global resource string
+        $uri = $this->path2uri($path);
 
         if (!$this->lock_db->unlock($uri, $lock)) {
             throw new Exception("Database error. Unable to remove a lock.", file_storage::ERROR);
@@ -1022,16 +1209,295 @@
     }
 
     /**
+     * Sharing interface
+     *
+     * @param string $folder_name Name of a folder with full path
+     * @param int    $mode        Sharing action mode
+     * @param array  $args        POST/GET parameters
+     *
+     * @return mixed Sharing response
+     * @throws Exception
+     */
+    public function sharing($folder, $mode, $args = array())
+    {
+        $folder_name = $this->folder_in($folder);
+        $storage     = $this->rc->get_storage();
+        $folder_info = $storage->folder_info($folder_name);
+
+        if (!is_array($folder_info['rights'])) {
+            throw new Exception("Storage error. Failed to get folder permissions.", file_storage::ERROR);
+        }
+
+        if (!in_array('a', $folder_info['rights'])) {
+            throw new Exception("No permissions to administer this folder.", file_storage::ERROR_FORBIDDEN);
+        }
+
+        if ($mode == file_storage::SHARING_MODE_FORM) {
+            $form = array(
+                'shares' => array(
+                    'title' => 'share.permissions',
+                    'form'  => array(
+                        'user' => array(
+                            'title' => 'share.usergroup',
+                            'type'  => 'input',
+                            'autocomplete' => 'user,group',
+                        ),
+                        'right' => array(
+                            'title' => 'share.permission',
+                            'type'  => 'select',
+                            'options' => array(
+                                'r'  => 'share.readonly',
+                                'rw' => 'share.readwrite',
+                                'a' => 'share.admin',
+                            ),
+                        ),
+                    ),
+                    'extra_fields' => array(
+                        'type' => 'user',
+                        'id'   => '',
+                    ),
+                ),
+            );
+
+            return $form;
+        }
+
+        if ($mode == file_storage::SHARING_MODE_RIGHTS) {
+            $result   = array();
+            $acl_list = $storage->get_acl($folder_name);
+            $ac       = new kolab_file_autocomplete($this);
+
+            foreach ((array) $acl_list as $name => $acl) {
+                if ($name == $_SESSION['username']) {
+                    continue;
+                }
+
+                if (in_array('a', $acl)) {
+                    $right = 'a';
+                }
+                else if (in_array('i', $acl)) {
+                    $right = 'rw';
+                }
+                else if (in_array('r', $acl)) {
+                    $right = 'r';
+                }
+                else {
+                    continue;
+                }
+
+                $type    = strpos($name, 'group:') === 0 ? 'group' : 'user';
+                $id      = $name;
+                $display = $ac->resolve_uid($id, $title);
+
+                $result[] = array(
+                    'mode'  => 'shares',
+                    'type'  => $type,
+                    'right' => $right,
+                    'user'  => $display,
+                    'title' => $title,
+                    'id'    => $id,
+                );
+            }
+
+            return $result;
+        }
+
+        if ($mode == file_storage::SHARING_MODE_UPDATE) {
+            if ($args['mode'] == 'shares') {
+                $user = $args['id'];
+                if (!$user) {
+                    $user = ($args['type'] == 'group' ? 'group:' : '') . preg_replace('/^group:/', '', $args['user']);
+                }
+
+                switch ($args['right']) {
+                case 'r':  $acl = 'lrs'; break;
+                case 'rw': $acl = 'lrswite'; break;
+                case 'a':  $acl = 'lrswiteax'; break;
+                }
+
+                if (empty($user) || (empty($acl) && $args['action'] != 'delete')) {
+                    throw new Exception("Invalid input.", file_storage::ERROR);
+                }
+
+                switch ($args['action']) {
+                case 'submit':
+                case 'update':
+                    if ($result = $storage->set_acl($folder_name, $user, $acl)) {
+                        $ac      = new kolab_file_autocomplete($this);
+                        $display = $ac->resolve_uid($user, $title);
+                        $result  = array('display' => $display, 'title' => $title);
+                    }
+                    break;
+
+                case 'delete':
+                    $result = $storage->delete_acl($folder_name, $user);
+                    break;
+                }
+            }
+            else {
+                throw new Exception("Invalid input.", file_storage::ERROR);
+            }
+
+            if (empty($result)) {
+                throw new Exception("Storage error. Failed to update share.", file_storage::ERROR);
+            }
+
+            return $result;
+        }
+    }
+
+    /**
+     * User/group search (autocompletion)
+     *
+     * @param string $search Search string
+     * @param int    $mode   Search mode
+     *
+     * @return array Users/Groups list
+     * @throws Exception
+     */
+    public function autocomplete($search, $mode)
+    {
+        $ac = new kolab_file_autocomplete($this);
+
+        $result = $ac->search($search, $mode & file_storage::SEARCH_GROUP);
+
+        if ($result === false) {
+            throw new Exception("Failed to search users", file_storage::ERROR);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Convert file/folder path into a global URI.
+     *
+     * @param string $path File/folder path
+     *
+     * @return string URI
+     * @throws Exception
+     */
+    public function path2uri($path)
+    {
+        $storage   = $this->rc->get_storage();
+        $namespace = $storage->get_namespace();
+        $separator = $storage->get_hierarchy_delimiter();
+        $_path     = str_replace(file_storage::SEPARATOR, $separator, $path);
+        $_path     = $this->folder_in($_path);
+        $owner     = $this->rc->get_user_name();
+
+        // find the owner and remove namespace prefix
+        foreach (array_filter($namespace) as $type => $ns) {
+            foreach ($ns as $root) {
+                if (is_array($root) && $root[0] && strpos($_path, $root[0]) === 0) {
+                    $path = substr($path, strlen($root[0]));
+
+                    switch ($type) {
+                    case 'shared':
+                        // in theory there can be more than one shared root
+                        // we add it to dummy user name, so we can revert conversion
+                        $owner = "shared({$root[0]})";
+                        break;
+
+                    case 'other':
+                        list($user, $path) = explode(file_storage::SEPARATOR, $path, 2);
+
+                        if (strpos($user, '@') === false) {
+                            $domain = strstr($owner, '@');
+                            if (!empty($domain)) {
+                                $user .= $domain;
+                            }
+                        }
+
+                        $owner = $user;
+                        break;
+                    }
+
+                    break 2;
+                }
+            }
+        }
+
+        return 'imap://' . rawurlencode($owner) . '@' . $storage->options['host']
+            . '/' . file_utils::encode_path($path);
+    }
+
+    /**
+     * Convert global URI into file/folder path.
+     *
+     * @param string $uri URI
+     *
+     * @return string File/folder path
+     * @throws Exception
+     */
+    public function uri2path($uri)
+    {
+        if (!preg_match('|^imap://([^@]+)@([^/]+)/(.*)$|', $uri, $matches)) {
+            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
+        }
+
+        $storage   = $this->rc->get_storage();
+        $separator = $storage->get_hierarchy_delimiter();
+        $owner     = $this->rc->get_user_name();
+
+        $user = rawurldecode($matches[1]);
+        $path = file_utils::decode_path($matches[3]);
+
+        if (strpos($path, '&') !== false) {
+            $path = rcube_charset::convert($path, 'UTF7-IMAP', RCUBE_CHARSET);
+        }
+
+        // personal namespace
+        if ($user == $owner) {
+            // do nothing
+            // Note: that might not work if personal namespace uses e.g. INBOX/ prefix.
+        }
+        // shared namespace
+        else if (preg_match('/^shared$(.*)$$/', $user, $matches)) {
+            $path = $matches[1] . $path;
+        }
+        // other users namespace
+        else {
+            $namespace = $storage->get_namespace('other');
+
+            list($local, $domain) = explode('@', $user);
+
+            // here we assume there's only one other users namespace root
+            $path = $namespace[0][0] . $local . file_storage::SEPARATOR . $path;
+        }
+
+        return $path;
+    }
+
+    /**
+     * Get files from a folder (with performance fix)
+     */
+    protected function get_files($folder, $filter, $all = true, $fast_mode = true)
+    {
+        if (!($folder instanceof kolab_storage_folder)) {
+            $folder = $this->get_folder_object($folder);
+        }
+
+        // for better performance it's good to assume max. number of records
+        $folder->set_order_and_limit(null, $all ? 0 : 1);
+
+        return $folder->select($filter, $fast_mode);
+    }
+
+    /**
      * Get file object.
      *
      * @param string               $file_name Name of a file (with folder path)
      * @param kolab_storage_folder $folder    Reference to folder object
+     * @param bool                 $cache     Use internal cache
+     * @param bool                 $fast_mode Return limited list of file attributes
      *
      * @return array File data
      * @throws Exception
      */
-    protected function get_file_object(&$file_name, &$folder = null)
+    protected function get_file_object(&$file_name, &$folder = null, $cache = false, $fast_mode = false)
     {
+        $original_name = $file_name;
+
         // extract file path and file name
         $path        = explode(file_storage::SEPARATOR, $file_name);
         $file_name   = array_pop($path);
@@ -1041,14 +1507,41 @@
             throw new Exception("Missing folder name", file_storage::ERROR);
         }
 
-        // get folder object
-        $folder = $this->get_folder_object($folder_name);
-        $files  = $folder->select(array(
-            array('type', '=', 'file'),
+        $folder = $this->get_folder_object($this->folder_in($folder_name));
+
+        if ($cache && !empty($this->icache[$original_name])) {
+            return $this->icache[$original_name];
+        }
+
+        $filter = array(
+            // array('type', '=', 'file'),
             array('filename', '=', $file_name)
-        ));
+        );
 
-        return $files[0];
+        $files = $this->get_files($folder, $filter, false, $fast_mode);
+        $file  = $files[0];
+
+        if ($cache) {
+            $this->icache[$original_name] = $file;
+        }
+
+        return $file;
+    }
+
+    /**
+     * Get file object.
+     *
+     * @param string               $file_name Name of a file (with folder path)
+     * @param kolab_storage_folder $folder    Reference to folder object
+     * @param bool                 $cache     Use internal cache
+     *
+     * @return array File data
+     * @throws Exception
+     * @see self::get_file_object()
+     */
+    protected function get_file_object_fast(&$file_name, &$folder = null, $cache = false)
+    {
+        return $this->get_file_object($file_name, $folder, $cache, true);
     }
 
     /**
@@ -1061,7 +1554,7 @@
      */
     protected function get_folder_object($folder_name)
     {
-        if ($folder_name === null || $folder_name === '') {
+        if (!is_string($folder_name) || $folder_name === '') {
             throw new Exception("Missing folder name", file_storage::ERROR);
         }
 
@@ -1069,10 +1562,19 @@
             $storage     = $this->rc->get_storage();
             $separator   = $storage->get_hierarchy_delimiter();
             $folder_name = str_replace(file_storage::SEPARATOR, $separator, $folder_name);
-            $imap_name   = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
+            $imap_name   = $this->folder_in($folder_name);
             $folder      = kolab_storage::get_folder($imap_name, 'file');
 
             if (!$folder || !$folder->valid) {
+                $error = $folder->get_error();
+
+                if ($error === kolab_storage::ERROR_IMAP_CONN || $error === kolab_storage::ERROR_CACHE_DB) {
+                    throw new Exception("The storage is temporarily unavailable.", file_storage::ERROR_UNAVAILABLE);
+                }
+                else if ($error === kolab_storage::ERROR_NO_PERMISSION) {
+                    throw new Exception("Storage error. Access not permitted", file_storage::ERROR_FORBIDDEN);
+                }
+
                 throw new Exception("Storage error. Folder not found.", file_storage::ERROR);
             }
 
@@ -1087,6 +1589,10 @@
      */
     protected function from_file_object($file)
     {
+        if (isset($file['filename']) && !$file['name']) {
+            $file['name'] = $file['filename'];
+        }
+
         if (empty($file['_attachments'])) {
             return $file;
         }
@@ -1129,99 +1635,44 @@
         return $file;
     }
 
-    protected function uri2resource($uri)
+    /**
+     * Initializes file_locks object
+     */
+    protected function init_lock_db()
     {
-        $storage   = $this->rc->get_storage();
-        $namespace = $storage->get_namespace();
-        $separator = $storage->get_hierarchy_delimiter();
-        $uri       = str_replace(file_storage::SEPARATOR, $separator, $uri);
-        $owner     = $this->rc->get_user_name();
-
-        // find the owner and remove namespace prefix
-        foreach ($namespace as $type => $ns) {
-            foreach ($ns as $root) {
-                if (is_array($root) && $root[0] && strpos($uri, $root[0]) === 0) {
-                    $uri = substr($uri, strlen($root[0]));
-
-                    switch ($type) {
-                    case 'shared':
-                        // in theory there can be more than one shared root
-                        // we add it to dummy user name, so we can revert conversion
-                        $owner = "shared({$root[0]})";
-                        break;
-
-                    case 'other':
-                        list($user, $uri) = explode($separator, $uri, 2);
-
-                        if (strpos($user, '@') === false) {
-                            $domain = strstr($owner, '@');
-                            if (!empty($domain)) {
-                                $user .= $domain;
-                            }
-                        }
-
-                        $owner = $user;
-                        break;
-                    }
-
-                    break 2;
-                }
-            }
+        if (!$this->lock_db) {
+            $this->lock_db = new file_locks;
         }
-
-        // convert to imap charset (to be safe to store in DB)
-        $uri = rcube_charset::convert($uri, RCUBE_CHARSET, 'UTF7-IMAP');
-
-        return 'imap://' . urlencode($owner) . '@' . $storage->options['host'] . '/' . $uri;
     }
 
-    protected function resource2uri($resource)
+    /**
+     * Apply any conversion on folder name input
+     */
+    protected function folder_in($folder_name)
     {
-        if (!preg_match('|^imap://([^@]+)@([^/]+)/(.*)$|', $resource, $matches)) {
-            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
-        }
-
-        $storage   = $this->rc->get_storage();
-        $separator = $storage->get_hierarchy_delimiter();
-        $owner     = $this->rc->get_user_name();
-
-        $user = urldecode($matches[1]);
-        $uri  = $matches[3];
-
-        // convert from imap charset (to be safe to store in DB)
-        $uri = rcube_charset::convert($uri, 'UTF7-IMAP', RCUBE_CHARSET);
-
-        // personal namespace
-        if ($user == $owner) {
-            // do nothing
-            // Note: that might not work if personal namespace uses e.g. INBOX/ prefix.
-        }
-        // shared namespace
-        else if (preg_match('/^shared$(.*)$$/', $user, $matches)) {
-            $uri = $matches[1] . $uri;
-        }
-        // other users namespace
-        else {
-            $namespace = $storage->get_namespace('other');
-
-            list($local, $domain) = explode('@', $user);
-
-            // here we assume there's only one other users namespace root
-            $uri = $namespace[0][0] . $local . $separator . $uri;
-        }
+        $folder_name = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
 
-        $uri = str_replace($separator, file_storage::SEPARATOR, $uri);
+        $plugin = $this->rc->plugins->exec_hook('folder_mod',
+            array('folder' => $folder_name, 'dir' => 'in'));
 
-        return $uri;
+        return $plugin['folder'];
     }
 
     /**
-     * Initializes file_locks object
+     * Apply any conversion on folder name output
+     *
+     * For example plugins can replace "/Outher Users/jane.doe/"
+     * with "/Other Users/Doe, Jane (jane.doe)/"
      */
-    protected function init_lock_db()
+    protected function folder_out($folder_name)
     {
-        if (!$this->lock_db) {
-            $this->lock_db = new file_locks;
+        $plugin = $this->rc->plugins->exec_hook('folder_mod',
+            array('folder' => $folder_name, 'dir' => 'out'));
+
+        if (strpos($plugin['folder'], '&') !== false) {
+            $plugin['folder'] = rcube_charset::convert($plugin['folder'], 'UTF7-IMAP', RCUBE_CHARSET);
         }
+
+        return $plugin['folder'];
     }
 }

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/seafile/seafile_api.php -> iRony-0.4.3.tar.gz/lib/FileAPI/drivers/seafile/seafile_api.php Changed

@@ -77,16 +77,31 @@
      */
     protected $token;
 
+    /**
+     * API URL prefix (schema and host[:port])
+     *
+     * @var string
+     */
+    protected $url_prefix;
+
 
     public function __construct($config = array())
     {
         $this->config = $config;
+        $this->token  = $config['token'];
 
         // set Web API URI
-        $this->url = rtrim('https://' . ($config['host'] ?: 'localhost'), '/');
+        $this->url = rtrim(trim($config['host']), '/') ?: 'localhost';
+
+        if (!preg_match('|^https?://|i', $this->url)) {
+            $this->url = 'https://' . $this->url;
+        }
+
         if (!preg_match('|/api2$|', $this->url)) {
             $this->url .= '/api2/';
         }
+
+        $this->url_prefix = preg_replace('|^(https?://[^/]+).*$|i', '\\1', $this->url);
     }
 
     /**
@@ -109,6 +124,10 @@
             'ssl_cafile', 'ssl_capath', 'ssl_local_cert', 'ssl_passphrase'
         )));
 
+        // force CURL adapter, this allows to handle correctly
+        // compressed responses with simple SplObserver registered
+        $config['adapter'] = 'HTTP_Request2_Adapter_Curl';
+
         try {
             $request = new HTTP_Request2();
             $request->setConfig($config);
@@ -124,21 +143,29 @@
     /**
      * Send HTTP request
      *
-     * @param string $method Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
-     * @param string $url    Request API URL
-     * @param array  $get    GET parameters
-     * @param array  $post   POST parameters
-     * @param array  $upload Uploaded files data
+     * @param string $method  Request method ('OPTIONS','GET','HEAD','POST','PUT','DELETE','TRACE','CONNECT')
+     * @param string $url     Request API URL
+     * @param array  $get     GET parameters
+     * @param array  $post    POST parameters
+     * @param array  $upload  Uploaded files data
+     * @param string $version API version (to replace "api2" with "api/v$version" in the URL
      *
      * @return string|array Server response
      */
-    protected function request($method, $url, $get = null, $post = null, $upload = null)
+    protected function request($method, $url, $get = null, $post = null, $upload = null, $version = null)
     {
         if (!preg_match('/^https?:\/\//', $url)) {
             $url = $this->url . $url;
             // Note: It didn't work for me without the last backslash
             $url = rtrim($url, '/') . '/';
         }
+        else {
+            $url = $this->mod_url($url);
+        }
+
+        if ($version && $version != 2) {
+            $url = str_replace('/api2/', "/api/v$version/", $url);
+        }
 
         if (!$this->request) {
             $this->config['store_body']       = true;
@@ -192,6 +219,16 @@
             $this->request->setUrl($_url);
         }
 
+        // HTTP_Request2 does not support POST params on PUT requests
+        if (!empty($post) && $method == 'PUT') {
+            $body = http_build_query($post, '', '&');
+            $body = str_replace('%7E', '~', $body); // support RFC 3986 by not encoding '~' symbol
+            $post = null;
+
+            $this->request->setBody($body);
+            $this->request->setHeader('content-type', 'application/x-www-form-urlencoded');
+        }
+
         if (!empty($post)) {
             $this->request->addPostParameter($post);
         }
@@ -235,8 +272,22 @@
             }
         }
 
+        if ($this->status < 400) {
+            $body = @json_decode($body, true);
+        }
+
+        // Sometimes we can get an error with response code 200
+        if ($this->status == 200
+            && ($method == 'PUT' || $method == 'POST')
+            && !empty($body) && is_array($body) && !empty($body['failed']) && empty($body['success'])
+        ) {
+            // Note: $body['failed'] is an array where each element is an array with 'error_msg' item
+            // TODO: Support partial success/error result
+            $this->status = 520;
+        }
+
         // decode response
-        return $this->status >= 400 ? false : @json_decode($body, true);
+        return $this->status >= 400 ? false : $body;
     }
 
     /**
@@ -375,12 +426,14 @@
     /**
      * List directory entries (files and directories)
      *
-     * @param string $repo_id Library identifier
-     * @param string $dir     Directory name (with path)
+     * @param string $repo_id   Library identifier
+     * @param string $dir       Directory name (with path)
+     * @param string $type      Entry type ('dir' or 'file') (requires Seafile 4.4.1)
+     * @param bool   $recursive Enable recursive call for 'dir' listing (requires Seafile 4.4.1)
      *
      * @return bool|array List of directories/files on success, False on failure
      */
-    public function directory_entries($repo_id, $dir)
+    public function directory_entries($repo_id, $dir, $type = null, $recursive = false)
     {
         // sanity checks
         if (!is_string($dir)) {
@@ -410,7 +463,43 @@
         //    "name": "test_dir"
         // }]
 
-        return $this->request('GET', "repos/$repo_id/dir", array('p' => $dir));
+        $params = array('p' => $dir);
+
+        if ($type) {
+            $params['t'] = $type == 'dir' ? 'd' : 'f';
+        }
+
+        if ($recursive && $type == 'dir') {
+            $params['recursive'] = 1;
+        }
+
+        return $this->request('GET', "repos/$repo_id/dir", $params);
+    }
+
+    /**
+     * Get directory information.
+     *
+     * @param string $repo_id Library identifier
+     * @param string $dir     Directory name (with path)
+     *
+     * @return bool|array Directory properties on success, False on failure
+     */
+    public function directory_info($repo_id, $dir)
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        $params = array('path' => $dir);
+
+        return $this->request('GET', "repos/$repo_id/dir/detail", $params, null, null, '2.1');
     }
 
     /**
@@ -846,4 +935,471 @@
 
         return $this->is_error() === false;
     }
+
+    /**
+     * Share a directory (or library)
+     *
+     * @param string $repo_id Library identifier
+     * @param string $dir     Directory name (with path)
+     * @param string $right   Permission ('r' or 'rw' or 'admin')
+     * @param string $mode    Mode ('user' or 'group')
+     * @param string $who     Username or Group ID
+     * @param bool   $update  Update an existing entry
+     *
+     * @return bool True on success, False on failure
+     */
+    public function shared_item_add($repo_id, $dir, $right, $mode, $who, $update = false)
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($mode != 'user' && $mode != 'group') {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($right != 'r' && $right != 'rw' && $right != 'admin') {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($dir === '') {
+            $dir = '/';
+        }
+
+        $post = array(
+            'permission' => $right,
+            'share_type' => $mode,
+        );
+
+        $post[$mode == 'group' ? 'group_id' : 'username'] = $who;
+
+        $this->request($update ? 'POST' : 'PUT', "repos/$repo_id/dir/shared_items", array('p' => $dir), $post);
+
+        return $this->is_error() === false;
+    }
+
+    /**
+     * Update shared item permissions
+     *
+     * @param string $repo_id Library identifier
+     * @param string $dir     Directory name (with path)
+     * @param string $right   Permission ('r' or 'rw' or 'admin')
+     * @param string $mode    Mode ('user' or 'group')
+     * @param string $who     Username or Group ID
+     *
+     * @return bool True on success, False on failure
+     */
+    public function shared_item_update($repo_id, $dir, $right, $mode, $who)
+    {
+        return $this->shared_item_add($repo_id, $dir, $right, $mode, $who, true);
+    }
+
+    /**
+     * Un-Share a directory (or library)
+     *
+     * @param string $repo_id Library identifier
+     * @param string $dir     Directory name (with path)
+     * @param string $mode    Mode ('user' or 'group')
+     * @param string $who     Username or Group ID
+     *
+     * @return bool True on success, False on failure
+     */
+    public function shared_item_delete($repo_id, $dir, $mode, $who)
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($mode != 'user' && $mode != 'group') {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($dir === '') {
+            $dir = '/';
+        }
+
+        $get = array(
+            'share_type' => $mode,
+            'p'          => $dir
+        );
+
+        $get[$mode == 'group' ? 'group_id' : 'username'] = $who;
+
+        $this->request('DELETE', "repos/$repo_id/dir/shared_items", $get);
+
+        return $this->is_error() === false;
+    }
+
+    /**
+     * List directory permissions (shares)
+     *
+     * @param string $repo_id   Library identifier
+     * @param string $dir       Directory name (with path)
+     *
+     * @return bool|array List of user/group info on success, False on failure
+     */
+    public function shared_item_list($repo_id, $dir)
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($dir === '') {
+            $dir = '/';
+        }
+
+        // Example result:
+        // [
+        //   {
+        //     "group_info": { "id": 17, "name": "Group Name" },
+        //     "is_admin": false,
+        //     "share_type": "group",
+        //     "permission": "rw"
+        //   },
+        //   {
+        //     "user_info": { "nickname": "user", "name": "user@domain.com" },
+        //     "share_type": "user",
+        //     "permission": "r"
+        //   }
+        // ]
+
+        return $this->request('GET', "repos/$repo_id/dir/shared_items", array('p' => $dir));
+    }
+
+    /**
+     * List share (download) links
+     *
+     * @param string $repo_id   Library identifier
+     * @param string $dir       Directory name (with path)
+     *
+     * @return bool|array List of shared links on success, False on failure
+     */
+    public function share_link_list($repo_id, $dir)
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($dir === '') {
+            $dir = '/';
+        }
+
+        // Example result:
+        // [
+        //   {
+        //     "username": "lian@lian.com",
+        //     "repo_id": "104f6537-b3a5-4d42-b8b5-8e47e494e4cf",
+        //     "ctime": "2017-04-01T02:35:29+00:00",
+        //     "expire_date": "",
+        //     "token": "0c4eb0cb104a43caaeef",
+        //     "view_cnt": 0,
+        //     "link": "https://cloud.seafile.com/d/0c4eb0cb104a43caaeef/",
+        //     "obj_name": "folder",
+        //     "path": "/folder/",
+        //     "is_dir": true,
+        //     "is_expired": false,
+        //     "repo_name": "for-test-web-api"
+        //   }
+        // ]
+
+        return $this->request('GET', "share-links", array('repo_id' => $repo_id, 'path' => $dir), null, null, '2.1');
+    }
+
+    /**
+     * Create a shared (download) link
+     *
+     * @param string $repo_id  Library identifier
+     * @param string $dir      Directory name (with path)
+     * @param string $password Password
+     * @param string $expire   Days to expire
+     *
+     * @return bool Link info on success, False on failure
+     */
+    public function share_link_add($repo_id, $dir, $password = '', $expire = 0)
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if (!empty($expire) && !is_numeric($expire)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($dir === '') {
+            $dir = '/';
+        }
+
+        $post = array(
+            'repo_id'     => $repo_id,
+            'path'        => $dir,
+        );
+
+        if (strlen($password)) {
+            $post['password'] = $password;
+        }
+        if ($expire > 0) {
+            $post['expire_days'] = $expire;
+        }
+
+        $result = $this->request('POST', "share-links", array(), $post, null, '2.1');
+
+        // Sample response:
+        // {
+        //   "token": "0c4eb0cb104a43caaeef",
+        //   "link": "https://cloud.seafile.com/d/db1a50e686/",
+        //   ...
+        // }
+
+        if (is_array($result) && !empty($result['link'])) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Delete a share (download) link
+     *
+     * @param string $token Link identifier (token)
+     *
+     * @return bool True on success, False on failure
+     */
+    public function share_link_delete($token)
+    {
+        // sanity checks
+        if ($token === '' || !is_string($token)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        $this->request('DELETE', "share-links/{$token}", null, null, null, '2.1');
+
+        return $this->is_error() === false;
+    }
+
+    /**
+     * List upload links
+     *
+     * @param string $repo_id Library identifier
+     * @param string $dir     Directory name (with path)
+     *
+     * @return bool|array List of upload links on success, False on failure
+     */
+    public function upload_link_list($repo_id, $dir)
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($dir === '') {
+            $dir = '/';
+        }
+
+        // Example result:
+        // [
+        //   {
+        //     "username": "lian@lian.com",
+        //     "repo_id": "104f6537-b3a5-4d42-b8b5-8e47e494e4cf",
+        //     "ctime": "2017-04-01T02:35:29+00:00",
+        //     "expire_date": "",
+        //     "token": "0c4eb0cb104a43caaeef",
+        //     "view_cnt": 0,
+        //     "link": "https://cloud.seafile.com/d/0c4eb0cb104a43caaeef/",
+        //     "obj_name": "folder",
+        //     "path": "/folder/",
+        //     "is_dir": true,
+        //     "is_expired": false,
+        //     "repo_name": "for-test-web-api"
+        //   }
+        // ]
+
+        return $this->request('GET', "upload-links", array('repo_id' => $repo_id, 'path' => $dir), null, null, '2.1');
+    }
+
+    /**
+     * Create an upload link
+     *
+     * @param string $repo_id  Library identifier
+     * @param string $dir      Directory name (with path)
+     * @param string $password Password
+     *
+     * @return bool Link info on success, False on failure
+     */
+    public function upload_link_add($repo_id, $dir, $password = '')
+    {
+        // sanity checks
+        if (!is_string($dir)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($repo_id === '' || !is_string($repo_id)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        if ($dir === '') {
+            $dir = '/';
+        }
+
+        $post = array(
+            'repo_id'     => $repo_id,
+            'path'        => $dir,
+        );
+
+        if (strlen($password)) {
+            $post['password'] = $password;
+        }
+
+        $result = $this->request('POST', "upload-links", array(), $post, null, '2.1');
+
+        // Sample response:
+        // {
+        //   "token": "0c4eb0cb104a43caaeef",
+        //   "link": "https://cloud.seafile.com/d/db1a50e686/",
+        //   ...
+        // }
+
+        if (is_array($result) && !empty($result['link'])) {
+            return $result;
+        }
+
+        return false;
+    }
+
+    /**
+     * Delete an upload link
+     *
+     * @param string $token Link identifier (token)
+     *
+     * @return bool True on success, False on failure
+     */
+    public function upload_link_delete($token)
+    {
+        // sanity checks
+        if ($token === '' || !is_string($token)) {
+            $this->status = self::BAD_REQUEST;
+            return false;
+        }
+
+        $this->request('DELETE', "upload-links/{$token}", null, null, null, '2.1');
+
+        return $this->is_error() === false;
+    }
+
+    /**
+     * List user groups
+     *
+     * @return bool|array List of groups on success, False on failure
+     */
+    public function group_list()
+    {
+        // Sample result:
+        // [
+        //   {
+        //     "ctime": 1398134171327948,
+        //     "creator": "user@example.com",
+        //     "msgnum": 0,
+        //     "mtime": 1398231100,
+        //     "id": 1,
+        //     "name": "lian"
+        //   }
+        // ]                                                                                    },
+
+        $result = $this->request('GET', "groups");
+
+        if (is_array($result)) {
+            $result = (array) $result['groups'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * List users
+     *
+     * @param string $search Search keyword
+     *
+     * @return bool|array List of users on success, False on failure
+     */
+    public function user_search($search = null)
+    {
+        // Sample response:
+        // [
+        //   {
+        //     'avatar_url': 'https://cloud.seafile.com/media/avatars/default.png',
+        //      'contact_email': 'foo@foo.com',
+        //      'email': 'foo@foo.com',
+        //      'name': 'foo'
+        //   }
+        // ]
+
+        $result = $this->request('GET', "search-user", array('q' => $search));
+
+        if (is_array($result)) {
+            $result = (array) $result['users'];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Parse and fix API request URLs
+     */
+    public function mod_url($url)
+    {
+        // If Seafile is behind a proxy and different port, it will return
+        // wrong URL for file uploads/downloads. We force the original URL prefix here
+        if (stripos($url, $this->url_prefix) !== 0) {
+            $url = $this->url_prefix . preg_replace('|^(https?://[^/]+)|i', '', $url);
+        }
+
+        return $url;
+    }
 }

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/seafile/seafile_file_storage.php -> iRony-0.4.3.tar.gz/lib/FileAPI/drivers/seafile/seafile_file_storage.php Changed

@@ -117,8 +117,10 @@
             'ssl_verify_peer' => $this->rc->config->get('fileapi_seafile_ssl_verify_peer', true),
             'ssl_verify_host' => $this->rc->config->get('fileapi_seafile_ssl_verify_host', true),
             'cache'           => $this->rc->config->get('fileapi_seafile_cache'),
-            'cache_ttl'       => $this->rc->config->get('fileapi_seafile_cache', '14d'),
+            'cache_ttl'       => $this->rc->config->get('fileapi_seafile_cache_ttl', '14d'),
             'debug'           => $this->rc->config->get('fileapi_seafile_debug', false),
+            'token'           => $_SESSION[$this->title . 'seafile_token'] ? $this->rc->decrypt($_SESSION[$this->title . 'seafile_token']) : null,
+
         );
 
         $this->config = array_merge($config, $this->config);
@@ -130,11 +132,26 @@
             return true;
         }
 
+        if ($this->config['cache']) {
+            $cache = $this->rc->get_cache('seafile_' . $this->title,
+                $this->config['cache'], $this->config['cache_ttl'], true);
+        }
+
         // try session token
-        if ($_SESSION[$this->title . 'seafile_token']
-            && ($token = $this->rc->decrypt($_SESSION[$this->title . 'seafile_token']))
-        ) {
-            $valid = $this->api->ping($token);
+        if ($config['token']) {
+            // With caching we know the last successful token use, so we can
+            // skip ping call, which is a big win for case of parallel folders listing
+            if ($cache) {
+                $valid = ($ping = $cache->get('ping')) && $ping + 15 >= time();
+            }
+
+            if (empty($valid)) {
+                $valid = $this->api->ping($config['token']);
+
+                if ($cache && $valid) {
+                    $cache->write('ping', time());
+                }
+            }
         }
 
         if (!$valid) {
@@ -151,6 +168,10 @@
 
             if ($user) {
                 $valid = $this->authenticate($user, $pass);
+
+                if ($cache) {
+                    $cache->remove('ping');
+                }
             }
         }
 
@@ -158,6 +179,9 @@
         if (!$valid && empty($_SESSION[$this->title . 'seafile_user'])) {
             throw new Exception("User credentials not provided", file_storage::ERROR_NOAUTH);
         }
+        else if (!$valid && !$this->api) {
+            throw new Exception("SeaFile storage unavailable", file_storage::ERROR);
+        }
         else if (!$valid && $this->api->is_error() == seafile_api::TOO_MANY_REQUESTS) {
             throw new Exception("SeaFile storage temporarily unavailable (too many requests)", file_storage::ERROR);
         }
@@ -205,6 +229,7 @@
             file_storage::CAPS_MAX_UPLOAD => $max_filesize,
             file_storage::CAPS_QUOTA      => true,
             file_storage::CAPS_LOCKS      => true,
+            file_storage::CAPS_ACL        => true,
         );
     }
 
@@ -445,7 +470,7 @@
      * Return file body.
      *
      * @param string   $file_name Name of a file (with folder path)
-     * @param array    $params    Parameters (force-download)
+     * @param array    $params    Parameters (force-download, force-type, head)
      * @param resource $fp        Print to file pointer instead (send no headers)
      *
      * @throws Exception
@@ -463,7 +488,7 @@
         $file = $this->from_file_object($file);
 
         // get file location on SeaFile server for download
-        if ($file['size']) {
+        if ($file['size'] && empty($params['head'])) {
             $link = $this->api->file_get($repo_id, $fn);
         }
 
@@ -506,10 +531,20 @@
         header("Content-Disposition: $disposition; filename=\"$filename\"");
 
         // just send redirect to SeaFile server
-        if ($file['size']) {
-            header("Location: $link");
+        if ($file['size'] && empty($params['head'])) {
+            $allow_redirects = $this->rc->config->get('fileapi_seafile_allow_redirects');
+            // In view-mode we can't redirect to SeaFile server because:
+            // - it responds with Content-Disposition: attachment, which causes that
+            //   e.g. previewing images is not possible
+            // - pdf/odf viewers can't follow redirects for some reason (#4590)
+            if ($allow_redirects && !empty($params['force-download'])) {
+                header("Location: $link");
+            }
+            else if ($fp = fopen('php://output', 'wb')) {
+                $this->save_file_content($link, $fp);
+                fclose($fp);
+            }
         }
-        die;
     }
 
     /**
@@ -535,8 +570,8 @@
             'name'     => $file['name'],
             'size'     => (int) $file['size'],
             'type'     => (string) $file['type'],
-            'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
-            'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
+            'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
+            'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
             'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
             'created'  => $file['created'] ? $file['created']->format('U') : 0,
         );
@@ -553,6 +588,11 @@
      */
     public function file_list($folder_name, $params = array())
     {
+        // mount point contains only folders
+        if (!is_string($folder_name) || $folder_name === '') {
+            return array();
+        }
+
         list($folder, $repo_id) = $this->find_library($folder_name);
 
         // prepare search filter
@@ -568,7 +608,7 @@
         }
 
         // get directory entries
-        $entries = $this->api->directory_entries($repo_id, $folder);
+        $entries = $this->api->directory_entries($repo_id, $folder, 'file');
         $result  = array();
 
         foreach ((array) $entries as $idx => $file) {
@@ -588,8 +628,8 @@
                     }
                     else if ($idx == 'class') {
                         foreach ($value as $v) {
-                            if (stripos($file['type'], $v) === 0) {
-                                break 2;
+                            if (stripos($file['type'], $v) !== false) {
+                                continue 2;
                             }
                         }
 
@@ -604,8 +644,8 @@
                 'name'     => $file['name'],
                 'size'     => (int) $file['size'],
                 'type'     => (string) $file['type'],
-                'mtime'    => $file['changed'] ? $file['changed']->format($this->config['date_format']) : '',
-                'ctime'    => $file['created'] ? $file['created']->format($this->config['date_format']) : '',
+                'mtime'    => file_utils::date_format($file['changed'], $this->config['date_format'], $this->config['timezone']),
+                'ctime'    => file_utils::date_format($file['created'], $this->config['date_format'], $this->config['timezone']),
                 'modified' => $file['changed'] ? $file['changed']->format('U') : 0,
                 'created'  => $file['created'] ? $file['created']->format('U') : 0,
             );
@@ -814,23 +854,49 @@
     }
 
     /**
+     * Subscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_subscribe($folder_name)
+    {
+        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * Unsubscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_unsubscribe($folder_name)
+    {
+        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
      * Returns list of folders.
      *
+     * @param array $params List parameters ('type', 'search', 'path', 'level')
+     *
      * @return array List of folders
      * @throws Exception
      */
-    public function folder_list()
+    public function folder_list($params = array())
     {
-        $libraries = $this->libraries();
-        $folders   = array();
-
-        if ($this->config['cache']) {
-            $cache = $this->rc->get_cache('seafile_' . $this->title,
-                $this->config['cache'], $this->config['cache_ttl'], true);
+        $libraries  = $this->libraries();
+        $writable   = ($params['type'] & file_storage::FILTER_WRITABLE) ? true : false;
+        $prefix     = (string) $params['path'];
+        $prefix_len = strlen($prefix);
+        $folders    = array();
 
-            if ($cache) {
-                $cached = $cache->get('folders');
-            }
+        if ($prefix_len) {
+            $path           = explode('/', $prefix);
+            $lib_search     = array_shift($path);
+            $params['path'] = implode('/', $path);
         }
 
         foreach ($libraries as $library) {
@@ -838,29 +904,110 @@
                 continue;
             }
 
-            $folders[$library['name']] = $library['mtime'];
+            if ($prefix_len && $lib_search !== $library['name']) {
+                continue;
+            }
+
+            if (!strlen($params['path'])) {
+                $folders[$library['name']] = array(
+                    'mtime'      => $library['mtime'],
+                    'permission' => $library['permission'],
+                );
+            }
 
-            if ($folder_tree = $this->folders_tree($library, '', $library, $cached)) {
-                $folders = array_merge($folders, $folder_tree);
+            if ($params['level'] == 1 && !$prefix_len) {
+                // Only list of libraries has been requested
+                continue;
+            }
+
+            foreach ($this->folders_tree($library, $params) as $folder_name => $folder) {
+                $folders[$library['name'] . '/' . $folder_name] = $folder;
             }
         }
 
-        if (empty($folders)) {
+        if (empty($libraries)) {
             throw new Exception("Storage error. Unable to get folders list.", file_storage::ERROR);
         }
 
-        if ($cache) {
-            $cache->set('folders', $folders);
+        // remove read-only folders when requested
+        if ($writable) {
+            foreach ($folders as $folder_name => $folder) {
+                if (strpos($folder['permission'], 'w') === false) {
+                    unset($folders[$folder_name]);
+                }
+            }
+        }
+
+        // In extended format we return array of arrays
+        if (!empty($params['extended'])) {
+            foreach ($folders as $folder_name => $folder) {
+                $item = array('folder' => $folder_name);
+
+                // check if folder is readonly
+                if (!$writable && $params['permissions']) {
+                    if (strpos($folder['permission'], 'w') === false) {
+                        $item['readonly'] = true;
+                    }
+                }
+
+                $folders[$folder_name] = $item;
+            }
+        }
+        else {
+            $folders = array_keys($folders);
         }
 
         // sort folders
-        $folders = array_keys($folders);
-        usort($folders, array($this, 'sort_folder_comparator'));
+        usort($folders, array('file_utils', 'sort_folder_comparator'));
 
         return $folders;
     }
 
     /**
+     * Check folder rights.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @return int Folder rights (sum of file_storage::ACL_*)
+     */
+    public function folder_rights($folder_name)
+    {
+        // It is not possible (yet) to assign a specified library/folder
+        // to the mount point. So, it is a "virtual" folder.
+        if (!strlen($folder_name)) {
+            return 0;
+        }
+
+        list($folder, $repo_id, $library) = $this->find_library($folder_name);
+
+        // @TODO: we should check directory permission not library
+        // However, there's no API for this, we'd need to get a list
+        // of directories of a parent folder/library
+/*
+        if (strpos($folder, '/')) {
+            // @TODO
+        }
+        else {
+            $acl = $library['permission'];
+        }
+*/
+        $acl    = $library['permission'];
+        $rights = 0;
+        $map    = array(
+            'r' => file_storage::ACL_READ,
+            'w' => file_storage::ACL_WRITE,
+        );
+
+        foreach ($map as $key => $value) {
+            if (strpos($acl, $key) !== false) {
+                $rights |= $value;
+            }
+        }
+
+        return $rights;
+    }
+
+    /**
      * Returns a list of locks
      *
      * This method should return all the locks for a particular URI, including
@@ -869,25 +1016,25 @@
      * If child_locks is set to true, this method should also look for
      * any locks in the subtree of the URI for locks.
      *
-     * @param string $uri         URI
+     * @param string $path        File/folder path
      * @param bool   $child_locks Enables subtree checks
      *
      * @return array List of locks
      * @throws Exception
      */
-    public function lock_list($uri, $child_locks = false)
+    public function lock_list($path, $child_locks = false)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->uri2resource($uri);
+        $uri = $this->path2uri($path);
 
         // get locks list
         $list = $this->lock_db->lock_list($uri, $child_locks);
 
         // convert back resource string into URIs
         foreach ($list as $idx => $lock) {
-            $list[$idx]['uri'] = $this->resource2uri($lock['uri']);
+            $list[$idx]['uri'] = $this->uri2path($lock['uri']);
         }
 
         return $list;
@@ -896,7 +1043,7 @@
     /**
      * Locks a URI
      *
-     * @param string $uri  URI
+     * @param string $path File/folder path
      * @param array  $lock Lock data
      *                     - depth: 0/'infinite'
      *                     - scope: 'shared'/'exclusive'
@@ -906,12 +1053,12 @@
      *
      * @throws Exception
      */
-    public function lock($uri, $lock)
+    public function lock($path, $lock)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->uri2resource($uri);
+        $uri = $this->uri2resource($path);
 
         if (!$this->lock_db->lock($uri, $lock)) {
             throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR);
@@ -921,17 +1068,17 @@
     /**
      * Removes a lock from a URI
      *
-     * @param string $path URI
+     * @param string $path File/folder path
      * @param array  $lock Lock data
      *
      * @throws Exception
      */
-    public function unlock($uri, $lock)
+    public function unlock($path, $lock)
     {
         $this->init_lock_db();
 
         // convert URI to global resource string
-        $uri = $this->uri2resource($uri);
+        $uri = $this->path2uri($path);
 
         if (!$this->lock_db->unlock($uri, $lock)) {
             throw new Exception("Database error. Unable to remove a lock.", file_storage::ERROR);
@@ -968,63 +1115,416 @@
     }
 
     /**
-     * Recursively builds folders list
+     * Sharing interface
+     *
+     * @param string $folder_name Name of a folder with full path
+     * @param int    $mode        Sharing action mode
+     * @param array  $args        POST/GET parameters
+     *
+     * @return mixed Sharing response
+     * @throws Exception
      */
-    protected function folders_tree($library, $path, $folder, $cached)
+    public function sharing($folder, $mode, $args = array())
     {
-        $folders = array();
-        $fname  = strlen($path) ? $path . $folder['name'] : '/';
-        $root   = $library['name'] . ($fname != '/' ? $fname : '');
-
-        // nothing changed, use cached folders tree of this folder
-        if ($cached && $cached[$root] && $cached[$root] == $folder['mtime']) {
-            foreach ($cached as $folder_name => $mtime) {
-                if (strpos($folder_name, $root . '/') === 0) {
-                    $folders[$folder_name] = $mtime;
+        if ($mode == file_storage::SHARING_MODE_FORM) {
+            $form = array(
+                'shares' => array(
+                    'title' => 'share.permissions',
+                    'form'  => array(
+                        'user' => array(
+                            'title' => 'share.usergroup',
+                            'type'  => 'input',
+                            'autocomplete' => 'user,group',
+                        ),
+                        'right' => array(
+                            'title' => 'share.permission',
+                            'type'  => 'select',
+                            'options' => array(
+                                'r'  => 'share.readonly',
+                                'rw' => 'share.readwrite',
+                            ),
+                        ),
+                    ),
+                    'extra_fields' => array(
+                        'type' => 'user',
+                        'id'   => '',
+                    ),
+                ),
+                'download-link' => array(
+                    'title'             => 'share.download-link',
+                    'label'             => 'share.generate',
+                    'single'            => true,
+                    'list_column'       => 'link',
+                    'list_column_label' => 'share.link',
+                    'form'              => array(
+                        'password' => array(
+                            'title'       => 'share.password',
+                            'type'        => 'password',
+                        ),
+                        'expire' => array(
+                            'title'       => 'share.expire',
+                            'placeholder' => 'share.expiredays',
+                            'type'        => 'input',
+                        ),
+                    ),
+                    'extra_fields' => array(
+                        'id' => '',
+                    ),
+                ),
+                'upload-link' => array(
+                    'title'             => 'share.upload-link',
+                    'label'             => 'share.generate',
+                    'single'            => true,
+                    'list_column'       => 'link',
+                    'list_column_label' => 'share.link',
+                    'form'              => array(
+                        'password' => array(
+                            'title' => 'share.password',
+                            'type'  => 'password',
+                        ),
+                    ),
+                    'extra_fields' => array(
+                        'id' => '',
+                    ),
+                ),
+            );
+
+            return $form;
+        }
+
+        if ($mode == file_storage::SHARING_MODE_RIGHTS) {
+            if (!$this->init()) {
+                throw new Exception("Storage error. Unable to get shares of SeaFile folder/lib.", file_storage::ERROR);
+            }
+
+            list($path, $repo_id) = $this->find_library($folder);
+
+            $result = array();
+
+            if ($shares = $this->api->shared_item_list($repo_id, $path)) {
+                foreach ($shares as $share) {
+                    if (!empty($share['group_info'])) {
+                        $name = $share['group_info']['name'];
+                        $name = $share['group_info']['id'];
+                    }
+                    else {
+                        $name = $this->user_label($share['user_info']['nickname'], $share['user_info']['name']);
+                        $id   = $share['user_info']['name'];
+                    }
+
+                    $result[] = array(
+                        'mode'  => 'shares',
+                        'type'  => $share['share_type'],
+                        'right' => $share['permission'],
+                        'user'  => $name,
+                        'id'    => $id,
+                    );
+                }
+            }
+
+            if ($links = $this->api->share_link_list($repo_id, $path)) {
+                foreach ($links as $link) {
+                    $result[] = array(
+                        'mode' => 'download-link',
+                        'id'   => $link['token'],
+                        'link' => $link['link'],
+                    );
+                }
+            }
+
+            if ($links = $this->api->upload_link_list($repo_id, $path)) {
+                foreach ($links as $link) {
+                    $result[] = array(
+                        'mode' => 'upload-link',
+                        'id'   => $link['token'],
+                        'link' => $link['link'],
+                    );
                 }
             }
+
+            return $result;
         }
-        // get folder content (files and sub-folders)
-        // there's no API method to get only folders
-        else if ($content = $this->api->directory_entries($library['id'], $fname)) {
-            if ($fname != '/') {
-                $fname .= '/';
+
+        if ($mode == file_storage::SHARING_MODE_UPDATE) {
+            if (!$this->init()) {
+                throw new Exception("Storage error. Unable to update shares of SeaFile folder/lib.", file_storage::ERROR);
             }
 
-            foreach ($content as $item) {
-                if ($item['type'] == 'dir' && strlen($item['name'])) {
-                    $folders[$root . '/' . $item['name']] = $item['mtime'];
+            list($path, $repo_id) = $this->find_library($folder);
 
-                    // get subfolders recursively
-                    $folders_tree = $this->folders_tree($library, $fname, $item, $cached);
-                    if (!empty($folders_tree)) {
-                        $folders = array_merge($folders, $folders_tree);
+            if ($args['mode'] == 'shares') {
+                $share_id = $args['id'] ?: $args['user'];
+
+                switch ($args['action']) {
+                case 'submit':
+                    $result = $this->api->shared_item_add($repo_id, $path, $args['right'], $args['type'], $share_id);
+                    break;
+
+                case 'update':
+                    $result = $this->api->shared_item_update($repo_id, $path, $args['right'], $args['type'], $share_id);
+                    break;
+
+                case 'delete':
+                    $result = $this->api->shared_item_delete($repo_id, $path, $args['type'], $share_id);
+                    break;
+                }
+            }
+            else if ($args['mode'] == 'download-link') {
+                switch ($args['action']) {
+                case 'submit':
+                    $result = $this->api->share_link_add($repo_id, $path, $args['password'], $args['expire']);
+
+                    if ($result) {
+                        $result['id']   = $result['token'];
+                        $result['mode'] = 'download-link';
                     }
+                    break;
+
+                case 'delete':
+                    $result = $this->api->share_link_delete($args['id']);
+                    break;
                 }
             }
+            else if ($args['mode'] == 'upload-link') {
+                switch ($args['action']) {
+                case 'submit':
+                    $result = $this->api->upload_link_add($repo_id, $path, $args['password']);
+
+                    if ($result) {
+                        $result['id']   = $result['token'];
+                        $result['mode'] = 'upload-link';
+                    }
+                    break;
+
+                case 'delete':
+                    $result = $this->api->upload_link_delete($args['id']);
+                    break;
+                }
+            }
+            else {
+                throw new Exception("Invalid input.", file_storage::ERROR);
+            }
+
+            if (empty($result)) {
+                throw new Exception("Storage error. Failed to update share.", file_storage::ERROR);
+            }
+
+            return $result;
         }
+    }
 
-        return $folders;
+    /**
+     * User/group search (autocompletion)
+     *
+     * @param string $search Search string
+     * @param int    $mode   Search mode
+     *
+     * @return array Users/Groups list
+     * @throws Exception
+     */
+    public function autocomplete($search, $mode)
+    {
+        if (!$this->init()) {
+            throw new Exception("Storage error. Failed to init Seafile storage connection.", file_storage::ERROR);
+        }
+
+        $limit  = (int) $this->rc->config->get('autocomplete_max', 15);
+        $result = array();
+        $index  = array();
+
+        if ($mode & file_storage::SEARCH_USER) {
+            $users = $this->api->user_search($search);
+
+            if (!is_array($users)) {
+                throw new Exception("Storage error. Failed to search users.", file_storage::ERROR);
+            }
+
+            foreach ($users as $user) {
+                $index[] = $user['name'];
+                $result[] = array(
+                    'name' => $this->user_label($user['name'], $user['email']),
+                    'id'   => $user['email'],
+                    'type' => 'user',
+                );
+            }
+        }
+
+        if (count($result) < $limit && ($mode & file_storage::SEARCH_GROUP)) {
+            if ($groups = $this->api->group_list()) {
+                $search = mb_strtoupper($search);
+                foreach ($groups as $group) {
+                    if (strpos(mb_strtoupper($group['name']), $search) !== false) {
+                        $index[] = $group['name'];
+                        $result[] = array(
+                            'name' => $group['name'],
+                            'id'   => $group['id'],
+                            'type' => 'group',
+                        );
+                    }
+                }
+            }
+        }
+
+        if (count($result)) {
+            array_multisort($index, SORT_ASC, SORT_LOCALE_STRING, $result);
+        }
+
+        if (count($result) > $limit) {
+            $result = array_slice($result, 0, $limit);
+        }
+
+        return $result;
     }
 
     /**
-     * Callback for uasort() that implements correct
-     * locale-aware case-sensitive sorting
+     * Convert file/folder path into a global URI.
+     *
+     * @param string $path File/folder path
+     *
+     * @return string URI
+     * @throws Exception
      */
-    protected function sort_folder_comparator($str1, $str2)
+    public function path2uri($path)
     {
-        $path1 = explode('/', $str1);
-        $path2 = explode('/', $str2);
+        // Remove protocol prefix and path, we work with host only
+        $host = preg_replace('#(^https?://|/.*$)#i', '', $this->config['host']);
 
-        foreach ($path1 as $idx => $folder1) {
-            $folder2 = $path2[$idx];
+        if (!is_string($path) || !strlen($path)) {
+            $user = $_SESSION[$this->title . 'seafile_user'];
+            return 'seafile://' . rawurlencode($user) . '@' . $host . '/';
+        }
 
-            if ($folder1 === $folder2) {
-                continue;
+        list($file, $repo_id, $library) = $this->find_library($path);
+
+        return 'seafile://' . rawurlencode($library['owner']) . '@' . $host . '/' . file_utils::encode_path($path);
+    }
+
+    /**
+     * Convert global URI into file/folder path.
+     *
+     * @param string $uri URI
+     *
+     * @return string File/folder path
+     * @throws Exception
+     */
+    public function uri2path($uri)
+    {
+        if (!preg_match('|^seafile://([^@]+)@([^/]+)/(.*)$|', $uri, $matches)) {
+            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
+        }
+
+        $user   = rawurldecode($matches[1]);
+        $host   = $matches[2];
+        $path   = file_utils::decode_path($matches[3]);
+        $c_host = preg_replace('#(^https?://|/.*$)#i', '', $this->config['host']);
+
+        if (strlen($path)) {
+            list($file, $repo_id, $library) = $this->find_library($path, true);
+
+            if (empty($library) || $host != $c_host || $user != $library['owner']) {
+                throw new Exception("Internal storage error. Unresolvable URI.", file_storage::ERROR);
             }
+        }
 
-            return strcoll($folder1, $folder2);
+        return $path;
+    }
+
+    /**
+     * Get folders tree in the Seafile library
+     */
+    protected function folders_tree($library, $params = array())
+    {
+        $root = '';
+        if (is_string($params['path']) && strlen($params['path'])) {
+            $root = trim($params['path'], '/');
         }
+
+        if ($this->config['cache'] && empty($params['recursive'])) {
+            $cache = $this->rc->get_cache('seafile_' . $this->title,
+                $this->config['cache'], $this->config['cache_ttl'], true);
+
+            if ($cache) {
+                $cache_key = 'folders.' . md5(sprintf('%s:%d:%s', $library['id'], $params['level'], $root));
+                $folders   = $cache->get($cache_key);
+
+                if (is_string($folders) && preg_match('/^([0-9]+):[\{\[]/', $folders, $m)) {
+                    $cache_mtime = $m[1];
+                    $folders     = json_decode(substr($folders, strlen($cache_mtime)+1), true);
+                }
+                else {
+                    $folders = null;
+                }
+
+                if (strlen($root)) {
+                    $info = $this->api->directory_info($library['id'], $root);
+                    if ($info && $info['mtime']) {
+                        try {
+                            $dt    = new DateTime($info['mtime']);
+                            $mtime = $dt->format('U');
+                        }
+                        catch (Exception $e) {
+                            // ignore
+                            rcube::raise_error($e, true, false);
+                        }
+                    }
+                }
+                else {
+                    $mtime = $library['mtime'];
+                }
+
+                if (is_array($folders) && $mtime && $cache_mtime && intval($mtime) === intval($cache_mtime)) {
+                    return $folders;
+                }
+            }
+        }
+
+        $folders    = array();
+        $add_folder = function($item, &$result, $parent) {
+            if ($item['type'] == 'dir' && strlen($item['name'])) {
+                $name = (strlen($parent) > 0 ? "$parent/" : '') . $item['name'];
+
+                $result[$name] = array(
+                    'mtime'      => $item['mtime'],
+                    'permission' => $item['permission'],
+                );
+
+                return $name;
+            }
+        };
+
+        // Full folder hierarchy requested, we can get all in one request...
+        if (empty($params['recursive']) && empty($params['level'])) {
+            if ($content = $this->api->directory_entries($library['id'], $root, 'dir', true)) {
+                foreach ($content as $item) {
+                    $add_folder($item, $folders, trim($item['parent_dir'], '/'));
+                }
+            }
+        }
+        // Only part of the folder tree has been requested...
+        else if ($content = $this->api->directory_entries($library['id'], $root, 'dir', false)) {
+            $params['recursive'] = true;
+            $params['level']    -= 1;
+
+            // Recursively add sub-folders tree
+            foreach ($content as $item) {
+                $folder = $add_folder($item, $folders, $root);
+
+                // FIXME: id="0000000000000000000000000000000000000000" means the folder is empty?
+                if ($folder !== null && $params['level'] > 1 && $item['id'] !== "0000000000000000000000000000000000000000") {
+                    $params['path'] = $folder;
+                    $tree = $this->folders_tree($library, $params);
+                    if (!empty($tree)) {
+                        $folders = array_merge($folders, $tree);
+                    }
+                }
+            }
+        }
+
+        if ($cache_key && is_array($content) && $mtime && ($_folders = json_encode($folders))) {
+            $cache->set($cache_key, intval($mtime) . ':' . $_folders);
+        }
+
+        return $folders;
     }
 
     /**
@@ -1032,7 +1532,7 @@
      */
     protected function libraries()
     {
-        // get from memory, @TODO: cache in rcube_cache?
+        // get from memory
         if ($this->libraries !== null) {
             return $this->libraries;
         }
@@ -1041,8 +1541,33 @@
             throw new Exception("Storage error. Unable to get list of SeaFile libraries.", file_storage::ERROR);
         }
 
+        if ($this->config['cache']) {
+            $cache = $this->rc->get_cache('seafile_' . $this->title,
+                $this->config['cache'], $this->config['cache_ttl'], true);
+
+            if ($cache) {
+                $repos = $cache->get('repos');
+
+                if (is_string($repos) && preg_match('/^([0-9]+):[\{\[]/', $repos, $m)) {
+                    $mtime = $m[1];
+                    $repos = json_decode(substr($repos, strlen($mtime)+1), true);
+                    // We use the cached value for up to 15 seconds
+                    // It should be enough to improve parallel folders listing requests
+                    if (is_array($repos) && $mtime + 15 >= time()) {
+                        return $repos;
+                    }
+                }
+            }
+        }
+
+        $mtime = time();
+
         if ($list = $this->api->library_list()) {
             $this->libraries = $list;
+
+            if ($cache) {
+                $cache->write('repos', $mtime . ':' . json_encode($list));
+            }
         }
         else {
             $this->libraries = array();
@@ -1160,7 +1685,7 @@
         $observer->set_fp($fp);
 
         try {
-            $request->setUrl($location);
+            $request->setUrl($this->api->mod_url($location));
             $request->attach($observer);
 
             $response = $request->send();
@@ -1181,31 +1706,6 @@
         return true;
     }
 
-    protected function uri2resource($uri)
-    {
-        list($file, $repo_id, $library) = $this->find_library($uri);
-
-        // convert to imap charset (to be safe to store in DB)
-        $uri = rcube_charset::convert($uri, RCUBE_CHARSET, 'UTF7-IMAP');
-
-        return 'seafile://' . urlencode($library['owner']) . '@' . $this->config['host'] . '/' . $uri;
-    }
-
-    protected function resource2uri($resource)
-    {
-        if (!preg_match('|^seafile://([^@]+)@([^/]+)/(.*)$|', $resource, $matches)) {
-            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
-        }
-
-        $user = urldecode($matches[1]);
-        $uri  = $matches[3];
-
-        // convert from imap charset (to be safe to store in DB)
-        $uri = rcube_charset::convert($uri, 'UTF7-IMAP', RCUBE_CHARSET);
-
-        return $uri;
-    }
-
     /**
      * Initializes file_locks object
      */
@@ -1215,4 +1715,19 @@
             $this->lock_db = new file_locks;
         }
     }
+
+    /**
+     * Create display-username-with-email string
+     */
+    protected function user_label($name, $email)
+    {
+        if ($name && $name != $email) {
+            $label = "{$name} ({$email})";
+        }
+        else {
+            $label = $email;
+        }
+
+        return $label;
+    }
 }

iRony-0.4.2.tar.gz/lib/FileAPI/drivers/seafile/seafile_request_observer.php -> iRony-0.4.3.tar.gz/lib/FileAPI/drivers/seafile/seafile_request_observer.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/webdav Added

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/webdav/webdav.png Added

iRony-0.4.3.tar.gz/lib/FileAPI/drivers/webdav/webdav_file_storage.php Added

@@ -0,0 +1,1115 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2015, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+// try SabreDAV installed as described in README
+if (file_exists(__DIR__ . '/../../ext/SabreDAV/vendor/autoload.php')) {
+    require __DIR__ . '/../../ext/SabreDAV/vendor/autoload.php';
+}
+// fallback to System-installed package
+else {
+    require 'Sabre/autoload.php';
+}
+
+use Sabre\DAV\Client;
+
+class webdav_file_storage implements file_storage
+{
+    /**
+     * @var rcube
+     */
+    protected $rc;
+
+    /**
+     * @var array
+     */
+    protected $config = array();
+
+    /**
+     * @var string
+     */
+    protected $title;
+
+    /**
+     * @var Sabre\DAV\Client
+     */
+    protected $client;
+
+
+    /**
+     * Class constructor
+     */
+    public function __construct()
+    {
+        $this->rc = rcube::get_instance();
+    }
+
+    /**
+     * Authenticates a user
+     *
+     * @param string $username User name
+     * @param string $password User password
+     *
+     * @param bool True on success, False on failure
+     */
+    public function authenticate($username, $password)
+    {
+        $settings = array(
+            'baseUri'  => $this->config['baseuri'],
+            'userName' => $username,
+            'password' => $password,
+            'authType' => Client::AUTH_BASIC,
+        );
+
+        $client = new Client($settings);
+
+        try {
+            $client->propfind('', array());
+        }
+        catch (Exception $e) {
+            return false;
+        }
+
+        if ($this->title) {
+            $_SESSION[$this->title . '_webdav_user']  = $username;
+            $_SESSION[$this->title . '_webdav_pass']  = $this->rc->encrypt($password);
+            $this->client = $client;
+        }
+
+        return true;
+    }
+
+    /**
+     * Get password and name of authenticated user
+     *
+     * @return array Authenticated user data
+     */
+    public function auth_info()
+    {
+        return array(
+            'username' => $this->config['username'],
+            'password' => $this->config['password'],
+        );
+    }
+
+    /**
+     * Configures environment
+     *
+     * @param array  $config Configuration
+     * @param string $title  Source identifier
+     */
+    public function configure($config, $title = null)
+    {
+        if (!empty($config['host'])) {
+            $config['baseuri'] = $config['host'];
+        }
+
+        $this->config = array_merge($this->config, $config);
+        $this->title  = $title;
+    }
+
+    /**
+     * Initializes WebDAV client
+     */
+    protected function init()
+    {
+        if ($this->client !== null) {
+            return true;
+        }
+
+        // Load configuration for main driver
+        $config['baseuri'] = $this->rc->config->get('fileapi_webdav_baseuri');
+
+        if (!empty($config['baseuri'])) {
+            $config['username'] = $_SESSION['username'];
+            $config['password'] = $this->rc->decrypt($_SESSION['password']);
+        }
+
+        $this->config = array_merge($config, $this->config);
+
+        // Use session username if not set in configuration
+        if (!isset($this->config['username'])) {
+            $this->config['username'] = $_SESSION[$this->title . '_webdav_user'];
+        }
+        if (!isset($this->config['password'])) {
+            $this->config['password'] = $this->rc->decrypt($_SESSION[$this->title . '_webdav_pass']);
+        }
+
+        if (empty($this->config['baseuri'])) {
+            throw new Exception("Missing base URI of WebDAV server", file_storage::ERROR_NOAUTH);
+        }
+
+        $this->client = new Client(array(
+            'baseUri'  => rtrim($this->config['baseuri'], '/') . '/',
+            'userName' => $this->config['username'],
+            'password' => $this->config['password'],
+            'authType' => Client::AUTH_BASIC,
+        ));
+    }
+
+    /**
+     * Returns current instance title
+     *
+     * @return string Instance title (mount point)
+     */
+    public function title()
+    {
+        return $this->title;
+    }
+
+    /**
+     * Storage driver capabilities
+     *
+     * @return array List of capabilities
+     */
+    public function capabilities()
+    {
+        // find max filesize value
+        $max_filesize = parse_bytes(ini_get('upload_max_filesize'));
+        $max_postsize = parse_bytes(ini_get('post_max_size'));
+        if ($max_postsize && $max_postsize < $max_filesize) {
+            $max_filesize = $max_postsize;
+        }
+
+        return array(
+            file_storage::CAPS_MAX_UPLOAD => $max_filesize,
+            file_storage::CAPS_QUOTA      => true,
+            file_storage::CAPS_LOCKS      => true, //TODO: Implement WebDAV locks
+        );
+    }
+
+    /**
+     * Save configuration of external driver (mount point)
+     *
+     * @param array $driver Driver data
+     *
+     * @throws Exception
+     */
+    public function driver_create($driver)
+    {
+        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * Delete configuration of external driver (mount point)
+     *
+     * @param string $name Driver instance name
+     *
+     * @throws Exception
+     */
+    public function driver_delete($name)
+    {
+        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * Return list of registered drivers (mount points)
+     *
+     * @return array List of drivers data
+     * @throws Exception
+     */
+    public function driver_list()
+    {
+        return array();
+        //TODO: Stub. Not implemented.
+    }
+
+    /**
+     * Update configuration of external driver (mount point)
+     *
+     * @param string $title  Driver instance title
+     * @param array  $driver Driver data
+     *
+     * @throws Exception
+     */
+    public function driver_update($title, $driver)
+    {
+        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * Returns metadata of the driver
+     *
+     * @return array Driver meta data (image, name, form)
+     */
+    public function driver_metadata()
+    {
+        $image_content = file_get_contents(__DIR__ . '/webdav.png');
+
+        $metadata = array(
+            'image' => 'data:image/png;base64,' . base64_encode($image_content),
+            'name'  => 'WebDAV',
+            'ref'   => 'http://www.webdav.org/',
+            'description' => 'WebDAV client',
+            'form'  => array(
+                'baseuri'  => 'baseuri',
+                'username' => 'username',
+                'password' => 'password',
+            ),
+        );
+
+        // these are returned when authentication on folders list fails
+        if ($this->config['username']) {
+            $metadata['form_values'] = array(
+                'baseuri'  => $this->config['baseuri'],
+                'username' => $this->config['username'],
+            );
+        }
+
+        return $metadata;
+    }
+
+    /**
+     * Validate metadata (config) of the driver
+     *
+     * @param array $metadata Driver metadata
+     *
+     * @return array Driver meta data to be stored in configuration
+     * @throws Exception
+     */
+    public function driver_validate($metadata)
+    {
+        if (!is_string($metadata['username']) || !strlen($metadata['username'])) {
+            throw new Exception("Missing user name.", file_storage::ERROR);
+        }
+
+        if (!is_string($metadata['password']) || !strlen($metadata['password'])) {
+            throw new Exception("Missing user password.", file_storage::ERROR);
+        }
+
+        if (!is_string($metadata['baseuri']) || !strlen($metadata['baseuri'])) {
+            throw new Exception("Missing base URL.", file_storage::ERROR);
+        }
+
+        // Ensure baseUri ends with a slash
+        $base_uri = $metadata['baseuri'];
+        if (substr($base_uri, -1) != '/') {
+            $base_uri .= '/';
+        }
+
+        $this->config['baseuri'] = $base_uri;
+
+        if (!$this->authenticate($metadata['username'], $metadata['password'])) {
+            throw new Exception("Unable to authenticate user", file_storage::ERROR_NOAUTH);
+        }
+
+        return array(
+            'host'     => $base_uri,
+            'port'     => 0,
+            'username' => $metadata['username'],
+            'password' => $metadata['password'],
+        );
+    }
+
+    /**
+     * Create a file.
+     *
+     * @param string $file_name Name of a file (with folder path)
+     * @param array  $file      File data (path, type)
+     *
+     * @throws Exception
+     */
+    public function file_create($file_name, $file)
+    {
+        $this->init();
+
+        if ($file['path']) {
+            $data = fopen($file['path'], 'r');
+        }
+        else {
+            // Resource or data
+            $data = $file['content'];
+        }
+
+        if (is_resource($data)) {
+            // Need to tell Curl the attachments size, so it properly
+            // sets Content-Length header, that is required in PUT
+            // request by some webdav servers (#2978)
+            $stat = fstat($data);
+            $this->client->addCurlSetting(CURLOPT_INFILESIZE, $stat['size']);
+        }
+
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request('PUT', $file_name, $data);
+
+        if ($file['path']) {
+            fclose($data);
+        }
+
+        if ($response['statusCode'] != 201) {
+            throw new Exception("Storage error. " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Update a file.
+     *
+     * @param string $file_name Name of a file (with folder path)
+     * @param array  $file      File data (path, type)
+     *
+     * @throws Exception
+     */
+    public function file_update($file_name, $file)
+    {
+        $this->init();
+
+        if ($file['path']) {
+            $data = fopen($file['path'], 'r');
+        }
+        else {
+            //Resource or data
+            $data = $file['content'];
+        }
+
+        if (is_resource($data)) {
+            // Need to tell Curl the attachment size, so it properly
+            // sets Content-Length header, that is required in PUT
+            // request by some webdav servers (#2978)
+            $stat = fstat($data);
+            $this->client->addCurlSetting(CURLOPT_INFILESIZE, $stat['size']);
+        }
+
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request('PUT', $file_name, $data);
+
+        if ($file['path']) {
+            fclose($data);
+        }
+
+        if ($response['statusCode'] != 204) {
+            throw new Exception("Storage error. " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Delete a file.
+     *
+     * @param string $file_name Name of a file (with folder path)
+     *
+     * @throws Exception
+     */
+    public function file_delete($file_name)
+    {
+        $this->init();
+
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request('DELETE', $file_name);
+
+        if ($response['statusCode'] != 204) {
+            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Return file body.
+     *
+     * @param string   $file_name Name of a file (with folder path)
+     * @param array    $params    Parameters (force-download)
+     * @param resource $fp        Print to file pointer instead (send no headers)
+     *
+     * @throws Exception
+     */
+    public function file_get($file_name, $params = array(), $fp = null)
+    {
+        $this->init();
+
+        // @TODO: Write directly to $fp
+
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request($params['head'] ? 'HEAD' : 'GET', $file_name);
+
+        if ($response['statusCode'] != 200) {
+            throw new Exception("Storage error. File not found.", file_storage::ERROR);
+        }
+
+        // Sometimes Content-Length is an array here (T3757)
+        $size = $response['headers']['content-length'];
+        if (is_array($size)) {
+            $size = $size[0];
+        }
+
+        // write to file pointer, send no headers
+        if ($fp) {
+            if ($size) {
+                fwrite($fp, $response['body']);
+            }
+            return;
+        }
+
+        if (!empty($params['force-download'])) {
+            $disposition = 'attachment';
+            header("Content-Type: application/octet-stream");
+// @TODO
+//            if ($browser->ie)
+//                header("Content-Type: application/force-download");
+        }
+        else {
+            $mimetype = file_utils::real_mimetype($params['force-type'] ? $params['force-type'] : $response['headers']['content-type']);
+            $disposition = 'inline';
+
+            header("Content-Transfer-Encoding: binary");
+            header("Content-Type: $mimetype");
+        }
+
+        $filename = addcslashes(end(explode('/', $file_name)), '"');
+
+        // Workaround for nasty IE bug (#1488844)
+        // If Content-Disposition header contains string "attachment" e.g. in filename
+        // IE handles data as attachment not inline
+/*
+@TODO
+        if ($disposition == 'inline' && $browser->ie && $browser->ver < 9) {
+            $filename = str_ireplace('attachment', 'attach', $filename);
+        }
+*/
+        header("Content-Length: " . $size);
+        header("Content-Disposition: $disposition; filename=\"$filename\"");
+
+        if ($size && empty($params['head'])) {
+            echo $response['body'];
+        }
+    }
+
+    /**
+     * Returns file metadata.
+     *
+     * @param string $file_name Name of a file (with folder path)
+     *
+     * @throws Exception
+     */
+    public function file_info($file_name)
+    {
+        $this->init();
+
+        try {
+            $props = $this->client->propfind($this->encode_path($file_name), array(
+                    '{DAV:}resourcetype',
+                    '{DAV:}getcontentlength',
+                    '{DAV:}getcontenttype',
+                    '{DAV:}getlastmodified',
+                    '{DAV:}creationdate'
+                ), 0);
+        }
+        catch (Exception $e) {
+            throw new Exception("Storage error. File not found.", file_storage::ERROR);
+        }
+
+        $mtime = new DateTime($props['{DAV:}getlastmodified']);
+        $ctime = new DateTime($props['{DAV:}creationdate']);
+
+        return array (
+            'name'     => end(explode('/', $file_name)),
+            'size'     => (int) $props['{DAV:}getcontentlength'],
+            'type'     => (string) $props['{DAV:}getcontenttype'],
+            'mtime'    => file_utils::date_format($mtime, $this->config['date_format'], $this->config['timezone']),
+            'ctime'    => file_utils::date_format($ctime, $this->config['date_format'], $this->config['timezone']),
+            'modified' => $mtime ? $mtime->format('U') : 0,
+            'created'  => $ctime ? $ctime->format('U') : 0,
+        );
+    }
+
+    /**
+     * List files in a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     * @param array  $params      List parameters ('sort', 'reverse', 'search', 'prefix')
+     *
+     * @return array List of files (file properties array indexed by filename)
+     * @throws Exception
+     */
+    public function file_list($folder_name, $params = array())
+    {
+        $this->init();
+
+        if (!empty($params['search'])) {
+            foreach ($params['search'] as $idx => $value) {
+                switch ($idx) {
+                case 'name':
+                    $params['search']['name'] = mb_strtoupper($value);
+                    break;
+
+                case 'class':
+                    $params['search']['class'] = file_utils::class2mimetypes($params['search']['class']);
+                    break;
+                }
+            }
+        }
+
+        try {
+            $items = $this->client->propfind($this->encode_path($folder_name), array(
+                    '{DAV:}resourcetype',
+                    '{DAV:}getcontentlength',
+                    '{DAV:}getcontenttype',
+                    '{DAV:}getlastmodified',
+                    '{DAV:}creationdate'
+                ), 1);
+        }
+        catch (Exception $e) {
+            throw new Exception("Storage error. Folder not found.", file_storage::ERROR);
+        }
+
+        $result = array();
+
+        foreach ($items as $file => $props) {
+            // Skip directories
+            $is_dir = !empty($props['{DAV:}resourcetype']) && count($props['{DAV:}resourcetype']->getValue()) > 0;
+            if ($is_dir) {
+                continue;
+            }
+
+            $mtime = new DateTime($props['{DAV:}getlastmodified']);
+            $ctime = new DateTime($props['{DAV:}creationdate']);
+            $ctype = (string) $props['{DAV:}getcontenttype'];
+
+            $path  = $this->get_full_url($file);
+            $path  = $this->decode_path($path);
+            $fname = end(explode('/', $path));
+
+            if (!empty($params['search'])) {
+                foreach ($params['search'] as $idx => $value) {
+                    switch ($idx) {
+                    case 'name':
+                        if (stripos(mb_strtoupper($fname), $value) === false) {
+                            continue 3; // skip the file
+                        }
+                        break;
+
+                    case 'class':
+                        foreach ($value as $type) {
+                            if (stripos($ctype, $type) !== false) {
+                                continue 3;
+                            }
+                        }
+                        continue 3; // skip the file
+                        break;
+                    }
+                }
+            }
+
+            $result[$path] = array(
+                'name'     => $fname,
+                'size'     => (int) $props['{DAV:}getcontentlength'],
+                'type'     => $ctype,
+                'mtime'    => file_utils::date_format($mtime, $this->config['date_format'], $this->config['timezone']),
+                'ctime'    => file_utils::date_format($ctime, $this->config['date_format'], $this->config['timezone']),
+                'modified' => $mtime ? $mtime->format('U') : 0,
+                'created'  => $ctime ? $ctime->format('U') : 0,
+            );
+        }
+
+        // @TODO: pagination
+
+        // Sorting
+        $sort  = !empty($params['sort']) ? $params['sort'] : 'name';
+        $index = array();
+
+        if ($sort == 'mtime') {
+            $sort = 'modified';
+        }
+
+        if (in_array($sort, array('name', 'size', 'modified'))) {
+            foreach ($result as $key => $val) {
+                $index[$key] = $val[$sort];
+            }
+            array_multisort($index, SORT_ASC, SORT_NUMERIC, $result);
+        }
+
+        if ($params['reverse']) {
+            $result = array_reverse($result, true);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Copy a file.
+     *
+     * @param string $file_name Name of a file (with folder path)
+     * @param string $new_name  New name of a file (with folder path)
+     *
+     * @throws Exception
+     */
+    public function file_copy($file_name, $new_name)
+    {
+        $this->init();
+
+        $request   =  array('Destination' => $this->config['baseuri'] . '/' . rawurlencode($new_name));
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request('COPY', $file_name, null, $request);
+
+        if ($response['statusCode'] != 201) {
+            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Move (or rename) a file.
+     *
+     * @param string $file_name Name of a file (with folder path)
+     * @param string $new_name  New name of a file (with folder path)
+     *
+     * @throws Exception
+     */
+    public function file_move($file_name, $new_name)
+    {
+        $this->init();
+
+        $request   = array('Destination' => $this->config['baseuri'] . '/' . rawurlencode($new_name));
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request('MOVE', $file_name, null, $request);
+
+        if ($response['statusCode'] != 201) {
+            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Create a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception on error
+     */
+    public function folder_create($folder_name)
+    {
+        $this->init();
+
+        $folder_name = $this->encode_path($folder_name);
+        $response    = $this->client->request('MKCOL', $folder_name);
+
+        if ($response['statusCode'] != 201) {
+            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Delete a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception on error
+     */
+    public function folder_delete($folder_name)
+    {
+        $this->init();
+
+        $folder_name = $this->encode_path($folder_name);
+        $response    = $this->client->request('DELETE', $folder_name);
+
+        if ($response['statusCode'] != 204) {
+            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Move/Rename a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     * @param string $new_name    New name of a folder with full path
+     *
+     * @throws Exception on error
+     */
+    public function folder_move($folder_name, $new_name)
+    {
+        $this->init();
+
+        $request     = array('Destination' => $this->config['baseuri'] . '/' . rawurlencode($new_name));
+        $folder_name = $this->encode_path($folder_name);
+        $response    = $this->client->request('MOVE', $folder_name, null, $request);
+
+        if ($response['statusCode'] != 201) {
+            throw new Exception("Storage error: " . $response['body'], file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Subscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_subscribe($folder_name)
+    {
+        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * Unsubscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_unsubscribe($folder_name)
+    {
+        throw new Exception("Not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * Returns list of folders.
+     *
+     * @param array $params List parameters ('type', 'search', path, level)
+     *
+     * @return array List of folders
+     * @throws Exception
+     */
+    public function folder_list($params = array())
+    {
+        $this->init();
+
+        if (empty($params['level'])) {
+            $params['level'] = 100;
+        }
+
+        $result = $this->folders_tree($params);
+
+        // ensure sorted folders
+        usort($result, array('file_utils', 'sort_folder_comparator'));
+
+        // In extended format we return array of arrays
+        if (!empty($params['extended'])) {
+            foreach ($result as $idx => $folder) {
+                $item = array('folder' => $folder);
+                $result[$idx] = $item;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Check folder rights.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @return int Folder rights (sum of file_storage::ACL_*)
+     */
+    public function folder_rights($folder_name)
+    {
+        // @TODO
+        return file_storage::ACL_READ | file_storage::ACL_WRITE;
+    }
+
+    /**
+     * Returns a list of locks
+     *
+     * This method should return all the locks for a particular URI, including
+     * locks that might be set on a parent URI.
+     *
+     * If child_locks is set to true, this method should also look for
+     * any locks in the subtree of the URI for locks.
+     *
+     * @param string $path        File/folder path
+     * @param bool   $child_locks Enables subtree checks
+     *
+     * @return array List of locks
+     * @throws Exception
+     */
+    public function lock_list($path, $child_locks = false)
+    {
+        $this->init_lock_db();
+
+        // convert path into global URI
+        $uri = $this->path2uri($path);
+
+        // get locks list
+        $list = $this->lock_db->lock_list($uri, $child_locks);
+
+        // convert back global URIs into paths
+        foreach ($list as $idx => $lock) {
+            $list[$idx]['uri'] = $this->uri2path($lock['uri']);
+        }
+
+        return $list;
+    }
+
+    /**
+     * Locks a URI
+     *
+     * @param string $path File/folder path
+     * @param array  $lock Lock data
+     *                     - depth: 0/'infinite'
+     *                     - scope: 'shared'/'exclusive'
+     *                     - owner: string
+     *                     - token: string
+     *                     - timeout: int
+     *
+     * @throws Exception
+     */
+    public function lock($path, $lock)
+    {
+        $this->init_lock_db();
+
+        // convert path into global URI
+        $uri = $this->path2uri($path);
+
+        if (!$this->lock_db->lock($uri, $lock)) {
+            throw new Exception("Database error. Unable to create a lock.", file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Removes a lock from a URI
+     *
+     * @param string $path File/folder path
+     * @param array  $lock Lock data
+     *
+     * @throws Exception
+     */
+    public function unlock($path, $lock)
+    {
+        $this->init_lock_db();
+
+        // convert path into global URI
+        $uri = $this->path2uri($path);
+
+        if (!$this->lock_db->unlock($uri, $lock)) {
+            throw new Exception("Database error. Unable to remove a lock.", file_storage::ERROR);
+        }
+    }
+
+    /**
+     * Return disk quota information for specified folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @return array Quota
+     * @throws Exception
+     */
+    public function quota($folder)
+    {
+        $this->init();
+
+        $props = $this->client->propfind($this->encode_path($folder), array(
+            '{DAV:}quota-available-bytes',
+            '{DAV:}quota-used-bytes',
+        ), 0);
+
+        $used      = $props['{DAV:}quota-used-bytes'];
+        $available = $props['{DAV:}quota-available-bytes'];
+
+        return array(
+            // expected values in kB
+            'total' => ($used + $available) / 1024,
+            'used'  => $used / 1024,
+        );
+    }
+
+    /**
+     * Sharing interface
+     *
+     * @param string $folder_name Name of a folder with full path
+     * @param int    $mode        Sharing action mode
+     * @param array  $args        POST/GET parameters
+     *
+     * @return mixed Sharing response
+     * @throws Exception
+     */
+    public function sharing($folder, $mode, $args = array())
+    {
+        // TODO
+        throw new Exception("Search not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * User/group search (autocompletion)
+     *
+     * @param string $search Search string
+     * @param int    $mode   Search mode
+     *
+     * @return array Users/Groups list
+     * @throws Exception
+     */
+    public function autocomplete($search, $mode)
+    {
+        // TODO
+        throw new Exception("Search not implemented", file_storage::ERROR_UNSUPPORTED);
+    }
+
+    /**
+     * Convert file/folder path into a global URI.
+     *
+     * @param string $path File/folder path
+     *
+     * @return string URI
+     * @throws Exception
+     */
+    public function path2uri($path)
+    {
+        $base = preg_replace('|^[a-zA-Z]+://|', '', $this->config['baseuri']);
+
+        return 'webdav://' . rawurlencode($this->config['username']) . '@' . $base
+            . '/' . file_utils::encode_path($path);
+    }
+
+    /**
+     * Convert global URI into file/folder path.
+     *
+     * @param string $uri URI
+     *
+     * @return string File/folder path
+     * @throws Exception
+     */
+    public function uri2path($uri)
+    {
+        if (!preg_match('|^webdav://([^@]+)@(.*)$|', $uri, $matches)) {
+            throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
+        }
+
+        $user = rawurldecode($matches[1]);
+        $base = preg_replace('|^[a-zA-Z]+://|', '', $this->config['baseuri']);
+        $uri  = $matches[2];
+
+        if ($user != $this->config['username'] || strpos($uri, $base) !== 0) {
+            throw new Exception("Internal storage error. Unresolvable URI.", file_storage::ERROR);
+        }
+
+        $uri = substr($matches[2], strlen($base) + 1);
+
+        return file_utils::decode_path($uri);
+    }
+
+    /**
+     * Gets the relative URL of a resource
+     *
+     * @param string $url WebDAV URL
+     * @return string Path relative to root (title/.)
+     */
+    protected function get_relative_url($url)
+    {
+        $url = $this->client->getAbsoluteUrl($url);
+
+        return trim(str_replace($this->config['baseuri'], '', $url), '/');
+    }
+
+    /**
+     * Gets the full URL of a resource
+     *
+     * @param string $url WebDAV URL
+     * @return string Path relative to chwala root
+     */
+    protected function get_full_url($url)
+    {
+        if (!empty($this->title)) {
+            return $this->title . '/' . $this->get_relative_url($url);
+        }
+
+        return $this->get_relative_url($url);
+    }
+
+    /**
+     * Encode folder/file names in the path
+     * so it can be used as URL
+     *
+     * @param string $path File/folder path
+     *
+     * @return string Encoded URL
+     */
+    protected function encode_path($path)
+    {
+        $path = explode('/', $path);
+        $path = array_map('rawurlencode', $path);
+
+        return implode('/', $path);
+    }
+
+    /**
+     * Decode folder/file URL path
+     *
+     * @param string $path File/folder path
+     *
+     * @return string Decoded path
+     */
+    protected function decode_path($path)
+    {
+        $path = explode('/', $path);
+        $path = array_map('rawurldecode', $path);
+
+        return implode('/', $path);
+    }
+
+    /**
+     * Recursive method to fetch folders tree
+     */
+    protected function folders_tree($params)
+    {
+        $folders = array();
+        $root    = '';
+
+        if (is_string($params['path']) && strlen($params['path'])) {
+            $root = trim($params['path'], '/');
+        }
+
+        try {
+            $props = array('{DAV:}resourcetype');
+            $items = $this->client->propfind($root, $props, '1,noroot');
+        }
+        catch (Exception $e) {
+            throw new Exception("User credentials not provided", file_storage::ERROR_NOAUTH);
+        }
+
+        foreach ($items as $file => $props) {
+            // Skip files
+            $is_dir = !empty($props['{DAV:}resourcetype']) && count($props['{DAV:}resourcetype']->getValue()) > 0;
+            if (!$is_dir) {
+                continue;
+            }
+
+            $path = $this->get_relative_url($file);
+            $path = $this->decode_path($path);
+
+            // 'noroot' not always works
+            if ($path === $root) {
+                continue;
+            }
+
+            $folders[] = $path;
+
+            $params['level'] -= 1;
+
+            // Many servers just do not support 'Depth: infinity' for security reasons
+            // E.g. SabreDAV has this optional and disabled by default
+
+            if ($params['level'] > 0) {
+                $params['path'] = $path;
+                $tree = $this->folders_tree($params);
+                if (!empty($tree)) {
+                    $folders = array_merge($folders, $tree);
+                }
+            }
+        }
+
+        return $folders;
+    }
+
+    /**
+     * Initializes file_locks object
+     */
+    protected function init_lock_db()
+    {
+        if (!$this->lock_db) {
+            $this->lock_db = new file_locks;
+        }
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/file_api.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_api.php Changed

@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------------+
  | This file is part of the Kolab File API                                  |
  |                                                                          |
- | Copyright (C) 2012-2013, Kolab Systems AG                                |
+ | Copyright (C) 2012-2015, Kolab Systems AG                                |
  |                                                                          |
  | 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 |
@@ -25,25 +25,31 @@
 class file_api extends file_api_core
 {
     public $session;
+    public $config;
+    public $browser;
     public $output_type = file_api_core::OUTPUT_JSON;
 
-    private $conf;
-    private $browser;
 
+    /**
+     * Class factory.
+     */
+    public static function factory()
+    {
+        $class = 'file_api' . (!empty($_GET['wopi']) ? '_wopi' : '');
+
+        return new $class;
+    }
 
+    /**
+     * Class constructor.
+     */
     public function __construct()
     {
         $rcube = rcube::get_instance();
-        $rcube->add_shutdown_function(array($this, 'shutdown'));
+        register_shutdown_function(array($this, 'shutdown'));
 
-        $this->conf = $rcube->config;
+        $this->config = $rcube->config;
         $this->session_init();
-
-        if ($_SESSION['config']) {
-            $this->config = $_SESSION['config'];
-        }
-
-        $this->locale_init();
     }
 
     /**
@@ -54,30 +60,37 @@
         $this->request = strtolower($_GET['method']);
 
         // Check the session, authenticate the user
-        if (!$this->session_validate()) {
+        if (!$this->session_validate($this->request == 'authenticate', $_REQUEST['token'])) {
             $this->session->destroy(session_id());
+            $this->session->regenerate_id(false);
 
-            if ($this->request == 'authenticate') {
-                $this->session->regenerate_id(false);
+            if ($username = $this->authenticate()) {
+                // Init locale after the session started
+                $this->locale_init();
+                $this->env['language'] = $this->language;
 
-                if ($username = $this->authenticate()) {
-                    $_SESSION['user']   = $username;
-                    $_SESSION['time']   = time();
-                    $_SESSION['config'] = $this->config;
+                $_SESSION['user'] = $username;
+                $_SESSION['env']  = $this->env;
 
-                    // remember client API version
-                    if (is_numeric($_GET['version'])) {
-                        $_SESSION['version'] = $_GET['version'];
-                    }
+                // remember client API version
+                if (is_numeric($_GET['version'])) {
+                    $_SESSION['version'] = $_GET['version'];
+                }
 
+                if ($this->request == 'authenticate') {
                     $this->output_success(array(
                         'token'        => session_id(),
                         'capabilities' => $this->capabilities(),
                     ));
                 }
             }
-
-            throw new Exception("Invalid session", 403);
+            else {
+                throw new Exception("Invalid session", file_api_core::ERROR_UNAUTHORIZED);
+            }
+        }
+        else {
+            // Init locale after the session started
+            $this->locale_init();
         }
 
         // Call service method
@@ -91,28 +104,35 @@
     /**
      * Session validation check and session start
      */
-    private function session_validate()
+    protected function session_validate($new_session = false, $token = null)
     {
-        $sess_id = rcube_utils::request_header('X-Session-Token') ?: $_REQUEST['token'];
+        if (!$new_session) {
+            $sess_id = rcube_utils::request_header('X-Session-Token') ?: $token;
+        }
 
         if (empty($sess_id)) {
-            session_start();
+            $this->session->start();
             return false;
         }
 
         session_id($sess_id);
-        session_start();
+        $this->session->start();
 
         if (empty($_SESSION['user'])) {
             return false;
         }
 
-        $timeout = $this->conf->get('session_lifetime', 0) * 60;
-        if ($timeout && $_SESSION['time'] && $_SESSION['time'] < time() - $timeout) {
-            return false;
+        // Single-document session?
+        if (!($this instanceof file_api_wopi)
+            && ($doc_id = $_SESSION['document_session'])
+            && (strpos($this->request, 'document') !== 0 || $doc_id != $_GET['id'])
+        ) {
+            throw new Exception("Access denied", file_api_core::ERROR_UNAUTHORIZED);
+        }
+
+        if ($_SESSION['env']) {
+            $this->env = $_SESSION['env'];
         }
-        // update session time
-        $_SESSION['time'] = time();
 
         return true;
     }
@@ -120,11 +140,11 @@
     /**
      * Initializes session
      */
-    private function session_init()
+    protected function session_init()
     {
         $rcube     = rcube::get_instance();
-        $sess_name = $this->conf->get('session_name');
-        $lifetime  = $this->conf->get('session_lifetime', 0) * 60;
+        $sess_name = $this->config->get('session_name');
+        $lifetime  = $this->config->get('session_lifetime', 0) * 60;
 
         if ($lifetime) {
             ini_set('session.gc_maxlifetime', $lifetime * 2);
@@ -134,14 +154,19 @@
         ini_set('session.use_cookies', 0);
         ini_set('session.serialize_handler', 'php');
 
-        // use database for storing session data
-        $this->session = new rcube_session($rcube->get_dbh(), $this->conf);
+        // Roundcube Framework >= 1.2
+        if (in_array('factory', get_class_methods('rcube_session'))) {
+            $this->session = rcube_session::factory($this->config);
+        }
+        // Rouncube Framework < 1.2
+        else {
+            $this->session = new rcube_session($rcube->get_dbh(), $this->config);
+            $this->session->set_secret($this->config->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
+            $this->session->set_ip_check($this->config->get('ip_check'));
+        }
 
         $this->session->register_gc_handler(array($rcube, 'gc'));
 
-        $this->session->set_secret($this->conf->get('des_key') . dirname($_SERVER['SCRIPT_NAME']));
-        $this->session->set_ip_check($this->conf->get('ip_check'));
-
         // this is needed to correctly close session in shutdown function
         $rcube->session = $this->session;
     }
@@ -152,13 +177,29 @@
     public function shutdown()
     {
         // write performance stats to logs/console
-        if ($this->conf->get('devel_mode')) {
-            if (function_exists('memory_get_peak_usage'))
-                $mem = memory_get_peak_usage();
-            else if (function_exists('memory_get_usage'))
-                $mem = memory_get_usage();
+        if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) {
+            // we have to disable per_user_logging to make sure stats end up in the main console log
+            $this->config->set('per_user_logging', false);
+
+            // make sure logged numbers use unified format
+            setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C');
+
+            if (function_exists('memory_get_usage')) {
+                $mem = round(memory_get_usage() / 1024 /1024, 1);
+            }
+            if (function_exists('memory_get_peak_usage')) {
+                $mem .= '/'. round(memory_get_peak_usage() / 1024 / 1024, 1);
+            }
+
+            $path    = !empty($this->path) ? '/' . implode($this->path, '/') : '';
+            $request = ($this instanceof file_api_wopi ? 'wopi/' : '') . $this->request;
+
+            if ($path !== '' && substr_compare($this->request, $path, -1 * strlen($path), strlen($path), true) != 0) {
+                $request .= $path;
+            }
+
+            $log = sprintf('%s: %s [%s]', $this->method ?: $_SERVER['REQUEST_METHOD'], trim($request) ?: '/', $mem);
 
-            $log = trim($this->request . ($mem ? sprintf(' [%.1f MB]', $mem/1024/1024) : ''));
             if (defined('FILE_API_START')) {
                 rcube::print_timer(FILE_API_START, $log);
             }
@@ -171,7 +212,7 @@
     /**
      * Authentication request handler (HTTP Auth)
      */
-    private function authenticate()
+    protected function authenticate()
     {
         if (isset($_POST['username'])) {
             $username = $_POST['username'];
@@ -183,37 +224,44 @@
         }
         // when used with (f)cgi no PHP_AUTH* variables are available without defining a special rewrite rule
         else if (!isset($_SERVER['PHP_AUTH_USER'])) {
-            // "Basic didhfiefdhfu4fjfjdsa34drsdfterrde..."
-            if (isset($_SERVER["REMOTE_USER"])) {
-                $basicAuthData = base64_decode(substr($_SERVER["REMOTE_USER"], 6));
-            }
-            else if (isset($_SERVER["REDIRECT_REMOTE_USER"])) {
-                $basicAuthData = base64_decode(substr($_SERVER["REDIRECT_REMOTE_USER"], 6));
-            }
-            else if (isset($_SERVER["Authorization"])) {
-                $basicAuthData = base64_decode(substr($_SERVER["Authorization"], 6));
-            }
-            else if (isset($_SERVER["HTTP_AUTHORIZATION"])) {
-                $basicAuthData = base64_decode(substr($_SERVER["HTTP_AUTHORIZATION"], 6));
-            }
+            $tokens = array(
+                $_SERVER['REMOTE_USER'],
+                $_SERVER['REDIRECT_REMOTE_USER'],
+                $_SERVER['HTTP_AUTHORIZATION'],
+                rcube_utils::request_header('Authorization'),
+            );
 
-            if (isset($basicAuthData) && !empty($basicAuthData)) {
-                list($username, $password) = explode(":", $basicAuthData);
+            foreach ($tokens as $token) {
+                if (!empty($token)) {
+                    if (stripos($token, 'Basic ') === 0) {
+                        $basicAuthData = base64_decode(substr($token, 6));
+                        list($username, $password) = explode(':', $basicAuthData, 2);
+                        if ($username) {
+                            break;
+                        }
+                    }
+                    else if (stripos($token, 'Bearer ') === 0) {
+                        $username = base64_decode(substr($token, 7));
+                        if ($username) {
+                            break;
+                        }
+                    }
+                }
             }
         }
 
         if (!empty($username)) {
             $backend = $this->get_backend();
             $result  = $backend->authenticate($username, $password);
-        }
 
-        if (empty($result)) {
+            if (empty($result)) {
 /*
-            header('WWW-Authenticate: Basic realm="' . $this->app_name .'"');
-            header('HTTP/1.1 401 Unauthorized');
-            exit;
+                header('WWW-Authenticate: Basic realm="' . $this->app_name .'"');
+                header('HTTP/1.1 401 Unauthorized');
+                exit;
 */
-            throw new Exception("Invalid password or username", file_api_core::ERROR_CODE);
+                throw new Exception("Invalid password or username", file_api_core::ERROR_UNAUTHORIZED);
+            }
         }
 
         return $username;
@@ -222,7 +270,7 @@
     /**
      * Storage/System method handler
      */
-    private function request_handler($request)
+    protected function request_handler($request)
     {
         // handle "global" requests that don't require api driver
         switch ($request) {
@@ -234,14 +282,14 @@
                 return array();
 
             case 'configure':
-                foreach (array_keys($this->config) as $name) {
+                foreach (array_keys($this->env) as $name) {
                     if (isset($_GET[$name])) {
-                        $this->config[$name] = $_GET[$name];
+                        $this->env[$name] = $_GET[$name];
                     }
                 }
-                $_SESSION['config'] = $this->config;
+                $_SESSION['env'] = $this->env;
 
-                return $this->config;
+                return $this->env;
 
             case 'upload_progress':
                 return $this->upload_progress();
@@ -255,13 +303,18 @@
 
         // handle request
         if ($request && preg_match('/^[a-z0-9_-]+$/', $request)) {
-            // request name aliases for backward compatibility
             $aliases = array(
+                // request name aliases for backward compatibility
                 'lock'          => 'lock_create',
                 'unlock'        => 'lock_delete',
                 'folder_rename' => 'folder_move',
             );
 
+            // Redirect all document_* actions into 'document' action
+            if (preg_match('/^(sessions|invitations|document_[a-z]+)$/', $request)) {
+                $request = 'document';
+            }
+
             $request = $aliases[$request] ?: $request;
 
             require_once __DIR__ . "/api/common.php";
@@ -290,7 +343,7 @@
             if (!empty($status)) {
                 $status['percent'] = round($status['current']/$status['total']*100);
                 if ($status['percent'] < 100) {
-                    $diff = time() - intval($status['start_time']);
+                    $diff = max(1, time() - intval($status['start_time']));
                     // calculate time to end of uploading (in seconds)
                     $status['eta'] = intval($diff * (100 - $status['percent']) / $status['percent']);
                     // average speed (bytes per second)
@@ -315,12 +368,44 @@
      */
     public function file_url($file)
     {
-        return file_utils::script_uri(). '?method=file_get'
+        return $this->api_url() . '?method=file_get'
             . '&file=' . urlencode($file)
             . '&token=' . urlencode(session_id());
     }
 
     /**
+     * Returns API URL
+     *
+     * @return string API URL
+     */
+    public function api_url()
+    {
+        $api_url = $this->config->get('file_api_url', '');
+
+        if (!preg_match('|^https?://|', $api_url)) {
+            $schema = rcube_utils::https_check() ? 'https' : 'http';
+            $port   = $schema == 'http' ? 80 : 443;
+            $url    = $schema . '://' . preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']);
+
+            if ($_SERVER['SERVER_PORT'] != $port && $_SERVER['SERVER_PORT'] != 80) {
+                $url .= ':' . $_SERVER['SERVER_PORT'];
+            }
+
+            if ($api_url) {
+                $api_url = $url . '/' . trim($api_url, '/ ');
+            }
+            else {
+                $url .= preg_replace('/\/?\?.*$/', '', $_SERVER['REQUEST_URI']);
+                $url = preg_replace('/\/api$/', '', $url);
+
+                $api_url = $url . '/api';
+            }
+        }
+
+        return rtrim($api_url, '/ ');
+    }
+
+    /**
      * Returns web browser object
      *
      * @return rcube_browser Web browser object
@@ -374,12 +459,22 @@
 
         if (!empty($_REQUEST['req_id'])) {
             $response['req_id'] = $_REQUEST['req_id'];
+            header("X-Chwala-Request-ID: " . $_REQUEST['req_id']);
         }
 
         if (empty($response['code'])) {
             $response['code'] = file_api_core::ERROR_CODE;
         }
 
+        header("X-Chwala-Error: " . $response['code']);
+
+        // When binary response is expected return real
+        // HTTP error instaead of JSON response with code 200
+        if ($this->is_binary_request()) {
+            header(sprintf("HTTP/1.0 %d %s", $response['code'], $response ?: "Server error"));
+            exit;
+        }
+
         $this->output_send($response);
     }
 
@@ -388,15 +483,27 @@
      *
      * @param mixed $data Data
      */
-    protected function output_send($data)
+    public function output_send($data = null)
     {
         // Send response
-        header("Content-Type: {$this->output_type}; charset=utf-8");
-        echo json_encode($data);
+        if ($data !== null) {
+            header("Content-Type: {$this->output_type}; charset=utf-8");
+            echo rcube_output::json_serialize($data);
+        }
+
         exit;
     }
 
     /**
+     * Find out if current request expects binary output
+     */
+    protected function is_binary_request()
+    {
+        return $_SERVER['REQUEST_METHOD'] == 'GET' &&
+            ($this->request == 'file_get' || $this->request == 'document');
+    }
+
+    /**
      * Returns API version supported by the client
      */
     public function client_version()

iRony-0.4.2.tar.gz/lib/FileAPI/file_api_core.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_api_core.php Changed

@@ -24,21 +24,27 @@
 
 class file_api_core extends file_locale
 {
-    const API_VERSION = 2;
+    const API_VERSION = 5;
 
-    const ERROR_CODE    = 500;
-    const ERROR_INVALID = 501;
+    const ERROR_UNAUTHORIZED        = 401;
+    const ERROR_NOT_FOUND           = 404;
+    const ERROR_PRECONDITION_FAILED = 412;
+    const ERROR_CODE                = 500;
+    const ERROR_INVALID             = 501;
+    const ERROR_NOT_IMPLEMENTED     = 501;
 
     const OUTPUT_JSON = 'application/json';
     const OUTPUT_HTML = 'text/html';
 
-    public $config = array(
+    public $env = array(
         'date_format' => 'Y-m-d H:i',
         'language'    => 'en_US',
+        'timezone'    => 'UTC',
     );
 
     protected $app_name = 'Kolab File API';
     protected $drivers  = array();
+    protected $icache   = array();
     protected $backend;
 
     /**
@@ -66,7 +72,7 @@
         $this->backend = $this->load_driver_object($driver);
 
         // configure api
-        $this->backend->configure($this->config);
+        $this->backend->configure($this->env);
 
         return $this->backend;
     }
@@ -74,22 +80,44 @@
     /**
      * Return supported/enabled external storage instances
      *
-     * @param bool $as_objects Return drivers as objects not config data
+     * @param bool  $as_objects     Return drivers as objects not config data
+     * @param array &$admin_drivers List of admin-configured drivers
      *
      * @return array List of storage drivers
      */
-    public function get_drivers($as_objects = false)
+    public function get_drivers($as_objects = false, &$admin_drivers = null)
     {
         $rcube   = rcube::get_instance();
+        $backend = $this->get_backend();
         $enabled = $rcube->config->get('fileapi_drivers');
         $preconf = $rcube->config->get('fileapi_sources');
         $result  = array();
         $all     = array();
+        $iRony   = defined('KOLAB_DAV_ROOT');
+
+        // Disable webdav sources/drivers in iRony that point to the
+        // same host to prevent infinite recursion
+        $is_valid_source = function($source) {
+            if ($source['driver'] == 'webdav') {
+                $self_url = parse_url($_SERVER['SCRIPT_URI']);
+                $item_url = parse_url($source['baseuri'] ?: $source['host']);
+                $hosts    = array($self_url['host'], $_SERVER['SERVER_NAME'], $_SERVER['SERVER_ADDR']);
+
+                if (in_array($item_url['host'], $hosts)) {
+                    return false;
+                }
+            }
+
+            return true;
+        };
 
         if (!empty($enabled)) {
-            $backend = $this->get_backend();
             $drivers = $backend->driver_list();
 
+            if ($iRony) {
+                $drivers = array_filter($drivers, $is_valid_source);
+            }
+
             foreach ($drivers as $item) {
                 $all[] = $item['title'];
 
@@ -99,13 +127,21 @@
             }
         }
 
-        if (empty($result) && !empty($preconf)) {
-            foreach ((array) $preconf as $title => $item) {
+        $admin_drivers = array();
+
+        if (!empty($preconf)) {
+            if ($iRony) {
+                $preconf = array_filter($preconf, $is_valid_source);
+            }
+
+            foreach ($preconf as $title => $item) {
                 if (!in_array($title, $all)) {
                     $item['title'] = $title;
                     $item['admin'] = true;
 
                     $result[] = $as_objects ? $this->get_driver_object($item) : $item;
+
+                    $admin_drivers[] = $title;
                 }
             }
         }
@@ -134,6 +170,11 @@
         }
 
         if (empty($selected)) {
+            $rcube = rcube::get_instance();
+            if ($rcube->config->get('fileapi_backend_storage_disabled')) {
+                throw new Exception("Failed to find a driver for specified folder/file.", self::ERROR_NOT_FOUND);
+            }
+
             return array($this->get_backend(), $path);
         }
 
@@ -167,7 +208,7 @@
             }
 
             // configure api
-            $driver->configure(array_merge($config, $this->config), $key);
+            $driver->configure(array_merge($config, $this->env), $key);
         }
 
         return $this->drivers[$key];
@@ -192,13 +233,15 @@
     /**
      * Returns storage(s) capabilities
      *
+     * @param bool $full Return all drivers' capabilities
+     *
      * @return array Capabilities
      */
-    public function capabilities()
+    public function capabilities($full = true)
     {
         $rcube   = rcube::get_instance();
         $backend = $this->get_backend();
-        $caps    = array();
+        $caps    = array('VERSION' => self::API_VERSION);
 
         // check support for upload progress
         if (($progress_sec = $rcube->config->get('upload_progress'))
@@ -216,6 +259,34 @@
             }
         }
 
+        // Manticore support
+        if ($rcube->config->get('fileapi_manticore')) {
+            $caps['MANTICORE'] = true;
+        }
+
+        // WOPI support
+        if ($rcube->config->get('fileapi_wopi_office')) {
+            $caps['WOPI'] = true;
+        }
+
+        if ($rcube->config->get('fileapi_backend_storage_disabled')) {
+            $caps['NOROOT'] = true;
+        }
+
+        if (!$full) {
+            return $caps;
+        }
+
+        if ($caps['MANTICORE']) {
+            $manticore = new file_manticore($this);
+            $caps['MANTICORE_EDITABLE'] = $manticore->supported_filetypes(true);
+        }
+
+        if ($caps['WOPI']) {
+            $wopi = new file_wopi($this);
+            $caps['WOPI_EDITABLE'] = $wopi->supported_filetypes(true);
+        }
+
         // get capabilities of other drivers
         $drivers = $this->get_drivers(true);
 
@@ -225,7 +296,7 @@
                 foreach ($driver->capabilities() as $name => $value) {
                     // skip disabled capabilities
                     if ($value !== false) {
-                        $caps['roots'][$title][$name] = $value;
+                        $caps['MOUNTPOINTS'][$title][$name] = $value;
                     }
                 }
             }
@@ -235,14 +306,48 @@
     }
 
     /**
+     * Get user name from user identifier (email address) using LDAP lookup
+     *
+     * @param string $email User identifier
+     *
+     * @return string User name
+     */
+    public function resolve_user($email)
+    {
+        $key = "user:$email";
+
+        // make sure Kolab backend is initialized so kolab_storage can be found
+        $this->get_backend();
+
+        // @todo: Move this into drivers
+        if ($this->icache[$key] === null
+            && class_exists('kolab_storage')
+            && ($ldap = kolab_storage::ldap())
+        ) {
+            $user = $ldap->get_user_record($email, $_SESSION['imap_host']);
+
+            $this->icache[$key] = $user ?: false;
+        }
+
+        if ($this->icache[$key]) {
+            return $this->icache[$key]['displayname'] ?: $this->icache[$key]['name'];
+        }
+    }
+
+    /**
      * Return mimetypes list supported by built-in viewers
      *
      * @return array List of mimetypes
      */
     protected function supported_mimetypes()
     {
-        $mimetypes = array();
-        $dir       = __DIR__ . '/viewers';
+        $rcube       = rcube::get_instance();
+        $mimetypes   = array();
+        $mimetypes_c = array();
+        $dir         = __DIR__ . '/viewers';
+
+        // make sure Kolab backend is initialized so kolab_auth can modify config
+        $backend = $this->get_backend();
 
         if ($handle = opendir($dir)) {
             while (false !== ($file = readdir($handle))) {
@@ -251,13 +356,38 @@
                     $class  = 'file_viewer_' . $matches[1];
                     $viewer = new $class($this);
 
-                    $mimetypes = array_merge($mimetypes, $viewer->supported_mimetypes());
+                    if ($supported = $viewer->supported_mimetypes()) {
+                        $mimetypes = array_merge($mimetypes, $supported);
+                    }
                 }
             }
             closedir($handle);
         }
 
-        return $mimetypes;
+        // Here we return mimetypes supported for editing and creation of files
+        // @TODO: maybe move this to viewers
+        if ($rcube->config->get('fileapi_wopi_office')) {
+            $mimetypes_c['application/vnd.oasis.opendocument.text']         = array('ext' => 'odt');
+            $mimetypes_c['application/vnd.oasis.opendocument.presentation'] = array('ext' => 'odp');
+            $mimetypes_c['application/vnd.oasis.opendocument.spreadsheet']  = array('ext' => 'ods');
+        }
+        else if ($rcube->config->get('fileapi_manticore')) {
+            $mimetypes_c['application/vnd.oasis.opendocument.text'] = array('ext' => 'odt');
+        }
+
+        $mimetypes_c['text/plain'] = array('ext' => 'txt');
+        $mimetypes_c['text/html']  = array('ext' => 'html');
+
+        foreach (array_keys($mimetypes_c) as $type) {
+            list ($app, $label) = explode('/', $type);
+            $label = preg_replace('/[^a-z]/', '', $label);
+            $mimetypes_c[$type]['label'] = $this->translate('type.' . $label);
+        }
+
+        return array(
+            'view' => $mimetypes,
+            'edit' => $mimetypes_c,
+        );
     }
 
     /**

iRony-0.4.2.tar.gz/lib/FileAPI/file_api_lib.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_api_lib.php Changed

@@ -36,12 +36,12 @@
 
         switch ($name) {
             case 'configure':
-                foreach (array_keys($this->config) as $name) {
+                foreach (array_keys($this->env) as $name) {
                     if (isset($arguments[0][$name])) {
-                        $this->config[$name] = $arguments[0][$name];
+                        $this->env[$name] = $arguments[0][$name];
                     }
                 }
-                return $this->config;
+                return $this->env;
 
             case 'mimetypes':
                 return $this->supported_mimetypes();
@@ -84,17 +84,29 @@
                 return;
 
             case 'folder_list':
-                // no arguments
-                $args = array();
+                $args = array(
+                    'folder' => $arguments[0],
+                    'level'  => $arguments[1],
+                );
                 break;
 
             case 'folder_create':
+            case 'folder_subscribe':
+            case 'folder_unsubscribe':
             case 'folder_delete':
                 $args = array(
                     'folder' => $arguments[0],
                 );
                 break;
 
+            case 'folder_info':
+                $args = array(
+                    'folder'   => $arguments[0],
+                    'rights'   => 1,
+                    'sessions' => 1,
+                );
+                break;
+
             case 'folder_move':
                 $args = array(
                     'folder' => $arguments[0],
@@ -119,6 +131,7 @@
                 throw new Exception("Invalid method name", \file_storage::ERROR_UNSUPPORTED);
         }
 
+        require_once __DIR__ . "/api/common.php";
         require_once __DIR__ . "/api/$name.php";
 
         $class   = "file_api_$name";
@@ -134,52 +147,3 @@
     {
     }
 }
-
-
-/**
- * Common handler class, from which action handler classes inherit
- */
-class file_api_common
-{
-    protected $api;
-    protected $rc;
-    protected $args;
-
-
-    public function __construct($api, $args)
-    {
-        $this->rc   = rcube::get_instance();
-        $this->api  = $api;
-        $this->args = $args;
-    }
-
-    /**
-     * Request handler
-     */
-    public function handle()
-    {
-        // disable script execution time limit, so we can handle big files
-        @set_time_limit(0);
-    }
-
-    /**
-     * Parse driver metadata information
-     */
-    protected function parse_metadata($metadata, $default = false)
-    {
-        if ($default) {
-            unset($metadata['form']);
-            $metadata['name'] .= ' (' . $this->api->translate('localstorage') . ')';
-        }
-
-        // localize form labels
-        foreach ($metadata['form'] as $key => $val) {
-            $label = $this->api->translate('form.' . $val);
-            if (strpos($label, 'form.') !== 0) {
-                $metadata['form'][$key] = $label;
-            }
-        }
-
-        return $metadata;
-    }
-}

iRony-0.4.3.tar.gz/lib/FileAPI/file_api_wopi.php Added

@@ -0,0 +1,122 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2018, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_api_wopi extends file_api
+{
+    public $output_type = file_api_core::OUTPUT_JSON;
+    public $path        = array();
+    public $args        = array();
+    public $method      = 'GET';
+
+
+    /**
+     * Session validation check and session start
+     */
+    protected function session_validate($new_session = false, $token = null)
+    {
+        if (empty($_GET['access_token'])) {
+            throw new Exception("Token missing", file_api_core::ERROR_UNAUTHORIZED);
+        }
+
+        return parent::session_validate($new_session = false, $_GET['access_token']);
+    }
+
+    /**
+     * Storage/System method handler
+     */
+    protected function request_handler($request)
+    {
+        // header("X-WOPI-HostEndpoint: " . $endpoint_desc);
+        // header("X-WOPI-MachineName: " .  $machine_name);
+        header("X-WOPI-ServerVersion: " . file_api_core::API_VERSION);
+
+        $request = $_GET['method']; // file_api uses strtolower(), we don't want that
+
+        // handle request
+        if ($request && preg_match('/^[a-z]+\/*[a-zA-Z0-9_\/-]*$/', $request)) {
+            $path    = explode('/', $request);
+            $request = array_shift($path);
+            $method  = $_SERVER['REQUEST_METHOD'];
+
+            if ($_method = rcube_utils::request_header('X-WOPI-Override')) {
+                $method = $_method;
+            }
+            else if ($method == 'POST' && !empty($_SERVER['HTTP_X_HTTP_METHOD'])) {
+                $method = $_SERVER['HTTP_X_HTTP_METHOD'];
+            }
+
+            $this->path   = $path;
+            $this->args   = $_GET;
+            $this->method = $method;
+
+            include_once __DIR__ . "/wopi/$request.php";
+
+            $class_name = "file_wopi_$request";
+            if (class_exists($class_name, false)) {
+                $handler = new $class_name($this);
+                return $handler->handle();
+            }
+        }
+
+        throw new Exception("Unknown method", file_api_core::ERROR_NOT_FOUND);
+    }
+
+    /**
+     * Send success response
+     *
+     * @param mixed $data Data
+     */
+    public function output_success($data)
+    {
+        $this->output_send($data);
+    }
+
+    /**
+     * Send error response
+     *
+     * @param mixed $response Response data
+     * @param int   $code     Error code
+     */
+    public function output_error($response, $code = null)
+    {
+        header(sprintf("HTTP/1.0 %d %s", $code ?: file_api_core::ERROR_CODE, $response));
+
+        $this->output_send();
+    }
+
+    /**
+     * Send response
+     *
+     * @param mixed $data Data
+     */
+    public function output_send($data = null)
+    {
+        // Remove NULL data according to WOPI spec.
+        if (is_array($data)) {
+            $data = array_filter($data, function($v) { return $v !== null; });
+        }
+
+        parent::output_send($data);
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/file_document.php Added

@@ -0,0 +1,880 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2016, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Document editing sessions handling
+ */
+class file_document
+{
+    protected $api;
+    protected $rc;
+    protected $user;
+    protected $sessions_table    = 'chwala_sessions';
+    protected $invitations_table = 'chwala_invitations';
+    protected $icache            = array();
+    protected $file_meta_items   = array('type', 'name', 'size', 'modified');
+
+    const STATUS_INVITED        = 'invited';
+    const STATUS_REQUESTED      = 'requested';
+    const STATUS_ACCEPTED       = 'accepted';
+    const STATUS_DECLINED       = 'declined';
+    const STATUS_DECLINED_OWNER = 'declined-owner'; // same as 'declined' but done by the session owner
+    const STATUS_ACCEPTED_OWNER = 'accepted-owner'; // same as 'accepted' but done by the session owner
+
+    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+
+
+    /**
+     * Class constructor
+     *
+     * @param file_api $api Chwala API app instance
+     */
+    public function __construct($api)
+    {
+        $this->rc   = rcube::get_instance();
+        $this->api  = $api;
+        $this->user = $_SESSION['user'];
+
+        $db = $this->rc->get_dbh();
+        $this->sessions_table    = $db->table_name($this->sessions_table);
+        $this->invitations_table = $db->table_name($this->invitations_table);
+    }
+
+    /**
+     * Detect type of file_document class to use for specified session
+     *
+     * @param file_api $api        Chwala API app instance
+     * @param string   $session_id Document session ID
+     *
+     * @return file_document Document object
+     */
+    public static function get_handler($api, $session_id)
+    {
+        // we add "w-" prefix to wopi session identifiers,
+        // so we can distinguish it from manticore sessions
+        if (strpos($session_id, 'w-') === 0) {
+            return new file_wopi($api);
+        }
+
+        return new file_manticore($api);
+    }
+
+    /**
+     * Return viewer URI for specified file/session. This creates
+     * a new collaborative editing session when needed.
+     *
+     * @param string $file        File path
+     * @param array  &$file_info  File metadata (e.g. type)
+     * @param string &$session_id Optional session ID to join to
+     * @param string $readonly    Create readonly (one-time) session
+     *
+     * @return string An URI for specified file/session
+     * @throws Exception
+     */
+    public function session_start($file, &$file_info, &$session_id = null, $readonly = false)
+    {
+        if ($file !== null) {
+            $uri = $this->path2uri($file, $driver);
+        }
+
+        $backend = $this->api->get_backend();
+
+        if ($session_id) {
+            $session = $this->session_info($session_id);
+
+            if (empty($session)) {
+                throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
+            }
+
+            // check session ownership
+            if ($session['owner'] != $this->user) {
+                // check if the user was invited
+                $invitations = $this->invitations_find(array('session_id' => $session_id, 'user' => $this->user));
+                $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
+
+                if (empty($invitations) || !in_array($invitations[0]['status'], $states)) {
+                    throw new Exception("No permission to join the editing session.", file_api_core::ERROR_CODE);
+                }
+
+                // automatically accept the invitation, if not done yet
+                if ($invitations[0]['status'] == self::STATUS_INVITED) {
+                    $this->invitation_update($session_id, $this->user, self::STATUS_ACCEPTED);
+                }
+            }
+
+            $file_info['type'] = $session['type'];
+        }
+        else if (!empty($uri)) {
+            // To prevent from creating new sessions for the same file+user
+            // (e.g. when user uses F5 to refresh the page), we check first
+            // if such a session exist and continue with it
+            $db = $this->rc->get_dbh();
+
+            $res = $db->query("SELECT `id` FROM `{$this->sessions_table}`"
+                . " WHERE `owner` = ? AND `uri` = ? AND `readonly` = ?",
+                $this->user, $uri, intval($readonly));
+
+            if ($row = $db->fetch_assoc($res)) {
+                $session_id = $row['id'];
+                $res = true;
+            }
+            else if (!$db->is_error($res)) {
+                $session_id = rcube_utils::bin2ascii(md5(time() . $uri, true));
+                $owner      = $this->user;
+                $data       = array('origin' => $this->get_origin());
+
+                // store some file data, they will be used
+                // by invited users that has no access to the storage
+                foreach ($this->file_meta_items as $item) {
+                    if (isset($file_info[$item])) {
+                        $data[$item] = $file_info[$item];
+                    }
+                }
+
+                // bind the session ID with editor type (see file_document::get_handler())
+                if ($this instanceof file_wopi) {
+                    $session_id = 'w-' . $session_id;
+                }
+
+                // we'll store user credentials if the file comes from
+                // an external source that requires authentication
+                if ($backend != $driver) {
+                    $auth = $driver->auth_info();
+                    $auth['password']  = $this->rc->encrypt($auth['password']);
+                    $data['auth_info'] = $auth;
+                }
+
+                $res = $this->session_create($session_id, $uri, $owner, $data, $readonly);
+            }
+
+            if (!$res) {
+                throw new Exception("Failed creating document editing session", file_api_core::ERROR_CODE);
+            }
+        }
+        else {
+            throw new Exception("Failed creating document editing session (unknown file)", file_api_core::ERROR_CODE);
+        }
+
+        // Implementations should return real URI
+        return '';
+    }
+
+    /**
+     * Get file path (not URI) from session.
+     *
+     * @param string $id        Session ID
+     * @param bool   $join_mode Throw exception only if session does not exist
+     *
+     * @return array File info (file, type, size)
+     * @throws Exception
+     */
+    public function session_file($id, $join_mode = false)
+    {
+        $session = $this->session_info($id);
+
+        if (empty($session)) {
+            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
+        }
+
+        $path = $this->uri2path($session['uri']);
+
+        if (empty($path) && (!$join_mode || $session['owner'] == $this->user)) {
+            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
+        }
+
+        // check permissions to the session
+        if ($session['owner'] != $this->user) {
+            $invitations = $this->invitations_find(array('session_id' => $id, 'user' => $this->user));
+            $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
+
+            if (empty($invitations) || !in_array($invitations[0]['status'], $states)) {
+                throw new Exception("No permission to join the editing session.", file_api_core::ERROR_CODE);
+            }
+        }
+
+        $result = array('file' => $path);
+
+        foreach ($this->file_meta_items as $item) {
+            if (isset($session[$item])) {
+                $result[$item] = $session[$item];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get editing session info
+     *
+     * @param string $id               Session identifier
+     * @param bool   $with_invitations Return invitations list
+     *
+     * @return array Session data
+     */
+    public function session_info($id, $with_invitations = false)
+    {
+        $session = $this->icache["session:$id"];
+
+        if (!$session) {
+            $db     = $this->rc->get_dbh();
+            $result = $db->query("SELECT * FROM `{$this->sessions_table}`"
+                . " WHERE `id` = ?", $id);
+
+            if ($row = $db->fetch_assoc($result)) {
+                $session = $this->session_info_parse($row);
+
+                $this->icache["session:$id"] = $session;
+            }
+        }
+
+        if ($session) {
+            if ($session['owner'] == $this->user) {
+                $session['is_owner'] = true;
+            }
+
+            if ($with_invitations && $session['is_owner']) {
+                $session['invitations'] = $this->invitations_find(array('session_id' => $id));
+            }
+        }
+
+        return $session;
+    }
+
+    /**
+     * Find editing sessions for specified path
+     */
+    public function session_find($path, $invitations = true)
+    {
+        // create an URI for specified path
+        $uri = trim($this->path2uri($path), '/') . '/';
+
+        // get existing sessions
+        $sessions = array();
+        $filter   = array('file', 'owner', 'owner_name', 'is_owner');
+        $db       = $this->rc->get_dbh();
+        $result   = $db->query("SELECT * FROM `{$this->sessions_table}`"
+            . " WHERE `readonly` = 0 AND `uri` LIKE '" . $db->escape($uri) . "%'");
+
+        while ($row = $db->fetch_assoc($result)) {
+            if ($path = $this->uri2path($row['uri'])) {
+                $sessions[$row['id']] = $this->session_info_parse($row, $path, $filter);
+            }
+        }
+
+        // set 'is_invited' flag
+        if ($invitations && !empty($sessions)) {
+            $invitations = $this->invitations_find(array('user' => $this->user));
+            $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
+
+            foreach ($invitations as $invitation) {
+                if (!empty($sessions[$invitation['session_id']]) && in_array($invitation['status'], $states)) {
+                    $sessions[$invitation['session_id']]['is_invited'] = true;
+                }
+            }
+        }
+
+        return $sessions;
+    }
+
+    /**
+     * Delete editing session (only owner can do that)
+     *
+     * @param string $id Session identifier
+     */
+    public function session_delete($id)
+    {
+        $db     = $this->rc->get_dbh();
+        $result = $db->query("DELETE FROM `{$this->sessions_table}`"
+            . " WHERE `id` = ? AND `owner` = ?",
+            $id, $this->user);
+
+        return $db->affected_rows($result) > 0;
+    }
+
+    /**
+     * Update editing session
+     *
+     * @param string $id   Session ID
+     * @param array  $data Session metadata
+     */
+    public function session_update($id, $data)
+    {
+       $db     = $this->rc->get_dbh();
+       $result = $db->query("SELECT `data` FROM `{$this->sessions_table}`"
+           . " WHERE `id` = ?", $id);
+
+       if ($row = $db->fetch_assoc($result)) {
+            // merge only relevant information
+            $data = array_intersect_key($data, array_flip($this->file_meta_items));
+            if (empty($data)) {
+                return true;
+            }
+
+            $sess_data = json_decode($row['data'], true);
+            $sess_data = array_merge($sess_data, $data);
+
+            $result = $db->query("UPDATE `{$this->sessions_table}`"
+                . " SET `data` = ? WHERE `id` = ?",
+                json_encode($sess_data), $id);
+
+            return $db->affected_rows($result) > 0;
+        }
+
+        return false;
+    }
+
+    /**
+     * Create editing session
+     */
+    protected function session_create($id, $uri, $owner, $data, $readonly = false)
+    {
+        // get user name
+        $owner_name = $this->api->resolve_user($owner) ?: '';
+
+        $db     = $this->rc->get_dbh();
+        $result = $db->query("INSERT INTO `{$this->sessions_table}`"
+            . " (`id`, `uri`, `owner`, `owner_name`, `data`, `readonly`)"
+            . " VALUES (?, ?, ?, ?, ?, ?)",
+            $id, $uri, $owner, $owner_name, json_encode($data), intval($readonly));
+
+        return $db->affected_rows($result) > 0;
+    }
+
+    /**
+     * Find sessions, including:
+     *   1. to which the user has access (is a creator or has been invited)
+     *   2. to which the user is considered eligible to request authorization
+     *     to participate in the session by already having access to the file
+     * Note: Readonly sessions are ignored here.
+     *
+     * @param array $param List parameters
+     *
+     * @return array Sessions list
+     */
+    public function sessions_list($param = array())
+    {
+        $db       = $this->rc->get_dbh();
+        $sessions = array();
+
+        // 1. Get sessions user has access to
+        $result = $db->query("SELECT * FROM `{$this->sessions_table}` s"
+            . " WHERE s.`readonly` = 0 AND (s.`owner` = ? OR s.`id` IN ("
+                . "SELECT i.`session_id` FROM `{$this->invitations_table}` i"
+                . " WHERE i.`user` = ?"
+            . "))",
+            $this->user, $this->user);
+
+        if ($db->is_error($result)) {
+            throw new Exception("Internal error.", file_api_core::ERROR_CODE);
+        }
+
+        while ($row = $db->fetch_assoc($result)) {
+            if ($path = $this->uri2path($row['uri'], true)) {
+                $sessions[$row['id']] = $this->session_info_parse($row, $path);
+            }
+        }
+
+        // 2. Get sessions user is eligible
+        // - get list of all folder URIs and find sessions for files in these locations
+        // @FIXME: in corner cases (user has many folders) this may produce a big query,
+        // maybe fetching all sessions and then comparing with list of locations would be faster?
+        $uris = $this->all_folder_locations();
+
+        if (!empty($uris)) {
+            $where = array_map(function($uri) use ($db) {
+                    return 's.`uri` LIKE ' . $db->quote(str_replace('%', '_', $uri) . '/%');
+                }, $uris);
+
+            $result = $db->query("SELECT * FROM `{$this->sessions_table}` s"
+                . " WHERE s.`readonly` = 0 AND (" . join(' OR ', $where) . ")");
+
+            if ($db->is_error($result)) {
+                throw new Exception("Internal error.", file_api_core::ERROR_CODE);
+            }
+
+            while ($row = $db->fetch_assoc($result)) {
+                if (empty($sessions[$row['id']])) {
+                    // remove filename (and anything after it) so we have the folder URI
+                    // to check if it's on the folders list we have
+                    $uri = substr($row['uri'], 0, strrpos($row['uri'], '/'));
+                    if (in_array($uri, $uris) && ($path = $this->uri2path($row['uri'], true))) {
+                        $sessions[$row['id']] = $this->session_info_parse($row, $path);
+                    }
+                }
+            }
+        }
+
+        // set 'is_invited' flag
+        if (!empty($sessions)) {
+            $invitations = $this->invitations_find(array('user' => $this->user));
+            $states      = array(self::STATUS_INVITED, self::STATUS_ACCEPTED, self::STATUS_ACCEPTED_OWNER);
+
+            foreach ($invitations as $invitation) {
+                if (!empty($sessions[$invitation['session_id']]) && in_array($invitation['status'], $states)) {
+                    $sessions[$invitation['session_id']]['is_invited'] = true;
+                }
+            }
+        }
+
+        // Sorting
+        $sort  = !empty($params['sort']) ? $params['sort'] : 'name';
+        $index = array();
+
+        if (in_array($sort, array('name', 'file', 'owner'))) {
+            foreach ($sessions as $key => $val) {
+                if ($sort == 'name' || $sort == 'file') {
+                    $path        = explode(file_storage::SEPARATOR, $val['file']);
+                    $index[$key] = $path[count($path) - 1];
+                    continue;
+                }
+
+                $index[$key] = $val[$sort];
+            }
+            array_multisort($index, SORT_ASC, SORT_LOCALE_STRING, $sessions);
+        }
+
+        if ($params['reverse']) {
+            $sessions = array_reverse($sessions, true);
+        }
+
+        return $sessions;
+    }
+
+    /**
+     * Retern extra editor parameters to post the the viewer iframe
+     *
+     * @param array $info File info
+     *
+     * @return array POST parameters
+     */
+    public function editor_post_params($info)
+    {
+        return array();
+    }
+
+    /**
+     * Find invitations for current user. This will return all
+     * invitations related to the user including his sessions.
+     *
+     * @param array $filter Search filter (see self::invitations_find())
+     *
+     * @return array Invitations list
+     */
+    public function invitations_list($filter = array())
+    {
+        $filter['user'] = $this->user;
+
+        // list of invitations to the user or requested by him
+        $result = $this->invitations_find($filter, true);
+
+        unset($filter['user']);
+        $filter['owner'] = $this->user;
+
+        // other invitations that belong to the sessions owned by the user
+        if ($other = $this->invitations_find($filter, true)) {
+            $result = array_merge($result, $other);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Find invitations for specified filter
+     *
+     * @param array $filter Search filter (see self::invitations_find())
+     *                      - session_id: session identifier
+     *                      - timestamp: "changed > ?" filter
+     *                      - user: Invitation user identifier
+     *                      - owner: Session owner identifier
+     * @param bool $extended Return session file names
+     *
+     * @return array Invitations list
+     */
+    public function invitations_find($filter, $extended = false)
+    {
+        $db     = $this->rc->get_dbh();
+        $query  = '';
+        $select = "i.*";
+
+        foreach ($filter as $column => $value) {
+            if ($column == 'timestamp') {
+                $where[] = "i.`changed` > " . $db->quote($this->db_datetime($value));
+            }
+            else if ($column == 'owner') {
+                $join[] = "`{$this->sessions_table}` s ON (i.`session_id` = s.`id`)";
+                $where[] = "s.`owner` = " . $db->quote($value);
+            }
+            else {
+                $where[] = "i.`$column` = " . $db->quote($value);
+            }
+        }
+
+        if ($extended) {
+            $select .= ", s.`uri`, s.`owner`, s.`owner_name`";
+            $join[]  = "`{$this->sessions_table}` s ON (i.`session_id` = s.`id`)";
+        }
+
+        if (!empty($join)) {
+            $query .= ' JOIN ' . implode(' JOIN ', array_unique($join));
+        }
+
+        if (!empty($where)) {
+            $query .= ' WHERE ' . implode(' AND ', array_unique($where));
+        }
+
+        $result = $db->query("SELECT $select FROM `{$this->invitations_table}` i"
+            . "$query ORDER BY i.`changed`");
+
+        if ($db->is_error($result)) {
+            throw new Exception("Internal error.", file_api_core::ERROR_CODE);
+        }
+
+        $invitations = array();
+
+        while ($row = $db->fetch_assoc($result)) {
+            if ($extended) {
+                try {
+                    // add unix-timestamp of the `changed` date to the result
+                    $dt = new DateTime($row['changed']);
+                    $row['timestamp'] = $dt->format('U');
+                }
+                catch(Exception $e) { }
+
+                // add filename to the result
+                $filename = parse_url($row['uri'], PHP_URL_PATH);
+                $filename = pathinfo($filename, PATHINFO_BASENAME);
+                $filename = rawurldecode($filename);
+
+                $row['filename'] = $filename;
+
+                if ($path = $this->uri2path($row['uri'])) {
+                    $row['file'] = $path;
+                }
+
+                unset($row['uri']);
+            }
+
+            $invitations[] = $row;
+        }
+
+        return $invitations;
+    }
+
+    /**
+     * Create an invitation
+     *
+     * @param string $session_id Document session identifier
+     * @param string $user       User identifier (use null for current user)
+     * @param string $status     Invitation status (invited, requested)
+     * @param string $comment    Invitation description/comment
+     * @param string &$user_name Optional user name
+     *
+     * @throws Exception
+     */
+    public function invitation_create($session_id, $user, $status = 'invited', $comment = '', &$user_name = '')
+    {
+        if (empty($user)) {
+            $user = $this->user;
+        }
+
+        if ($status != self::STATUS_INVITED && $status != self::STATUS_REQUESTED) {
+            throw new Exception("Invalid invitation status.", file_api_core::ERROR_CODE);
+        }
+
+        // get session information
+        $session = $this->session_info($session_id);
+
+        if (empty($session)) {
+            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
+        }
+
+        // check session ownership, only owner can create 'new' invitations
+        if ($status == self::STATUS_INVITED && $session['owner'] != $this->user) {
+            throw new Exception("No permission to create an invitation.", file_api_core::ERROR_CODE);
+        }
+
+        if ($session['owner'] == $user) {
+            throw new Exception("Not possible to create an invitation for the session creator.", file_api_core::ERROR_CODE);
+        }
+
+        // get user name
+        if (empty($user_name)) {
+            $user_name = $this->api->resolve_user($user) ?: '';
+        }
+
+        // insert invitation
+        $db     = $this->rc->get_dbh();
+        $result = $db->query("INSERT INTO `{$this->invitations_table}`"
+            . " (`session_id`, `user`, `user_name`, `status`, `comment`, `changed`)"
+            . " VALUES (?, ?, ?, ?, ?, ?)",
+            $session_id, $user, $user_name, $status, $comment ?: '', $this->db_datetime());
+
+        if (!$db->affected_rows($result)) {
+            throw new Exception("Failed to create an invitation.", file_api_core::ERROR_CODE);
+        }
+    }
+
+    /**
+     * Delete an invitation (only session owner can do that)
+     *
+     * @param string $session_id Session identifier
+     * @param string $user       User identifier
+     * @param bool   $local      Remove invitation only from local database
+     *
+     * @throws Exception
+     */
+    public function invitation_delete($session_id, $user, $local = false)
+    {
+        $db     = $this->rc->get_dbh();
+        $result = $db->query("DELETE FROM `{$this->invitations_table}`"
+            . " WHERE `session_id` = ? AND `user` = ?"
+                . " AND EXISTS (SELECT 1 FROM `{$this->sessions_table}` WHERE `id` = ? AND `owner` = ?)",
+            $session_id, $user, $session_id, $this->user);
+
+        if (!$db->affected_rows($result)) {
+            throw new Exception("Failed to delete an invitation.", file_api_core::ERROR_CODE);
+        }
+    }
+
+    /**
+     * Update an invitation status
+     *
+     * @param string $session_id Session identifier
+     * @param string $user       User identifier (use null for current user)
+     * @param string $status     Invitation status (accepted, declined)
+     * @param string $comment    Invitation description/comment
+     *
+     * @throws Exception
+     */
+    public function invitation_update($session_id, $user, $status, $comment = '')
+    {
+        if (empty($user)) {
+            $user = $this->user;
+        }
+
+        if ($status != self::STATUS_ACCEPTED && $status != self::STATUS_DECLINED) {
+            throw new Exception("Invalid invitation status.", file_api_core::ERROR_CODE);
+        }
+
+        // get session information
+        $session = $this->session_info($session_id);
+
+        if (empty($session)) {
+            throw new Exception("Document session not found.", file_api_core::ERROR_CODE);
+        }
+
+        // check session ownership
+        if ($user != $this->user && $session['owner'] != $this->user) {
+            throw new Exception("No permission to update an invitation.", file_api_core::ERROR_CODE);
+        }
+
+        if ($session['owner'] == $this->user) {
+            $status = $status . '-owner';
+        }
+
+        $db     = $this->rc->get_dbh();
+        $result = $db->query("UPDATE `{$this->invitations_table}`"
+            . " SET `status` = ?, `comment` = ?, `changed` = ?"
+            . " WHERE `session_id` = ? AND `user` = ?",
+            $status, $comment ?: '', $this->db_datetime(), $session_id, $user);
+
+        if (!$db->affected_rows($result)) {
+            throw new Exception("Failed to update an invitation status.", file_api_core::ERROR_CODE);
+        }
+    }
+
+    /**
+     * Update a session URI (e.g. on file/folder move)
+     *
+     * @param string $from      Source file/folder path
+     * @param string $to        Destination file/folder path
+     * @param bool   $is_folder True if the path is a folder
+     */
+    public function session_uri_update($from, $to, $is_folder = false)
+    {
+        $db = $this->rc->get_dbh();
+
+        // Resolve paths
+        $from = $this->path2uri($from);
+        $to   = $this->path2uri($to);
+
+        if ($is_folder) {
+            $set = "`uri` = REPLACE(`uri`, " . $db->quote($from . '/') . ", " . $db->quote($to .'/') . ")";
+            $where = "`uri` LIKE " . $db->quote(str_replace('%', '_', $from) . '/%');
+        }
+        else {
+            $set = "`uri` = " . $db->quote($to);
+            $where = "`uri` = " . $db->quote($from);
+        }
+
+        $db->query("UPDATE `{$this->sessions_table}` SET $set WHERE $where");
+    }
+
+    /**
+     * Parse session info data
+     */
+    protected function session_info_parse($record, $path = null, $filter = array())
+    {
+        $session = array();
+        $fields  = array('id', 'uri', 'owner', 'owner_name', 'readonly');
+
+        foreach ($fields as $field) {
+            if (isset($record[$field])) {
+                $session[$field] = $record[$field];
+            }
+        }
+
+        if ($path) {
+            $session['file'] = $path;
+        }
+
+        if (!empty($record['data'])) {
+            $data   = json_decode($record['data'], true);
+            $fields = array_merge($this->file_meta_items, array('origin'));
+
+            foreach ($fields as $field) {
+                if (empty($filter) || in_array($field, $filter)) {
+                    $session[$field] = $data[$field];
+                }
+            }
+        }
+
+        // @TODO: is_invited?, last_modified?
+
+        if ($session['owner'] == $this->user) {
+            $session['is_owner'] = true;
+        }
+
+        if (!empty($filter)) {
+            $session = array_intersect_key($session, array_flip($filter));
+        }
+
+        return $session;
+    }
+
+    /**
+     * Get file URI from path
+     */
+    protected function path2uri($path, &$driver = null)
+    {
+        list($driver, $path) = $this->api->get_driver($path);
+
+        return $driver->path2uri($path);
+    }
+
+    /**
+     * Get file path from the URI
+     */
+    protected function uri2path($uri, $use_fallback = false)
+    {
+        $backend = $this->api->get_backend();
+
+        try {
+            return $backend->uri2path($uri);
+        }
+        catch (Exception $e) {
+                // do nothing
+        }
+
+        foreach ($this->api->get_drivers(true) as $driver) {
+            try {
+                $path  = $driver->uri2path($uri);
+                $title = $driver->title();
+
+                if ($title) {
+                    $path = $title . file_storage::SEPARATOR . $path;
+                }
+
+                return $path;
+            }
+            catch (Exception $e) {
+                // do nothing
+            }
+        }
+
+        // likely user has no access to the file, but has been invited,
+        // extract filename from the URI
+        if ($use_fallback && $uri) {
+            $path = parse_url($uri, PHP_URL_PATH);
+            $path = explode('/', $path);
+            $path = $path[count($path) - 1];
+
+            return $path;
+        }
+    }
+
+    /**
+     * Get URI of all user folders (with shared locations)
+     */
+    protected function all_folder_locations()
+    {
+        $locations = array();
+
+        foreach (array_merge(array($this->api->get_backend()), $this->api->get_drivers(true)) as $driver) {
+            // Performance optimization: We're interested here in shared folders,
+            // Kolab is the only driver that currently supports them, ignore others
+            if (get_class($driver) != 'kolab_file_storage') {
+                continue;
+            }
+
+            try {
+                foreach ($driver->folder_list() as $folder) {
+                    if ($uri = $driver->path2uri($folder)) {
+                        $locations[] = $uri;
+                    }
+                }
+            }
+            catch (Exception $e) {
+               // do nothing
+            }
+        }
+
+        return $locations;
+    }
+
+    /**
+     * Get request origin, use Referer header if specified
+     */
+    protected function get_origin()
+    {
+        if (!empty($_SERVER['HTTP_REFERER'])) {
+            $url = parse_url($_SERVER['HTTP_REFERER']);
+
+            return $url['scheme'] . '://' . $url['host'] . ($url['port'] ?: '');
+        }
+
+        return (rcube_utils::https_check() ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST'];
+    }
+
+    /**
+     * Return datetime in UTC timezone in SQL format
+     */
+    protected function db_datetime($dt = null)
+    {
+        $timezone = new DateTimeZone('UTC');
+        $datetime = new DateTime($dt ? '@'.$dt : 'now', $timezone);
+
+        return $datetime->format(self::DB_DATE_FORMAT);
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/file_locale.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_locale.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/file_locks.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_locks.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/file_manticore.php Added

@@ -0,0 +1,238 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2016, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Document editing sessions handling (Manticore)
+ */
+class file_manticore extends file_document
+{
+    protected $request;
+
+
+    /**
+     * Return viewer URI for specified file/session. This creates
+     * a new collaborative editing session when needed.
+     *
+     * @param string $file        File path
+     * @param array  &$file_info  File metadata (e.g. type)
+     * @param string &$session_id Optional session ID to join to
+     * @param string $readonly    Create readonly (one-time) session
+     *
+     * @return string Manticore URI
+     * @throws Exception
+     */
+    public function session_start($file, &$file_info, &$session_id = null, $readonly = false)
+    {
+        parent::session_start($file, $file_info, $session_id, $readonly);
+
+        // authenticate to Manticore, we need auth token for frame_uri
+        if (empty($_SESSION['manticore_token'])) {
+            $this->get_request();
+        }
+
+        // @TODO: make sure the session exists in Manticore?
+
+        return $this->frame_uri($session_id);
+    }
+
+    /**
+     * Delete editing session (only owner can do that)
+     *
+     * @param string $id    Session identifier
+     * @param bool   $local Remove session only from local database
+     */
+    public function session_delete($id, $local = false)
+    {
+        $success = parent::session_delete($id, $local);
+
+        // Send document delete to Manticore
+        if ($success && !$local) {
+            $req = $this->get_request();
+            $res = $req->document_delete($id);
+        }
+
+        return $success;
+    }
+
+    /**
+     * Create editing session
+     */
+    protected function session_create($id, $uri, $owner, $data, $readonly = false)
+    {
+        $success = parent::session_create($id, $uri, $owner, $data, $readonly);
+
+        // create the session in Manticore
+        if ($success) {
+            $req = $this->get_request();
+            $res = $req->document_create(array(
+                'id'     => $id,
+                'title'  => '', // @TODO: maybe set to a file path without extension?
+                'access' => array(
+                    array(
+                        'identity'   => $owner,
+                        'permission' => file_manticore_api::ACCESS_WRITE,
+                    ),
+                ),
+            ));
+
+            if (!$res) {
+                $this->session_delete($id, true);
+                return false;
+            }
+        }
+
+        return $success;
+    }
+
+    /**
+     * Create an invitation
+     *
+     * @param string $session_id Document session identifier
+     * @param string $user       User identifier (use null for current user)
+     * @param string $status     Invitation status (invited, requested)
+     * @param string $comment    Invitation description/comment
+     * @param string &$user_name Optional user name
+     *
+     * @throws Exception
+     */
+    public function invitation_create($session_id, $user, $status = 'invited', $comment = '', &$user_name = '')
+    {
+        parent::invitation_create($session_id, $user, $status, $comment, $user_name);
+
+        // Update Manticore 'access' array
+        if ($status == file_document::STATUS_INVITED) {
+            $req = $this->get_request();
+            $res = $req->editor_add($session_id, $user, file_manticore_api::ACCESS_WRITE);
+
+            if (!$res) {
+                $this->invitation_delete($session_id, $user, true);
+                throw new Exception("Failed to create an invitation.", file_api_core::ERROR_CODE);
+            }
+        }
+    }
+
+    /**
+     * Delete an invitation (only session owner can do that)
+     *
+     * @param string $session_id Session identifier
+     * @param string $user       User identifier
+     * @param bool   $local      Remove invitation only from local database
+     *
+     * @throws Exception
+     */
+    public function invitation_delete($session_id, $user, $local = false)
+    {
+        parent::invitation_delete($session_id, $user, $local);
+
+        // Update Manticore 'access' array
+        if (!$local) {
+            $req = $this->get_request();
+            $res = $req->editor_delete($session_id, $user);
+
+            if (!$res) {
+                throw new Exception("Failed to remove an invitation.", file_api_core::ERROR_CODE);
+            }
+        }
+    }
+
+    /**
+     * Update an invitation status
+     *
+     * @param string $session_id Session identifier
+     * @param string $user       User identifier (use null for current user)
+     * @param string $status     Invitation status (accepted, declined)
+     * @param string $comment    Invitation description/comment
+     *
+     * @throws Exception
+     */
+    public function invitation_update($session_id, $user, $status, $comment = '')
+    {
+        parent::invitation_update($session_id, $user, $status, $comment);
+
+        // Update Manticore 'access' array if an owner accepted an invitation request
+        if ($status == file_document::STATUS_ACCEPTED_OWNER) {
+            $req = $this->get_request();
+            $res = $req->editor_add($session_id, $user, file_manticore_api::ACCESS_WRITE);
+
+            if (!$res) {
+                throw new Exception("Failed to update an invitation status.", file_api_core::ERROR_CODE);
+            }
+        }
+    }
+
+    /**
+     * List supported mimetypes
+     *
+     * @param bool $editable Return only editable mimetypes
+     *
+     * @return array List of supported mimetypes
+     */
+    public function supported_filetypes($editable = false)
+    {
+        return array(
+            'application/vnd.oasis.opendocument.text',
+        );
+    }
+
+    /**
+     * Generate URI of Manticore editing session
+     */
+    protected function frame_uri($id)
+    {
+        $base_url = rtrim($this->rc->config->get('fileapi_manticore'), ' /');
+
+        return $base_url . '/document/' . $id . '/' . $_SESSION['manticore_token'];
+    }
+
+    /**
+     * Initialize Manticore API request handler
+     */
+    protected function get_request()
+    {
+        if (!$this->request) {
+            $uri = rcube_utils::resolve_url($this->rc->config->get('fileapi_manticore'));
+            $this->request = new file_manticore_api($uri);
+
+            // Use stored session token, check if it's still valid
+            if ($_SESSION['manticore_token']) {
+                $is_valid = $this->request->set_session_token($_SESSION['manticore_token'], true);
+
+                if ($is_valid) {
+                    return $this->request;
+                }
+            }
+
+            $backend = $this->api->get_backend();
+            $auth    = $backend->auth_info();
+
+            $_SESSION['manticore_token'] = $this->request->login($auth['username'], $auth['password']);
+
+            if (empty($_SESSION['manticore_token'])) {
+                throw new Exception("Unable to login to Manticore server.", file_api_core::ERROR_CODE);
+            }
+        }
+
+        return $this->request;
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/file_manticore_api.php Added

@@ -0,0 +1,440 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2011-2015, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Helper class to connect to the Manticore API
+ */
+class file_manticore_api
+{
+    /**
+     * @var HTTP_Request2
+     */
+    private $request;
+
+    /**
+     * @var string
+     */
+    private $base_url;
+
+    /**
+     * @var bool
+     */
+    private $debug = false;
+
+    const ERROR_INTERNAL   = 100;
+    const ERROR_CONNECTION = 500;
+
+    const ACCEPT_HEADER = "application/json,text/javascript,*/*";
+
+    const ACCESS_WRITE = 'write';
+    const ACCESS_READ  = 'read';
+    const ACCESS_DENY  = 'deny';
+
+
+    /**
+     * Class constructor.
+     *
+     * @param string $base_url Base URL of the Kolab API
+     */
+    public function __construct($base_url)
+    {
+        require_once 'HTTP/Request2.php';
+
+        $config         = rcube::get_instance()->config;
+        $this->debug    = rcube_utils::get_boolean($config->get('fileapi_manticore_debug'));
+        $this->base_url = rtrim($base_url, '/') . '/';
+        $this->request  = new HTTP_Request2();
+
+        self::configure($this->request);
+    }
+
+    /**
+     * Configure HTTP_Request2 object
+     *
+     * @param HTTP_Request2 $request Request object
+     */
+    public static function configure($request)
+    {
+        // Configure connection options
+        $config      = rcube::get_instance()->config;
+        $http_config = (array) $config->get('http_request', $config->get('kolab_http_request'));
+
+        // Deprecated config, all options are separated variables
+        if (empty($http_config)) {
+            $options = array(
+                'ssl_verify_peer',
+                'ssl_verify_host',
+                'ssl_cafile',
+                'ssl_capath',
+                'ssl_local_cert',
+                'ssl_passphrase',
+                'follow_redirects',
+            );
+
+            foreach ($options as $optname) {
+                if (($optvalue = $config->get($optname)) !== null
+                    || ($optvalue = $config->get('kolab_' . $optname)) !== null
+                ) {
+                    $http_config[$optname] = $optvalue;
+                }
+            }
+        }
+
+        if (!empty($http_config)) {
+            try {
+                $request->setConfig($http_config);
+            }
+            catch (Exception $e) {
+                rcube::log_error("HTTP: " . $e->getMessage());
+            }
+        }
+
+        // proxy User-Agent
+        $request->setHeader('user-agent', $_SERVER['HTTP_USER_AGENT']);
+
+        // some HTTP server configurations require this header
+        $request->setHeader('accept', self::ACCEPT_HEADER);
+
+        $request->setHeader('Content-Type', 'application/json; charset=UTF-8');
+    }
+
+    /**
+     * Return API's base URL
+     *
+     * @return string Base URL
+     */
+    public function base_url()
+    {
+        return $this->base_url;
+    }
+
+    /**
+     * Return HTTP_Request2 object
+     *
+     * @return HTTP_Request2 Request object
+     */
+    public function request()
+    {
+        return $this->request;
+    }
+
+    /**
+     * Logs specified user into the API
+     *
+     * @param string $username User name
+     * @param string $password User password
+     *
+     * @return string Session token (on success)
+     */
+    public function login($username, $password)
+    {
+        $query = array(
+            'email'    => $username,
+            'password' => $password,
+        );
+
+        // remove current token if any
+        $this->request->setHeader('Authorization');
+
+        // authenticate the user
+        $response = $this->post('auth/local', $query);
+
+        if ($token = $response->get('token')) {
+            $this->set_session_token($token);
+        }
+
+        return $token;
+    }
+
+    /**
+     * Sets request session token.
+     *
+     * @param string $token    Session token.
+     * @param bool   $validate Enables token validatity check
+     *
+     * @return bool Token validity status
+     */
+    public function set_session_token($token, $validate = false)
+    {
+        $this->request->setHeader('Authorization', "Bearer $token");
+
+        if ($validate) {
+            $result = $this->get('api/users/me');
+
+            return $result->get_error_code() == 200;
+        }
+
+        return true;
+    }
+
+    /**
+     * Delete document editing session
+     *
+     * @param array $id Session identifier
+     *
+     * @return bool True on success, False on failure
+     */
+    public function document_delete($id)
+    {
+        $res = $this->delete('api/documents/' . $id);
+
+        return $res->get_error_code() == 204;
+    }
+
+    /**
+     * Create document editing session
+     *
+     * @param array $params Session parameters
+     *
+     * @return bool True on success, False on failure
+     */
+    public function document_create($params)
+    {
+        $res = $this->post('api/documents', $params);
+
+        // @FIXME: 422?
+        return $res->get_error_code() == 201 || $res->get_error_code() == 422;
+    }
+
+    /**
+     * Add document editor (update 'access' array)
+     *
+     * @param array $session_id Session identifier
+     * @param array $identity   User identifier
+     *
+     * @return bool True on success, False on failure
+     */
+    public function editor_add($session_id, $identity, $permission)
+    {
+        $res = $this->get("api/documents/$session_id/access");
+
+        if ($res->get_error_code() != 200) {
+            return false;
+        }
+
+        $access = $res->get();
+
+        // sanity check, this should never be empty
+        if (empty($access)) {
+            return false;
+        }
+
+        // add editor to the 'access' array
+        foreach ($access as $entry) {
+            if ($entry['identity'] == $identity) {
+                return true;
+            }
+        }
+
+        $access[] = array('identity' => $identity, 'permission' => $permission);
+
+        $res = $this->put("api/documents/$session_id/access", $access);
+
+        return $res->get_error_code() == 200;
+    }
+
+    /**
+     * Remove document editor (update 'access' array)
+     *
+     * @param array $session_id Session identifier
+     * @param array $identity   User identifier
+     *
+     * @return bool True on success, False on failure
+     */
+    public function editor_delete($session_id, $identity)
+    {
+        $res = $this->get("api/documents/$session_id/access");
+
+        if ($res->get_error_code() != 200) {
+            return false;
+        }
+
+        $access = $res->get();
+        $found  = true;
+
+        // remove editor from the 'access' array
+        foreach ((array) $access as $idx => $entry) {
+            if ($entry['identity'] == $identity) {
+                unset($access[$idx]);
+            }
+        }
+
+        if (!$found) {
+            return false;
+        }
+
+        $res = $this->put("api/documents/$session_id/access", $access);
+
+        return $res->get_error_code() == 200;
+    }
+
+    /**
+     * API's GET request.
+     *
+     * @param string $action Action name
+     * @param array  $get    Request arguments
+     *
+     * @return file_ui_api_result Response
+     */
+    public function get($action, $get = array())
+    {
+        $url = $this->build_url($action, $get);
+
+        if ($this->debug) {
+            rcube::write_log('manticore', "GET: $url " . json_encode($get));
+        }
+
+        $this->request->setMethod(HTTP_Request2::METHOD_GET);
+        $this->request->setBody('');
+
+        return $this->get_response($url);
+    }
+
+    /**
+     * API's POST request.
+     *
+     * @param string $action Action name
+     * @param array  $post   POST arguments
+     *
+     * @return kolab_client_api_result Response
+     */
+    public function post($action, $post = array())
+    {
+        $url = $this->build_url($action);
+
+        if ($this->debug) {
+            rcube::write_log('manticore', "POST: $url " . json_encode($post));
+        }
+
+        $this->request->setMethod(HTTP_Request2::METHOD_POST);
+        $this->request->setBody(json_encode($post));
+
+        return $this->get_response($url);
+    }
+
+    /**
+     * API's PUT request.
+     *
+     * @param string $action Action name
+     * @param array  $post   POST arguments
+     *
+     * @return kolab_client_api_result Response
+     */
+    public function put($action, $post = array())
+    {
+        $url = $this->build_url($action);
+
+        if ($this->debug) {
+            rcube::write_log('manticore', "PUT: $url " . json_encode($post));
+        }
+
+        $this->request->setMethod(HTTP_Request2::METHOD_PUT);
+        $this->request->setBody(json_encode($post));
+
+        return $this->get_response($url);
+    }
+
+    /**
+     * API's DELETE request.
+     *
+     * @param string $action Action name
+     * @param array  $get    Request arguments
+     *
+     * @return file_ui_api_result Response
+     */
+    public function delete($action, $get = array())
+    {
+        $url = $this->build_url($action, $get);
+
+        if ($this->debug) {
+            rcube::write_log('manticore', "DELETE: $url " . json_encode($get));
+        }
+
+        $this->request->setMethod(HTTP_Request2::METHOD_DELETE);
+        $this->request->setBody('');
+
+        return $this->get_response($url);
+    }
+
+    /**
+     * @param string $action Action GET parameter
+     * @param array  $args   GET parameters (hash array: name => value)
+     *
+     * @return Net_URL2 URL object
+     */
+    private function build_url($action, $args = array())
+    {
+        $url = new Net_URL2($this->base_url . $action);
+
+        $url->setQueryVariables((array) $args);
+
+        return $url;
+    }
+
+    /**
+     * HTTP Response handler.
+     *
+     * @param Net_URL2 $url URL object
+     *
+     * @return kolab_client_api_result Response object
+     */
+    private function get_response($url)
+    {
+        try {
+            $this->request->setUrl($url);
+            $response = $this->request->send();
+        }
+        catch (Exception $e) {
+            return new file_ui_api_result(null,
+                self::ERROR_CONNECTION, $e->getMessage());
+        }
+
+        try {
+            $body = $response->getBody();
+        }
+        catch (Exception $e) {
+            return new file_ui_api_result(null,
+                self::ERROR_INTERNAL, $e->getMessage());
+        }
+
+        $code = $response->getStatus();
+
+        if ($this->debug) {
+            rcube::write_log('manticore', "Response [$code]: $body");
+        }
+
+        if ($code < 300) {
+            $result = $body ? json_decode($body, true) : array();
+        }
+        else {
+            if ($code != 401) {
+                rcube::raise_error("Error $code on $url", true, false);
+            }
+
+            $error = $body;
+        }
+
+        return new file_ui_api_result($result, $code, $error);
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/file_storage.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_storage.php Changed

@@ -31,13 +31,17 @@
     const CAPS_PROGRESS_TIME = 'PROGRESS_TIME';
     const CAPS_QUOTA         = 'QUOTA';
     const CAPS_LOCKS         = 'LOCKS';
+    const CAPS_SUBSCRIPTIONS = 'SUBSCRIPTIONS';
+    const CAPS_FAST_FOLDER_LIST = 'FAST_FOLDER_LIST';
 
     // config
     const SEPARATOR = '/';
 
     // error codes
-    const ERROR             = 500;
     const ERROR_LOCKED      = 423;
+    const ERROR             = 500;
+    const ERROR_UNAVAILABLE = 503;
+    const ERROR_FORBIDDEN   = 530;
     const ERROR_FILE_EXISTS = 550;
     const ERROR_UNSUPPORTED = 570;
     const ERROR_NOAUTH      = 580;
@@ -47,6 +51,23 @@
     const LOCK_EXCLUSIVE = 'exclusive';
     const LOCK_INFINITE  = 'infinite';
 
+    // list filters
+    const FILTER_UNSUBSCRIBED = 1;
+    const FILTER_WRITABLE     = 2;
+
+    // folder permissions
+    const ACL_READ = 1;
+    const ACL_WRITE = 2;
+
+    // sharing interface modes
+    const SHARING_MODE_FORM   = 1;
+    const SHARING_MODE_RIGHTS = 2;
+    const SHARING_MODE_UPDATE = 3;
+
+    // search modes
+    const SEARCH_USER   = 1;
+    const SEARCH_GROUP  = 2;
+
 
     /**
      * Authenticates a user
@@ -250,12 +271,41 @@
     public function folder_move($folder_name, $new_name);
 
     /**
+     * Subscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_subscribe($folder_name);
+
+    /**
+     * Unsubscribe a folder.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @throws Exception
+     */
+    public function folder_unsubscribe($folder_name);
+
+    /**
      * Returns list of folders.
      *
+     * @param array $params List parameters ('type', 'search', 'extended', 'permissions')
+     *
      * @return array List of folders
      * @throws Exception
      */
-    public function folder_list();
+    public function folder_list($params = array());
+
+    /**
+     * Check folder rights.
+     *
+     * @param string $folder_name Name of a folder with full path
+     *
+     * @return int Folder rights (sum of file_storage::ACL_*)
+     */
+    public function folder_rights($folder_name);
 
     /**
      * Returns a list of locks
@@ -308,4 +358,49 @@
      * @throws Exception
      */
     public function quota($folder);
+
+    /**
+     * Sharing interface
+     *
+     * @param string $folder_name Name of a folder with full path
+     * @param int    $mode        Sharing action mode
+     * @param array  $args        POST/GET parameters
+     *
+     * @return mixed Sharing response
+     * @throws Exception
+     */
+    public function sharing($folder, $mode, $args = array());
+
+    /**
+     * User/group search (autocompletion)
+     *
+     * @param string $search Search string
+     * @param int    $mode   Search mode
+     *
+     * @return array Users/Groups list
+     * @throws Exception
+     */
+    public function autocomplete($search, $mode);
+
+    /**
+     * Convert file/folder path into a global URI.
+     * Note: We're using self::SEPARATOR as a hierarchy delimiter
+     *
+     * @param string $path File/folder path
+     *
+     * @return string URI
+     * @throws Exception
+     */
+    public function path2uri($path);
+
+    /**
+     * Convert global URI into file/folder path.
+     * Note: We're using self::SEPARATOR as a hierarchy delimiter
+     *
+     * @param string $uri URI
+     *
+     * @return string File/folder path
+     * @throws Exception
+     */
+    public function uri2path($uri);
 }

iRony-0.4.2.tar.gz/lib/FileAPI/file_ui.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_ui.php Changed

@@ -40,11 +40,11 @@
      */
     protected $config;
 
-    protected $ajax_only = false;
-    protected $page_title = 'Kolab File API';
-    protected $menu = array();
-    protected $cache = array();
-    protected $devel_mode = false;
+    protected $ajax_only    = false;
+    protected $page_title   = 'Kolab File API';
+    protected $menu         = array();
+    protected $cache        = array();
+    protected $devel_mode   = false;
     protected $object_types = array();
 
     const API_VERSION = 2;
@@ -58,7 +58,7 @@
     public function __construct($output = null)
     {
         $rcube = rcube::get_instance();
-        $rcube->add_shutdown_function(array($this, 'shutdown'));
+        register_shutdown_function(array($this, 'shutdown'));
 
         $this->config_init();
 
@@ -355,14 +355,21 @@
     public function shutdown()
     {
         // write performance stats to logs/console
-        if ($this->devel_mode) {
-            if (function_exists('memory_get_peak_usage'))
-                $mem = memory_get_peak_usage();
-            else if (function_exists('memory_get_usage'))
-                $mem = memory_get_usage();
-
-            $log = 'ui:' . $this->get_task() . ($this->action ? '/' . $this->action : '');
-            $log .= ($mem ? sprintf(' [%.1f MB]', $mem/1024/1024) : '');
+        if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) {
+            // we have to disable per_user_logging to make sure stats end up in the main console log
+            $this->config->set('per_user_logging', false);
+
+            // make sure logged numbers use unified format
+            setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C');
+
+            if (function_exists('memory_get_usage')) {
+                $mem = round(memory_get_usage() / 1024 /1024, 1);
+            }
+            if (function_exists('memory_get_peak_usage')) {
+                $mem .= '/'. round(memory_get_peak_usage() / 1024 / 1024, 1);
+            }
+
+            $log = 'ui:' . $this->get_task() . ($this->action ? '/' . $this->action : '') . " [$mem]";
 
             if (defined('FILE_API_START')) {
                 rcube::print_timer(FILE_API_START, $log);

iRony-0.4.2.tar.gz/lib/FileAPI/file_ui_api.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_ui_api.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/file_ui_api_result.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_ui_api_result.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/file_utils.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_utils.php Changed

@@ -170,20 +170,79 @@
     }
 
     /**
-     * Returns script URI
+     * Callback for uasort() that implements correct
+     * locale-aware case-sensitive sorting
+     */
+    public static function sort_folder_comparator($p1, $p2)
+    {
+        $ext   = is_array($p1); // folder can be a string or an array with 'folder' key
+        $path1 = explode(file_storage::SEPARATOR, $ext ? $p1['folder'] : $p1);
+        $path2 = explode(file_storage::SEPARATOR, $ext ? $p2['folder'] : $p2);
+
+        foreach ($path1 as $idx => $folder1) {
+            $folder2 = $path2[$idx];
+
+            if ($folder1 === $folder2) {
+                continue;
+            }
+
+            return strcoll($folder1, $folder2);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Encode folder path for use in an URI
+     *
+     * @param string $path Folder path
+     *
+     * @return string Encoded path
+     */
+    public static function encode_path($path)
+    {
+        $items = explode(file_storage::SEPARATOR, $path);
+        $items = array_map('rawurlencode', $items);
+
+        return implode(file_storage::SEPARATOR, $items);
+    }
+
+    /**
+     * Decode an URI into folder path
      *
-     * @return string Script URI
+     * @param string $path Encoded folder path
+     *
+     * @return string Decoded path
      */
-    static function script_uri()
+    public static function decode_path($path)
     {
-        if (!empty($_SERVER['SCRIPT_URI'])) {
-            return $_SERVER['SCRIPT_URI'];
+        $items = explode(file_storage::SEPARATOR, $path);
+        $items = array_map('rawurldecode', $items);
+
+        return implode(file_storage::SEPARATOR, $items);
+    }
+
+    /**
+     *
+     * @return string Date time string in specified format and timezone
+     */
+    public static function date_format($datetime, $format = 'Y-m-d H:i', $timezone = null)
+    {
+        if (!$datetime instanceof DateTime) {
+            return '';
         }
 
-        $uri = $_SERVER['SERVER_PORT'] == 443 ? 'https://' : 'http://';
-        $uri .= $_SERVER['HTTP_HOST'];
-        $uri .= preg_replace('/\?.*$/', '', $_SERVER['REQUEST_URI']);
+        if ($timezone && $timezone != $datetime->getTimezone()) {
+            try {
+                $dt = clone $datetime;
+                $dt->setTimezone(new DateTimeZone($timezone));
+                $datetime = $dt;
+            }
+            catch (Exception $e) {
+                // ignore, return original timezone
+            }
+        }
 
-        return $uri;
+        return $datetime->format($format);
     }
 }

iRony-0.4.2.tar.gz/lib/FileAPI/file_viewer.php -> iRony-0.4.3.tar.gz/lib/FileAPI/file_viewer.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/file_wopi.php Added

@@ -0,0 +1,356 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2017, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Document editing sessions handling (WOPI)
+ */
+class file_wopi extends file_document
+{
+    protected $cache;
+
+    // Mimetypes supported by CODE, but not advertised by all possible names
+    protected $mimetype_aliases = array(
+        'application/vnd.corel-draw' => 'image/x-coreldraw',
+    );
+
+    // Mimetypes supported by other Chwala viewers or ones we don't want to be editable
+    protected $mimetype_exceptions = array(
+        'text/plain',
+        'image/bmp',
+        'image/png',
+        'image/jpeg',
+        'image/jpg',
+        'image/pjpeg',
+        'image/gif',
+        'image/tiff',
+        'image/x-tiff',
+    );
+
+    /**
+     * Return viewer URI for specified file/session. This creates
+     * a new collaborative editing session when needed.
+     *
+     * @param string $file        File path
+     * @param array  &$file_info  File metadata (e.g. type)
+     * @param string &$session_id Optional session ID to join to
+     * @param string $readonly    Create readonly (one-time) session
+     *
+     * @return string WOPI URI for specified document
+     * @throws Exception
+     */
+    public function session_start($file, &$file_info, &$session_id = null, $readonly = false)
+    {
+        parent::session_start($file, $file_info, $session_id, $readonly);
+
+        if ($session_id) {
+            // Create Chwala session for use as WOPI access_token
+            // This session will have access to this one document session only
+            $keys = array('env', 'user_id', 'user', 'username', 'password',
+                'storage_host', 'storage_port', 'storage_ssl');
+
+            $data = array_intersect_key($_SESSION, array_flip($keys));
+            $data['document_session'] = $session_id;
+
+            $this->token = $this->api->session->create($data);
+
+            $this->log_login($session_id);
+        }
+
+        return $this->frame_uri($session_id, $file_info['type']);
+    }
+
+    /**
+     * Generate URI of WOPI editing session (WOPIsrc)
+     */
+    protected function frame_uri($id, $mimetype)
+    {
+        $capabilities = $this->capabilities();
+
+        if (empty($capabilities) || empty($mimetype)) {
+            return;
+        }
+
+        $metadata = $capabilities[strtolower($mimetype)];
+
+        if (empty($metadata)) {
+            return;
+        }
+
+        $office_url  = rtrim($metadata['urlsrc'], ' /?'); // collabora
+        $service_url = $this->api->api_url() . '/wopi/files/' . $id;
+
+        // @TODO: Parsing and replacing placeholder values
+        // https://wopi.readthedocs.io/en/latest/discovery.html#action-urls
+
+        $args = array('WOPISrc' => $service_url);
+
+        // We could also set: title, closebutton, revisionhistory
+        // @TODO: do it in editor_post_params() when supported by the editor
+        if ($lang = $this->api->env['language']) {
+            $args['lang'] = str_replace('_', '-', $lang);
+        }
+
+        return $office_url . '?' . http_build_query($args, '', '&');
+    }
+
+    /**
+     * Retern extra viewer parameters to post to the viewer iframe
+     *
+     * @param array $info File info
+     *
+     * @return array POST parameters
+     */
+    public function editor_post_params($info)
+    {
+        // Access token TTL (number of milliseconds since January 1, 1970 UTC)
+        if ($ttl = $this->rc->config->get('session_lifetime', 0) * 60) {
+            $now = new DateTime('now', new DateTimeZone('UTC'));
+            $ttl = ($ttl + $now->format('U')) . '000';
+        }
+
+        $params = array(
+            'access_token'     => $this->token,
+            'access_token_ttl' => $ttl ?: 0,
+        );
+
+        return $params;
+    }
+
+    /**
+     * List supported mimetypes
+     *
+     * @param bool $editable Return only editable mimetypes
+     *
+     * @return array List of supported mimetypes
+     */
+    public function supported_filetypes($editable = false)
+    {
+        $caps = $this->capabilities();
+
+        if ($editable) {
+            $editable = array();
+            foreach ($caps as $mimetype => $c) {
+                if ($c['name'] == 'edit') {
+                    $editable[] = $mimetype;
+                }
+            }
+
+            return $editable;
+        }
+
+        return array_keys($caps);
+    }
+
+    /**
+     * Uses WOPI discovery to get Office capabilities
+     * https://wopi.readthedocs.io/en/latest/discovery.html
+     */
+    protected function capabilities()
+    {
+        $cache_key = 'wopi.capabilities';
+        if ($result = $this->get_from_cache($cache_key)) {
+            return $this->apply_aliases_and_exceptions($result);
+        }
+
+        $office_url  = rtrim($this->rc->config->get('fileapi_wopi_office'), ' /');
+        $office_url .= '/hosting/discovery';
+
+        try {
+            $request = $this->http_request();
+            $request->setMethod(HTTP_Request2::METHOD_GET);
+            $request->setBody('');
+            $request->setUrl($office_url);
+
+            $response = $request->send();
+            $body     = $response->getBody();
+            $code     = $response->getStatus();
+
+            if (empty($body) || $code != 200) {
+                throw new Exception("Unexpected WOPI discovery response");
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, false);
+
+            // Don't bail out here, it would make the kolab_files UI broken
+            return array();
+        }
+
+        // parse XML output
+        // <wopi-discovery>
+        //   <net-zone name="external-http">
+        //     <app name="application/vnd.lotus-wordpro">
+        //       <action ext="lwp" name="edit" urlsrc="https://office.example.org/loleaflet/1.8.3/loleaflet.html?"/>
+        //     </app>
+        // ...
+
+        $node = new DOMDocument('1.0', 'UTF-8');
+        $node->loadXML($body);
+
+        $result = array();
+
+        foreach ($node->getElementsByTagName('app') as $app) {
+            if ($mimetype = $app->getAttribute('name')) {
+                if ($action = $app->getElementsByTagName('action')->item(0)) {
+                    foreach ($action->attributes as $attr) {
+                        $result[$mimetype][$attr->name] = $attr->value;
+                    }
+                }
+            }
+        }
+
+        if (empty($result)) {
+            rcube::raise_error("Failed to parse WOPI discovery response: $body", true, false);
+
+            // Don't bail out here, it would make the kolab_files UI broken
+            return array();
+        }
+
+        $this->save_in_cache($cache_key, $result);
+
+        return $this->apply_aliases_and_exceptions($result);
+    }
+
+    /**
+     * Initializes HTTP request object
+     */
+    protected function http_request()
+    {
+        require_once 'HTTP/Request2.php';
+
+        $request = new HTTP_Request2();
+
+        // Configure connection options
+        $config      = $this->rc->config;
+        $http_config = (array) $config->get('http_request', $config->get('kolab_http_request'));
+
+        // Deprecated config, all options are separated variables
+        if (empty($http_config)) {
+            $options = array(
+                'ssl_verify_peer',
+                'ssl_verify_host',
+                'ssl_cafile',
+                'ssl_capath',
+                'ssl_local_cert',
+                'ssl_passphrase',
+                'follow_redirects',
+            );
+
+            foreach ($options as $optname) {
+                if (($optvalue = $config->get($optname)) !== null
+                    || ($optvalue = $config->get('kolab_' . $optname)) !== null
+                ) {
+                    $http_config[$optname] = $optvalue;
+                }
+            }
+        }
+
+        if (!empty($http_config)) {
+            try {
+                $request->setConfig($http_config);
+            }
+            catch (Exception $e) {
+                rcube::log_error("HTTP: " . $e->getMessage());
+            }
+        }
+
+        // proxy User-Agent
+        $request->setHeader('user-agent', $_SERVER['HTTP_USER_AGENT']);
+
+        // some HTTP server configurations require this header
+        $request->setHeader('accept', "application/json,text/javascript,*/*");
+
+        return $request;
+    }
+
+    /**
+     * Get cached data
+     */
+    protected function get_from_cache($key)
+    {
+        if ($cache = $this->get_cache()) {
+            return $cache->get($key);
+        }
+    }
+
+    /**
+     * Store data in cache
+     */
+    protected function save_in_cache($key, $value)
+    {
+        if ($cache = $this->get_cache()) {
+            $cache->set($key, $value);
+        }
+    }
+
+    /**
+     * Getter for the shared cache engine object
+     */
+    protected function get_cache()
+    {
+        if ($this->cache === null) {
+            $this->cache = $this->rc->get_cache_shared('fileapi') ?: false;
+        }
+
+        return $this->cache;
+    }
+
+    /**
+     * Support more mimetypes in CODE capabilities
+     */
+    protected function apply_aliases_and_exceptions($caps)
+    {
+        foreach ($this->mimetype_aliases as $type => $alias) {
+            if (isset($caps[$type]) && !isset($caps[$alias])) {
+                $caps[$alias] = $caps[$type];
+            }
+        }
+
+        foreach ($this->mimetype_exceptions as $type) {
+            unset($caps[$type]);
+        }
+
+        return $caps;
+    }
+
+    /**
+     * Write login data (name, ID, IP address) to the 'userlogins' log file.
+     */
+    protected function log_login($session_id)
+    {
+        if (!$this->api->config->get('log_logins')) {
+            return;
+        }
+
+        $rcube     = rcube::get_instance();
+        $user_name = $rcube->get_user_name();
+        $user_id   = $rcube->get_user_id();
+
+        $message = sprintf('CODE access for %s (ID: %d) from %s in session %s; %s',
+            $user_name, $user_id, rcube_utils::remote_ip(), session_id(), $session_id);
+
+        // log login
+        rcube::write_log('userlogins', $message);
+    }
+}

iRony-0.4.2.tar.gz/lib/FileAPI/init.php -> iRony-0.4.3.tar.gz/lib/FileAPI/init.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/locale/en_US.php -> iRony-0.4.3.tar.gz/lib/FileAPI/locale/en_US.php Changed

@@ -41,12 +41,14 @@
 $LANG['folder.driverwithpassdesc'] = 'Stored passwords will be encrypted. Enable this if you do not want to be asked for the password on every login or you want this storage to be available via WebDAV.';
 $LANG['folder.name'] = 'Name:';
 $LANG['folder.authenticate'] = 'Logon to $title';
+$LANG['folder.parent'] = 'Subfolder of:';
 
 $LANG['form.submit'] = 'Submit';
 $LANG['form.cancel'] = 'Cancel';
 $LANG['form.hostname'] = 'Hostname:';
 $LANG['form.username'] = 'Username:';
 $LANG['form.password'] = 'Password:';
+$LANG['form.baseuri'] = 'Base URI:';
 
 $LANG['login.username'] = 'Username';
 $LANG['login.password'] = 'Password';
@@ -73,11 +75,31 @@
 $LANG['search.in_all_folders'] = 'in all folders';
 $LANG['search.in_current_folder'] = 'in current folder';
 
+$LANG['share.permissions'] = 'Permissions';
+$LANG['share.readonly'] = 'read-only';
+$LANG['share.readwrite'] = 'read-write';
+$LANG['share.admin'] = 'administrator';
+$LANG['share.usergroup'] = 'User or Group';
+$LANG['share.permission'] = 'Permission';
+$LANG['share.upload-link'] = 'Upload Link';
+$LANG['share.download-link'] = 'Download Link';
+$LANG['share.password'] = 'Password';
+$LANG['share.expire'] = 'Expiration';
+$LANG['share.expiredays'] = 'Expiration time in days';
+$LANG['share.generate'] = 'Generate';
+$LANG['share.link'] = 'Link';
+
 $LANG['size.B'] = 'B';
 $LANG['size.KB'] = 'KB';
 $LANG['size.MB'] = 'MB';
 $LANG['size.GB'] = 'GB';
 
+$LANG['type.vndoasisopendocumenttext'] = 'OpenDocument Document (.odt)';
+$LANG['type.vndoasisopendocumentpresentation'] = 'OpenDocument Presentation (.odp)';
+$LANG['type.vndoasisopendocumentspreadsheet'] = 'OpenDocument Spreadsheet (.ods)';
+$LANG['type.plain'] = 'Plain Text Document (.txt)';
+$LANG['type.html'] = 'HTML Document (.html)';
+
 $LANG['upload.size'] = 'Size:';
 $LANG['upload.size.error'] = 'Maximum upload size ($size) exceeded!';
 $LANG['upload.progress'] = 'Progress:';

iRony-0.4.3.tar.gz/lib/FileAPI/templates Added

iRony-0.4.3.tar.gz/lib/FileAPI/templates/empty.odp Added

iRony-0.4.3.tar.gz/lib/FileAPI/templates/empty.ods Added

iRony-0.4.3.tar.gz/lib/FileAPI/templates/empty.odt Added

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/doc Added

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/doc.php Added

@@ -0,0 +1,130 @@
+<?php
+/*
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2011-2016, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+/**
+ * Class integrating Collabora Online documents viewer
+ */
+class file_viewer_doc extends file_viewer
+{
+    /**
+     * Class constructor
+     *
+     * @param file_api File API object
+     */
+    public function __construct($api)
+    {
+        $this->api = $api;
+    }
+
+    /**
+     * Returns list of supported mimetype
+     *
+     * @return array List of mimetypes
+     */
+    public function supported_mimetypes()
+    {
+        $rcube = rcube::get_instance();
+
+        // Get list of supported types from Collabora
+        if ($rcube->config->get('fileapi_wopi_office')) {
+            $wopi = new file_wopi($this->api);
+            if ($types = $wopi->supported_filetypes()) {
+                return $types;
+            }
+        }
+
+        return array();
+    }
+
+    /**
+     * Check if mimetype is supported by the viewer
+     *
+     * @param string $mimetype File type
+     *
+     * @return bool True if mimetype is supported, False otherwise
+     */
+    public function supports($mimetype)
+    {
+        return in_array($mimetype, $this->supported_mimetypes());
+    }
+
+    /**
+     * Return file viewer URL
+     *
+     * @param string $file     File name
+     * @param string $mimetype File type
+     */
+    public function href($file, $mimetype = null)
+    {
+        return $this->api->file_url($file) . '&viewer=doc';
+    }
+
+    /**
+     * Print output and exit
+     *
+     * @param string $file      File name
+     * @param array  $file_info File metadata (e.g. type)
+     */
+    public function output($file, $file_info = array())
+    {
+        // Create readonly session and get WOPI request parameters
+        $wopi = new file_wopi($this->api);
+        $url  = $wopi->session_start($file, $file_info, $session, true);
+
+        if (!$url) {
+            $this->api->output_error("Failed to open file", 404);
+        }
+
+        $info = array('readonly' => true);
+        $post = $wopi->editor_post_params($info);
+        $url  = htmlentities($url);
+        $form = '';
+
+        foreach ($post as $name => $value) {
+            $form .= '<input type="hidden" name="' . $name . '" value="' . $value . '" />';
+        }
+
+        echo <<<EOT
+<html>
+  <head>
+    <script src="viewers/doc/file_editor.js" type="text/javascript" charset="utf-8"></script>
+    <style>
+      iframe, body { width: 100%; height: 100%; margin: 0; border: none; }
+      form { display: none; }
+    </style>
+  </head>
+  <body>
+    <iframe id="viewer" name="viewer" allowfullscreen></iframe>
+    <form target="viewer" method="post" action="$url">
+      $form
+    </form>
+    <script type="text/javascript">
+      var file_editor = new file_editor;
+      file_editor.init();
+    </script>
+  </body>
+</html>
+EOT;
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/viewers/doc/file_editor.js Added

iRony-0.4.2.tar.gz/lib/FileAPI/viewers/image.php -> iRony-0.4.3.tar.gz/lib/FileAPI/viewers/image.php Changed

@@ -60,9 +60,7 @@
      */
     public function href($file, $mimetype = null)
     {
-        $href = file_utils::script_uri() . '?method=file_get'
-            . '&file=' . urlencode($file)
-            . '&token=' . urlencode(session_id());
+        $href = $this->api->file_url($file);
 
         // we redirect to self only images with types unsupported
         // by browser
@@ -76,14 +74,14 @@
     /**
      * Print output and exit
      *
-     * @param string $file     File name
-     * @param string $mimetype File type
+     * @param string $file      File name
+     * @param array  $file_info File metadata (e.g. type)
      */
-    public function output($file, $mimetype = null)
+    public function output($file, $file_info = array())
     {
 /*
         // conversion not needed
-        if (preg_match('/^image/p?jpe?g$/i', $mimetype)) {
+        if (preg_match('/^image/p?jpe?g$/i', $file_info['type'])) {
             $this->api->api->file_get($file);
             return;
         }

iRony-0.4.2.tar.gz/lib/FileAPI/viewers/media.php -> iRony-0.4.3.tar.gz/lib/FileAPI/viewers/media.php Changed

@@ -67,7 +67,7 @@
      */
     public function frame($file, $mimetype = null)
     {
-        $path     = file_utils::script_uri();
+        $path     = $this->api->api_url();
         $file_uri = htmlentities($this->api->file_url($file));
         $mimetype = htmlentities($mimetype);
         $source   = "<source src=\"$file_uri\" type=\"$mimetype\"></source>";
@@ -80,26 +80,21 @@
         }
 
         return <<<EOT
-    <link rel="stylesheet" type="text/css" href="{$path}viewers/media/mediaelementplayer.css" />
-    <script type="text/javascript" src="{$path}viewers/media/mediaelement-and-player.js"></script>
+    <link rel="stylesheet" type="text/css" href="$path/viewers/media/mediaelementplayer.css" />
+    <script type="text/javascript" src="$path/viewers/media/mediaelement-and-player.js"></script>
     <$tag id="media-player" controls preload="auto">$source</$tag>
     <style>
       .mejs-container { text-align: center; }
     </style>
     <script>
-      var content_frame = $('#media-player').parent(),
-        height = content_frame.height(),
-        width = content_frame.width(),
+      var height = '100%';
+        width = '100%';
         player = new MediaElementPlayer('#media-player', {
           videoHeight: height, audioHeight: height, videoWidth: width, audioWidth: width
         });
 
       player.pause();
       player.play();
-      // add player resize handler
-      $(window).resize(function() {
-        player.setPlayerSize(content_frame.width(), content_frame.height());
-      });
     </script>
 EOT;
     }

iRony-0.4.2.tar.gz/lib/FileAPI/viewers/odf.php -> iRony-0.4.3.tar.gz/lib/FileAPI/viewers/odf.php Changed

@@ -90,17 +90,6 @@
     }
 
     /**
-     * Return output of file content area
-     *
-     * @param string $file     File name
-     * @param string $mimetype File type
-     */
-    public function frame($file, $mimetype = null)
-    {
-        // we use iframe method, see output()
-    }
-
-    /**
      * Return file viewer URL
      *
      * @param string $file     File name
@@ -108,19 +97,16 @@
      */
     public function href($file, $mimetype = null)
     {
-        return file_utils::script_uri() . '?method=file_get'
-            . '&viewer=odf'
-            . '&file=' . urlencode($file)
-            . '&token=' . urlencode(session_id());
+        return $this->api->file_url($file) . '&viewer=odf';
     }
 
     /**
      * Print output and exit
      *
-     * @param string $file     File name
-     * @param string $mimetype File type
+     * @param string $file      File name
+     * @param array  $file_info File metadata (e.g. type)
      */
-    public function output($file, $mimetype = null)
+    public function output($file, $file_info = array())
     {
         $file_uri = $this->api->file_url($file);

iRony-0.4.2.tar.gz/lib/FileAPI/viewers/pdf.php -> iRony-0.4.3.tar.gz/lib/FileAPI/viewers/pdf.php Changed

iRony-0.4.2.tar.gz/lib/FileAPI/viewers/text.php -> iRony-0.4.3.tar.gz/lib/FileAPI/viewers/text.php Changed

iRony-0.4.3.tar.gz/lib/FileAPI/wopi Added

iRony-0.4.3.tar.gz/lib/FileAPI/wopi/containers.php Added

@@ -0,0 +1,34 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2018, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_wopi_containers
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        throw new Exception("Not implemented", file_api_core::ERROR_NOT_IMPLEMENTED);
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/wopi/ecosystem.php Added

@@ -0,0 +1,34 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2018, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+class file_wopi_ecosystem
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        throw new Exception("Not implemented", file_api_core::ERROR_NOT_IMPLEMENTED);
+    }
+}

iRony-0.4.3.tar.gz/lib/FileAPI/wopi/files.php Added

@@ -0,0 +1,199 @@
+<?php
+/**
+ +--------------------------------------------------------------------------+
+ | This file is part of the Kolab File API                                  |
+ |                                                                          |
+ | Copyright (C) 2012-2018, Kolab Systems AG                                |
+ |                                                                          |
+ | 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/>      |
+ +--------------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                      |
+ +--------------------------------------------------------------------------+
+*/
+
+require_once __DIR__ . "/../api/common.php";
+require_once __DIR__ . "/../api/document.php";
+
+class file_wopi_files extends file_api_document
+{
+    /**
+     * Request handler
+     */
+    public function handle()
+    {
+        if (empty($this->api->path)) {
+            throw new Exception("File ID not specified", file_api_core::ERROR_NOT_FOUND);
+        }
+
+        $file_id = $this->api->path[0];
+        $command = $this->api->path[1];
+
+        if ($file_id != $_SESSION['document_session']) {
+            throw new Exception("File ID not specified", file_api_core::ERROR_UNAUTHORIZED);
+        }
+
+        if ($this->api->method == 'GET') {
+            if (empty($command)) {
+                return $this->document_info($file_id);
+            }
+
+            if ($command == 'contents') {
+                return $this->document_get($file_id);
+            }
+        }
+        else if ($this->api->method == 'PUT') {
+            if ($command == 'contents') {
+                return $this->document_put($file_id);
+            }
+        }
+/*
+        else if (empty($command)) {
+            switch ($api->method)
+            // TODO case 'UNLOCK':
+            // TODO case 'LOCK':
+            // TODO case 'GET_LOCK':
+            // TODO case 'REFRESH_LOCK':
+            // TODO case 'PUT_RELATIVE':
+            // TODO case 'RENAME_FILE':
+            // TODO case 'DELETE':
+            // TODO case 'PUT_USER_INFO':
+            // TODO case 'GET_SHARE_URL':
+            }
+        }
+*/
+        throw new Exception("Unknown method", file_api_core::ERROR_NOT_IMPLEMENTED);
+    }
+
+    /**
+     * Return document informations
+     *
+     * JSON Response (only required attributes listed):
+     * - BaseFileName: The string name of the file without a path. Used for
+     *   display in user interface (UI), and determining the extension
+     *   of the file.
+     * - OwnerId: A string that uniquely identifies the owner of the file.
+     * - Size: The size of the file in bytes, expressed as a long,
+     *   a 64-bit signed integer.
+     * - UserId: A string value uniquely identifying the user currently
+     *   accessing the file.
+     * - Version: The current version of the file based on the server’s file
+     *   version schema, as a string. This value must change when the file changes.
+     */
+    protected function document_info($id)
+    {
+        $info = parent::document_info($id);
+
+        // Convert file metadata to Wopi format
+        // TODO: support more properties from
+        //       https://wopirest.readthedocs.io/en/latest/files/CheckFileInfo.html
+
+        $result = array(
+            'BaseFileName'              => $info['name'],
+            'Size'                      => $info['size'],
+            'Version'                   => $info['modified'],
+            'OwnerId'                   => $info['owner'],
+            'UserId'                    => $info['user'],
+            'UserFriendlyName'          => $info['user_name'] ?: preg_replace('/@.*$/', '', $info['user']),
+            'UserCanWrite'              => empty($info['readonly']),
+            'PostMessageOrigin'         => $info['origin'],
+            // Tell the client we do not support PutRelativeFile yet
+            'UserCanNotWriteRelative'   => true,
+            // Properties specific to Collabora Online
+            'HideSaveOption'            => true,
+            'HideExportOption'          => true,
+            'HidePrintOption'           => true,
+            'EnableOwnerTermination'    => true,
+            'WatermarkText'             => '', // ??
+            'DisablePrint'              => false,
+            'DisableExport'             => false,
+            'DisableCopy'               => false,
+            'DisableInactiveMessages'   => true,
+            'DisableChangeTrackingRecord' => true,
+            'DisableChangeTrackingShow'   => true,
+            'HideChangeTrackingControls'  => true,
+            // TODO: 'UserExtraInfo' => ['avatar' => 'http://url/to/user/avatar', 'mail' => $info['user']]
+            'UserExtraInfo'             => array(),
+        );
+
+        if ($info['modified']) {
+            try {
+                $dt = new DateTime('@' . $info['modified'], new DateTimeZone('UTC'));
+                $result['LastModifiedTime'] = $dt->format('Y-m-d\TH:i:s') . '.0000000Z';
+            }
+            catch (Exception $e) {
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Update document file content
+     *
+     * Request Headers:
+     * - X-WOPI-Lock: A string provided by the WOPI client in a previous Lock request.
+     *   Note that this header will not be included during document creation.
+     * Collabora-specific Request Headers:
+     * - X-LOOL-WOPI-IsModifiedByUser: true/false indicates whether the document
+     *   was modified by the user when they saved it.
+     * - X-LOOL-WOPI-IsAutosave: true/false indicates whether the PutFile
+     *   is a result of autosave or the user pressing the Save button.
+     * Response Headers:
+     * - X-WOPI-Lock: A string value identifying the current lock on the file.
+     *   This header must always be included when responding to the request with 409.
+     *   It should not be included when responding to the request with 200 OK.
+     * - X-WOPI-LockFailureReason: An optional string value indicating the cause
+     *   of a lock failure.
+     * - X-WOPI-ItemVersion: An optional string value indicating the version of the file.
+     *   Its value should be the same as Version value in CheckFileInfo.
+     * Status Codes:
+     * - 409 Conflict: Lock mismatch/locked by another interface
+     * - 413 Request Entity Too Large: File is too large; Host limit exceeded.
+     */
+    protected function document_put($file_id)
+    {
+        // TODO: Locking
+
+        parent::document_put($file_id);
+    }
+
+    /**
+     * Return document file content
+     *
+     * Request Headers:
+     * - X-WOPI-MaxExpectedSize: An integer specifying the upper bound
+     *   of the expected size of the file being requested. Optional.
+     *   The host should use the maximum value of a 4-byte integer
+     *   if this value is not set in the request.
+     * Response Headers:
+     * - X-WOPI-ItemVersion: An optional string value indicating the version of the file.
+     *   Its value should be the same as Version value in CheckFileInfo.
+     * Status Codes:
+     * - 412 File is larger than X-WOPI-MaxExpectedSize
+     */
+    protected function document_get($id)
+    {
+        $doc_info = parent::document_info($id, false);
+        $max_size = rcube_utils::request_header('X-WOPI-MaxExpectedSize') ?: 1024 * 1024 * 1024;
+
+        // Check max file size
+        if ($doc_info['size'] > $max_size) {
+            throw new Exception("File exceeds max expected size", file_api_core::ERROR_PRECONDITION_FAILED);
+        }
+
+        header("X-WOPI-ItemVersion: " . $doc_info['modified']);
+
+        parent::document_get($id);
+    }
+}

iRony-0.4.2.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php -> iRony-0.4.3.tar.gz/lib/Kolab/CalDAV/CalendarBackend.php Changed

iRony-0.4.2.tar.gz/lib/Kolab/CalDAV/Plugin.php -> iRony-0.4.3.tar.gz/lib/Kolab/CalDAV/Plugin.php Changed

iRony-0.4.2.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php -> iRony-0.4.3.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php Changed

iRony-0.4.2.tar.gz/lib/Kolab/CardDAV/Plugin.php -> iRony-0.4.3.tar.gz/lib/Kolab/CardDAV/Plugin.php Changed

iRony-0.4.2.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php -> iRony-0.4.3.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php Changed

@@ -101,7 +101,9 @@
             $error_str = rcube::get_instance()->get_storage()->get_error_str();
         }
 
-        \kolab_auth::log_login_error($auth['user'], $error_str ?: $error);
+        if (class_exists('kolab_auth')) {
+            \kolab_auth::log_login_error($auth['user'], $error_str ?: $error);
+        }
 
         // IMAP server failure... send 503 error
         if ($error == rcube_imap_generic::ERROR_BAD) {
@@ -173,6 +175,7 @@
         $storage      = $rcube->get_storage();
         $login_lc     = $rcube->config->get('login_lc');
         $default_port = $rcube->config->get('default_port', 143);
+        $username_domain = $rcube->config->get('username_domain');
 
         // parse $host
         $a_host = parse_url($host);
@@ -191,6 +194,24 @@
             $port = $default_port;
         }
 
+        // Check if we need to add/force domain to username
+        if (!empty($username_domain)) {
+            $domain = is_array($username_domain) ? $username_domain[$host] : $username_domain;
+
+            if ($domain = rcube_utils::parse_host((string)$domain, $host)) {
+                $pos = strpos($username, '@');
+
+                // force configured domains
+                if ($pos !== false && $rcube->config->get('username_domain_forced')) {
+                    $username = substr($username, 0, $pos) . '@' . $domain;
+                }
+                // just add domain if not specified
+                else if ($pos === false) {
+                    $username .= '@' . $domain;
+                }
+            }
+        }
+
         // Convert username to lowercase. If storage backend
         // is case-insensitive we need to store always the same username
         if ($login_lc) {

iRony-0.4.2.tar.gz/lib/Kolab/Utils/DAVBackend.php -> iRony-0.4.3.tar.gz/lib/Kolab/Utils/DAVBackend.php Changed

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

iRony-0.4.2.tar.gz/lib/Roundcube/README.md -> iRony-0.4.3.tar.gz/lib/Roundcube/README.md Changed

iRony-0.4.2.tar.gz/lib/Roundcube/bootstrap.php -> iRony-0.4.3.tar.gz/lib/Roundcube/bootstrap.php Changed

@@ -2,8 +2,9 @@
 
 /**
  +-----------------------------------------------------------------------+
- | This file is part of the Roundcube PHP suite                          |
- | Copyright (C) 2005-2017, The Roundcube Dev Team                       |
+ | This file is part of the Roundcube webmail client                     |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -57,7 +58,7 @@
 }
 
 // framework constants
-define('RCUBE_VERSION', '1.4-git');
+define('RCUBE_VERSION', '1.4.2');
 define('RCUBE_CHARSET', 'UTF-8');
 define('RCUBE_TEMP_FILE_PREFIX', 'RCMTEMP');
 
@@ -168,6 +169,10 @@
 
 /**
  * Make sure the string ends with a slash
+ *
+ * @param string $str A string
+ *
+ * @return string A string ending with a slash
  */
 function slashify($str)
 {
@@ -176,6 +181,10 @@
 
 /**
  * Remove slashes at the end of the string
+ *
+ * @param string $str A string
+ *
+ * @return string A string ending with no slash
  */
 function unslashify($str)
 {
@@ -284,6 +293,12 @@
 
 /**
  * Remove all non-ascii and non-word chars except ., -, _
+ *
+ * @param string $str          A string
+ * @param bool   $css_id       The result may be used as CSS identifier
+ * @param string $replace_with Replacement character
+ *
+ * @return string Clean string
  */
 function asciiwords($str, $css_id = false, $replace_with = '')
 {
@@ -297,7 +312,7 @@
  * @param string $str           String to check
  * @param bool   $control_chars Includes control characters
  *
- * @return bool
+ * @return bool True if the string contains ASCII-only, False otherwise
  */
 function is_ascii($str, $control_chars = true)
 {
@@ -367,18 +382,23 @@
     );
 }
 
-/**
- * intl replacement functions
- */
+// intl replacement functions
 
 if (!function_exists('idn_to_utf8'))
 {
+    /**
+     * Convert domain name from IDNA ASCII to Unicode
+     *
+     * @param string $domain Domain to convert in an IDNA ASCII-compatible format.
+     *
+     * @return string|false Unicode domain, False on failure
+     */
     function idn_to_utf8($domain)
     {
         static $idn, $loaded;
 
         if (!$loaded) {
-            $idn    = new Net_IDNA2();
+            $idn    = new Net_IDNA2(array('version' => '2008'));
             $loaded = true;
         }
 
@@ -387,6 +407,7 @@
                 $domain = $idn->decode($domain);
             }
             catch (Exception $e) {
+                return false;
             }
         }
 
@@ -396,12 +417,19 @@
 
 if (!function_exists('idn_to_ascii'))
 {
+    /**
+     * Convert domain name to IDNA ASCII-compatible form Unicode
+     *
+     * @param string $domain The domain to convert, which must be UTF-8 encoded
+     *
+     * @return string|false The domain name encoded in ASCII-compatible form, False on failure
+     */
     function idn_to_ascii($domain)
     {
         static $idn, $loaded;
 
         if (!$loaded) {
-            $idn    = new Net_IDNA2();
+            $idn    = new Net_IDNA2(array('version' => '2008'));
             $loaded = true;
         }
 
@@ -410,6 +438,7 @@
                 $domain = $idn->encode($domain);
             }
             catch (Exception $e) {
+                return false;
             }
         }
 
@@ -420,6 +449,10 @@
 /**
  * Use PHP5 autoload for dynamic class loading
  *
+ * @param string $classname Class name
+ *
+ * @return bool True when the class file has been found
+ *
  * @todo Make Zend, PEAR etc play with this
  * @todo Make our classes conform to a more straight forward CS.
  */

iRony-0.4.2.tar.gz/lib/Roundcube/cache/apc.php -> iRony-0.4.3.tar.gz/lib/Roundcube/cache/apc.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2018, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_cache_apc extends rcube_cache
 {

iRony-0.4.2.tar.gz/lib/Roundcube/cache/db.php -> iRony-0.4.3.tar.gz/lib/Roundcube/cache/db.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2018, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_cache_db extends rcube_cache
 {

iRony-0.4.2.tar.gz/lib/Roundcube/cache/memcache.php -> iRony-0.4.3.tar.gz/lib/Roundcube/cache/memcache.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2018, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_cache_memcache extends rcube_cache
 {
@@ -95,7 +94,7 @@
             if (!$seen["$host:$port"]++) {
                 $available--;
                 rcube::raise_error(array(
-                        'code' => 604, 'type' => 'db',
+                        'code' => 604, 'type' => 'memcache',
                         'line' => __LINE__, 'file' => __FILE__,
                         'message' => "Memcache failure on host $host:$port"),
                     true, false);

iRony-0.4.3.tar.gz/lib/Roundcube/cache/memcached.php Added

@@ -0,0 +1,217 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Caching engine - Memcache                                           |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Interface class for accessing Memcached cache
+ *
+ * @package    Framework
+ * @subpackage Cache
+ */
+class rcube_cache_memcached extends rcube_cache
+{
+    /**
+     * Instance of memcached handler
+     *
+     * @var Memcached
+     */
+    protected static $memcache;
+
+
+    /**
+     * Object constructor.
+     *
+     * @param int    $userid User identifier
+     * @param string $prefix Key name prefix
+     * @param string $ttl    Expiration time of memcache/apc items
+     * @param bool   $packed Enables/disabled data serialization.
+     *                       It's possible to disable data serialization if you're sure
+     *                       stored data will be always a safe string
+     */
+    public function __construct($userid, $prefix = '', $ttl = 0, $packed = true)
+    {
+        parent::__construct($userid, $prefix, $ttl, $packed);
+
+        $this->type  = 'memcache';
+        $this->debug = rcube::get_instance()->config->get('memcache_debug');
+
+        // Maximum TTL is 30 days, bigger values are treated by Memcached
+        // as unix timestamp which is not what we want
+        if ($this->ttl > 60*60*24*30) {
+            $this->ttl = 60*60*24*30;
+        }
+
+        self::engine();
+    }
+
+    /**
+     * Get global handle for memcache access
+     *
+     * @return object Memcache
+     */
+    public static function engine()
+    {
+        if (self::$memcache !== null) {
+            return self::$memcache;
+        }
+
+        // no memcache support in PHP
+        if (!class_exists('Memcached')) {
+            self::$memcache = false;
+
+            rcube::raise_error(array(
+                    'code' => 604, 'type' => 'memcache', 'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Failed to find Memcached. Make sure php-memcached is installed"
+                ),
+                true, true);
+        }
+
+        // add all configured hosts to pool
+        $rcube          = rcube::get_instance();
+        $pconnect       = $rcube->config->get('memcache_pconnect', true);
+        $timeout        = $rcube->config->get('memcache_timeout', 1);
+        $retry_interval = $rcube->config->get('memcache_retry_interval', 15);
+        $hosts          = $rcube->config->get('memcache_hosts');
+        $persistent_id  = $pconnect ? ('rc' . md5(serialize($hosts))) : null;
+
+        self::$memcache = new Memcached($persistent_id);
+
+        self::$memcache->setOptions(array(
+                Memcached::OPT_CONNECT_TIMEOUT => $timeout * 1000,
+                Memcached::OPT_RETRY_TIMEOUT   => $timeout,
+                Memcached::OPT_DISTRIBUTION    => Memcached::DISTRIBUTION_CONSISTENT,
+                Memcached::OPT_COMPRESSION     => true,
+        ));
+
+        if (!$pconnect || !count(self::$memcache->getServerList())) {
+            foreach ((array) $hosts as $host) {
+                if (substr($host, 0, 7) != 'unix://') {
+                    list($host, $port) = explode(':', $host);
+                    if (!$port) $port = 11211;
+                }
+                else {
+                    $host = substr($host, 8);
+                    $port = 0;
+                }
+
+                self::$memcache->addServer($host, $port);
+            }
+        }
+
+        // test connection
+        $result = self::$memcache->increment('__CONNECTIONTEST__');
+
+        if ($result === false && ($res_code = self::$memcache->getResultCode()) !== Memcached::RES_NOTFOUND) {
+            self::$memcache = false;
+
+            rcube::raise_error(array(
+                    'code' => 604, 'type' => 'memcache', 'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Memcache connection failure (code: $res_code)."
+                ),
+                true, false);
+        }
+
+        return self::$memcache;
+    }
+
+    /**
+     * Remove cache records older than ttl
+     */
+    public function expunge()
+    {
+        // No need for GC, entries are expunged automatically
+    }
+
+    /**
+     * Remove expired records of all caches
+     */
+    public static function gc()
+    {
+        // No need for GC, entries are expunged automatically
+    }
+
+    /**
+     * Reads cache entry.
+     *
+     * @param string $key Cache internal key name
+     *
+     * @return mixed Cached value
+     */
+    protected function get_item($key)
+    {
+        if (!self::$memcache) {
+            return false;
+        }
+
+        $data = self::$memcache->get($key);
+
+        if ($this->debug) {
+            $this->debug('get', $key, $data);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Adds entry into the cache.
+     *
+     * @param string $key  Cache internal key name
+     * @param mixed  $data Serialized cache data
+     *
+     * @param boolean True on success, False on failure
+     */
+    protected function add_item($key, $data)
+    {
+        if (!self::$memcache) {
+            return false;
+        }
+
+        $result = self::$memcache->set($key, $data, $this->ttl);
+
+        if ($this->debug) {
+            $this->debug('set', $key, $data, $result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes entry from the cache
+     *
+     * @param string $key Cache internal key name
+     *
+     * @param boolean True on success, False on failure
+     */
+    protected function delete_item($key)
+    {
+        if (!self::$memcache) {
+            return false;
+        }
+
+        // #1488592: use 2nd argument
+        $result = self::$memcache->delete($key, 0);
+
+        if ($this->debug) {
+            $this->debug('delete', $key, null, $result);
+        }
+
+        return $result;
+    }
+}

iRony-0.4.2.tar.gz/lib/Roundcube/cache/redis.php -> iRony-0.4.3.tar.gz/lib/Roundcube/cache/redis.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2018, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_cache_redis extends rcube_cache
 {
@@ -82,8 +81,8 @@
                 true, true);
         }
 
-        $rcube     = rcube::get_instance();
-        $hosts     = $rcube->config->get('redis_hosts');
+        $rcube = rcube::get_instance();
+        $hosts = $rcube->config->get('redis_hosts');
 
         // host config is wrong
         if (!is_array($hosts) || empty($hosts)) {
@@ -110,62 +109,58 @@
         }
 
         self::$redis = new Redis;
+        $failures    = 0;
 
         foreach ($hosts as $redis_host) {
             // explode individual fields
             list($host, $port, $database, $password) = array_pad(explode(':', $redis_host, 4), 4, null);
 
-            $params = parse_url($redis_host);
-            if ($params['scheme'] == 'redis') {
-                $host = (isset($params['host'])) ? $params['host'] : null;
-                $port = (isset($params['port'])) ? $params['port'] : null;
-                $database = (isset($params['database'])) ? $params['database'] : null;
-                $password = (isset($params['password'])) ? $params['password'] : null;
+            if (substr($redis_host, 0, 7) === 'unix://') {
+                $host = substr($port, 2);
+                $port = null;
             }
-
-            // set default values if not set
-            $host = ($host !== null) ? $host : '127.0.0.1';
-            $port = ($port !== null) ? $port : 6379;
-            $database = ($database !== null) ? $database : 0;
-
-            if (self::$redis->connect($host, $port) === false) {
-                rcube::raise_error(array(
-                        'code' => 604,
-                        'type' => 'redis',
-                        'line' => __LINE__,
-                        'file' => __FILE__,
-                        'message' => "Could not connect to Redis server. Please check host and port"
-                    ),
-                    true, true);
+            else {
+                // set default values if not set
+                $host = $host ?: '127.0.0.1';
+                $port = $port ?: 6379;
             }
 
-            if ($password != null && self::$redis->auth($password) === false) {
-                rcube::raise_error(array(
-                        'code' => 604,
-                        'type' => 'redis',
-                        'line' => __LINE__,
-                        'file' => __FILE__,
-                        'message' => "Could not authenticate with Redis server. Please check password."
-                    ),
-                    true, true);
-            }
+            try {
+                if (self::$redis->connect($host, $port) === false) {
+                    throw new Exception("Could not connect to Redis server. Please check host and port.");
+                }
+
+                if ($password !== null && self::$redis->auth($password) === false) {
+                    throw new Exception("Could not authenticate with Redis server. Please check password.");
+                }
 
-            if ($database != 0 && self::$redis->select($database) === false) {
-                rcube::raise_error(array(
-                        'code' => 604,
-                        'type' => 'redis',
-                        'line' => __LINE__,
-                        'file' => __FILE__,
-                        'message' => "Could not select Redis database. Please check database setting."
-                    ),
-                    true, true);
+                if ($database !== null && self::$redis->select($database) === false) {
+                    throw new Exception("Could not select Redis database. Please check database setting.");
+                }
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, false);
+                $failures++;
             }
         }
 
-        if (self::$redis->ping() != "+PONG") {
+        if (count($hosts) === $failures) {
             self::$redis = false;
         }
 
+        if (self::$redis) {
+            try {
+                $ping = self::$redis->ping();
+                if ($ping !== true && $ping !== "+PONG") {
+                    throw new Exception("Redis connection failure. Ping failed.");
+                }
+            }
+            catch (Exception $e) {
+                self::$redis = false;
+                rcube::raise_error($e, true, false);
+            }
+        }
+
         return self::$redis;
     }
 
@@ -198,7 +193,13 @@
             return false;
         }
 
-        $data = self::$redis->get($key);
+        try {
+            $data = self::$redis->get($key);
+        }
+        catch (Exception $e) {
+            raise_error($e, true, false);
+            return false;
+        }
 
         if ($this->debug) {
             $this->debug('get', $key, $data);
@@ -221,7 +222,13 @@
             return false;
         }
 
-        $result = self::$redis->setEx($key, $this->ttl, $data);
+        try {
+            $result = self::$redis->setEx($key, $this->ttl, $data);
+        }
+        catch (Exception $e) {
+            raise_error($e, true, false);
+            return false;
+        }
 
         if ($this->debug) {
             $this->debug('set', $key, $data, $result);
@@ -243,7 +250,14 @@
             return false;
         }
 
-        $result = self::$redis->delete($key);
+        try {
+            $fname  = method_exists(self::$redis, 'del') ? 'del' : 'delete';
+            $result = self::$redis->$fname($key);
+        }
+        catch (Exception $e) {
+            raise_error($e, true, false);
+            return false;
+        }
 
         if ($this->debug) {
             $this->debug('delete', $key, null, $result);

iRony-0.4.2.tar.gz/lib/Roundcube/db/mssql.php -> iRony-0.4.3.tar.gz/lib/Roundcube/db/mssql.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/db/mysql.php -> iRony-0.4.3.tar.gz/lib/Roundcube/db/mysql.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -69,7 +70,7 @@
             $args = $args[0];
         }
 
-        return 'CONCAT(' . join(', ', $args) . ')';
+        return 'CONCAT(' . implode(', ', $args) . ')';
     }
 
     /**
@@ -140,6 +141,10 @@
             $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca'];
         }
 
+        if (isset($dsn['verify_server_cert'])) {
+            $result[PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = rcube_utils::get_boolean($dsn['verify_server_cert']);
+        }
+
         // Always return matching (not affected only) rows count
         $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;

iRony-0.4.2.tar.gz/lib/Roundcube/db/oracle.php -> iRony-0.4.3.tar.gz/lib/Roundcube/db/oracle.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/db/pgsql.php -> iRony-0.4.3.tar.gz/lib/Roundcube/db/pgsql.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2017, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -190,9 +191,8 @@
     {
         // get tables if not cached
         if ($this->tables === null) {
-            if ($schema = $this->options['table_prefix']) {
-                $schema = str_replace('.', '', $schema);
-                $add    = " AND TABLE_SCHEMA = " . $this->quote($schema);
+            if (($schema = $this->options['table_prefix']) && $schema[strlen($schema)-1] === '.') {
+                $add = " AND TABLE_SCHEMA = " . $this->quote(substr($schema, 0, -1));
             }
             else {
                 $add = " AND TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')";
@@ -219,9 +219,9 @@
     {
         $args = array($table);
 
-        if ($schema = $this->options['table_prefix']) {
+        if (($schema = $this->options['table_prefix']) && $schema[strlen($schema)-1] === '.') {
             $add    = " AND TABLE_SCHEMA = ?";
-            $args[] = str_replace('.', '', $schema);
+            $args[] = substr($schema, 0, -1);
         }
         else {
             $add = " AND TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')";

iRony-0.4.2.tar.gz/lib/Roundcube/db/sqlite.php -> iRony-0.4.3.tar.gz/lib/Roundcube/db/sqlite.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/db/sqlsrv.php -> iRony-0.4.3.tar.gz/lib/Roundcube/db/sqlsrv.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/html.php -> iRony-0.4.3.tar.gz/lib/Roundcube/html.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -225,7 +226,8 @@
     /**
      * Derrived method to create <iframe></iframe>
      *
-     * @param mixed $attr Hash array with tag attributes or string with frame source (src)
+     * @param mixed  $attr Hash array with tag attributes or string with frame source (src)
+     * @param string $cont Tag content
      *
      * @return string HTML code
      * @see html::tag()
@@ -254,15 +256,21 @@
         if (is_string($attr)) {
             $attr = array('src' => $attr);
         }
+
         if ($cont) {
-            if (self::$doctype == 'xhtml')
-                $cont = "\n/* <![CDATA[ */\n" . $cont . "\n/* ]]> */\n";
-            else
-                $cont = "\n" . $cont . "\n";
+            if (self::$doctype == 'xhtml') {
+                $cont = "/* <![CDATA[ */\n{$cont}\n/* ]]> */";
+            }
+
+            $cont = "\n{$cont}\n";
         }
 
-        return self::tag('script', $attr + array('type' => 'text/javascript', 'nl' => true),
-            $cont, array_merge(self::$common_attrib, array('src','type','charset')));
+        if (self::$doctype == 'xhtml') {
+            $attr += array('type' => 'text/javascript');
+        }
+
+        return self::tag('script', $attr + array('nl' => true), $cont,
+            array_merge(self::$common_attrib, array('src', 'type', 'charset')));
     }
 
     /**
@@ -774,6 +782,10 @@
         $cell->attrib  = $attr;
         $cell->content = $cont;
 
+        if (!isset($this->rows[$this->rowindex])) {
+            $this->rows[$this->rowindex] = new stdClass;
+        }
+
         $this->rows[$this->rowindex]->cells[$this->colindex] = $cell;
         $this->colindex += max(1, intval($attr['colspan']));
 
@@ -934,13 +946,14 @@
         $this->content = $thead . ($this->tagname == 'table' ? self::tag('tbody', null, $tbody) : $tbody);
 
         unset($this->attrib['cols'], $this->attrib['rowsonly']);
+
         return parent::show();
     }
 
     /**
      * Count number of rows
      *
-     * @return The number of rows
+     * @return int The number of rows
      */
     public function size()
     {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2014, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -38,101 +39,60 @@
 
     const DEBUG_LINE_LENGTH = 4096;
 
-    /**
-     * Singleton instance of rcube
-     *
-     * @var rcube
-     */
-    static protected $instance;
-
-    /**
-     * Stores instance of rcube_config.
-     *
-     * @var rcube_config
-     */
+    /** @var rcube_config Stores instance of rcube_config */
     public $config;
 
-    /**
-     * Instance of database class.
-     *
-     * @var rcube_db
-     */
+    /** @var rcube_db Instance of database class */
     public $db;
 
-    /**
-     * Instance of Memcache class.
-     *
-     * @var Memcache
-     */
+    /** @var Memcache Instance of Memcache class */
     public $memcache;
 
-    /**
-     * Instance of Redis class.
-     *
-     * @var Redis
-     */
+    /** @var Memcached Instance of Memcached class */
+    public $memcached;
+
+    /** @var Redis Instance of Redis class */
     public $redis;
 
-   /**
-     * Instance of rcube_session class.
-     *
-     * @var rcube_session
-     */
+    /** @var rcube_session Instance of rcube_session class */
     public $session;
 
-    /**
-     * Instance of rcube_smtp class.
-     *
-     * @var rcube_smtp
-     */
+    /** @var rcube_smtp Instance of rcube_smtp class */
     public $smtp;
 
-    /**
-     * Instance of rcube_storage class.
-     *
-     * @var rcube_storage
-     */
+    /** @var rcube_storage Instance of rcube_storage class */
     public $storage;
 
-    /**
-     * Instance of rcube_output class.
-     *
-     * @var rcube_output
-     */
+    /** @var rcube_output Instance of rcube_output class */
     public $output;
 
-    /**
-     * Instance of rcube_plugin_api.
-     *
-     * @var rcube_plugin_api
-     */
+    /** @var rcube_plugin_api Instance of rcube_plugin_api */
     public $plugins;
 
-    /**
-     * Instance of rcube_user class.
-     *
-     * @var rcube_user
-     */
+    /** @var rcube_user Instance of rcube_user class */
     public $user;
 
-    /**
-     * Request status
-     *
-     * @var int
-     */
+    /** @var int Request status */
     public $request_status = 0;
 
-    /* private/protected vars */
+    /** @var array Localization */
     protected $texts;
+
+    /** @var rcube_cache[] Initialized cache objects */
     protected $caches = array();
+
+    /** @var array Registered shutdown functions */
     protected $shutdown_functions = array();
 
+    /** @var rcube Singleton instance of rcube */
+    static protected $instance;
+
 
     /**
      * This implements the 'singleton' design pattern
      *
-     * @param integer $mode Options to initialize with this instance. See rcube::INIT_WITH_* constants
-     * @param string  $env  Environment name to run (e.g. live, dev, test)
+     * @param int    $mode Options to initialize with this instance. See rcube::INIT_WITH_* constants
+     * @param string $env  Environment name to run (e.g. live, dev, test)
      *
      * @return rcube The one and only instance
      */
@@ -148,6 +108,8 @@
 
     /**
      * Private constructor
+     *
+     * @param string $env Environment name to run (e.g. live, dev, test)
      */
     protected function __construct($env = '')
     {
@@ -160,6 +122,8 @@
 
     /**
      * Initial startup function
+     *
+     * @param int $mode Options to initialize with this instance. See rcube::INIT_WITH_* constants
      */
     protected function init($mode = 0)
     {
@@ -216,6 +180,20 @@
     }
 
     /**
+     * Get global handle for memcached access
+     *
+     * @return object Memcached
+     */
+    public function get_memcached()
+    {
+        if (!isset($this->memcached)) {
+            $this->memcached = rcube_cache_memcached::engine();
+        }
+
+        return $this->memcached;
+    }
+
+    /**
      * Get global handle for redis access
      *
      * @return object Redis
@@ -439,6 +417,8 @@
 
     /**
      * Callback for IMAP connection events to log session identifiers
+     *
+     * @param array $args Callback arguments
      */
     public function storage_log_session($args)
     {
@@ -452,8 +432,8 @@
      */
     public function session_init()
     {
-        // session started (Installer?)
-        if (session_id()) {
+        // Ignore in CLI mode or when session started (Installer?)
+        if (empty($_SERVER['REMOTE_ADDR']) || session_id()) {
             return;
         }
 
@@ -491,14 +471,10 @@
             ini_set('session.gc_probability', 1);
         }
 
-        // get session driver instance
+        // Start the session
         $this->session = rcube_session::factory($this->config);
         $this->session->register_gc_handler(array($this, 'gc'));
-
-        // start PHP session (if not in CLI mode)
-        if ($_SERVER['REMOTE_ADDR']) {
-            $this->session->start();
-        }
+        $this->session->start();
     }
 
     /**
@@ -627,9 +603,9 @@
     /**
      * Check if the given text label exists
      *
-     * @param string $name       Label name
-     * @param string $domain     Label domain (plugin) name or '*' for all domains
-     * @param string $ref_domain Sets domain name if label is found
+     * @param string $name        Label name
+     * @param string $domain      Label domain (plugin) name or '*' for all domains
+     * @param string &$ref_domain Sets domain name if label is found
      *
      * @return boolean True if text exists (either in the current language or in en_US)
      */
@@ -858,9 +834,9 @@
     /**
      * Encrypt a string
      *
-     * @param string  $clear  Clear text input
-     * @param string  $key    Encryption key to retrieve from the configuration, defaults to 'des_key'
-     * @param boolean $base64 Whether or not to base64_encode() the result before returning
+     * @param string $clear  Clear text input
+     * @param string $key    Encryption key to retrieve from the configuration, defaults to 'des_key'
+     * @param bool   $base64 Whether or not to base64_encode() the result before returning
      *
      * @return string Encrypted text
      */
@@ -874,7 +850,19 @@
         $method = $this->config->get_crypto_method();
         $opts   = defined('OPENSSL_RAW_DATA') ? OPENSSL_RAW_DATA : true;
         $iv     = rcube_utils::random_bytes(openssl_cipher_iv_length($method), true);
-        $cipher = $iv . openssl_encrypt($clear, $method, $ckey, $opts, $iv);
+        $cipher = openssl_encrypt($clear, $method, $ckey, $opts, $iv);
+
+        if ($cipher === false) {
+            self::raise_error(array(
+                    'file'    => __FILE__,
+                    'line'    => __LINE__,
+                    'message' => "Failed to encrypt data with configured cipher method: $method!"
+                ), true, false);
+
+            return false;
+        }
+
+        $cipher = $iv . $cipher;
 
         return $base64 ? base64_encode($cipher) : $cipher;
     }
@@ -882,9 +870,9 @@
     /**
      * Decrypt a string
      *
-     * @param string  $cipher Encrypted text
-     * @param string  $key    Encryption key to retrieve from the configuration, defaults to 'des_key'
-     * @param boolean $base64 Whether or not input is base64-encoded
+     * @param string $cipher Encrypted text
+     * @param string $key    Encryption key to retrieve from the configuration, defaults to 'des_key'
+     * @param boo    $base64 Whether or not input is base64-encoded
      *
      * @return string Decrypted text
      */
@@ -962,7 +950,7 @@
      *
      * @param int $mode Request method
      *
-     * @return boolean True if request token is valid false if not
+     * @return bool True if request token is valid false if not
      */
     public function check_request($mode = rcube_utils::INPUT_POST)
     {
@@ -1092,8 +1080,10 @@
 
         if ($this->memcache) {
             $this->memcache->close();
-            // after close() need to re-init memcache
-            $this->memcache_init();
+        }
+
+        if ($this->memcached) {
+            $this->memcached->quit();
         }
 
         if ($this->smtp) {
@@ -1109,6 +1099,10 @@
      * Quote a given string.
      * Shortcut function for rcube_utils::rep_specialchars_output()
      *
+     * @param string $str      A string to quote
+     * @param string $mode     Replace mode for tags: show|remove|strict
+     * @param bool   $newlines Convert newlines
+     *
      * @return string HTML-quoted string
      */
     public static function Q($str, $mode = 'strict', $newlines = true)
@@ -1120,6 +1114,8 @@
      * Quote a given string for javascript output.
      * Shortcut function for rcube_utils::rep_specialchars_output()
      *
+     * @param string $str A string to quote
+     *
      * @return string JS-quoted string
      */
     public static function JQ($str)
@@ -1131,10 +1127,10 @@
      * Construct shell command, execute it and return output as string.
      * Keywords {keyword} are replaced with arguments
      *
-     * @param $cmd    Format string with {keywords} to be replaced
-     * @param $values (zero, one or more arrays can be passed)
+     * @param string $cmd        Format string with {keywords} to be replaced
+     * @param mixed  $values,... (zero, one or more arrays can be passed)
      *
-     * @return output of command. shell errors not detectable
+     * @return string Output of command. Shell errors not detectable
      */
     public static function exec(/* $cmd, $values1 = array(), ... */)
     {
@@ -1170,13 +1166,13 @@
                 }
             }
 
-            $replacements[$tag] = join(" ", $parts);
+            $replacements[$tag] = implode(' ', $parts);
         }
 
         // use strtr behaviour of going through source string once
         $cmd = strtr($cmd, $replacements);
 
-        return (string)shell_exec($cmd);
+        return (string) shell_exec($cmd);
     }
 
     /**
@@ -1203,7 +1199,7 @@
             $msg[] = !is_string($arg) ? var_export($arg, true) : $arg;
         }
 
-        self::write_log('console', join(";\n", $msg));
+        self::write_log('console', implode(";\n", $msg));
     }
 
     /**
@@ -1266,9 +1262,12 @@
         $line = sprintf("[%s]: %s\n", $date, $line);
 
         // per-user logging is activated
-        if (self::$instance && self::$instance->config->get('per_user_logging') && self::$instance->get_user_id()) {
+        if (self::$instance && self::$instance->config->get('per_user_logging')
+            && self::$instance->get_user_id()
+            && !in_array($name, array('userlogins', 'sendmail'))
+        ) {
             $log_dir = self::$instance->get_user_log_dir();
-            if (empty($log_dir) && !in_array($name, array('errors', 'userlogins', 'sendmail'))) {
+            if (empty($log_dir) && $name !== 'errors') {
                 return false;
             }
         }
@@ -1305,8 +1304,8 @@
      *      - message: Error message
      *      - file:    File where error occurred
      *      - line:    Line where error occurred
-     * @param boolean $log       True to log the error
-     * @param boolean $terminate Terminate script execution
+     * @param bool $log       True to log the error
+     * @param bool $terminate Terminate script execution
      */
     public static function raise_error($arg = array(), $log = false, $terminate = false)
     {
@@ -1355,21 +1354,20 @@
             self::log_bug($arg);
         }
 
+        if ($cli) {
+            fwrite(STDERR, 'ERROR: ' . trim($arg['message']) . "\n");
+        }
+        else if ($terminate && is_object(self::$instance->output)) {
+            self::$instance->output->raise_error($arg['code'], $arg['message']);
+        }
+        else if ($terminate) {
+            header("HTTP/1.0 500 Internal Error");
+        }
+
         // terminate script
         if ($terminate) {
-            // display error page
-            if (is_object(self::$instance->output)) {
-                self::$instance->output->raise_error($arg['code'], $arg['message']);
-            }
-            else if ($cli) {
-                fwrite(STDERR, 'ERROR: ' . $arg['message']);
-            }
-
             exit(1);
         }
-        else if ($cli) {
-            fwrite(STDERR, 'ERROR: ' . $arg['message']);
-        }
     }
 
     /**
@@ -1542,6 +1540,8 @@
 
     /**
      * Get the per-user log directory
+     *
+     * @return string|false Per-user log directory if it exists and is writable, False otherwise
      */
     protected function get_user_log_dir()
     {
@@ -1603,17 +1603,17 @@
     /**
      * Send the given message using the configured method.
      *
-     * @param object       $message    Reference to Mail_MIME object
-     * @param string       $from       Sender address string
-     * @param array|string $mailto     Either a comma-separated list of recipients (RFC822 compliant),
-     *                                 or an array of recipients, each RFC822 valid
-     * @param array        $error      SMTP error array (reference)
-     * @param string       $body_file  Location of file with saved message body (reference),
-     *                                 used when delay_file_io is enabled
-     * @param array        $options    SMTP options (e.g. DSN request)
-     * @param bool         $disconnect Close SMTP connection ASAP
-     *
-     * @return boolean Send status.
+     * @param Mail_Mime    &$message    Reference to Mail_MIME object
+     * @param string       $from        Sender address string
+     * @param array|string $mailto      Either a comma-separated list of recipients (RFC822 compliant),
+     *                                  or an array of recipients, each RFC822 valid
+     * @param array        &$error      SMTP error array (reference)
+     * @param string       &$body_file  Location of file with saved message body (reference),
+     *                                  used when delay_file_io is enabled
+     * @param array        $options     SMTP options (e.g. DSN request)
+     * @param bool         $disconnect  Close SMTP connection ASAP
+     *
+     * @return bool Send status.
      */
     public function deliver_message(&$message, $from, $mailto, &$error,
         &$body_file = null, $options = null, $disconnect = false)
@@ -1687,7 +1687,7 @@
         if (!$sent) {
             self::raise_error(array('code' => 800, 'type' => 'smtp',
                 'line' => __LINE__, 'file' => __FILE__,
-                'message' => join("\n", $response)), true, false);
+                'message' => implode("\n", $response)), true, false);
 
             // allow plugins to catch sending errors with the same parameters as in 'message_before_send'
             $this->plugins->exec_hook('message_send_error', $plugin + array('error' => $error));
@@ -1708,7 +1708,7 @@
                     rcube_utils::remote_addr(),
                     $headers['Message-ID'],
                     implode(', ', $mailto),
-                    !empty($response) ? join('; ', $response) : ''));
+                    !empty($response) ? implode('; ', $response) : ''));
             }
         }
 
@@ -1740,6 +1740,11 @@
 {
     /**
      * Triggers a plugin hook.
+     *
+     * @param string $hook Hook name
+     * @param array  $args Hook arguments
+     *
+     * @return array Hook arguments
      * @see rcube_plugin_api::exec_hook()
      */
     public function exec_hook($hook, $args = array())

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_addressbook.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_addressbook.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -259,7 +260,7 @@
      *
      * @return mixed The created record ID on success, False on error
      */
-    function insert($save_data, $check=false)
+    function insert($save_data, $check = false)
     {
         /* empty for read-only address books */
     }
@@ -272,7 +273,7 @@
      *
      * @return array List of created record IDs
      */
-    function insertMultiple($recset, $check=false)
+    function insertMultiple($recset, $check = false)
     {
         $ids = array();
         if (is_object($recset) && is_a($recset, rcube_result_set)) {
@@ -281,6 +282,7 @@
                     $ids[] = $insert;
             }
         }
+
         return $ids;
     }
 
@@ -507,7 +509,7 @@
 
         // default display name composition according to vcard standard
         if (!$fn) {
-            $fn = join(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix'])));
+            $fn = implode(' ', array_filter(array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix'])));
             $fn = trim(preg_replace('/\s+/u', ' ', $fn));
         }
 
@@ -542,18 +544,24 @@
     {
         static $compose_mode;
 
-        if (!isset($compose_mode))  // cache this
+        if (!isset($compose_mode)) {
             $compose_mode = rcube::get_instance()->config->get('addressbook_name_listing', 0);
+        }
 
-        if ($compose_mode == 3)
-            $fn = join(' ', array($contact['surname'] . ',', $contact['firstname'], $contact['middlename']));
-        else if ($compose_mode == 2)
-            $fn = join(' ', array($contact['surname'], $contact['firstname'], $contact['middlename']));
-        else if ($compose_mode == 1)
-            $fn = join(' ', array($contact['firstname'], $contact['middlename'], $contact['surname']));
-        else if ($compose_mode == 0)
-            $fn = $contact['name'] ?: join(' ', array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']));
-        else {
+        switch ($compose_mode) {
+        case 3:
+            $fn = implode(' ', array($contact['surname'] . ',', $contact['firstname'], $contact['middlename']));
+            break;
+        case 2:
+            $fn = implode(' ', array($contact['surname'], $contact['firstname'], $contact['middlename']));
+            break;
+        case 1:
+            $fn = implode(' ', array($contact['firstname'], $contact['middlename'], $contact['surname']));
+            break;
+        case 0:
+            $fn = $contact['name'] ?: implode(' ', array($contact['prefix'], $contact['firstname'], $contact['middlename'], $contact['surname'], $contact['suffix']));
+            break;
+        default:
             $plugin = rcube::get_instance()->plugins->exec_hook('contact_listname', array('contact' => $contact));
             $fn     = $plugin['fn'];
         }

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_base_replacer.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_base_replacer.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_browser.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_browser.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2007-2015, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -24,46 +25,79 @@
  */
 class rcube_browser
 {
-    function __construct()
+    /** @var float $ver Browser version */
+    public $ver = 0;
+
+    /** @var bool $win Browser OS is Windows */
+    public $win = false;
+
+    /** @var bool $mac Browser OS is Mac */
+    public $mac = false;
+
+    /** @var bool $linux Browser OS is Linux */
+    public $linux = false;
+
+    /** @var bool $unix Browser OS is Unix */
+    public $unix = false;
+
+    /** @var bool $webkit Browser uses WebKit engine */
+    public $webkit = false;
+
+    /** @var bool $opera Browser is Opera */
+    public $opera = false;
+
+    /** @var bool $chrome Browser is Chrome */
+    public $chrome = false;
+
+    /** @var bool $ie Browser is Internet Explorer */
+    public $ie = false;
+
+    /** @var bool $edge Browser is Edge */
+    public $edge = false;
+
+    /** @var bool $safari Browser is Safari */
+    public $safari = false;
+
+    /** @var bool $mz Browser is Mozilla Firefox */
+    public $mz = false;
+
+
+    /**
+     * Object constructor
+     */
+    public function __construct()
     {
         $HTTP_USER_AGENT = strtolower($_SERVER['HTTP_USER_AGENT']);
 
-        $this->ver   = 0;
+        // Operating system detection
         $this->win   = strpos($HTTP_USER_AGENT, 'win') != false;
         $this->mac   = strpos($HTTP_USER_AGENT, 'mac') != false;
         $this->linux = strpos($HTTP_USER_AGENT, 'linux') != false;
         $this->unix  = strpos($HTTP_USER_AGENT, 'unix') != false;
 
+        // Engine detection
         $this->webkit = strpos($HTTP_USER_AGENT, 'applewebkit') !== false;
         $this->opera  = strpos($HTTP_USER_AGENT, 'opera') !== false || ($this->webkit && strpos($HTTP_USER_AGENT, 'opr/') !== false);
-        $this->ns     = strpos($HTTP_USER_AGENT, 'netscape') !== false;
-        $this->chrome = !$this->opera && strpos($HTTP_USER_AGENT, 'chrome') !== false;
-        $this->ie     = !$this->opera && (strpos($HTTP_USER_AGENT, 'compatible; msie') !== false || strpos($HTTP_USER_AGENT, 'trident/') !== false);
-        $this->safari = !$this->opera && !$this->chrome && ($this->webkit || strpos($HTTP_USER_AGENT, 'safari') !== false);
-        $this->mz     = !$this->ie && !$this->safari && !$this->chrome && !$this->ns && !$this->opera && strpos($HTTP_USER_AGENT, 'mozilla') !== false;
-
-        if ($this->opera) {
-            if (preg_match('/(opera|opr)\/([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
-                $this->ver = (float) $regs[2];
-            }
+        $this->edge   = strpos($HTTP_USER_AGENT, 'edge/') !== false;
+        $this->ie     = !$this->opera && !$this->edge && (strpos($HTTP_USER_AGENT, 'compatible; msie') !== false || strpos($HTTP_USER_AGENT, 'trident/') !== false);
+        $this->chrome = !$this->opera && !$this->edge && strpos($HTTP_USER_AGENT, 'chrome') !== false;
+        $this->safari = !$this->opera && !$this->chrome && !$this->edge
+                        && ($this->webkit || strpos($HTTP_USER_AGENT, 'safari') !== false);
+        $this->mz     = !$this->ie && !$this->edge && !$this->safari && !$this->chrome && !$this->opera
+                        && strpos($HTTP_USER_AGENT, 'mozilla') !== false;
+
+        // Version detection
+        if ($this->edge && preg_match('/edge\/([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
+            $this->ver = (float) $regs[1];
         }
-        else if (preg_match('/(chrome|msie|version|khtml)(\s*|\/)([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
+        else if ($this->opera && preg_match('/(opera|opr)(\s*|\/)([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
             $this->ver = (float) $regs[3];
         }
-        else if (preg_match('/rv:([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
+        else if ($this->safari && preg_match('/(version|safari)\/([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
             $this->ver = (float) $regs[1];
         }
-
-        if (preg_match('/ ([a-z]{2})-([a-z]{2})/', $HTTP_USER_AGENT, $regs)) {
-            $this->lang =  $regs[1];
-        }
-        else {
-            $this->lang =  'en';
+        else if (preg_match('/(chrome|khtml|version|msie|rv:)(\s*|\/)([0-9.]+)/', $HTTP_USER_AGENT, $regs)) {
+            $this->ver = (float) $regs[3];
         }
-
-        $this->dom      = $this->mz || $this->safari || ($this->ie && $this->ver>=5) || ($this->opera && $this->ver>=7);
-        $this->pngalpha = $this->mz || $this->safari || ($this->ie && $this->ver>=5.5) ||
-            ($this->ie && $this->ver>=5 && $this->mac) || ($this->opera && $this->ver>=7);
-        $this->imgdata  = !$this->ie;
     }
 }

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_cache.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_cache.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011, The Roundcube Dev Team                            |
- | Copyright (C) 2011, Kolab Systems AG                                  |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_cache
 {
@@ -157,7 +156,7 @@
      * @param boolean $prefix_mode Enable it to clear all keys starting
      *                             with prefix specified in $key
      */
-    public function remove($key=null, $prefix_mode=false)
+    public function remove($key = null, $prefix_mode = false)
     {
         // Remove all keys
         if ($key === null) {
@@ -234,6 +233,33 @@
     }
 
     /**
+     * A helper to build cache key for specified parameters.
+     *
+     * @param string $prefix Key prefix (Max. length 64 characters)
+     * @param array  $params Additional parameters
+     *
+     * @return string Key name
+     */
+    public static function key_name($prefix, $params = array())
+    {
+        $cache_key = $prefix;
+
+        if (!empty($params)) {
+            $func   = function($v) {
+                if (is_array($v)) {
+                    sort($v);
+                }
+                return is_string($v) ? $v : serialize($v);
+            };
+
+            $params = array_map($func, $params);
+            $cache_key .= '.' . md5(implode(':', $params));
+        }
+
+        return $cache_key;
+    }
+
+    /**
      * Reads cache entry.
      *
      * @param string  $key     Cache key name

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_charset.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_charset.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  | Copyright (C) 2000 Edmund Grimley Evans <edmundo@rano.org>            |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
@@ -16,6 +17,7 @@
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
+ | Author: Edmund Grimley Evans <edmundo@rano.org>                       |
  +-----------------------------------------------------------------------+
 */
 
@@ -24,9 +26,6 @@
  *
  * @package    Framework
  * @subpackage Core
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- * @author     Edmund Grimley Evans <edmundo@rano.org>
  */
 class rcube_charset
 {
@@ -184,8 +183,8 @@
     }
 
     /**
-     * Parse and validate charset name string (see #1485758).
-     * Sometimes charset string is malformed, there are also charset aliases 
+     * Parse and validate charset name string.
+     * Sometimes charset string is malformed, there are also charset aliases,
      * but we need strict names for charset conversion (specially utf8 class)
      *
      * @param string $input Input charset name
@@ -206,6 +205,7 @@
             '/\$.*$/',          // e.g. _ISO-8859-JP$SIO
             '/UNICODE-1-1-*/',  // RFC1641/1642
             '/^X-/',            // X- prefix (e.g. X-ROMAN8 => ROMAN8)
+            '/\*.*$/'           // lang code according to RFC 2231.5
         ), '', $charset);
 
         if ($charset == 'BINARY') {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_config.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_config.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -24,7 +25,7 @@
  */
 class rcube_config
 {
-    const DEFAULT_SKIN = 'larry';
+    const DEFAULT_SKIN = 'elastic';
 
     private $env       = '';
     private $paths     = array();
@@ -49,6 +50,7 @@
         'min_refresh_interval' => 'min_keep_alive',
         'messages_cache_ttl'   => 'message_cache_lifetime',
         'mail_read_time'       => 'preview_pane_mark_read',
+        'session_debug'        => 'log_session',
         'redundant_attachments_cache_ttl' => 'redundant_attachments_memcache_ttl',
     );
 
@@ -225,7 +227,6 @@
             }
         }
 
-        // larry is the new default skin :-)
         if ($this->prop['skin'] == 'default') {
             $this->prop['skin'] = self::DEFAULT_SKIN;
         }
@@ -450,11 +451,16 @@
             }
         }
 
-        // larry is the new default skin :-)
         if ($prefs['skin'] == 'default') {
             $prefs['skin'] = self::DEFAULT_SKIN;
         }
 
+        $skins_allowed = $this->get('skins_allowed');
+
+        if (!empty($prefs['skin']) && !empty($skins_allowed) && !in_array($prefs['skin'], (array) $skins_allowed)) {
+            unset($prefs['skin']);
+        }
+
         $this->userprefs = $prefs;
         $this->prop      = array_merge($this->prop, $prefs);
     }
@@ -577,6 +583,26 @@
     }
 
     /**
+     * Returns list of configured PGP key servers
+     *
+     * @return array|null List of keyservers' URLs
+     */
+    public function keyservers()
+    {
+        $list = (array) $this->prop['keyservers'];
+
+        foreach ($list as $idx => $host) {
+            if (!preg_match('|^[a-z]://|', $host)) {
+                $host = "https://$host";
+            }
+
+            $list[$idx] = slashify($host);
+        }
+
+        return !empty($list) ? $list : null;
+    }
+
+    /**
      * Return the mail domain configured for the given host
      *
      * @param string  $host   IMAP host
@@ -611,7 +637,7 @@
      */
     public function get_error()
     {
-        return empty($this->errors) ? false : join("\n", $this->errors);
+        return empty($this->errors) ? false : implode("\n", $this->errors);
     }
 
     /**

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_contacts.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_contacts.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -293,10 +294,8 @@
             $required = array($required);
         }
 
-        $where = $and_where = $post_search = array();
+        $where = $post_search = array();
         $mode  = intval($mode);
-        $WS    = ' ';
-        $AS    = self::SEPARATOR;
 
         // direct ID search
         if ($fields == 'ID' || $fields == $this->primary_key) {
@@ -337,7 +336,7 @@
                 foreach ((array)$fields as $idx => $col) {
                     $groups[] = $this->fulltext_sql_where($word, $mode, $col);
                 }
-                $where[] = '(' . join(' OR ', $groups) . ')';
+                $where[] = '(' . implode(' OR ', $groups) . ')';
             }
         }
 
@@ -348,7 +347,7 @@
 
         if (!empty($where)) {
             // use AND operator for advanced searches
-            $where = join(" AND ", $where);
+            $where = implode(' AND ', $where);
         }
 
         // Post-searching in vCard data fields
@@ -356,7 +355,7 @@
         if (!empty($post_search) || !empty($required)) {
             $ids = array(0);
             // build key name regexp
-            $regexp = '/^(' . implode(array_keys($post_search), '|') . ')(?:.*)$/';
+            $regexp = '/^(' . implode('|', array_keys($post_search)) . ')(?:.*)$/';
             // use initial WHERE clause, to limit records number if possible
             if (!empty($where))
                 $this->set_search_set($where);
@@ -389,7 +388,7 @@
                     if (!empty($required)) {
                         foreach ($required as $req) {
                             $hit = false;
-                            foreach ($row as $c => $values) {
+                            foreach (array_keys($row) as $c) {
                                 if ($c === $req || strpos($c, $req.':') === 0) {
                                     if ((is_string($row[$c]) && strlen($row[$c])) || !empty($row[$c])) {
                                         $hit = true;
@@ -459,7 +458,7 @@
             }
         }
 
-        return count($where) ? '(' . join(" $bool ", $where) . ')' : '';
+        return count($where) ? '(' . implode(" $bool ", $where) . ')' : '';
     }
 
     /**
@@ -644,9 +643,9 @@
 
         if (!$existing->count && !empty($a_insert_cols)) {
             $this->db->query(
-                "INSERT INTO " . $this->db->table_name($this->db_name, true).
-                " (`user_id`, `changed`, `del`, ".join(', ', $a_insert_cols).")".
-                " VALUES (".intval($this->user_id).", ".$this->db->now().", 0, ".join(', ', $a_insert_values).")"
+                "INSERT INTO " . $this->db->table_name($this->db_name, true)
+                . " (`user_id`, `changed`, `del`, " . implode(', ', $a_insert_cols) . ")"
+                . " VALUES (" . intval($this->user_id) . ", " . $this->db->now() . ", 0, " . implode(', ', $a_insert_values) . ")"
             );
 
             $insert_id = $this->db->insert_id($this->db_name);
@@ -678,11 +677,11 @@
 
         if (!empty($write_sql)) {
             $this->db->query(
-                "UPDATE " . $this->db->table_name($this->db_name, true).
-                " SET `changed` = ".$this->db->now().", ".join(', ', $write_sql).
-                " WHERE `contact_id` = ?".
-                    " AND `user_id` = ?".
-                    " AND `del` <> 1",
+                "UPDATE " . $this->db->table_name($this->db_name, true)
+                . " SET `changed` = " . $this->db->now() . ", " . implode(', ', $write_sql)
+                . " WHERE `contact_id` = ?"
+                    . " AND `user_id` = ?"
+                    . " AND `del` <> 1",
                 $id,
                 $this->user_id
             );
@@ -743,7 +742,7 @@
                 if (isset($value))
                     $vcard->set($field, $value, $section);
                 if ($fulltext && is_array($value))
-                    $words .= ' ' . rcube_utils::normalize_string(join(" ", $value));
+                    $words .= ' ' . rcube_utils::normalize_string(implode(' ', $value));
                 else if ($fulltext && strlen($value) >= 3)
                     $words .= ' ' . rcube_utils::normalize_string($value);
             }
@@ -752,21 +751,24 @@
 
         foreach ($this->table_cols as $col) {
             $key = $col;
-            if (!isset($save_data[$key]))
+            if (!isset($save_data[$key])) {
                 $key .= ':home';
+            }
             if (isset($save_data[$key])) {
-                if (is_array($save_data[$key]))
-                    $out[$col] = join(self::SEPARATOR, $save_data[$key]);
-                else
+                if (is_array($save_data[$key])) {
+                    $out[$col] = implode(self::SEPARATOR, $save_data[$key]);
+                }
+                else {
                     $out[$col] = $save_data[$key];
+                }
             }
         }
 
         // save all e-mails in database column
-        $out['email'] = join(self::SEPARATOR, $vcard->email);
+        $out['email'] = implode(self::SEPARATOR, $vcard->email);
 
         // join words for fulltext search
-        $out['words'] = join(" ", array_unique(explode(" ", $words)));
+        $out['words'] = implode(' ', array_unique(explode(' ', $words)));
 
         return $out;
     }

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_content_filter.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_content_filter.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_csv2vcard.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_csv2vcard.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -21,7 +22,6 @@
  *
  * @package    Framework
  * @subpackage Addressbook
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_csv2vcard
 {
@@ -482,6 +482,10 @@
 
     /**
      * Parse CSV file line
+     *
+     * @param string $line Line of text from CSV file
+     *
+     * @return array CSV data extracted from the line
      */
     protected function parse_line($line)
     {
@@ -511,6 +515,8 @@
 
     /**
      * Parse CSV header line, detect fields mapping
+     *
+     * @param array $elements Array of field names from a first line in CSV file
      */
     protected function parse_header($elements)
     {
@@ -573,6 +579,8 @@
 
     /**
      * Convert CSV data row to vCard
+     *
+     * @param array $data CSV data array
      */
     protected function csv_to_vcard($data)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_db.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_db.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -913,7 +914,7 @@
             $name[] = $start . $elem . $end;
         }
 
-        return implode($name, '.');
+        return implode('.', $name);
     }
 
     /**
@@ -1009,7 +1010,7 @@
             $args = $args[0];
         }
 
-        return '(' . join(' || ', $args) . ')';
+        return '(' . implode(' || ', $args) . ')';
     }
 
     /**
@@ -1183,7 +1184,6 @@
         }
 
         // Find protocol and hostspec
-
         // $dsn => proto(proto_opts)/database
         if (preg_match('|^([^(]+)$(.*?)$/?(.*?)$|', $dsn, $match)) {
             $proto       = $match[1];
@@ -1199,9 +1199,9 @@
                 && strpos($dsn, '/', 2) !== false
                 && $parsed['phptype'] == 'oci8'
             ) {
-                //oracle's "Easy Connect" syntax:
-                //"username/password@[//]host[:port][/service_name]"
-                //e.g. "scott/tiger@//mymachine:1521/oracle"
+                // Oracle's "Easy Connect" syntax:
+                // "username/password@[//]host[:port][/service_name]"
+                // e.g. "scott/tiger@//mymachine:1521/oracle"
                 $proto_opts = $dsn;
                 $pos = strrpos($proto_opts, '/');
                 $dsn = substr($proto_opts, $pos + 1);
@@ -1229,17 +1229,18 @@
             $parsed['socket'] = $proto_opts;
         }
 
-        // Get dabase if any
+        // Get database if any
         // $dsn => database
         if ($dsn) {
             // /database
             if (($pos = strpos($dsn, '?')) === false) {
                 $parsed['database'] = rawurldecode($dsn);
-            // /database?param1=value1&param2=value2
             }
             else {
+                // /database?param1=value1&param2=value2
                 $parsed['database'] = rawurldecode(substr($dsn, 0, $pos));
                 $dsn = substr($dsn, $pos + 1);
+
                 if (strpos($dsn, '&') !== false) {
                     $opts = explode('&', $dsn);
                 }
@@ -1254,6 +1255,18 @@
                     }
                 }
             }
+
+            // remove problematic suffix (#7034)
+            $parsed['database'] = preg_replace('/;.*$/', '', $parsed['database']);
+
+            // Resolve relative path to the sqlite database file
+            // so for example it works with Roundcube Installer
+            if (!empty($parsed['phptype']) && !empty($parsed['database'])
+                && stripos($parsed['phptype'], 'sqlite') === 0
+                && $parsed['database'][0] != '/'
+            ) {
+                $parsed['database'] = INSTALL_PATH . $parsed['database'];
+            }
         }
 
         return $parsed;
@@ -1368,8 +1381,8 @@
         }
 
         $sql = preg_replace_callback(
-            '/((TABLE|TRUNCATE|(?<!ON )UPDATE|INSERT INTO|FROM'
-            . '| ON(?! (DELETE|UPDATE))|REFERENCES|CONSTRAINT|FOREIGN KEY|INDEX)'
+            '/((TABLE|TRUNCATE( TABLE)?|(?<!ON )UPDATE|INSERT INTO|FROM'
+            . '| ON(?! (DELETE|UPDATE))|REFERENCES|CONSTRAINT|FOREIGN KEY|INDEX|UNIQUE( INDEX)?)'
             . '\s+(IF (NOT )?EXISTS )?[`"]*)([^`"\( \r\n]+)/',
             array($this, 'fix_table_names_callback'),
             $sql

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_enriched.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_enriched.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_html2text.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_html2text.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  | Copyright (c) 2005-2007, Jon Abernathy <jon@chuggnutt.com>            |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
@@ -248,8 +249,6 @@
     protected $callback_search = array(
         '/<(a) [^>]*href=("|\')([^"\']+)\2[^>]*>(.*?)<\/a>/i', // <a href="">
         '/<(h)[123456]( [^>]*)?>(.*?)<\/h[123456]>/i',         // h1 - h6
-        '/<(b)( [^>]*)?>(.*?)<\/b>/i',                         // <b>
-        '/<(strong)( [^>]*)?>(.*?)<\/strong>/i',               // <strong>
         '/<(th)( [^>]*)?>(.*?)<\/th>/i',                       // <th> and </th>
     );
 
@@ -667,14 +666,12 @@
      * Callback function for preg_replace_callback use.
      *
      * @param array $matches PREG matches
-     * @return string
+     *
+     * @return string Element content
      */
     public function tags_preg_callback($matches)
     {
         switch (strtolower($matches[1])) {
-        case 'b':
-        case 'strong':
-            return $this->_toupper($matches[3]);
         case 'th':
             return $this->_toupper("\t\t". $matches[3] ."\n");
         case 'h':
@@ -690,7 +687,8 @@
      * Callback function for preg_replace_callback use in PRE content handler.
      *
      * @param array $matches PREG matches
-     * @return string
+     *
+     * @return string PRE content
      */
     public function pre_preg_callback($matches)
     {
@@ -701,6 +699,7 @@
      * Strtoupper function with HTML tags and entities handling.
      *
      * @param string $str Text to convert
+     *
      * @return string Converted text
      */
     private function _toupper($str)
@@ -722,6 +721,7 @@
      * Strtoupper multibyte wrapper function with HTML entities handling.
      *
      * @param string $str Text to convert
+     *
      * @return string Converted text
      */
     private function _strtoupper($str)

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_image.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_image.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -322,7 +323,7 @@
             $p['out']  = $filename;
             $p['type'] = self::$extensions[$type];
 
-            $result = rcube::exec($convert . ' 2>&1 -colorspace sRGB -strip -quality 75 {in} {type}:{out}', $p);
+            $result = rcube::exec($convert . ' 2>&1 -colorspace sRGB -strip -flatten -quality 75 {in} {type}:{out}', $p);
 
             if ($result === '') {
                 chmod($filename, 0600);
@@ -394,7 +395,9 @@
     }
 
     /**
-     * Checks if image format conversion is supported
+     * Checks if image format conversion is supported (for specified mimetype).
+     *
+     * @param string $mimetype Mimetype name
      *
      * @return boolean True if specified format can be converted to another format
      */
@@ -440,6 +443,10 @@
 
     /**
      * Check if we have enough memory to load specified image
+     *
+     * @param array Hash array with image props like channels, width, height
+     *
+     * @return bool True if there's enough memory to process the image, False otherwise
      */
     private function mem_check($props)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_imap.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_imap.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_imap extends rcube_storage
 {
@@ -643,7 +642,7 @@
 
         $vendor  = (string) (!empty($ident) ? $ident['name'] : '');
         $ident   = strtolower($vendor . ' ' . $this->conn->data['GREETING']);
-        $vendors = array('cyrus', 'dovecot', 'uw-imap', 'gmail', 'hmail');
+        $vendors = array('cyrus', 'dovecot', 'uw-imap', 'gimap', 'hmail');
 
         foreach ($vendors as $v) {
             if (strpos($ident, $v) !== false) {
@@ -1102,8 +1101,10 @@
                 }
 
                 // slice resultset first...
+                $index = array_slice($search_set->get(), $from, $slice_length);
                 $fetch = array();
-                foreach (array_slice($search_set->get(), $from, $slice_length) as $msg_id) {
+
+                foreach ($index as $msg_id) {
                     list($uid, $folder) = explode('-', $msg_id, 2);
                     $fetch[$folder][] = $uid;
                 }
@@ -1113,6 +1114,11 @@
                 foreach ($fetch as $folder => $a_index) {
                     $a_msg_headers = array_merge($a_msg_headers, array_values($this->fetch_headers($folder, $a_index)));
                 }
+
+                // Re-sort the result according to the original search set order
+                usort($a_msg_headers, function($a, $b) use ($index) {
+                    return array_search($a->uid . '-' . $a->folder, $index) - array_search($b->uid . '-' . $b->folder, $index);
+                });
             }
 
             if ($slice) {
@@ -2174,8 +2180,7 @@
 
         // get part ID
         if (!empty($part[3])) {
-            $struct->content_id = $part[3];
-            $struct->headers['content-id'] = $part[3];
+            $struct->content_id = $struct->headers['content-id'] = trim($part[3]);
 
             if (empty($struct->disposition)) {
                 $struct->disposition = 'inline';
@@ -2405,13 +2410,15 @@
             $part_data = rcube_imap_generic::getStructurePartData($structure, $part);
 
             $o_part = new rcube_message_part;
-            $o_part->ctype_primary = $part_data['type'];
-            $o_part->encoding      = $part_data['encoding'];
-            $o_part->charset       = $part_data['charset'];
-            $o_part->size          = $part_data['size'];
+            $o_part->ctype_primary   = $part_data['type'];
+            $o_part->ctype_secondary = $part_data['subtype'];
+            $o_part->encoding        = $part_data['encoding'];
+            $o_part->charset         = $part_data['charset'];
+            $o_part->size            = $part_data['size'];
         }
 
-        if ($o_part && $o_part->size) {
+        // Note: multipart/* parts will have size=0, we don't want to ignore them
+        if ($o_part && ($o_part->size || $o_part->ctype_primary == 'multipart')) {
             $formatted = $formatted && $o_part->ctype_primary == 'text';
             $body = $this->conn->handlePartBody($this->folder, $uid, true,
                 $part ? $part : 'TEXT', $o_part->encoding, $print, $fp, $formatted, $max_bytes);
@@ -2620,7 +2627,7 @@
      *
      * @return boolean True on success, False on error
      */
-    public function move_message($uids, $to_mbox, $from_mbox='')
+    public function move_message($uids, $to_mbox, $from_mbox = '')
     {
         if (!strlen($from_mbox)) {
             $from_mbox = $this->folder;
@@ -2664,16 +2671,9 @@
         if ($moved) {
             $this->clear_messagecount($from_mbox);
             $this->clear_messagecount($to_mbox);
-
             $this->set_search_dirty($from_mbox);
             $this->set_search_dirty($to_mbox);
-        }
-        // moving failed
-        else if ($to_trash && $config->get('delete_always', false)) {
-            $moved = $this->delete_message($uids, $from_mbox);
-        }
 
-        if ($moved) {
             // unset threads internal cache
             unset($this->icache['threads']);
 
@@ -2705,13 +2705,13 @@
      *
      * @return boolean True on success, False on error
      */
-    public function copy_message($uids, $to_mbox, $from_mbox='')
+    public function copy_message($uids, $to_mbox, $from_mbox = '')
     {
         if (!strlen($from_mbox)) {
             $from_mbox = $this->folder;
         }
 
-        list($uids, $all_mode) = $this->parse_uids($uids);
+        list($uids, ) = $this->parse_uids($uids);
 
         // exit if no message uids are specified
         if (empty($uids)) {
@@ -2735,12 +2735,12 @@
     /**
      * Mark messages as deleted and expunge them
      *
-     * @param mixed  $uids    Message UIDs as array or comma-separated string, or '*'
-     * @param string $folder  Source folder
+     * @param mixed  $uids   Message UIDs as array or comma-separated string, or '*'
+     * @param string $folder Source folder
      *
      * @return boolean True on success, False on error
      */
-    public function delete_message($uids, $folder='')
+    public function delete_message($uids, $folder = '')
     {
         if (!strlen($folder)) {
             $folder = $this->folder;
@@ -2859,14 +2859,9 @@
      *
      * @return  array   List of folders
      */
-    public function list_folders_subscribed($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
+    public function list_folders_subscribed($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false)
     {
-        $cache_key = $root.':'.$name;
-        if (!empty($filter)) {
-            $cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
-        }
-        $cache_key .= ':'.$rights;
-        $cache_key = 'mailboxes.'.md5($cache_key);
+        $cache_key = rcube_cache::key_name('mailboxes', array($root, $name, $filter, $rights));
 
         // get cached folder list
         $a_mboxes = $this->get_cache($cache_key);
@@ -2951,6 +2946,9 @@
         // Add/Remove folders according to some configuration options
         $this->list_folders_filter($result, $root . $name, ($list_extended ? 'ext-' : '') . 'subscribed');
 
+        // Save the last command state, so we can ignore errors on any following UNSEBSCRIBE calls
+        $state = $this->save_conn_state();
+
         if ($list_extended) {
             // unsubscribe non-existent folders, remove from the list
             if ($name == '*' && !empty($this->conn->data['LIST'])) {
@@ -2982,6 +2980,8 @@
             }
         }
 
+        $this->restore_conn_state($state);
+
         return $result;
     }
 
@@ -2996,14 +2996,9 @@
      *
      * @return array Indexed array with folder names
      */
-    public function list_folders($root='', $name='*', $filter=null, $rights=null, $skip_sort=false)
+    public function list_folders($root = '', $name = '*', $filter = null, $rights = null, $skip_sort = false)
     {
-        $cache_key = $root.':'.$name;
-        if (!empty($filter)) {
-            $cache_key .= ':'.(is_string($filter) ? $filter : serialize($filter));
-        }
-        $cache_key .= ':'.$rights;
-        $cache_key = 'mailboxes.list.'.md5($cache_key);
+        $cache_key = rcube_cache::key_name('mailboxes.list', array($root, $name, $filter, $rights));
 
         // get cached folder list
         $a_mboxes = $this->get_cache($cache_key);
@@ -3185,7 +3180,7 @@
                 continue;
             }
 
-            $myrights = join('', (array)$this->my_rights($folder));
+            $myrights = implode('', (array)$this->my_rights($folder));
 
             if ($myrights !== null && !preg_match($regex, $myrights)) {
                 unset($a_folders[$idx]);
@@ -3689,6 +3684,16 @@
             $data['UNDELETED'] = $this->icache['undeleted_idx'];
         }
 
+        // dovecot does not return HIGHESTMODSEQ until requested, we use it though in our caching system
+        // calling STATUS is needed only once, after first use mod-seq db will be maintained
+        if (!isset($data['HIGHESTMODSEQ']) && empty($data['NOMODSEQ'])
+            && ($this->get_capability('QRESYNC') || $this->get_capability('CONDSTORE'))
+        ) {
+            if ($add_data = $this->conn->status($folder, array('HIGHESTMODSEQ'))) {
+                $data = array_merge($data, $add_data);
+            }
+        }
+
         return $data;
     }
 
@@ -3706,7 +3711,7 @@
         }
 
         // get cached metadata
-        $cache_key = 'mailboxes.folder-info.' . $folder;
+        $cache_key = rcube_cache::key_name('mailboxes.folder-info', array($folder));
         $cached    = $this->get_cache($cache_key);
 
         if (is_array($cached)) {
@@ -3876,7 +3881,7 @@
             return false;
         }
 
-        $this->clear_cache('mailboxes.folder-info.' . $folder);
+        $this->clear_cache(rcube_cache::key_name('mailboxes.folder-info', array($folder)));
 
         return $this->conn->setACL($folder, $user, $acl);
     }
@@ -4053,13 +4058,7 @@
         $entries = (array) $entries;
 
         if (!$force) {
-            // create cache key
-            // @TODO: this is the simplest solution, but we do the same with folders list
-            //        maybe we should store data per-entry and merge on request
-            sort($options);
-            sort($entries);
-            $cache_key = 'mailboxes.metadata.' . $folder;
-            $cache_key .= '.' . md5(serialize($options).serialize($entries));
+            $cache_key = rcube_cache::key_name('mailboxes.metadata', array($folder, $options, $entries));
 
             // get cached data
             $cached_data = $this->get_cache($cache_key);
@@ -4552,6 +4551,31 @@
     }
 
     /**
+     * Remember state of the IMAP connection (last IMAP command).
+     * Use e.g. if you want to execute more commands and ignore results of these.
+     *
+     * @return array Connection state
+     */
+    protected function save_conn_state()
+    {
+        return array(
+            $this->conn->error,
+            $this->conn->errornum,
+            $this->conn->resultcode,
+        );
+    }
+
+    /**
+     * Restore saved connection state.
+     *
+     * @param array $state Connection result
+     */
+    protected function restore_conn_state($state)
+    {
+        list($this->conn->error, $this->conn->errornum, $this->conn->resultcode) = $state;
+    }
+
+    /**
      * This is our own debug handler for the IMAP connection
      */
     public function debug_handler(&$imap, $message)

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_imap_cache.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_imap_cache.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -22,8 +23,6 @@
  *
  * @package    Framework
  * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_imap_cache
 {
@@ -96,6 +95,8 @@
         8192    => 'LABEL3',
         16384   => 'LABEL4',
         32768   => 'LABEL5',
+        65536   => 'HASATTACHMENT',
+        131072  => 'HASNOATTACHMENT',
     );

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_imap_generic.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_imap_generic.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2015, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -298,7 +299,7 @@
         while ($line[0] == '*');
 
         if ($untagged) {
-            $untagged = join("\n", $untagged);
+            $untagged = implode("\n", $untagged);
         }
 
         return $line;
@@ -2652,22 +2653,18 @@
      */
     public static function sortHeaders($messages, $field, $flag)
     {
-        // Strategy: First, we'll create an "index" array.
-        // Then, we'll use sort() on that array, and use that to sort the main array.
-
-        $field  = empty($field) ? 'uid' : strtolower($field);
-        $flag   = empty($flag) ? 'ASC' : strtoupper($flag);
-        $index  = array();
-        $result = array();
+        $field = empty($field) ? 'uid' : strtolower($field);
+        $order = empty($flag) ? 'ASC' : strtoupper($flag);
+        $index = array();
 
         reset($messages);
 
+        // Create an index
         foreach ($messages as $key => $headers) {
-            $value = null;
-
             switch ($field) {
             case 'arrival':
                 $field = 'internaldate';
+                // no-break
             case 'date':
             case 'internaldate':
             case 'timestamp':
@@ -2683,33 +2680,26 @@
                 $value = $headers->$field;
                 if (is_string($value)) {
                     $value = str_replace('"', '', $value);
+
                     if ($field == 'subject') {
                         $value = preg_replace('/^(Re:\s*|Fwd:\s*|Fw:\s*)+/i', '', $value);
                     }
-
-                    $data = strtoupper($value);
                 }
             }
 
             $index[$key] = $value;
         }
 
-        if (!empty($index)) {
-            // sort index
-            if ($flag == 'ASC') {
-                asort($index);
-            }
-            else {
-                arsort($index);
-            }
+        $sort_order = $flag == 'ASC' ? SORT_ASC : SORT_DESC;
+        $sort_flags = SORT_STRING | SORT_FLAG_CASE;
 
-            // form new array based on index
-            foreach ($index as $key => $val) {
-                $result[$key] = $messages[$key];
-            }
+        if (in_array($field, array('arrival', 'date', 'internaldate', 'timestamp'))) {
+            $sort_flags = SORT_NUMERIC;
         }
 
-        return $result;
+        array_multisort($index, $sort_order, $sort_flags, $messages);
+
+        return $messages;
     }
 
     /**
@@ -3633,6 +3623,7 @@
         }
         else {
             $data['type']     = strtolower($part_a[0]);
+            $data['subtype']  = strtolower($part_a[1]);
             $data['encoding'] = strtolower($part_a[5]);
 
             // charset

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_imap_search.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_imap_search.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_ldap.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_ldap.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2013, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -338,7 +339,7 @@
                     $search_base_dn = strtr($conf['search_base_dn'], $replaces);
                     $search_filter  = strtr($conf['search_filter'], $replaces);
 
-                    $cache_key = 'DN.' . md5("$host:$search_bind_dn:$search_base_dn:$search_filter:" . $conf['search_bind_pw']);
+                    $cache_key = rcube_cache::key_name('DN', array($host, $search_bind_dn, $search_base_dn, $search_filter, $conf['search_bind_pw']));
 
                     if ($this->cache && ($dn = $this->cache->get($cache_key))) {
                         $replaces['%dn'] = $dn;
@@ -654,10 +655,11 @@
     /**
      * Fetch members of the given group entry from server
      *
-     * @param string Group DN
-     * @param array  Group entry
-     * @param string Member attribute to use
-     * @param boolean Count only
+     * @param string $dn    Group DN
+     * @param array  $entry Group entry
+     * @param string $attr  Member attribute to use
+     * @param bool   $count Count only
+     *
      * @return array Accumulated group members
      */
     private function _list_group_members($dn, $entry, $attr, $count)
@@ -698,16 +700,17 @@
     /**
      * List members of group class groupOfUrls
      *
-     * @param string Group DN
-     * @param array  Group entry
-     * @param boolean True if only used for counting
+     * @param string $dn    Group DN
+     * @param array  $entry Group entry
+     * @param boo    $count True if only used for counting
+     *
      * @return array Accumulated group members
      */
     private function _list_group_memberurl($dn, $entry, $count)
     {
         $group_members = array();
 
-        for ($i=0; $i < $entry['memberurl']['count']; $i++) {
+        for ($i = 0; $i < $entry['memberurl']['count']; $i++) {
             // extract components from url
             if (!preg_match('!ldap://[^/]*/([^\?]+)\?\?(\w+)\?(.*)$!', $entry['memberurl'][$i], $m)) {
                 continue;
@@ -715,14 +718,17 @@
 
             // add search filter if any
             $filter = $this->filter ? '(&(' . $m[3] . ')(' . $this->filter . '))' : $m[3];
-            $attrs = $count ? array('dn','objectClass') : $this->prop['list_attributes'];
+            $attrs  = $count ? array('dn','objectClass') : $this->prop['list_attributes'];
+
             if ($result = $this->ldap->search($m[1], $filter, $m[2], $attrs, $this->group_data)) {
                 $entries = $result->entries();
                 for ($j = 0; $j < $entries['count']; $j++) {
-                    if ($this->is_group_entry($entries[$j]) && ($nested_group_members = $this->list_group_members($entries[$j]['dn'], $count)))
+                    if ($this->is_group_entry($entries[$j]) && ($nested_group_members = $this->list_group_members($entries[$j]['dn'], $count))) {
                         $group_members = array_merge($group_members, $nested_group_members);
-                    else
+                    }
+                    else {
                         $group_members[] = $entries[$j];
+                    }
                 }
             }
         }
@@ -750,7 +756,7 @@
      *
      * @return rcube_result_set List of contact records
      */
-    function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array())
+    function search($fields, $value, $mode = 0, $select = true, $nocount = false, $required = array())
     {
         $mode = intval($mode);
 
@@ -771,7 +777,7 @@
         $rcube = rcube::get_instance();
         $list_fields = $rcube->config->get('contactlist_fields');
 
-        if ($this->prop['vlv_search'] && $this->ready && join(',', (array)$fields) == join(',', $list_fields)) {
+        if ($this->prop['vlv_search'] && $this->ready && implode(',', (array)$fields) == implode(',', $list_fields)) {
             $this->result = new rcube_result_set(0);
 
             $this->ldap->config_set('fuzzy_search', intval($this->prop['fuzzy_search'] && !($mode & rcube_addressbook::SEARCH_STRICT)));
@@ -924,7 +930,6 @@
         $prop    = $this->group_id ? $this->group_data : $this->prop;
         $base_dn = $this->group_id ? $prop['base_dn'] : $this->base_dn;
         $attrs   = $count ? array('dn') : $this->prop['attributes'];
-        $entries = array();
 
         // Use global search filter
         if ($filter = $this->filter) {
@@ -1005,8 +1010,8 @@
     /**
      * Get a specific contact record
      *
-     * @param mixed   Record identifier
-     * @param boolean Return as associative array
+     * @param mixed   $dn    Record identifier
+     * @param boolean $assoc Return as associative array
      *
      * @return mixed  Hash array or rcube_result_set with all record fields
      */
@@ -1017,7 +1022,7 @@
         if ($this->ready && $dn) {
             $dn = self::dn_decode($dn);
 
-            if ($rec = $this->ldap->get_entry($dn)) {
+            if ($rec = $this->ldap->get_entry($dn, $this->prop['attributes'])) {
                 $rec = array_change_key_case($rec, CASE_LOWER);
             }
 
@@ -1064,8 +1069,9 @@
      * Check the given data before saving.
      * If input not valid, the message to display can be fetched using get_error()
      *
-     * @param array Assoziative array with data to save
-     * @param boolean Try to fix/complete record automatically
+     * @param array   &$save_data Associative array with data to save
+     * @param boolean $autofix    Try to fix/complete record automatically
+     *
      * @return boolean True if input is valid, False if not.
      */
     public function validate(&$save_data, $autofix = false)
@@ -1082,23 +1088,24 @@
         }
 
         // Verify that the required fields are set.
-        $missing = null;
+        $missing   = array();
         $ldap_data = $this->_map_data($save_data);
+
         foreach ($this->prop['required_fields'] as $fld) {
             if (!isset($ldap_data[$fld]) || $ldap_data[$fld] === '') {
                 $missing[$fld] = 1;
             }
         }
 
-        if ($missing) {
+        if (!empty($missing)) {
             // try to complete record automatically
             if ($autofix) {
-                $sn_field    = $this->fieldmap['surname'];
-                $fn_field    = $this->fieldmap['firstname'];
-                $mail_field  = $this->fieldmap['email'];
+                $sn_field   = $this->fieldmap['surname'];
+                $fn_field   = $this->fieldmap['firstname'];
+                $mail_field = $this->fieldmap['email'];
 
                 // try to extract surname and firstname from displayname
-                $name_parts  = preg_split('/[\s,.]+/', $save_data['name']);
+                $name_parts = preg_split('/[\s,.]+/', $save_data['name']);
 
                 if ($sn_field && $missing[$sn_field]) {
                     $save_data['surname'] = array_pop($name_parts);
@@ -1134,10 +1141,10 @@
     /**
      * Create a new contact record
      *
-     * @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 array $save_cols 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 $check True to check for duplicates first
      *
      * @return mixed The created record ID on success, False on error
      */
@@ -1197,8 +1204,9 @@
         $dn = self::dn_encode($dn);
 
         // add new contact to the selected group
-        if ($this->group_id)
+        if ($this->group_id) {
             $this->add_to_group($this->group_id, $dn);
+        }
 
         return $dn;
     }
@@ -1213,17 +1221,15 @@
      */
     function update($id, $save_cols)
     {
-        $record = $this->get_record($id, true);
-
+        $record      = $this->get_record($id, true);
         $newdata     = array();
         $replacedata = array();
         $deletedata  = array();
         $subdata     = array();
         $subdeldata  = array();
         $subnewdata  = array();
-
-        $ldap_data = $this->_map_data($save_cols);
-        $old_data  = $record['_raw_attrib'];
+        $ldap_data   = $this->_map_data($save_cols);
+        $old_data    = $record['_raw_attrib'];
 
         // special handling of photo col
         if ($photo_fld = $this->fieldmap['photo']) {
@@ -1285,9 +1291,9 @@
                         // The data was modified, save it out.
                         $replacedata[$fld] = $val;
                     }
-                } // end if
-            } // end if
-        } // end foreach
+                }
+            }
+        }
 
         // console($old_data, $ldap_data, '----', $newdata, $replacedata, $deletedata, '----', $subdata, $subnewdata, $subdeldata);
 
@@ -1300,7 +1306,7 @@
                 $this->set_error(self::ERROR_SAVING, 'errorsaving');
                 return false;
             }
-        } // end if
+        }
 
         if (!empty($replacedata)) {
             // Handle RDN change
@@ -1321,7 +1327,7 @@
                     return false;
                 }
             }
-        } // end if
+        }
 
         // RDN change, we need to remove all sub-entries
         if (!empty($newrdn)) {
@@ -1345,7 +1351,7 @@
                 $this->set_error(self::ERROR_SAVING, 'errorsaving');
                 return false;
             }
-        } // end if
+        }
 
         // Handle RDN change
         if (!empty($newrdn)) {
@@ -1397,7 +1403,7 @@
         if (!is_array($ids)) {
             // Not an array, break apart the encoded DNs.
             $ids = explode(',', $ids);
-        } // end if
+        }
 
         foreach ($ids as $id) {
             $dn = self::dn_decode($id);
@@ -1422,13 +1428,14 @@
 
             // remove contact from all groups where he was a member
             if ($this->groups) {
-                $dn = self::dn_encode($dn);
+                $dn        = self::dn_encode($dn);
                 $group_ids = $this->get_record_groups($dn);
+
                 foreach (array_keys($group_ids) as $group_id) {
                     $this->remove_from_group($group_id, $dn);
                 }
             }
-        } // end foreach
+        }
 
         return count($ids);
     }
@@ -1477,7 +1484,7 @@
             $attrvals['{'.$k.'}'] = is_array($v) ? $v[0] : $v;
         }
 
-        foreach ((array)$this->prop['autovalues'] as $lf => $templ) {
+        foreach ((array) $this->prop['autovalues'] as $lf => $templ) {
             if (empty($attrs[$lf])) {
                 if (strpos($templ, '(') !== false) {
                     // replace {attr} placeholders with (escaped!) attribute values to be safely eval'd
@@ -1513,16 +1520,17 @@
      */
     private function _ldap2result($rec)
     {
-        $out = array('_type' => 'person');
+        $out      = array('_type' => 'person');
         $fieldmap = $this->fieldmap;
 
-        if ($rec['dn'])
+        if ($rec['dn']) {
             $out[$this->primary_key] = self::dn_encode($rec['dn']);
+        }
 
         // determine record type
         if ($this->is_group_entry($rec)) {
-            $out['_type'] = 'group';
-            $out['readonly'] = true;
+            $out['_type']     = 'group';
+            $out['readonly']  = true;
             $fieldmap['name'] = $this->group_data['name_attr'] ?: $this->prop['groups']['name_attr'];
         }
 
@@ -1536,10 +1544,16 @@
             }
         }
 
-        foreach ($fieldmap as $rf => $lf)
-        {
-            for ($i=0; $i < $rec[$lf]['count']; $i++) {
-                if (!($value = $rec[$lf][$i]))
+        foreach ($fieldmap as $rf => $lf) {
+            // we might be dealing with normalized and non-normalized data
+            $entry = $rec[$lf];
+            if (!is_array($entry) || !isset($entry['count'])) {
+                $entry = (array) $entry;
+                $entry['count'] = count($entry);
+            }
+
+            for ($i=0; $i < $entry['count']; $i++) {
+                if (!($value = $entry[$i]))
                     continue;
 
                 list($col, $subtype) = explode(':', $rf);
@@ -1551,7 +1565,7 @@
                     $out['address' . ($subtype ? ':' : '') . $subtype][$i][$col] = $value;
                 else if ($col == 'address' && strpos($value, '$') !== false)  // address data is represented as string separated with $
                     list($out[$rf][$i]['street'], $out[$rf][$i]['locality'], $out[$rf][$i]['zipcode'], $out[$rf][$i]['country']) = explode('$', $value);
-                else if ($rec[$lf]['count'] > 1)
+                else if ($entry['count'] > 1)
                     $out[$rf][] = $value;
                 else
                     $out[$rf] = $value;
@@ -1598,7 +1612,7 @@
                   $key = $col.':'.$subtype;
                   foreach ((array)$save_cols[$key] as $i => $val) {
                      $values = array($val['street'], $val['locality'], $val['zipcode'], $val['country']);
-                     $save_cols[$key][$i] = count(array_filter($values)) ? join($delim, $values) : null;
+                     $save_cols[$key][$i] = count(array_filter($values)) ? implode($delim, $values) : null;
                  }
                }
             }
@@ -1608,7 +1622,7 @@
         foreach ($this->fieldmap as $rf => $fld) {
             $val = $save_cols[$rf];
 
-            // check for value in base field (eg.g email instead of email:foo)
+            // check for value in base field (eg. email instead of email:foo)
             list($col, $subtype) = explode(':', $rf);
             if (!$val && !empty($save_cols[$col])) {
                 $val = $save_cols[$col];
@@ -1618,8 +1632,10 @@
                 $val = $this->get_col_values($col, $save_cols, true);
             }
 
-            if (is_array($val))
+            if (is_array($val)) {
                 $val = array_filter($val);  // remove empty entries
+            }
+
             if ($fld && $val) {
                 // The field does exist, add it to the entry.
                 $ldap_data[$fld] = $val;
@@ -1902,7 +1918,8 @@
     /**
      * Get group properties such as name and email address(es)
      *
-     * @param string Group identifier
+     * @param string $group_id Group identifier
+     *
      * @return array Group properties as hash array
      */
     function get_group($group_id)
@@ -1916,7 +1933,8 @@
     /**
      * Create a contact group with the given name
      *
-     * @param string The group name
+     * @param string $group_name The group name
+     *
      * @return mixed False on error, array with record props in success
      */
     function create_group($group_name)
@@ -1946,7 +1964,8 @@
     /**
      * Delete the given group and all linked group members
      *
-     * @param string Group identifier
+     * @param string $group_id Group identifier
+     *
      * @return boolean True on success, false if no data was changed
      */
     function delete_group($group_id)
@@ -1970,9 +1989,10 @@
     /**
      * Rename a specific contact group
      *
-     * @param string Group identifier
-     * @param string New name to set for this group
-     * @param string New group identifier (if changed, otherwise don't set)
+     * @param string $group_id Group identifier
+     * @param string $new_name New name to set for this group
+     * @param string &$new_gid New group identifier (if changed, otherwise don't set)
+     *
      * @return boolean New name on success, false if no data was changed
      */
     function rename_group($group_id, $new_name, &$new_gid)
@@ -1997,8 +2017,8 @@
     /**
      * Add the given contact records the a certain group
      *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be added
+     * @param string       $group_id    Group identifier
+     * @param array|string $contact_ids List of contact identifiers to be added
      *
      * @return int Number of contacts added
      */
@@ -2032,8 +2052,8 @@
     /**
      * Remove the given contact records from a certain group
      *
-     * @param string       Group identifier
-     * @param array|string List of contact identifiers to be removed
+     * @param string       $group_id    Group identifier
+     * @param array|string $contact_ids List of contact identifiers to be removed
      *
      * @return int Number of deleted group members
      */
@@ -2067,7 +2087,7 @@
     /**
      * Get group assignments of a specific contact record
      *
-     * @param mixed Record identifier
+     * @param mixed $contact_id Record identifier
      *
      * @return array List of assigned groups as ID=>Name pairs
      * @since 0.5-beta
@@ -2084,9 +2104,11 @@
         $member_attr = $this->get_group_member_attr();
         $add_filter  = '';
 
-        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
+        if ($member_attr != 'member' && $member_attr != 'uniqueMember') {
             $add_filter = "($member_attr=$contact_dn)";
-        $filter = strtr("(|(member=$contact_dn)(uniqueMember=$contact_dn)$add_filter)", array('\\' => '\\\\'));
+        }
+
+        $filter = strtr("(|(member=$contact_dn)(uniqueMember=$contact_dn)$add_filter)", array("\\" => "\\\\"));
 
         $ldap_data = $this->ldap->search($base_dn, $filter, 'sub', array('dn', $name_attr));
         if ($ldap_data === false) {
@@ -2095,10 +2117,12 @@
 
         $groups = array();
         foreach ($ldap_data as $entry) {
-            if (!$entry['dn'])
+            if (!$entry['dn']) {
                 $entry['dn'] = $ldap_data->get_dn();
+            }
+
             $group_name = $entry[$name_attr][0];
-            $group_id = self::dn_encode($entry['dn']);
+            $group_id   = self::dn_encode($entry['dn']);
             $groups[$group_id] = $group_name;
         }

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_ldap_generic.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_ldap_generic.php Changed

@@ -2,11 +2,10 @@
 
 /**
  +-----------------------------------------------------------------------+
- | Roundcube/rcube_ldap_generic.php                                      |
- |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2006-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2012-2015, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -55,19 +54,6 @@
     }
 
     /**
-     * Get a specific LDAP entry, identified by its DN
-     *
-     * @param string $dn Record identifier
-     * @param array  $attributes Attributes to return
-     *
-     * @return array Hash array
-     */
-    function get_entry($dn, $attributes = array())
-    {
-        return parent::get_entry($dn, !empty($attributes) ? $attributes : $this->attributes);
-    }
-
-    /**
      * Prints debug/error info to the log
      */
     public function log($level, $msg)
@@ -355,10 +341,10 @@
             foreach ($attributes as $attr) {
                 $parts[] = "($attr=$wp" . self::quote_string($word) . "$ws)";
             }
-            $groups[] = '(|' . join('', $parts) . ')';
+            $groups[] = '(|' . implode('', $parts) . ')';
         }
 
-        return count($groups) > 1 ? '(&' . join('', $groups) . ')' : join('', $groups);
+        return count($groups) > 1 ? '(&' . implode('', $groups) . ')' : implode('', $groups);
     }
 }

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_message.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_message.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,7 +24,6 @@
  *
  * @package    Framework
  * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
  */
 class rcube_message
 {
@@ -136,7 +136,8 @@
      * Return a (decoded) message header
      *
      * @param string $name Header name
-     * @param bool   $row  Don't mime-decode the value
+     * @param bool   $raw  Don't mime-decode the value
+     *
      * @return string Header value
      */
     public function get_header($name, $raw = false)
@@ -163,6 +164,7 @@
      *
      * @param string $mime_id Part MIME-ID
      * @param mixed  $embed Mimetype class for parts to be embedded
+     *
      * @return string URL or false if part does not exist
      */
     public function get_part_url($mime_id, $embed = false)
@@ -207,11 +209,11 @@
     /**
      * Get content of a specific part of this message
      *
-     * @param string  $mime_id   Part ID
-     * @param boolean $formatted Enables formatting of text/* parts bodies
-     * @param int     $max_bytes Only return/read this number of bytes
-     * @param mixed   $mode      NULL to return a string, -1 to print body
-     *                           or file pointer to save the body into
+     * @param string $mime_id   Part ID
+     * @param bool   $formatted Enables formatting of text/* parts bodies
+     * @param int    $max_bytes Only return/read this number of bytes
+     * @param mixed  $mode      NULL to return a string, -1 to print body
+     *                          or file pointer to save the body into
      *
      * @return string|bool Part content or operation status
      */
@@ -366,7 +368,7 @@
                         return true;
                     }
 
-                    $parent = $this->mime_parts[join('.', $level)];
+                    $parent = $this->mime_parts[implode('.', $level)];
 
                     if (!$this->check_context($parent)) {
                         return true;
@@ -424,7 +426,7 @@
                         return true;
                     }
 
-                    $parent = $this->mime_parts[join('.', $level)];
+                    $parent = $this->mime_parts[implode('.', $level)];
 
                     if (!$this->check_context($parent)) {
                         return true;
@@ -934,16 +936,22 @@
      */
     private function get_mime_numbers(&$part)
     {
-        if (strlen($part->mime_id))
+        if (strlen($part->mime_id)) {
             $this->mime_parts[$part->mime_id] = &$part;
+        }
 
-        if (is_array($part->parts))
-            for ($i=0; $i<count($part->parts); $i++)
+        if (is_array($part->parts)) {
+            for ($i=0; $i<count($part->parts); $i++) {
                 $this->get_mime_numbers($part->parts[$i]);
+            }
+        }
     }
 
     /**
      * Add a part to object parts array(s) (with context check)
+     *
+     * @param rcube_message_part $part Message part
+     * @param string             $type Part type (inline/attachment)
      */
     private function add_part($part, $type = null)
     {
@@ -960,6 +968,10 @@
 
     /**
      * Check if specified part belongs to the current context
+     *
+     * @param rcube_message_part $part Message part
+     *
+     * @return bool True if the part belongs to the current context, False otherwise
      */
     private function check_context($part)
     {
@@ -970,7 +982,8 @@
      * Decode a Microsoft Outlook TNEF part (winmail.dat)
      *
      * @param rcube_message_part $part Message part to decode
-     * @return array
+     *
+     * @return rcube_message_part[] List of message parts extracted from TNEF
      */
     function tnef_decode(&$part)
     {
@@ -1005,7 +1018,8 @@
      * Parse message body for UUencoded attachments bodies
      *
      * @param rcube_message_part $part Message part to decode
-     * @return array
+     *
+     * @return rcube_message_part[] List of message parts extracted from the file
      */
     function uu_decode(&$part)
     {
@@ -1058,7 +1072,12 @@
     }
 
     /**
-     * Fix attachment name encoding if needed/possible
+     * Fix attachment name encoding if needed and possible
+     *
+     * @param string             $name Attachment name
+     * @param rcube_message_part $part Message part
+     *
+     * @return string Fixed attachment name
      */
     protected function fix_attachment_name($name, $part)
     {
@@ -1080,8 +1099,8 @@
             // check parents' charset
             $items = explode('.', $part->mime_id);
             for ($i = count($items)-1; $i > 0; $i--) {
-                $last   = array_pop($items);
-                $parent = $this->mime_parts[join('.', $items)];
+                array_pop($items);
+                $parent = $this->mime_parts[implode('.', $items)];
 
                 if ($parent && $parent->charset) {
                     $charsets[] = $parent->charset;

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_message_header.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_message_header.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_message_part.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_message_part.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_mime.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_mime.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2016, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2016, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_mime
 {
@@ -711,9 +710,8 @@
     {
         static $mime_ext = array();
 
-        $mime_type  = null;
-        $config     = rcube::get_instance()->config;
-        $mime_magic = $config->get('mime_magic');
+        $mime_type = null;
+        $config    = rcube::get_instance()->config;
 
         if (!$skip_suffix && empty($mime_ext)) {
             foreach ($config->resolve_paths('mimetypes.php') as $fpath) {
@@ -730,6 +728,7 @@
 
         // try fileinfo extension if available
         if (!$mime_type && function_exists('finfo_open')) {
+            $mime_magic = $config->get('mime_magic');
             // null as a 2nd argument should be the same as no argument
             // this however is not true on all systems/versions
             if ($mime_magic) {
@@ -740,10 +739,8 @@
             }
 
             if ($finfo) {
-                if ($is_stream)
-                    $mime_type = finfo_buffer($finfo, $path);
-                else
-                    $mime_type = finfo_file($finfo, $path);
+                $func      = $is_stream ? 'finfo_buffer' : 'finfo_file';
+                $mime_type = $func($finfo, $path, FILEINFO_MIME_TYPE);
                 finfo_close($finfo);
             }
         }
@@ -757,11 +754,6 @@
         if (!$mime_type) {
             $mime_type = $failover;
         }
-        else {
-            // Sometimes (PHP-5.3?) content-type contains charset definition,
-            // Remove it (#1487122) also "charset=binary" is useless
-            $mime_type = array_shift(preg_split('/[; ]/', $mime_type));
-        }
 
         return $mime_type;
     }
@@ -849,6 +841,8 @@
             'image/jpg'      => array('jpg', 'jpeg', 'jpe'),
             'image/pjpeg'    => array('jpg', 'jpeg', 'jpe'),
             'image/tiff'     => array('tif'),
+            'image/bmp'      => array('bmp'),
+            'image/x-ms-bmp' => array('bmp'),
             'message/rfc822' => array('eml'),
             'text/x-mail'    => array('eml'),
         );

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_mime_decode.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_mime_decode.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2015, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2015, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -24,7 +25,6 @@
  *
  * @package    Framework
  * @subpackage Storage
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_mime_decode
 {
@@ -375,8 +375,6 @@
             $struct->charset = $part->ctype_parameters['charset'];
         }
 
-        $part_charset = $struct->charset ?: $this->params['default_charset'];
-
         // determine filename
         if (($filename = $part->d_parameters['filename']) || ($filename = $part->ctype_parameters['name'])) {
             if (!$this->params['decode_headers']) {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_output.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_output.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_plugin.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_plugin.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -68,9 +69,16 @@
      */
     public $allowed_prefs;
 
+    /** @var string Plugin directory location */
     protected $home;
+
+    /** @var string Base URL to the plugin directory */
     protected $urlbase;
+
+    /** @var string Plugin task name (if registered) */
     private $mytask;
+
+    /** @var array List of plugin configuration files already loaded */
     private $loaded_config = array();
 
 
@@ -95,7 +103,7 @@
     /**
      * Provide information about this
      *
-     * @return array Meta information about a plugin or false if not implemented:
+     * @return array Meta information about a plugin or false if not implemented.
      * As hash array with the following keys:
      *      name: The plugin name
      *    vendor: Name of the plugin developer
@@ -316,7 +324,7 @@
      */
     public function include_stylesheet($fn)
     {
-        $this->api->include_stylesheet($this->resource_url($fn), $if_exists);
+        $this->api->include_stylesheet($this->resource_url($fn));
     }
 
     /**
@@ -379,9 +387,11 @@
     {
         $rcube = rcube::get_instance();
         $skins = array_keys((array)$rcube->output->skins);
+
         if (empty($skins)) {
             $skins = (array) $rcube->config->get('skin');
         }
+
         foreach ($skins as $skin) {
             $skin_path = 'skins/' . $skin;
             if (is_dir(realpath(slashify($this->home) . $skin_path))) {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_plugin_api.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_plugin_api.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_result_index.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_result_index.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_result_multifolder.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_result_multifolder.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2011, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -165,7 +166,13 @@
             $msgid .= '-' . $this->folder;
         }
 
-        return array_search($msgid, $this->index);
+        $idx = array_search($msgid, $this->index);
+
+        if ($get_index) {
+            return $idx;
+        }
+
+        return $idx !== false;
     }
 
     /**

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_result_set.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_result_set.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_result_thread.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_result_thread.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_session.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_session.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -24,8 +25,6 @@
  *
  * @package    Framework
  * @subpackage Core
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 abstract class rcube_session
 {
@@ -82,6 +81,8 @@
     }
 
     /**
+     * Object constructor
+     *
      * @param Object $config
      */
     public function __construct($config)
@@ -92,13 +93,13 @@
         $this->set_ip_check($this->config->get('ip_check'));
 
         // set cookie name
-        if ($this->config->get('session_auth_name')) {
-            $this->set_cookiename($this->config->get('session_auth_name'));
+        if ($name = $this->config->get('session_auth_name')) {
+            $this->set_cookiename($name);
         }
     }
 
     /**
-     * register session handler
+     * Register session handler
      */
     public function register_session_handler()
     {
@@ -127,7 +128,7 @@
     {
         $this->start   = microtime(true);
         $this->ip      = rcube_utils::remote_addr();
-        $this->logging = $this->config->get('log_session', false);
+        $this->logging = $this->config->get('session_debug', false);
 
         $lifetime = $this->config->get('session_lifetime', 1) * 60;
         $this->set_lifetime($lifetime);
@@ -146,12 +147,12 @@
     abstract function update($key, $newvars, $oldvars);
 
     /**
-     * session write handler. This calls the implementation methods for write/update after some initial checks.
+     * Session write handler. This calls the implementation methods for write/update after some initial checks.
      *
-     * @param $key
-     * @param $vars
+     * @param string $key  Session identifier
+     * @param string $vars Serialized data string
      *
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function sess_write($key, $vars)
     {
@@ -188,7 +189,7 @@
     /**
      * Creates a new (separate) session
      *
-     * @param array Session data
+     * @param array $data Session data
      *
      * @return string Session identifier (on success)
      */
@@ -238,6 +239,10 @@
 
     /**
      * Execute registered garbage collector routines
+     *
+     * @param int $maxlifetime Maximum session lifetime
+     *
+     * @return bool True on success, False on failure
      */
     public function gc($maxlifetime)
     {
@@ -281,10 +286,12 @@
      *
      * @param boolean $destroy If enabled the current session will be destroyed
      *
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function regenerate_id($destroy = true)
     {
+        $old_id = session_id();
+
         // Since PHP 7.0 session_regenerate_id() will cause the old
         // session data update, we don't need this
         $this->ignore_write = true;
@@ -294,15 +301,17 @@
         $this->vars = null;
         $this->key  = session_id();
 
+        $this->log("Session regenerate: $old_id -> {$this->key}");
+
         return true;
     }
 
     /**
      * See if we have vars of this key already cached, and if so, return them.
      *
-     * @param string $key Session ID
+     * @param string $key Session identifier
      *
-     * @return string
+     * @return string Serialized data string
      */
     protected function get_cache($key)
     {
@@ -326,9 +335,9 @@
      *
      * Warning: Do not use if you already modified $_SESSION in the same request (#1490608)
      *
-     * @param string Path denoting the session variable where to append the value
-     * @param string Key name under which to append the new value (use null for appending to an indexed list)
-     * @param mixed  Value to append to the session data array
+     * @param string $path  Path denoting the session variable where to append the value
+     * @param string $key   Key name under which to append the new value (use null for appending to an indexed list)
+     * @param mixed  $value Value to append to the session data array
      */
     public function append($path, $key, $value)
     {
@@ -360,10 +369,12 @@
     /**
      * Unset a session variable
      *
-     * @param string Variable name (can be a path denoting a certain node in the session array, e.g. compose.attachments.5)
-     * @return boolean True on success
+     * @param string $var Variable name (can be a path denoting a certain node
+     *                    in the session array, e.g. compose.attachments.5)
+     *
+     * @return boolean True on success, False on failure
      */
-    public function remove($var=null)
+    public function remove($var = null)
     {
         if (empty($var)) {
             return $this->destroy(session_id());
@@ -389,9 +400,12 @@
      */
     public function kill()
     {
+        $this->log("Session destroy: " . session_id());
+
         $this->vars = null;
         $this->ip   = rcube_utils::remote_addr(); // update IP (might have changed)
         $this->destroy(session_id());
+
         rcube_utils::setcookie($this->cookiename, '-del-', time() - 60);
     }
 
@@ -472,6 +486,10 @@
     /**
      * Unserialize session data
      * http://www.php.net/manual/en/function.session-decode.php#56106
+     *
+     * @param string $str Serialized data string
+     *
+     * @return array Unserialized data
      */
     public static function unserialize($str)
     {
@@ -564,11 +582,13 @@
             $p = $q;
         }
 
-        return unserialize( 'a:' . $items . ':{' . $serialized . '}' );
+        return unserialize('a:' . $items . ':{' . $serialized . '}');
     }
 
     /**
      * Setter for session lifetime
+     *
+     * @param int $lifetime Session lifetime (in seconds)
      */
     public function set_lifetime($lifetime)
     {
@@ -581,6 +601,8 @@
 
     /**
      * Getter for remote IP saved with this session
+     *
+     * @return string Client IP address
      */
     public function get_ip()
     {
@@ -589,6 +611,8 @@
 
     /**
      * Setter for cookie encryption secret
+     *
+     * @param string $secret Authentication secret string
      */
     function set_secret($secret = null)
     {
@@ -607,6 +631,8 @@
 
     /**
      * Enable/disable IP check
+     *
+     * @param bool $check IP address checking state
      */
     function set_ip_check($check)
     {
@@ -615,11 +641,13 @@
 
     /**
      * Setter for the cookie name used for session cookie
+     *
+     * @param string $name Authentication cookie name
      */
-    function set_cookiename($cookiename)
+    function set_cookiename($name)
     {
-        if ($cookiename) {
-            $this->cookiename = $cookiename;
+        if ($name) {
+            $this->cookiename = $name;
         }
     }
 
@@ -673,9 +701,9 @@
     /**
      * Create session cookie for specified time slot.
      *
-     * @param int Time slot to use
+     * @param int $timeslot Time slot to use
      *
-     * @return string
+     * @return string Cookie value
      */
     protected function _mkcookie($timeslot)
     {
@@ -688,6 +716,8 @@
 
     /**
      * Writes debug information to the log
+     *
+     * @param string Log line
      */
     function log($line)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_smtp.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_smtp.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -13,6 +14,7 @@
  |   Provide SMTP functionality using socket connections                 |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ |         Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
@@ -21,8 +23,6 @@
  *
  * @package    Framework
  * @subpackage Mail
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_smtp
 {
@@ -172,7 +172,6 @@
                 $this->response[] = 'Authentication failure: ' . $result->getMessage()
                     . ' (Code: ' . $result->getCode() . ')';
 
-                $this->reset();
                 $this->disconnect();
 
                 return false;
@@ -350,7 +349,7 @@
             return false;
         }
 
-        $this->response[] = join(': ', $this->conn->getResponse());
+        $this->response[] = implode(': ', $this->conn->getResponse());
         return true;
     }
 
@@ -476,7 +475,7 @@
             }
         }
 
-        return array($from, join(self::SMTP_MIME_CRLF, $lines) . self::SMTP_MIME_CRLF);
+        return array($from, implode(self::SMTP_MIME_CRLF, $lines) . self::SMTP_MIME_CRLF);
     }
 
     /**

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_spellchecker.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_spellchecker.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -87,7 +88,7 @@
 
         // add correct labels
         $languages = array();
-        foreach ($langs as $lang) {
+        foreach ((array) $langs as $lang) {
             $langc = strtolower(substr($lang, 0, 2));
             $alias = $rcube_language_aliases[$langc];
             if (!$alias) {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_storage.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_storage.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2012, Kolab Systems AG                                  |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,8 +24,6 @@
  *
  * @package    Framework
  * @subpackage Storage
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 abstract class rcube_storage
 {
@@ -589,15 +588,15 @@
             }
             // get UIDs from current search set
             else {
-                $uids = join(',', $this->search_set->get());
+                $uids = implode(',', $this->search_set->get());
             }
         }
         else {
             if (is_array($uids)) {
-                $uids = join(',', $uids);
+                $uids = implode(',', $uids);
             }
             else if (strpos($uids, ':')) {
-                $uids = join(',', rcube_imap_generic::uncompressMessageSet($uids));
+                $uids = implode(',', rcube_imap_generic::uncompressMessageSet($uids));
             }
 
             if (preg_match('/[^0-9,]/', $uids)) {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_string_replacer.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_string_replacer.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2009-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -37,6 +38,11 @@
     protected $noword   = '[^\w@.#-]';
 
 
+    /**
+     * Object constructor
+     *
+     * @param array $options Configuration options
+     */
     function __construct($options = array())
     {
         // Simplified domain expression for UTF8 characters handling
@@ -62,7 +68,7 @@
     /**
      * Add a string to the internal list
      *
-     * @param string String value
+     * @param string $str String value
      *
      * @return int Index of value for retrieval
      */
@@ -75,6 +81,10 @@
 
     /**
      * Build replacement string
+     *
+     * @param string|int $i Replacement index
+     *
+     * @return string Replacement string
      */
     public function get_replacement($i)
     {
@@ -84,8 +94,10 @@
     /**
      * Callback function used to build HTML links around URL strings
      *
-     * @param array Matches result from preg_replace_callback
-     * @return int Index of saved string value
+     * @param array $matches Matches result from preg_replace_callback
+     *
+     * @return string Return valid link for recognized schemes, otherwise
+     *                return the unmodified URL.
      */
     public function link_callback($matches)
     {
@@ -110,13 +122,15 @@
             $this->urls[$i] = $attrib['href'];
         }
 
-        // Return valid link for recognized schemes, otherwise
-        // return the unmodified string for unrecognized schemes.
         return $i >= 0 ? $prefix . $this->get_replacement($i) : $matches[0];
     }
 
     /**
      * Callback to add an entry to the link index
+     *
+     * @param array $matches Matches result from preg_replace_callback
+     *
+     * @return string Replacement string
      */
     public function linkref_addindex($matches)
     {
@@ -128,6 +142,10 @@
 
     /**
      * Callback to replace link references with real links
+     *
+     * @param array $matches Matches result from preg_replace_callback
+     *
+     * @return string Replacement string
      */
     public function linkref_callback($matches)
     {
@@ -144,9 +162,9 @@
     /**
      * Callback function used to build mailto: links around e-mail strings
      *
-     * @param array Matches result from preg_replace_callback
+     * @param array $matches Matches result from preg_replace_callback
      *
-     * @return int Index of saved string value
+     * @return string Replacement string
      */
     public function mailto_callback($matches)
     {
@@ -161,7 +179,8 @@
      * Look up the index from the preg_replace matches array
      * and return the substitution value.
      *
-     * @param array Matches result from preg_replace_callback
+     * @param array $matches Matches result from preg_replace_callback
+     *
      * @return string Value at index $matches[1]
      */
     public function replace_callback($matches)
@@ -190,6 +209,10 @@
 
     /**
      * Replace substituted strings with original values
+     *
+     * @param string $str Text
+     *
+     * @return string Text
      */
     public function resolve($str)
     {
@@ -198,8 +221,12 @@
 
     /**
      * Fixes bracket characters in URL handling
+     *
+     * @param string &$url URL
+     *
+     * @return string Suffix (the rest of the URL input)
      */
-    public static function parse_url_brackets(&$url)
+    protected static function parse_url_brackets(&$url)
     {
         // #1487672: special handling of square brackets,
         // URL regexp allows [] characters in URL, for example:

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_text2html.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_text2html.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -24,25 +25,13 @@
  */
 class rcube_text2html
 {
-    /**
-     * Contains the HTML content after conversion.
-     *
-     * @var string $html
-     */
+    /** @var string Contains the HTML content after conversion */
     protected $html;
 
-    /**
-     * Contains the plain text.
-     *
-     * @var string $text
-     */
+    /** @var string Contains the plain text */
     protected $text;
 
-    /**
-     * Configuration
-     *
-     * @var array $config
-     */
+    /** @var array Configuration */
     protected $config = array(
         // non-breaking space
         'space' => "\xC2\xA0",
@@ -74,9 +63,9 @@
      * will instantiate with that source propagated, all that has
      * to be done it to call get_html().
      *
-     * @param string  $source    Plain text
-     * @param boolean $from_file Indicates $source is a file to pull content from
-     * @param array   $config    Class configuration
+     * @param string $source    Plain text
+     * @param bool   $from_file Indicates $source is a file to pull content from
+     * @param array  $config    Class configuration
      */
     function __construct($source = '', $from_file = false, $config = array())
     {
@@ -92,8 +81,8 @@
     /**
      * Loads source text into memory, either from $source string or a file.
      *
-     * @param string  $source    Plain text
-     * @param boolean $from_file Indicates $source is a file to pull content from
+     * @param string $source    Plain text
+     * @param bool   $from_file Indicates $source is a file to pull content from
      */
     function set_text($source, $from_file = false)
     {
@@ -142,7 +131,9 @@
     /**
      * Workhorse function that does actual conversion.
      *
-     * @param string Plain text
+     * @param string $text Plain text
+     *
+     * @return string HTML content
      */
     protected function _converter($text)
     {
@@ -235,7 +226,7 @@
                 str_repeat('</blockquote>', $quote_level)));
         }
 
-        $text = join("\n", $text);
+        $text = implode("\n", $text);
 
         // colorize signature (up to <sig_max_lines> lines)
         $len           = strlen($text);
@@ -265,6 +256,11 @@
 
     /**
      * Converts spaces in line of text
+     *
+     * @param string $text      Plain text
+     * @param bool   $is_flowed Is the $text format=flowed?
+     *
+     * @return string Converted text
      */
     protected function _convert_line($text, $is_flowed)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_tnef_decoder.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_tnef_decoder.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2017, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  | Copyright (C) 2002-2010, The Horde Project (http://www.horde.org/)    |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
@@ -128,7 +129,7 @@
      *
      * @param string $data The data to decompress.
      *
-     * @return mixed The decompressed data.
+     * @return array The decompressed data.
      */
     public function decompress($data)
     {
@@ -166,8 +167,8 @@
     /**
      * Pop specified number of bytes from the buffer.
      *
-     * @param string  &$data The data string.
-     * @param integer $bytes How many bytes to retrieve.
+     * @param string &$data The data string.
+     * @param int    $bytes How many bytes to retrieve.
      *
      * @return string Extracted data
      */
@@ -186,10 +187,10 @@
     /**
      * Pop specified number of bits from the buffer
      *
-     * @param string  &$data The data string.
-     * @param integer $bits  How many bits to retrieve.
+     * @param string &$data The data string.
+     * @param int    $bits  How many bits to retrieve.
      *
-     * @return int
+     * @return int|null
      */
     protected function _geti(&$data, $bits)
     {
@@ -215,6 +216,8 @@
      * Decode a single attribute
      *
      * @param string &$data The data string.
+     *
+     * @return string Extracted data
      */
     protected function _decodeAttribute(&$data)
     {
@@ -492,21 +495,21 @@
         $length_preload = strlen($preload);
 
         for ($cnt = 0; $cnt < $length_preload; $cnt++) {
-            $uncomp .= $preload{$cnt};
+            $uncomp .= $preload[$cnt];
             ++$out;
         }
 
         while ($out < ($size + $length_preload)) {
             if (($flag_count++ % 8) == 0) {
-                $flags = ord($data{$in++});
+                $flags = ord($data[$in++]);
             }
             else {
                 $flags = $flags >> 1;
             }
 
             if (($flags & 1) != 0) {
-                $offset = ord($data{$in++});
-                $length = ord($data{$in++});
+                $offset = ord($data[$in++]);
+                $length = ord($data[$in++]);
                 $offset = ($offset << 4) | ($length >> 4);
                 $length = ($length & 0xF) + 2;
                 $offset = ((int)($out / 4096)) * 4096 + $offset;
@@ -523,7 +526,7 @@
                 }
             }
             else {
-                $uncomp .= $data{$in++};
+                $uncomp .= $data[$in++];
                 ++$out;
             }
         }
@@ -533,8 +536,7 @@
 
     /**
      * Parse RTF data and return the best plaintext representation we can.
-     * Adapted from:
-     * http://webcheatsheet.com/php/reading_the_clean_text_from_rtf.php
+     * Adapted from: http://webcheatsheet.com/php/reading_the_clean_text_from_rtf.php
      *
      * @param string $text The RTF (uncompressed) text.
      *
@@ -737,6 +739,9 @@
         return $document;
     }
 
+    /**
+     * Checks if an RTF element is plain text
+     */
     protected static function _rtfIsPlain($s)
     {
         $notPlain = array('*', 'fonttbl', 'colortbl', 'datastore', 'themedata', 'stylesheet');

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_user.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_user.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -26,42 +27,35 @@
  */
 class rcube_user
 {
+    /** @var int User identifier */
     public $ID;
+
+    /** @var array User properties */
     public $data;
+
+    /** @var string User language code */
     public $language;
+
+    /** @var array User preferences */
     public $prefs;
 
-    /**
-     * Holds database connection.
-     *
-     * @var rcube_db
-     */
+
+    /** @var rcube_db Holds database connection */
     private $db;
 
-    /**
-     * Framework object.
-     *
-     * @var rcube
-     */
+    /** @var rcube Framework object */
     private $rc;
 
-    /**
-     * Internal identities cache
-     *
-     * @var array
-     */
+    /** @var array Internal identities cache */
     private $identities = array();
 
-    /**
-     * Internal emails cache
-     *
-     * @var array
-     */
+    /** @var array Internal emails cache */
     private $emails;
 
 
     const SEARCH_ADDRESSBOOK = 1;
-    const SEARCH_MAIL = 2;
+    const SEARCH_MAIL        = 2;
+
 
     /**
      * Object constructor
@@ -377,7 +371,7 @@
         $query_params[] = $this->ID;
 
         $sql = "UPDATE ".$this->db->table_name('identities', true).
-            " SET `changed` = ".$this->db->now().", ".join(', ', $query_cols).
+            " SET `changed` = ".$this->db->now().", ".implode(', ', $query_cols).
             " WHERE `identity_id` = ?".
                 " AND `user_id` = ?".
                 " AND `del` <> 1";
@@ -419,8 +413,8 @@
         $insert_values[] = $this->ID;
 
         $sql = "INSERT INTO ".$this->db->table_name('identities', true).
-            " (`changed`, ".join(', ', $insert_cols).")".
-            " VALUES (".$this->db->now().", ".join(', ', array_pad(array(), count($insert_values), '?')).")";
+            " (`changed`, ".implode(', ', $insert_cols).")".
+            " VALUES (".$this->db->now().", ".implode(', ', array_pad(array(), count($insert_values), '?')).")";
 
         $insert = $this->db->query($sql, $insert_values);
 
@@ -509,7 +503,9 @@
      */
     function failed_login()
     {
-        if ($this->ID && ($rate = (int) $this->rc->config->get('login_rate_limit', 3))) {
+        if ($this->ID && $this->rc->config->get('login_rate_limit', 3)) {
+            $counter = 0;
+
             if (empty($this->data['failed_login'])) {
                 $failed_login = new DateTime('now');
                 $counter      = 1;
@@ -856,8 +852,8 @@
         $insert_values[] = serialize($data['data']);
 
         $sql = "INSERT INTO ".$this->db->table_name('searches', true)
-            ." (".join(', ', $insert_cols).")"
-            ." VALUES (".join(', ', array_pad(array(), count($insert_values), '?')).")";
+            ." (".implode(', ', $insert_cols).")"
+            ." VALUES (".implode(', ', array_pad(array(), count($insert_values), '?')).")";
 
         $insert = $this->db->query($sql, $insert_values);

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_utils.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_utils.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2012, Kolab Systems AG                             |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -57,10 +58,10 @@
     /**
      * E-mail address validation.
      *
-     * @param string  $email     Email address
-     * @param boolean $dns_check True to check dns
+     * @param string $email     Email address
+     * @param bool   $dns_check True to check dns
      *
-     * @return boolean True on success, False if address is invalid
+     * @return bool True on success, False if address is invalid
      */
     public static function check_email($email, $dns_check=true)
     {
@@ -154,10 +155,10 @@
     /**
      * Replacing specials characters to a specific encoding type
      *
-     * @param string  Input string
-     * @param string  Encoding type: text|html|xml|js|url
-     * @param string  Replace mode for tags: show|remove|strict
-     * @param boolean Convert newlines
+     * @param string $str      Input string
+     * @param string $enctype  Encoding type: text|html|xml|js|url
+     * @param string $mode     Replace mode for tags: show|remove|strict
+     * @param bool   $newlines Convert newlines
      *
      * @return string The quoted string
      */
@@ -245,10 +246,10 @@
      * Read input value and convert it for internal use
      * Performs stripslashes() and charset conversion if necessary
      *
-     * @param string  Field name to read
-     * @param int     Source to get value from (see self::INPUT_*)
-     * @param boolean Allow HTML tags in field value
-     * @param string  Charset to convert into
+     * @param string $fname      Field name to read
+     * @param int    $source     Source to get value from (see self::INPUT_*)
+     * @param bool   $allow_html Allow HTML tags in field value
+     * @param string $charset    Charset to convert into
      *
      * @return string Field value or NULL if not available
      */
@@ -275,9 +276,9 @@
      * Parse/validate input value. See self::get_input_value()
      * Performs stripslashes() and charset conversion if necessary
      *
-     * @param string  Input value
-     * @param boolean Allow HTML tags in field value
-     * @param string  Charset to convert into
+     * @param string $value      Input value
+     * @param bool   $allow_html Allow HTML tags in field value
+     * @param string $charset    Charset to convert into
      *
      * @return string Parsed value
      */
@@ -320,9 +321,9 @@
      * Convert array of request parameters (prefixed with _)
      * to a regular array with non-prefixed keys.
      *
-     * @param int     $mode       Source to get value from (GPC)
-     * @param string  $ignore     PCRE expression to skip parameters by name
-     * @param boolean $allow_html Allow HTML tags in field value
+     * @param int    $mode       Source to get value from (GPC)
+     * @param string $ignore     PCRE expression to skip parameters by name
+     * @param bool   $allow_html Allow HTML tags in field value
      *
      * @return array Hash array with all request parameters
      */
@@ -344,25 +345,29 @@
     /**
      * Convert the given string into a valid HTML identifier
      * Same functionality as done in app.js with rcube_webmail.html_identifier()
+     *
+     * @param string $str    String input
+     * @param bool   $encode Use base64 encoding
+     *
+     * @param string Valid HTML identifier
      */
-    public static function html_identifier($str, $encode=false)
+    public static function html_identifier($str, $encode = false)
     {
         if ($encode) {
             return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
         }
-        else {
-            return asciiwords($str, true, '_');
-        }
+
+        return asciiwords($str, true, '_');
     }
 
     /**
      * Replace all css definitions with #container [def]
      * and remove css-inlined scripting, make position style safe
      *
-     * @param string CSS source code
-     * @param string Container ID to use as prefix
-     * @param bool   Allow remote content
-     * @param string Prefix to be added to id/class identifier
+     * @param string $source       CSS source code
+     * @param string $container_id Container ID to use as prefix
+     * @param bool   $allow_remote Allow remote content
+     * @param string $prefix       Prefix to be added to id/class identifier
      *
      * @return string Modified CSS source
      */
@@ -380,7 +385,7 @@
             return '/* evil! */';
         }
 
-        $strict_url_regexp = '!url\s*$[ "\'](https?:)//[a-z0-9/._+-]+["\' ]$!Uims';
+        $strict_url_regexp = '!url\s*$\s*["\']?(https?:)//[a-z0-9/._+-]+["\']?\s*$!Uims';
 
         // cut out all contents between { and }
         while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos))) {
@@ -391,7 +396,7 @@
             $styles = substr($source, $pos+1, $length);
 
             // Convert position:fixed to position:absolute (#5264)
-            $styles = preg_replace('/position:[\s\r\n]*fixed/i', 'position: absolute', $styles);
+            $styles = preg_replace('/position[^a-z]*:[\s\r\n]*fixed/i', 'position: absolute', $styles);
 
             // check every line of a style block...
             if ($allow_remote) {
@@ -413,7 +418,7 @@
                     }
                 }
 
-                $styles = join(";\n", $a_styles);
+                $styles = implode(";\n", $a_styles);
             }
 
             $key      = $replacements->add($styles);
@@ -430,10 +435,14 @@
             // (?!##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';
+            $regexp   = '/(^\s*|,\s*|\}\s*|\{\s*)((?!##str):?[a-z0-9\._#\*\[][a-z0-9\._:#=~ \[\]"\|\>\+\$\^-]*)/im';
             $callback = function($matches) use ($container_id, $prefix) {
                 $replace = $matches[2];
 
+                if (stripos($replace, ':root') === 0) {
+                    $replace = substr($replace, 5);
+                }
+
                 if ($prefix) {
                     $replace = str_replace(array('.', '#'), array(".$prefix", "#$prefix"), $replace);
                 }
@@ -442,6 +451,9 @@
                     $replace = "#$container_id " . $replace;
                 }
 
+                // Remove redundant spaces (for simpler testing)
+                $replace = preg_replace('/\s+/', ' ', $replace);
+
                 return str_replace($matches[2], $replace, $matches[0]);
             };
 
@@ -487,14 +499,14 @@
             }
         }
 
-        return join(" ", $classes);
+        return implode(' ', $classes);
     }
 
     /**
      * Decode escaped entities used by known XSS exploits.
      * See http://downloads.securityfocus.com/vulnerabilities/exploits/26800.eml for examples
      *
-     * @param string CSS content to decode
+     * @param string $content CSS content to decode
      *
      * @return string Decoded string
      */
@@ -515,9 +527,9 @@
     /**
      * Check if we can process not exceeding memory_limit
      *
-     * @param integer Required amount of memory
+     * @param integer $need Required amount of memory
      *
-     * @return boolean True if memory won't be exceeded, False otherwise
+     * @return bool True if memory won't be exceeded, False otherwise
      */
     public static function mem_check($need)
     {
@@ -530,25 +542,28 @@
     /**
      * Check if working in SSL mode
      *
-     * @param integer $port      HTTPS port number
-     * @param boolean $use_https Enables 'use_https' option checking
+     * @param int  $port      HTTPS port number
+     * @param bool $use_https Enables 'use_https' option checking
      *
-     * @return boolean
+     * @return bool True in SSL mode, False otherwise
      */
-    public static function https_check($port=null, $use_https=true)
+    public static function https_check($port = null, $use_https = true)
     {
         if (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off') {
             return true;
         }
+
         if (!empty($_SERVER['HTTP_X_FORWARDED_PROTO'])
             && strtolower($_SERVER['HTTP_X_FORWARDED_PROTO']) == 'https'
             && in_array($_SERVER['REMOTE_ADDR'], rcube::get_instance()->config->get('proxy_whitelist', array()))
         ) {
             return true;
         }
+
         if ($port && $_SERVER['SERVER_PORT'] == $port) {
             return true;
         }
+
         if ($use_https && rcube::get_instance()->config->get('use_https')) {
             return true;
         }
@@ -573,13 +588,15 @@
         // %n - host
         $n = self::server_name();
         // %t - host name without first part, e.g. %n=mail.domain.tld, %t=domain.tld
-        $t = preg_replace('/^[^\.]+\./', '', $n);
-        // %d - domain name without first part
-        $d = preg_replace('/^[^\.]+\./', '', self::server_name('HTTP_HOST'));
+        // If %n=domain.tld then %t=domain.tld as well (remains valid)
+        $t = preg_replace('/^[^.]+\.(?![^.]+$)/', '', $n);
+        // %d - domain name without first part (up to domain.tld)
+        $d = preg_replace('/^[^.]+\.(?![^.]+$)/', '', self::server_name('HTTP_HOST'));
         // %h - IMAP host
         $h = $_SESSION['storage_host'] ?: $host;
         // %z - IMAP domain without first part, e.g. %h=imap.domain.tld, %z=domain.tld
-        $z = preg_replace('/^[^\.]+\./', '', $h);
+        // If %h=domain.tld then %z=domain.tld as well (remains valid)
+        $z = preg_replace('/^[^.]+\.(?![^.]+$)/', '', $h);
         // %s - domain name after the '@' from e-mail address provided at login screen.
         //      Returns FALSE if an invalid email is provided
         if (strpos($name, '%s') !== false) {
@@ -594,11 +611,12 @@
     }
 
     /**
-     * Returns the host name after checking it against trusted hostname
-     * patterns, otherwise returns localhost (and logs a warning)
+     * Returns the server name after checking it against trusted hostname patterns.
      *
-     * @param string  $type       The $_SERVER key, e.g. 'HTTP_HOST', Default: 'SERVER_NAME'.
-     * @param boolean $strip_port Strip port from the host name
+     * Returns 'localhost' and logs a warning when the hostname is not trusted.
+     *
+     * @param string $type       The $_SERVER key, e.g. 'HTTP_HOST', Default: 'SERVER_NAME'.
+     * @param bool   $strip_port Strip port from the host name
      *
      * @return string Server name
      */
@@ -669,6 +687,7 @@
             if (in_array($_SERVER['REMOTE_ADDR'], $proxy_whitelist)) {
                 if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
                     foreach (array_reverse(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'])) as $forwarded_ip) {
+                        $forwarded_ip = trim($forwarded_ip);
                         if (!in_array($forwarded_ip, $proxy_whitelist)) {
                             return $forwarded_ip;
                         }
@@ -693,27 +712,31 @@
      *
      * @param string $name Header name
      *
-     * @return mixed Header value or null if not available
+     * @return string|null Header value or null if not available
      */
     public static function request_header($name)
     {
-        if (function_exists('getallheaders')) {
-            $hdrs = array_change_key_case(getallheaders(), CASE_UPPER);
-            $key  = strtoupper($name);
+        if (function_exists('apache_request_headers')) {
+            $headers = apache_request_headers();
+            $key     = strtoupper($name);
         }
         else {
-            $key  = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
-            $hdrs = array_change_key_case($_SERVER, CASE_UPPER);
+            $headers = $_SERVER;
+            $key     = 'HTTP_' . strtoupper(strtr($name, '-', '_'));
         }
 
-        return $hdrs[$key];
+        if (!empty($headers)) {
+            $headers = array_change_key_case($headers, CASE_UPPER);
+
+            return $headers[$key];
+        }
     }
 
     /**
      * Explode quoted string
      *
-     * @param string Delimiter expression string for preg_match()
-     * @param string Input string
+     * @param string $delimiter Delimiter expression string for preg_match()
+     * @param string $string    Input string
      *
      * @return array String items
      */
@@ -779,7 +802,7 @@
      * @param string       $date     Date string
      * @param DateTimeZone $timezone Timezone to use for DateTime object
      *
-     * @return DateTime instance or false on failure
+     * @return DateTime|false DateTime object or False on failure
      */
     public static function anytodatetime($date, $timezone = null)
     {
@@ -873,8 +896,8 @@
      * @param string $date   Date string
      * @param string $format Input date format
      *
-     * @return strin Date string in YYYY-MM-DD format, or the original string
-     *               if format is not supported
+     * @return string Date string in YYYY-MM-DD format, or the original string
+     *                if format is not supported
      */
     public static function format_datestr($date, $format)
     {
@@ -954,11 +977,13 @@
 
         if ($is_utf) {
             if (preg_match('/[^\x20-\x7E]/', $domain)) {
-                $domain = idn_to_ascii($domain, $options, $variant);
+                $options = defined('IDNA_NONTRANSITIONAL_TO_ASCII') ? IDNA_NONTRANSITIONAL_TO_ASCII : 0;
+                $domain  = idn_to_ascii($domain, $options, $variant);
             }
         }
         else if (preg_match('/(^|\.)xn--/i', $domain)) {
-            $domain = idn_to_utf8($domain, $options, $variant);
+            $options = defined('IDNA_NONTRANSITIONAL_TO_UNICODE') ? IDNA_NONTRANSITIONAL_TO_UNICODE : 0;
+            $domain  = idn_to_utf8($domain, $options, $variant);
         }
 
         if ($domain === false) {
@@ -971,8 +996,9 @@
     /**
      * Split the given string into word tokens
      *
-     * @param string Input to tokenize
-     * @param integer Minimum length of a single token
+     * @param string $str     Input to tokenize
+     * @param int    $minlen  Minimum length of a single token
+     *
      * @return array List of tokens
      */
     public static function tokenize_string($str, $minlen = 2)
@@ -993,11 +1019,11 @@
      * Normalize the given string for fulltext search.
      * Currently only optimized for ISO-8859-1 and ISO-8859-2 characters; to be extended
      *
-     * @param string  Input string (UTF-8)
-     * @param boolean True to return list of words as array
-     * @param integer Minimum length of tokens
+     * @param string $str      Input string (UTF-8)
+     * @param bool   $as_array True to return list of words as array
+     * @param int    $minlen   Minimum length of tokens
      *
-     * @return mixed Normalized string or a list of normalized tokens
+     * @return string|array Normalized string or a list of normalized tokens
      */
     public static function normalize_string($str, $as_array = false, $minlen = 2)
     {
@@ -1041,21 +1067,21 @@
             $arr[$i] = $part;
         }
 
-        return $as_array ? $arr : join(" ", $arr);
+        return $as_array ? $arr : implode(' ', $arr);
     }
 
     /**
      * Compare two strings for matching words (order not relevant)
      *
-     * @param string Haystack
-     * @param string Needle
+     * @param string $haystack Haystack
+     * @param string $needle   Needle
      *
-     * @return boolean True if match, False otherwise
+     * @return bool True if match, False otherwise
      */
     public static function words_match($haystack, $needle)
     {
         $a_needle  = self::tokenize_string($needle, 1);
-        $_haystack = join(" ", self::tokenize_string($haystack, 1));
+        $_haystack = implode(' ', self::tokenize_string($haystack, 1));
         $valid     = strlen($_haystack) > 0;
         $hits      = 0;
 
@@ -1132,6 +1158,8 @@
      * Safe password prompt for command line
      * from http://blogs.sitepoint.com/2009/05/01/interactive-cli-password-prompt-in-php/
      *
+     * @param string $prompt Prompt text
+     *
      * @return string Password
      */
     public static function prompt_silent($prompt = "Password:")
@@ -1147,20 +1175,22 @@
 
             return $password;
         }
-        else {
-            $command = "/usr/bin/env bash -c 'echo OK'";
-            if (rtrim(shell_exec($command)) !== 'OK') {
-                echo $prompt;
-                $pass = trim(fgets(STDIN));
-                echo chr(8)."\r" . $prompt . str_repeat("*", strlen($pass))."\n";
-                return $pass;
-            }
 
-            $command = "/usr/bin/env bash -c 'read -s -p \"" . addslashes($prompt) . "\" mypassword && echo \$mypassword'";
-            $password = rtrim(shell_exec($command));
-            echo "\n";
-            return $password;
+        $command = "/usr/bin/env bash -c 'echo OK'";
+
+        if (rtrim(shell_exec($command)) !== 'OK') {
+            echo $prompt;
+            $pass = trim(fgets(STDIN));
+            echo chr(8)."\r" . $prompt . str_repeat("*", strlen($pass))."\n";
+
+            return $pass;
         }
+
+        $command  = "/usr/bin/env bash -c 'read -s -p \"" . addslashes($prompt) . "\" mypassword && echo \$mypassword'";
+        $password = rtrim(shell_exec($command));
+        echo "\n";
+
+        return $password;
     }
 
     /**
@@ -1168,7 +1198,7 @@
      *
      * @param string $str Input value
      *
-     * @return boolean Boolean value
+     * @return bool Boolean value
      */
     public static function get_boolean($str)
     {
@@ -1179,15 +1209,18 @@
 
     /**
      * OS-dependent absolute path detection
+     *
+     * @param string $path File path
+     *
+     * @return bool True if the path is absolute, False otherwise
      */
     public static function is_absolute_path($path)
     {
         if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
             return (bool) preg_match('!^[a-z]:[\\\\/]!i', $path);
         }
-        else {
-            return $path[0] == '/';
-        }
+
+        return $path[0] == '/';
     }
 
     /**
@@ -1317,7 +1350,7 @@
     public static function parse_socket_options(&$options, $host = null)
     {
         if (empty($host) || empty($options)) {
-            return $options;
+            return;
         }
 
         // get rid of schema and port from the hostname
@@ -1327,7 +1360,7 @@
         }
 
         // find per-host options
-        if (array_key_exists($host, $options)) {
+        if ($host && array_key_exists($host, $options)) {
             $options = $options[$host];
         }
     }

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_vcard.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_vcard.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -88,6 +89,12 @@
 
     /**
      * Constructor
+     *
+     * @param string $vcard    vCard content
+     * @param string $charset  Charset of string values
+     * @param bool   $detect   True if loading a 'foreign' vcard and extra heuristics
+     *                         for charset detection is required
+     * @param array  $fieldmap Fields mapping definition
      */
     public function __construct($vcard = null, $charset = RCUBE_CHARSET, $detect = false, $fieldmap = array())
     {
@@ -103,9 +110,10 @@
     /**
      * Load record from (internal, unfolded) vcard 3.0 format
      *
-     * @param string vCard string to parse
-     * @param string Charset of string values
-     * @param boolean True if loading a 'foreign' vcard and extra heuristics for charset detection is required
+     * @param string $vcard   vCard string to parse
+     * @param string $charset Charset of string values
+     * @param bool   $detect  True if loading a 'foreign' vcard and extra heuristics
+     *                        for charset detection is required
      */
     public function load($vcard, $charset = RCUBE_CHARSET, $detect = false)
     {
@@ -131,7 +139,7 @@
         $this->middlename   = $this->raw['N'][0][2];
         $this->nickname     = $this->raw['NICKNAME'][0][0];
         $this->organization = $this->raw['ORG'][0][0];
-        $this->business     = ($this->raw['X-ABSHOWAS'][0][0] == 'COMPANY') || (join('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));
+        $this->business     = ($this->raw['X-ABSHOWAS'][0][0] == 'COMPANY') || (implode('', (array)$this->raw['N'][0]) == '' && !empty($this->organization));
 
         foreach ((array)$this->raw['EMAIL'] as $i => $raw_email) {
             $this->email[$i] = is_array($raw_email) ? $raw_email[0] : $raw_email;
@@ -168,10 +176,13 @@
             }
         }
 
-        if ($this->raw['N'][0][3])
+        if ($this->raw['N'][0][3]) {
             $out['prefix'] = $this->raw['N'][0][3];
-        if ($this->raw['N'][0][4])
+        }
+
+        if ($this->raw['N'][0][4]) {
             $out['suffix'] = $this->raw['N'][0][4];
+        }
 
         // convert from raw vcard data into associative data for Roundcube
         foreach (array_flip(self::$fieldmap) as $tag => $col) {
@@ -182,7 +193,9 @@
                     $subtype = '';
 
                     if (!empty($raw['type'])) {
-                        $combined = join(',', self::array_filter((array)$raw['type'], 'internet,pref', true));
+                        $raw['type'] = array_map('strtolower', $raw['type']);
+
+                        $combined = implode(',', array_diff($raw['type'], array('internet', 'pref')));
                         $combined = strtoupper($combined);
 
                         if ($typemap[$combined]) {
@@ -192,11 +205,11 @@
                             $subtype = $typemap[$raw['type'][$k]];
                         }
                         else {
-                            $subtype = strtolower($raw['type'][$k]);
+                            $subtype = $raw['type'][$k];
                         }
 
                         while ($k < count($raw['type']) && ($subtype == 'internet' || $subtype == 'pref')) {
-                            $subtype = $typemap[$raw['type'][++$k]] ?: strtolower($raw['type'][$k]);
+                            $subtype = $typemap[$raw['type'][++$k]] ?: $raw['type'][$k];
                         }
                     }
 
@@ -254,6 +267,10 @@
 
     /**
      * Convert the data structure into a vcard 3.0 string
+     *
+     * @param bool $folder Use RFC2425 folding
+     *
+     * @return string vCard output
      */
     public function export($folded = true)
     {
@@ -269,8 +286,8 @@
     public function reset($fields = null)
     {
         if (!$fields) {
-            $fields = array_merge(array_values(self::$fieldmap), array_keys($this->immap),
-                array('FN','N','ORG','NICKNAME','EMAIL','ADR','BDAY'));
+            $fields = array('FN', 'N', 'ORG', 'NICKNAME', 'EMAIL', 'ADR', 'BDAY');
+            $fields = array_merge(array_values(self::$fieldmap), array_keys($this->immap), $fields);
         }
 
         foreach ($fields as $f) {
@@ -280,6 +297,7 @@
         if (!$this->raw['N']) {
             $this->raw['N'] = array(array('','','','',''));
         }
+
         if (!$this->raw['FN']) {
             $this->raw['FN'] = array();
         }
@@ -290,9 +308,9 @@
     /**
      * Setter for address record fields
      *
-     * @param string Field name
-     * @param string Field value
-     * @param string Type/section name
+     * @param string $field Field name
+     * @param mixed  $value Field value
+     * @param string $type  Type/section name
      */
     public function set($field, $value, $type = 'HOME')
     {
@@ -371,7 +389,7 @@
             $value = $value[0] ? $value : array('', '', $value['street'], $value['locality'], $value['region'], $value['zipcode'], $value['country']);
 
             // fall through if not empty
-            if (!strlen(join('', $value))) {
+            if (!strlen(implode('', $value))) {
                 break;
             }
 
@@ -399,20 +417,21 @@
     /**
      * Setter for individual vcard properties
      *
-     * @param string VCard tag name
-     * @param array Value-set of this vcard property
-     * @param boolean Set to true if the value-set should be appended instead of replacing any existing value-set
+     * @param string $tag    VCard tag name
+     * @param array  $value  Value-set of this vcard property
+     * @param bool   $append Set to true if the value-set should be appended
+     *                       instead of replacing any existing value-set
      */
     public function set_raw($tag, $value, $append = false)
     {
         $index = $append && isset($this->raw[$tag]) ? count($this->raw[$tag]) : 0;
-        $this->raw[$tag][$index] = (array)$value;
+        $this->raw[$tag][$index] = (array) $value;
     }
 
     /**
      * Find index with the '$type' attribute
      *
-     * @param string Field name
+     * @param string $field Field name
      *
      * @return int Field index having $type set
      */
@@ -454,6 +473,8 @@
 
     /**
      * Extends fieldmap definition
+     *
+     * @param array $map Field mapping definition
      */
     public function extend_fieldmap($map)
     {
@@ -465,9 +486,9 @@
     /**
      * Factory method to import a vcard file
      *
-     * @param string vCard file content
+     * @param string $data vCard file content
      *
-     * @return array List of rcube_vcard objects
+     * @return rcube_vcard[] List of rcube_vcard objects
      */
     public static function import($data)
     {
@@ -517,7 +538,7 @@
     /**
      * Normalize vcard data for better parsing
      *
-     * @param string vCard block
+     * @param string $vcard vCard block
      *
      * @return string Cleaned vcard block
      */
@@ -535,8 +556,8 @@
                 '/item(\d+)\.(TEL|EMAIL|URL)([^:]*?):(.*?)item\1.X-ABLabel:(?:_\$!<)?([\w() -]*)(?:>!\$_)?./si',
                 '/^item\d*\.X-AB.*$/mi',  // remove cruft like item1.X-AB*
                 '/^item\d*\./mi',         // remove item1.ADR instead of ADR
-                '/\n+/',                 // remove empty lines
-                '/^(N:[^;\R]*)$/m',      // if N doesn't have any semicolons, add some
+                '/\n+/',                  // remove empty lines
+                '/^(N:[^;\r\n]*)$/m',     // if N doesn't have any semicolons, add some
             ),
             array(
                 '\2;type=\5\3:\4',
@@ -555,22 +576,38 @@
         return $vcard;
     }
 
+    /**
+     * Apple X-ABRELATEDNAMES converter callback
+     *
+     * @param array $matches Matching entries
+     *
+     * @return string Replacement string
+     */
     private static function x_abrelatednames_callback($matches)
     {
         return 'X-' . strtoupper($matches[5]) . $matches[3] . ':'. $matches[4];
     }
 
+    /**
+     * RFC2425 folding callback
+     *
+     * @param array $matches Matching entries
+     *
+     * @return string Replacement string
+     */
     private static function rfc2425_fold_callback($matches)
     {
         // chunk_split string and avoid lines breaking multibyte characters
         $c = 71;
         $out .= substr($matches[1], 0, $c);
+
         for ($n = $c; $c < strlen($matches[1]); $c++) {
             // break if length > 75 or mutlibyte character starts after position 71
             if ($n > 75 || ($n > 71 && ord($matches[1][$c]) >> 6 == 3)) {
                 $out .= "\r\n ";
                 $n = 0;
             }
+
             $out .= $matches[1][$c];
             $n++;
         }
@@ -578,16 +615,22 @@
         return $out;
     }
 
+    /**
+     * Apply RFC2425 folding to a vCard content
+     *
+     * @param string $val vCard content
+     *
+     * @retunr string Folded vCard string
+     */
     public static function rfc2425_fold($val)
     {
         return preg_replace_callback('/([^\n]{72,})/', array('self', 'rfc2425_fold_callback'), $val);
     }
 
     /**
-     * Decodes a vcard block (vcard 3.0 format, unfolded)
-     * into an array structure
+     * Decodes a vcard block (vcard 3.0 format, unfolded) into an array structure
      *
-     * @param string vCard block to parse
+     * @param string $vcard vCard block to parse
      *
      * @return array Raw data structure
      */
@@ -688,8 +731,8 @@
     /**
      * Decode a given string with the encoding rule from ENCODING attributes
      *
-     * @param string String to decode
-     * @param string Encoding type (quoted-printable and base64 supported)
+     * @param string $value    String to decode
+     * @param string $encoding Encoding type (quoted-printable and base64 supported)
      *
      * @return string Decoded 8bit value
      */
@@ -713,7 +756,7 @@
     /**
      * Encodes an entry for storage in our database (vcard 3.0 format, unfolded)
      *
-     * @param array Raw data structure to encode
+     * @param array $data Raw data structure to encode
      *
      * @return string vCard encoded string
      */
@@ -779,32 +822,35 @@
     /**
      * Join indexed data array to a vcard quoted string
      *
-     * @param array Field data
-     * @param string Separator
+     * @param array  $str Field data
+     * @param string $sep Separator
      *
      * @return string Joined and quoted string
      */
-    public static function vcard_quote($s, $sep = ';')
+    public static function vcard_quote($str, $sep = ';')
     {
-        if (is_array($s)) {
-            foreach ($s as $part) {
+        if (is_array($str)) {
+            $r = array();
+
+            foreach ($str as $part) {
                 $r[] = self::vcard_quote($part, $sep);
             }
-            return(implode($sep, (array)$r));
+
+            return(implode($sep, $r));
         }
 
-        return strtr($s, array('\\' => '\\\\', "\r" => '', "\n" => '\n', $sep => '\\'.$sep));
+        return strtr($str, array("\\" => "\\\\", "\r" => '', "\n" => '\n', $sep => "\\$sep"));
     }
 
     /**
      * Split quoted string
      *
-     * @param string vCard string to split
-     * @param string Separator char/string
+     * @param string $str vCard string to split
+     * @param string $sep Separator char/string
      *
      * @return array List with splited values
      */
-    private static function vcard_unquote($s, $sep = ';')
+    private static function vcard_unquote($str, $sep = ';')
     {
         // break string into parts separated by $sep
         if (!empty($sep)) {
@@ -812,50 +858,51 @@
             $rep1 = array("\\\\" => "\010", "\\$sep" => "\007");
             $rep2 = array("\007" => "\\$sep", "\010" => "\\\\");
 
-            if (count($parts = explode($sep, strtr($s, $rep1))) > 1) {
+            if (count($parts = explode($sep, strtr($str, $rep1))) > 1) {
                 foreach ($parts as $s) {
                     $result[] = self::vcard_unquote(strtr($s, $rep2));
                 }
+
                 return $result;
             }
 
-            $s = trim(strtr($s, $rep2));
+            $str = trim(strtr($str, $rep2));
         }
 
         // some implementations (GMail) use non-standard backslash before colon (#1489085)
         // we will handle properly any backslashed character - removing dummy backslahes
-        // return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
+        // return strtr($str, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';'));
 
-        $s   = str_replace("\r", '', $s);
+        $str = str_replace("\r", '', $str);
         $pos = 0;
 
-        while (($pos = strpos($s, '\\', $pos)) !== false) {
-            $next = substr($s, $pos + 1, 1);
+        while (($pos = strpos($str, "\\", $pos)) !== false) {
+            $next = substr($str, $pos + 1, 1);
             if ($next == 'n' || $next == 'N') {
-                $s = substr_replace($s, "\n", $pos, 2);
+                $str = substr_replace($str, "\n", $pos, 2);
             }
             else {
-                $s = substr_replace($s, '', $pos, 1);
+                $str = substr_replace($str, '', $pos, 1);
             }
 
             $pos += 1;
         }
 
-        return $s;
+        return $str;
     }
 
     /**
      * Check if vCard entry is empty: empty string or an array with
      * all entries empty.
      *
-     * @param mixed $value Attribute value (string or array)
+     * @param string|array $value Attribute value
      *
      * @return bool True if the value is empty, False otherwise
      */
     private static function is_empty($value)
     {
         foreach ((array)$value as $v) {
-            if (((string)$v) !== '') {
+            if (strval($v) !== '') {
                 return false;
             }
         }
@@ -864,36 +911,9 @@
     }
 
     /**
-     * Extract array values by a filter
-     *
-     * @param array Array to filter
-     * @param keys Array or comma separated list of values to keep
-     * @param boolean Invert key selection: remove the listed values
-     *
-     * @return array The filtered array
-     */
-    private static function array_filter($arr, $values, $inverse = false)
-    {
-        if (!is_array($values)) {
-            $values = explode(',', $values);
-        }
-
-        $result = array();
-        $keep   = array_flip((array)$values);
-
-        foreach ($arr as $key => $val) {
-            if ($inverse != isset($keep[strtolower($val)])) {
-                $result[$key] = $val;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
      * Returns UNICODE type based on BOM (Byte Order Mark)
      *
-     * @param string Input string to test
+     * @param string $string Input string to test
      *
      * @return string Detected encoding
      */

iRony-0.4.2.tar.gz/lib/Roundcube/rcube_washtml.php -> iRony-0.4.3.tar.gz/lib/Roundcube/rcube_washtml.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -16,68 +17,32 @@
  | Author: Aleksander Machniak <alec@alec.pl>                            |
  | Author: Frederic Motte <fmotte@ubixis.com>                            |
  +-----------------------------------------------------------------------+
- */
 
-/*
- *                Washtml, a HTML sanityzer.
- *
- * Copyright (c) 2007 Frederic Motte <fmotte@ubixis.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * OVERVIEW:
- *
- * Wahstml take an untrusted HTML and return a safe html string.
- *
- * SYNOPSIS:
- *
- * $washer = new washtml($config);
- * $washer->wash($html);
- * It return a sanityzed string of the $html parameter without html and head tags.
- * $html is a string containing the html code to wash.
- * $config is an array containing options:
- *   $config['allow_remote'] is a boolean to allow link to remote resources (images/css).
- *   $config['blocked_src'] string with image-src to be used for blocked remote images
- *   $config['show_washed'] is a boolean to include washed out attributes as x-washed
- *   $config['cid_map'] is an array where cid urls index urls to replace them.
- *   $config['charset'] is a string containing the charset of the HTML document if it is not defined in it.
- * $washer->extlinks is a reference to a boolean that is set to true if remote images were removed. (FE: show remote images link)
- *
- * INTERNALS:
- *
- * Only tags and attributes in the static lists $html_elements and $html_attributes
- * are kept, inline styles are also filtered: all style identifiers matching
- * /[a-z\-]/i are allowed. Values matching colors, sizes, /[a-z\-]/i and safe
- * urls if allowed and cid urls if mapped are kept.
- *
- * Roundcube Changes:
- * - added $block_elements
- * - changed $ignore_elements behaviour
- * - added RFC2397 support
- * - base URL support
- * - invalid HTML comments removal before parsing
- * - "fixing" unitless CSS values for XHTML output
- * - SVG and MathML support
- */
+                Washtml, a HTML sanityzer.
+
+ Copyright (c) 2007 Frederic Motte <fmotte@ubixis.com>
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
 
 /**
  * Utility class providing HTML sanityzer
@@ -87,7 +52,9 @@
  */
 class rcube_washtml
 {
-    /* Allowed HTML elements (default) */
+    /**
+     * @var array Allowed HTML elements (default)
+     */
     static $html_elements = array('a', 'abbr', 'acronym', 'address', 'area', 'b',
         'basefont', 'bdo', 'big', 'blockquote', 'br', 'caption', 'center',
         'cite', 'code', 'col', 'colgroup', 'dd', 'del', 'dfn', 'dir', 'div', 'dl',
@@ -122,10 +89,14 @@
         'bvar', 'lowlimit', 'uplimit',
     );
 
-    /* Ignore these HTML tags and their content */
+    /**
+     * @var array Ignore these HTML tags and their content
+     */
     static $ignore_elements = array('script', 'applet', 'embed', 'object', 'style');
 
-    /* Allowed HTML attributes */
+    /**
+     * @var array Allowed HTML attributes
+     */
     static $html_attribs = array('name', 'class', 'title', 'alt', 'width', 'height',
         'align', 'nowrap', 'col', 'row', 'id', 'rowspan', 'colspan', 'cellspacing',
         'cellpadding', 'valign', 'bgcolor', 'color', 'border', 'bordercolorlight',
@@ -174,7 +145,9 @@
         'fontsize', 'fontweight', 'fontstyle', 'fontfamily', 'groupalign', 'edge', 'side',
     );
 
-    /* Elements which could be empty and be returned in short form (<tag />) */
+    /**
+     * @var array Elements which could be empty and be returned in short form (<tag />)
+     */
     static $void_elements = array('area', 'base', 'br', 'col', 'command', 'embed', 'hr',
         'img', 'input', 'keygen', 'link', 'meta', 'param', 'source', 'track', 'wbr',
         // MathML
@@ -182,38 +155,57 @@
         'maligngroup', 'none', 'mprescripts',
     );
 
-    /* State for linked objects in HTML */
+    /**
+     * @var array Additional allowed attributes of body element
+     */
+    static $body_attribs = array('alink', 'background', 'bgcolor', 'link', 'text', 'vlink');
+
+    /** @var bool State indicating existence of linked objects in HTML */
     public $extlinks = false;
 
-    /* Current settings */
+    /** @var array Current settings */
     private $config = array();
 
-    /* Registered callback functions for tags */
+    /** @var array Registered callback functions for tags */
     private $handlers = array();
 
-    /* Allowed HTML elements */
+    /** @var array Allowed HTML elements */
     private $_html_elements = array();
 
-    /* Ignore these HTML tags but process their content */
+    /** @var array Ignore these HTML tags but process their content */
     private $_ignore_elements = array();
 
-    /* Elements which could be empty and be returned in short form (<tag />) */
+    /** @var array Elements which could be empty and be returned in short form (<tag />) */
     private $_void_elements = array();
 
-    /* Allowed HTML attributes */
+    /** @var array Allowed HTML attributes */
     private $_html_attribs = array();
 
-    /* A prefix to be added to id/class/for attribute values */
+    /** @var string A prefix to be added to id/class/for attribute values */
     private $_css_prefix;
 
-    /* Max nesting level */
+    /** @var int Max nesting level */
     private $max_nesting_level;
 
+    /** @var bool True if current document is XML */
     private $is_xml = false;
 
 
     /**
      * Class constructor
+     *
+     * @param array $p Configuration options:
+     *         allow_remote: is a boolean to allow link to remote resources (images/css)
+     *         blocked_src: string with image-src to be used for blocked remote images
+     *         show_washed: is a boolean to include washed out attributes as x-washed
+     *         cid_map: is an array where cid urls index urls to replace them
+     *         charset: is a string containing the charset of the HTML document,
+     *                  to be used if the charset is not defined in the document
+     *         css_prefix: A prefix to be added to id/class/for attribute values
+     *         html_elements: Additional allowed HTML elements
+     *         ignore_elements: Additional HTML elements to ignore
+     *         html_attribs: Additional allowed HTML attributes
+     *         void_elements: Elements which could be empty and be returned in short form (<tag />)
      */
     public function __construct($p = array())
     {
@@ -223,21 +215,28 @@
         $this->_void_elements   = array_flip((array)$p['void_elements']) + array_flip(self::$void_elements);
         $this->_css_prefix      = is_string($p['css_prefix']) && strlen($p['css_prefix']) ? $p['css_prefix'] : null;
 
-        unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['void_elements']);
+        unset($p['html_elements'], $p['html_attribs'], $p['ignore_elements'], $p['void_elements'], $p['css_prefix']);
 
         $this->config = $p + array('show_washed' => true, 'allow_remote' => false, 'cid_map' => array());
     }
 
     /**
      * Register a callback function for a certain tag
+     *
+     * @param string   $tag      HTML tag name
+     * @param callback $callback Callback function
      */
-    public function add_callback($tagName, $callback)
+    public function add_callback($tag, $callback)
     {
-        $this->handlers[$tagName] = $callback;
+        $this->handlers[$tag] = $callback;
     }
 
     /**
      * Check CSS style
+     *
+     * @param string $style CSS style
+     *
+     * @return string Washed CSS style
      */
     private function wash_style($style)
     {
@@ -292,11 +291,20 @@
 
     /**
      * Take a node and return allowed attributes and check values
+     *
+     * @param DOMNode $node Document element
+     *
+     * @return string Washed element attributes
      */
     private function wash_attribs($node)
     {
         $result = '';
         $washed = array();
+        $additional_attribs = array();
+
+        if ($node->nodeName == 'body') {
+            $additional_attribs = self::$body_attribs;
+        }
 
         foreach ($node->attributes as $name => $attr) {
             $key   = strtolower($name);
@@ -306,7 +314,7 @@
                 // replace double quotes to prevent syntax error and XSS issues (#1490227)
                 $result .= ' style="' . str_replace('"', '&quot;', $style) . '"';
             }
-            else if (isset($this->_html_attribs[$key])) {
+            else if (isset($this->_html_attribs[$key]) || in_array($key, $additional_attribs)) {
                 $value = trim($value);
                 $out   = null;
 
@@ -322,7 +330,7 @@
                     $out = $this->wash_uri($value, true);
                 }
                 else if ($this->is_link_attribute($node->nodeName, $key)) {
-                    if (!preg_match('!^(javascript|vbscript|data:text)!i', $value)
+                    if (!preg_match('!^(javascript|vbscript|data:)!i', $value)
                         && preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value)
                     ) {
                         $out = $value;
@@ -374,6 +382,12 @@
 
     /**
      * Wash URI value
+     *
+     * @param string $uri            URI
+     * @param bool   $blocked_source Block remote source
+     * @param bool   $is_image       URI points to an image
+     *
+     * @return string Washed URI
      */
     private function wash_uri($uri, $blocked_source = false, $is_image = true)
     {
@@ -405,6 +419,11 @@
 
     /**
      * Check it the tag/attribute may contain an URI
+     *
+     * @param string $tag  Element name
+     * @param string $attr Attribute name
+     *
+     * @return bool True if attribute may contain an URI, False otherwise
      */
     private function is_link_attribute($tag, $attr)
     {
@@ -413,6 +432,11 @@
 
     /**
      * Check it the tag/attribute may contain an image URI
+     *
+     * @param string $tag  Element name
+     * @param string $attr Attribute name
+     *
+     * @return bool True if attribute may contain an image URI, False otherwise
      */
     private function is_image_attribute($tag, $attr)
     {
@@ -425,6 +449,11 @@
 
     /**
      * Check it the tag/attribute may contain a FUNCIRI value
+     *
+     * @param string $tag  Element name
+     * @param string $attr Attribute name
+     *
+     * @return bool True if attribute may contain a FUNCIRI value, False otherwise
      */
     private function is_funciri_attribute($tag, $attr)
     {
@@ -438,6 +467,8 @@
      *
      * @param DOMNode $node  HTML element
      * @param int     $level Recurrence level (safe initial value found empirically)
+     *
+     * @return string HTML content
      */
     private function dumpHtml($node, $level = 20)
     {
@@ -456,6 +487,7 @@
                     'message' => "Maximum nesting level exceeded (xdebug.max_nesting_level={$this->max_nesting_level})"),
                     true, false);
             }
+
             return '';
         }
 
@@ -536,6 +568,10 @@
     /**
      * Main function, give it untrusted HTML, tell it if you allow loading
      * remote images and give it a map to convert "cid:" urls.
+     *
+     * @param string $html HTML content
+     *
+     * @return string Washed HTML content
      */
     public function wash($html)
     {
@@ -562,7 +598,7 @@
         if (!$this->is_xml && class_exists('Masterminds\HTML5')) {
             try {
                 $html5 = new Masterminds\HTML5();
-                $node  = $html5->loadHTML($html);
+                $node  = $html5->loadHTML($this->fix_html5($html));
             }
             catch (Exception $e) {
                 // ignore, fallback to DOMDocument
@@ -580,6 +616,10 @@
 
     /**
      * Getter for config parameters
+     *
+     * @param string $prop Configuration parameter name
+     *
+     * @return mixed Configuration parameter value
      */
     public function get_config($prop)
     {
@@ -588,6 +628,10 @@
 
     /**
      * Clean HTML input
+     *
+     * @param string $html HTML content
+     *
+     * @return string Clean HTML content
      */
     private function cleanup($html)
     {
@@ -605,6 +649,8 @@
             '/^(\0\0\xFE\xFF|\xFF\xFE\0\0|\xFE\xFF|\xFF\xFE|\xEF\xBB\xBF)/',
             // washtml/DOMDocument cannot handle xml namespaces
             '/<html\s[^>]+>/i',
+            // washtml/DOMDocument cannot handle xml namespaces
+            '/<\?xml:namespace\s[^>]+>/i',
         );
 
         $html_replace = array(
@@ -613,6 +659,7 @@
             '',
             '',
             '<html>',
+            '',
         );
 
         $html = preg_replace($html_search, $html_replace, $html);
@@ -665,6 +712,10 @@
 
     /**
      * Callback function for HTML tags fixing
+     *
+     * @param array $matches Matched elements (from preg_replace_callback())
+     *
+     * @return string Replacement string
      */
     public static function html_tag_callback($matches)
     {
@@ -690,6 +741,10 @@
 
     /**
      * Convert all relative URLs according to a <base> in HTML
+     *
+     * @param string $body HTML body
+     *
+     * @return string HTML body
      */
     public static function resolve_base($body)
     {
@@ -704,6 +759,8 @@
 
     /**
      * Fix broken nested lists, they are not handled properly by DOMDocument (#1488768)
+     *
+     * @param string &$html HTML content
      */
     public static function fix_broken_lists(&$html)
     {
@@ -733,8 +790,8 @@
                     // li close tag
                     else if ($tt == '</li' && in_array($html[$p+4], array(' ', '>'))) {
                         $li_pos = $p;
+                        $in_li  = false;
                         $p += 4;
-                        $in_li = false;
                     }
                     // ul/ol closing tag
                     else if ($tt == '</' . $tag && in_array($html[$p+4], array(' ', '>'))) {
@@ -762,8 +819,8 @@
                         $element = substr($html, $p, $len);
 
                         // move element to the end of the last li
-                        $html    = substr_replace($html, '', $p, $len);
-                        $html    = substr_replace($html, $element, $li_pos, 0);
+                        $html = substr_replace($html, '', $p, $len);
+                        $html = substr_replace($html, $element, $li_pos, 0);
 
                         $p = $end;
                     }
@@ -776,7 +833,48 @@
     }
 
     /**
+     * Cleanup and workarounds on input to Masterminds/HTML5
+     *
+     * @param string $html HTML content
+     *
+     * @return string HTML content
+     */
+    protected function fix_html5($html)
+    {
+        // There might be content before html/body tag, we'll move it to the body
+        // We'll wrap it by a div container, it's an invalid HTML anyway
+        if (strpos($html, '<')) {
+            $pos     = stripos($html, '<!DOCTYPE') ?: stripos($html, '<html') ?: stripos($html, '<body');
+            $prefix  = '<div>' . substr($html, 0, $pos) . '</div>';
+            $html    = substr($html, $pos);
+        }
+
+        // HTML5 requires <head> or <body> (#6713)
+        // https://github.com/Masterminds/html5-php/issues/166
+        if (isset($prefix) || !preg_match('/<(head|body)/i', $html)) {
+            $body_pos = stripos($html, '<body');
+            $pos      = $body_pos !== false ? $body_pos : stripos($html, '<html');
+
+            // No HTML and no BODY tag
+            if ($pos === false) {
+                $html = '<html><body>' . $prefix . $html;
+            }
+            // Either HTML or BODY tag found
+            else {
+                $pos  = strpos($html, '>', $pos);
+                $html = substr_replace($html, ($body_pos === false ? '<body>' : '') . $prefix, $pos + 1, 0);
+            }
+        }
+
+        return $html;
+    }
+
+    /**
      * Explode css style value
+     *
+     * @param string $style CSS style
+     *
+     * @return array List of CSS rules
      */
     protected function explode_style($style)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/session/db.php -> iRony-0.4.3.tar.gz/lib/Roundcube/session/db.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -24,9 +25,6 @@
  *
  * @package    Framework
  * @subpackage Core
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- * @author     Cor Bosman <cor@roundcu.be>
  */
 class rcube_session_db extends rcube_session
 {
@@ -34,7 +32,9 @@
     private $table_name;
 
     /**
-     * @param Object $config
+     * Object constructor
+     *
+     * @param rcube_config $config Configuration
      */
     public function __construct($config)
     {
@@ -54,9 +54,12 @@
     }
 
     /**
-     * @param $save_path
-     * @param $session_name
-     * @return bool
+     * Opens the session
+     *
+     * @param string $save_path    Session save path
+     * @param string $session_name Session name
+     *
+     * @return bool True on success, False on failure
      */
     public function open($save_path, $session_name)
     {
@@ -64,7 +67,9 @@
     }
 
     /**
-     * @return bool
+     * Close the session
+     *
+     * @return bool True on success, False on failure
      */
     public function close()
     {
@@ -72,10 +77,11 @@
     }
 
     /**
-     * Handler for session_destroy()
+     * Destroy the session
+     *
+     * @param string $key Session identifier
      *
-     * @param $key
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function destroy($key)
     {
@@ -89,9 +95,9 @@
     /**
      * Read session data from database
      *
-     * @param string Session ID
+     * @param string $key Session identifier
      *
-     * @return string Session vars
+     * @return string Session vars (serialized string)
      */
     public function read($key)
     {
@@ -115,11 +121,12 @@
     }
 
     /**
-     * insert new data into db session store
+     * Insert new data into db session store
+     *
+     * @param string $key  Session identifier
+     * @param string $vars Serialized data string
      *
-     * @param $key
-     * @param $vars
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function write($key, $vars)
     {
@@ -138,13 +145,13 @@
     }
 
     /**
-     * update session data
+     * Update session data
      *
-     * @param $key
-     * @param $newvars
-     * @param $oldvars
+     * @param string $key     Session identifier
+     * @param string $newvars New session data string
+     * @param string $oldvars Old session data string
      *
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function update($key, $newvars, $oldvars)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/session/memcache.php -> iRony-0.4.3.tar.gz/lib/Roundcube/session/memcache.php Changed

@@ -3,15 +3,16 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
  | See the README file for a full license statement.                     |
  |                                                                       |
  | PURPOSE:                                                              |
- |   Provide database supported session management                       |
+ |   Provide memcache supported session management                       |
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  | Author: Aleksander Machniak <alec@alec.pl>                            |
@@ -24,9 +25,6 @@
  *
  * @package    Framework
  * @subpackage Core
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- * @author     Cor Bosman <cor@roundcu.be>
  */
 class rcube_session_memcache extends rcube_session
 {
@@ -34,7 +32,9 @@
     private $debug;
 
     /**
-     * @param Object $config
+     * Object constructor
+     *
+     * @param rcube_config $config Configuration
      */
     public function __construct($config)
     {
@@ -45,7 +45,7 @@
 
         if (!$this->memcache) {
             rcube::raise_error(array(
-                    'code' => 604, 'type' => 'db',
+                    'code' => 604, 'type' => 'memcache',
                     'line' => __LINE__, 'file' => __FILE__,
                     'message' => "Failed to connect to memcached. Please check configuration"),
                 true, true);
@@ -56,9 +56,12 @@
     }
 
     /**
-     * @param $save_path
-     * @param $session_name
-     * @return bool
+     * Opens the session
+     *
+     * @param string $save_path    Session save path
+     * @param string $session_name Session name
+     *
+     * @return bool True on success, False on failure
      */
     public function open($save_path, $session_name)
     {
@@ -66,7 +69,9 @@
     }
 
     /**
-     * @return bool
+     * Close the session
+     *
+     * @return bool True on success, False on failure
      */
     public function close()
     {
@@ -74,10 +79,11 @@
     }
 
     /**
-     * Handler for session_destroy() with memcache backend
+     * Destroy the session
+     *
+     * @param string $key Session identifier
      *
-     * @param $key
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function destroy($key)
     {
@@ -96,8 +102,9 @@
     /**
      * Read session data from memcache
      *
-     * @param $key
-     * @return null|string
+     * @param string $key Session identifier
+     *
+     * @return string Serialized data string
      */
     public function read($key)
     {
@@ -119,10 +126,10 @@
     /**
      * Write data to memcache storage
      *
-     * @param $key
-     * @param $vars
+     * @param string $key  Session identifier
+     * @param string $vars Session data string
      *
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function write($key, $vars)
     {
@@ -143,11 +150,11 @@
     /**
      * Update memcache session data
      *
-     * @param $key
-     * @param $newvars
-     * @param $oldvars
+     * @param string $key     Session identifier
+     * @param string $newvars New session data string
+     * @param string $oldvars Old session data string
      *
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function update($key, $newvars, $oldvars)
     {
@@ -169,6 +176,11 @@
 
     /**
      * Write memcache debug info to the log
+     *
+     * @param string $type   Operation type
+     * @param string $key    Session identifier
+     * @param string $data   Data to log
+     * @param bool   $result Opearation result
      */
     protected function debug($type, $key, $data = null, $result = null)
     {

iRony-0.4.3.tar.gz/lib/Roundcube/session/memcached.php Added

@@ -0,0 +1,194 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Provide memcached supported session management                      |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ | Author: Cor Bosman <cor@roundcu.bet>                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Class to provide memcached session storage
+ *
+ * @package    Framework
+ * @subpackage Core
+ */
+class rcube_session_memcached extends rcube_session
+{
+    private $memcache;
+    private $debug;
+
+    /**
+     * Object constructor
+     *
+     * @param rcube_config $config Configuration
+     */
+    public function __construct($config)
+    {
+        parent::__construct($config);
+
+        $this->memcache = rcube::get_instance()->get_memcached();
+        $this->debug    = $config->get('memcache_debug');
+
+        if (!$this->memcache) {
+            rcube::raise_error(array(
+                    'code' => 604, 'type' => 'memcache',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Failed to connect to memcached. Please check configuration"),
+                true, true);
+        }
+
+        // register sessions handler
+        $this->register_session_handler();
+    }
+
+    /**
+     * Opens the session
+     *
+     * @param string $save_path    Session save path
+     * @param string $session_name Session name
+     *
+     * @return bool True on success, False on failure
+     */
+    public function open($save_path, $session_name)
+    {
+        return true;
+    }
+
+    /**
+     * Close the session
+     *
+     * @return bool True on success, False on failure
+     */
+    public function close()
+    {
+        return true;
+    }
+
+    /**
+     * Destroy the session
+     *
+     * @param string $key Session identifier
+     *
+     * @return bool True on success, False on failure
+     */
+    public function destroy($key)
+    {
+        if ($key) {
+            // #1488592: use 2nd argument
+            $result = $this->memcache->delete($key, 0);
+
+            if ($this->debug) {
+                $this->debug('delete', $key, null, $result);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Read session data from memcache
+     *
+     * @param string $key Session identifier
+     *
+     * @return string Serialized data string
+     */
+    public function read($key)
+    {
+        if ($arr = $this->memcache->get($key)) {
+            $this->changed = $arr['changed'];
+            $this->ip      = $arr['ip'];
+            $this->vars    = $arr['vars'];
+            $this->key     = $key;
+        }
+
+        if ($this->debug) {
+            $this->debug('get', $key, $arr ? serialize($arr) : '');
+        }
+
+        return $this->vars ?: '';
+    }
+
+    /**
+     * Write data to memcache storage
+     *
+     * @param string $key  Session identifier
+     * @param string $vars Session data string
+     *
+     * @return bool True on success, False on failure
+     */
+    public function write($key, $vars)
+    {
+        if ($this->ignore_write) {
+            return true;
+        }
+
+        $data   = array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars);
+        $result = $this->memcache->set($key, $data, $this->lifetime + 60);
+
+        if ($this->debug) {
+            $this->debug('set', $key, serialize($data), $result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Update memcache session data
+     *
+     * @param string $key     Session identifier
+     * @param string $newvars New session data string
+     * @param string $oldvars Old session data string
+     *
+     * @return bool True on success, False on failure
+     */
+    public function update($key, $newvars, $oldvars)
+    {
+        $ts = microtime(true);
+
+        if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 3) {
+            $data   = array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars);
+            $result = $this->memcache->set($key, $data, $this->lifetime + 60);
+
+            if ($this->debug) {
+                $this->debug('set', $key, serialize($data), $result);
+            }
+
+            return $result;
+        }
+
+        return true;
+    }
+
+    /**
+     * Write memcache debug info to the log
+     *
+     * @param string $type   Operation type
+     * @param string $key    Session identifier
+     * @param string $data   Data to log
+     * @param bool   $result Opearation result
+     */
+    protected function debug($type, $key, $data = null, $result = null)
+    {
+        $line = strtoupper($type) . ' ' . $key;
+
+        if ($data !== null) {
+            $line .= ' ' . $data;
+        }
+
+        rcube::debug('memcache', $line, $result);
+    }
+}

iRony-0.4.2.tar.gz/lib/Roundcube/session/php.php -> iRony-0.4.3.tar.gz/lib/Roundcube/session/php.php Changed

@@ -3,8 +3,9 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011, Kolab Systems AG                                  |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -24,15 +25,12 @@
  *
  * @package    Framework
  * @subpackage Core
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- * @author     Cor Bosman <cor@roundcu.be>
  */
 class rcube_session_php extends rcube_session {
 
     /**
-     * native php sessions don't need a save handler
-     * we do need to define abstract function implementations but they are not used.
+     * Native php sessions don't need a save handler.
+     * We do need to define abstract function implementations but they are not used.
      */
 
     public function open($save_path, $session_name) {}
@@ -43,7 +41,9 @@
     public function update($key, $newvars, $oldvars) {}
 
     /**
-     * @param Object $config
+     * Object constructor
+     *
+     * @param rcube_config $config Configuration
      */
     public function __construct($config)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/session/redis.php -> iRony-0.4.3.tar.gz/lib/Roundcube/session/redis.php Changed

@@ -3,7 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2018, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -13,6 +14,7 @@
  |   Provide redis supported session management                          |
  +-----------------------------------------------------------------------+
  | Author: Cor Bosman <cor@roundcu.be>                                   |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
@@ -21,8 +23,6 @@
  *
  * @package    Framework
  * @subpackage Core
- * @author     Cor Bosman <cor@roundcu.be>
- * @author     Aleksander Machniak <alec@alec.pl>
  */
 class rcube_session_redis extends rcube_session {
 
@@ -30,7 +30,9 @@
     private $debug;
 
     /**
-     * @param rcube_config $config
+     * Object constructor
+     *
+     * @param rcube_config $config Configuration
      */
     public function __construct($config)
     {
@@ -39,14 +41,25 @@
         $this->redis = rcube::get_instance()->get_redis();
         $this->debug = $config->get('redis_debug');
 
+        if (!$this->redis) {
+            rcube::raise_error(array(
+                    'code' => 604, 'type' => 'redis',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Failed to connect to redis. Please check configuration"),
+                true, true);
+        }
+
         // register sessions handler
         $this->register_session_handler();
     }
 
     /**
-     * @param $save_path
-     * @param $session_name
-     * @return bool
+     * Opens the session
+     *
+     * @param string $save_path    Session save path
+     * @param string $session_name Session name
+     *
+     * @return bool True on success, False on failure
      */
     public function open($save_path, $session_name)
     {
@@ -54,7 +67,9 @@
     }
 
     /**
-     * @return bool
+     * Close the session
+     *
+     * @return bool True on success, False on failure
      */
     public function close()
     {
@@ -62,15 +77,22 @@
     }
 
     /**
-     * remove data from store
+     * Destroy the session
+     *
+     * @param string $key Session identifier
      *
-     * @param $key
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function destroy($key)
     {
         if ($key) {
-            $result = $this->redis->del($key);
+            try {
+                $fname  = method_exists($this->redis, 'del') ? 'del' : 'delete';
+                $result = $this->redis->$fname($key);
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, true);
+            }
 
             if ($this->debug) {
                 $this->debug('delete', $key, null, $result);
@@ -81,14 +103,26 @@
     }
 
     /**
-     * read data from redis store
+     * Read data from redis store
      *
-     * @param $key
-     * @return string
+     * @param string $key Session identifier
+     *
+     * @return string Serialized data string
      */
     public function read($key)
     {
-        if ($value = $this->redis->get($key)) {
+        try {
+            $value = $this->redis->get($key);
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, true);
+        }
+
+        if ($this->debug) {
+            $this->debug('get', $key, $value);
+        }
+
+        if ($value) {
             $arr = unserialize($value);
             $this->changed = $arr['changed'];
             $this->ip      = $arr['ip'];
@@ -96,28 +130,31 @@
             $this->key     = $key;
         }
 
-        if ($this->debug) {
-            $this->debug('get', $key, $value);
-        }
-
         return $this->vars ?: '';
     }
 
     /**
-     * write data to redis store
+     * Write data to redis store
      *
-     * @param $key
-     * @param $newvars
-     * @param $oldvars
-     * @return bool
+     * @param string $key     Session identifier
+     * @param string $newvars New session data string
+     * @param string $oldvars Old session data string
+     *
+     * @return bool True on success, False on failure
      */
     public function update($key, $newvars, $oldvars)
     {
         $ts = microtime(true);
 
         if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 3) {
-            $data   = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars));
-            $result = $this->redis->setex($key, $this->lifetime + 60, $data);
+            $data = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars));
+
+            try {
+                $result = $this->redis->setex($key, $this->lifetime + 60, $data);
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, true);
+            }
 
             if ($this->debug) {
                 $this->debug('set', $key, $data, $result);
@@ -130,11 +167,12 @@
     }
 
     /**
-     * write data to redis store
+     * Write data to redis store
+     *
+     * @param string $key  Session identifier
+     * @param array  $vars Session data
      *
-     * @param $key
-     * @param $vars
-     * @return bool
+     * @return bool True on success, False on failure
      */
     public function write($key, $vars)
     {
@@ -142,8 +180,13 @@
             return true;
         }
 
-        $data   = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars));
-        $result = $this->redis->setex($key, $this->lifetime + 60, $data);
+        try {
+            $data   = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars));
+            $result = $this->redis->setex($key, $this->lifetime + 60, $data);
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, true);
+        }
 
         if ($this->debug) {
             $this->debug('set', $key, $data, $result);
@@ -154,6 +197,11 @@
 
     /**
      * Write memcache debug info to the log
+     *
+     * @param string $type   Operation type
+     * @param string $key    Session identifier
+     * @param string $data   Data to log
+     * @param bool   $result Opearation result
      */
     protected function debug($type, $key, $data = null, $result = null)
     {

iRony-0.4.2.tar.gz/lib/Roundcube/spellchecker/atd.php -> iRony-0.4.3.tar.gz/lib/Roundcube/spellchecker/atd.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/spellchecker/enchant.php -> iRony-0.4.3.tar.gz/lib/Roundcube/spellchecker/enchant.php Changed

@@ -4,8 +4,8 @@
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
  |                                                                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- | Copyright (C) 20011-2013, The Roundcube Dev Team                      |
+ | Copyright (C) The Roundcube Dev Team                                  |
+ | Copyright (C) Kolab Systems AG                                        |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -39,6 +39,10 @@
     {
         $this->init();
 
+        if (!$this->enchant_broker) {
+            return;
+        }
+
         $langs = array();
         if ($dicts = enchant_broker_list_dicts($this->enchant_broker)) {
             foreach ($dicts as $dict) {
@@ -87,8 +91,8 @@
         // tokenize
         $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
 
-        $diff       = 0;
-        $matches    = array();
+        $diff    = 0;
+        $matches = array();
 
         foreach ($text as $w) {
             $word = trim($w[0]);

iRony-0.4.2.tar.gz/lib/Roundcube/spellchecker/engine.php -> iRony-0.4.3.tar.gz/lib/Roundcube/spellchecker/engine.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/spellchecker/googie.php -> iRony-0.4.3.tar.gz/lib/Roundcube/spellchecker/googie.php Changed

iRony-0.4.2.tar.gz/lib/Roundcube/spellchecker/pspell.php -> iRony-0.4.3.tar.gz/lib/Roundcube/spellchecker/pspell.php Changed

@@ -4,7 +4,7 @@
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
  |                                                                       |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
+ | Copyright (C) The Roundcube Dev Team                                  |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -37,18 +37,21 @@
     function languages()
     {
         $defaults = array('en');
-        $langs = array();
+        $langs    = array();
 
         // get aspell dictionaries
         exec('aspell dump dicts', $dicts);
         if (!empty($dicts)) {
             $seen = array();
             foreach ($dicts as $lang) {
-                $lang = preg_replace('/-.*$/', '', $lang);
+                $lang  = preg_replace('/-.*$/', '', $lang);
                 $langc = strlen($lang) == 2 ? $lang.'_'.strtoupper($lang) : $lang;
-                if (!$seen[$langc]++)
+
+                if (!$seen[$langc]++) {
                     $langs[] = $lang;
+                }
             }
+
             $langs = array_unique($langs);
         }
         else {
@@ -93,8 +96,8 @@
         // tokenize
         $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
 
-        $diff       = 0;
-        $matches    = array();
+        $diff    = 0;
+        $matches = array();
 
         foreach ($text as $w) {
             $word = trim($w[0]);
@@ -136,8 +139,9 @@
 
         $suggestions = pspell_suggest($this->plink, $word);
 
-        if (count($suggestions) > self::MAX_SUGGESTIONS)
+        if (count($suggestions) > self::MAX_SUGGESTIONS) {
             $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
+        }
 
         return is_array($suggestions) ? $suggestions : array();
     }

iRony-0.4.2.tar.gz/lib/plugins/calendar/README -> iRony-0.4.3.tar.gz/lib/plugins/calendar/README Changed

@@ -6,14 +6,10 @@
 initialization of the local database is necessary. To do so, execute the
 SQL commands in drivers/<yourchoice>/SQL/<yourdatabase>.initial.sql
 
-The client-side calendar UI relies on the "fullcalendar" project by Adam Arshaw
-with extensions made for the use in Roundcube. All changes are published in
-an official fork at https://github.com/roundcube/fullcalendar
-
 For some general calendar-based operations such as alarms handling or iCal
-parsing/exporting this plugins requires the `libcalendaring` plugin which
-is also part of the Kolab Roundcube Plugins repository. Make sure that plugin
-is installed and configured correctly.
+parsing/exporting and UI widgets/style this plugins requires the `libcalendaring`
+and `libkolab` plugins which are also part of the Kolab Roundcube Plugins repository.
+Make sure these plugins are installed and configured correctly.
 
 For recurring event computation, some utility classes from the Horde project
 are used. They are packaged in a slightly modified version with this plugin.
@@ -26,8 +22,8 @@
 library plugins. Thus in order to run the calendar plugin, you also need the
 following plugins installed:
 
-* libcalendaring [1]
-* libkolab [1] (when using the 'kolab' driver)
+* kolab/libcalendaring [1]
+* kolab/libkolab [1]
 
 
 INSTALLATION
@@ -44,6 +40,7 @@
   $ cd /<path-to-roundcube>/plugins
   $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/calendar .
   $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libcalendaring .
+  $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libkolab .
 
 2. Create calendar plugin configuration
 
@@ -53,11 +50,15 @@
 
 3. Initialize the calendar database tables
 
-  $ mysql roundcubemail < drivers/database/SQL/mysql.initial.sql
+  $ cd ../../
+  $ bin/initdb.sh --dir=plugins/calendar/drivers/database/SQL
+
+4. Build css styles for the Elastic skin
 
-4. Enable the calendar plugin
+  $ lessc --relative-urls -x plugins/libkolab/skins/elastic/libkolab.less > plugins/libkolab/skins/elastic/libkolab.min.css
+
+5. Enable the calendar plugin
 
-  $ cd ../../
   $ edit config/config.inc.php
 
 Add 'calendar' to the list of active plugins:
@@ -68,5 +69,13 @@
   );
 
 
+IMPORTANT
+---------
+
+This plugin doesn't work with the Classic skin of Roundcube because no
+templates are available for that skin.
+
+Use Roundcube `skins_allowed` option to limit skins available to the user
+or remove incompatible skins from the skins folder.
 
 [1] https://git.kolab.org/diffusion/RPK/

iRony-0.4.2.tar.gz/lib/plugins/calendar/calendar.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/calendar.php Changed

@@ -188,13 +188,13 @@
 
       // add 'Create event' item to message menu
       if ($this->api->output->type == 'html' && $_GET['_rel'] != 'event') {
-        $this->api->add_content(html::tag('li', null, 
+        $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',
+            'class'    => 'icon calendarlink disabled',
             'innerclass' => 'icon calendar',
           ))),
           'messagemenu');
@@ -918,10 +918,6 @@
     $event  = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
     $success = $reload = $got_msg = false;
 
-    // force notify if hidden + active
-    if ((int)$this->rc->config->get('calendar_itip_send_option', $this->defaults['calendar_itip_send_option']) === 1)
-      $event['_notify'] = 1;
-
     // read old event data in order to find changes
     if (($event['_notify'] || $event['_decline']) && $action != 'new') {
       $old = $this->driver->get_event($event);
@@ -983,8 +979,7 @@
       case "remove":
         // remove previous deletes
         $undo_time = $this->driver->undelete ? $this->rc->config->get('undo_timeout', 0) : 0;
-        $this->rc->session->remove('calendar_event_undo');
-        
+
         // 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))) {
@@ -993,11 +988,12 @@
           $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 || $event['_savemode']) ? 2 : 1;
 
         if ($undo_time > 0 && $success) {
-          $_SESSION['calendar_event_undo'] = array('ts' => time(), 'data' => $event);
           // 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'))",
@@ -1051,16 +1047,14 @@
 
       case "undo":
         // Restore deleted event
-        $event  = $_SESSION['calendar_event_undo']['data'];
-
-        if ($event)
+        if ($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;
+          $reload  = 2;
         }
 
         break;
@@ -1367,7 +1361,7 @@
   public function itip_events($msgref)
   {
     $path = explode('/', $msgref);
-    $msg = array_pop($path);
+    $msg  = array_pop($path);
     $mbox = join('/', $path);
     list($uid, $mime_id) = explode('#', $msg);
     $events = array();
@@ -1383,23 +1377,27 @@
         }
       }
 */
-      $event['id'] = $event['uid'];
+      $event['id']        = $event['uid'];
       $event['temporary'] = true;
-      $event['readonly'] = true;
-      $event['calendar'] = '--invitation--itip';
+      $event['readonly']  = true;
+      $event['calendar']  = '--invitation--itip';
       $event['className'] = 'fc-invitation-' . strtolower($partstat);
-      $event['_mbox'] = $mbox;
-      $event['_uid']  = $uid;
-      $event['_part'] = $mime_id;
+      $event['_mbox']     = $mbox;
+      $event['_uid']      = $uid;
+      $event['_part']     = $mime_id;
 
       $events[] = $this->_client_event($event, true);
 
       // add recurring instances
       if (!empty($event['recurrence'])) {
-        foreach ($this->driver->get_recurring_events($event, $event['start']) as $recurring) {
+        // 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';
+          $recurring['readonly']  = true;
+          $recurring['calendar']  = '--invitation--itip';
           $events[] = $this->_client_event($recurring, true);
         }
       }
@@ -1770,20 +1768,25 @@
     $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['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['invitation_calendars'] = (bool)$this->rc->config->get('kolab_invitation_calendars', false);
-    $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['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') {
@@ -2456,17 +2459,20 @@
    */
   public static function event_diff($a, $b)
   {
-    $diff = array();
+    $diff   = array();
     $ignore = array('changed' => 1, 'attachments' => 1);
+
     foreach (array_unique(array_merge(array_keys($a), array_keys($b))) as $key) {
-      if (!$ignore[$key] && $key[0] != '_' && $a[$key] != $b[$key])
+      if (!$ignore[$key] && $key[0] != '_' && $a[$key] != $b[$key]) {
         $diff[] = $key;
+      }
     }
-    
+
     // only compare number of attachments
-    if (count($a['attachments']) != count($b['attachments']))
+    if (count((array) $a['attachments']) != count((array) $b['attachments'])) {
       $diff[] = 'attachments';
-    
+    }
+
     return $diff;
   }
 
@@ -2922,14 +2928,15 @@
 
       // get prepared inline UI for this event object
       if ($ical_objects->method) {
-        $append = '';
+        $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', $this->rc->format_date($event['start'], $this->rc->config->get('date_format')))
-            ) . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%');
+            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',
@@ -2939,7 +2946,7 @@
             $ical_objects->mime_id . ':' . $idx,
             'calendar',
             rcube_utils::anytodatetime($ical_objects->message_date),
-            $this->rc->url(array('task' => 'calendar')) . '&view=agendaDay&date=' . $event['start']->format('U')
+            $this->rc->url(array('task' => 'calendar')) . '&view=agendaDay&date=' . $date->format('U')
           ) . $append
         );
       }
@@ -2964,7 +2971,7 @@
         'type'       => 'link',
         'wrapper'    => 'li',
         'command'    => 'attachment-save-calendar',
-        'class'      => 'icon calendarlink',
+        'class'      => 'icon calendarlink disabled',
         'classact'   => 'icon calendarlink active',
         'innerclass' => 'icon calendar',
         'label'      => 'calendar.savetocalendar',

iRony-0.4.2.tar.gz/lib/plugins/calendar/calendar_ui.js -> iRony-0.4.3.tar.gz/lib/plugins/calendar/calendar_ui.js Changed

@@ -317,7 +317,7 @@
       if (String(css['border-color']).match(/^#?f+$/i))
         delete css['border-color'];
 
-      $.each(css, function(i, v) { if (!v) delete css[i]; if (v.charAt(0) != '#') css[i] = '#' + v; });
+      $.each(css, function(i, v) { if (!v) delete css[i]; else if (v.charAt(0) != '#') css[i] = '#' + v; });
 
       if (mode == 'list') {
         bg_color = css['background-color'];
@@ -397,7 +397,7 @@
       if (event.valarms && event.alarms_text)
         $('#event-alarm').show().find('.event-text').html(Q(event.alarms_text).replace(',', ',<br>'));
       if (calendar.name)
-        $('#event-calendar').show().find('.event-text').text(calendar.name).addClass('cal-'+calendar.id);
+        $('#event-calendar').show().find('.event-text').html(Q(calendar.name)).addClass('cal-'+calendar.id);
       if (event.categories)
         $('#event-category').show().find('.event-text').text(event.categories).addClass('cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
       if (event.free_busy)
@@ -527,7 +527,13 @@
         }
       }
 
-      var buttons = [];
+      var buttons = [], is_removable_event = function(event, calendar) {
+          // for invitation calendars check permissions of the original folder
+          if (event._folder_id)
+            calendar = me.calendars[event._folder_id];
+          return calendar && me.has_permission(calendar, 'td');
+        };
+
       if (!temp && calendar.editable && event.editable !== false) {
         buttons.push({
           text: rcmail.gettext('edit', 'calendar'),
@@ -537,7 +543,8 @@
           }
         });
       }
-      if (!temp && me.has_permission(calendar, 'td') && event.editable !== false) {
+
+      if (!temp && is_removable_event(event, calendar) && event.editable !== false) {
         buttons.push({
           text: rcmail.gettext('delete', 'calendar'),
           'class': 'delete',
@@ -565,7 +572,7 @@
         open: function() {
           $dialog.attr('aria-hidden', 'false');
           setTimeout(function(){
-            $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+            $dialog.parent().find('button:not(.ui-dialog-titlebar-close,.delete)').first().focus();
           }, 5);
         },
         beforeClose: function(e) {
@@ -812,7 +819,7 @@
         save_func = function() {
           var start = allday.checked ? '12:00' : $.trim(starttime.val()),
             end = allday.checked ? '13:00' : $.trim(endtime.val()),
-            re = /^((0[0-9])|(1[0-9])|(2[0-3])):([0-5][0-9])(\s*[ap]\.?m\.?)?$/i;
+            re = /^((0?[0-9])|(1[0-9])|(2[0-3])):([0-5][0-9])(\s*[ap]\.?m\.?)?$/i;
 
           if (!re.test(start) || !re.test(end)) {
             rcmail.alert_dialog(rcmail.gettext('invalideventdates', 'calendar'));
@@ -1154,7 +1161,7 @@
         open: function() {
           $dialog.attr('aria-hidden', 'false');
           setTimeout(function(){
-            $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+            $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
           }, 5);
         },
         close: function() {
@@ -1277,12 +1284,10 @@
           
           return false;
         });
-      
+
       // enable/disable buttons
-      // FIXME: .button() does nothing in Elastic skin
-      var disabled = fb_start.getTime() < now.getTime();
-      $('#schedule-find-prev').button('option', 'disabled', disabled).prop('disabled', disabled);
-      
+      $('#schedule-find-prev').prop('disabled', fb_start.getTime() < now.getTime());
+
       // dialog buttons
       var buttons = [
         {
@@ -1829,7 +1834,8 @@
         // move freebusy grid if necessary
         var event_start = 'toDate' in event.start ? event.start.toDate() : event.start,
           event_end = 'toDate' in event.end ? event.end.toDate() : event.end,
-          offset = Math.ceil((event_start.getTime() - freebusy_ui.end.getTime()) / DAY_MS);
+          offset = Math.ceil((event_start.getTime() - freebusy_ui.end.getTime()) / DAY_MS),
+          now = new Date();
 
         if (event_start.getTime() >= freebusy_ui.end.getTime())
           render_freebusy_grid(Math.max(1, offset));
@@ -1838,9 +1844,7 @@
         else
           render_freebusy_overlay();
 
-        var now = new Date(), disabled = event_start.getTime() < now.getTime();
-        // FIXME: .button() does nothing in Elastic skin
-        $('#schedule-find-prev').button('option', 'disabled', disabled).prop('disabled', disabled);
+        $('#schedule-find-prev').prop('disabled', event_start.getTime() < now.getTime());
 
         // speak new selection
         rcmail.display_message(rcmail.gettext('suggestedslot', 'calendar') + ': ' + me.event_date_text(event, true), 'voice');
@@ -2110,7 +2114,7 @@
         height: 500
       }).show();
 
-      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().attr('id', 'rcmbtncalresadd');
+      $('.ui-dialog-buttonset button', $dialog.parent()).first().attr('id', 'rcmbtncalresadd');
 
       me.dialog_resize($dialog.get(0), 540, Math.min(1000, $(window).width() - 50));
 
@@ -2129,7 +2133,7 @@
         resources_treelist.addEventListener('select', function(node) {
           if (resources_data[node.id]) {
             resource_showinfo(resources_data[node.id]);
-            rcmail.enable_command('add-resource', me.selected_event && $("#eventedit").is(':visible') ? true : false);
+            rcmail.enable_command('add-resource', me.selected_event && $("#eventedit").is(':visible'));
 
             // on elastic mobile display resource info box
             if ($('html.layout-small,html.layout-phone').length) {
@@ -2152,7 +2156,7 @@
         rcmail.http_request('resources-list', {}, me.loading_lock);
 
         // register button
-        rcmail.register_button('add-resource', 'rcmbtncalresadd', 'uibutton');
+        rcmail.register_button('add-resource', 'rcmbtncalresadd', 'button');
 
         // initialize resource calendar display
         var resource_cal = $(rcmail.gui_objects.resourceinfocalendar);
@@ -2373,10 +2377,8 @@
     var add_resource2event = function()
     {
       var resource = resources_data[resources_treelist.get_selection()];
-      if (resource) {
-        if (add_attendee($.extend({ role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }, resource)))
-          rcmail.display_message(rcmail.get_label('resourceadded', 'calendar'), 'confirmation');
-      }
+      if (resource)
+        add_attendee($.extend({ role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }, resource));
     }
 
     // when the user accepts or declines an event invitation
@@ -2446,9 +2448,16 @@
         }
 
         // submit status change to server
-        var submit_data = $.extend({}, me.selected_event, { source:null, comment:$('#reply-comment-event-rsvp').val(), _savemode: replymode || 'all' }, (delegate || {})),
+        var submit_data = $.extend({}, { source:null, comment:$('#reply-comment-event-rsvp').val(), _savemode: replymode || 'all' }, (delegate || {})),
+          submit_items = 'id,uid,_instance,calendar,_mbox,_uid,_part,attendees,free_busy,allDay',
           noreply = $('#noreply-event-rsvp:checked').length ? 1 : 0;
 
+        // Submit only that data we really need
+        $.each(submit_items.split(','), function() {
+          if (this in me.selected_event)
+            submit_data[this] = me.selected_event[this];
+        });
+
         // import event from mail (temporary iTip event)
         if (submit_data._mbox && submit_data._uid) {
           me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
@@ -2585,6 +2594,7 @@
 
       if (!data) data = event;
       var decline = false, notify = false, html = '', cal = me.calendars[event.calendar],
+        _is_invitation = String(event.calendar).match(/^--invitation--(declined|pending)/) && RegExp.$1,
         _has_attendees = me.has_attendees(event),
         _is_attendee = _has_attendees && me.is_attendee(event),
         _is_organizer = me.is_organizer(event);
@@ -2593,19 +2603,19 @@
       if (_has_attendees) {
         var checked = (settings.itip_notify & 1 ? ' checked="checked"' : '');
 
-        if (action == 'remove' && cal.group != 'shared' && !_is_organizer && _is_attendee) {
+        if (action == 'remove' && cal.group != 'shared' && !_is_organizer && _is_attendee && _is_invitation != 'declined') {
           decline = true;
           checked = event.status != 'CANCELLED' ? checked : '';
           html += '<div class="message dialog-message ui alert boxwarning">' +
-            '<label><input class="confirm-attendees-decline" type="checkbox"' + checked + ' value="1" name="decline" />&nbsp;' +
-            rcmail.gettext('itipdeclineevent', 'calendar') + 
+            '<label><input class="confirm-attendees-decline pretty-checkbox" type="checkbox"' + checked + ' value="1" name="decline" />&nbsp;' +
+            rcmail.gettext('itipdeclineevent', 'calendar') +
             '</label></div>';
         }
         else if (_is_organizer) {
           notify = true;
           if (settings.itip_notify & 2) {
             html += '<div class="message dialog-message ui alert boxwarning">' +
-              '<label><input class="confirm-attendees-donotify" type="checkbox"' + checked + ' value="1" name="notify" />&nbsp;' +
+              '<label><input class="confirm-attendees-donotify pretty-checkbox" type="checkbox"' + checked + ' value="1" name="notify" />&nbsp;' +
                 rcmail.gettext((action == 'remove' ? 'sendcancellation' : 'sendnotifications'), 'calendar') +
               '</label></div>';
           }
@@ -2613,6 +2623,10 @@
             data._notify = settings.itip_notify;
           }
         }
+        else if (cal.group != 'shared' && !_is_invitation) {
+          html += '<div class="message dialog-message ui alert boxwarning">' + $('#edit-localchanges-warning').html() + '</div>';
+          data._notify = 0;
+        }
       }
 
       // recurring event: user needs to select the savemode
@@ -2633,14 +2647,13 @@
             (action != 'remove' ? '<a href="#new" class="button btn btn-secondary">' + rcmail.gettext('saveasnew', 'calendar') + '</a>' : '') +
           '</div>';
       }
-      
+
       // show dialog
       if (html) {
         var $dialog = $('<div>').html(html);
-      
-        $dialog.find('a.button').button().filter(':not(.disabled)').click(function(e) {
+
+        $dialog.find('a.button').filter(':not(.disabled)').click(function(e) {
           data._savemode = String(this.href).replace(/.+#/, '');
-          data._notify = settings.itip_notify;
 
           // open event edit dialog when saving as new
           if (data._savemode == 'new') {
@@ -2661,7 +2674,7 @@
           $dialog.dialog("close");
           return false;
         });
-        
+
         var buttons = [];
 
         if (!event.recurrence) {
@@ -2693,7 +2706,7 @@
           buttons: buttons,
           open: function() {
             setTimeout(function(){
-              $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+              $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
             }, 5);
           },
           close: function(){
@@ -3008,7 +3021,7 @@
             if (form && form.elements._data.value) {
               rcmail.async_upload_form(form, 'import_events', function(e) {
                 rcmail.set_busy(false, null, me.saving_lock);
-                $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
+                $('.ui-dialog-buttonpane button', $dialog.parent()).prop('disabled', false);
 
                 // display error message if no sophisticated response from server arrived (e.g. iframe load error)
                 if (me.import_succeeded === null)
@@ -3020,7 +3033,7 @@
               rcmail.env.request_timeout = 600;
               me.import_succeeded = null;
               me.saving_lock = rcmail.set_busy(true, 'uploading');
-              $('.ui-dialog-buttonpane button', $dialog.parent()).button('disable');
+              $('.ui-dialog-buttonpane button', $dialog.parent()).prop('disabled', true);
 
               // restore settings
               rcmail.env.request_timeout = timeout;
@@ -3041,7 +3054,7 @@
         closeOnEscape: false,
         title: rcmail.gettext('importevents', 'calendar'),
         close: function() {
-          $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
+          $('.ui-dialog-buttonpane button', $dialog.parent()).prop('disabled', false);
           $dialog.dialog("destroy").hide();
         },
         buttons: buttons,
@@ -3083,9 +3096,10 @@
         $('#event-export-calendar').val(calendar.id);
 
       $('#event-export-range').change(function(e){
-        var custom = $('option:selected', this).val() == 'custom',
-          input = $('#event-export-startdate')
-        input.parent()[(custom?'show':'hide')]();
+        var custom = $(this).val() == 'custom', input = $('#event-export-startdate');
+
+        $(this)[custom ? 'removeClass' : 'addClass']('rounded-right'); // Elastic/Bootstrap
+        input[custom ? 'show' : 'hide']();
         if (custom)
           input.select();
       })
@@ -3096,8 +3110,8 @@
           'class': 'mainaction export',
           click: function() {
             if (form) {
-              var start = 0, range = $('#event-export-range option:selected', this).val(),
-                source = $('#event-export-calendar option:selected').val(),
+              var start = 0, range = $('#event-export-range', this).val(),
+                source = $('#event-export-calendar').val(),
                 attachmt = $('#event-export-attachments').get(0).checked;
 
               if (range == 'custom')
@@ -3124,7 +3138,7 @@
         closeOnEscape: false,
         title: rcmail.gettext('exporttitle', 'calendar'),
         close: function() {
-          $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
+          $('.ui-dialog-buttonpane button', $dialog.parent()).prop('disabled', false);
           $dialog.dialog("destroy").hide();
         },
         buttons: buttons,
@@ -3212,7 +3226,10 @@
       function update_view(view, event, source) {
         var existing = view.fullCalendar('clientEvents', event._id);
         if (existing.length) {
+          delete existing[0].temp;
+          delete existing[0].editable;
           $.extend(existing[0], event);
+
           view.fullCalendar('updateEvent', existing[0]);
           // remove old recurrence instances
           if (event.recurrence && !event.recurrence_id)
@@ -3249,16 +3266,13 @@
       // add/update single event object
       else if (source && p.update) {
         var event = p.update;
-        event.temp = false;
-        event.editable = 0;
 
         // update main view
-        event.editable = source.editable;
         update_view(fc, event, source);
 
         // update the currently displayed event dialog
         if ($('#eventshow').is(':visible') && me.selected_event && me.selected_event.id == event.id)
-          event_show_dialog(event)
+          event_show_dialog(event);
       }
       // refetch all calendars
       else if (p.refetch) {
@@ -3596,25 +3610,19 @@
       }
 
       var id = this.value;
-      if (me.calendars[id]) {  // add or remove event source on click
-        var action;
-        if (this.checked) {
-          action = 'addEventSource';
-          me.calendars[id].active = true;
-        }
-        else {
-          action = 'removeEventSource';
-          me.calendars[id].active = false;
-        }
 
+      // add or remove event source on click
+      if (me.calendars[id]) {
         // adjust checked state of original list item
         if (calendars_list.is_search()) {
           calendars_list.container.find('input[value="'+id+'"]').prop('checked', this.checked);
         }
 
+        me.calendars[id].active = this.checked;
+
         // add/remove event source
-        fc.fullCalendar(action, me.calendars[id]);
-        rcmail.http_post('calendar', { action:'subscribe', c:{ id:id, active:me.calendars[id].active?1:0 } });
+        fc.fullCalendar(this.checked ? 'addEventSource' : 'removeEventSource', me.calendars[id]);
+        rcmail.http_post('calendar', {action: 'subscribe', c: {id: id, active: this.checked ? 1 : 0}});
       }
     })
     .on('keypress', 'input[type=checkbox]', function(e) {
@@ -3677,8 +3685,7 @@
     if (rcmail.env.itip_events && rcmail.env.itip_events.length) {
       me.calendars['--invitation--itip'] = {
         events: rcmail.env.itip_events,
-        color: '#fff',
-        textColor: '#333',
+        color: 'ffffff',
         editable: false,
         rights: 'lrs',
         attendees: true
@@ -4045,11 +4052,11 @@
         event_freebusy_dialog();
       });
 
-      $('#schedule-freebusy-prev').html('&#9668;').button().click(function(){ render_freebusy_grid(-1); });
-      $('#schedule-freebusy-next').html('&#9658;').button().click(function(){ render_freebusy_grid(1); }); // FIXME .parent().buttonset();
+      $('#schedule-freebusy-prev').html('&#9668;').click(function() { render_freebusy_grid(-1); });
+      $('#schedule-freebusy-next').html('&#9658;').click(function() { render_freebusy_grid(1); });
 
-      $('#schedule-find-prev').button().click(function(){ freebusy_find_slot(-1); });
-      $('#schedule-find-next').button().click(function(){ freebusy_find_slot(1); });
+      $('#schedule-find-prev').click(function() { freebusy_find_slot(-1); });
+      $('#schedule-find-next').click(function() { freebusy_find_slot(1); });
 
       $('#schedule-freebusy-workinghours').click(function(){
         freebusy_ui.workinhoursonly = this.checked;
@@ -4219,7 +4226,7 @@
         }
         dp.height('auto').removeClass('ui-dialog-content ui-widget-content')
           .data('dialog-parent', dp.closest('.ui-dialog'))
-          .appendTo('#layout > div.sidebar');
+          .appendTo('#layout-sidebar');
       }
       else if (!in_dialog && dp.length && width <= 768 && dp.data('dialog-parent')) {
         dp.addClass('ui-dialog-content ui-widget-content')
@@ -4272,12 +4279,12 @@
     $('#timezone-display').appendTo($('.fc-header-toolbar > .fc-center')).removeClass('hidden');
     $('#agendaoptions').detach().insertAfter('.fc-header-toolbar');
 
-    $('.content-frame-navigation a.button.date').appendTo('.content > .searchbar');
+    $('.content-frame-navigation a.button.date').appendTo('#layout-content > .searchbar');
 
     // Mobile header title
     if (window.MutationObserver) {
       var title = $('.fc-header-toolbar > .fc-center h2'),
-        mobile_header = $('#layout > .content > .header > .header-title'),
+        mobile_header = $('#layout-content > .header > .header-title'),
         callback = function() {
           var text = title.text();
           mobile_header.html('').append([

iRony-0.4.2.tar.gz/lib/plugins/calendar/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/calendar/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/config.inc.php.dist -> iRony-0.4.3.tar.gz/lib/plugins/calendar/config.inc.php.dist Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/calendar_driver.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/calendar_driver.php Changed

@@ -592,14 +592,16 @@
    */
   public function calendar_form($action, $calendar, $formfields)
   {
-    $html = '';
-    foreach ($formfields as $field) {
-      $html .= html::div('form-section',
-        html::label($field['id'], $field['label']) .
-        $field['value']);
+    $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 $html;
+    return $table->show();
   }
 
   /**
@@ -729,7 +731,7 @@
 
     $rcmail = rcmail::get_instance();
 
-    if ($source && $contact_id && ($abook = $rcmail->get_address_book($source))) {
+    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);
       }

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/database/SQL/sqlite/2013051600.sql -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/database/SQL/sqlite/2013051600.sql Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/database/SQL/sqlite/2014040900.sql -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/database/SQL/sqlite/2014040900.sql Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/database/database_driver.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/database/database_driver.php Changed

@@ -26,1471 +26,1504 @@
 
 class database_driver extends calendar_driver
 {
-  const DB_DATE_FORMAT = 'Y-m-d H:i:s';
-
-  public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'cancelled');
-
-  // features this backend supports
-  public $alarms = true;
-  public $attendees = true;
-  public $freebusy = false;
-  public $attachments = true;
-  public $alarm_types = array('DISPLAY');
-
-  private $rc;
-  private $cal;
-  private $cache = array();
-  private $calendars = array();
-  private $calendar_ids = '';
-  private $free_busy_map = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);
-  private $sensitivity_map = array('public' => 0, 'private' => 1, 'confidential' => 2);
-  private $server_timezone;
-  
-  private $db_events = 'events';
-  private $db_calendars = 'calendars';
-  private $db_attachments = 'attachments';
-
-
-  /**
-   * Default constructor
-   */
-  public function __construct($cal)
-  {
-    $this->cal = $cal;
-    $this->rc = $cal->rc;
-    $this->server_timezone = new DateTimeZone(date_default_timezone_get());
-    
-    // read database config
-    $db = $this->rc->get_dbh();
-    $this->db_events = $this->rc->config->get('db_table_events', $db->table_name($this->db_events));
-    $this->db_calendars = $this->rc->config->get('db_table_calendars', $db->table_name($this->db_calendars));
-    $this->db_attachments = $this->rc->config->get('db_table_attachments', $db->table_name($this->db_attachments));
-    
-    $this->_read_calendars();
-  }
-
-  /**
-   * Read available calendars for the current user and store them internally
-   */
-  private function _read_calendars()
-  {
-    $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
-    
-    if (!empty($this->rc->user->ID)) {
-      $calendar_ids = array();
-      $result = $this->rc->db->query(
-        "SELECT *, calendar_id AS id FROM " . $this->db_calendars . "
-         WHERE user_id=?
-         ORDER BY name",
-         $this->rc->user->ID
-      );
-      while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
-        $arr['showalarms'] = intval($arr['showalarms']);
-        $arr['active']     = !in_array($arr['id'], $hidden);
-        $arr['name']       = html::quote($arr['name']);
-        $arr['listname']   = html::quote($arr['name']);
-        $arr['rights']     = 'lrswikxteav';
-        $arr['editable']  = true;
-        $this->calendars[$arr['calendar_id']] = $arr;
-        $calendar_ids[] = $this->rc->db->quote($arr['calendar_id']);
-      }
-      $this->calendar_ids = join(',', $calendar_ids);
-    }
-  }
-
-  /**
-   * Get a list of available calendars from this source
-   *
-   * @param integer Bitmask defining filter criterias
-   *
-   * @return array List of calendars
-   */
-  public function list_calendars($filter = 0)
-  {
-    // attempt to create a default calendar for this user
-    if (empty($this->calendars)) {
-      if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true)))
+    const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+
+    public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'cancelled');
+
+    // features this backend supports
+    public $alarms      = true;
+    public $attendees   = true;
+    public $freebusy    = false;
+    public $attachments = true;
+    public $alarm_types = array('DISPLAY');
+
+    private $rc;
+    private $cal;
+    private $cache           = array();
+    private $calendars       = array();
+    private $calendar_ids    = '';
+    private $free_busy_map   = array('free' => 0, 'busy' => 1, 'out-of-office' => 2, 'outofoffice' => 2, 'tentative' => 3);
+    private $sensitivity_map = array('public' => 0, 'private' => 1, 'confidential' => 2);
+    private $server_timezone;
+
+    private $db_events      = 'events';
+    private $db_calendars   = 'calendars';
+    private $db_attachments = 'attachments';
+
+
+    /**
+     * Default constructor
+     */
+    public function __construct($cal)
+    {
+        $this->cal             = $cal;
+        $this->rc              = $cal->rc;
+        $this->server_timezone = new DateTimeZone(date_default_timezone_get());
+
+        // read database config
+        $db = $this->rc->get_dbh();
+        $this->db_events      = $db->table_name($this->rc->config->get('db_table_events', $this->db_events));
+        $this->db_calendars   = $db->table_name($this->rc->config->get('db_table_calendars', $this->db_calendars));
+        $this->db_attachments = $db->table_name($this->rc->config->get('db_table_attachments', $this->db_attachments));
+
         $this->_read_calendars();
     }
 
-    $calendars = $this->calendars;
+    /**
+     * Read available calendars for the current user and store them internally
+     */
+    private function _read_calendars()
+    {
+        $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
+
+        if (!empty($this->rc->user->ID)) {
+            $calendar_ids = array();
+            $result = $this->rc->db->query(
+                "SELECT *, `calendar_id` AS id FROM `{$this->db_calendars}`"
+                . " WHERE `user_id` = ?"
+                . " ORDER BY `name`",
+                $this->rc->user->ID
+            );
+
+            while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
+                $arr['showalarms'] = intval($arr['showalarms']);
+                $arr['active']     = !in_array($arr['id'], $hidden);
+                $arr['name']       = html::quote($arr['name']);
+                $arr['listname']   = html::quote($arr['name']);
+                $arr['rights']     = 'lrswikxteav';
+                $arr['editable']  = true;
+
+                $this->calendars[$arr['calendar_id']] = $arr;
+                $calendar_ids[] = $this->rc->db->quote($arr['calendar_id']);
+            }
+
+            $this->calendar_ids = join(',', $calendar_ids);
+        }
+    }
+
+    /**
+     * Get a list of available calendars from this source
+     *
+     * @param integer Bitmask defining filter criterias
+     *
+     * @return array List of calendars
+     */
+    public function list_calendars($filter = 0)
+    {
+        // attempt to create a default calendar for this user
+        if (empty($this->calendars)) {
+            if ($this->create_calendar(array('name' => 'Default', 'color' => 'cc0000', 'showalarms' => true))) {
+                $this->_read_calendars();
+            }
+        }
+
+        $calendars = $this->calendars;
+
+        // filter active calendars
+        if ($filter & self::FILTER_ACTIVE) {
+            foreach ($calendars as $idx => $cal) {
+                if (!$cal['active']) {
+                    unset($calendars[$idx]);
+                }
+            }
+        }
+
+        // 'personal' is unsupported in this driver
+
+        // append the virtual birthdays calendar
+        if ($this->rc->config->get('calendar_contact_birthdays', false)) {
+            $prefs  = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
+            $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
+            $id     = self::BIRTHDAY_CALENDAR_ID;
+
+            if (!$active || !in_array($id, $hidden)) {
+                $calendars[$id] = array(
+                    'id'         => $id,
+                    'name'       => $this->cal->gettext('birthdays'),
+                    'listname'   => $this->cal->gettext('birthdays'),
+                    'color'      => $prefs['color'],
+                    'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
+                    'active'     => !in_array($id, $hidden),
+                    'group'      => 'x-birthdays',
+                    'editable'  => false,
+                    'default'    => false,
+                    'children'   => false,
+                );
+            }
+        }
+
+        return $calendars;
+    }
+
+    /**
+     * 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)
+    {
+        $result = $this->rc->db->query(
+            "INSERT INTO `{$this->db_calendars}`"
+            . " (`user_id`, `name`, `color`, `showalarms`)"
+            . " VALUES (?, ?, ?, ?)",
+            $this->rc->user->ID,
+            $prop['name'],
+            strval($prop['color']),
+            $prop['showalarms'] ? 1 : 0
+        );
 
-    // filter active calendars
-    if ($filter & self::FILTER_ACTIVE) {
-      foreach ($calendars as $idx => $cal) {
-        if (!$cal['active']) {
-          unset($calendars[$idx]);
+        if ($result) {
+            return $this->rc->db->insert_id($this->db_calendars);
         }
-      }
+
+        return false;
     }
 
-    // 'personal' is unsupported in this driver
-
-    // append the virtual birthdays calendar
-    if ($this->rc->config->get('calendar_contact_birthdays', false)) {
-      $prefs = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
-      $hidden = array_filter(explode(',', $this->rc->config->get('hidden_calendars', '')));
-
-      $id = self::BIRTHDAY_CALENDAR_ID;
-      if (!$active || !in_array($id, $hidden)) {
-        $calendars[$id] = array(
-          'id'         => $id,
-          'name'       => $this->cal->gettext('birthdays'),
-          'listname'   => $this->cal->gettext('birthdays'),
-          'color'      => $prefs['color'],
-          'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
-          'active'     => !in_array($id, $hidden),
-          'group'      => 'x-birthdays',
-          'editable'  => false,
-          'default'    => false,
-          'children'   => false,
+    /**
+     * Update properties of an existing calendar
+     *
+     * @see calendar_driver::edit_calendar()
+     */
+    public function edit_calendar($prop)
+    {
+        // birthday calendar properties are saved in user prefs
+        if ($prop['id'] == self::BIRTHDAY_CALENDAR_ID) {
+            $prefs['birthday_calendar'] = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
+            if (isset($prop['color'])) {
+                $prefs['birthday_calendar']['color'] = $prop['color'];
+            }
+            if (isset($prop['showalarms'])) {
+                $prefs['calendar_birthdays_alarm_type'] = $prop['showalarms'] ? $this->alarm_types[0] : '';
+            }
+
+            $this->rc->user->save_prefs($prefs);
+            return true;
+        }
+
+        $query = $this->rc->db->query(
+            "UPDATE `{$this->db_calendars}`"
+            . " SET `name` = ?, `color` = ?, `showalarms` = ?"
+            . " WHERE `calendar_id` = ? AND `user_id` = ?",
+            $prop['name'],
+            strval($prop['color']),
+            $prop['showalarms'] ? 1 : 0,
+            $prop['id'],
+            $this->rc->user->ID
         );
-      }
+
+        return $this->rc->db->affected_rows($query);
     }
 
-    return $calendars;
-  }
-
-  /**
-   * 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)
-  {
-    $result = $this->rc->db->query(
-      "INSERT INTO " . $this->db_calendars . "
-       (user_id, name, color, showalarms)
-       VALUES (?, ?, ?, ?)",
-       $this->rc->user->ID,
-       $prop['name'],
-       $prop['color'],
-       $prop['showalarms']?1:0
-    );
-    
-    if ($result)
-      return $this->rc->db->insert_id($this->db_calendars);
-    
-    return false;
-  }
-
-  /**
-   * Update properties of an existing calendar
-   *
-   * @see calendar_driver::edit_calendar()
-   */
-  public function edit_calendar($prop)
-  {
-    // birthday calendar properties are saved in user prefs
-    if ($prop['id'] == self::BIRTHDAY_CALENDAR_ID) {
-      $prefs['birthday_calendar'] = $this->rc->config->get('birthday_calendar', array('color' => '87CEFA'));
-      if (isset($prop['color']))
-        $prefs['birthday_calendar']['color'] = $prop['color'];
-      if (isset($prop['showalarms']))
-        $prefs['calendar_birthdays_alarm_type'] = $prop['showalarms'] ? $this->alarm_types[0] : '';
-      $this->rc->user->save_prefs($prefs);
-      return true;
+    /**
+     * Set active/subscribed state of a calendar
+     * Save a list of hidden calendars in user prefs
+     *
+     * @see calendar_driver::subscribe_calendar()
+     */
+    public function subscribe_calendar($prop)
+    {
+        $hidden = array_flip(explode(',', $this->rc->config->get('hidden_calendars', '')));
+
+        if ($prop['active']) {
+            unset($hidden[$prop['id']]);
+        }
+        else {
+            $hidden[$prop['id']] = 1;
+        }
+
+        return $this->rc->user->save_prefs(array('hidden_calendars' => join(',', array_keys($hidden))));
     }
 
-    $query = $this->rc->db->query(
-      "UPDATE " . $this->db_calendars . "
-       SET   name=?, color=?, showalarms=?
-       WHERE calendar_id=?
-       AND   user_id=?",
-      $prop['name'],
-      $prop['color'],
-      $prop['showalarms']?1:0,
-      $prop['id'],
-      $this->rc->user->ID
-    );
-    
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * Set active/subscribed state of a calendar
-   * Save a list of hidden calendars in user prefs
-   *
-   * @see calendar_driver::subscribe_calendar()
-   */
-  public function subscribe_calendar($prop)
-  {
-    $hidden = array_flip(explode(',', $this->rc->config->get('hidden_calendars', '')));
-    
-    if ($prop['active'])
-      unset($hidden[$prop['id']]);
-    else
-      $hidden[$prop['id']] = 1;
-    
-    return $this->rc->user->save_prefs(array('hidden_calendars' => join(',', array_keys($hidden))));
-  }
-
-  /**
-   * Delete the given calendar with all its contents
-   *
-   * @see calendar_driver::delete_calendar()
-   */
-  public function delete_calendar($prop)
-  {
-    if (!$this->calendars[$prop['id']])
-      return false;
-
-    // events and attachments will be deleted by foreign key cascade
-
-    $query = $this->rc->db->query(
-      "DELETE FROM " . $this->db_calendars . "
-       WHERE calendar_id=?",
-       $prop['id']
-    );
-
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * 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)
-  {
-    // not implemented
-    return array();
-  }
-
-  /**
-   * Add a single event to the database
-   *
-   * @param array Hash array with event properties
-   * @see calendar_driver::new_event()
-   */
-  public function new_event($event)
-  {
-    if (!$this->validate($event))
-      return false;
-
-    if (!empty($this->calendars)) {
-      if ($event['calendar'] && !$this->calendars[$event['calendar']])
-        return false;
-      if (!$event['calendar'])
-        $event['calendar'] = reset(array_keys($this->calendars));
+    /**
+     * Delete the given calendar with all its contents
+     *
+     * @see calendar_driver::delete_calendar()
+     */
+    public function delete_calendar($prop)
+    {
+        if (!$this->calendars[$prop['id']]) {
+            return false;
+        }
+
+        // events and attachments will be deleted by foreign key cascade
 
-      if ($event_id = $this->_insert_event($event)) {
-        $this->_update_recurring($event);
-      }
+        $query = $this->rc->db->query(
+            "DELETE FROM `{$this->db_calendars}` WHERE `calendar_id` = ? AND `user_id` = ?",
+            $prop['id'],
+            $this->rc->user->ID
+        );
 
-      return $event_id;
+        return $this->rc->db->affected_rows($query);
     }
-    
-    return false;
-  }
-
-  /**
-   *
-   */
-  private function _insert_event(&$event)
-  {
-    $event = $this->_save_preprocess($event);
-
-    $this->rc->db->query(sprintf(
-      "INSERT INTO " . $this->db_events . "
-       (calendar_id, created, changed, uid, recurrence_id, instance, isexception, %s, %s, all_day, recurrence,
-          title, description, location, categories, url, free_busy, priority, sensitivity, status, attendees, alarms, notifyat)
-       VALUES (?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-        $this->rc->db->quote_identifier('start'),
-        $this->rc->db->quote_identifier('end'),
-        $this->rc->db->now(),
-        $this->rc->db->now()
-      ),
-      $event['calendar'],
-      strval($event['uid']),
-      intval($event['recurrence_id']),
-      strval($event['_instance']),
-      intval($event['isexception']),
-      $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']),
-      intval($event['free_busy']),
-      intval($event['priority']),
-      intval($event['sensitivity']),
-      strval($event['status']),
-      $event['attendees'],
-      $event['alarms'],
-      $event['notifyat']
-    );
-
-    $event_id = $this->rc->db->insert_id($this->db_events);
-
-    if ($event_id) {
-      $event['id'] = $event_id;
-
-      // add attachments
-      if (!empty($event['attachments'])) {
-        foreach ($event['attachments'] as $attachment) {
-          $this->add_attachment($attachment, $event_id);
-          unset($attachment);
-        }
-      }
-
-      return $event_id;
+
+    /**
+     * 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)
+    {
+        // not implemented
+        return array();
     }
 
-    return false;
-  }
-
-  /**
-   * Update an event entry with the given data
-   *
-   * @param array Hash array with event properties
-   * @see calendar_driver::edit_event()
-   */
-  public function edit_event($event)
-  {
-    if (!empty($this->calendars)) {
-      $update_master = false;
-      $update_recurring = true;
-      $old = $this->get_event($event);
-      $ret = true;
-
-      // check if update affects scheduling and update attendee status accordingly
-      $reschedule = $this->_check_scheduling($event, $old, true);
-
-      // increment sequence number
-      if (empty($event['sequence']) && $reschedule)
-        $event['sequence'] = max($event['sequence'], $old['sequence']) + 1;
-      
-      // modify a recurring event, check submitted savemode to do the right things
-      if ($old['recurrence'] || $old['recurrence_id']) {
-        $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'])
-          $event['recurrence']['EXDATE'] = $old['recurrence']['EXDATE'];
-        
-        switch ($event['_savemode']) {
-          case 'new':
-            $event['uid'] = $this->cal->generate_uid();
-            return $this->new_event($event);
-          
-          case 'current':
-            // save as exception
-            $event['isexception'] = 1;
-            $update_recurring = false;
-
-            // set exception to first instance (= master)
-            if ($event['id'] == $master['id']) {
-              $event += $old;
-              $event['recurrence_id'] = $master['id'];
-              $event['_instance'] = libcalendaring::recurrence_instance_identifier($old, $master['allday']);
-              $event['isexception'] = 1;
-              $event_id = $this->_insert_event($event);
-              return $event_id;
-            }
-            break;
-          
-          case 'future':
-            if ($master['id'] != $event['id']) {
-              // set until-date on master event, then save this instance as new recurring event
-              $master['recurrence']['UNTIL'] = clone $event['start'];
-              $master['recurrence']['UNTIL']->sub(new DateInterval('P1D'));
-              unset($master['recurrence']['COUNT']);
-              $update_master = true;
-              
-              // if recurrence COUNT, update value to the correct number of future occurences
-              if ($event['recurrence']['COUNT']) {
-                $fromdate = clone $event['start'];
-                $fromdate->setTimezone($this->server_timezone);
-                $sqlresult = $this->rc->db->query(sprintf(
-                  "SELECT event_id FROM " . $this->db_events . "
-                   WHERE calendar_id IN (%s)
-                   AND %s >= ?
-                   AND recurrence_id=?",
-                  $this->calendar_ids,
-                  $this->rc->db->quote_identifier('start')
-                  ),
-                  $fromdate->format(self::DB_DATE_FORMAT),
-                  $master['id']);
-                if ($count = $this->rc->db->num_rows($sqlresult))
-                  $event['recurrence']['COUNT'] = $count;
-              }
-            
-              $update_recurring = true;
-              $event['recurrence_id'] = 0;
-              $event['isexception'] = 0;
-              $event['_instance'] = '';
-              break;
+    /**
+     * Add a single event to the database
+     *
+     * @param array Hash array with event properties
+     * @see calendar_driver::new_event()
+     */
+    public function new_event($event)
+    {
+        if (!$this->validate($event)) {
+            return false;
+        }
+
+        if (!empty($this->calendars)) {
+            if ($event['calendar'] && !$this->calendars[$event['calendar']]) {
+                return false;
             }
-            // else: 'future' == 'all' if modifying the master event
-          
-          default:  // 'all' is default
-            $event['id'] = $master['id'];
-            $event['recurrence_id'] = 0;
-            
-            // 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 = $old['end']->format('U') - $old['start']->format('U');
-            
-            $new_start_date = $event['start']->format('Y-m-d');
-            $new_start_time = $event['allday'] ? '' : $event['start']->format('H:i');
-            $new_duration = $event['end']->format('U') - $event['start']->format('U');
-            
-            $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($old['start']->diff($event['start']));
-              $event['end'] = clone $event['start'];
-              $event['end']->add(new DateInterval('PT'.$new_duration.'S'));
+
+            if (!$event['calendar']) {
+                $event['calendar'] = reset(array_keys($this->calendars));
             }
-            // 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'];
+
+            if ($event_id = $this->_insert_event($event)) {
+                $this->_update_recurring($event);
             }
-            
-            // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
-            if (is_array($event['recurrence']) && ($old_start_date != $new_start_date || $old_start_time != $new_start_time)
-                && ($exceptions = $this->_load_exceptions($old))) {
-              $recurrence_id_format = libcalendaring::recurrence_id_format($event);
-              foreach ($exceptions as $exception) {
-                $recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $old['start']->getTimezone());
-                if (is_a($recurrence_id, 'DateTime')) {
-                  $recurrence_id->add($date_shift);
-                  $exception['_instance'] = $recurrence_id->format($recurrence_id_format);
-                  $this->_update_event($exception, false);
+
+            return $event_id;
+        }
+
+        return false;
+    }
+
+    /**
+     *
+     */
+    private function _insert_event(&$event)
+    {
+        $event = $this->_save_preprocess($event);
+        $now   = $this->rc->db->now();
+
+        $this->rc->db->query(
+            "INSERT INTO `{$this->db_events}`"
+            . " (`calendar_id`, `created`, `changed`, `uid`, `recurrence_id`, `instance`,"
+                . " `isexception`, `start`, `end`, `all_day`, `recurrence`, `title`, `description`,"
+                . " `location`, `categories`, `url`, `free_busy`, `priority`, `sensitivity`,"
+                . " `status`, `attendees`, `alarms`, `notifyat`)"
+            . " VALUES (?, $now, $now, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+            $event['calendar'],
+            strval($event['uid']),
+            intval($event['recurrence_id']),
+            strval($event['_instance']),
+            intval($event['isexception']),
+            $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']),
+            intval($event['free_busy']),
+            intval($event['priority']),
+            intval($event['sensitivity']),
+            strval($event['status']),
+            $event['attendees'],
+            $event['alarms'],
+            $event['notifyat']
+        );
+
+        $event_id = $this->rc->db->insert_id($this->db_events);
+
+        if ($event_id) {
+            $event['id'] = $event_id;
+
+            // add attachments
+            if (!empty($event['attachments'])) {
+                foreach ($event['attachments'] as $attachment) {
+                    $this->add_attachment($attachment, $event_id);
+                    unset($attachment);
                 }
-              }
             }
-            
-            $ret = $event['id'];  // return master ID
-            break;
-        }
-      }
-      
-      $success = $this->_update_event($event, $update_recurring);
-      
-      if ($success && $update_master)
-        $this->_update_event($master, true);
-      
-      return $success ? $ret : false;
-    }
-    
-    return false;
-  }
-
-  /**
-   * 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']) {
-      $update_event = $this->get_event(array('id' => $event['recurrence_id']));
-      $update_event['_savemode'] = $event['_savemode'];
-      calendar::merge_attendee_data($update_event, $attendees);
-    }
 
-    if ($ret = $this->update_attendees($update_event, $attendees)) {
-      // replace $event with effectively updated event (for iTip reply)
-      if ($ret !== true && $ret != $update_event['id'] && ($new_event = $this->get_event(array('id' => $ret)))) {
-        $event = $new_event;
-      }
-      else {
-        $event = $update_event;
-      }
+            return $event_id;
+        }
+
+        return false;
     }
 
-    return $ret;
-  }
-
-  /**
-   * Update the participant status for the given attendees
-   *
-   * @see calendar_driver::update_attendees()
-   */
-  public function update_attendees(&$event, $attendees)
-  {
-    $success = $this->edit_event($event, true);
-
-    // apply attendee updates to recurrence exceptions too
-    if ($success && $event['_savemode'] == 'all' && !empty($event['recurrence']) && empty($event['recurrence_id']) && ($exceptions = $this->_load_exceptions($event))) {
-      foreach ($exceptions as $exception) {
-        calendar::merge_attendee_data($exception, $attendees);
-        $this->_update_event($exception, false);
-      }
+    /**
+     * Update an event entry with the given data
+     *
+     * @param array Hash array with event properties
+     * @see calendar_driver::edit_event()
+     */
+    public function edit_event($event)
+    {
+        if (!empty($this->calendars)) {
+            $update_master    = false;
+            $update_recurring = true;
+
+            $old = $this->get_event($event);
+            $ret = true;
+
+            // check if update affects scheduling and update attendee status accordingly
+            $reschedule = $this->_check_scheduling($event, $old, true);
+
+            // increment sequence number
+            if (empty($event['sequence']) && $reschedule) {
+                $event['sequence'] = max($event['sequence'], $old['sequence']) + 1;
+            }
+
+            // modify a recurring event, check submitted savemode to do the right things
+            if ($old['recurrence'] || $old['recurrence_id']) {
+                $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']) {
+                    $event['recurrence']['EXDATE'] = $old['recurrence']['EXDATE'];
+                }
+
+                switch ($event['_savemode']) {
+                case 'new':
+                    $event['uid'] = $this->cal->generate_uid();
+                    return $this->new_event($event);
+
+                case 'current':
+                    // save as exception
+                    $event['isexception'] = 1;
+                    $update_recurring     = false;
+
+                    // set exception to first instance (= master)
+                    if ($event['id'] == $master['id']) {
+                        $event += $old;
+                        $event['recurrence_id'] = $master['id'];
+                        $event['_instance']     = libcalendaring::recurrence_instance_identifier($old, $master['allday']);
+                        $event['isexception']   = 1;
+                        $event_id = $this->_insert_event($event);
+
+                        return $event_id;
+                    }
+                    break;
+
+                case 'future':
+                    if ($master['id'] != $event['id']) {
+                        // set until-date on master event, then save this instance as new recurring event
+                        $master['recurrence']['UNTIL'] = clone $event['start'];
+                        $master['recurrence']['UNTIL']->sub(new DateInterval('P1D'));
+                        unset($master['recurrence']['COUNT']);
+                        $update_master = true;
+
+                        // if recurrence COUNT, update value to the correct number of future occurences
+                        if ($event['recurrence']['COUNT']) {
+                            $fromdate = clone $event['start'];
+                            $fromdate->setTimezone($this->server_timezone);
+
+                            $query = $this->rc->db->query(
+                                "SELECT `event_id` FROM `{$this->db_events}`"
+                                . " WHERE `calendar_id` IN ({$this->calendar_ids})"
+                                    . " AND `start` >= ? AND `recurrence_id` = ?",
+                                $fromdate->format(self::DB_DATE_FORMAT),
+                                $master['id']
+                            );
+
+                            if ($count = $this->rc->db->num_rows($query)) {
+                                $event['recurrence']['COUNT'] = $count;
+                            }
+                        }
+
+                        $update_recurring       = true;
+                        $event['recurrence_id'] = 0;
+                        $event['isexception']   = 0;
+                        $event['_instance']     = '';
+                        break;
+                    }
+                    // else: 'future' == 'all' if modifying the master event
+
+                default:  // 'all' is default
+                    $event['id']            = $master['id'];
+                    $event['recurrence_id'] = 0;
+
+                    // 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   = $old['end']->format('U') - $old['start']->format('U');
+
+                    $new_start_date = $event['start']->format('Y-m-d');
+                    $new_start_time = $event['allday'] ? '' : $event['start']->format('H:i');
+                    $new_duration   = $event['end']->format('U') - $event['start']->format('U');
+
+                    $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($old['start']->diff($event['start']));
+                        $event['end']   = clone $event['start'];
+                        $event['end']->add(new DateInterval('PT'.$new_duration.'S'));
+                    }
+                    // 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'];
+                    }
+
+                    // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
+                    if (is_array($event['recurrence'])
+                        && ($old_start_date != $new_start_date || $old_start_time != $new_start_time)
+                        && ($exceptions = $this->_load_exceptions($old))
+                    ) {
+                        $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+
+                        foreach ($exceptions as $exception) {
+                            $recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $old['start']->getTimezone());
+                            if (is_a($recurrence_id, 'DateTime')) {
+                                $recurrence_id->add($date_shift);
+                                $exception['_instance'] = $recurrence_id->format($recurrence_id_format);
+                                $this->_update_event($exception, false);
+                            }
+                        }
+                    }
+
+                    $ret = $event['id'];  // return master ID
+                    break;
+                }
+            }
+
+            $success = $this->_update_event($event, $update_recurring);
+
+            if ($success && $update_master) {
+                $this->_update_event($master, true);
+            }
+
+            return $success ? $ret : false;
+        }
+
+        return false;
     }
 
-    return $success;
-  }
-
-  /**
-   * Determine whether the current change affects scheduling and reset attendee status accordingly
-   */
-  private function _check_scheduling(&$event, $old, $update = true)
-  {
-    // skip this check when importing iCal/iTip events
-    if (isset($event['sequence']) || !empty($event['_method'])) {
-      return false;
+    /**
+     * 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']) {
+            $update_event = $this->get_event(array('id' => $event['recurrence_id']));
+            $update_event['_savemode'] = $event['_savemode'];
+            calendar::merge_attendee_data($update_event, $attendees);
+        }
+
+        if ($ret = $this->update_attendees($update_event, $attendees)) {
+            // replace $event with effectively updated event (for iTip reply)
+            if ($ret !== true && $ret != $update_event['id'] && ($new_event = $this->get_event(array('id' => $ret)))) {
+                $event = $new_event;
+            }
+            else {
+                $event = $update_event;
+            }
+        }
+
+        return $ret;
     }
 
-    $reschedule = false;
+    /**
+     * Update the participant status for the given attendees
+     *
+     * @see calendar_driver::update_attendees()
+     */
+    public function update_attendees(&$event, $attendees)
+    {
+        $success = $this->edit_event($event, true);
+
+        // apply attendee updates to recurrence exceptions too
+        if ($success && $event['_savemode'] == 'all'
+            && !empty($event['recurrence'])
+            && empty($event['recurrence_id'])
+            && ($exceptions = $this->_load_exceptions($event))
+        ) {
+            foreach ($exceptions as $exception) {
+                calendar::merge_attendee_data($exception, $attendees);
+                $this->_update_event($exception, false);
+            }
+        }
+
+        return $success;
+    }
 
-    // iterate through the list of properties considered 'significant' for scheduling
-    foreach (self::$scheduling_properties as $prop) {
-        $a = $old[$prop];
-        $b = $event[$prop];
-        if ($event['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
-            $a = $a->format('Y-m-d');
-            $b = $b->format('Y-m-d');
+    /**
+     * Determine whether the current change affects scheduling and reset attendee status accordingly
+     */
+    private function _check_scheduling(&$event, $old, $update = true)
+    {
+        // skip this check when importing iCal/iTip events
+        if (isset($event['sequence']) || !empty($event['_method'])) {
+            return false;
         }
-        if ($prop == 'recurrence' && is_array($a) && is_array($b)) {
-            unset($a['EXCEPTIONS'], $b['EXCEPTIONS']);
-            $a = array_filter($a);
-            $b = array_filter($b);
 
-            // advanced rrule comparison: no rescheduling if series was shortened
-            if ($a['COUNT'] && $b['COUNT'] && $b['COUNT'] < $a['COUNT']) {
-              unset($a['COUNT'], $b['COUNT']);
+        $reschedule = false;
+
+        // iterate through the list of properties considered 'significant' for scheduling
+        foreach (self::$scheduling_properties as $prop) {
+            $a = $old[$prop];
+            $b = $event[$prop];
+
+            if ($event['allday'] && ($prop == 'start' || $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
+                $a = $a->format('Y-m-d');
+                $b = $b->format('Y-m-d');
             }
-            else if ($a['UNTIL'] && $b['UNTIL'] && $b['UNTIL'] < $a['UNTIL']) {
-              unset($a['UNTIL'], $b['UNTIL']);
+
+            if ($prop == 'recurrence' && is_array($a) && is_array($b)) {
+                unset($a['EXCEPTIONS'], $b['EXCEPTIONS']);
+                $a = array_filter($a);
+                $b = array_filter($b);
+
+                // advanced rrule comparison: no rescheduling if series was shortened
+                if ($a['COUNT'] && $b['COUNT'] && $b['COUNT'] < $a['COUNT']) {
+                    unset($a['COUNT'], $b['COUNT']);
+                }
+                else if ($a['UNTIL'] && $b['UNTIL'] && $b['UNTIL'] < $a['UNTIL']) {
+                    unset($a['UNTIL'], $b['UNTIL']);
+                }
+            }
+
+            if ($a != $b) {
+                $reschedule = true;
+                break;
             }
         }
-        if ($a != $b) {
-            $reschedule = true;
-            break;
+
+        // 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;
+            }
         }
-    }
 
-    // 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;
-      }
+        return $reschedule;
     }
 
-    return $reschedule;
-  }
-
-  /**
-   * Convert save data to be used in SQL statements
-   */
-  private function _save_preprocess($event)
-  {
-    // shift dates to server's timezone (except for all-day events)
-    if (!$event['allday']) {
-      $event['start'] = clone $event['start'];
-      $event['start']->setTimezone($this->server_timezone);
-      $event['end'] = clone $event['end'];
-      $event['end']->setTimezone($this->server_timezone);
-    }
-    
-    // compose vcalendar-style recurrencue rule from structured data
-    $rrule = $event['recurrence'] ? libcalendaring::to_rrule($event['recurrence']) : '';
-    $event['_recurrence'] = rtrim($rrule, ';');
-    $event['free_busy'] = intval($this->free_busy_map[strtolower($event['free_busy'])]);
-    $event['sensitivity'] = intval($this->sensitivity_map[strtolower($event['sensitivity'])]);
-
-    if ($event['free_busy'] == 'tentative') {
-        $event['status'] = 'TENTATIVE';
-    }
+    /**
+     * Convert save data to be used in SQL statements
+     */
+    private function _save_preprocess($event)
+    {
+        // shift dates to server's timezone (except for all-day events)
+        if (!$event['allday']) {
+            $event['start'] = clone $event['start'];
+            $event['start']->setTimezone($this->server_timezone);
+            $event['end'] = clone $event['end'];
+            $event['end']->setTimezone($this->server_timezone);
+        }
 
-    if (isset($event['allday'])) {
-      $event['all_day'] = $event['allday'] ? 1 : 0;
-    }
+        // compose vcalendar-style recurrencue rule from structured data
+        $rrule = $event['recurrence'] ? libcalendaring::to_rrule($event['recurrence']) : '';
 
-    // compute absolute time to notify the user
-    $event['notifyat'] = $this->_get_notification($event);
+        $event['_recurrence'] = rtrim($rrule, ';');
+        $event['free_busy']   = intval($this->free_busy_map[strtolower($event['free_busy'])]);
+        $event['sensitivity'] = intval($this->sensitivity_map[strtolower($event['sensitivity'])]);
 
-    if (is_array($event['valarms'])) {
-        $event['alarms'] = $this->serialize_alarms($event['valarms']);
-    }
+        if ($event['free_busy'] == 'tentative') {
+            $event['status'] = 'TENTATIVE';
+        }
 
-    // process event attendees
-    if (!empty($event['attendees']))
-      $event['attendees'] = json_encode((array)$event['attendees']);
-    else
-      $event['attendees'] = '';
-
-    return $event;
-  }
-  
-  /**
-   * Compute absolute time to notify the user
-   */
-  private function _get_notification($event)
-  {
-    if ($event['valarms'] && $event['start'] > new DateTime()) {
-      $alarm = libcalendaring::get_next_alarm($event);
-
-      if ($alarm['time'] && in_array($alarm['action'], $this->alarm_types))
-        return date('Y-m-d H:i:s', $alarm['time']);
-    }
+        if (isset($event['allday'])) {
+            $event['all_day'] = $event['allday'] ? 1 : 0;
+        }
 
-    return null;
-  }
-
-  /**
-   * Save the given event record to database
-   *
-   * @param array Event data
-   * @param boolean True if recurring events instances should be updated, too
-   */
-  private function _update_event($event, $update_recurring = true)
-  {
-    $event = $this->_save_preprocess($event);
-    $sql_set = array();
-    $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'isexception', 'sequence', 'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority', 'sensitivity', 'status', 'attendees', 'alarms', 'notifyat');
-    foreach ($set_cols as $col) {
-      if (is_object($event[$col]) && is_a($event[$col], 'DateTime'))
-        $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]->format(self::DB_DATE_FORMAT));
-      else if (is_array($event[$col]))
-        $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote(join(',', $event[$col]));
-      else if (array_key_exists($col, $event))
-        $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]);
-    }
-    
-    if ($event['_recurrence'])
-      $sql_set[] = $this->rc->db->quote_identifier('recurrence') . '=' . $this->rc->db->quote($event['_recurrence']);
-    
-    if ($event['_instance'])
-      $sql_set[] = $this->rc->db->quote_identifier('instance') . '=' . $this->rc->db->quote($event['_instance']);
-    
-    if ($event['_fromcalendar'] && $event['_fromcalendar'] != $event['calendar'])
-        $sql_set[] = 'calendar_id=' . $this->rc->db->quote($event['calendar']);
-    
-    $query = $this->rc->db->query(sprintf(
-      "UPDATE " . $this->db_events . "
-       SET   changed=%s %s
-       WHERE event_id=?
-       AND   calendar_id IN (" . $this->calendar_ids . ")",
-        $this->rc->db->now(),
-        ($sql_set ? ', ' . join(', ', $sql_set) : '')
-      ),
-      $event['id']
-    );
-
-    $success = $this->rc->db->affected_rows($query);
-
-    // add attachments
-    if ($success && !empty($event['attachments'])) {
-      foreach ($event['attachments'] as $attachment) {
-        $this->add_attachment($attachment, $event['id']);
-        unset($attachment);
-      }
-    }
+        // compute absolute time to notify the user
+        $event['notifyat'] = $this->_get_notification($event);
 
-    // remove attachments
-    if ($success && !empty($event['deleted_attachments'])) {
-      foreach ($event['deleted_attachments'] as $attachment) {
-        $this->remove_attachment($attachment, $event['id']);
-      }
-    }
+        if (is_array($event['valarms'])) {
+            $event['alarms'] = $this->serialize_alarms($event['valarms']);
+        }
+
+        // process event attendees
+        if (!empty($event['attendees'])) {
+            $event['attendees'] = json_encode((array)$event['attendees']);
+        }
+        else {
+            $event['attendees'] = '';
+        }
 
-    if ($success) {
-      unset($this->cache[$event['id']]);
-      if ($update_recurring)
-        $this->_update_recurring($event);
+        return $event;
     }
 
-    return $success;
-  }
-
-  /**
-   * Insert "fake" entries for recurring occurences of this event
-   */
-  private function _update_recurring($event)
-  {
-    if (empty($this->calendars))
-      return;
-
-    if (!empty($event['recurrence'])) {
-      $exdata = array();
-      $exceptions = $this->_load_exceptions($event);
-
-      foreach ($exceptions as $exception) {
-        $exdate = substr($exception['_instance'], 0, 8);
-        $exdata[$exdate] = $exception;
-      }
+    /**
+     * Compute absolute time to notify the user
+     */
+    private function _get_notification($event)
+    {
+        if ($event['valarms'] && $event['start'] > new DateTime()) {
+            $alarm = libcalendaring::get_next_alarm($event);
+
+            if ($alarm['time'] && in_array($alarm['action'], $this->alarm_types)) {
+                return date('Y-m-d H:i:s', $alarm['time']);
+            }
+        }
     }
 
-    // clear existing recurrence copies
-    $this->rc->db->query(
-      "DELETE FROM " . $this->db_events . "
-       WHERE recurrence_id=?
-       AND isexception=0
-       AND calendar_id IN (" . $this->calendar_ids . ")",
-       $event['id']
-    );
-
-    // create new fake entries
-    if (!empty($event['recurrence'])) {
-      // include library class
-      require_once($this->cal->home . '/lib/calendar_recurrence.php');
-      
-      $recurrence = new calendar_recurrence($this->cal, $event);
-
-      $count = 0;
-      $event['allday'] = $event['all_day'];
-      $duration = $event['start']->diff($event['end']);
-      $recurrence_id_format = libcalendaring::recurrence_id_format($event);
-      while ($next_start = $recurrence->next_start()) {
-        $instance = $next_start->format($recurrence_id_format);
-        $datestr = substr($instance, 0, 8);
-
-        // skip exceptions
-        // TODO: merge updated data from master event
-        if ($exdata[$datestr]) {
-          continue;
-        }
-
-        $next_start->setTimezone($this->server_timezone);
-        $next_end = clone $next_start;
-        $next_end->add($duration);
-
-        $notify_at = $this->_get_notification(array('alarms' => $event['alarms'], 'start' => $next_start, 'end' => $next_end, 'status' => $event['status']));
-        $query = $this->rc->db->query(sprintf(
-          "INSERT INTO " . $this->db_events . "
-           (calendar_id, recurrence_id, created, changed, uid, instance, %s, %s, all_day, sequence, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, notifyat)
-            SELECT calendar_id, ?, %s, %s, uid, ?, ?, ?, all_day, sequence, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, ?
-            FROM  " . $this->db_events . " WHERE event_id=? AND calendar_id IN (" . $this->calendar_ids . ")",
-            $this->rc->db->quote_identifier('start'),
-            $this->rc->db->quote_identifier('end'),
-            $this->rc->db->now(),
-            $this->rc->db->now()
-          ),
-          $event['id'],
-          $instance,
-          $next_start->format(self::DB_DATE_FORMAT),
-          $next_end->format(self::DB_DATE_FORMAT),
-          $notify_at,
-          $event['id']
+    /**
+     * Save the given event record to database
+     *
+     * @param array Event data
+     * @param boolean True if recurring events instances should be updated, too
+     */
+    private function _update_event($event, $update_recurring = true)
+    {
+        $event    = $this->_save_preprocess($event);
+        $sql_args = array();
+        $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'isexception', 'sequence',
+            'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority',
+            'sensitivity', 'status', 'attendees', 'alarms', 'notifyat'
         );
-        
-        if (!$this->rc->db->affected_rows($query))
-          break;
-        
-        // stop adding events for inifinite recurrence after 20 years
-        if (++$count > 999 || (!$recurrence->recurEnd && !$recurrence->recurCount && $next_start->format('Y') > date('Y') + 20))
-          break;
-      }
-      
-      // remove all exceptions after recurrence end
-      if ($next_end && !empty($exceptions)) {
-          $this->rc->db->query(
-          "DELETE FROM " . $this->db_events . "
-           WHERE `recurrence_id`=?
-           AND `isexception`=1
-           AND `start` > ?
-           AND `calendar_id` IN (" . $this->calendar_ids . ")",
-           $event['id'],
-           $next_end->format(self::DB_DATE_FORMAT)
+
+        foreach ($set_cols as $col) {
+            if (is_object($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];
+            }
+        }
+
+        if ($event['_recurrence']) {
+            $sql_args['recurrence'] = $event['_recurrence'];
+        }
+
+        if ($event['_instance']) {
+            $sql_args['instance'] = $event['_instance'];
+        }
+
+        if ($event['_fromcalendar'] && $event['_fromcalendar'] != $event['calendar']) {
+            $sql_args['calendar_id'] = $event['calendar'];
+        }
+
+        $sql_set = '';
+        foreach (array_keys($sql_args) as $col) {
+            $sql_set .= ", `$col` = ?";
+        }
+
+        $sql_args = array_values($sql_args);
+        $sql_args[] = $event['id'];
+
+        $query = $this->rc->db->query(
+            "UPDATE `{$this->db_events}`"
+            . " SET `changed` = " . $this->rc->db->now() . $sql_set
+            . " WHERE `event_id` = ? AND `calendar_id` IN ({$this->calendar_ids})",
+            $sql_args
         );
-      }
-    }
-  }
-  
-  /**
-   *
-   */
-  private function _load_exceptions($event, $instance_id = null)
-  {
-    $sql_add_where = '';
-    if (!empty($instance_id)) {
-      $sql_add_where = 'AND `instance`=?';
-    }
 
-    $result = $this->rc->db->query(
-      "SELECT * FROM " . $this->db_events . "
-       WHERE `recurrence_id`=?
-       AND `isexception`=1
-       AND `calendar_id` IN (" . $this->calendar_ids . ")
-       $sql_add_where
-       ORDER BY `instance`, `start`",
-       $event['id'],
-       $instance_id
-    );
-
-    $exceptions = array();
-    while ($result && ($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr['event_id']) {
-      $exception = $this->_read_postprocess($sql_arr);
-      $instance = $exception['_instance'] ?: $exception['start']->format($exception['allday'] ? 'Ymd' : 'Ymd\THis');
-      $exceptions[$instance] = $exception;
+        $success = $this->rc->db->affected_rows($query);
+
+        // add attachments
+        if ($success && !empty($event['attachments'])) {
+            foreach ($event['attachments'] as $attachment) {
+                $this->add_attachment($attachment, $event['id']);
+                unset($attachment);
+            }
+        }
+
+        // remove attachments
+        if ($success && !empty($event['deleted_attachments'])) {
+            foreach ($event['deleted_attachments'] as $attachment) {
+                $this->remove_attachment($attachment, $event['id']);
+            }
+        }
+
+        if ($success) {
+            unset($this->cache[$event['id']]);
+            if ($update_recurring) {
+                $this->_update_recurring($event);
+            }
+        }
+
+        return $success;
     }
 
-    return $exceptions;
-  }
-
-  /**
-   * Move a single event
-   *
-   * @param array Hash array with event properties
-   * @see calendar_driver::move_event()
-   */
-  public function move_event($event)
-  {
-    // let edit_event() do all the magic
-    return $this->edit_event($event + (array)$this->get_event($event));
-  }
-
-  /**
-   * Resize a single event
-   *
-   * @param array Hash array with event properties
-   * @see calendar_driver::resize_event()
-   */
-  public function resize_event($event)
-  {
-    // let edit_event() do all the magic
-    return $this->edit_event($event + (array)$this->get_event($event));
-  }
-
-  /**
-   * Remove a single event from the database
-   *
-   * @param array   Hash array with event properties
-   * @param boolean Remove record irreversible (@TODO)
-   *
-   * @see calendar_driver::remove_event()
-   */
-  public function remove_event($event, $force = true)
-  {
-    if (!empty($this->calendars)) {
-      $event += (array)$this->get_event($event);
-      $master = $event;
-      $update_master = false;
-      $savemode = 'all';
-      $ret = true;
-
-      // read master if deleting a recurring event
-      if ($event['recurrence'] || $event['recurrence_id']) {
-        $master = $event['recurrence_id'] ? $this->get_event(array('id' => $event['recurrence_id'])) : $event;
-        $savemode = $event['_savemode'];
-      }
-
-      switch ($savemode) {
-        case 'current':
-          // add exception to master event
-          $master['recurrence']['EXDATE'][] = $event['start'];
-          $update_master = true;
-          
-          // just delete this single occurence
-          $query = $this->rc->db->query(
-            "DELETE FROM " . $this->db_events . "
-             WHERE calendar_id IN (" . $this->calendar_ids . ")
-             AND event_id=?",
+    /**
+     * Insert "fake" entries for recurring occurences of this event
+     */
+    private function _update_recurring($event)
+    {
+        if (empty($this->calendars)) {
+            return;
+        }
+
+        if (!empty($event['recurrence'])) {
+            $exdata     = array();
+            $exceptions = $this->_load_exceptions($event);
+
+            foreach ($exceptions as $exception) {
+                $exdate = substr($exception['_instance'], 0, 8);
+                $exdata[$exdate] = $exception;
+            }
+        }
+
+        // clear existing recurrence copies
+        $this->rc->db->query(
+            "DELETE FROM `{$this->db_events}`"
+            . " WHERE `recurrence_id` = ? AND `isexception` = 0 AND `calendar_id` IN ({$this->calendar_ids})",
             $event['id']
-          );
-          break;
-
-        case 'future':
-          if ($master['id'] != $event['id']) {
-            // set until-date on master event
-            $master['recurrence']['UNTIL'] = clone $event['start'];
-            $master['recurrence']['UNTIL']->sub(new DateInterval('P1D'));
-            unset($master['recurrence']['COUNT']);
-            $update_master = true;
-            
-            // delete this and all future instances
-            $fromdate = clone $event['start'];
-            $fromdate->setTimezone($this->server_timezone);
-            $query = $this->rc->db->query(
-              "DELETE FROM " . $this->db_events . "
-               WHERE calendar_id IN (" . $this->calendar_ids . ")
-               AND " . $this->rc->db->quote_identifier('start') . " >= ?
-               AND recurrence_id=?",
-              $fromdate->format(self::DB_DATE_FORMAT),
-              $master['id']
-            );
-            $ret = $master['id'];
-            break;
-          }
-          // else: future == all if modifying the master event
-
-        default:  // 'all' is default
-          $query = $this->rc->db->query(
-            "DELETE FROM " . $this->db_events . "
-             WHERE (event_id=? OR recurrence_id=?)
-             AND calendar_id IN (" . $this->calendar_ids . ")",
-             $master['id'],
-             $master['id']
-          );
-          break;
-      }
-
-      $success = $this->rc->db->affected_rows($query);
-      if ($success && $update_master)
-        $this->_update_event($master, true);
-
-      return $success ? $ret : false;
-    }
-    
-    return false;
-  }
-
-  /**
-   * Return data of a specific event
-   * @param mixed  Hash array with event properties or event UID
-   * @param integer Bitmask defining the scope to search events in
-   * @param boolean If true, recurrence exceptions shall be added
-   * @return array Hash array with event properties
-   */
-  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;
-    $col = is_array($event) && is_numeric($id) ? 'event_id' : 'uid';
-
-    $where_add = '';
-    if (is_array($event) && !$event['id'] && !empty($event['_instance'])) {
-      $where_add = 'AND instance=' . $this->rc->db->quote($event['_instance']);
-    }
+        );
 
-    if ($this->cache[$id])
-      return $this->cache[$id];
+        // create new fake entries
+        if (!empty($event['recurrence'])) {
+            // include library class
+            require_once($this->cal->home . '/lib/calendar_recurrence.php');
+
+            $recurrence = new calendar_recurrence($this->cal, $event);
+            $count = 0;
+            $event['allday'] = $event['all_day'];
+            $duration = $event['start']->diff($event['end']);
+            $recurrence_id_format = libcalendaring::recurrence_id_format($event);
+
+            while ($next_start = $recurrence->next_start()) {
+                $instance = $next_start->format($recurrence_id_format);
+                $datestr  = substr($instance, 0, 8);
+
+                // skip exceptions
+                // TODO: merge updated data from master event
+                if ($exdata[$datestr]) {
+                    continue;
+                }
 
-    // get event from the address books birthday calendar
-    if ($cal == self::BIRTHDAY_CALENDAR_ID) {
-      return $this->get_birthday_event($id);
-    }
+                $next_start->setTimezone($this->server_timezone);
+                $next_end = clone $next_start;
+                $next_end->add($duration);
+
+                $notify_at = $this->_get_notification(array(
+                        'alarms' => $event['alarms'],
+                        'start'  => $next_start,
+                        'end'    => $next_end,
+                        'status' => $event['status']
+                ));
+
+                $now   = $this->rc->db->now();
+                $query = $this->rc->db->query(
+                    "INSERT INTO `{$this->db_events}`"
+                    . " (`calendar_id`, `recurrence_id`, `created`, `changed`, `uid`, `instance`, `start`, `end`,"
+                        . " `all_day`, `sequence`, `recurrence`, `title`, `description`, `location`, `categories`,"
+                        . " `url`, `free_busy`, `priority`, `sensitivity`, `status`, `alarms`, `attendees`, `notifyat`)"
+                    . " SELECT `calendar_id`, ?, $now, $now, `uid`, ?, ?, ?,"
+                        . " `all_day`, `sequence`, `recurrence`, `title`, `description`, `location`, `categories`,"
+                        . " `url`, `free_busy`, `priority`, `sensitivity`, `status`, `alarms`, `attendees`, ?"
+                    . " FROM `{$this->db_events}` WHERE `event_id` = ? AND `calendar_id` IN ({$this->calendar_ids})",
+                    $event['id'],
+                    $instance,
+                    $next_start->format(self::DB_DATE_FORMAT),
+                    $next_end->format(self::DB_DATE_FORMAT),
+                    $notify_at,
+                    $event['id']
+                );
+
+                if (!$this->rc->db->affected_rows($query)) {
+                    break;
+                }
 
-    if ($scope & self::FILTER_ACTIVE) {
-      $calendars = $this->calendars;
-      foreach ($calendars as $idx => $cal) {
-        if (!$cal['active']) {
-          unset($calendars[$idx]);
+                // stop adding events for inifinite recurrence after 20 years
+                if (++$count > 999 || (!$recurrence->recurEnd && !$recurrence->recurCount && $next_start->format('Y') > date('Y') + 20)) {
+                    break;
+                }
+            }
+
+            // remove all exceptions after recurrence end
+            if ($next_end && !empty($exceptions)) {
+                $this->rc->db->query(
+                    "DELETE FROM `{$this->db_events}`"
+                    . " WHERE `recurrence_id` = ? AND `isexception` = 1 AND `start` > ?"
+                        . " AND `calendar_id` IN ({$this->calendar_ids})",
+                    $event['id'],
+                    $next_end->format(self::DB_DATE_FORMAT)
+                );
+            }
         }
-      }
-      $cals = join(',', $calendars);
     }
-    else {
-      $cals = $this->calendar_ids;
+
+    /**
+     *
+     */
+    private function _load_exceptions($event, $instance_id = null)
+    {
+        $sql_add_where = '';
+        if (!empty($instance_id)) {
+            $sql_add_where = " AND `instance` = ?";
+        }
+
+        $result = $this->rc->db->query(
+            "SELECT * FROM `{$this->db_events}`"
+            . " WHERE `recurrence_id` = ? AND `isexception` = 1"
+                . " AND `calendar_id` IN ({$this->calendar_ids})" . $sql_add_where
+            . " ORDER BY `instance`, `start`",
+            $event['id'],
+            $instance_id
+        );
+
+        $exceptions = array();
+        while (($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr['event_id']) {
+            $exception = $this->_read_postprocess($sql_arr);
+            $instance  = $exception['_instance'] ?: $exception['start']->format($exception['allday'] ? 'Ymd' : 'Ymd\THis');
+            $exceptions[$instance] = $exception;
+        }
+
+        return $exceptions;
     }
 
-    $result = $this->rc->db->query(sprintf(
-      "SELECT e.*, (SELECT COUNT(attachment_id) FROM " . $this->db_attachments . " 
-         WHERE event_id = e.event_id OR event_id = e.recurrence_id) AS _attachments
-       FROM " . $this->db_events . " AS e
-       WHERE e.calendar_id IN (%s)
-       AND e.$col=?
-       %s",
-       $cals,
-       $where_add
-      ),
-      $id);
-
-    if ($result && ($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr['event_id']) {
-      $event = $this->_read_postprocess($sql_arr);
-
-      // also load recurrence exceptions
-      if (!empty($event['recurrence']) && $full) {
-        $event['recurrence']['EXCEPTIONS'] = array_values($this->_load_exceptions($event));
-      }
-
-      $this->cache[$id] = $event;
-      return $this->cache[$id];
+    /**
+     * Move a single event
+     *
+     * @param array Hash array with event properties
+     * @see calendar_driver::move_event()
+     */
+    public function move_event($event)
+    {
+        // let edit_event() do all the magic
+        return $this->edit_event($event + (array)$this->get_event($event));
     }
 
-    return false;
-  }
-
-  /**
-   * Get event data
-   *
-   * @see calendar_driver::load_events()
-   */
-  public function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null)
-  {
-    if (empty($calendars))
-      $calendars = array_keys($this->calendars);
-    else if (!is_array($calendars))
-      $calendars = explode(',', strval($calendars));
-      
-    // only allow to select from calendars of this use
-    $calendar_ids = array_map(array($this->rc->db, 'quote'), array_intersect($calendars, array_keys($this->calendars)));
-    
-    // compose (slow) SQL query for searching
-    // FIXME: improve searching using a dedicated col and normalized values
-    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) . ')';
+    /**
+     * Resize a single event
+     *
+     * @param array Hash array with event properties
+     * @see calendar_driver::resize_event()
+     */
+    public function resize_event($event)
+    {
+        // let edit_event() do all the magic
+        return $this->edit_event($event + (array)$this->get_event($event));
     }
-    
-    if (!$virtual)
-      $sql_add .= ' AND e.recurrence_id = 0';
-    
-    if ($modifiedsince)
-      $sql_add .= ' AND e.changed >= ' . $this->rc->db->quote(date('Y-m-d H:i:s', $modifiedsince));
-    
-    $events = array();
-    if (!empty($calendar_ids)) {
-      $result = $this->rc->db->query(sprintf(
-        "SELECT e.*, (SELECT COUNT(attachment_id) FROM " . $this->db_attachments . "
-            WHERE event_id = e.event_id OR event_id = e.recurrence_id) AS _attachments
-         FROM " . $this->db_events . " e
-         WHERE e.calendar_id IN (%s)
-            AND e.start <= %s AND e.end >= %s
-            %s",
-         join(',', $calendar_ids),
-         $this->rc->db->fromunixtime($end),
-         $this->rc->db->fromunixtime($start),
-         $sql_add
-       ));
-
-      while ($result && ($sql_arr = $this->rc->db->fetch_assoc($result))) {
-        $event = $this->_read_postprocess($sql_arr);
-        $add = true;
-
-        if (!empty($event['recurrence']) && !$event['recurrence_id']) {
-          // load recurrence exceptions (i.e. for export)
-          if (!$virtual) {
-            $event['recurrence']['EXCEPTIONS'] = $this->_load_exceptions($event);
-          }
-          // check for exception on first instance
-          else {
-            $instance = libcalendaring::recurrence_instance_identifier($event);
-            $exceptions = $this->_load_exceptions($event, $instance);
-            if ($exceptions && is_array($exceptions[$instance])) {
-              $event = $exceptions[$instance];
-              $add = false;
+
+    /**
+     * Remove a single event from the database
+     *
+     * @param array   Hash array with event properties
+     * @param boolean Remove record irreversible (@TODO)
+     *
+     * @see calendar_driver::remove_event()
+     */
+    public function remove_event($event, $force = true)
+    {
+        if (!empty($this->calendars)) {
+            $event += (array)$this->get_event($event);
+            $master        = $event;
+            $update_master = false;
+            $savemode      = 'all';
+            $ret           = true;
+
+            // read master if deleting a recurring event
+            if ($event['recurrence'] || $event['recurrence_id']) {
+                $master   = $event['recurrence_id'] ? $this->get_event(array('id' => $event['recurrence_id'])) : $event;
+                $savemode = $event['_savemode'];
+            }
+
+            switch ($savemode) {
+            case 'current':
+                // add exception to master event
+                $master['recurrence']['EXDATE'][] = $event['start'];
+                $update_master = true;
+
+                // just delete this single occurence
+                $query = $this->rc->db->query(
+                    "DELETE FROM `{$this->db_events}`"
+                    . " WHERE `calendar_id` IN ({$this->calendar_ids}) AND `event_id` = ?",
+                    $event['id']
+                );
+                break;
+
+            case 'future':
+                if ($master['id'] != $event['id']) {
+                    // set until-date on master event
+                    $master['recurrence']['UNTIL'] = clone $event['start'];
+                    $master['recurrence']['UNTIL']->sub(new DateInterval('P1D'));
+                    unset($master['recurrence']['COUNT']);
+                    $update_master = true;
+
+                    // delete this and all future instances
+                    $fromdate = clone $event['start'];
+                    $fromdate->setTimezone($this->server_timezone);
+
+                    $query = $this->rc->db->query(
+                        "DELETE FROM `{$this->db_events}`"
+                        . " WHERE `calendar_id` IN ({$this->calendar_ids}) AND `start` >= ? AND `recurrence_id` = ?",
+                        $fromdate->format(self::DB_DATE_FORMAT),
+                        $master['id']
+                    );
+
+                    $ret = $master['id'];
+                    break;
+                }
+                // else: future == all if modifying the master event
+
+            default:  // 'all' is default
+                $query = $this->rc->db->query(
+                    "DELETE FROM `{$this->db_events}`"
+                    . " WHERE (`event_id` = ? OR `recurrence_id` = ?) AND `calendar_id` IN ({$this->calendar_ids})",
+                    $master['id'],
+                    $master['id']
+                );
+                break;
+            }
+
+            $success = $this->rc->db->affected_rows($query);
+
+            if ($success && $update_master) {
+                $this->_update_event($master, true);
             }
-          }
+
+            return $success ? $ret : false;
         }
 
-        if ($add)
-          $events[] = $event;
-      }
+        return false;
     }
 
-    // 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));
+    /**
+     * Return data of a specific event
+     *
+     * @param mixed   Hash array with event properties or event UID
+     * @param integer Bitmask defining the scope to search events in
+     * @param boolean If true, recurrence exceptions shall be added
+     *
+     * @return array Hash array with event properties
+     */
+    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;
+        $col = is_array($event) && is_numeric($id) ? 'event_id' : 'uid';
+
+        if ($this->cache[$id]) {
+            return $this->cache[$id];
+        }
+
+        // get event from the address books birthday calendar
+        if ($cal == self::BIRTHDAY_CALENDAR_ID) {
+            return $this->get_birthday_event($id);
+        }
+
+        $where_add = '';
+        if (is_array($event) && !$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]);
+                }
+            }
+            $cals = join(',', $calendars);
+        }
+        else {
+            $cals = $this->calendar_ids;
+        }
+
+        $result = $this->rc->db->query(
+            "SELECT e.*, (SELECT COUNT(`attachment_id`) FROM `{$this->db_attachments}`"
+                . " WHERE `event_id` = e.event_id OR `event_id` = e.recurrence_id) AS _attachments"
+            . " FROM `{$this->db_events}` AS e"
+            . " WHERE e.calendar_id IN ($cals) AND e.$col = ?" . $where_add,
+            $id
+        );
+
+        if ($result && ($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr['event_id']) {
+            $event = $this->_read_postprocess($sql_arr);
+
+            // also load recurrence exceptions
+            if (!empty($event['recurrence']) && $full) {
+                $event['recurrence']['EXCEPTIONS'] = array_values($this->_load_exceptions($event));
+            }
+
+            $this->cache[$id] = $event;
+
+            return $this->cache[$id];
+        }
+
+        return false;
     }
 
-    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)
-  {
-      // not implemented
-      return array();
-  }
-
-  /**
-   * Convert sql record into a rcube style event object
-   */
-  private function _read_postprocess($event)
-  {
-    $free_busy_map = array_flip($this->free_busy_map);
-    $sensitivity_map = array_flip($this->sensitivity_map);
-    
-    $event['id'] = $event['event_id'];
-    $event['start'] = new DateTime($event['start']);
-    $event['end'] = new DateTime($event['end']);
-    $event['allday'] = intval($event['all_day']);
-    $event['created'] = new DateTime($event['created']);
-    $event['changed'] = new DateTime($event['changed']);
-    $event['free_busy'] = $free_busy_map[$event['free_busy']];
-    $event['sensitivity'] = $sensitivity_map[$event['sensitivity']];
-    $event['calendar'] = $event['calendar_id'];
-    $event['recurrence_id'] = intval($event['recurrence_id']);
-    $event['isexception'] = intval($event['isexception']);
-    
-    // parse recurrence rule
-    if ($event['recurrence'] && preg_match_all('/([A-Z]+)=([^;]+);?/', $event['recurrence'], $m, PREG_SET_ORDER)) {
-      $event['recurrence'] = array();
-      foreach ($m as $rr) {
-        if (is_numeric($rr[2]))
-          $rr[2] = intval($rr[2]);
-        else if ($rr[1] == 'UNTIL')
-          $rr[2] = date_create($rr[2]);
-        else if ($rr[1] == 'RDATE')
-          $rr[2] = array_map('date_create', explode(',', $rr[2]));
-        else if ($rr[1] == 'EXDATE')
-          $rr[2] = array_map('date_create', explode(',', $rr[2]));
-        $event['recurrence'][$rr[1]] = $rr[2];
-      }
+    /**
+     * Get event data
+     *
+     * @see calendar_driver::load_events()
+     */
+    public function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null)
+    {
+        if (empty($calendars)) {
+            $calendars = array_keys($this->calendars);
+        }
+        else if (!is_array($calendars)) {
+            $calendars = explode(',', strval($calendars));
+        }
+
+        // only allow to select from calendars of this use
+        $calendar_ids = array_map(array($this->rc->db, 'quote'), array_intersect($calendars, array_keys($this->calendars)));
+
+        // compose (slow) SQL query for searching
+        // FIXME: improve searching using a dedicated col and normalized values
+        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) . ")";
+        }
+
+        if (!$virtual) {
+            $sql_add .= " AND e.recurrence_id = 0";
+        }
+
+        if ($modifiedsince) {
+            $sql_add .= " AND e.changed >= " . $this->rc->db->quote(date('Y-m-d H:i:s', $modifiedsince));
+        }
+
+        $events = array();
+        if (!empty($calendar_ids)) {
+            $result = $this->rc->db->query(
+                "SELECT e.*, (SELECT COUNT(`attachment_id`) FROM `{$this->db_attachments}`"
+                    . " WHERE `event_id` = e.event_id OR `event_id` = e.recurrence_id) AS _attachments"
+                . " FROM `{$this->db_events}` e"
+                . " WHERE e.calendar_id IN (" . join(',', $calendar_ids) . ")"
+                    . " AND e.start <= " . $this->rc->db->fromunixtime($end)
+                    . " AND e.end >= " . $this->rc->db->fromunixtime($start)
+                    . $sql_add
+            );
+
+            while ($result && ($sql_arr = $this->rc->db->fetch_assoc($result))) {
+                $event = $this->_read_postprocess($sql_arr);
+                $add   = true;
+
+                if (!empty($event['recurrence']) && !$event['recurrence_id']) {
+                    // load recurrence exceptions (i.e. for export)
+                    if (!$virtual) {
+                        $event['recurrence']['EXCEPTIONS'] = $this->_load_exceptions($event);
+                    }
+                    // check for exception on first instance
+                    else {
+                        $instance   = libcalendaring::recurrence_instance_identifier($event);
+                        $exceptions = $this->_load_exceptions($event, $instance);
+
+                        if ($exceptions && is_array($exceptions[$instance])) {
+                            $event = $exceptions[$instance];
+                            $add   = false;
+                        }
+                    }
+                }
+
+                if ($add) {
+                    $events[] = $event;
+                }
+            }
+        }
+
+        // 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));
+        }
+
+        return $events;
     }
-    
-    if ($event['recurrence_id']) {
-      libcalendaring::identify_recurrence_instance($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  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)
+    {
+        // not implemented
+        return array();
     }
-    
-    if (strlen($event['instance'])) {
-      $event['_instance'] = $event['instance'];
 
-      if (empty($event['recurrence_id'])) {
-        $event['recurrence_date'] = rcube_utils::anytodatetime($event['_instance'], $event['start']->getTimezone());
-      }
+    /**
+     * Convert sql record into a rcube style event object
+     */
+    private function _read_postprocess($event)
+    {
+        $free_busy_map   = array_flip($this->free_busy_map);
+        $sensitivity_map = array_flip($this->sensitivity_map);
+
+        $event['id']            = $event['event_id'];
+        $event['start']         = new DateTime($event['start']);
+        $event['end']           = new DateTime($event['end']);
+        $event['allday']        = intval($event['all_day']);
+        $event['created']       = new DateTime($event['created']);
+        $event['changed']       = new DateTime($event['changed']);
+        $event['free_busy']     = $free_busy_map[$event['free_busy']];
+        $event['sensitivity']   = $sensitivity_map[$event['sensitivity']];
+        $event['calendar']      = $event['calendar_id'];
+        $event['recurrence_id'] = intval($event['recurrence_id']);
+        $event['isexception']   = intval($event['isexception']);
+
+        // parse recurrence rule
+        if ($event['recurrence'] && preg_match_all('/([A-Z]+)=([^;]+);?/', $event['recurrence'], $m, PREG_SET_ORDER)) {
+            $event['recurrence'] = array();
+            foreach ($m as $rr) {
+                if (is_numeric($rr[2])) {
+                    $rr[2] = intval($rr[2]);
+                }
+                else if ($rr[1] == 'UNTIL') {
+                    $rr[2] = date_create($rr[2]);
+                }
+                else if ($rr[1] == 'RDATE') {
+                    $rr[2] = array_map('date_create', explode(',', $rr[2]));
+                }
+                else if ($rr[1] == 'EXDATE') {
+                    $rr[2] = array_map('date_create', explode(',', $rr[2]));
+                }
+
+                $event['recurrence'][$rr[1]] = $rr[2];
+            }
+        }
+
+        if ($event['recurrence_id']) {
+            libcalendaring::identify_recurrence_instance($event);
+        }
+
+        if (strlen($event['instance'])) {
+            $event['_instance'] = $event['instance'];
+
+            if (empty($event['recurrence_id'])) {
+                $event['recurrence_date'] = rcube_utils::anytodatetime($event['_instance'], $event['start']->getTimezone());
+            }
+        }
+
+        if ($event['_attachments'] > 0) {
+            $event['attachments'] = (array)$this->list_attachments($event);
+        }
+
+        // decode serialized event attendees
+        if (strlen($event['attendees'])) {
+            $event['attendees'] = $this->unserialize_attendees($event['attendees']);
+        }
+        else {
+            $event['attendees'] = array();
+        }
+
+        // decode serialized alarms
+        if ($event['alarms']) {
+            $event['valarms'] = $this->unserialize_alarms($event['alarms']);
+        }
+
+        unset($event['event_id'], $event['calendar_id'], $event['notifyat'], $event['all_day'], $event['instance'], $event['_attachments']);
+
+        return $event;
     }
-    
-    if ($event['_attachments'] > 0) {
-      $event['attachments'] = (array)$this->list_attachments($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)
+    {
+        if (empty($calendars)) {
+            $calendars = array_keys($this->calendars);
+        }
+        else if (!is_array($calendars)) {
+            $calendars = explode(',', (array) $calendars);
+        }
+
+        // only allow to select from calendars with activated alarms
+        $calendar_ids = array();
+        foreach ($calendars as $cid) {
+            if ($this->calendars[$cid] && $this->calendars[$cid]['showalarms']) {
+                $calendar_ids[] = $cid;
+            }
+        }
+
+        $calendar_ids = array_map(array($this->rc->db, 'quote'), $calendar_ids);
+        $alarms       = array();
+
+        if (!empty($calendar_ids)) {
+            $stime  = $this->rc->db->fromunixtime($time);
+            $result = $this->rc->db->query(
+                "SELECT * FROM `{$this->db_events}`"
+                . " WHERE `calendar_id` IN (" . join(',', $calendar_ids) . ")"
+                . " AND `notifyat` <= $stime AND `end` > $stime"
+            );
+
+            while ($event = $this->rc->db->fetch_assoc($result)) {
+                $alarms[] = $this->_read_postprocess($event);
+            }
+        }
+
+        return $alarms;
     }
-    
-    // decode serialized event attendees
-    if (strlen($event['attendees'])) {
-      $event['attendees'] = $this->unserialize_attendees($event['attendees']);
+
+    /**
+     * Feedback after showing/sending an alarm notification
+     *
+     * @see calendar_driver::dismiss_alarm()
+     */
+    public function dismiss_alarm($event_id, $snooze = 0)
+    {
+        // set new notifyat time or unset if not snoozed
+        $notify_at = $snooze > 0 ? date(self::DB_DATE_FORMAT, time() + $snooze) : null;
+
+        $query = $this->rc->db->query(
+            "UPDATE `{$this->db_events}`"
+            . " SET `changed` = " . $this->rc->db->now() . ", `notifyat` = ?"
+            . " WHERE `event_id` = ? AND `calendar_id` IN ({$this->calendar_ids})",
+            $notify_at,
+            $event_id
+        );
+
+        return $this->rc->db->affected_rows($query);
     }
-    else {
-      $event['attendees'] = array();
+
+    /**
+     * Save an attachment related to the given event
+     */
+    private function add_attachment($attachment, $event_id)
+    {
+        if (isset($attachment['data'])) {
+            $data = $attachment['data'];
+        }
+        else if (!empty($attachment['path'])) {
+            $data = file_get_contents($attachment['path']);
+        }
+        else {
+            return false;
+        }
+
+        $query = $this->rc->db->query(
+            "INSERT INTO `{$this->db_attachments}`"
+            . " (`event_id`, `filename`, `mimetype`, `size`, `data`)"
+            . " VALUES (?, ?, ?, ?, ?)",
+            $event_id,
+            $attachment['name'],
+            $attachment['mimetype'],
+            strlen($data),
+            base64_encode($data)
+        );
+
+        return $this->rc->db->affected_rows($query);
     }
-    
-    // decode serialized alarms
-    if ($event['alarms']) {
-      $event['valarms'] = $this->unserialize_alarms($event['alarms']);
+
+    /**
+     * Remove a specific attachment from the given event
+     */
+    private function remove_attachment($attachment_id, $event_id)
+    {
+        $query = $this->rc->db->query(
+            "DELETE FROM `{$this->db_attachments}`"
+            . " WHERE `attachment_id` = ? AND `event_id` IN ("
+                . "SELECT `event_id` FROM `{$this->db_events}`"
+                . " WHERE `event_id` = ? AND `calendar_id` IN ({$this->calendar_ids}))",
+            $attachment_id,
+            $event_id
+        );
+
+        return $this->rc->db->affected_rows($query);
     }
-    
-    unset($event['event_id'], $event['calendar_id'], $event['notifyat'], $event['all_day'], $event['instance'], $event['_attachments']);
-    return $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)
-  {
-    if (empty($calendars))
-      $calendars = array_keys($this->calendars);
-    else if (is_string($calendars))
-      $calendars = explode(',', $calendars);
-    
-    // only allow to select from calendars with activated alarms
-    $calendar_ids = array();
-    foreach ($calendars as $cid) {
-      if ($this->calendars[$cid] && $this->calendars[$cid]['showalarms'])
-        $calendar_ids[] = $cid;
+
+    /**
+     * List attachments of specified event
+     */
+    public function list_attachments($event)
+    {
+        $attachments = array();
+
+        if (!empty($this->calendar_ids)) {
+            $result = $this->rc->db->query(
+                "SELECT `attachment_id` AS id, `filename` AS name, `mimetype`, `size`"
+                . " FROM `{$this->db_attachments}`"
+                . " WHERE `event_id` IN ("
+                    . "SELECT `event_id` FROM `{$this->db_events}`"
+                    . " WHERE `event_id` = ? AND `calendar_id` IN ({$this->calendar_ids}))"
+                . " ORDER BY `filename`",
+                $event['recurrence_id'] ? $event['recurrence_id'] : $event['event_id']
+            );
+
+            while ($arr = $this->rc->db->fetch_assoc($result)) {
+                $attachments[] = $arr;
+            }
+        }
+
+        return $attachments;
     }
-    $calendar_ids = array_map(array($this->rc->db, 'quote'), $calendar_ids);
-    
-    $alarms = array();
-    if (!empty($calendar_ids)) {
-      $result = $this->rc->db->query(sprintf(
-        "SELECT * FROM " . $this->db_events . "
-         WHERE calendar_id IN (%s)
-         AND notifyat <= %s AND %s > %s",
-         join(',', $calendar_ids),
-         $this->rc->db->fromunixtime($time),
-         $this->rc->db->quote_identifier('end'),
-         $this->rc->db->fromunixtime($time)
-       ));
-
-      while ($result && ($event = $this->rc->db->fetch_assoc($result)))
-        $alarms[] = $this->_read_postprocess($event);
+
+    /**
+     * Get attachment properties
+     */
+    public function get_attachment($id, $event)
+    {
+        if (!empty($this->calendar_ids)) {
+            $result = $this->rc->db->query(
+                "SELECT `attachment_id` AS id, `filename` AS name, `mimetype`, `size` "
+                . " FROM `{$this->db_attachments}`"
+                . " WHERE `attachment_id` = ? AND `event_id` IN ("
+                    . "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']
+            );
+
+            if ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
+                return $arr;
+            }
+        }
     }
 
-    return $alarms;
-  }
-
-  /**
-   * Feedback after showing/sending an alarm notification
-   *
-   * @see calendar_driver::dismiss_alarm()
-   */
-  public function dismiss_alarm($event_id, $snooze = 0)
-  {
-    // set new notifyat time or unset if not snoozed
-    $notify_at = $snooze > 0 ? date(self::DB_DATE_FORMAT, time() + $snooze) : null;
-    
-    $query = $this->rc->db->query(sprintf(
-      "UPDATE " . $this->db_events . "
-       SET   changed=%s, notifyat=?
-       WHERE event_id=?
-       AND calendar_id IN (" . $this->calendar_ids . ")",
-        $this->rc->db->now()),
-      $notify_at,
-      $event_id
-    );
-    
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * Save an attachment related to the given event
-   */
-  private function add_attachment($attachment, $event_id)
-  {
-    $data = $attachment['data'] ? $attachment['data'] : file_get_contents($attachment['path']);
-    
-    $query = $this->rc->db->query(
-      "INSERT INTO " . $this->db_attachments .
-      " (event_id, filename, mimetype, size, data)" .
-      " VALUES (?, ?, ?, ?, ?)",
-      $event_id,
-      $attachment['name'],
-      $attachment['mimetype'],
-      strlen($data),
-      base64_encode($data)
-    );
-
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * Remove a specific attachment from the given event
-   */
-  private function remove_attachment($attachment_id, $event_id)
-  {
-    $query = $this->rc->db->query(
-      "DELETE FROM " . $this->db_attachments .
-      " WHERE attachment_id = ?" .
-        " AND event_id IN (SELECT event_id FROM " . $this->db_events .
-          " WHERE event_id = ?"  .
-            " AND calendar_id IN (" . $this->calendar_ids . "))",
-      $attachment_id,
-      $event_id
-    );
-
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * List attachments of specified event
-   */
-  public function list_attachments($event)
-  {
-    $attachments = array();
-
-    if (!empty($this->calendar_ids)) {
-      $result = $this->rc->db->query(
-        "SELECT attachment_id AS id, filename AS name, mimetype, size " .
-        " FROM " . $this->db_attachments .
-        " WHERE event_id IN (SELECT event_id FROM " . $this->db_events .
-          " WHERE event_id=?"  .
-            " AND calendar_id IN (" . $this->calendar_ids . "))".
-        " ORDER BY filename",
-        $event['recurrence_id'] ? $event['recurrence_id'] : $event['event_id']
-      );
-
-      while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
-        $attachments[] = $arr;
-      }
+    /**
+     * Get attachment body
+     */
+    public function get_attachment_body($id, $event)
+    {
+        if (!empty($this->calendar_ids)) {
+            $result = $this->rc->db->query(
+                "SELECT `data` FROM `{$this->db_attachments}`"
+                . " WHERE `attachment_id` = ? AND `event_id` IN ("
+                    . "SELECT `event_id` FROM `{$this->db_events}`"
+                    . " WHERE `event_id` = ? AND `calendar_id` IN ({$this->calendar_ids}))",
+                $id,
+                $event['id']
+            );
+
+            if ($arr = $this->rc->db->fetch_assoc($result)) {
+                return base64_decode($arr['data']);
+            }
+        }
     }
 
-    return $attachments;
-  }
-
-  /**
-   * Get attachment properties
-   */
-  public function get_attachment($id, $event)
-  {
-    if (!empty($this->calendar_ids)) {
-      $result = $this->rc->db->query(
-        "SELECT attachment_id AS id, filename AS name, mimetype, size " .
-        " FROM " . $this->db_attachments .
-        " WHERE attachment_id=?".
-          " AND event_id=?",
-        $id,
-        $event['recurrence_id'] ? $event['recurrence_id'] : $event['id']
-      );
-
-      if ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
-        return $arr;
-      }
+    /**
+     * Remove the given category
+     */
+    public function remove_category($name)
+    {
+        $query = $this->rc->db->query(
+            "UPDATE `{$this->db_events}` SET `categories` = ''"
+            . " WHERE `categories` = ? AND `calendar_id` IN ({$this->calendar_ids})",
+            $name
+        );
+
+        return $this->rc->db->affected_rows($query);
     }
 
-    return null;
-  }
-
-  /**
-   * Get attachment body
-   */
-  public function get_attachment_body($id, $event)
-  {
-    if (!empty($this->calendar_ids)) {
-      $result = $this->rc->db->query(
-        "SELECT data " .
-        " FROM " . $this->db_attachments .
-        " WHERE attachment_id=?".
-          " AND event_id=?",
-        $id,
-        $event['id']
-      );
-
-      if ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
-        return base64_decode($arr['data']);
-      }
+    /**
+     * Update/replace a category
+     */
+    public function replace_category($oldname, $name, $color)
+    {
+        $query = $this->rc->db->query(
+            "UPDATE `{$this->db_events}` SET `categories` = ?"
+            . " WHERE `categories` = ? AND `calendar_id` IN ({$this->calendar_ids})",
+            $name,
+            $oldname
+        );
+
+        return $this->rc->db->affected_rows($query);
     }
 
-    return null;
-  }
-
-  /**
-   * Remove the given category
-   */
-  public function remove_category($name)
-  {
-    $query = $this->rc->db->query(
-      "UPDATE " . $this->db_events . "
-       SET   categories=''
-       WHERE categories=?
-       AND   calendar_id IN (" . $this->calendar_ids . ")",
-      $name
-    );
-    
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * Update/replace a category
-   */
-  public function replace_category($oldname, $name, $color)
-  {
-    $query = $this->rc->db->query(
-      "UPDATE " . $this->db_events . "
-       SET   categories=?
-       WHERE categories=?
-       AND   calendar_id IN (" . $this->calendar_ids . ")",
-      $name,
-      $oldname
-    );
-    
-    return $this->rc->db->affected_rows($query);
-  }
-
-  /**
-   * Helper method to serialize the list of alarms into a string
-   */
-  private function serialize_alarms($valarms)
-  {
-      foreach ((array)$valarms as $i => $alarm) {
-          if ($alarm['trigger'] instanceof DateTime) {
-              $valarms[$i]['trigger'] = '@' . $alarm['trigger']->format('c');
-          }
-      }
-
-      return $valarms ? json_encode($valarms) : null;
-  }
-
-  /**
-   * Helper method to decode a serialized list of alarms
-   */
-  private function unserialize_alarms($alarms)
-  {
-      // decode json serialized alarms
-      if ($alarms && $alarms[0] == '[') {
-          $valarms = json_decode($alarms, true);
-          foreach ($valarms as $i => $alarm) {
-              if ($alarm['trigger'][0] == '@') {
-                  try {
-                      $valarms[$i]['trigger'] = new DateTime(substr($alarm['trigger'], 1));
-                  }
-                  catch (Exception $e) {
-                      unset($valarms[$i]);
-                  }
-              }
-          }
-      }
-      // convert legacy alarms data
-      else if (strlen($alarms)) {
-          list($trigger, $action) = explode(':', $alarms, 2);
-          if ($trigger = libcalendaring::parse_alarm_value($trigger)) {
-              $valarms = array(array('action' => $action, 'trigger' => $trigger[3] ?: $trigger[0]));
-          }
-      }
-
-      return $valarms;
-  }
-
-  /**
-   * Helper method to decode the attendees list from string
-   */
-  private function unserialize_attendees($s_attendees)
-  {
-    $attendees = array();
-
-    // decode json serialized string
-    if ($s_attendees[0] == '[') {
-      $attendees = json_decode($s_attendees, true);
+    /**
+     * Helper method to serialize the list of alarms into a string
+     */
+    private function serialize_alarms($valarms)
+    {
+        foreach ((array)$valarms as $i => $alarm) {
+            if ($alarm['trigger'] instanceof DateTime) {
+                $valarms[$i]['trigger'] = '@' . $alarm['trigger']->format('c');
+            }
+        }
+
+        return $valarms ? json_encode($valarms) : null;
     }
-    // decode the old serialization format
-    else {
-      foreach (explode("\n", $s_attendees) as $line) {
-        $att = array();
-        foreach (rcube_utils::explode_quoted_string(';', $line) as $prop) {
-          list($key, $value) = explode("=", $prop);
-          $att[strtolower($key)] = stripslashes(trim($value, '""'));
-        }
-        $attendees[] = $att;
-      }
+
+    /**
+     * Helper method to decode a serialized list of alarms
+     */
+    private function unserialize_alarms($alarms)
+    {
+        // decode json serialized alarms
+        if ($alarms && $alarms[0] == '[') {
+            $valarms = json_decode($alarms, true);
+            foreach ($valarms as $i => $alarm) {
+                if ($alarm['trigger'][0] == '@') {
+                    try {
+                        $valarms[$i]['trigger'] = new DateTime(substr($alarm['trigger'], 1));
+                    }
+                    catch (Exception $e) {
+                        unset($valarms[$i]);
+                    }
+                }
+            }
+        }
+        // convert legacy alarms data
+        else if (strlen($alarms)) {
+            list($trigger, $action) = explode(':', $alarms, 2);
+            if ($trigger = libcalendaring::parse_alarm_value($trigger)) {
+                $valarms = array(array('action' => $action, 'trigger' => $trigger[3] ?: $trigger[0]));
+            }
+        }
+
+        return $valarms;
     }
 
-    return $attendees;
-  }
-
-  /**
-   * Handler for user_delete plugin hook
-   */
-  public function user_delete($args)
-  {
-      $db = $this->rc->db;
-      $user = $args['user'];
-      $event_ids = array();
-
-      $events = $db->query(
-          "SELECT event_id FROM " . $this->db_events . " AS ev" .
-          " LEFT JOIN " . $this->db_calendars . " cal ON (ev.calendar_id = cal.calendar_id)".
-          " WHERE user_id=?",
-          $user->ID);
-
-      while ($row = $db->fetch_assoc($events)) {
-          $event_ids[] = $row['event_id'];
-      }
-
-      if (!empty($event_ids)) {
-          foreach (array($this->db_attachments, $this->db_events) as $table) {
-              $db->query(sprintf("DELETE FROM $table WHERE event_id IN (%s)", join(',', $event_ids)));
-          }
-      }
-
-      foreach (array($this->db_calendars, 'itipinvitations') as $table) {
-          $db->query("DELETE FROM $table WHERE user_id=?", $user->ID);
-      }
-  }
+    /**
+     * Helper method to decode the attendees list from string
+     */
+    private function unserialize_attendees($s_attendees)
+    {
+        $attendees = array();
 
+        // decode json serialized string
+        if ($s_attendees[0] == '[') {
+            $attendees = json_decode($s_attendees, true);
+        }
+        // decode the old serialization format
+        else {
+            foreach (explode("\n", $s_attendees) as $line) {
+                $att = array();
+                foreach (rcube_utils::explode_quoted_string(';', $line) as $prop) {
+                    list($key, $value) = explode("=", $prop);
+                    $att[strtolower($key)] = stripslashes(trim($value, '""'));
+                }
+                $attendees[] = $att;
+            }
+        }
+
+        return $attendees;
+    }
 }

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

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/kolab/SQL/mysql/2012080600.sql -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/kolab/SQL/mysql/2012080600.sql Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_calendar.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

@@ -342,6 +342,7 @@
         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'];
@@ -406,10 +407,12 @@
   }
 
   /**
+   * 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)
@@ -432,7 +435,7 @@
 
     // query Kolab storage
     $query[] = array('dtend',   '>=', $start);
-    
+
     if ($end)
       $query[] = array('dtstart', '<=', $end);
 
@@ -455,7 +458,7 @@
    * 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)
@@ -495,9 +498,9 @@
    * 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;
@@ -541,6 +544,7 @@
    * Delete an event record
    *
    * @see calendar_driver::remove_event()
+   *
    * @return boolean True on success, False on error
    */
   public function delete_event($event, $force = true)
@@ -549,9 +553,8 @@
 
     if (!$deleted) {
       rcube::raise_error(array(
-        'code' => 600, 'type' => 'php',
-        'file' => __FILE__, 'line' => __LINE__,
-        'message' => sprintf("Error deleting event object '%s' from Kolab server", $event['id'])),
+          'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+          'message' => sprintf("Error deleting event object '%s' from Kolab server", $event['id'])),
         true, false);
     }
 
@@ -562,18 +565,21 @@
    * Restore deleted event record
    *
    * @see calendar_driver::undelete_event()
+   *
    * @return boolean True on success, False on error
    */
   public function restore_event($event)
   {
-    if ($this->storage->undelete($event['id'])) {
+    // 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, 'type' => 'php',
-          'file' => __FILE__, 'line' => __LINE__,
-          'message' => "Error undeleting the event object $event[id] from the Kolab server"),
+          'code' => 600, 'file' => __FILE__, 'line' => __LINE__,
+          'message' => sprintf("Error undeleting the event object '%s' from the Kolab server", $event['id'])),
         true, false);
     }
 
@@ -613,7 +619,7 @@
   {
     $object = $event['_formatobj'];
     if (!$object) {
-      $rec = $this->storage->get_object($event['id']);
+      $rec    = $this->storage->get_object($event['uid'] ?: $event['id']);
       $object = $rec['_formatobj'];
     }
 
@@ -749,6 +755,9 @@
   {
     $record['calendar'] = $this->id;
 
+    // remove (possibly outdated) cached parameters
+    unset($record['_folder_id'], $record['className']);
+
     if ($links && !array_key_exists('links', $record)) {
       $record['links'] = $this->get_links($record['uid']);
     }
@@ -828,18 +837,23 @@
       $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 (is_array($event['exceptions'])) {
-      array_walk($event['exceptions'], function(&$exception) {
-        unset($exception['_mailbox'], $exception['_msguid'], $exception['_formatobj'], $exception['_attachments'],
-          $event['attachments'], $event['deleted_attachments'], $event['recurrence_id']);
+      array_walk($event['exceptions'], function(&$exception) use ($cleanup_fn) {
+        unset($exception['_mailbox'], $exception['_msguid'], $exception['_formatobj']);
+        $cleanup_fn($exception);
       });
     }
 
-    // remove some internal properties which should not be saved
-    unset($event['_savemode'], $event['_fromcalendar'], $event['_identity'], $event['_folder_id'],
-      $event['recurrence_id'], $event['attachments'], $event['deleted_attachments'], $event['className']);
-
     // copy meta data (starting with _) from old object
     foreach ((array)$old as $key => $val) {
       if (!isset($event[$key]) && $key[0] == '_')

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -91,18 +91,12 @@
 
     $this->calendars = array();
     foreach ($folders as $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);
-      }
-
+      $calendar = $this->_to_calendar($folder);
       if ($calendar->ready) {
         $this->calendars[$calendar->id] = $calendar;
-        if ($calendar->editable)
+        if ($calendar->editable) {
           $this->has_writeable = true;
+        }
       }
     }
 
@@ -110,6 +104,26 @@
   }
 
   /**
+   * 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);
+    }
+
+    return $calendar;
+  }
+
+  /**
    * Get a list of available calendars from this source
    *
    * @param integer $filter Bitmask defining filter criterias
@@ -129,17 +143,17 @@
       }
     }
 
-    $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
-    $folders = $this->filter_calendars($filter);
+    $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) {
-      $fullname = $cal->get_name();
-      $listname = $cal->get_foldername();
       $imap_path = explode($delim, $cal->name);
 
       // find parent
@@ -147,72 +161,60 @@
         array_pop($imap_path);
         $parent_id = kolab_storage::folder_id(join($delim, $imap_path));
       }
-      while (count($imap_path) > 1 && !$this->calendars[$parent_id]);
+      while (count($imap_path) > 1 && !in_array($parent_id, $parents));
 
       // restore "real" parent ID
-      if ($parent_id && !$this->calendars[$parent_id]) {
+      if ($parent_id && !in_array($parent_id, $parents)) {
           $parent_id = kolab_storage::folder_id($cal->get_parent());
       }
 
-      // turn a kolab_storage_folder object into a kolab_calendar
-      if ($cal instanceof kolab_storage_folder) {
-          $cal = new kolab_calendar($cal->name, $this->cal);
-          $this->calendars[$cal->id] = $cal;
-      }
+      $parents[] = $cal->id;
 
-      // special handling for user or virtual folders
-      if ($cal instanceof kolab_storage_folder_user) {
+      if ($cal->virtual) {
         $calendars[$cal->id] = array(
           'id'       => $cal->id,
-          'name'     => $fullname,
-          'listname' => $listname,
-          'editname' => $cal->get_foldername(),
-          'color'    => $cal->get_color(),
-          'active'   => $cal->is_active(),
-          'title'    => $cal->get_owner(),
-          'owner'    => $cal->get_owner(),
-          'history'  => false,
-          'virtual'  => false,
-          'editable' => false,
-          'group'     => 'other',
-          'class'     => 'user',
-          'removable' => true,
-        );
-      }
-      else if ($cal->virtual) {
-        $calendars[$cal->id] = array(
-          'id' => $cal->id,
-          'name' => $fullname,
-          'listname' => $listname,
+          'name'     => $cal->get_name(),
+          'listname' => $cal->get_foldername(),
           'editname' => $cal->get_foldername(),
           'virtual'  => true,
           'editable' => false,
-          'group'     => $cal->get_namespace(),
-          'class'     => 'folder',
+          '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'     => $fullname,
-          'listname' => $listname,
-          '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'    => $cal->get_namespace(),
-          'default'  => $cal->default,
-          'active'   => $cal->is_active(),
-          'owner'    => $cal->get_owner(),
-          'children' => true,  // TODO: determine if that folder indeed has child folders
-          'parent'   => $parent_id,
-          'subtype'  => $cal->subtype,
-          'caldavurl' => $cal->get_caldav_url(),
+          '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] += 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) {
@@ -224,7 +226,6 @@
     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);
-        $this->calendars[$cal->id] = $cal;
         if (!($filter & self::FILTER_ACTIVE) || $cal->is_active()) {
           $calendars[$id] = array(
             'id'       => $cal->id,
@@ -268,7 +269,7 @@
           'active'     => (bool)$prefs[$id]['active'],
           'showalarms' => (bool)$this->rc->config->get('calendar_birthdays_alarm_type'),
           'group'      => 'x-birthdays',
-          'editable'  => false,
+          'editable'   => false,
           'default'    => false,
           'children'   => false,
           'history'    => false,
@@ -337,11 +338,11 @@
     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)
@@ -351,9 +352,10 @@
     // create calendar object if necesary
     if (!$this->calendars[$id]) {
       if (in_array($id, array(self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
-        $this->calendars[$id] = new kolab_invitation_calendar($id, $this->cal);
+        return new kolab_invitation_calendar($id, $this->cal);
       }
-      else if ($id !== self::BIRTHDAY_CALENDAR_ID) {
+      // 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;
@@ -370,13 +372,15 @@
    * @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['type']       = 'event';
+    $prop['active']     = true;
     $prop['subscribed'] = true;
+
     $folder = kolab_storage::folder_update($prop);
 
     if ($folder === false) {
@@ -775,21 +779,26 @@
    */
   public function remove_event($event, $force = true)
   {
-    $ret = true;
-    $success = false;
+    $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;
+    }
+
     if (($storage = $this->get_calendar($event['calendar'])) && ($event = $storage->get_event($event['id']))) {
       $event['_savemode'] = $savemode;
       $savemode = 'all';
-      $master = $event;
-
-      $this->rc->session->remove('calendar_restore_event_data');
+      $master   = $event;
 
       // read master if deleting a recurring event
       if ($event['recurrence'] || $event['recurrence_id'] || $event['isexception']) {
-        $master = $storage->get_event($event['uid']);
+        $master   = $storage->get_event($event['uid']);
         $savemode = $event['_savemode'] ?: ($event['_instance'] || $event['isexception'] ? 'current' : 'all');
 
         // force 'current' mode for single occurrences stored as exception
@@ -817,23 +826,8 @@
         case 'current':
           $_SESSION['calendar_restore_event_data'] = $master;
 
-          // removing the first instance => just move to next occurence
-          if ($master['recurrence'] && $event['_instance'] == libcalendaring::recurrence_instance_identifier($master)) {
-            $recurring = reset($storage->get_recurring_events($event, $event['start'], null, $event['id'] . '-1', 1));
-
-            // no future instances found: delete the master event (bug #1677)
-            if (!$recurring['start']) {
-              $success = $storage->delete_event($master, $force);
-              break;
-            }
-
-            $master['start'] = $recurring['start'];
-            $master['end'] = $recurring['end'];
-            if ($master['recurrence']['COUNT'])
-              $master['recurrence']['COUNT']--;
-          }
           // remove the matching RDATE entry
-          else if ($master['recurrence']['RDATE']) {
+          if ($master['recurrence']['RDATE']) {
             foreach ($master['recurrence']['RDATE'] as $j => $rdate) {
               if ($rdate->format('Ymd') == $event['start']->format('Ymd')) {
                 unset($master['recurrence']['RDATE'][$j]);
@@ -841,9 +835,10 @@
               }
             }
           }
-          else {  // add exception to master event
-            $master['recurrence']['EXDATE'][] = $event['start'];
-          }
+
+          // add exception to master event
+          $master['recurrence']['EXDATE'][] = $event['start'];
+
           $success = $storage->update_event($master);
           break;
 
@@ -851,7 +846,7 @@
           $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'));
@@ -881,10 +876,10 @@
           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['exceptions']   = $master['exceptions'];
             $newmaster['_attachments'] = $master['_attachments'];
-            $newmaster['_mailbox'] = $master['_mailbox'];
-            $newmaster['_msguid'] = $master['_msguid'];
+            $newmaster['_mailbox']     = $master['_mailbox'];
+            $newmaster['_msguid']      = $master['_msguid'];
 
             $success = $storage->update_event($newmaster);
           }
@@ -901,8 +896,18 @@
       }
     }
 
+    if ($success && !$force) {
+      if ($master['_folder_id'])
+        $sess_data['_folder_id'] = $master['_folder_id'];
+      $_SESSION['calendar_event_undo'] = array('ts' => time(), 'data' => $sess_data);
+    }
+
     if ($success && $this->freebusy_trigger)
-      $this->rc->output->command('plugin.ping_url', array('action' => 'calendar/push-freebusy', 'source' => $storage->id));
+      $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;
   }
@@ -911,20 +916,26 @@
    * Restore a single deleted event
    *
    * @param array Hash array with event properties:
-   *      id: Event identifier
+   *                    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($_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', 'source' => $storage->id));
-      
+        $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;
     }

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

@@ -176,16 +176,31 @@
     $event = $this->cal->driver->get_event($id, calendar_driver::FILTER_WRITEABLE);
 
     if (is_array($event)) {
-      // add pointer to original calendar folder
-      $event['_folder_id'] = $event['calendar'];
-      $event = $this->_mod_event($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 ($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);
+      }
+    }
+  }
+
+  /**
    * Get attachment body
+   *
    * @see calendar_driver::get_attachment_body()
    */
   public function get_attachment_body($id, $event)
@@ -212,11 +227,12 @@
   }
 
   /**
-   * @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 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())
@@ -251,7 +267,7 @@
         }
 
         if ($match) {
-          $events[$event['id'] ?: $event['uid']] = $this->_mod_event($event);
+          $events[$event['id'] ?: $event['uid']] = $this->_mod_event($event, $cal->id);
         }
       }
 
@@ -263,12 +279,15 @@
   }
 
   /**
+   * 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
    *
-   * @param  integer Date range start (unix timestamp)
-   * @param  integer Date range end (unix timestamp)
    * @return integer Count
    */
-  public function count_events($start, $end = null)
+  public function count_events($start, $end = null, $filter = null)
   {
     // get email addresses of the current user
     $user_emails = $this->cal->get_user_emails();
@@ -309,7 +328,7 @@
   /**
    * Helper method to modify some event properties
    */
-  private function _mod_event($event)
+  private function _mod_event($event, $calendar_id = null)
   {
     // set classes according to PARTSTAT
     $event = kolab_driver::add_partstat_class($event, $this->partstats);
@@ -318,15 +337,18 @@
       $event['calendar'] = $this->id;
     }
 
+    // add pointer to original calendar folder
+    if ($calendar_id) {
+      $event['_folder_id'] = $calendar_id;
+    }
+
     return $event;
   }
 
   /**
    * Create a new event record
    *
-   * @see calendar_driver::new_event()
-   * 
-   * @return mixed The created record ID on success, False on error
+   * @see kolab_calendar::insert_event()
    */
   public function insert_event($event)
   {
@@ -336,8 +358,7 @@
   /**
    * Update a specific event record
    *
-   * @see calendar_driver::new_event()
-   * @return boolean True on success, False on error
+   * @see kolab_calendar::update_event()
    */
   public function update_event($event, $exception_id = null)
   {
@@ -355,22 +376,36 @@
   /**
    * Delete an event record
    *
-   * @see calendar_driver::remove_event()
-   * @return boolean True on success, False on error
+   * @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);
+      }
+    }
+
     return false;
   }
 
   /**
    * Restore deleted event record
    *
-   * @see calendar_driver::undelete_event()
-   * @return boolean True on success, False on error
+   * @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);
+      }
+    }
+
     return false;
   }
 }

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_user_calendar.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_user_calendar.php Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/ldap/resources_driver_ldap.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/ldap/resources_driver_ldap.php Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/drivers/resources_driver.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/drivers/resources_driver.php Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/importexport.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/importexport.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/index.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/index.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/invitations.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/invitations.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/settings.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/settings.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/sharing.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/pl_PL/LC_MESSAGES/sharing.po Changed

@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Aleksander Machniak <alec@alec.pl>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Kolab Documentation\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-11-26 23:28+0100\n"
-"PO-Revision-Date: 2014-11-27 23:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Polish (http://www.transifex.com/kolab/kolab-documentation/language/pl/)\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Aleksander Machniak <alec@alec.pl>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/kolab/kolab-documentation/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
+"Language: pl_PL\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
-msgstr ""
+msgstr "Współdzielenie kalendarza"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:13
 msgid ""

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/importexport.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/importexport.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/index.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/index.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/invitations.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/invitations.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/manage.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/manage.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/overview.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/overview.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/settings.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/settings.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/sharing.po -> iRony-0.4.3.tar.gz/lib/plugins/calendar/helpdocs/locale/sv_SE/LC_MESSAGES/sharing.po Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/lib/calendar_ui.php -> iRony-0.4.3.tar.gz/lib/plugins/calendar/lib/calendar_ui.php Changed

@@ -571,7 +571,7 @@
       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'));
+    $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'),
@@ -583,11 +583,11 @@
       ),
       array(0,'1','2','3','6','12','custom'));
 
-    $startdate = new html_inputfield(array('name' => 'start', 'size' => 11, 'id' => 'event-export-startdate'));
+    $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', $select->show(0) . html::span(array('style'=>'display:none'), $startdate->show())));
+        . 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',

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/bg_BG.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/bg_BG.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/ca_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/ca_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/cs_CZ.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/cs_CZ.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/da_DK.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/da_DK.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/de.inc Added

@@ -0,0 +1,268 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['default_view'] = 'Standardansicht';
+$labels['time_format'] = 'Zeitformatierung';
+$labels['timeslots'] = 'Zeitfenster pro Stunde';
+$labels['first_day'] = 'Erster Wochentag';
+$labels['first_hour'] = 'Erste angezeigte Stunde';
+$labels['workinghours'] = 'Arbeitszeiten';
+$labels['add_category'] = 'Kategorie hinzufügen';
+$labels['remove_category'] = 'Kategorie entfernen';
+$labels['defaultcalendar'] = 'Neue Termine erstellen in';
+$labels['eventcoloring'] = 'Färbung der Termine';
+$labels['coloringmode0'] = 'Farbe des Kalenders';
+$labels['coloringmode1'] = 'Farbe der Kategorie';
+$labels['coloringmode2'] = 'Kalenderfarbe außen, Kategoriefarbe innen';
+$labels['coloringmode3'] = 'Kategoriefarbe außen, Kalenderfarbe innen';
+$labels['afternothing'] = 'nichts unternehmen';
+$labels['aftertrash'] = 'In den Papierkorb verschieben';
+$labels['afterdelete'] = 'Nachricht löschen';
+$labels['afterflagdeleted'] = 'Als gelöscht markieren';
+$labels['aftermoveto'] = 'Verschiebe nach...';
+$labels['itipoptions'] = 'Veranstaltungseinladungen';
+$labels['afteraction'] = 'Nachdem eine Einladungs- oder Aktualisierungsnachricht verarbeitet wurde';
+$labels['weeknonone'] = 'nie';
+$labels['calendar'] = 'Kalender';
+$labels['calendars'] = 'Kalender';
+$labels['category'] = 'Kategorie';
+$labels['categories'] = 'Kategorien';
+$labels['createcalendar'] = 'Neuen Kalender erstellen';
+$labels['name'] = 'Name';
+$labels['color'] = 'Farbe';
+$labels['day'] = 'Tag';
+$labels['week'] = 'Woche';
+$labels['month'] = 'Monat';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Neu';
+$labels['new_event'] = 'Neuer Termin';
+$labels['edit_event'] = 'Termin bearbeiten';
+$labels['edit'] = 'Bearbeiten';
+$labels['save'] = 'Speichern';
+$labels['removelist'] = 'Von der Liste entfernen';
+$labels['cancel'] = 'Abbrechen';
+$labels['select'] = 'Auswählen';
+$labels['print'] = 'Drucken';
+$labels['printtitle'] = 'Kalender drucken';
+$labels['title'] = 'Titel';
+$labels['description'] = 'Beschreibung';
+$labels['all-day'] = 'ganztägig';
+$labels['export'] = 'Exportieren';
+$labels['exporttitle'] = 'Kalender als iCalendar exportieren';
+$labels['exportrange'] = 'Termine ab';
+$labels['exportattachments'] = 'Mit Anhängen';
+$labels['customdate'] = 'Benutzerdefiniertes Datum';
+$labels['location'] = 'Ort';
+$labels['url'] = 'Internetadresse';
+$labels['date'] = 'Datum';
+$labels['start'] = 'Beginn';
+$labels['starttime'] = 'Startzeit';
+$labels['end'] = 'Ende';
+$labels['endtime'] = 'Endzeit';
+$labels['repeat'] = 'Wiederholung';
+$labels['selectdate'] = 'Datum auswählen';
+$labels['freebusy'] = 'Mich anzeigen als';
+$labels['free'] = 'Frei';
+$labels['busy'] = 'Gebucht';
+$labels['outofoffice'] = 'Abwesend';
+$labels['tentative'] = 'Mit Vorbehalt';
+$labels['mystatus'] = 'Mein Status';
+$labels['status'] = 'Status';
+$labels['status-confirmed'] = 'Bestätigt';
+$labels['status-cancelled'] = 'Abgesagt';
+$labels['status-tentative'] = 'Mit Vorbehalt';
+$labels['priority'] = 'Priorität';
+$labels['sensitivity'] = 'Sichtbarkeit';
+$labels['public'] = 'öffentlich';
+$labels['private'] = 'privat';
+$labels['confidential'] = 'vertraulich';
+$labels['links'] = 'Referenz';
+$labels['alarms'] = 'Erinnerung';
+$labels['comment'] = 'Kommentar';
+$labels['created'] = 'Erstellt';
+$labels['changed'] = 'Geändert';
+$labels['unknown'] = 'Unbekannt';
+$labels['eventoptions'] = 'Optionen';
+$labels['generated'] = 'erstellt am';
+$labels['eventhistory'] = 'Historie';
+$labels['removelink'] = 'E-Mail-Referenz entfernen';
+$labels['printdescriptions'] = 'Beschreibung drucken';
+$labels['parentcalendar'] = 'Erstellen in';
+$labels['searchearlierdates'] = '« Frühere Termine suchen';
+$labels['searchlaterdates'] = 'Spätere Termine suchen »';
+$labels['laterevents'] = 'Später';
+$labels['andnmore'] = '$nr weitere …';
+$labels['togglerole'] = 'Zum Ändern der Rolle klicken';
+$labels['createfrommail'] = 'Als Termin speichern';
+$labels['importevents'] = 'Termine importieren';
+$labels['importrange'] = 'Termine ab';
+$labels['onemonthback'] = '1 Monat zurück';
+$labels['nmonthsback'] = '$nr Monate zurück';
+$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['findcalendars'] = 'Kalender finden …';
+$labels['searchterms'] = 'Suchbegriffe';
+$labels['calsearchresults'] = 'Verfügbare Kalender';
+$labels['calendarsubscribe'] = 'Permanent anzeigen';
+$labels['nocalendarsfound'] = 'Keine Kalender gefunden';
+$labels['nrcalendarsfound'] = '$nr Kalender gefunden';
+$labels['quickview'] = 'Nur diesen Kalender anzeigen';
+$labels['invitationspending'] = 'Ausstehende Einladungen';
+$labels['invitationsdeclined'] = 'Abgelehnte Einladungen';
+$labels['changepartstat'] = 'Teilnehmerstatus ändern';
+$labels['rsvpcomment'] = 'Einladungstext';
+$labels['listrange'] = 'Angezeigter Bereich:';
+$labels['listsections'] = 'Unterteilung:';
+$labels['smartsections'] = 'Intelligent';
+$labels['until'] = 'bis';
+$labels['today'] = 'Heute';
+$labels['tomorrow'] = 'Morgen';
+$labels['thisweek'] = 'Diese Woche';
+$labels['nextweek'] = 'Nächste Woche';
+$labels['prevweek'] = 'Vorige Woche';
+$labels['thismonth'] = 'Diesen Monat';
+$labels['nextmonth'] = 'Nächsten Monat';
+$labels['weekofyear'] = 'Woche';
+$labels['pastevents'] = 'Vergangene';
+$labels['futureevents'] = 'Zukünftige';
+$labels['showalarms'] = 'Erinnerungen anzeigen';
+$labels['defaultalarmtype'] = 'Standard-Erinnerungseinstellung';
+$labels['defaultalarmoffset'] = 'Standard-Erinnerungszeit';
+$labels['attendee'] = 'Teilnehmer';
+$labels['role'] = 'Rolle';
+$labels['availability'] = 'Verfüg.';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Hinzufügen';
+$labels['roleorganizer'] = 'Organisator';
+$labels['rolerequired'] = 'Erforderlich';
+$labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Vorsitz';
+$labels['rolenonparticipant'] = 'Abwesend';
+$labels['cutypeindividual'] = 'Person';
+$labels['cutypegroup'] = 'Gruppe';
+$labels['cutyperesource'] = 'Ressource';
+$labels['cutyperoom'] = 'Raum';
+$labels['availfree'] = 'Frei';
+$labels['availbusy'] = 'Gebucht';
+$labels['availunknown'] = 'Unbekannt';
+$labels['availtentative'] = 'Mit Vorbehalt';
+$labels['availoutofoffice'] = 'Abwesend';
+$labels['scheduletime'] = 'Verfügbarkeit anzeigen';
+$labels['sendinvitations'] = 'Einladungen versenden';
+$labels['sendnotifications'] = 'Teilnehmer über die Änderungen informieren';
+$labels['sendcancellation'] = 'Teilnehmer über die Terminabsage informieren';
+$labels['onlyworkinghours'] = 'Verfügbarkeit innerhalb meiner Arbeitszeiten suchen';
+$labels['reqallattendees'] = 'Erforderliche/alle Teilnehmer';
+$labels['prevslot'] = 'Vorheriger Vorschlag';
+$labels['nextslot'] = 'Nächster Vorschlag';
+$labels['suggestedslot'] = 'Empfohlener Slot';
+$labels['noslotfound'] = 'Es konnten keine freien Zeiten gefunden werden';
+$labels['invitationsubject'] = 'Sie wurden zu »$title« eingeladen';
+$labels['invitationmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\n\$description\n\nIm Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
+$labels['invitationattendlinks'] = "Falls Ihr E-Mail-Programm keine iTip-Anfragen unterstützt, können Sie den folgenden Link verwenden, um den Termin zu bestätigen oder abzulehnen:\n\$url";
+$labels['eventupdatesubject'] = '»$title« wurde aktualisiert';
+$labels['eventupdatesubjectempty'] = 'Termin wurde aktualisiert';
+$labels['eventupdatemailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nIm Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
+$labels['eventcancelsubject'] = '»$title« wurde abgesagt';
+$labels['eventcancelmailbody'] = "*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees\n\nDer Termin wurde von \$organizer abgesagt.\n\nIm Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
+$labels['itipobjectnotfound'] = 'Der Termin auf den sich diese Nachricht bezieht, wurde in Ihrem Kalender nicht gefunden.';
+$labels['itipmailbodyaccepted'] = "\$sender hat die Einladung zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender hat die Einladung zum folgenden Termin abgelehnt:\n\n*\$title*\n\nWann: \$date\n\nTeilnehmer: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender hat Ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:\n\n*\$title*\n\nWann: \$date";
+$labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat die Teilnahme an folgendem Event an Sie delegiert:\n\n*\$title*\n\nWann: \$date";
+$labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
+$labels['declinedeleteconfirm'] = 'Soll der abgelehnte Termin zusätzlich aus dem Kalender gelöscht werden?';
+$labels['itipcomment'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';
+$labels['itipcommenttitle'] = 'Dieser Kommentar wird an die Einladungs-/Benachrichtigungsnachricht angehängt, die an die Teilnehmer verschickt wird';
+$labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
+$labels['eventcancelled'] = 'Der Termin wurde vom Organisator abgesagt';
+$labels['saveincalendar'] = 'speichern in';
+$labels['updatemycopy'] = 'In meinem Kalender aktualisieren';
+$labels['savetocalendar'] = 'In Kalender übernehmen';
+$labels['openpreview'] = 'Kalender überprüfen';
+$labels['noearlierevents'] = 'Keine früheren Ereignisse';
+$labels['nolaterevents'] = 'Keine späteren Ereignisse';
+$labels['resource'] = 'Ressource';
+$labels['addresource'] = 'Ressource buchen';
+$labels['findresources'] = 'Ressourcen finden';
+$labels['resourcedetails'] = 'Details';
+$labels['resourceavailability'] = 'Verfügbarkeit';
+$labels['resourceowner'] = 'Eigentümer';
+$labels['resourceadded'] = 'Diese Ressource wurde Ihrem Termin hinzugefügt';
+$labels['tabsummary'] = 'Übersicht';
+$labels['tabrecurrence'] = 'Wiederholung';
+$labels['tabattendees'] = 'Teilnehmer';
+$labels['tabresources'] = 'Ressourcen';
+$labels['tabattachments'] = 'Anhänge';
+$labels['tabsharing'] = 'Freigabe';
+$labels['deleteobjectconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
+$labels['deleteventconfirm'] = 'Möchten Sie diesen Termin wirklich löschen?';
+$labels['deletecalendarconfirm'] = 'Möchten Sie diesen Kalender mit allen Terminen wirklich löschen?';
+$labels['deletecalendarconfirmrecursive'] = 'Soll dieser Kalender wirklich mit allen Terminen und Unterkalendern gelöscht werden?';
+$labels['savingdata'] = 'Daten werden gespeichert …';
+$labels['errorsaving'] = 'Fehler beim Speichern.';
+$labels['operationfailed'] = 'Die Aktion ist fehlgeschlagen.';
+$labels['invalideventdates'] = 'Ungültige Daten eingegeben! Bitte überprüfen Sie die Eingaben.';
+$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.';
+$labels['successrestore'] = 'Der Termin wurde erfolgreich wieder hergestellt.';
+$labels['errornotifying'] = 'Benachrichtigung an die Teilnehmer konnten nicht gesendet werden';
+$labels['errorimportingevent'] = 'Fehler beim Importieren';
+$labels['importwarningexists'] = 'Eine Kopie dieses Termins existiert bereits in Ihrem Kalender.';
+$labels['newerversionexists'] = 'Eine neuere Version dieses Termins exisitert bereits! Import abgebrochen.';
+$labels['nowritecalendarfound'] = 'Kein Kalender zum Speichern gefunden';
+$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['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.';
+$labels['sentresponseto'] = 'Antwort auf diese Einladung erfolgreich an $mailto gesendet';
+$labels['localchangeswarning'] = 'Die auszuführenden Änderungen werden sich nur auf den persönlichen Kalender auswirken und nicht an den Organisator des Termins weitergeleitet.';
+$labels['importsuccess'] = 'Es wurden $nr Termine erfolgreich importiert';
+$labels['importnone'] = 'Keine Termine zum Importieren gefunden';
+$labels['importerror'] = 'Fehler beim Importieren';
+$labels['aclnorights'] = 'Der Zugriff auf diesen Kalender erfordert Administrator-Rechte.';
+$labels['changeeventconfirm'] = 'Termin ändern';
+$labels['removeeventconfirm'] = 'Termin löschen';
+$labels['changerecurringeventwarning'] = 'Dies ist eine Terminreihe. Möchten Sie nur den aktuellen, diesen und alle zukünftigen oder alle Termine bearbeiten oder die Änderungen als neuen Termin speichern?';
+$labels['removerecurringeventwarning'] = 'Dies ist ein wiederkehrender Termin. Wollen Sie nur diesen Termin bearbeiten oder alle zukünftigen Vorkommen? Alternativ können auch alle Vorkommen bearbeitet werden.';
+$labels['removerecurringallonly'] = 'Dieses ist ein wiederkehrender Termin. Als ein Teilnehmer können Sie nur den gesamten Termin inklusive aller Wiederholungen löschen.';
+$labels['currentevent'] = 'Aktuellen';
+$labels['futurevents'] = 'Zukünftige';
+$labels['allevents'] = 'Alle';
+$labels['saveasnew'] = 'Als neu speichern';
+$labels['birthdays'] = 'Geburtstage';
+$labels['birthdayscalendar'] = 'Geburtstagskalender';
+$labels['displaybirthdayscalendar'] = 'Geburtstagskalender anzeigen';
+$labels['birthdayscalendarsources'] = 'Für diese Adressbücher';
+$labels['birthdayeventtitle'] = '$names Geburtstag';
+$labels['birthdayage'] = 'Alter $age';
+$labels['objectchangelog'] = 'Änderungsverlauf';
+$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
+$labels['objectnotfound'] = 'Termindaten sind leider nicht vergübar';
+$labels['objectchangelognotavailable'] = 'Änderungshistorie ist nicht verfügbar für diesen Termin';
+$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
+$labels['revisionrestoreconfirm'] = 'Wollen Sie wirklich die Version $rev dieses Termins wiederherstellen? Diese Aktion wird die aktuelle Kopie mit der älteren Version ersetzen.';
+$labels['objectrestoresuccess'] = 'Revision $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Revision';
+$labels['arialabelminical'] = 'Kalender Datumswahl';
+$labels['arialabelcalendarview'] = 'Kalender Ansicht';
+$labels['arialabelsearchform'] = 'Suchformular für Termine';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe für Termine';
+$labels['arialabelcalsearchform'] = 'Suchformular für Kalender';
+$labels['calendaractions'] = 'Kalenderaktionen';
+$labels['arialabeleventattendees'] = 'Teilehmerliste';
+$labels['arialabeleventresources'] = 'Liste der Terminressourcen';
+$labels['arialabelresourcesearchform'] = 'Suchformular für Ressourcen';
+$labels['arialabelresourceselection'] = 'Verfügbare Ressourcen';
+?>

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/de_CH.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/de_CH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/de_DE.inc Changed

@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
 $labels['default_view'] = 'Standardansicht';
 $labels['time_format'] = 'Zeitformatierung';
 $labels['timeslots'] = 'Zeitfenster pro Stunde';
@@ -26,7 +33,6 @@
 $labels['category'] = 'Kategorie';
 $labels['categories'] = 'Kategorien';
 $labels['createcalendar'] = 'Neuen Kalender erstellen';
-$labels['editcalendar'] = 'Kalendereigenschaften bearbeiten';
 $labels['name'] = 'Name';
 $labels['color'] = 'Farbe';
 $labels['day'] = 'Tag';
@@ -158,73 +164,47 @@
 $labels['suggestedslot'] = 'Empfohlener Slot';
 $labels['noslotfound'] = 'Es konnten keine freien Zeiten gefunden werden';
 $labels['invitationsubject'] = 'Sie wurden zu »$title« eingeladen';
-$labels['invitationmailbody'] = '*$title*
-
+$labels['invitationmailbody'] = "*$title*
 Wann: $date
-
 Teilnehmer: $attendees
-
 $description
-
-Im Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.';
-$labels['invitationattendlinks'] = 'Falls Ihr E-Mail-Programm keine iTip-Anfragen unterstützt, können Sie den folgenden Link verwenden, um den Termin zu bestätigen oder abzulehnen:
-$url';
+Im Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
+$labels['invitationattendlinks'] = "Falls Ihr E-Mail-Programm keine iTip-Anfragen unterstützt, können Sie den folgenden Link verwenden, um den Termin zu bestätigen oder abzulehnen:
+$url";
 $labels['eventupdatesubject'] = '»$title« wurde aktualisiert';
 $labels['eventupdatesubjectempty'] = 'Termin wurde aktualisiert';
-$labels['eventupdatemailbody'] = '*$title*
-
+$labels['eventupdatemailbody'] = "*$title*
 Wann: $date
-
 Teilnehmer: $attendees
-
-Im Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.';
+Im Anhang finden Sie eine iCalendar-Datei mit den aktualisiereten Termindaten. Diese können Sie in Ihre Kalenderanwendung importieren.";
 $labels['eventcancelsubject'] = '»$title« wurde abgesagt';
-$labels['eventcancelmailbody'] = '*$title*
-
+$labels['eventcancelmailbody'] = "*$title*
 Wann: $date
-
 Teilnehmer: $attendees
-
 Der Termin wurde von $organizer abgesagt.
-
-Im Anhang finden Sie eine iCalendar-Datei mit den Termindaten.';
+Im Anhang finden Sie eine iCalendar-Datei mit den Termindaten.";
 $labels['itipobjectnotfound'] = 'Der Termin auf den sich diese Nachricht bezieht, wurde in Ihrem Kalender nicht gefunden.';
-$labels['itipmailbodyaccepted'] = '$sender hat die Einladung zum folgenden Termin angenommen:
-
+$labels['itipmailbodyaccepted'] = "$sender hat die Einladung zum folgenden Termin angenommen:
 *$title*
-
 Wann: $date
-
-Teilnehmer: $attendees';
-$labels['itipmailbodytentative'] = '$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:
-
+Teilnehmer: $attendees";
+$labels['itipmailbodytentative'] = "$sender hat die Einladung mit Vorbehalt zum folgenden Termin angenommen:
 *$title*
-
 Wann: $date
-
-Teilnehmer: $attendees';
-$labels['itipmailbodydeclined'] = '$sender hat die Einladung zum folgenden Termin abgelehnt:
-
+Teilnehmer: $attendees";
+$labels['itipmailbodydeclined'] = "$sender hat die Einladung zum folgenden Termin abgelehnt:
 *$title*
-
 Wann: $date
-
-Teilnehmer: $attendees';
-$labels['itipmailbodycancel'] = '$sender hat Ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:
-
+Teilnehmer: $attendees";
+$labels['itipmailbodycancel'] = "$sender hat Ihre Teilnahme bei der folgenden Veranstaltung zurückgewiesen:
 *$title*
-
-Wann: $date';
-$labels['itipmailbodydelegated'] = '$sender hat die Teilnahme an folgendem Event delegiert:
-
+Wann: $date";
+$labels['itipmailbodydelegated'] = "$sender hat die Teilnahme an folgendem Event delegiert:
 *$title*
-
-When: $date';
-$labels['itipmailbodydelegatedto'] = '$sender hat die Teilnahme an folgendem Event an Sie delegiert:
-
+When: $date";
+$labels['itipmailbodydelegatedto'] = "$sender hat die Teilnahme an folgendem Event an Sie delegiert:
 *$title*
-
-Wann: $date';
+Wann: $date";
 $labels['itipdeclineevent'] = 'Möchten Sie die Einladung zu diesem Termin ablehnen?';
 $labels['declinedeleteconfirm'] = 'Soll der abgelehnte Termin zusätzlich aus dem Kalender gelöscht werden?';
 $labels['itipcomment'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';
@@ -312,3 +292,4 @@
 $labels['arialabeleventresources'] = 'Liste der Terminressourcen';
 $labels['arialabelresourcesearchform'] = 'Suchformular für Ressourcen';
 $labels['arialabelresourceselection'] = 'Verfügbare Ressourcen';
+?>

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/el.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/el.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/es_AR.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/es_AR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/es_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/es_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/et_EE.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/et_EE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/fi_FI.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/fi_FI.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/fr_FR.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/fr_FR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/hu_HU.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/hu_HU.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/it_IT.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/it_IT.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/ja_JP.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/ja_JP.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/ko_KR.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/ko_KR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/lv.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/lv.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/nl_NL.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/nl_NL.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/pl.inc Added

@@ -0,0 +1,267 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['default_view'] = 'Domyślny widok';
+$labels['time_format'] = 'Format czasu';
+$labels['timeslots'] = 'Przedziały czasowe w ciągu godziny';
+$labels['first_day'] = 'Pierwszy dzień tygodnia';
+$labels['first_hour'] = 'Pierwsza godzina';
+$labels['workinghours'] = 'Godziny robocze';
+$labels['add_category'] = 'Dodaj kategorię';
+$labels['remove_category'] = 'Usuń kategorię';
+$labels['defaultcalendar'] = 'Twórz nowe zdarzenia w';
+$labels['eventcoloring'] = 'Kolor zdarzenia';
+$labels['coloringmode0'] = 'Zgodnie z kalendarzem';
+$labels['coloringmode1'] = 'Zgodnie z kategorią';
+$labels['coloringmode2'] = 'Kalendarz dla obramowania, kategoria dla środka';
+$labels['coloringmode3'] = 'Kategoria dla obramowania, kalendarz dla środka';
+$labels['afternothing'] = 'Nie rób nic';
+$labels['aftertrash'] = 'Przenieś do Kosza';
+$labels['afterdelete'] = 'Usuń wiadomość';
+$labels['afterflagdeleted'] = 'Oznacz jako usunięta';
+$labels['aftermoveto'] = 'Przenieś do...';
+$labels['itipoptions'] = 'Zaproszenia';
+$labels['afteraction'] = 'Wiadomość jest przetwarzana po zaproszeniu lub aktualizacji';
+$labels['calendar'] = 'Kalendarz';
+$labels['calendars'] = 'Kalendarze';
+$labels['category'] = 'Kategoria';
+$labels['categories'] = 'Kategorie';
+$labels['createcalendar'] = 'Utwórz nowy kalendarz';
+$labels['name'] = 'Nazwa';
+$labels['color'] = 'Kolor';
+$labels['day'] = 'Dzień';
+$labels['week'] = 'Tydzień';
+$labels['month'] = 'Miesiąc';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Nowy';
+$labels['new_event'] = 'Nowe zdarzenie';
+$labels['edit_event'] = 'Edytuj zdarzenie';
+$labels['edit'] = 'Edytuj';
+$labels['save'] = 'Zapisz';
+$labels['removelist'] = 'Usuń z listy';
+$labels['cancel'] = 'Anuluj';
+$labels['select'] = 'Wybierz';
+$labels['print'] = 'Drukuj';
+$labels['printtitle'] = 'Drukuj kalendarze';
+$labels['title'] = 'Podsumowanie';
+$labels['description'] = 'Opis';
+$labels['all-day'] = 'cały dzień';
+$labels['export'] = 'Eksport';
+$labels['exporttitle'] = 'Eksport w formacie iCalendar';
+$labels['exportrange'] = 'Zdarzenia z';
+$labels['exportattachments'] = 'Z załącznikami';
+$labels['customdate'] = 'Własna data';
+$labels['location'] = 'Położenie';
+$labels['url'] = 'Adres URL';
+$labels['date'] = 'Data';
+$labels['start'] = 'Początek';
+$labels['starttime'] = 'Początek';
+$labels['end'] = 'Koniec';
+$labels['endtime'] = 'Koniec';
+$labels['repeat'] = 'Powtórz';
+$labels['selectdate'] = 'Wybierz datę';
+$labels['freebusy'] = 'Pokaż mnie jako';
+$labels['free'] = 'Wolny';
+$labels['busy'] = 'Zajęty';
+$labels['outofoffice'] = 'Poza biurem';
+$labels['tentative'] = 'Niepewny';
+$labels['mystatus'] = 'Mój status';
+$labels['status'] = 'Status';
+$labels['status-confirmed'] = 'Potwierdzony';
+$labels['status-cancelled'] = 'Anulowany';
+$labels['status-tentative'] = 'Niepewny';
+$labels['priority'] = 'Priorytet';
+$labels['sensitivity'] = 'Poufność';
+$labels['public'] = 'publiczny';
+$labels['private'] = 'prywatny';
+$labels['confidential'] = 'poufny';
+$labels['links'] = 'Reference';
+$labels['alarms'] = 'Przypomnienie';
+$labels['comment'] = 'Komentarz';
+$labels['created'] = 'Utworzono';
+$labels['changed'] = 'Ostatnia modyfikacja';
+$labels['unknown'] = 'Nieznany';
+$labels['eventoptions'] = 'Opcje';
+$labels['generated'] = 'wygenerowano';
+$labels['eventhistory'] = 'Historia';
+$labels['removelink'] = 'Usuń odnośnik e-mail';
+$labels['printdescriptions'] = 'Drukuj opisy';
+$labels['parentcalendar'] = 'Wstaw wewnątrz';
+$labels['searchearlierdates'] = '« Szukaj wcześniejszych zdarzeń';
+$labels['searchlaterdates'] = 'Szukaj późniejszych zdarzeń »';
+$labels['laterevents'] = 'Później';
+$labels['andnmore'] = '$nr więcej...';
+$labels['togglerole'] = 'Kliknuj aby przestawić rolę';
+$labels['createfrommail'] = 'Zapisz jako zdarzenie';
+$labels['importevents'] = 'Importuj zdarzenia';
+$labels['importrange'] = 'Zdarzenia z';
+$labels['onemonthback'] = '1 miesiąc wstecz';
+$labels['nmonthsback'] = '$nr miesięcy wstecz';
+$labels['showurl'] = 'Pokaż adres URL kalendarza';
+$labels['showurldescription'] = 'Używaj tego adresu aby dostać się do kalendarza z innych programów (w trybie tylko-do-odczytu). Możesz wkleić go do dowolnej aplikacji obsługującej format iCal.';
+$labels['caldavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej format <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (np. Evolution lub Mozilla Thunderbird) aby zsynchronizować wybrany kalendarz z twoim komputerem lub urządzeniem przenośnym.';
+$labels['findcalendars'] = 'Wyszukaj kalendarze...';
+$labels['searchterms'] = 'Szukana fraza';
+$labels['calsearchresults'] = 'Dostępne kalendarze';
+$labels['calendarsubscribe'] = 'Dodaj do listy na stałe';
+$labels['nocalendarsfound'] = 'Nie znaleziono żadych kalendarzy';
+$labels['nrcalendarsfound'] = 'znaleziono $nr kalendarzy';
+$labels['quickview'] = 'Pokaż tylko ten kalendarz';
+$labels['invitationspending'] = 'Oczekujące zaproszenia';
+$labels['invitationsdeclined'] = 'Odrzucone zaproszenia';
+$labels['changepartstat'] = 'Zmień status uczestnika';
+$labels['rsvpcomment'] = 'Treść zaproszenia';
+$labels['listrange'] = 'Zakres do pokazania:';
+$labels['listsections'] = 'Podziel na:';
+$labels['smartsections'] = 'Inteligentne sekcje';
+$labels['until'] = 'dopóki';
+$labels['today'] = 'Dzisiaj';
+$labels['tomorrow'] = 'Jutro';
+$labels['thisweek'] = 'Bieżący tydzień';
+$labels['nextweek'] = 'Następny tydzień';
+$labels['prevweek'] = 'Poprzedni tydzień';
+$labels['thismonth'] = 'Bieżący miesiąc';
+$labels['nextmonth'] = 'Następny miesiąc';
+$labels['weekofyear'] = 'Tydzień';
+$labels['pastevents'] = 'Przeszłe';
+$labels['futureevents'] = 'Przyszłe';
+$labels['showalarms'] = 'Pokaż powiadomienia';
+$labels['defaultalarmtype'] = 'Domyślne powiadomienie';
+$labels['defaultalarmoffset'] = 'Domyślny czas powiadomienia';
+$labels['attendee'] = 'Uczestnik';
+$labels['role'] = 'Rola';
+$labels['availability'] = 'Dostępny';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Dodaj uczestnika';
+$labels['roleorganizer'] = 'Organizator';
+$labels['rolerequired'] = 'Wymagany';
+$labels['roleoptional'] = 'Opcjonalny';
+$labels['rolechair'] = 'Przewodniczący';
+$labels['rolenonparticipant'] = 'Nieobecny';
+$labels['cutypeindividual'] = 'Osoba';
+$labels['cutypegroup'] = 'Grupa';
+$labels['cutyperesource'] = 'Zasób';
+$labels['cutyperoom'] = 'Pokój';
+$labels['availfree'] = 'Wolny';
+$labels['availbusy'] = 'Zajęty';
+$labels['availunknown'] = 'Nieznany';
+$labels['availtentative'] = 'Niepewny';
+$labels['availoutofoffice'] = 'Poza biurem';
+$labels['scheduletime'] = 'Sprawdź dostępność';
+$labels['sendinvitations'] = 'Wyślij zaproszenia';
+$labels['sendnotifications'] = 'Powiadom uczestników o zmianach';
+$labels['sendcancellation'] = 'Powiadom uczestników o anulowaniu zdarzenia';
+$labels['onlyworkinghours'] = 'Sprawdź dostępność w moich godzinach pracy';
+$labels['reqallattendees'] = 'Wymagany/wszyscy uczestnicy';
+$labels['prevslot'] = 'Poprzedni przedział';
+$labels['nextslot'] = 'Następny przedział';
+$labels['suggestedslot'] = 'Sugerowany przedział';
+$labels['noslotfound'] = 'Nie znaleziono wolnego przedziału czasu';
+$labels['invitationsubject'] = 'Zostałeś zaproszony do "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\n\$description\n\nW załączeniu plik w formacie iCalendar ze szczegółami zdarzenia, który możesz zaimportować do twojej aplikacji kalendarza.";
+$labels['invitationattendlinks'] = "W przypadku gdy klient poczty elektronicznej nie obsługuje rządań w formacie iTip, aby zaakceptować lub odrzucić to zaproszenie, można skorzystać z następującego linku:\n\$url ";
+$labels['eventupdatesubject'] = '"$title" zostało zaktualizowane';
+$labels['eventupdatesubjectempty'] = 'Zdarzenie które cię dotyczy zostało zaktualizowane';
+$labels['eventupdatemailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nW załączeniu plik w formacie iCalendar zawierający zaktualizowane szczegóły zdarzenia, które możesz zaimportować do swojej aplikacji kalendarza.";
+$labels['eventcancelsubject'] = '"$title" zostało anulowane';
+$labels['eventcancelmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\nZdarzenie zostało anulowane przez \$organizer.\n\nW załączeniu plik w formacie iCalendar ze zaktualizowanymi szczegółami zdarzenia.";
+$labels['itipobjectnotfound'] = 'W twoim kalendarzu nie znaleziono zdarzenia związanego z tą wiadomością.';
+$labels['itipmailbodyaccepted'] = "\$sender zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender warunkowo zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender odrzucił zaproszenie na następujące zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender odrzucił twój udział w zastępującym zdarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegated'] = "\$sender oddelegował udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender oddelegował do ciebie udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipdeclineevent'] = 'Czy chcesz odrzucić zaproszenie na to zdarzenie?';
+$labels['declinedeleteconfirm'] = 'Czy chcesz także usunąć to odrzucone zdarzenie ze swojego kalendarza?';
+$labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
+$labels['itipcommenttitle'] = 'Komentarz ten będzie dołączony do wiadomości wysłanej do uczestników zdarzenia';
+$labels['notanattendee'] = 'Nie jesteś na liście uczestników tego zdarzenia';
+$labels['eventcancelled'] = 'Zdarzenie zostało anulowane';
+$labels['saveincalendar'] = 'zapisz w';
+$labels['updatemycopy'] = 'Uaktualnij w moim kalendarzu';
+$labels['savetocalendar'] = 'Zapisz do kalendarza';
+$labels['openpreview'] = 'Sprawdź kalendarz';
+$labels['noearlierevents'] = 'Brak wcześniejszych zdarzeń';
+$labels['nolaterevents'] = '« Brak póżniejszych zdarzeń';
+$labels['resource'] = 'Zasób';
+$labels['addresource'] = 'Rezerwuj zasób';
+$labels['findresources'] = 'Wyszukaj zasoby';
+$labels['resourcedetails'] = 'Szczegóły';
+$labels['resourceavailability'] = 'Dostępność';
+$labels['resourceowner'] = 'Właściciel';
+$labels['resourceadded'] = 'Zasób został dodany do twojego zdarzenia';
+$labels['tabsummary'] = 'Podsumowanie';
+$labels['tabrecurrence'] = 'Powtarzalność';
+$labels['tabattendees'] = 'Uczestnicy';
+$labels['tabresources'] = 'Zasoby';
+$labels['tabattachments'] = 'Załączniki';
+$labels['tabsharing'] = 'Udostępnianie';
+$labels['deleteobjectconfirm'] = 'Czy na pewno chcesz usunąć to zdarzenie?';
+$labels['deleteventconfirm'] = 'Czy na pewno chcesz usunąć to zdarzenie?';
+$labels['deletecalendarconfirm'] = 'Czy na pewno chcesz usunąć ten kalendarz z wszystkimi zadaniami?';
+$labels['deletecalendarconfirmrecursive'] = 'Czy na pewno chcesz usunąć ten kalendarz ze wszystkimi zdarzeniami i pod-kalendarzami?';
+$labels['savingdata'] = 'Zapisuję dane...';
+$labels['errorsaving'] = 'Błąd podczas zapisu danych.';
+$labels['operationfailed'] = 'Żądana operacja nie powiodła się.';
+$labels['invalideventdates'] = 'Błędna data! Proszę sprawdzić wprowadzone dane.';
+$labels['invalidcalendarproperties'] = 'Błędna właściwość kalendarza! Proszę podać poprawną nazwę.';
+$labels['searchnoresults'] = 'Nie znaleziono zdarzeń w wybranym kalendarzu.';
+$labels['successremoval'] = 'Zdarzenie zostało usunięte.';
+$labels['successrestore'] = 'Zdarzenie zostało przywrócone.';
+$labels['errornotifying'] = 'Nie udało się wysłać powiadomień do uczestników zdarzenia';
+$labels['errorimportingevent'] = 'Nie udało się zaimportować zdarzenia';
+$labels['importwarningexists'] = 'Kopia tego zdarzenia już istnieje w twoim kalendarzu.';
+$labels['newerversionexists'] = 'Istnieje nowsza wersja tego zdarzenia ! Przerwano.';
+$labels['nowritecalendarfound'] = 'Nie znaleziono kalendarza aby zapisać zdarzenie.';
+$labels['importedsuccessfully'] = 'Zdarzenie dodano do \'$calendar\'';
+$labels['updatedsuccessfully'] = 'Zdarzenie zostało pomyślnie zaktualizowane w \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Zaktualizowano status uczestnika.';
+$labels['itipsendsuccess'] = 'Wysłano zaproszenia do uczestników.';
+$labels['itipresponseerror'] = 'Nie udało się wysłać odpowiedzi na to zaproszenie.';
+$labels['itipinvalidrequest'] = 'To zaproszenie nie jest już aktualne.';
+$labels['sentresponseto'] = 'Wysłano odpowiedź na zaproszenie do $mailto.';
+$labels['localchangeswarning'] = 'Zamierzasz dokonać zmian, które mogą zostać wykonane tylko w twoim kalendarzu i nie zostaną wysłane do organizatora zdarzenia.';
+$labels['importsuccess'] = 'Zaimportowano $nr zdarzeń.';
+$labels['importnone'] = 'Nie znaleziono zdarzeń do zaimportowania.';
+$labels['importerror'] = 'Wystąpił błąd podczas importu.';
+$labels['aclnorights'] = 'Nie masz uprawnień administracyjnych dla tego kalendarza.';
+$labels['changeeventconfirm'] = 'Zmień zdarzenie';
+$labels['removeeventconfirm'] = 'Usuń zdarzenie';
+$labels['changerecurringeventwarning'] = 'To jest zdarzenie powtarzalne. Czy chcesz zmienić bieżące zdarzenie, bieżące i przyszłe, wszystkie, a może zapisać je jako nowe zdarzenie?';
+$labels['removerecurringeventwarning'] = 'Jest to zdarzenie cykliczne. Czy chcesz usunąć wyłącznie bieżące zdarzenie i jego przyszłe wystąpienia, czy wszystkie wystąpienia tego zdarzenia?';
+$labels['removerecurringallonly'] = 'Jest to zdarzenie cykliczne. Jako uczestnik, możesz jedynie usunąć całe zdarzenie ze wszystkimi jego wystąpieniami.';
+$labels['currentevent'] = 'Bieżące';
+$labels['futurevents'] = 'Przyszłe';
+$labels['allevents'] = 'Wszystkie';
+$labels['saveasnew'] = 'Zapisz jako nowe';
+$labels['birthdays'] = 'Uruodziny';
+$labels['birthdayscalendar'] = 'Kalendarz Urodzin';
+$labels['displaybirthdayscalendar'] = 'Wyświetl kalendarz urodzin';
+$labels['birthdayscalendarsources'] = 'Z tych książek adresowych';
+$labels['birthdayeventtitle'] = 'Urodziny $name\'s';
+$labels['birthdayage'] = 'Wiek $age';
+$labels['objectchangelog'] = 'Historia zmian';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
+$labels['objectnotfound'] = 'Nie udało się wczytać zdarzenia';
+$labels['objectchangelognotavailable'] = 'Historia zmian jest niedostępna dla tego zdarzenia';
+$labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
+$labels['revisionrestoreconfirm'] = 'Czy na pewno chcesz przywrócić wersję $rev tego zdarzenia? Bierzące zdarzenie zostanie zastąpione starszą wersją.';
+$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
+$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
+$labels['arialabelminical'] = 'Wybór daty kalendarza';
+$labels['arialabelcalendarview'] = 'Podgląd kalendarza';
+$labels['arialabelsearchform'] = 'Formularz wyszukiwania zdarzeń';
+$labels['arialabelquicksearchbox'] = 'Fraza wyszukiwania zdarzeń';
+$labels['arialabelcalsearchform'] = 'Formularz wyszukiwania kalendarzy';
+$labels['calendaractions'] = 'Akcje kalendarzy';
+$labels['arialabeleventattendees'] = 'Lista uczestników zdarzenia';
+$labels['arialabeleventresources'] = 'Lista zasobów zdarzenia';
+$labels['arialabelresourcesearchform'] = 'Formularz wyszukiwania zasobów';
+$labels['arialabelresourceselection'] = 'Dostępne zasoby';
+?>

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/pl_PL.inc Changed

@@ -27,12 +27,18 @@
 $labels['aftermoveto'] = 'Przenieś do...';
 $labels['itipoptions'] = 'Zaproszenia';
 $labels['afteraction'] = 'Wiadomość jest przetwarzana po zaproszeniu lub aktualizacji';
+$labels['showweekno'] = 'Wyświetlaj numery tygodni';
+$labels['weeknonone'] = 'nigdy';
+$labels['weeknodatepicker'] = 'tylko przy wyborze daty';
+$labels['weeknoall'] = 'w widoku kalendarza i przy wyborze daty';
 $labels['calendar'] = 'Kalendarz';
 $labels['calendars'] = 'Kalendarze';
 $labels['category'] = 'Kategoria';
 $labels['categories'] = 'Kategorie';
+$labels['addcalendar'] = 'Dodaj kalendarz';
 $labels['createcalendar'] = 'Utwórz nowy kalendarz';
-$labels['editcalendar'] = 'Edytuj właściwości kalendarza';
+$labels['editcalendar'] = 'Edytuj/Udostępnij kalendarz';
+$labels['deletecalendar'] = 'Usuń kalendarz';
 $labels['name'] = 'Nazwa';
 $labels['color'] = 'Kolor';
 $labels['day'] = 'Dzień';
@@ -95,7 +101,8 @@
 $labels['parentcalendar'] = 'Wstaw wewnątrz';
 $labels['searchearlierdates'] = '« Szukaj wcześniejszych zdarzeń';
 $labels['searchlaterdates'] = 'Szukaj późniejszych zdarzeń »';
-$labels['laterevents'] = 'Później';
+$labels['earlierevents'] = 'Wcześniej';
+$labels['laterevents'] = 'Późniejsze';
 $labels['andnmore'] = '$nr więcej...';
 $labels['togglerole'] = 'Kliknuj aby przestawić rolę';
 $labels['createfrommail'] = 'Zapisz jako zdarzenie';
@@ -106,8 +113,11 @@
 $labels['showurl'] = 'Pokaż adres URL kalendarza';
 $labels['showurldescription'] = 'Używaj tego adresu aby dostać się do kalendarza z innych programów (w trybie tylko-do-odczytu). Możesz wkleić go do dowolnej aplikacji obsługującej format iCal.';
 $labels['caldavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej format <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (np. Evolution lub Mozilla Thunderbird) aby zsynchronizować wybrany kalendarz z twoim komputerem lub urządzeniem przenośnym.';
+$labels['showfburl'] = 'Pokaż adres free-busy.';
+$labels['fburldescription'] = 'Używaj ten adres w aplikacjach obsługujących informacje Free-Busy. Możesz go skopiować i wkleić w dowolnej aplikacji kalendarza, która obsługuje informacje wolny-zajęty w formacie iCal. Dla tego adresu uwierzytelnianie nie jest wymagane.';
 $labels['findcalendars'] = 'Wyszukaj kalendarze...';
 $labels['searchterms'] = 'Szukana fraza';
+$labels['findevents'] = 'Znajdź wydarzenia';
 $labels['calsearchresults'] = 'Dostępne kalendarze';
 $labels['calendarsubscribe'] = 'Dodaj do listy na stałe';
 $labels['nocalendarsfound'] = 'Nie znaleziono żadych kalendarzy';
@@ -117,6 +127,8 @@
 $labels['invitationsdeclined'] = 'Odrzucone zaproszenia';
 $labels['changepartstat'] = 'Zmień status uczestnika';
 $labels['rsvpcomment'] = 'Treść zaproszenia';
+$labels['eventstartsync'] = 'Przenieś datę początku zdarzenia do pierwszego wystąpienia';
+$labels['weekshort'] = 'tydz.';
 $labels['listrange'] = 'Zakres do pokazania:';
 $labels['listsections'] = 'Podziel na:';
 $labels['smartsections'] = 'Inteligentne sekcje';
@@ -164,7 +176,7 @@
 $labels['suggestedslot'] = 'Sugerowany przedział';
 $labels['noslotfound'] = 'Nie znaleziono wolnego przedziału czasu';
 $labels['invitationsubject'] = 'Zostałeś zaproszony do "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\n\$description\n\nW załączeniu plik w formacie iCalendar ze szczegółami zdarzenia, który możesz zaimportować do twojej aplikacji kalendarza.";
+$labels['invitationmailbody'] = "*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees\n\n\$description\n\nW załączeniu plik w formacie iCalendar ze szczegółami zdarzenia, który możesz zaimportować do twojego kalendarza.";
 $labels['invitationattendlinks'] = "W przypadku gdy klient poczty elektronicznej nie obsługuje rządań w formacie iTip, aby zaakceptować lub odrzucić to zaproszenie, można skorzystać z następującego linku:\n\$url ";
 $labels['eventupdatesubject'] = '"$title" zostało zaktualizowane';
 $labels['eventupdatesubjectempty'] = 'Zdarzenie które cię dotyczy zostało zaktualizowane';
@@ -176,8 +188,8 @@
 $labels['itipmailbodytentative'] = "\$sender warunkowo zaakceptował zaproszenie do następującego zdarzenia:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender odrzucił zaproszenie na następujące zdarzenie:\n\n*\$title*\n\nKiedy: \$date\n\nZaproszeni: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender odrzucił twój udział w zastępującym zdarzeniu:\n\n*\$title*\n\nKiedy: \$date";
-$labels['itipmailbodydelegated'] = "\$sender oddelegował udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
-$labels['itipmailbodydelegatedto'] = "\$sender oddelegował do ciebie udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegated'] = "\$sender delegował udział w następującym wydarzeniu:\n\n*\$title*\n\nKiedy: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender delegował udział w następującym wydarzeniu na ciebie\n\n*\$title*\n\nKiedy: \$date";
 $labels['itipdeclineevent'] = 'Czy chcesz odrzucić zaproszenie na to zdarzenie?';
 $labels['declinedeleteconfirm'] = 'Czy chcesz także usunąć to odrzucone zdarzenie ze swojego kalendarza?';
 $labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
@@ -189,12 +201,14 @@
 $labels['savetocalendar'] = 'Zapisz do kalendarza';
 $labels['openpreview'] = 'Sprawdź kalendarz';
 $labels['noearlierevents'] = 'Brak wcześniejszych zdarzeń';
-$labels['nolaterevents'] = '« Brak póżniejszych zdarzeń';
+$labels['nolaterevents'] = 'Brak póżniejszych zdarzeń';
+$labels['legend'] = 'Legenda';
 $labels['resource'] = 'Zasób';
 $labels['addresource'] = 'Rezerwuj zasób';
 $labels['findresources'] = 'Wyszukaj zasoby';
 $labels['resourcedetails'] = 'Szczegóły';
 $labels['resourceavailability'] = 'Dostępność';
+$labels['resourceprops'] = 'Właściwości zasobów';
 $labels['resourceowner'] = 'Właściciel';
 $labels['resourceadded'] = 'Zasób został dodany do twojego zdarzenia';
 $labels['tabsummary'] = 'Podsumowanie';
@@ -211,6 +225,7 @@
 $labels['errorsaving'] = 'Błąd podczas zapisu danych.';
 $labels['operationfailed'] = 'Żądana operacja nie powiodła się.';
 $labels['invalideventdates'] = 'Błędna data! Proszę sprawdzić wprowadzone dane.';
+$labels['emptyeventtitle'] = 'Podsumowanie zdarzenia nie może być puste.';
 $labels['invalidcalendarproperties'] = 'Błędna właściwość kalendarza! Proszę podać poprawną nazwę.';
 $labels['searchnoresults'] = 'Nie znaleziono zdarzeń w wybranym kalendarzu.';
 $labels['successremoval'] = 'Zdarzenie zostało usunięte.';
@@ -223,6 +238,7 @@
 $labels['importedsuccessfully'] = 'Zdarzenie dodano do \'$calendar\'';
 $labels['updatedsuccessfully'] = 'Zdarzenie zostało pomyślnie zaktualizowane w \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Zaktualizowano status uczestnika.';
+$labels['errorunknownattendee'] = 'Nie udało się znaleźć informacji o uczestniku.';
 $labels['itipsendsuccess'] = 'Wysłano zaproszenia do uczestników.';
 $labels['itipresponseerror'] = 'Nie udało się wysłać odpowiedzi na to zaproszenie.';
 $labels['itipinvalidrequest'] = 'To zaproszenie nie jest już aktualne.';
@@ -232,6 +248,7 @@
 $labels['importnone'] = 'Nie znaleziono zdarzeń do zaimportowania.';
 $labels['importerror'] = 'Wystąpił błąd podczas importu.';
 $labels['aclnorights'] = 'Nie masz uprawnień administracyjnych dla tego kalendarza.';
+$labels['importtext'] = 'Możesz przesyłać wydarzenia <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a>w formacie (.ics).';
 $labels['changeeventconfirm'] = 'Zmień zdarzenie';
 $labels['removeeventconfirm'] = 'Usuń zdarzenie';
 $labels['changerecurringeventwarning'] = 'To jest zdarzenie powtarzalne. Czy chcesz zmienić bieżące zdarzenie, bieżące i przyszłe, wszystkie, a może zapisać je jako nowe zdarzenie?';
@@ -241,11 +258,12 @@
 $labels['futurevents'] = 'Przyszłe';
 $labels['allevents'] = 'Wszystkie';
 $labels['saveasnew'] = 'Zapisz jako nowe';
-$labels['birthdays'] = 'Uruodziny';
+$labels['recurrenceerror'] = 'Nie można ustalić reguły powtarzalności dla podanej daty początkowej.';
+$labels['birthdays'] = 'Urodziny';
 $labels['birthdayscalendar'] = 'Kalendarz Urodzin';
 $labels['displaybirthdayscalendar'] = 'Wyświetl kalendarz urodzin';
 $labels['birthdayscalendarsources'] = 'Z tych książek adresowych';
-$labels['birthdayeventtitle'] = 'Urodziny $name\'s';
+$labels['birthdayeventtitle'] = 'Urodziny $name';
 $labels['birthdayage'] = 'Wiek $age';
 $labels['objectchangelog'] = 'Historia zmian';
 $labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
@@ -253,16 +271,18 @@
 $labels['objectchangelognotavailable'] = 'Historia zmian jest niedostępna dla tego zdarzenia';
 $labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
 $labels['revisionrestoreconfirm'] = 'Czy na pewno chcesz przywrócić wersję $rev tego zdarzenia? Bierzące zdarzenie zostanie zastąpione starszą wersją.';
-$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
-$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
+$labels['objectrestoresuccess'] = 'Wersja $rev poprawnie przywrócona';
+$labels['objectrestoreerror'] = 'Błąd przywracania starej wersji';
 $labels['arialabelminical'] = 'Wybór daty kalendarza';
 $labels['arialabelcalendarview'] = 'Podgląd kalendarza';
 $labels['arialabelsearchform'] = 'Formularz wyszukiwania zdarzeń';
 $labels['arialabelquicksearchbox'] = 'Fraza wyszukiwania zdarzeń';
 $labels['arialabelcalsearchform'] = 'Formularz wyszukiwania kalendarzy';
 $labels['calendaractions'] = 'Akcje kalendarzy';
+$labels['calendarprops'] = 'Właściwości kalendarza';
 $labels['arialabeleventattendees'] = 'Lista uczestników zdarzenia';
 $labels['arialabeleventresources'] = 'Lista zasobów zdarzenia';
 $labels['arialabelresourcesearchform'] = 'Formularz wyszukiwania zasobów';
 $labels['arialabelresourceselection'] = 'Dostępne zasoby';
+$labels['arialabeleventform'] = 'Formularz edycji wydarzenia';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/pt_BR.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/pt_BR.inc Changed

@@ -8,7 +8,7 @@
  */
 $labels['default_view'] = 'Visualização padrão';
 $labels['time_format'] = 'Formato da hora';
-$labels['timeslots'] = 'Time slots per hour';
+$labels['timeslots'] = 'Faixa de tempo por hora';
 $labels['first_day'] = 'Primeiro dia da semana';
 $labels['first_hour'] = 'Primeira hora a mostrar';
 $labels['workinghours'] = 'Horário de trabalho';
@@ -20,10 +20,13 @@
 $labels['coloringmode1'] = 'De acordo com a categoria';
 $labels['coloringmode2'] = 'Calendário para esboço, categoria para conteúdo';
 $labels['coloringmode3'] = 'Categoria para esboço, calendário para conteúdo';
-$labels['aftertrash'] = 'Mover para Lixeira';
-$labels['afterdelete'] = 'Apagar a mensagem';
-$labels['aftermoveto'] = 'Mover para...';
-$labels['itipoptions'] = 'Convites para Eventos';
+$labels['afternothing'] = 'Não fazer nada';
+$labels['aftertrash'] = 'Enviar para a lixeira';
+$labels['afterdelete'] = 'Deletar a mensagem';
+$labels['afterflagdeleted'] = 'Marcar como deletado';
+$labels['aftermoveto'] = 'Enviar para...';
+$labels['itipoptions'] = 'Convites de Eventos';
+$labels['afteraction'] = 'O que fazer após um convite ou atualização em mensagem for processada';
 $labels['showweekno'] = 'Exibir número de semanas';
 $labels['weeknonone'] = 'nunca';
 $labels['calendar'] = 'Calendário';
@@ -31,7 +34,6 @@
 $labels['category'] = 'Categoria';
 $labels['categories'] = 'Categorias';
 $labels['createcalendar'] = 'Criar novo calendário';
-$labels['editcalendar'] = 'Editar propriedades do calendário';
 $labels['name'] = 'Nome';
 $labels['color'] = 'Cor';
 $labels['day'] = 'Dia';
@@ -55,13 +57,14 @@
 $labels['exporttitle'] = 'Exportar para iCalendar';
 $labels['exportrange'] = 'Eventos de';
 $labels['exportattachments'] = 'Com anexos';
-$labels['customdate'] = 'Custom date';
+$labels['customdate'] = 'Data personalizada';
 $labels['location'] = 'Local';
 $labels['url'] = 'URL';
 $labels['date'] = 'Data';
 $labels['start'] = 'Início';
 $labels['starttime'] = 'Hora de início';
 $labels['end'] = 'Término';
+$labels['endtime'] = 'Hora de término';
 $labels['repeat'] = 'Repetir';
 $labels['selectdate'] = 'Escolha a data';
 $labels['freebusy'] = 'Mostrar me como';
@@ -69,10 +72,11 @@
 $labels['busy'] = 'Ocupado';
 $labels['outofoffice'] = 'Fora de escritório';
 $labels['tentative'] = 'Tentativa';
+$labels['mystatus'] = 'Minha situação';
 $labels['status'] = 'Situação';
 $labels['status-confirmed'] = 'Confirmado';
 $labels['status-cancelled'] = 'Cancalado';
-$labels['status-tentative'] = 'Tentativa';
+$labels['status-tentative'] = 'Tentative';
 $labels['priority'] = 'Prioridade';
 $labels['sensitivity'] = 'Privacidade';
 $labels['public'] = 'público';
@@ -81,7 +85,7 @@
 $labels['links'] = 'Reference';
 $labels['alarms'] = 'Lembrete';
 $labels['comment'] = 'Comentário';
-$labels['created'] = 'Created';
+$labels['created'] = 'Criado';
 $labels['changed'] = 'Última modificação';
 $labels['unknown'] = 'Desconhecido';
 $labels['eventoptions'] = 'Opções';
@@ -102,11 +106,18 @@
 $labels['nmonthsback'] = '$nr meses atrás';
 $labels['showurl'] = 'Mostrar URL do calendário';
 $labels['showurldescription'] = 'Use o seguinte endereço para acessar (somente leitura) seu calendário em outras aplicações. Você pode copiar e colar este endereço em qualquer software de calendário que suporte o formato iCal.';
-$labels['caldavurldescription'] = 'Copy this address to a <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> client application (e.g. Evolution or Mozilla Thunderbird) to fully synchronize this specific calendar with your computer or mobile device.';
+$labels['caldavurldescription'] = 'Copie esse endereço para um aplicativo cliente do <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (ex. Evolution ou Mozilla Thunderbird) para sincronização completa desse calendário específico com seu computador ou celular.';
 $labels['findcalendars'] = 'Buscar calendários...';
-$labels['searchterms'] = 'Search terms';
+$labels['searchterms'] = 'Buscar termos';
 $labels['calsearchresults'] = 'Calendários disponíveis';
 $labels['calendarsubscribe'] = 'Listar permanentemente';
+$labels['nocalendarsfound'] = 'Nenhum calendário encontrado';
+$labels['nrcalendarsfound'] = '$nr calendários encontrados';
+$labels['quickview'] = 'Ver apenas esse calendário';
+$labels['invitationspending'] = 'Convites pendentes';
+$labels['invitationsdeclined'] = 'Convites recusados';
+$labels['changepartstat'] = 'Alterar situação de participantes';
+$labels['rsvpcomment'] = 'Texto do convite';
 $labels['listrange'] = 'Intervalo para exibir:';
 $labels['listsections'] = 'Dividir em:';
 $labels['smartsections'] = 'Seções inteligentes';
@@ -115,12 +126,13 @@
 $labels['tomorrow'] = 'Amanhã';
 $labels['thisweek'] = 'Esta semana';
 $labels['nextweek'] = 'Próxima semana';
+$labels['prevweek'] = 'Semana passada';
 $labels['thismonth'] = 'Este mês';
 $labels['nextmonth'] = 'Próximo mês';
 $labels['weekofyear'] = 'Semana';
 $labels['pastevents'] = 'Passado';
 $labels['futureevents'] = 'Futuro';
-$labels['showalarms'] = 'Mostrar lembrentes';
+$labels['showalarms'] = 'Mostrar lembretes';
 $labels['defaultalarmtype'] = 'Configuração de lembrete padrão';
 $labels['defaultalarmoffset'] = 'Horário padrão de lembrete';
 $labels['attendee'] = 'Participante';
@@ -132,8 +144,11 @@
 $labels['rolerequired'] = 'Obrigatório';
 $labels['roleoptional'] = 'Opcional';
 $labels['rolechair'] = 'Cadeira';
+$labels['rolenonparticipant'] = 'Ausente';
+$labels['cutypeindividual'] = 'Individual';
 $labels['cutypegroup'] = 'Grupo';
 $labels['cutyperesource'] = 'Recurso';
+$labels['cutyperoom'] = 'Sala';
 $labels['availfree'] = 'Disponível';
 $labels['availbusy'] = 'Ocupado';
 $labels['availunknown'] = 'Desconhecido';
@@ -147,26 +162,35 @@
 $labels['reqallattendees'] = 'Obrigatório/todos os participantes';
 $labels['prevslot'] = 'Espaço anterior';
 $labels['nextslot'] = 'Próximo espaço';
+$labels['suggestedslot'] = 'Espaço sugerido';
 $labels['noslotfound'] = 'Incapaz de encontrar um horário disponível';
 $labels['invitationsubject'] = 'Você foi convidado para "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com todos os detalhes do evento na qual você pode importar para sua aplicação de calendário.";
 $labels['invitationattendlinks'] = "No caso do seu cliente de e-mail não suportar requisições iTIP você pode usar o link a seguir para aceitar ou recusar este convite:\n\$url";
 $labels['eventupdatesubject'] = '"$title" foi atualizado';
 $labels['eventupdatesubjectempty'] = 'Um evento do seu interesse foi atualizado';
 $labels['eventupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento na qual você pode importar para sua aplicação de calendário.";
+$labels['eventcancelsubject'] = '"$title" foi cancelado.';
 $labels['eventcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nO evento foi cancelado por \$organizer.\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados do evento.";
 $labels['itipobjectnotfound'] = 'O evento referenciado por esta mensagem não foi encontrado em seu calendário.';
 $labels['itipmailbodyaccepted'] = "\$sender aceitou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender aceitou como tentativa o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender recusou o convite para o seguinte evento:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender rejeitou sua participação no seguinte evento:\n\n*\$title*\n\nQuando: \$date";
+$labels['itipmailbodydelegated'] = "\$sender delegou a participação no seguinte evento:\n\n*\$title*\n\nWhen: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender delegou a sua participação no seguinte evento:\n\n*\$title*\n\nWhen: \$date";
 $labels['itipdeclineevent'] = 'Você deseja recusar o convite para este evento?';
-$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined event from your calendar?';
-$labels['itipcomment'] = 'Invitation/notification comment';
+$labels['declinedeleteconfirm'] = 'Deseja também deletar esse evento recusado do seu calendário?';
+$labels['itipcomment'] = 'Comentário do Convite/Notificação';
+$labels['itipcommenttitle'] = 'Estas observações serão enviadas com o convite/notificação aos participantes.';
 $labels['notanattendee'] = 'Você não está listado como um participante deste evento';
 $labels['eventcancelled'] = 'O evento foi cancelado';
 $labels['saveincalendar'] = 'salvar em';
 $labels['updatemycopy'] = 'Atualize em meu calendário';
 $labels['savetocalendar'] = 'Gravar no calendário';
+$labels['openpreview'] = 'Verificar calendário';
+$labels['noearlierevents'] = 'Sem eventos anteriores';
+$labels['nolaterevents'] = 'Sem eventos posteriores';
 $labels['resource'] = 'Recurso';
 $labels['addresource'] = 'Livro de recursos';
 $labels['findresources'] = 'Encontrar recursos';
@@ -183,7 +207,7 @@
 $labels['deleteobjectconfirm'] = 'Você realmente deseja remover este evento?';
 $labels['deleteventconfirm'] = 'Você realmente deseja remover este evento?';
 $labels['deletecalendarconfirm'] = 'Você realmente deseja excluir este calendário com todos os seus eventos?';
-$labels['deletecalendarconfirmrecursive'] = 'Do you really want to delete this calendar with all its events and sub-calendars?';
+$labels['deletecalendarconfirmrecursive'] = 'Tem a certeza que quer eliminar este calendário com todos os seus eventos e sub-calendários?';
 $labels['savingdata'] = 'Salvando dados...';
 $labels['errorsaving'] = 'Falha ao salvar as modificações.';
 $labels['operationfailed'] = 'A operação requisitada falhou.';
@@ -204,22 +228,42 @@
 $labels['itipresponseerror'] = 'Falha ao enviar a resposta para este convite de evento';
 $labels['itipinvalidrequest'] = 'Este convite não é mais válido';
 $labels['sentresponseto'] = 'Resposta de convite enviada com sucesso para $mailto';
-$labels['localchangeswarning'] = 'You are about to make changes that will only be reflected on your calendar and not be sent to the organizer of the event.';
+$labels['localchangeswarning'] = 'Você está prestes a fazer modificações que serão apenas alteradas no seu calendário e não será enviado ao organizador do evento.';
 $labels['importsuccess'] = 'Importado com sucesso $nr eventos';
 $labels['importnone'] = 'Não há eventos a serem importados';
 $labels['importerror'] = 'Ocorreu um erro na importação';
 $labels['aclnorights'] = 'Você não tem permissão de administrador neste calendário.';
 $labels['changeeventconfirm'] = 'Trocar evento';
+$labels['removeeventconfirm'] = 'Deletar evento';
 $labels['changerecurringeventwarning'] = 'Este é um evento com repetição. Você gostaria de editar o evento atual somente, estas e todas as futuras ocorrências ou salvar este como um novo evento?';
+$labels['removerecurringeventwarning'] = 'Este evento é recorrente. Deseja eliminar a ocorrência atual, esta e todas as futuras ocorrências ou todas as ocorrências do evento?';
+$labels['removerecurringallonly'] = 'Este evento é recorrente. Como participante você só pode apagar o evento com todas as ocorrências.';
 $labels['currentevent'] = 'Atual';
 $labels['futurevents'] = 'Futuro';
 $labels['allevents'] = 'Todos';
 $labels['saveasnew'] = 'Salvar como novo';
-$labels['birthdays'] = 'Birthdays';
-$labels['birthdayscalendar'] = 'Birthdays Calendar';
-$labels['displaybirthdayscalendar'] = 'Display birthdays calendar';
-$labels['birthdayscalendarsources'] = 'From these address books';
-$labels['birthdayeventtitle'] = '$name\'s Birthday';
-$labels['birthdayage'] = 'Age $age';
+$labels['birthdays'] = 'Aniversários';
+$labels['birthdayscalendar'] = 'Calendário de Aniversários';
+$labels['displaybirthdayscalendar'] = 'Mostrar calendário de aniversários';
+$labels['birthdayscalendarsources'] = 'Desses catálogos de endereços';
+$labels['birthdayeventtitle'] = '$name\' - Aniversário';
+$labels['birthdayage'] = '$age anos';
 $labels['objectchangelog'] = 'Mudar Histórico';
+$labels['objectdiff'] = 'Alterações da $rev1 para $rev2';
+$labels['objectnotfound'] = 'Falha ao ler os dados do evento';
+$labels['objectchangelognotavailable'] = 'Não é possível alterar o histórico deste evento';
+$labels['objectdiffnotavailable'] = 'Não é possível comparar as revisões selecionadas';
+$labels['revisionrestoreconfirm'] = 'Confirmar a restauração da revisão $rev deste evento? Os dados atuais serão substituídos pelos da versão anterior.';
+$labels['objectrestoresuccess'] = 'Revisão $rev restaurada com sucesso';
+$labels['objectrestoreerror'] = 'Falha ao restaurar a revisão antiga';
+$labels['arialabelminical'] = 'Seleção da data do calendário';
+$labels['arialabelcalendarview'] = 'Vista do calendário';
+$labels['arialabelsearchform'] = 'Formulário de pesquisa de eventos';
+$labels['arialabelquicksearchbox'] = 'Pesquisa de eventos';
+$labels['arialabelcalsearchform'] = 'Formulário de pesquisa de calendários';
+$labels['calendaractions'] = 'Ações do calendário';
+$labels['arialabeleventattendees'] = 'Lista de participantes do evento';
+$labels['arialabeleventresources'] = 'Lista de recursos para eventos';
+$labels['arialabelresourcesearchform'] = 'Formulário de pesquisa de recursos';
+$labels['arialabelresourceselection'] = 'Recursos disponíveis';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/pt_PT.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/pt_PT.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/ru_RU.inc Changed

@@ -27,13 +27,18 @@
 $labels['aftermoveto'] = 'Переместить в...';
 $labels['itipoptions'] = 'Приглашения на события';
 $labels['afteraction'] = 'После того, как приглашение или сообщение о его изменении обработано';
+$labels['showweekno'] = 'Показать номера недели';
 $labels['weeknonone'] = 'никогда';
+$labels['weeknodatepicker'] = 'только в режиме выбора даты';
+$labels['weeknoall'] = 'посмотреть в режиме выбора даты и календаря';
 $labels['calendar'] = 'Календарь';
 $labels['calendars'] = 'Календари';
 $labels['category'] = 'Категория';
 $labels['categories'] = 'Категории';
+$labels['addcalendar'] = 'Добавить календарь';
 $labels['createcalendar'] = 'Создать новый календарь';
-$labels['editcalendar'] = 'Редактировать свойства календаря';
+$labels['editcalendar'] = 'Редактировать/Поделиться календарь';
+$labels['deletecalendar'] = 'Удалить календарь';
 $labels['name'] = 'Имя';
 $labels['color'] = 'Цвет';
 $labels['day'] = 'День';
@@ -96,6 +101,7 @@
 $labels['parentcalendar'] = 'Вставить внутри';
 $labels['searchearlierdates'] = '« Искать события раньше';
 $labels['searchlaterdates'] = 'Искать события позже »';
+$labels['earlierevents'] = 'Ранее';
 $labels['laterevents'] = 'Позднее';
 $labels['andnmore'] = '$nr больше...';
 $labels['togglerole'] = 'Кликните для переключения роли';
@@ -107,8 +113,11 @@
 $labels['showurl'] = 'Показать URL календаря';
 $labels['showurldescription'] = 'Используйте следующий адрес для просмотра Вашего календаря из других приложений. Вы можете скопировать и вставить это в любое приложение которое поддерживает формат iCal.';
 $labels['caldavurldescription'] = 'Скопируйте этот адрес в клиент, <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">поддерживающий CalDAV</a> (например, Evolution или Mozilla Thunderbird) для полной синхронизации данного календаря со своим компьютером или мобильным устройством.';
+$labels['showfburl'] = 'Показать свободный-занятый URL';
+$labels['fburldescription'] = 'Используйте следующий адрес для доступа к информации свободе-занятости из других приложений. Вы можете скопировать и вставить это в любое программное обеспечение календаря, которое поддерживает информацию о свободе-занятости в формате iCal. Для этого URL аутентификация не требуется.';
 $labels['findcalendars'] = 'Найти календари...';
 $labels['searchterms'] = 'Условия поиска';
+$labels['findevents'] = 'Найти события';
 $labels['calsearchresults'] = 'Доступные календари';
 $labels['calendarsubscribe'] = 'Всегда показывать';
 $labels['nocalendarsfound'] = 'Календарей не найдено';
@@ -118,6 +127,8 @@
 $labels['invitationsdeclined'] = 'Отклонённые приглашения';
 $labels['changepartstat'] = 'Изменить статус участника';
 $labels['rsvpcomment'] = 'Текст приглашения';
+$labels['eventstartsync'] = 'Переместить дату начала события к первому случаю';
+$labels['weekshort'] = 'Нд';
 $labels['listrange'] = 'Диапазон:';
 $labels['listsections'] = 'Разделить на:';
 $labels['smartsections'] = 'Умные секции';
@@ -165,6 +176,7 @@
 $labels['suggestedslot'] = 'Предлагаемое время';
 $labels['noslotfound'] = 'Невозможно найти свободное время';
 $labels['invitationsubject'] = 'Вы приглашены на "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nКогда: \$date\n\nПриглашенные: \$attendees\n\nВо вложении вы найдёте файл iCalendar со всеми деталями события, который вы можете импортировать в приложение календаря.";
 $labels['invitationattendlinks'] = "В случае, если Ваш почтовый клиент не поддерживает запросы iTip, Вы можете использовать ссылку данную ниже, чтобы принять или отклонить это приглашение:\n\$url";
 $labels['eventupdatesubject'] = '"$title" было обновлено';
 $labels['eventupdatesubjectempty'] = 'Событие, которое касается Вас, было обновлено';
@@ -190,11 +202,13 @@
 $labels['openpreview'] = 'Проверить календарь';
 $labels['noearlierevents'] = 'Нет предыдущих событий';
 $labels['nolaterevents'] = 'Нет последующих событий';
+$labels['legend'] = 'Легенда';
 $labels['resource'] = 'Ресурс';
 $labels['addresource'] = 'Зарезервировать ресурс';
 $labels['findresources'] = 'Найти ресурсы';
 $labels['resourcedetails'] = 'Подробнее';
 $labels['resourceavailability'] = 'Доступность';
+$labels['resourceprops'] = 'Свойства ресурса';
 $labels['resourceowner'] = 'Владелец';
 $labels['resourceadded'] = 'Ресурс добавлен в ваше событие';
 $labels['tabsummary'] = 'Сводка';
@@ -211,6 +225,7 @@
 $labels['errorsaving'] = 'Ошибка сохранения изменений.';
 $labels['operationfailed'] = 'Не удалось выполнить запрошенную операцию.';
 $labels['invalideventdates'] = 'Неверная дата! Пожалуйста проверьте данные.';
+$labels['emptyeventtitle'] = 'Сводка событий не может быть пустой.';
 $labels['invalidcalendarproperties'] = 'Неверные свойства календаря! Пожалуйста введите допустимые данные.';
 $labels['searchnoresults'] = 'Событие не найдено в выбранных календарях.';
 $labels['successremoval'] = 'Событие успешно удалено.';
@@ -223,6 +238,7 @@
 $labels['importedsuccessfully'] = 'Событие успешно добавлено в \'$calendar\'';
 $labels['updatedsuccessfully'] = 'Событие успешно обновлено в \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Успешно обновлен статус участника';
+$labels['errorunknownattendee'] = 'Не удалось найти информацию об участнике.';
 $labels['itipsendsuccess'] = 'Приглашания отправлены участникам.';
 $labels['itipresponseerror'] = 'Не удалось послать ответ на это приглашение';
 $labels['itipinvalidrequest'] = 'Это приглашение больше не действительно';
@@ -232,6 +248,7 @@
 $labels['importnone'] = 'Не найдено событий для импорта';
 $labels['importerror'] = 'Ошибка при импорте';
 $labels['aclnorights'] = 'Вы не имеете прав администратора для этого календаря.';
+$labels['importtext'] = 'Вы можете загружать события в формате <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a>  (.ics).';
 $labels['changeeventconfirm'] = 'Изменить событие';
 $labels['removeeventconfirm'] = 'Удалить событие';
 $labels['changerecurringeventwarning'] = 'Это - повторяющееся событие. Хотели бы Вы редактировать только текущее событие, это и все будущие повторения, все события или сохранять его как новое событие?';
@@ -241,6 +258,7 @@
 $labels['futurevents'] = 'Будущие';
 $labels['allevents'] = 'Все';
 $labels['saveasnew'] = 'Сохранить как новое';
+$labels['recurrenceerror'] = 'Не удалось разрешить правило повторения для указанной даты начала.';
 $labels['birthdays'] = 'Дни рождения';
 $labels['birthdayscalendar'] = 'Календарь Дней Рождения';
 $labels['displaybirthdayscalendar'] = 'Показывать календарь Дней Рождения';
@@ -261,8 +279,10 @@
 $labels['arialabelquicksearchbox'] = 'Поиск событий';
 $labels['arialabelcalsearchform'] = 'Форма поиска календарей';
 $labels['calendaractions'] = 'Действия с календарями';
+$labels['calendarprops'] = 'Свойства календаря';
 $labels['arialabeleventattendees'] = 'Участники события';
 $labels['arialabeleventresources'] = 'Ресурсы события';
 $labels['arialabelresourcesearchform'] = 'Форма поиска ресурсов';
 $labels['arialabelresourceselection'] = 'Доступные ресурсы';
+$labels['arialabeleventform'] = 'Форма редактирования события';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/sk_SK.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/sk_SK.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/sl_SI.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/sl_SI.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/sv.inc Added

@@ -0,0 +1,260 @@
+<?php
+/**
+ * Localizations for Kolab Calendar plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
+ */
+$labels['default_view'] = 'Standardvy';
+$labels['time_format'] = 'Tidformat';
+$labels['timeslots'] = 'Tidsluckor per timme';
+$labels['first_day'] = 'Första veckodag';
+$labels['first_hour'] = 'Dagen börjar';
+$labels['workinghours'] = 'Arbetstid';
+$labels['add_category'] = 'Lägg till kategori';
+$labels['remove_category'] = 'Ta bort kategori';
+$labels['defaultcalendar'] = 'Skapa nya händelser i';
+$labels['eventcoloring'] = 'Händelsefärg';
+$labels['coloringmode0'] = 'Enligt kalender';
+$labels['coloringmode1'] = 'Enligt kategori';
+$labels['coloringmode2'] = 'Kalender för översikt, kategori för innehåll';
+$labels['coloringmode3'] = 'Kategori för översikt, kalender för innehåll';
+$labels['afternothing'] = 'Gör inget';
+$labels['aftertrash'] = 'Flytta till papperskorgen';
+$labels['afterdelete'] = 'Ta bort meddelandet';
+$labels['afterflagdeleted'] = 'Märk som borttaget';
+$labels['aftermoveto'] = 'Flytta till ...';
+$labels['itipoptions'] = 'Händelseinbjudningar';
+$labels['afteraction'] = 'Efter en inbjudan eller uppdatering bearbetats meddelande';
+$labels['calendar'] = 'Kalender';
+$labels['calendars'] = 'Kalendrar';
+$labels['category'] = 'Kategori';
+$labels['categories'] = 'Kategorier';
+$labels['createcalendar'] = 'Skapa ny kalender';
+$labels['name'] = 'Namn';
+$labels['color'] = 'Färg';
+$labels['day'] = 'Dag';
+$labels['week'] = 'Vecka';
+$labels['month'] = 'Månad';
+$labels['agenda'] = 'Agenda';
+$labels['new'] = 'Ny';
+$labels['new_event'] = 'Ny händelse';
+$labels['edit_event'] = 'Redigera händelse';
+$labels['edit'] = 'Redigera';
+$labels['save'] = 'Spara';
+$labels['removelist'] = 'Ta bort från lista';
+$labels['cancel'] = 'Avbryt';
+$labels['select'] = 'Välj';
+$labels['print'] = 'Skriv ut';
+$labels['printtitle'] = 'Skriv ut kalendrar';
+$labels['title'] = 'Sammanfattning';
+$labels['description'] = 'Beskrivning';
+$labels['all-day'] = 'heldag';
+$labels['export'] = 'Exportera';
+$labels['exporttitle'] = 'Exportera till iCalendar';
+$labels['exportrange'] = 'Händelser från';
+$labels['exportattachments'] = 'Med bilagor';
+$labels['customdate'] = 'Anpassat datum';
+$labels['location'] = 'Plats';
+$labels['url'] = 'URL';
+$labels['date'] = 'Datum';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Starttid';
+$labels['end'] = 'Slut';
+$labels['endtime'] = 'Sluttid';
+$labels['repeat'] = 'Upprepa';
+$labels['selectdate'] = 'Välj datum';
+$labels['freebusy'] = 'Visa mig som';
+$labels['free'] = 'Ledig';
+$labels['busy'] = 'Upptagen';
+$labels['outofoffice'] = 'Frånvarande';
+$labels['tentative'] = 'Preliminärt';
+$labels['mystatus'] = 'Min status';
+$labels['status'] = 'Status';
+$labels['status-confirmed'] = 'Bekräftad';
+$labels['status-cancelled'] = 'Inställd';
+$labels['status-tentative'] = 'Preliminärt';
+$labels['priority'] = 'Prioritet';
+$labels['sensitivity'] = 'Integritet';
+$labels['public'] = 'publik';
+$labels['private'] = 'privat';
+$labels['confidential'] = 'konfidentiell';
+$labels['links'] = 'Referens';
+$labels['alarms'] = 'Påminnelse';
+$labels['comment'] = 'Kommentar';
+$labels['created'] = 'Skapad';
+$labels['changed'] = 'Senast ändrad';
+$labels['unknown'] = 'Okänd';
+$labels['eventoptions'] = 'Alternativ';
+$labels['generated'] = 'genererad vid';
+$labels['eventhistory'] = 'Historik';
+$labels['removelink'] = 'Ta bort e-postreferens';
+$labels['printdescriptions'] = 'Skriv ut beskrivning';
+$labels['parentcalendar'] = 'Infoga inuti';
+$labels['searchearlierdates'] = '« Sök efter tidigare händelser';
+$labels['searchlaterdates'] = 'Sök efter senare händelser »';
+$labels['andnmore'] = '$nr fler ...';
+$labels['togglerole'] = 'Klicka för att växla roll';
+$labels['createfrommail'] = 'Spara som händelse';
+$labels['importevents'] = 'Importera händelser';
+$labels['importrange'] = 'Händelser från';
+$labels['onemonthback'] = '1 månad bakåt';
+$labels['nmonthsback'] = '$nr månader bakåt';
+$labels['showurl'] = 'Visa kalender-URL';
+$labels['showurldescription'] = 'Använd följande adress för åtkomst (endast läsbar) till din kalender från andra applikationer. Du kan kopiera och klistra in adressen in i ett kalenderprogram som stöder iCal-formatet.';
+$labels['caldavurldescription'] = 'Kopiera denna adress till ett <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> klientprogram (t.ex. Evolution eller Mozilla Thunderbird) för att helt synkronisera denna specifika kalender med din dator eller mobila enhet.';
+$labels['findcalendars'] = 'Hitta kalendrar ...';
+$labels['searchterms'] = 'Sökord';
+$labels['calsearchresults'] = 'Tillgängliga kalendrar';
+$labels['calendarsubscribe'] = 'Lista permanent';
+$labels['nocalendarsfound'] = 'Inga kalendrar hittades';
+$labels['nrcalendarsfound'] = '$nr kalendrar hittades';
+$labels['quickview'] = 'Visa endast denna kalender';
+$labels['invitationspending'] = 'Avvaktade inbjudningar';
+$labels['invitationsdeclined'] = 'Avböjda inbjudningar';
+$labels['changepartstat'] = 'Ändra deltagarstatus';
+$labels['rsvpcomment'] = 'Inbjudningstext';
+$labels['listrange'] = 'Intervall att visa';
+$labels['listsections'] = 'Dela upp i';
+$labels['smartsections'] = 'Smarta sektioner';
+$labels['until'] = 'tills';
+$labels['today'] = 'Idag';
+$labels['tomorrow'] = 'Imorgon';
+$labels['thisweek'] = 'Denna vecka';
+$labels['nextweek'] = 'Nästa vecka';
+$labels['prevweek'] = 'Föregående vecka';
+$labels['thismonth'] = 'Denna månad';
+$labels['nextmonth'] = 'Nästa månad';
+$labels['weekofyear'] = 'Vecka';
+$labels['pastevents'] = 'Förflutna';
+$labels['futureevents'] = 'Framtida';
+$labels['showalarms'] = 'Visa påminnelser';
+$labels['defaultalarmtype'] = 'Standardinställning för påminnelser';
+$labels['defaultalarmoffset'] = 'Standartid för påminnelser';
+$labels['attendee'] = 'Deltagare';
+$labels['role'] = 'Roll';
+$labels['availability'] = 'Tillg.';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Lägg till deltagare';
+$labels['roleorganizer'] = 'Organisatör';
+$labels['rolerequired'] = 'Obligatorisk';
+$labels['roleoptional'] = 'Valfritt';
+$labels['rolechair'] = 'Stol';
+$labels['rolenonparticipant'] = 'Frånvarande';
+$labels['cutypeindividual'] = 'Individuell';
+$labels['cutypegroup'] = 'Grupp';
+$labels['cutyperesource'] = 'Resurs';
+$labels['cutyperoom'] = 'Rum';
+$labels['availfree'] = 'Ledig';
+$labels['availbusy'] = 'Upptagen';
+$labels['availunknown'] = 'Okänd';
+$labels['availtentative'] = 'Preliminärt';
+$labels['availoutofoffice'] = 'Frånvarande';
+$labels['scheduletime'] = 'Hitta tillgänglighet';
+$labels['sendinvitations'] = 'Skicka inbjudningar';
+$labels['sendnotifications'] = 'Meddela deltagare om ändringar';
+$labels['sendcancellation'] = 'Meddela deltagare om att händelsen ställts in';
+$labels['onlyworkinghours'] = 'Sök tillgänglighet inom min arbetstid';
+$labels['reqallattendees'] = 'Obligatorisk/alla deltagare';
+$labels['prevslot'] = 'Föregående lucka';
+$labels['nextslot'] = 'Nästa lucka';
+$labels['suggestedslot'] = 'Föreslagen lucka';
+$labels['noslotfound'] = 'Det gick inte att hitta en ledig tidslucka';
+$labels['invitationsubject'] = 'Du har blivit inbjuden till "$title"';
+$labels['invitationattendlinks'] = "Om din e-postklient inte stöder iTip-förfrågningar kan du använda följande länk för att antingen tacka ja eller eller nej till denna inbjudan:\n\$url";
+$labels['eventupdatesubject'] = '"$title" har uppdaterats';
+$labels['eventupdatesubjectempty'] = 'En händelse som berör dig har uppdaterats';
+$labels['eventupdatemailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHärmed bifogas en iCalendar-fil med uppdaterad information som du kan importera till din kalenderapplikation.";
+$labels['eventcancelmailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHändelsen har ställts in av \$organizer.\n\nHärmed bifogas en iCalendar-fil med uppdaterad information om händelsen.";
+$labels['itipobjectnotfound'] = 'Den händelse som avses i detta meddelande hittades inte i din kalender.';
+$labels['itipmailbodyaccepted'] = "\$sender har accepterat inbjudan till följande händelse:\n\n*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender har preliminärt accepterat inbjudan till följande evenemang:\n\n*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender har tackat nej till inbjudan till följande händelse:\n\n*\$title*\n\nNär: \$date\n\nIbjudna: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender har avvisat ditt deltagande i följande händelse:\n\n*\$title*\n\nNär: \$dat";
+$labels['itipmailbodydelegated'] = "\$sender har delegerat deltagandet i följande händelse:\n\n*\$title*\n\nNär: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender har delegerat deltagandet i följande händelse till dig:\n\n*\$title*\n\nNär: \$date";
+$labels['itipdeclineevent'] = 'Vill du tacka nej till inbjudan till denna händelse?';
+$labels['declinedeleteconfirm'] = 'Vill du även ta bort denna händelse, som du tackat nej till, från din kalender?';
+$labels['itipcomment'] = 'Kommentar till inbjudan/meddelande';
+$labels['itipcommenttitle'] = 'Denna kommentar kommer att bifogas i inbjudan/meddelandet som skickas till deltagarna';
+$labels['notanattendee'] = 'Du är inte listad som en deltagare i denna händelse';
+$labels['eventcancelled'] = 'Händelsen har ställts in';
+$labels['saveincalendar'] = 'Spara i';
+$labels['updatemycopy'] = 'Uppdatera i min kalender';
+$labels['savetocalendar'] = 'Spara till kalender';
+$labels['openpreview'] = 'Kontrollera kalender';
+$labels['noearlierevents'] = 'Inga tidigare händelser';
+$labels['nolaterevents'] = 'Inga senare händelser';
+$labels['resource'] = 'Resurs';
+$labels['addresource'] = 'Boka resurs';
+$labels['findresources'] = 'Hitta resurser';
+$labels['resourcedetails'] = 'Detaljer';
+$labels['resourceavailability'] = 'Tillgänglighet';
+$labels['resourceowner'] = 'Ägare';
+$labels['resourceadded'] = 'Resursen har kopplats till din händelser ';
+$labels['tabsummary'] = 'Sammanfattning';
+$labels['tabrecurrence'] = 'Återkommande';
+$labels['tabattendees'] = 'Deltagare';
+$labels['tabresources'] = 'Resurser';
+$labels['tabattachments'] = 'Bilagor';
+$labels['tabsharing'] = 'Delning';
+$labels['deleteobjectconfirm'] = 'Vill du verkligen ta bort denna händelse';
+$labels['deleteventconfirm'] = 'Vill du verkligen ta bort denna händelse';
+$labels['deletecalendarconfirm'] = 'Vill du verkligen ta bort denna kalender med alla dess händelser?';
+$labels['deletecalendarconfirmrecursive'] = 'Vill du verkligen ta bort denna kalender med alla händelser och delkalendrar?';
+$labels['savingdata'] = 'Sparar data ...';
+$labels['errorsaving'] = 'Misslyckades att spara ändringar.';
+$labels['operationfailed'] = 'Den begärda åtgärden misslyckades.';
+$labels['invalideventdates'] = 'Ogiltiga datum angivna! Kontrollera din inmatning.';
+$labels['invalidcalendarproperties'] = 'Ogiltiga kalenderegenskaper! Var god ange ett giltigt namn.';
+$labels['searchnoresults'] = 'Inga händelser hittades i de valda kalendrarna.';
+$labels['successremoval'] = 'Händelsen har tagits bort.';
+$labels['successrestore'] = 'Händelsen har återställts.';
+$labels['errornotifying'] = 'Det gick inte att skicka meddelande till händelsens deltagare';
+$labels['errorimportingevent'] = 'Det gick inte att importera händelsen';
+$labels['importwarningexists'] = 'En kopia av denna händelse finns redan i din kalender.';
+$labels['newerversionexists'] = 'En nyare version av denna händelse finns redan! Åtgärd avbruten.';
+$labels['nowritecalendarfound'] = 'Ingen kalender hittades att spara händelsen i';
+$labels['importedsuccessfully'] = 'Händelsen har lagts till i \'$calendar\'';
+$labels['updatedsuccessfully'] = 'Händelsen uppdaterades i \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Uppdaterade deltagarens status';
+$labels['itipsendsuccess'] = 'Inbjudan har skickats till deltagare.';
+$labels['itipresponseerror'] = 'Det gick inte att skicka ett svar på inbjudan till denna händelse';
+$labels['itipinvalidrequest'] = 'Denna inbjudan är inte längre giltig';
+$labels['sentresponseto'] = 'Skickade svar på inbjudan till $mailto';
+$labels['localchangeswarning'] = 'Du är på väg att göra ändringar som endast kommer att återspeglas i din kalender och inte skickas till organisatören av händelsen.';
+$labels['importsuccess'] = 'Importerade $nr händelser';
+$labels['importnone'] = 'Hittade inga händelser att importera';
+$labels['importerror'] = 'Ett fel uppstod vid import';
+$labels['aclnorights'] = 'Du har inga administratörsrättigheter i denna kalender.';
+$labels['changeeventconfirm'] = 'Ändra händelse';
+$labels['removeeventconfirm'] = 'Ta bort händelse';
+$labels['changerecurringeventwarning'] = 'Detta är en återkommande händelse. Vill du redigera endast den aktuella händelsen, denna och alla framtida händelser, alla händelser eller spara den som en ny händelse?';
+$labels['removerecurringeventwarning'] = 'etta är en återkommande händelse. Vill du ta bort endast den aktuella händelsen, denna och alla framtida händelser eller alla förekomster av denna händelse';
+$labels['currentevent'] = 'Nuvarande';
+$labels['futurevents'] = 'Framtida';
+$labels['allevents'] = 'Alla';
+$labels['saveasnew'] = 'Spara som ny';
+$labels['birthdays'] = 'Födelsedagar';
+$labels['birthdayscalendar'] = 'Födelsedagskalender';
+$labels['displaybirthdayscalendar'] = 'Visa födelsedagskalender';
+$labels['birthdayscalendarsources'] = 'Från dessa adressböcker';
+$labels['birthdayeventtitle'] = '$name\s födelsedag';
+$labels['birthdayage'] = '$age år';
+$labels['objectchangelog'] = 'Ändringshistorik';
+$labels['objectnotfound'] = 'Det gick inte att läsa in data för händelsen';
+$labels['objectchangelognotavailable'] = 'Ändringshistorik är inte tillgänglig för denna händelse';
+$labels['objectdiffnotavailable'] = 'Ingen jämförelse möjlig för valda revisioner';
+$labels['revisionrestoreconfirm'] = 'Vill du verkligen återställa revision $rev för denna händelse? Det kommer att ersätta den aktuella händelsen med den gamla versionen.';
+$labels['arialabelminical'] = 'Kalender datumurval';
+$labels['arialabelcalendarview'] = 'Kalender vy';
+$labels['arialabelsearchform'] = 'Händelse sökformulär';
+$labels['arialabelquicksearchbox'] = 'Händelse sökinmatning';
+$labels['arialabelcalsearchform'] = 'Kalender sökformulär';
+$labels['calendaractions'] = 'Kalender åtgärder';
+$labels['arialabeleventattendees'] = 'Händelse deltagarlista';
+$labels['arialabeleventresources'] = 'Händelse resurslista';
+$labels['arialabelresourcesearchform'] = 'Resurser sökformulär';
+$labels['arialabelresourceselection'] = 'Tillgängliga resurser';
+?>

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/sv_SE.inc Changed

@@ -27,12 +27,12 @@
 $labels['aftermoveto'] = 'Flytta till ...';
 $labels['itipoptions'] = 'Händelseinbjudningar';
 $labels['afteraction'] = 'Efter en inbjudan eller uppdatering bearbetats meddelande';
+$labels['weeknonone'] = 'aldrig';
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalendrar';
 $labels['category'] = 'Kategori';
 $labels['categories'] = 'Kategorier';
 $labels['createcalendar'] = 'Skapa ny kalender';
-$labels['editcalendar'] = 'Redigera kalenderegenskaper';
 $labels['name'] = 'Namn';
 $labels['color'] = 'Färg';
 $labels['day'] = 'Dag';
@@ -95,6 +95,7 @@
 $labels['parentcalendar'] = 'Infoga inuti';
 $labels['searchearlierdates'] = '« Sök efter tidigare händelser';
 $labels['searchlaterdates'] = 'Sök efter senare händelser »';
+$labels['laterevents'] = 'Senare';
 $labels['andnmore'] = '$nr fler ...';
 $labels['togglerole'] = 'Klicka för att växla roll';
 $labels['createfrommail'] = 'Spara som händelse';
@@ -167,6 +168,7 @@
 $labels['eventupdatesubject'] = '"$title" har uppdaterats';
 $labels['eventupdatesubjectempty'] = 'En händelse som berör dig har uppdaterats';
 $labels['eventupdatemailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHärmed bifogas en iCalendar-fil med uppdaterad information som du kan importera till din kalenderapplikation.";
+$labels['eventcancelsubject'] = '"$title" har ställts in';
 $labels['eventcancelmailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHändelsen har ställts in av \$organizer.\n\nHärmed bifogas en iCalendar-fil med uppdaterad information om händelsen.";
 $labels['itipobjectnotfound'] = 'Den händelse som avses i detta meddelande hittades inte i din kalender.';
 $labels['itipmailbodyaccepted'] = "\$sender har accepterat inbjudan till följande händelse:\n\n*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees";
@@ -244,10 +246,13 @@
 $labels['birthdayeventtitle'] = '$name\s födelsedag';
 $labels['birthdayage'] = '$age år';
 $labels['objectchangelog'] = 'Ändringshistorik';
+$labels['objectdiff'] = 'Ändringar från $rev1 till $rev2';
 $labels['objectnotfound'] = 'Det gick inte att läsa in data för händelsen';
 $labels['objectchangelognotavailable'] = 'Ändringshistorik är inte tillgänglig för denna händelse';
 $labels['objectdiffnotavailable'] = 'Ingen jämförelse möjlig för valda revisioner';
 $labels['revisionrestoreconfirm'] = 'Vill du verkligen återställa revision $rev för denna händelse? Det kommer att ersätta den aktuella händelsen med den gamla versionen.';
+$labels['objectrestoresuccess'] = 'Version $rev har återställts ';
+$labels['objectrestoreerror'] = 'Det gick inte att återställa den gamla versionen';
 $labels['arialabelminical'] = 'Kalender datumurval';
 $labels['arialabelcalendarview'] = 'Kalender vy';
 $labels['arialabelsearchform'] = 'Händelse sökformulär';

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/th_TH.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/th_TH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/uk_UA.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/uk_UA.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/calendar/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/calendar/skins/elastic/templates/calendar.html -> iRony-0.4.3.tar.gz/lib/plugins/calendar/skins/elastic/templates/calendar.html Changed

@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="calendar.calendar" /></h1>
 
 
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-calendars">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-calendars">
 	<div class="header">
 		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-calendars" class="header-title"><roundcube:label name="calendar.calendars" /></span>
@@ -12,7 +12,7 @@
 			title="calendar.calendaractions" class="button icon sidebar-menu" data-popup="calendaractions-menu"
 			innerClass="inner" label="actions" />
 	</div>
-	<roundcube:object name="libkolab.folder_search_form" id="calendarlistsearch" wrapper="searchbar toolbar"
+	<roundcube:object name="libkolab.folder_search_form" id="calendarlistsearch" wrapper="searchbar menu"
 		ariatag="h2" label="calsearchform" label-domain="calendar" buttontitle="findcalendars" />
 	<div id="calendars-content" class="scroller">
 		<roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist listing iconized" />
@@ -22,14 +22,14 @@
 </div>
 
 
-<div class="content selected no-navbar" role="main">
+<div id="layout-content" class="selected no-navbar" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="calendar.calendars" /></span></a>
 		<span class="header-title"></span>
 		
-		<div id="calendartoolbar" class="toolbar">
+		<div id="calendartoolbar" class="toolbar menu">
 			<roundcube:button command="addevent" type="link"
 				class="button create disabled" classAct="button create"
 				label="create" title="calendar.new_event" innerClass="inner" />
@@ -46,14 +46,14 @@
 			<roundcube:container name="toolbar" id="calendartoolbar" />
 		</div>
 	</div>
-	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar menu"
 		label="searchform" buttontitle="calendar.findevents" label-domain="calendar" ariatag="h2" />
 	<h2 id="aria-label-calendarview" class="voice"><roundcube:label name="calendar.arialabelcalendarview" /></h2>
 	<div id="calendar" class="content" role="main" aria-labelledby="aria-label-calendarview" data-elastic-mode="true">
 		<roundcube:object name="plugin.agenda_options" id="agendaoptions" />
 		<div id="searchcontrols" class="search-controls"></div>
 	</div>
-	<div class="footer toolbar content-frame-navigation" role="toolbar" data-hidden="big">
+	<div class="footer toolbar menu content-frame-navigation" role="toolbar" data-hidden="big">
 		<a href="#" class="button prev" onclick="$('.fc-prev-button').click()"><span class="inner"><roundcube:label name="previous" /></span></a>
 		<a href="#" class="button today" onclick="$('.fc-today-button').click()"><span class="inner"><roundcube:label name="today" /></span></a>
 		<a href="#" class="button date" onclick="window.calendar_datepicker()"><span class="inner"><roundcube:label name="date" /></span></a>
@@ -140,7 +140,7 @@
 
 <div id="calendaractions-menu" class="popupmenu">
 	<h3 id="aria-label-calendaroptions" class="voice"><roundcube:label name="calendar.calendaractions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-calendaroptions">
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-calendaroptions">
 		<roundcube:button type="link-menuitem" command="calendar-create" label="calendar.addcalendar" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="calendar-edit" label="calendar.editcalendar" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="calendar-delete" label="calendar.deletecalendar" class="delete disabled" classAct="delete active" />
@@ -159,7 +159,7 @@
 
 <div id="eventoptionsmenu" class="popupmenu">
 	<h3 id="aria-label-eventoptions" class="voice"><roundcube:label name="calendar.eventoptions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-eventoptions">
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-eventoptions">
 		<roundcube:button type="link-menuitem" command="event-download" label="download" class="download disabled" classAct="download active" />
 		<roundcube:button type="link-menuitem" command="event-sendbymail" label="send" class="send disabled" classAct="send active" />
 		<roundcube:button type="link-menuitem" command="event-copy" label="copy" class="copy disabled" classAct="copy active" />
@@ -176,7 +176,7 @@
 			<span class="header-title"><roundcube:label name="calendar.tabresources" /></span>
 		</div>
 		<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox"
-			wrapper="searchbar toolbar" ariatag="h4" buttontitle="calendar.findresources"
+			wrapper="searchbar menu" ariatag="h4" buttontitle="calendar.findresources"
 			label="resourcesearchform" label-domain="calendar" />
 		<div class="scroller">
 			<roundcube:object name="plugin.resources_list" id="resources-list" class="listing treelist" />

iRony-0.4.2.tar.gz/lib/plugins/calendar/skins/elastic/templates/eventedit.html -> iRony-0.4.3.tar.gz/lib/plugins/calendar/skins/elastic/templates/eventedit.html Changed

@@ -33,11 +33,11 @@
 			<div class="form-group row" id="edit-alarms">
 				<label for="edit-alarm-item" class="col-sm-2 col-form-label"><roundcube:label name="calendar.alarms" /></label>
 				<div class="col-sm-10 alarms-input">
-					<div class="edit-alarm-item first">
+					<div class="edit-alarm-item input-group first">
 						<roundcube:object name="plugin.alarm_select" id="edit-alarm-item" />
-						<span class="edit-alarm-buttons">
-							<a href="#add" class="icon button btn create add-alarm"><span class="inner"><roundcube:label name="libcalendaring.addalarm" /></span></a>
-							<a href="#delete" class="icon button btn delete delete-alarm"><span class="inner"><roundcube:label name="libcalendaring.removealarm" /></span></a>
+						<span class="edit-alarm-buttons input-group-append">
+							<a href="#add" class="icon button btn add add-alarm input-group-text"><span class="inner"><roundcube:label name="libcalendaring.addalarm" /></span></a>
+							<a href="#delete" class="icon button btn delete delete-alarm input-group-text"><span class="inner"><roundcube:label name="libcalendaring.removealarm" /></span></a>
 						</span>
 					</div>
 				</div>

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/kolab2fa.js -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/kolab2fa.js Changed

@@ -100,7 +100,7 @@
                     open: function(event, ui) {
                         $(event.target).find('input[name="_verify_code"]').keypress(function(e) {
                             if (e.which == 13) {
-                                $(e.target).closest('.ui-dialog').find('.ui-button.mainaction').click();
+                                $(e.target).closest('.ui-dialog').find('button.mainaction').click();
                             }
                         });
                     },
@@ -242,7 +242,7 @@
                             // submit code on <Enter>
                             $(event.target).find('input[name="_code"]').keypress(function(e) {
                                 if (e.which == 13) {
-                                    $(e.target).closest('.ui-dialog').find('.ui-button.mainaction').click();
+                                    $(e.target).closest('.ui-dialog').find('button.mainaction').click();
                                 }
                             }).select();
                         },

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/bg_BG.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/bg_BG.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/ca_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/ca_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/cs_CZ.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/cs_CZ.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/da_DK.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/da_DK.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/de.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/de_CH.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/de_CH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/de_DE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/el.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/el.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/es_AR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/es_AR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/es_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/es_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/et_EE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/et_EE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/fi_FI.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/fi_FI.inc Changed

@@ -6,11 +6,30 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_2fa/
  */
+$labels['factor'] = 'Tekijä';
+$labels['secret'] = 'Salainen avain';
 $labels['created'] = 'Luotu';
 $labels['remove'] = 'Poista';
 $labels['continue'] = 'Jatka';
+$labels['settingslist'] = 'Monivaiheinen tunnistautuminen';
+$labels['settingstitle'] = 'Tunnistautumistekijät';
+$labels['totp'] = 'Mobiilisovellus (TOTP)';
+$labels['hotp'] = 'Mobiilisovellus (HOTP)';
+$labels['yubikey'] = 'Yubikey';
+$labels['or'] = 'tai';
 $labels['yes'] = 'kyllä';
 $labels['no'] = 'ei';
 $labels['label'] = 'Nimi';
-$labels['verifycodeexplainhotp'] = $labels['verifycodeexplaintotp'];
+$labels['qrcode'] = 'QR-koodi';
+$labels['showqrcode'] = 'Näytä QR-koodi';
+$labels['yubikeyid'] = 'YubiKey-tunnisteesi';
+$labels['yubikeyidexplainyubikey'] = 'Paina YubiKeytasi kerran ja kirjoita luotu koodi';
+$labels['addfactor'] = 'Lisää tunnistautumistekijä';
+$labels['testfactor'] = 'Testaa tätä tekijää';
+$labels['verifycode'] = 'Vahvista koodi';
+$labels['loginexpired'] = 'Kirjautumispyyntö vanheni! Yritä uudelleen.';
+$labels['authremoveconfirm'] = 'Haluatko varmasti poistaa tämän tunnistautumistekijän tililtäsi?';
+$labels['verifycodemissing'] = 'Kirjoita vahvistuskoodi laitteeltasi';
+$labels['factorsavesuccess'] = 'Tunnistautumistekijä tallennettu onnistuneesti';
+$labels['factorremovesuccess'] = 'Tunnistautumistekijä poistettu onnistuneesti';
 $labels['enterhighsecurity'] = 'Vahvista';

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/fr_FR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/fr_FR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/he_IL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/he_IL.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/hr_HR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/hr_HR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/hu_HU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/hu_HU.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/it_IT.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/it_IT.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/ja_JP.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/ja_JP.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/ko_KR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/ko_KR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/lv.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/lv.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/nl_NL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/nl_NL.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/pl.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/pl.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/pl_PL.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/pt_BR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/pt_BR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/pt_PT.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/pt_PT.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/ru_RU.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/sk_SK.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/sk_SK.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/sl_SI.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/sl_SI.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/sv_SE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/th_TH.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/th_TH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/uk_UA.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/uk_UA.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/vi_VN.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/vi_VN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/localization/zh_TW.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/localization/zh_TW.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_2fa/skins/elastic/templates/config.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_2fa/skins/elastic/templates/config.html Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_activesync/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.php Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_activesync/kolab_activesync_ui.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/kolab_activesync_ui.php Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/localization/de.inc Added

@@ -0,0 +1,33 @@
+<?php
+$labels['tabtitle'] = 'ActiveSync';
+$labels['activesynctitle'] = 'Verwalte ActiveSync-Geräte';
+$labels['devices'] = 'Geräte';
+$labels['devicealias'] = 'Gerätename';
+$labels['synchronize'] = 'Synchronisieren';
+$labels['withalarms'] = 'Mit Erinnerungen';
+$labels['syncsettings'] = 'Synchronisationseinstellungen';
+$labels['deviceconfig'] = 'Gerätekonfiguration';
+$labels['folderstosync'] = 'Ordner zum Synchronisieren';
+$labels['mail'] = 'E-Mail';
+$labels['contact'] = 'Kontakte';
+$labels['event'] = 'Kalender';
+$labels['task'] = 'Aufgaben';
+$labels['note'] = 'Notizen';
+$labels['configuration'] = 'Konfiguration';
+$labels['deletedevice'] = 'Gerät löschen';
+$labels['nodevices'] = 'Es sind aktuell keine Geräte registriert.<br/><br/>Um ein Gerät zu registrieren, bitte zuerst nach der Anleitung von <a href="$url" target="_blank">dieser Seite</a> mit dem Server verbinden. Anschließend sollte das Gerät für die Konfiguration hier zur Verfügung stehen.';
+$labels['savingdata'] = 'Daten werden gespeichert...';
+$labels['savingerror'] = 'Fehler beim Speichern der Konfiguration';
+$labels['notsupported'] = 'Ihr Server unterstützt keine Activesync-Konfiguration';
+$labels['devicedeleteconfirm'] = 'Wollen Sie wirklich alle Einstellungen für dieses Gerät löschen?';
+$labels['successfullydeleted'] = 'Die Geräteinstellungen wurden erfolgreich gelöscht';
+$labels['devicenotfound'] = 'Es kann nicht auf die Gerätekonfiguration zugegriffen werden.';
+$labels['devicetype'] = 'Gerätetyp';
+$labels['acsversion'] = 'Protokollversion';
+$labels['useragent'] = 'User Agent';
+$labels['friendlyname'] = 'Lesbarer Name';
+$labels['os'] = 'Betriebssystem';
+$labels['oslanguage'] = 'Betriebssystemsprache';
+$labels['phonenumber'] = 'Telefonnummer';
+$labels['arialabeldeviceframe'] = 'Formular für die Einstellungen zur Gerätesynchronisation';
+?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_activesync/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/localization/de_DE.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_activesync/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/localization/pl_PL.inc Changed

@@ -1,5 +1,33 @@
 <?php
+$labels['tabtitle'] = 'ActiveSync';
+$labels['activesynctitle'] = 'Zarządzaj urządzeniami ActiveSync';
+$labels['devices'] = 'Urządzenia';
+$labels['devicealias'] = 'Nazwa urządzenia';
+$labels['synchronize'] = 'Synchronizuj';
+$labels['withalarms'] = 'Z alarmami';
+$labels['syncsettings'] = 'Ustawienia synchronizacji';
+$labels['deviceconfig'] = 'Konfiguracja urządzenia';
+$labels['folderstosync'] = 'Foldery do synchronizacji';
+$labels['mail'] = 'Poczta';
+$labels['contact'] = 'Kontakty';
 $labels['event'] = 'Kalendarze';
 $labels['task'] = 'Zadania';
+$labels['note'] = 'Notatki';
+$labels['configuration'] = 'Konfiguracja';
+$labels['deletedevice'] = 'Usuń urządzenie';
+$labels['nodevices'] = 'Nie posiadasz żadnych zarejestrowanych urządzeń mobilnych.<br/><br/>Aby zarejestrować urządzenie, połącz je z serwerem z wykorzystaniem instrukcji z <a href="$url" target="_blank">tej strony</a>. W wyniku tego urządzenie powinno pojawić się tutaj i możliwa będzie jego konfiguracja.';
 $labels['savingdata'] = 'Zapisuję dane...';
+$labels['savingerror'] = 'Nie udało się zapisać konfiguracji';
+$labels['notsupported'] = 'Twój serwer nie obsługuje rozszerzenia metadata/annotations';
+$labels['devicedeleteconfirm'] = 'Czy na pewno chcesz usunąć konfigurację tego urządzenia?';
+$labels['successfullydeleted'] = 'Konfiguracja urządzenie została usunięta';
+$labels['devicenotfound'] = 'Nie można odczytać konfiguracji urządzenia';
+$labels['devicetype'] = 'Typ urządzenia';
+$labels['acsversion'] = 'Wersja protokołu';
+$labels['useragent'] = 'Klient';
+$labels['friendlyname'] = 'Przyjazna nazwa';
+$labels['os'] = 'System operacyjny';
+$labels['oslanguage'] = 'Język systemu';
+$labels['phonenumber'] = 'Numer telefonu';
+$labels['arialabeldeviceframe'] = 'Formularz ustawień synchronizacji urządzenia';
 ?>

iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_activesync/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/localization/sv_SE.inc Changed

@@ -1,8 +1,33 @@
 <?php
+$labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Hantera Activesync-enheter';
+$labels['devices'] = 'Enheter';
+$labels['devicealias'] = 'Enhetsnamn';
+$labels['synchronize'] = 'Synkronisera';
+$labels['withalarms'] = 'Med alarm';
+$labels['syncsettings'] = 'Synkronisera inställningar';
+$labels['deviceconfig'] = 'Enhetskonfiguration';
+$labels['folderstosync'] = 'Mappar att synkronisera';
+$labels['mail'] = 'E-post';
 $labels['contact'] = 'Kontakter';
 $labels['event'] = 'Kalendrar';
 $labels['task'] = 'Uppgifter';
 $labels['note'] = 'Anteckningar';
 $labels['configuration'] = 'Konfiguration';
+$labels['deletedevice'] = 'Ta bort enhet';
+$labels['nodevices'] = 'Det finns för närvarande inga registrerade enheter. <br/> <br/> För att registrera en enhet, anslut den till servern först enligt instruktioner på <a href="$url" target="_blank"> denna sida < / a>. Därefter bör enheten bli tillgänglig för konfigurering här.';
 $labels['savingdata'] = 'Sparar data ...';
+$labels['savingerror'] = 'Misslyckades att spara konfiguration';
+$labels['notsupported'] = 'Din server stöder inte metadata/annoteringar';
+$labels['devicedeleteconfirm'] = 'Vill du verkligen ta bort konfigurationen för denna enhet?';
+$labels['successfullydeleted'] = 'Enhetskonfigurationen togs bort';
+$labels['devicenotfound'] = 'Kan inte läsa enhetskonfiguration';
+$labels['devicetype'] = 'Enhetstyp';
+$labels['acsversion'] = 'Protokollversion';
+$labels['useragent'] = 'Användaragent';
+$labels['friendlyname'] = 'Enkelt namn';
+$labels['os'] = 'Operativsystem';
+$labels['oslanguage'] = 'OS-språk';
+$labels['phonenumber'] = 'Telefonnummer';
+$labels['arialabeldeviceframe'] = 'Inställningsformulär för enhetssynkronisering';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_activesync/skins/elastic/templates/config.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_activesync/skins/elastic/templates/config.html Changed

@@ -5,7 +5,7 @@
 <h1 class="voice"><roundcube:label name="kolab_activesync.tabtitle" /></h1>
 
 
-<div class="list listbox selected" aria-labelledby="aria-label-deviceslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-deviceslist">
 	<div class="header">
 		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
 		<span id="aria-label-deviceslist" class="header-title"><roundcube:label name="kolab_activesync.devices" /></span>
@@ -18,15 +18,15 @@
 </div>
 
 
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		
-		<div class="toolbar">
+		<div class="toolbar menu">
 			<roundcube:button command="plugin.delete-device" type="link"
-				class="button delete disabled" classAct="button delete"
+				class="delete disabled" classAct="button delete"
 				label="delete" title="kolab_activesync.deletedevice" innerclass="inner" />
 		</div>
 	</div>

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/pl_PL/LC_MESSAGES/addressbook.po -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/pl_PL/LC_MESSAGES/addressbook.po Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/sv_SE/LC_MESSAGES/addressbook.po -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/sv_SE/LC_MESSAGES/addressbook.po Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.php Changed

@@ -88,7 +88,7 @@
                 if ($this->bonnie_api) {
                     $this->add_button(array(
                         'command'    => 'contact-history-dialog',
-                        'class'      => 'history contact-history',
+                        'class'      => 'history contact-history disabled',
                         'classact'   => 'history contact-history active',
                         'innerclass' => 'icon inner',
                         'label'      => 'kolab_addressbook.showhistory',
@@ -406,13 +406,7 @@
     public function get_address_book($p)
     {
         if ($p['id']) {
-            $id = kolab_storage::id_decode($p['id']);
-
-            // check for falsely base64 decoded identifier
-            if (preg_match('![^A-Za-z0-9=/+&._ -]!', $id)) {
-                $id = $p['id'];
-            }
-
+            $id     = kolab_storage::id_decode($p['id']);
             $folder = kolab_storage::get_folder($id);
 
             // try with unencoded (old-style) identifier
@@ -831,10 +825,9 @@
         }
 
         $ldap_public = $this->rc->config->get('ldap_public');
-        $abook_type  = $this->rc->config->get('address_book_type');
 
         // Hide option if there's no global addressbook
-        if (empty($ldap_public) || $abook_type != 'ldap') {
+        if (empty($ldap_public)) {
             return $args;
         }
 
@@ -1126,9 +1119,8 @@
         // Make sure any global addressbooks are defined
         if ($abook_prio == 0 || $abook_prio == 2) {
             $ldap_public = $this->rc->config->get('ldap_public');
-            $abook_type  = $this->rc->config->get('address_book_type');
 
-            if (empty($ldap_public) || $abook_type != 'ldap') {
+            if (empty($ldap_public)) {
                 $abook_prio = 1;
             }
         }

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Changed

@@ -325,7 +325,9 @@
     public function list_records($cols = null, $subset = 0, $nocount = false)
     {
         $this->result = new rcube_result_set(0, ($this->list_page-1) * $this->page_size);
+
         $fetch_all = false;
+        $fast_mode = !empty($cols) && is_array($cols);
 
         // list member of the selected group
         if ($this->gid) {
@@ -355,7 +357,7 @@
 
             // get members by UID
             if (!empty($uids)) {
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids));
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids), $fast_mode);
                 $this->sortindex = array_merge($this->sortindex, $local_sortindex);
             }
         }
@@ -363,11 +365,11 @@
             $ids = $this->filter['ids'];
             if (count($ids)) {
                 $uids = array_map(array($this, 'id2uid'), $this->filter['ids']);
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids));
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids), $fast_mode);
             }
         }
         else {
-            $this->_fetch_contacts($query = 'contact', true);
+            $this->_fetch_contacts($query = 'contact', true, $fast_mode);
         }
 
         if ($fetch_all) {
@@ -1062,7 +1064,7 @@
     /**
      * Query storage layer and store records in private member var
      */
-    private function _fetch_contacts($query = array(), $limit = false)
+    private function _fetch_contacts($query = array(), $limit = false, $fast_mode = false)
     {
         if (!isset($this->dataset) || !empty($query)) {
             if ($limit) {
@@ -1071,7 +1073,7 @@
             }
 
             $this->sortindex = array();
-            $this->dataset   = $this->storagefolder->select($query);
+            $this->dataset   = $this->storagefolder->select($query, $fast_mode);
 
             foreach ($this->dataset as $idx => $record) {
                 $contact = $this->_to_rcube_contact($record);
@@ -1137,7 +1139,7 @@
     {
         if (!isset($this->distlists)) {
             $this->distlists = $this->groupmembers = array();
-            foreach ($this->storagefolder->select('distribution-list') as $record) {
+            foreach ($this->storagefolder->select('distribution-list', true) as $record) {
                 $record['ID'] = $this->uid2id($record['uid']);
                 foreach ((array)$record['member'] as $i => $member) {
                     $mid = $this->uid2id($member['uid'] ? $member['uid'] : 'mailto:' . $member['email']);
@@ -1145,8 +1147,9 @@
                     $record['member'][$i]['readonly'] = empty($member['uid']);
                     $this->groupmembers[$mid][] = $record['ID'];
 
-                    if ($with_contacts && empty($member['uid']))
+                    if ($with_contacts && empty($member['uid'])) {
                         $this->contacts[$mid] = $record['member'][$i];
+                    }
                 }
                 $this->distlists[$record['ID']] = $record;
             }

iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/de.inc Added

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
+$labels['initials'] = 'Initialen';
+$labels['profession'] = 'Berufsbezeichnung';
+$labels['officelocation'] = 'Büro Adresse';
+$labels['children'] = 'Kinder';
+$labels['pgppublickey'] = 'PGP-Schlüssel';
+$labels['pkcs7publickey'] = 'S/MIME-Schlüssel';
+$labels['freebusyurl'] = 'Frei/Belegt URL';
+$labels['typebusiness'] = 'Dienstlich';
+$labels['typebusinessfax'] = 'Dienst';
+$labels['typecompany'] = 'Firma';
+$labels['typeprimary'] = 'Primär';
+$labels['typetelex'] = 'Fernschreiber';
+$labels['typeradio'] = 'Funktelefon';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'Schreibtelefon';
+$labels['typecallback'] = 'Rückruf';
+$labels['settings'] = 'Einstellungen';
+$labels['bookcreate'] = 'Adressbuch anlegen';
+$labels['bookedit'] = 'Adressbuch bearbeiten';
+$labels['bookdelete'] = 'Adressbuch löschen';
+$labels['bookremove'] = 'Von der Liste entfernen';
+$labels['bookproperties'] = 'Eigenschaften des Adressbuchs';
+$labels['bookname'] = 'Name des Buches';
+$labels['parentbook'] = 'Übergeordnetes Buch';
+$labels['bookshowurl'] = 'CardDAV URL anzeigen';
+$labels['carddavurldescription'] = 'Diese Adresse in einen <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a>-Klienten kopieren, um dasAdressbuch mit einem Computer oder mobilen Gerät zu synchronisieren.';
+$labels['addressbookprio'] = 'Reihenfolge der Adressbücher';
+$labels['personalfirst'] = 'Private(s) Adressbuch/Adressbücher zuerst';
+$labels['globalfirst'] = 'Globale(s) Adressbuch/Adressbücher zuerst';
+$labels['personalonly'] = 'Nur persönliche(s) Adressbuch/Adressbücher';
+$labels['globalonly'] = 'Nur globale(s) Adressbuch/Adressbücher';
+$labels['searchterms'] = 'Suchbegriffe';
+$labels['listsearchresults'] = 'Zusätzliche Adressbücher';
+$labels['foldersearchform'] = 'Suchformular für Adressbuch';
+$labels['foldersubscribe'] = 'Permanent anzeigen';
+$labels['nraddressbooksfound'] = '$nr Adressbücher gefunden';
+$labels['noaddressbooksfound'] = 'Keine Adressbücher gefunden';
+$labels['showhistory'] = 'Historie anzeigen';
+$labels['objectchangelog'] = 'Änderungshistorie';
+$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
+$labels['revisionrestoreconfirm'] = 'Wollen Sie wirklich die Version $rev dieses Kontakt wiederherstellen? Diese Aktion wird die aktuelle Kopie mit der älteren Version ersetzen.';
+$labels['objectnotfound'] = 'Fehler beim Laden der Addressedaten';
+$labels['objectchangelognotavailable'] = 'Änderungshistorie ist nicht verfügbar für diesen Kontakt';
+$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
+$labels['objectrestoresuccess'] = 'Revision $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Revision';
+$messages['bookdeleteconfirm']  = 'Soll das gewählte Adressbuch und alle Kontakte darin wirklich gelöscht werden?';
+$messages['bookdeleting'] = 'Adressbuch wird gelöscht...';
+$messages['booksaving'] = 'Adressbuch wird gespeichert...';
+$messages['bookdeleted'] = 'Adressbuch erfolgreich gelöscht.';
+$messages['bookupdated'] = 'Adressbuch erfolgreich aktualisiert.';
+$messages['bookcreated'] = 'Adressbuch erfolgreich angelegt.';
+$messages['bookdeleteerror'] = 'Fehler beim Löschen des Adressbuchs.';
+$messages['bookupdateerror'] = 'Fehler beim Aktualisieren des Adressbuchs.';
+$messages['bookcreateerror'] = 'Fehler beim Anlegen des Adressbuchs.';
+$messages['nobooknamewarning'] = 'Bitte den Namen des Adressbuchs angeben.';
+$messages['noemailnamewarning'] = 'Bitte E-Mail-Adresse oder Namen des Kontakts angeben.';
+?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/de_DE.inc Changed

@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Address Book plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
+ */
 $labels['initials'] = 'Initialen';
 $labels['profession'] = 'Berufsbezeichnung';
 $labels['officelocation'] = 'Büro Adresse';
@@ -45,3 +52,14 @@
 $labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
 $labels['objectrestoresuccess'] = 'Revision $rev erfolgreich wiederhergestellt';
 $labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Revision';
+$messages['bookdeleteconfirm']  = 'Möchten Sie das ausgewählte Adressbuch und alle darin enthaltenen Kontakte wirklich löschen?';
+$messages['bookdeleting'] = 'Adressbuch wird gelöscht...';
+$messages['booksaving'] = 'Adressbuch wird gespeichert...';
+$messages['bookdeleted'] = 'Adressbuch erfolgreich gelöscht.';
+$messages['bookupdated'] = 'Adressbuch erfolgreich aktualisiert.';
+$messages['bookcreated'] = 'Adressbuch erfolgreich angelegt.';
+$messages['bookdeleteerror'] = 'Beim Löschen des Adressbuchs ist ein Fehler aufgetreten.';
+$messages['bookupdateerror'] = 'Bei der Aktualisierung des Adressbuchs ist ein Fehler aufgetreten.';
+$messages['bookcreateerror'] = 'Beim Anlegen des Adressbuchs ist ein Fehler aufgetreten.';
+$messages['nobooknamewarning'] = 'Bitte geben Sie den Namen des Adressbuchs ein.';
+?>

iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/pl_PL.inc Changed

@@ -6,12 +6,61 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
+$labels['initials'] = 'Inicjały';
+$labels['profession'] = 'Zawód';
+$labels['officelocation'] = 'Biuro';
+$labels['children'] = 'Dzieci';
+$labels['pgppublickey'] = 'Klucz publiczny PGP';
+$labels['pkcs7publickey'] = 'Klucz publiczny S/MIME';
+$labels['freebusyurl'] = 'Adres URL free-busy';
+$labels['typebusiness'] = 'Firmowy';
+$labels['typebusinessfax'] = 'Fax firmowy';
+$labels['typecompany'] = 'Firma';
+$labels['typeprimary'] = 'Główny';
+$labels['typetelex'] = 'Teleks';
+$labels['typeradio'] = 'Radiowy';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Callback';
+$labels['settings'] = 'Ustawienia';
+$labels['bookcreate'] = 'Utwórz książkę adresową';
+$labels['bookedit'] = 'Edytuj książkę adresową';
+$labels['bookdelete'] = 'Usuń książkę adresową';
 $labels['bookremove'] = 'Usuń z listy';
+$labels['bookproperties'] = 'Właściwości książki adresowej';
+$labels['bookname'] = 'Nazwa książki';
+$labels['parentbook'] = 'Nadrzędna książka';
+$labels['bookshowurl'] = 'Pokaż adres URL CardDAV';
+$labels['carddavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej format <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> aby zsynchronizować książkę adresową z twoim komputerem lub urządzeniem przenośnym.';
+$labels['addressbookprio'] = 'Wybór/zachowanie książek adresowych';
+$labels['personalfirst'] = 'najpierw prywatne książki adresowe';
+$labels['globalfirst'] = 'najpierw globalne książki adresowe';
+$labels['personalonly'] = 'tylko prywatne książki adresowe';
+$labels['globalonly'] = 'tylko globalne książki adresowe';
 $labels['searchterms'] = 'Szukana fraza';
+$labels['listsearchresults'] = 'Dodatkowe książki adresowe';
+$labels['foldersearchform'] = 'Formularz wyszukiwania książek adresowych';
 $labels['foldersubscribe'] = 'Dodaj do listy na stałe';
+$labels['nraddressbooksfound'] = 'znaleziono $nr książkek adresowych';
+$labels['noaddressbooksfound'] = 'Nie znaleziono żadnych książek adresowych';
+$labels['showhistory'] = 'Pokaż Historię';
 $labels['objectchangelog'] = 'Historia zmian';
 $labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
+$labels['revisionrestoreconfirm'] = 'Czy na pewno chcesz przywrócić rewizję $rev tego kontaktu? Starsza wersja nadpisze obecną.';
+$labels['objectnotfound'] = 'Błąd pobierania danych kontaktu';
+$labels['objectchangelognotavailable'] = 'Historia zmian nie jest dostępna dla tego kontaktu';
 $labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
-$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
-$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
+$labels['objectrestoresuccess'] = 'Wersja $rev poprawnie przywrócona';
+$labels['objectrestoreerror'] = 'Błąd przywracania starej wersji';
+$messages['bookdeleteconfirm']  = 'Czy na pewno chcesz usunąć wybraną książkę i wszystkie kontakty?';
+$messages['bookdeleting'] = 'Usuwanie książki adresowej...';
+$messages['booksaving'] = 'Zapisywanie książki adresowej...';
+$messages['bookdeleted'] = 'Książka adresowa została usunięta.';
+$messages['bookupdated'] = 'Książka adresowa została zaktualizowana.';
+$messages['bookcreated'] = 'Książka adresowa została utworzona.';
+$messages['bookdeleteerror'] = 'Podczas usuwania książki adresowej wystąpił błąd.';
+$messages['bookupdateerror'] = 'Podczas zapisywania książki adresowej wystąpił błąd.';
+$messages['bookcreateerror'] = 'Podczas dodawania książki adresowej wystąpił błąd.';
+$messages['nobooknamewarning'] = 'Proszę podać nazwę książki adresowej.';
+$messages['noemailnamewarning'] = 'Proszę podać adres email lub nazwę kontaktu.';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/localization/pt_BR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/pt_BR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/ru_RU.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/sv_SE.inc Changed

@@ -6,9 +6,61 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
+$labels['initials'] = 'Initialer';
+$labels['profession'] = 'Yrke';
+$labels['officelocation'] = 'Kontorsadress';
+$labels['children'] = 'Barn';
+$labels['pgppublickey'] = 'Publik PGP-nyckel';
+$labels['pkcs7publickey'] = 'Publik S/MIME-nyckel';
+$labels['freebusyurl'] = 'Ledig-upptagen-URL';
+$labels['typebusiness'] = 'Företag';
+$labels['typebusinessfax'] = 'Företagsfax';
+$labels['typecompany'] = 'Företag';
+$labels['typeprimary'] = 'Primär';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Radio';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Återuppringning';
+$labels['settings'] = 'Inställningar';
+$labels['bookcreate'] = 'Skapa adressbok';
+$labels['bookedit'] = 'Redigera adressbok';
+$labels['bookdelete'] = 'Ta bort adressbok';
 $labels['bookremove'] = 'Ta bort från lista';
+$labels['bookproperties'] = 'Egenskaper för adressbok';
+$labels['bookname'] = 'Bokens namn';
+$labels['parentbook'] = 'Överordnad bok';
+$labels['bookshowurl'] = 'Visa CardDAV-URL';
+$labels['carddavurldescription'] = 'Kopiera denna adress till ett <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank"> CardDAV</a>-klientprogram för att fullt ut synkronisera denna specifika adressbok med din dator eller mobila enhet .';
+$labels['addressbookprio'] = 'Val/beteenden för adressbok(böcker) ';
+$labels['personalfirst'] = 'Personliga adressböcker först';
+$labels['globalfirst'] = 'Globala adressböcker först';
+$labels['personalonly'] = 'Personliga adressböcker enbart';
+$labels['globalonly'] = 'Globala adressböcker enbart';
 $labels['searchterms'] = 'Sökord';
+$labels['listsearchresults'] = 'Ytterligare adressböcker';
+$labels['foldersearchform'] = 'Sökformulär för adressböcker';
 $labels['foldersubscribe'] = 'Lista permanent';
+$labels['nraddressbooksfound'] = '$nr adressböcker hittades';
+$labels['noaddressbooksfound'] = 'Inga adressböcker hittades';
+$labels['showhistory'] = 'Visa historik';
 $labels['objectchangelog'] = 'Ändringshistorik';
+$labels['objectdiff'] = 'Ändringar från $rev1 till $rev2';
+$labels['revisionrestoreconfirm'] = 'Vill du verkligen vill återställa version $rev av denna kontakt? Detta kommer att ersätta nuvarande kontakt med den gamla versionen.';
+$labels['objectnotfound'] = 'Det gick ej att läsa in kontaktdata';
+$labels['objectchangelognotavailable'] = 'Att ändra i historiken är inte möjligt för denna kontakt';
 $labels['objectdiffnotavailable'] = 'Ingen jämförelse möjlig för valda revisioner';
+$labels['objectrestoresuccess'] = 'Version $rev har återställts ';
+$labels['objectrestoreerror'] = 'Det gick inte att återställa den gamla versionen';
+$messages['bookdeleteconfirm']  = 'Vill du verkligen ta bort den valda adressboken och alla kontakter i den?';
+$messages['bookdeleting'] = 'Tar bort adressbok ...';
+$messages['booksaving'] = 'Sparar adressbok ...';
+$messages['bookdeleted'] = 'Adressbok borttagen.';
+$messages['bookupdated'] = 'Adressbok uppdaterad.';
+$messages['bookcreated'] = 'Adressbok skapad.';
+$messages['bookdeleteerror'] = 'Ett fel uppstod vid borttagning av adressbok.';
+$messages['bookupdateerror'] = 'Ett fel uppstod vid uppdatering av adressbok.';
+$messages['bookcreateerror'] = 'Ett fel uppstod vid skapandet av adressbok.';
+$messages['nobooknamewarning'] = 'Vänligen ange adressbokens namn.';
+$messages['noemailnamewarning'] = 'Vänligen ange e-postadress eller kontaktnamn.';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_auth/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_auth/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_auth/kolab_auth.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_auth/kolab_auth.php Changed

@@ -39,6 +39,7 @@
         $rcmail = rcube::get_instance();
 
         $this->load_config();
+        $this->require_plugin('libkolab');
 
         $this->add_hook('authenticate', array($this, 'authenticate'));
         $this->add_hook('startup', array($this, 'startup'));
@@ -558,8 +559,11 @@
                     $effective_rights = (array)$ldap->effective_rights($target_entry['dn']);
 
                     if (!empty($effective_rights)) {
-                        $effective_rights['attrib'] = $effective_rights['attributeLevelRights'];
-                        $effective_rights['entry']  = $effective_rights['entryLevelRights'];
+                        // compat with out of date Net_LDAP3
+                        $effective_rights = array_change_key_case($effective_rights, CASE_LOWER);
+
+                        $effective_rights['attrib'] = $effective_rights['attributelevelrights'];
+                        $effective_rights['entry']  = $effective_rights['entrylevelrights'];
 
                         // compare the rights with the permissions mapping
                         $allowed_tasks = array();
@@ -796,28 +800,12 @@
      */
     public static function ldap()
     {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
-        $rcmail      = rcube::get_instance();
-        $addressbook = $rcmail->config->get('kolab_auth_addressbook');
-
-        if (!is_array($addressbook)) {
-            $ldap_config = (array)$rcmail->config->get('ldap_public');
-            $addressbook = $ldap_config[$addressbook];
-        }
+        self::$ldap = kolab_storage::ldap('kolab_auth_addressbook');
 
-        if (empty($addressbook)) {
-            return null;
+        if (self::$ldap) {
+            self::$ldap->extend_fieldmap(array('uniqueid' => 'nsuniqueid'));
         }
 
-        $addressbook['fieldmap']['uniqueid'] = 'nsuniqueid';
-
-        require_once __DIR__ . '/kolab_auth_ldap.php';
-
-        self::$ldap = new kolab_auth_ldap($addressbook);
-
         return self::$ldap;
     }
 
@@ -834,7 +822,7 @@
 
     /**
      * Parses LDAP DN string with replacing supported variables.
-     * See kolab_auth_ldap::parse_vars()
+     * See kolab_ldap::parse_vars()
      *
      * @param string $str LDAP DN string
      *
@@ -874,11 +862,15 @@
                 $username = sprintf('%s (as user %s)', $username, $login_as);
             }
 
+            // Don't log full session id for better security
+            $session_id = session_id();
+            $session_id = $session_id ? substr($session_id, 0, 16) : 'no-session';
+
             $message = sprintf(
                 "Failed login for %s from %s in session %s %s",
                 $username,
                 rcube_utils::remote_ip(),
-                session_id() ?: 'no-session',
+                $session_id,
                 $message ? "($message)" : ''
             );

iRony-0.4.3.tar.gz/lib/plugins/kolab_auth/localization/de.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_auth/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_auth/localization/de_DE.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_auth/localization/sv_SE.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_chat/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_chat/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_chat/localization/de.inc Added

iRony-0.4.3.tar.gz/lib/plugins/kolab_chat/localization/pl.inc Added

iRony-0.4.3.tar.gz/lib/plugins/kolab_chat/localization/ru_RU.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_chat/skins/elastic/templates/chat.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_chat/skins/elastic/templates/chat.html Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.php Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/kolab_delegation_engine.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/kolab_delegation_engine.php Changed

@@ -79,7 +79,7 @@
 
         // add delegate to the list
         $list[] = $dn;
-        $list   = array_map(array('kolab_auth_ldap', 'dn_decode'), $list);
+        $list   = array_map(array('kolab_ldap', 'dn_decode'), $list);
 
         // update user record
         $result = $this->user_update_delegates($list);
@@ -149,7 +149,7 @@
         // remove delegate from the list
         unset($list[$dn]);
         $list = array_keys($list);
-        $list = array_map(array('kolab_auth_ldap', 'dn_decode'), $list);
+        $list = array_map(array('kolab_ldap', 'dn_decode'), $list);
         $user[$this->ldap_delegate_field] = $list;
 
         // update user record
@@ -181,7 +181,7 @@
             }
 
             // Get delegate
-            $user = $ldap->get_record(kolab_auth_ldap::dn_decode($dn));
+            $user = $ldap->get_record(kolab_ldap::dn_decode($dn));
 
             if (empty($user)) {
                 return array();
@@ -230,27 +230,9 @@
             return $this->ldap;
         }
 
-        if ($addressbook = $this->rc->config->get('kolab_delegation_addressbook')) {
-            if (!is_array($addressbook)) {
-                $ldap_config = (array) $this->rc->config->get('ldap_public');
-                $addressbook = $ldap_config[$addressbook];
-            }
-
-            if (!empty($addressbook)) {
-                require_once __DIR__ . '/../kolab_auth/kolab_auth_ldap.php';
-
-                $ldap = new kolab_auth_ldap($addressbook);
-            }
-        }
-
-        // Fallback to kolab_auth plugin's addressbook
-        if (!$ldap) {
-            $ldap = kolab_auth::ldap();
-        }
-
-        $this->ldap = $ldap;
+        $this->ldap = kolab_storage::ldap('kolab_delegation_addressbook');
 
-        if (!$ldap || !$ldap->ready) {
+        if (!$this->ldap || !$this->ldap->ready) {
             return null;
         }
 
@@ -270,10 +252,10 @@
         // Name of the LDAP field with organization name for identities
         $this->ldap_org_field = $this->rc->config->get('kolab_delegation_organization_field', $this->rc->config->get('kolab_auth_organization'));
 
-        $ldap->set_filter($this->ldap_filter);
-        $ldap->extend_fieldmap(array($this->ldap_delegate_field => $this->ldap_delegate_field));
+        $this->ldap->set_filter($this->ldap_filter);
+        $this->ldap->extend_fieldmap(array($this->ldap_delegate_field => $this->ldap_delegate_field));
 
-        return $ldap;
+        return $this->ldap;
     }
 
     /**
@@ -540,7 +522,7 @@
         }
 
         return array(
-            'ID'       => kolab_auth_ldap::dn_encode($dn),
+            'ID'       => kolab_ldap::dn_encode($dn),
             'uid'      => $uid,
             'name'     => $name,
             'realname' => $realname,

iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/localization/de.inc Added

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Localizations for the Kolab Delegation plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
+ */
+$labels['tabtitle'] = 'Vertretung';
+$labels['delegationtitle'] = 'Verwalte Vertreter';
+$labels['delegates'] = 'Vertreter';
+$labels['delegate'] = 'Vertreter';
+$labels['mail'] = 'E-Mail';
+$labels['contact'] = 'Kontakte';
+$labels['event'] = 'Kalender';
+$labels['task'] = 'Aufgaben';
+$labels['note'] = 'Notizen';
+$labels['yes'] = 'Ja';
+$labels['no'] = 'Nein';
+$labels['read'] = 'Schreibgeschützt';
+$labels['write'] = 'Schreiben';
+$labels['adddelegate'] = 'Vertreter hinzufügen';
+$labels['deletedelegate'] = 'Vertreter löschen';
+$labels['savingdata'] = 'Speichere Daten...';
+$labels['delegatedeleteconfirm'] = 'Willst du wirklich diesen Vertreter löschen?';
+$labels['delegateremoveacl'] = 'Entferne Zugriffsberechtigungen auf den für diesen Benutzer zugewiesenen Ordnern.';
+$labels['deleteconfirm'] = 'Bestätigung';
+$labels['deletesuccess'] = 'Der Vertreter wurde erfolgreich entfernt';
+$labels['deleteerror'] = 'Konnte Vertreter nicht entfernen.';
+$labels['updatesuccess'] = 'Der Vertreter wurde erfolgreich aktualisiert.';
+$labels['updateerror'] = 'Konnte Verteter nicht aktualisieren';
+$labels['createsuccess'] = 'Der Vertreter wurde erfolgreich hinzugefügt';
+$labels['createerror'] = 'Konnte Vertreter nicht hinzufügen.';
+$labels['arialabeldelegatedelete'] = 'Vertreter Löschen Dialog';
+$labels['arialabeldelegateform'] = 'Verterter Eigenschaften Maske';
+?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/localization/de_DE.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/localization/pl_PL.inc Changed

@@ -6,7 +6,33 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['tabtitle'] = 'Pełnomocnictwa';
+$labels['delegationtitle'] = 'Zarządzaj delegatami';
+$labels['delegates'] = 'Wydelegowani';
+$labels['delegate'] = 'Pełnomocnik';
+$labels['delegatefolders'] = 'Delegowane foldery';
+$labels['delegateprops'] = 'Właściwości delegata';
+$labels['mail'] = 'Poczta';
+$labels['contact'] = 'Kontakty';
 $labels['event'] = 'Kalendarze';
 $labels['task'] = 'Zadania';
+$labels['note'] = 'Notatki';
+$labels['yes'] = 'Tak';
+$labels['no'] = 'Nie';
+$labels['read'] = 'Tylko-do-odczytu';
+$labels['write'] = 'Zapis';
+$labels['adddelegate'] = 'Dodaj delegata';
+$labels['deletedelegate'] = 'Usuń delegata';
 $labels['savingdata'] = 'Zapisuję dane...';
+$labels['delegatedeleteconfirm'] = 'Czy na pewno chcesz usunąć tego delegata?';
+$labels['delegateremoveacl'] = 'usuń prawa dostępu do folderów przypisanych do tego użytkownika';
+$labels['deleteconfirm'] = 'Potwierdzenie';
+$labels['deletesuccess'] = 'Delegat został usunięty.';
+$labels['deleteerror'] = 'Nie można usunąć delegata.';
+$labels['updatesuccess'] = 'Delegat został zaktualizowany.';
+$labels['updateerror'] = 'Nie można zaktualizować delegata.';
+$labels['createsuccess'] = 'Delegat został dodany.';
+$labels['createerror'] = 'Nie można dodać delegata.';
+$labels['arialabeldelegatedelete'] = 'Okno usuwania delegata';
+$labels['arialabeldelegateform'] = 'Formularz właściwości delegata';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/localization/ru_RU.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/localization/sv_SE.inc Changed

@@ -6,9 +6,31 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['tabtitle'] = 'Delegering';
+$labels['delegationtitle'] = 'Hantera ombud';
+$labels['delegates'] = 'Ombud';
+$labels['delegate'] = 'Delegera';
+$labels['mail'] = 'E-post';
 $labels['contact'] = 'Kontakter';
 $labels['event'] = 'Kalendrar';
 $labels['task'] = 'Uppgifter';
 $labels['note'] = 'Anteckningar';
+$labels['yes'] = 'Ja';
+$labels['no'] = 'Nej';
+$labels['read'] = 'Endast läsbar';
+$labels['write'] = 'Skriv';
+$labels['adddelegate'] = 'Lägg till ombud';
+$labels['deletedelegate'] = 'Ta bort ombud';
 $labels['savingdata'] = 'Sparar data ...';
+$labels['delegatedeleteconfirm'] = 'Vill du verkligen ta bort detta ombud?';
+$labels['delegateremoveacl'] = 'ta bort åtkomsträttigheter för mappar som tilldelats denna användare';
+$labels['deleteconfirm'] = 'Bekräftelse';
+$labels['deletesuccess'] = 'Ombudet togs bort.';
+$labels['deleteerror'] = 'Ombudet kunde inte tas bort.';
+$labels['updatesuccess'] = 'Detta ombud uppdaterades.';
+$labels['updateerror'] = 'Ombudet kunde inte uppdateras.';
+$labels['createsuccess'] = 'Ombudet lades till.';
+$labels['createerror'] = 'Ombudet kunde inte läggas till.';
+$labels['arialabeldelegatedelete'] = 'Borttagningsdialog för ombud';
+$labels['arialabeldelegateform'] = 'Egenskapsformulär för ombud';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_delegation/skins/elastic/templates/settings.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_delegation/skins/elastic/templates/settings.html Changed

@@ -5,7 +5,7 @@
 <h1 class="voice"><roundcube:label name="kolab_delegation.tabtitle" /></h1>
 
 
-<div class="list listbox selected" aria-labelledby="aria-label-delegateslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-delegateslist">
 	<div class="header">
 		<a class="button icon back-sidebar-button" href="#sidebar"><span class="inner"><roundcube:label name="settings" /></span></a>
 		<span id="aria-label-delegateslist" class="header-title"><roundcube:label name="kolab_delegation.delegates" /></span>
@@ -15,19 +15,16 @@
 		<roundcube:object name="plugin.delegatelist" id="delegate-table" class="listing" role="listbox"
 			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="delegate-add" />
 	</div>
-
 </div>
 
 
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		
-		<div class="toolbar">
+		<div class="toolbar menu">
 			<roundcube:button command="delegate-add" type="link"
 				label="create" title="kolab_delegation.adddelegate"
 				class="button create disabled" classAct="button create" innerClass="inner" />

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/kolab_files.js -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/kolab_files.js Changed

@@ -245,7 +245,7 @@
 
   $.extend(editor_config, {
     // notifications/alerts
-    gettext: function(label) { return rcmail.get_label('kolab_files.' + label); },
+    gettext: function(label) { return rcmail.get_label(label, 'kolab_files'); },
     set_busy: function(state, message) { return rcmail.set_busy(state, message ? 'kolab_files.' + message : ''); },
     hide_message: function(id) { return rcmail.hide_message(id); },
     display_message: function(label, type, is_txt, timeout) {
@@ -778,7 +778,7 @@
     create_func = function(dialog, editaction) {
       var sel, folder = select.val(), type = type_select.val(), name = input.val();
 
-      if (!name || !folder)
+      if (!name || !folder || !file_api.is_writable(folder))
         return;
 
       if (!/\.[a-z0-9]{1,5}$/.test(name)) {
@@ -951,7 +951,7 @@
 // Handle form submit with Enter key, click first dialog button instead
 function kolab_dialog_submit_handler()
 {
-  $(this).parents('.ui-dialog').find('.ui-button').first().click();
+  $(this).parents('.ui-dialog').find('.ui-dialog-buttonpane button').first().click();
   return false;
 };
 
@@ -1487,11 +1487,28 @@
 // close editing session
 rcube_webmail.prototype.document_close = function()
 {
+  var delete_fn = function() {
+    document_editor.terminate(function() {
+      var win = window.opener || window.parent;
+
+      if (win && win.rcmail && win.file_api)
+        win.file_api.document_delete(rcmail.env.file_data.session.id);
+
+      // For Elastic: hide the parent dialog
+      if (rcmail.is_framed()) {
+        parent.$('.ui-dialog:visible button.cancel').click();
+      }
+
+      window.close();
+    });
+  };
+
   // check document "unsaved changes" state and display a warning
-  if (this.commands['document-save'])
-    this.confirm_dialog(this.gettext('kolab_files.unsavedchanges'), 'kolab_files.terminate', function() {
-      file_api.document_delete(rcmail.env.file_data.session.id);
-    }, {button_class: 'delete'});
+  // skip the warning for WOPI, Collabora will save the document anyway on session close
+  if (this.commands['document-save'] && (!this.env.file_data.viewer || !this.env.file_data.viewer.wopi))
+    this.confirm_dialog(this.gettext('kolab_files.unsavedchanges'), 'kolab_files.terminate', delete_fn, {button_class: 'delete'});
+  else
+    delete_fn();
 };
 
 // document editors management dialog
@@ -2103,7 +2120,6 @@
 {
   this.requests = {};
   this.uploads = [];
-  this.workers = {};
   this.list_updates = 0;
 
 /*
@@ -2255,7 +2271,7 @@
     });
 
     // add Sessions entry
-    if (rcmail.task == 'files' && !rcmail.env.action && rcmail.env.files_caps && rcmail.env.files_caps.DOCEDIT) {
+    if (rcmail.task == 'files' && !rcmail.env.action && this.env.caps && this.env.caps.DOCEDIT) {
       rows.push($('<li class="mailbox collection sessions"></li>')
         .attr('id', 'rcmli' + rcmail.html_identifier_encode('folder-collection-sessions'))
         .append($('<a class="name"></a>').text(rcmail.gettext('kolab_files.sessions')))
@@ -2265,9 +2281,12 @@
     list.append(rows).appendTo(elem)
       .on('click', 'a.subscription', function(e) {
         return file_api.folder_list_subscription_button_click(this);
+      })
+      .on('mouseover', 'a.name', function() {
+        rcube_webmail.long_subject_title_ex(this);
       });
 
-    if (rcmail.env.contextmenu)
+    if (rcmail.task == 'files' && rcmail.env.contextmenu)
       list.on('contextmenu', function(e) {
         var elem = $(e.target).closest('li');
           id = rcmail.html_identifier_decode(elem.attr('id').replace(/^rcmli/, ''));
@@ -2333,7 +2352,7 @@
     // do not support fast folders list
     if (rcmail.env.files_api_version > 4) {
       var ref = this;
-      $.each(rcmail.env.files_caps.MOUNTPOINTS || [], function(k, v) {
+      $.each(this.env.caps.MOUNTPOINTS || [], function(k, v) {
         if (!v.FAST_FOLDER_LIST)
           ref.folder_list({level: 2, folder: k}, true);
       });
@@ -2812,7 +2831,7 @@
   };
 
   // folder create response handler
-  this.folder_rename_response = function(response, data)
+  this.folder_rename_response = function(response, params)
   {
     if (!this.response(response))
       return;
@@ -2820,8 +2839,15 @@
     this.display_message('kolab_files.folderupdatenotice', 'confirmation');
 
     // refresh folders and files list
-    if (this.env.folder == data.folder)
-      this.env.folder = data['new'];
+    if (this.env.folder == params.folder)
+      this.env.folder = params['new'];
+
+    // Removed mount point, refresh capabilities stored in session
+    if (this.env.caps.MOUNTPOINTS[params.folder]) {
+      this.env.caps.MOUNTPOINTS[params['new']] = this.env.caps.MOUNTPOINTS[params.folder];
+      delete this.env.caps.MOUNTPOINTS[params.folder];
+      rcmail.http_post('files/reset', {});
+    }
 
     // TODO: Don't reload the whole list
     this.folder_list();
@@ -2843,7 +2869,11 @@
     this.display_message('kolab_files.foldermountnotice', 'confirmation');
 
     if (response.result.capabilities) {
-        rcmail.env.files_caps.MOUNTPOINTS[params.folder] = response.result.capabilities;
+      // we make sure the result is an object not array
+      // when the list is empty it is an array, because of how works JSON encoding from PHP
+      var add = {};
+      add[params.folder] = response.result.capabilities;
+      this.env.caps.MOUNTPOINTS = $.extend({}, this.env.caps.MOUNTPOINTS, add);
     }
 
     // Refresh capabilities stored in session
@@ -2875,8 +2905,8 @@
     }
 
     // Removed mount point, refresh capabilities stored in session
-    if (rcmail.env.files_caps.MOUNTPOINTS[params.folder]) {
-      delete rcmail.env.files_caps.MOUNTPOINTS[params.folder];
+    if (this.env.caps.MOUNTPOINTS[params.folder]) {
+      delete this.env.caps.MOUNTPOINTS[params.folder];
       rcmail.http_post('files/reset', {});
     }
 
@@ -2916,7 +2946,10 @@
         .on('click', function() { file_api.sharing_delete(post.folder, $(this).closest('tr'), post.mode); });
 
     if (form_info.list_column) {
-      row.append($('<td>').append($('<span class="name">').text(post[form_info.list_column])));
+      row.append($('<td>').append($('<span class="name">')
+        .text(response.result.display || post[form_info.list_column])
+        .attr('title', response.result.title))
+      );
     }
     else {
       $.each(form_info.form || [], function(i, v) {
@@ -2932,7 +2965,7 @@
           content.append(opts).val(post[i]);
         }
         else {
-          content = $('<span class="name">').text(post[i]);
+          content = $('<span class="name">').text(response.result.display || post[i]).attr('title', response.result.title);
           hidden.push($('<input>').attr({type: 'hidden', name: i, value: post[i] || ''}));
         }
 
@@ -3014,7 +3047,7 @@
   // quota request
   this.quota = function()
   {
-    if (rcmail.env.files_quota && (this.env.folder || !rcmail.env.files_caps.NOROOT))
+    if (rcmail.env.files_quota && (this.env.folder || !this.env.caps.NOROOT))
       this.request('quota', {folder: this.env.folder}, 'quota_response');
   };
 
@@ -3033,6 +3066,8 @@
     if (!rcmail.gui_objects.sessionslist)
       return;
 
+    this.file_list_abort(true);
+
     if (!params)
       params = {};
 
@@ -3081,23 +3116,11 @@
     if (!rcmail.gui_objects.fileslist)
       return;
 
+    this.file_list_abort(true);
+
     if (!params)
       params = {};
 
-    // reset all pending list requests
-    $.each(this.requests, function(i, v) {
-      v.abort();
-      rcmail.hide_message(i);
-    });
-
-    // reset folder_info workers
-    $.each(this.workers, function(i, v) {
-      clearTimeout(v);
-    });
-
-    this.workers = {};
-    this.requests = {};
-
     if (params.all_folders) {
       params.collection = null;
       params.folder = null;
@@ -3138,7 +3161,7 @@
     if (params.collection || params.all_folders)
       this.file_list_loop(params);
     else if (this.env.folder) {
-      params.req_id = this.set_busy(true, 'loading');
+      params.req_id = this.env.file_list_req_id = this.set_busy(true, 'loading');
       this.requests[params.req_id] = this.request('file_list', params, 'file_list_response');
     }
   };
@@ -3171,10 +3194,30 @@
       this.request('folder_info', {folder: this.file_path(list[0].filename), sessions: 1}, 'folder_info_response');
   };
 
+  this.file_list_abort = function(all)
+  {
+    if (all) {
+      clearTimeout(this.file_list_worker);
+      this.file_list_worker = null;
+    }
+
+    // reset all pending list requests
+    $.each(this.requests, function(i, v) {
+      v.abort();
+      rcmail.hide_message(i);
+    });
+
+    this.requests = {};
+
+    rcmail.set_busy(false, null, this.env.file_list_req_id);
+  };
+
   // call file_list request for every folder (used for search and virt. collections)
   this.file_list_loop = function(params)
   {
-    var i, folders = [], limit = Math.max(this.env.search_threads || 1, 1);
+    var i, folders = [],
+      limit = Math.max(this.env.search_threads || 1, 1),
+      msg = rcmail.get_label('searching') + ' <a onclick="file_api.file_list_abort()">' + rcmail.get_label('kolab_files.abort') + '</a>';
 
     if (params.collection) {
       if (!params.search)
@@ -3191,32 +3234,38 @@
     });
 
     this.env.folders_loop = folders;
-    this.env.folders_loop_params = params;
     this.env.folders_loop_lock = false;
+    this.env.file_list_req_id = rcmail.display_message(msg, 'loading', 5 * 60 * 1000, 'files-file-search');
+    rcmail.set_busy(true);
 
     for (i=0; i<folders.length && i<limit; i++) {
-      params.req_id = this.set_busy(true, 'loading');
+      params.req_id = new Date().getTime();
       params.folder = folders.shift();
       this.requests[params.req_id] = this.request('file_list', params, 'file_list_loop_response');
     }
   };
 
   // file list response handler for loop'ed request
-  this.file_list_loop_response = function(response)
+  this.file_list_loop_response = function(response, params)
   {
-    var i, folders = this.env.folders_loop,
-      params = this.env.folders_loop_params,
-      limit = Math.max(this.env.search_threads || 1, 1),
+    var folders = this.env.folders_loop,
       valid = this.response(response);
 
-    if (response.req_id)
-      rcmail.hide_message(response.req_id);
-
-    for (i=0; i<folders.length && i<limit; i++) {
-      params.req_id = this.set_busy(true, 'loading');
+    if (folders.length) {
+      params.req_id = new Date().getTime();
       params.folder = folders.shift();
       this.requests[params.req_id] = this.request('file_list', params, 'file_list_loop_response');
     }
+    else {
+      rcmail.set_busy(false, null, this.env.file_list_req_id);
+    }
+
+    // refresh sessions info in time intervals (one request for all folders)
+    if (!this.file_list_worker && this.env.caps && this.env.caps.DOCEDIT && (rcmail.fileslist || rcmail.env.file))
+      this.file_list_worker = setTimeout(function() {
+        var params = {req_id: file_api.set_busy(true, 'loading')};
+        file_api.request('sessions', params, 'file_list_sessions_response');
+      }, 0);
 
     rcmail.fileslist.resize();
 
@@ -3226,6 +3275,36 @@
     this.file_list_loop_result_add(response.result);
   };
 
+  // Update sessions metadata for files list (in multifolder mode)
+  this.file_list_sessions_response = function(response)
+  {
+    this.file_list_worker = setTimeout(function() {
+      var params = {req_id: file_api.set_busy(true, 'loading')};
+      file_api.request('sessions', params, 'file_list_sessions_response');
+    }, (rcmail.env.files_interval || 60) * 1000);
+
+    if (response.req_id)
+      rcmail.hide_message(response.req_id);
+
+    if (!this.response(response))
+      return;
+
+    this.sessions = [];
+
+    $.each(response.result || [], function(sess_id, data) {
+      var folder = file_api.file_path(data.file);
+      if (!file_api.sessions[folder])
+        file_api.sessions[folder] = {};
+      file_api.sessions[folder][sess_id] = data;
+    });
+
+    // update files list with document session info
+    $.each(file_api.env.file_list || [], function(i, file) {
+      var folder = file_api.file_path(file.filename);
+      file_api.file_session_data_set(file, file_api.sessions[folder]);
+    });
+  };
+
   // add files from list request to the table (with sorting)
   this.file_list_loop_result_add = function(result)
   {
@@ -3241,9 +3320,19 @@
     // lock table, other list responses will wait
     this.env.folders_loop_lock = true;
 
-    var n, i, len, elem, row, folder, list = [],
+    var n, i, len, elem, folder, list = [],
       index = this.env.file_list.length,
-      table = rcmail.fileslist;
+      table = rcmail.fileslist,
+      fn = function(result, key, before) {
+        var row = file_api.file_list_row(key, result[key], ++index);
+        table.insert_row(row, before);
+        result[key].row = row;
+        result[key].filename = key;
+        list.push(result[key]);
+
+        if (!folder)
+          folder = file_api.file_path(key);
+      };
 
     for (n=0, len=index; n<len; n++) {
       elem = this.env.file_list[n];
@@ -3251,15 +3340,7 @@
         if (this.sort_compare(elem, result[i]) < 0)
           break;
 
-        row = this.file_list_row(i, result[i], ++index);
-        table.insert_row(row, elem.row);
-        result[i].row = row;
-        result[i].filename = i;
-        list.push(result[i]);
-
-        if (!folder)
-          folder = this.file_path(i);
-
+        fn(result, i, elem.row);
         delete result[i];
       }
 
@@ -3267,23 +3348,18 @@
     }
 
     // add the rest of rows
-    $.each(result, function(key, data) {
-      var row = file_api.file_list_row(key, data, ++index);
-      table.insert_row(row);
-      result[key].row = row;
-      result[key].filename = key;
-      list.push(result[key]);
-
-      if (!folder)
-        folder = file_api.file_path(key);
-    });
+    for (i in result) fn(result, i);
 
     this.env.file_list = list;
-    this.env.folders_loop_lock = false;
 
-    // update document sessions info of this folder
-    if (folder)
-      this.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
+    // update files list with document session info
+    if (folder && this.sessions[folder])
+      $.each(list, function(i, file) {
+        if (folder == file_api.file_path(file.filename))
+          file_api.file_session_data_set(file, file_api.sessions[folder]);
+      });
+
+    this.env.folders_loop_lock = false;
   };
 
   // sort files list (without API request)
@@ -3409,34 +3485,39 @@
     // update files list with document session info
     $.each(file_api.env.file_list || [], function(i, file) {
       // skip files from a different folder (in multi-folder listing)
-      if (file.filename.indexOf(prefix) !== 0)
-        return;
+      if (file.filename.indexOf(prefix) >= 0)
+        file_api.file_session_data_set(file, response.result.sessions)
+    });
 
-      var classes = [];
+    // refresh sessions info in time intervals
+    if (this.env.caps && this.env.caps.DOCEDIT && (rcmail.fileslist || rcmail.env.file))
+      this.file_list_worker = setTimeout(function() {
+        file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
+      }, (rcmail.env.files_interval || 60) * 1000);
+  };
 
-      if ($(file.row).is('.selected'))
-        classes.push('selected');
+  // Set html classes on a file list entry according to defined document sessions
+  this.file_session_data_set = function(file, sessions)
+  {
+    var classes = [], old_class = file.row.className;
 
-      $.each(response.result.sessions || [], function(session_id, session) {
-        if (file.filename == session.file) {
-          if ($.inArray('session', classes) < 0)
-            classes.push('session');
-
-          if (session.is_owner && $.inArray('owner', classes) < 0)
-            classes.push('owner');
-          else if (session.is_invited && $.inArray('invited', classes) < 0)
-            classes.push('invited');
-        }
-      });
+    if ($(file.row).is('.selected'))
+      classes.push('selected');
 
-      $(file.row).attr('class', classes.join(' '));
+    $.each(sessions || [], function(session_id, session) {
+      if (file.filename == session.file) {
+        if ($.inArray('session', classes) < 0)
+          classes.push('session');
+
+        if (session.is_owner && $.inArray('owner', classes) < 0)
+          classes.push('owner');
+        else if (session.is_invited && $.inArray('invited', classes) < 0)
+          classes.push('invited');
+      }
     });
 
-    // refresh sessions info in time intervals
-    if (rcmail.env.files_caps && rcmail.env.files_caps.DOCEDIT && (rcmail.fileslist || rcmail.env.file))
-      this.workers[folder] = setTimeout(function() {
-        file_api.request('folder_info', {folder: folder, sessions: 1}, 'folder_info_response');
-      }, (rcmail.env.files_interval || 60) * 1000);
+    if (classes.length || old_class.length)
+      $(file.row).attr('class', classes.join(' '));
   };
 
   this.file_get = function(file, params)
@@ -3682,7 +3763,7 @@
 
     // open the file for editing if editable
     if (this.file_create_edit_file) {
-      var viewer = this.file_type_supported(this.file_create_edit_type, rcmail.env.files_caps);
+      var viewer = this.file_type_supported(this.file_create_edit_type, this.env.caps);
       this.file_open(this.file_create_edit_file, viewer, {action: 'edit'});
     }
   };
@@ -4025,43 +4106,25 @@
   this.document_delete = function(id)
   {
     this.req = this.set_busy(true, 'kolab_files.sessionterminating');
-    this.deleted_session = id;
     this.request('document_delete', {id: id}, 'document_delete_response');
   };
 
   // document session delete response handler
-  this.document_delete_response = function(response)
+  this.document_delete_response = function(response, params)
   {
     if (!this.response(response))
       return;
 
-    if (rcmail.task == 'files' && rcmail.env.action == 'edit') {
-      if (document_editor && document_editor.terminate)
-        document_editor.terminate();
-      // use timeout to have a chance to properly propagate termination request
-      setTimeout(function() { window.close(); }, 500);
-    }
-
-    // @todo: force sessions info update
-
-    var win = window, list = rcmail.sessionslist;
-
-    if (!list) {
-      win = window.opener || window.parent;
-      if (win && win.rcmail && win.file_api)
-        list = win.rcmail.sessionslist;
-    }
+    var list = rcmail.sessionslist;
 
     // remove session from the list (if sessions list exist)
     if (list)
-      list.remove_row(this.deleted_session);
-    if (win && win.file_api && win.file_api.env.sessions_list)
-      delete win.file_api.env.sessions_list[this.deleted_session];
-
-    // For Elastic: hide the parent dialog
-    if (rcmail.is_framed()) {
-      parent.$('.ui-dialog:visible button.cancel').click();
-    }
+      list.remove_row(params.id);
+
+    if (this.env.sessions_list)
+      delete this.env.sessions_list[params.id];
+
+    // @todo: force sessions info update, update files list
   };
 
   // Invite document session participants

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/lib/kolab_files_engine.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/lib/kolab_files_engine.php Changed

@@ -106,7 +106,7 @@
             $this->get_external_storage_drivers();
 
             // these labels may be needed even if fetching ext sources failed
-            $this->plugin->add_label('folderauthtitle', 'authenticating', 'foldershare');
+            $this->plugin->add_label('folderauthtitle', 'authenticating', 'foldershare', 'saving');
         }
 
         if ($list_widget) {
@@ -149,7 +149,7 @@
                 'more', 'accept', 'decline', 'join', 'status', 'when', 'file', 'comment',
                 'statusaccepted', 'statusinvited', 'statusdeclined', 'statusrequested',
                 'invitationaccepting', 'invitationdeclining', 'invitationrequesting',
-                'close', 'invitationtitle', 'sessions');
+                'close', 'invitationtitle', 'sessions', 'saving');
         }
 
         if (!empty($templates)) {
@@ -450,7 +450,7 @@
             foreach ((array) $info['rights'] as $entry) {
                 if ($entry['mode'] == $mode) {
                     if (!empty($tab['list_column'])) {
-                        $table->add(null, html::span('name', rcube::Q($entry[$tab['list_column']])));
+                        $table->add(null, html::span(array('title' => $entry['title'], 'class' => 'name'), rcube::Q($entry[$tab['list_column']])));
                     }
                     else {
                         foreach ($tab['form'] as $index => $field) {
@@ -458,7 +458,7 @@
                                 $table->add(null, $fields[$index]->show($entry[$index]));
                             }
                             else if ($fields[$index] instanceof html_inputfield) {
-                                $table->add(null, html::span('name', rcube::Q($entry[$index])));
+                                $table->add(null, html::span(array('title' => $entry['title'], 'class' => 'name'), rcube::Q($entry[$index])));
                             }
                         }
                     }
@@ -702,6 +702,8 @@
 
         $this->rc->output->include_script('list.js');
 
+        $this->rc->output->add_label('kolab_files.abort', 'searching');
+
         // attach css rules for mimetype icons
         if (!$this->filetypes_style) {
             $this->plugin->include_stylesheet($this->url . '/skins/default/images/mimetypes/style.css');

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/bg_BG.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/bg_BG.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/ca_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/ca_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/cs_CZ.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/cs_CZ.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/da_DK.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/da_DK.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/de.inc Added

@@ -0,0 +1,160 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['files'] = 'Dateien';
+$labels['filepreview'] = 'Dateivorschau';
+$labels['saveall'] = 'Alles in der Cloud speichern …';
+$labels['saveto'] = 'In der Cloud speichern …';
+$labels['saveas'] = 'Speichern als:';
+$labels['create'] = 'Erstellen';
+$labels['save'] = 'Speichern';
+$labels['cancel'] = 'Abbrechen';
+$labels['fromcloud'] = 'Aus der Cloud …';
+$labels['selectfiles'] = 'Datei(en) zum Anhängen auswählen …';
+$labels['attachsel'] = 'Ausgewählte anhängen';
+$labels['foldercreate'] = 'Ordner erstellen';
+$labels['addfolder'] = 'Ordner hinzufügen';
+$labels['foldershare'] = 'Ordner teilen';
+$labels['folderedit'] = 'Ordner ändern';
+$labels['folderrename'] = 'Ordner umbenennen';
+$labels['foldermount'] = 'Speicher hinzufügen';
+$labels['folderdelete'] = 'Ordner löschen';
+$labels['folderoptions'] = 'Ordneroptionen';
+$labels['share'] = 'Teilen';
+$labels['folderinside'] = 'Erstellen in';
+$labels['foldername'] = 'Ordnername';
+$labels['name'] = 'Name';
+$labels['mtime'] = 'Geändert';
+$labels['type'] = 'Typ';
+$labels['upload'] = 'Hochladen';
+$labels['uploadfile'] = 'Datei(en) hochladen';
+$labels['get'] = 'Herunterladen';
+$labels['getfile'] = 'Datei herunterladen';
+$labels['view'] = 'Ansehen';
+$labels['viewfile'] = 'Datei ansehen';
+$labels['rename'] = 'Umbenennen';
+$labels['deletefile'] = 'Datei(en) löschen';
+$labels['edit'] = 'Bearbeiten';
+$labels['editfile'] = 'Datei bearbeiten';
+$labels['save'] = 'Speichern';
+$labels['savefile'] = 'Datei speichern';
+$labels['printfile'] = 'Datei drucken';
+$labels['renamefile'] = 'Datei umbenennen';
+$labels['createfile'] = 'Datei erstellen';
+$labels['createandedit'] = 'Erstellen und Bearbeiten';
+$labels['copyfile'] = 'Datei kopieren';
+$labels['copyandedit'] = 'Kopieren und Bearbeiten';
+$labels['documenttitle'] = 'Titel:';
+$labels['close'] = 'Schließen';
+$labels['docedit'] = 'Dokumentbearbeitung';
+$labels['submit'] = 'Absenden';
+$labels['confirmpassword'] = 'Passwort bestätigen';
+$labels['passwordconflict'] = 'Passwörter stimmen nicht überein';
+$labels['saving'] = 'Speichern...';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Bilder';
+$labels['collection_document'] = 'Dokumente';
+$labels['sessions'] = 'Sitzungen';
+$labels['abort'] = 'Abbrechen';
+$labels['uploading'] = 'Datei(en) wird/werden hochgeladen …';
+$labels['attaching'] = 'Datei(en) wird/werden angehängt …';
+$labels['authenticating'] = 'Legitimierung wird durchgeführt …';
+$labels['foldercreating'] = 'Ordner wird erstellt …';
+$labels['folderupdating'] = 'Ordner wird aktualisiert …';
+$labels['foldermounting'] = 'Externer Speicher wird hinzugefügt …';
+$labels['folderdeleting'] = 'Ordner werden gelöscht …';
+$labels['folderdeleteconfirm'] = 'Sind Sie sicher, dass Sie den gewählten Ordner löschen möchten?';
+$labels['folderdeletenotice'] = 'Ordner erfolgreich gelöscht.';
+$labels['folderupdatenotice'] = 'Ordner erfolgreich aktualisiert.';
+$labels['foldercreatenotice'] = 'Ordner erfolgreich erstellt.';
+$labels['foldermountnotice'] = 'Speicher erfolgreich hinzugefügt.';
+$labels['folderauthtitle'] = 'Anmelden in $title';
+$labels['saveallnotice'] = '$n Datei(en) erfolgreich gespeichert.';
+$labels['saveallerror'] = 'Speichern von $n Datei(en) fehlgeschlagen.';
+$labels['attacherror'] = 'Anhängen von Datei(en) aus der Cloud fehlgeschlagen.';
+$labels['fileupdating'] = 'Datei wird aktualisiert …';
+$labels['filecreating'] = 'Datei wird erstellt …';
+$labels['filemoving'] = 'Datei(en) wird/werden verschoben …';
+$labels['filecopying'] = 'Datei(en) wird/werden kopiert …';
+$labels['filedeleting'] = 'Datei(en) wird/werden gelöscht …';
+$labels['filedeleteconfirm'] = 'Sind Sie sicher, dass Sie die gewählten Dateien löschen möchten?';
+$labels['filedeletenotice'] = 'Datei(en) erfolgreich gelöscht.';
+$labels['filemovenotice'] = 'Datei(en) erfolgreich verschoben.';
+$labels['filecopynotice'] = 'Datei(en) erfolgreich kopiert.';
+$labels['uploadsizeerror'] = 'Maximale Dateigröße ($size) überschritten!';
+$labels['updatingfoldershares'] = 'Ordnerberechtigungen werden aktualisiert ...';
+$labels['listpermanent'] = 'Dauerhaft anzeigen';
+$labels['additionalfolders'] = 'Zusätzliche Ordner';
+$labels['allfolders'] = 'in allen Ordnern suchen';
+$labels['fileskip'] = 'Überspringen';
+$labels['fileskipall'] = 'Alle überspringen';
+$labels['fileoverwrite'] = 'Überschreiben';
+$labels['fileoverwriteall'] = 'Alle überschreiben';
+$labels['filemoveconfirm'] = 'Diese Aktion wird die Zieldatei <b>$file</b> überschreiben.';
+$labels['editfiledialog'] = 'Bearbeitungsaktion bestätigen';
+$labels['newsession'] = 'Neue Sitzung erstellen';
+$labels['ownedsession'] = 'Vorhandene Sitzung vortsetzen';
+$labels['invitedsession'] = 'Sitzung des Benutzers $user beitreten';
+$labels['editfilerotitle'] = 'Schreibgeschützte Datei';
+$labels['select'] = 'Auswählen';
+$labels['terminatesession'] = 'Sitzung beenden';
+$labels['sessionterminatedtitle'] = 'Sitzung beendet';
+$labels['terminate'] = 'Beenden';
+$labels['sessionterminating'] = 'Sitzung wird beendet …';
+$labels['participant'] = 'Teilnehmer';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Hinzufügen';
+$labels['delparticipant'] = 'Teilnehmer entfernen';
+$labels['invitationtextlabel'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusinvited'] = 'Eingeladen';
+$labels['statusaccepted'] = 'Angenommen';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['statusrequested'] = 'Angefordert';
+$labels['documentinviting'] = 'Teilnehmer wird/werden eingeladen …';
+$labels['documentcancelling'] = 'Teilnehmer wird/werden entfernt …';
+$labels['removeparticipant'] = 'Entfernen';
+$labels['sessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['more'] = 'Mehr.';
+$labels['accept'] = 'Annehmen';
+$labels['join'] = 'Der Sitzung beitreten';
+$labels['decline'] = 'Ablehnen';
+$labels['owner'] = 'Eigentümer';
+$labels['when'] = 'Wenn';
+$labels['file'] = 'Datei';
+$labels['comment'] = 'Kommentar';
+$labels['open'] = 'Öffnen';
+$labels['invitationtitle'] = 'Einladung für $file';
+$labels['invitationaccepting'] = 'Eine Einladung wird angenommen …';
+$labels['invitationdeclining'] = 'Eine Einladung wird abgelehnt …';
+$labels['invitationrequesting'] = 'Einladung wird angefordert …';
+$labels['storepasswords'] = 'Passwort merken';
+$labels['storepasswordsdesc'] = 'Gespeicherte Passwörter werden verschlüsselt. Aktivieren Sie dies, wenn Sie nicht bei jedem Login nach dem Passwort gefragt werden möchten oder wenn dieser Speicher via WebDAV verfügbar sein soll.';
+$labels['arialabelsearchform'] = 'Suchformular für Dateien';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe';
+$labels['arialabellistoptions'] = 'Dateilisten Optionen';
+$labels['arialabelfolderoptions'] = 'Ordneraktionen';
+$labels['arialabelfileeditform'] = 'Dateibearbeitenformular';
+$labels['arialabelfilecreateform'] = 'Dateierstellenformular';
+$labels['arialabelfilelist'] = 'Dateiliste';
+$labels['arialabelfoldercreateform'] = 'Ordnererstellenformular';
+$labels['arialabelfoldereditform'] = 'Ordnerbearbeitenformular';
+$labels['arialabelfoldermountform'] = 'Externer-Speicherformular';
+$labels['arialabelfolderauthform'] = 'Legitimierungsformular des externen Speichers';
+$labels['arialabelfolderlist'] = 'Ordner-/Sammelauswahl';
+$labels['arialabelfileselectdialog'] = 'Dateiauswahldialog';
+$labels['arialabelattachmentoptions'] = 'Anhängespeichernoptionen';
+$labels['arialabelfilesavedialog'] = 'Datei(en)speicherndialog';
+$labels['arialabelfileprops'] = 'Dateieigenschaften';
+$labels['arialabelfilecontent'] = 'Dateiinhalt';
+$labels['arialabelfileeditdialog'] = 'Dateibearbeitungsdialog';
+$labels['arialabelfilesessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['type.plain'] = 'Klartextdokument';
+$labels['type.vndoasisopendocumenttext'] = 'Textdokument (ODF)';
+$labels['type.html'] = 'HTML-Dokument';

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/de_CH.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/de_CH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/de_DE.inc Changed

@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
 $labels['files'] = 'Dateien';
 $labels['filepreview'] = 'Dateivorschau';
 $labels['saveall'] = 'Alles in der Cloud speichern …';
@@ -11,11 +18,16 @@
 $labels['selectfiles'] = 'Datei(en) zum Anhängen auswählen …';
 $labels['attachsel'] = 'Ausgewählte anhängen';
 $labels['foldercreate'] = 'Ordner erstellen';
+$labels['addfolder'] = 'Ordner hinzufügen';
+$labels['foldershare'] = 'Ordner teilen';
 $labels['folderedit'] = 'Ordner ändern';
 $labels['folderrename'] = 'Ordner umbenennen';
 $labels['foldermount'] = 'Speicher hinzufügen';
 $labels['folderdelete'] = 'Ordner löschen';
 $labels['folderoptions'] = 'Ordneroptionen';
+$labels['findfolders'] = 'Ordner suchen...';
+$labels['findfiles'] = 'Dateien suchen';
+$labels['share'] = 'Teilen';
 $labels['folderinside'] = 'Erstellen in';
 $labels['foldername'] = 'Ordnername';
 $labels['name'] = 'Name';
@@ -31,6 +43,7 @@
 $labels['deletefile'] = 'Datei(en) löschen';
 $labels['edit'] = 'Bearbeiten';
 $labels['editfile'] = 'Datei bearbeiten';
+$labels['save'] = 'Speichern';
 $labels['savefile'] = 'Datei speichern';
 $labels['printfile'] = 'Datei drucken';
 $labels['renamefile'] = 'Datei umbenennen';
@@ -40,13 +53,16 @@
 $labels['copyandedit'] = 'Kopieren und Bearbeiten';
 $labels['documenttitle'] = 'Titel:';
 $labels['close'] = 'Schließen';
+$labels['docedit'] = 'Dokument bearbeitung';
 $labels['submit'] = 'Absenden';
 $labels['confirmpassword'] = 'Passwort bestätigen';
+$labels['passwordconflict'] = 'Passwörter stimmen nicht überein';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Bilder';
 $labels['collection_document'] = 'Dokumente';
 $labels['sessions'] = 'Sitzungen';
+$labels['abort'] = 'Abbrechen';
 $labels['uploading'] = 'Datei(en) wird/werden hochgeladen …';
 $labels['attaching'] = 'Datei(en) wird/werden angehängt …';
 $labels['authenticating'] = 'Legitimierung wird durchgeführt …';
@@ -73,6 +89,7 @@
 $labels['filemovenotice'] = 'Datei(en) erfolgreich verschoben.';
 $labels['filecopynotice'] = 'Datei(en) erfolgreich kopiert.';
 $labels['uploadsizeerror'] = 'Maximale Dateigröße ($size) überschritten!';
+$labels['updatingfoldershares'] = 'Zugrifssrechte wirden aktualisiert …';
 $labels['listpermanent'] = 'Dauerhaft anzeigen';
 $labels['additionalfolders'] = 'Zusätzliche Ordner';
 $labels['allfolders'] = 'in allen Ordnern suchen';
@@ -142,4 +159,3 @@
 $labels['type.plain'] = 'Klartextdokument';
 $labels['type.vndoasisopendocumenttext'] = 'Textdokument (ODF)';
 $labels['type.html'] = 'HTML-Dokument';
-$labels['addfolder'] = 'Ordner hinzufügen';

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/el.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/el.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/en_US.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/en_US.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/es_AR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/es_AR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/es_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/es_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/et_EE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/et_EE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/fi_FI.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/fi_FI.inc Changed

@@ -57,11 +57,13 @@
 $labels['submit'] = 'Lähetä';
 $labels['confirmpassword'] = 'Vahvista salasana';
 $labels['passwordconflict'] = 'Salasanat eivät täsmää';
+$labels['saving'] = 'Tallennetaan...';
 $labels['collection_audio'] = 'Ääni';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Kuvat';
 $labels['collection_document'] = 'Asiakirjat';
 $labels['sessions'] = 'Istunnot';
+$labels['abort'] = 'Keskeytä';
 $labels['uploading'] = 'Lähetetään tiedostoja...';
 $labels['attaching'] = 'Liitetään tiedostoja...';
 $labels['authenticating'] = 'Tunnistaudutaan...';
@@ -154,6 +156,7 @@
 $labels['invitationrequesting'] = 'Pyydetään kutsua...';
 $labels['storepasswords'] = 'muista salasana';
 $labels['storepasswordsdesc'] = 'Tallennetut salasanat salataan. Ota tämä asetus käyttöön, jos et halua salasanaa kysyttävän jokaisella kirjautumiskerralla tai haluat tämän tallennustilan olevan käytettävissä WebDAVin välityksellä.';
+$labels['storageautherror'] = 'Tunnistautuminen epäonnistui tallennustilaan $title.';
 $labels['sharepermissionerror'] = 'Oikeutesi eivät riitä tämän kansion jakamisen hallintaan.';
 $labels['sharestorageerror'] = 'Kansion jakamistietojen saaminen epäonnistui.';
 $labels['arialabelsearchform'] = 'Tiedostojen hakulomake';

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/fr_FR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/fr_FR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/hu_HU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/hu_HU.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/it_IT.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/it_IT.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/ja_JP.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/ja_JP.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/nl_NL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/nl_NL.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/pl.inc Added

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Localizations for the Kolab Files plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
+ */
+$labels['files'] = 'Pliki';
+$labels['filepreview'] = 'Podgląd pliku';
+$labels['saveas'] = 'Zapisz jako:';
+$labels['create'] = 'Utwórz';
+$labels['save'] = 'Zapisz';
+$labels['cancel'] = 'Anuluj';
+$labels['folderinside'] = 'Wstaw wewnątrz';
+$labels['name'] = 'Nazwa';
+$labels['mtime'] = 'Zmodyfikowano';
+$labels['type'] = 'Typ';
+$labels['get'] = 'Pobierz';
+$labels['getfile'] = 'Pobierz plik';
+$labels['rename'] = 'Zmień nazwę';
+$labels['deletefile'] = 'Usuń plik(i)';
+$labels['edit'] = 'Edytuj';
+$labels['editfile'] = 'Edytuj plik';
+$labels['save'] = 'Zapisz';
+$labels['savefile'] = 'Zapisz plik';
+$labels['printfile'] = 'Wydrukuj plik';
+$labels['close'] = 'Zamknij';
+$labels['submit'] = 'Wyślij';
+$labels['saving'] = 'Zapisuję...';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Obrazy';
+$labels['collection_document'] = 'Dokumenty';
+$labels['authenticating'] = 'Uwierzytelnianie...';
+$labels['foldercreating'] = 'Utwórz folder...';
+$labels['folderupdating'] = 'Aktualizacja folderu...';
+$labels['folderdeleting'] = 'Usuwanie folderu...';
+$labels['folderauthtitle'] = 'Zaloguj do $title';
+$labels['uploadsizeerror'] = 'Maksymalny rozmiar pliku ($size) przekroczony!';
+$labels['listpermanent'] = 'Dodaj do listy na stałe';
+$labels['fileskip'] = 'Pomiń';
+$labels['fileskipall'] = 'Pomiń wszystko';
+$labels['fileoverwrite'] = 'Nadpisz';
+$labels['fileoverwriteall'] = 'Nadpisz wszystko';
+$labels['select'] = 'Wybierz';
+$labels['participant'] = 'Uczestnik';
+$labels['status'] = 'Status';
+$labels['addparticipant'] = 'Dodaj uczestnika';
+$labels['invitationtextlabel'] = 'Komentarz zaproszenia/powiadomienia';
+$labels['statusorganizer'] = 'Organizator';
+$labels['removeparticipant'] = 'Usuń';
+$labels['owner'] = 'Właściciel';
+$labels['comment'] = 'Komentarz';
+$labels['open'] = 'Otwórz';
+$labels['storepasswords'] = 'zapamiętaj hasło';
+$labels['arialabelfileprops'] = 'Właściwości';

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/pl_PL.inc Changed

@@ -8,49 +8,174 @@
  */
 $labels['files'] = 'Pliki';
 $labels['filepreview'] = 'Podgląd pliku';
+$labels['saveall'] = 'Zapisz wszystkie w chmurze...';
+$labels['saveto'] = 'Zapisz w chmurze...';
 $labels['saveas'] = 'Zapisz jako:';
 $labels['create'] = 'Utwórz';
 $labels['save'] = 'Zapisz';
 $labels['cancel'] = 'Anuluj';
+$labels['fromcloud'] = 'Z chmury...';
+$labels['selectfiles'] = 'Wybierz pliki do załączenia...';
+$labels['attachsel'] = 'Załącz wybrane';
+$labels['foldercreate'] = 'Utwórz folder';
+$labels['addfolder'] = 'Dodaj folder';
+$labels['folderedit'] = 'Edytuj folder';
+$labels['folderrename'] = 'Zmień nazwę folderu';
+$labels['foldermount'] = 'Dodaj przestrzeń';
+$labels['folderdelete'] = 'Usuń folder';
+$labels['folderoptions'] = 'Opcje folderów';
+$labels['findfiles'] = 'Znajdź pliki';
 $labels['folderinside'] = 'Wstaw wewnątrz';
+$labels['foldername'] = 'Nazwa folderu';
 $labels['name'] = 'Nazwa';
 $labels['mtime'] = 'Zmodyfikowano';
 $labels['type'] = 'Typ';
+$labels['upload'] = 'Wyślij';
+$labels['uploadfile'] = 'Wyślij plik(i)';
 $labels['get'] = 'Pobierz';
 $labels['getfile'] = 'Pobierz plik';
+$labels['view'] = 'Podgląd';
+$labels['viewfile'] = 'Podgląd pliku';
 $labels['rename'] = 'Zmień nazwę';
 $labels['deletefile'] = 'Usuń plik(i)';
 $labels['edit'] = 'Edytuj';
 $labels['editfile'] = 'Edytuj plik';
 $labels['save'] = 'Zapisz';
 $labels['savefile'] = 'Zapisz plik';
-$labels['printfile'] = 'Wydrukuj plik';
+$labels['printfile'] = 'Drukuj plik';
+$labels['renamefile'] = 'Zmień nazwę pliku';
+$labels['createfile'] = 'Utwórz plik';
+$labels['createandedit'] = 'Utwórz i Edytuj';
+$labels['copyfile'] = 'Kopiuj plik';
+$labels['copyandedit'] = 'Skopiuj i Edytuj';
+$labels['documenttitle'] = 'Tytuł:';
 $labels['close'] = 'Zamknij';
-$labels['submit'] = 'Wyślij';
+$labels['docedit'] = 'Edycja documentu';
+$labels['submit'] = 'Zatwierdź';
+$labels['confirmpassword'] = 'Potwierdź hasło';
+$labels['saving'] = 'Zapisywanie...';
 $labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Obrazy';
 $labels['collection_document'] = 'Dokumenty';
+$labels['sessions'] = 'Sesje';
+$labels['abort'] = 'Przerwij';
+$labels['uploading'] = 'Zapisywanie plików...';
+$labels['attaching'] = 'Załączanie plików...';
 $labels['authenticating'] = 'Uwierzytelnianie...';
-$labels['foldercreating'] = 'Utwórz folder...';
-$labels['folderupdating'] = 'Aktualizacja folderu...';
+$labels['foldercreating'] = 'Tworzenie folderu...';
+$labels['folderupdating'] = 'Aktualizowanie folderu...';
+$labels['foldermounting'] = 'Dodawanie przestrzeni zewnętrznej...';
 $labels['folderdeleting'] = 'Usuwanie folderu...';
-$labels['folderauthtitle'] = 'Zaloguj do $title';
-$labels['uploadsizeerror'] = 'Maksymalny rozmiar pliku ($size) przekroczony!';
+$labels['folderdeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrany folder?';
+$labels['folderdeletenotice'] = 'Folder został usunięty.';
+$labels['folderupdatenotice'] = 'Folder został zaktualizowany.';
+$labels['foldercreatenotice'] = 'Folder został utworzony.';
+$labels['foldermountnotice'] = 'Przestrzeń dodana pomyślnie.';
+$labels['folderauthtitle'] = 'Logowanie do $title';
+$labels['saveallnotice'] = 'Pomyślnie zapisano $n plików.';
+$labels['saveallerror'] = 'Nie można zapisać $n plików.';
+$labels['attacherror'] = 'Nie udało się załączenie plików z chmury';
+$labels['fileupdating'] = 'Aktualizowanie pliku...';
+$labels['filecreating'] = 'Tworzenie pliku...';
+$labels['filemoving'] = 'Przenoszenie plików...';
+$labels['filecopying'] = 'Kopiowanie plików...';
+$labels['filedeleting'] = 'Usuwanie plików...';
+$labels['filedeleteconfirm'] = 'Czy na pewno chcesz usunąć wybrane pliki?';
+$labels['filedeletenotice'] = 'Plik(i) zostały usunięte.';
+$labels['filemovenotice'] = 'Plik(i) zostały przeniesione.';
+$labels['filecopynotice'] = 'Plik(i) zostały skopiowane.';
+$labels['uploadsizeerror'] = 'Przekroczono maksymalny rozmiar pliku ($size)! ';
 $labels['listpermanent'] = 'Dodaj do listy na stałe';
-$labels['fileskip'] = 'Pomiń';
-$labels['fileskipall'] = 'Pomiń wszystko';
+$labels['additionalfolders'] = 'Dodatkowe foldery';
+$labels['allfolders'] = 'szukaj we wszystkich folderach';
+$labels['fileskip'] = 'Omiń';
+$labels['fileskipall'] = 'Omiń wszystkie';
 $labels['fileoverwrite'] = 'Nadpisz';
-$labels['fileoverwriteall'] = 'Nadpisz wszystko';
+$labels['fileoverwriteall'] = 'Nadpisz wszystkie';
+$labels['filemoveconfirm'] = 'Akcja ta nadpisze docelowy plik: <b>$file</b>.';
+$labels['editfiledialog'] = 'Potwierdź akcję edycji';
+$labels['editfilesessions'] = 'Istnieją niezakończone sesje na wybranym pliku. Proszę wybrać akcję do wykonania.';
+$labels['newsession'] = 'Utwórz nową sesję';
+$labels['newsessionro'] = 'Utwórz nową sesję (skopiuj plik do miejsca z uprawnieniami do odczytu i zapisu)';
+$labels['ownedsession'] = 'Kontynuuj swoją istniejącą sesję';
+$labels['invitedsession'] = 'Dołącz do sesji utworzonej przez $user';
+$labels['joinsession'] = 'Zażądaj zaproszenia od $user';
+$labels['editfilero'] = 'Ten plik jest tylko-do-odczytu. Czy chcesz utworzyć i edytować jego kopię?';
+$labels['editfilerotitle'] = 'Plik tylko-do-odczytu';
 $labels['select'] = 'Wybierz';
+$labels['terminatesession'] = 'Zakończ sesję';
+$labels['sessionterminatedtitle'] = 'Sesja została zakończona';
+$labels['sessionterminated'] = 'Sesja została zakończona. Okno zostanie zamknięte.';
+$labels['terminate'] = 'Zakończ';
+$labels['sessionterminating'] = 'Kończenie sesji...';
+$labels['unsavedchanges'] = 'Dokument zawiera niezapisane zmiany, które zostaną utracone. Czy na pewno chcesz zakończyć tę sesję?';
+$labels['manageeditors'] = 'Zaproś do dokumentu';
 $labels['participant'] = 'Uczestnik';
 $labels['status'] = 'Status';
 $labels['addparticipant'] = 'Dodaj uczestnika';
+$labels['delparticipant'] = 'Usuń uczestnika';
+$labels['invitationtexttitle'] = 'Ten komentarz zostanie dołączony do zaproszenia/powiadomienia wysłanego do uczestnika';
 $labels['invitationtextlabel'] = 'Komentarz zaproszenia/powiadomienia';
 $labels['statusorganizer'] = 'Organizator';
+$labels['statusinvited'] = 'Zaproszony';
+$labels['statusaccepted'] = 'Zaakceptowany';
+$labels['statusdeclined'] = 'Odrzucony';
+$labels['statusrequested'] = 'Zarządany';
+$labels['documentinviting'] = 'Zapraszanie uczestników...';
+$labels['documentcancelling'] = 'Usuwanie uczestników...';
 $labels['removeparticipant'] = 'Usuń';
+$labels['invitednotice'] = 'Zostałeś zaproszony do sesji edycyjnej przez $owner.';
+$labels['acceptedownernotice'] = '$owner zaakceptował żądanie dołączenia do sesji edycyjnej.';
+$labels['declinedownernotice'] = '$owner odrzucił żądanie dołączenia do sesji edycyjnej.';
+$labels['acceptednotice'] = '$user zaakceptował twoje zaproszenie do sesji edycyjnej.';
+$labels['declinednotice'] = '$user odrzucił twoje zaproszenie do sesji edycyjnej.';
+$labels['requestednotice'] = '$user zażądał dołączenia do sesji edycyjnej.';
+$labels['sessiondialog'] = 'Sesja edycji dokumentu';
+$labels['sessiondialogcontent'] = 'Istnienie niezakończona sesja edycji $file utworzona przez $owner.';
+$labels['more'] = 'Więcej.';
+$labels['accept'] = 'Akceptuj';
+$labels['join'] = 'Dołącz do sesji';
+$labels['decline'] = 'Odrzuć';
 $labels['owner'] = 'Właściciel';
+$labels['when'] = 'Kiedy';
+$labels['file'] = 'Plik';
 $labels['comment'] = 'Komentarz';
 $labels['open'] = 'Otwórz';
+$labels['request'] = 'Zażądaj zaproszenia';
+$labels['invitationtitle'] = 'Zaproszenie dla $file';
+$labels['invitationaccepting'] = 'Akceptowanie zaproszenia...';
+$labels['invitationdeclining'] = 'Odrzucanie zaproszenia...';
+$labels['invitationrequesting'] = 'Żądanie zaproszenia...';
 $labels['storepasswords'] = 'zapamiętaj hasło';
-$labels['arialabelfileprops'] = 'Właściwości';
+$labels['storepasswordsdesc'] = 'Przechowywane hasła zostaną zaszyfrowane. Wybierz tą opcję jeśli nie chcesz być pytany o hasło za każdym razem albo jeśli chcesz aby to źródło było dostępne poprzez WebDAV.';
+$labels['storageautherror'] = 'Uwierzytelnianie nie powiodło się w przypadku $title przechowywania.';
+$labels['arialabelsearchform'] = 'Formularz wyszukiwania plików';
+$labels['arialabelquicksearchbox'] = 'Fraza wyszukiwania';
+$labels['arialabellistoptions'] = 'Opcje listy plików';
+$labels['arialabelfolderoptions'] = 'Akcje folderów';
+$labels['arialabelfileeditform'] = 'Formularz edycji pliku';
+$labels['arialabelfilecreateform'] = 'Formularz tworzenia pliku';
+$labels['arialabelfilelist'] = 'Lista plików';
+$labels['arialabelfoldercreateform'] = 'Formularz tworzenia folderów';
+$labels['arialabelfoldereditform'] = 'Formularz edycji folderów';
+$labels['arialabelfoldermountform'] = 'Formularz zewnętrznego przechowywania';
+$labels['arialabelfolderauthform'] = 'Formularz uwierzytelniania zewnętrznego źródła danych';
+$labels['arialabelfolderlist'] = 'Wybór foldera/kolekcji';
+$labels['arialabelfileselectdialog'] = 'Okno wyboru pliku';
+$labels['arialabelattachmentoptions'] = 'Opcje zapisu załączników';
+$labels['arialabelfilesavedialog'] = 'Okno zapisu plików';
+$labels['arialabelfileprops'] = 'Właściwości pliku';
+$labels['arialabelfilecontent'] = 'Treść pliku';
+$labels['arialabelfileeditdialog'] = 'Ekran edycji pliku';
+$labels['arialabelsessionslist'] = 'Lista sesji edycji dokumentów';
+$labels['arialabelsessionslistoptions'] = 'Opcje listy sesji';
+$labels['arialabelfilerenameform'] = 'Formularz zmiany nazwy pliku';
+$labels['arialabelfilesessiondialog'] = 'Sesja edycji dokumentu';
+$labels['arialabelcollaborators'] = 'Lista edytorów dokumentu';
+$labels['arialabelexportoptions'] = 'Opcje eksportu';
+$labels['arialabeldoceditorsdialog'] = 'Edytorzy dokumentu (zaproszenia)';
+$labels['arialabelmorefileactions'] = 'Więcej akcji plików';
+$labels['type.plain'] = 'Dokument tekstowy';
+$labels['type.vndoasisopendocumenttext'] = 'Dokument tekstowy (ODF)';
+$labels['type.html'] = 'Dokument HTML';

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/pt_BR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/pt_BR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/ru_RU.inc Changed

@@ -18,10 +18,16 @@
 $labels['selectfiles'] = 'Выбрать файл(ы) для прикрепления...';
 $labels['attachsel'] = 'Прикрепить выбранные';
 $labels['foldercreate'] = 'Создать папку';
+$labels['addfolder'] = 'Добавить папку';
+$labels['foldershare'] = 'Расшарить папку';
 $labels['folderedit'] = 'Редактировать папку';
 $labels['folderrename'] = 'Переименовать папку';
 $labels['foldermount'] = 'Добавить хранилище';
 $labels['folderdelete'] = 'Удалить папку';
+$labels['folderoptions'] = 'Свойства папки';
+$labels['findfolders'] = 'Найти папки...';
+$labels['findfiles'] = 'Найти файлы';
+$labels['share'] = 'Поделиться';
 $labels['folderinside'] = 'Вставить внутрь';
 $labels['foldername'] = 'Имя папки';
 $labels['name'] = 'Имя';
@@ -47,13 +53,17 @@
 $labels['copyandedit'] = 'Скопировать и редактировать';
 $labels['documenttitle'] = 'Заголовок:';
 $labels['close'] = 'Закрыть';
+$labels['docedit'] = 'Редактирования документа';
 $labels['submit'] = 'Отправить';
 $labels['confirmpassword'] = 'Повторите пароль';
+$labels['passwordconflict'] = 'Пароли не совпадают';
+$labels['saving'] = 'Сохранение...';
 $labels['collection_audio'] = 'Аудио';
 $labels['collection_video'] = 'Видео';
 $labels['collection_image'] = 'Картинки';
 $labels['collection_document'] = 'Документы';
 $labels['sessions'] = 'Сессии';
+$labels['abort'] = 'Отменить';
 $labels['uploading'] = 'Закачиваются файлы...';
 $labels['attaching'] = 'Прикрепляются файлы...';
 $labels['authenticating'] = 'Аутентификация...';
@@ -80,6 +90,9 @@
 $labels['filemovenotice'] = 'Файл(ы) перемещен(ы) успешно.';
 $labels['filecopynotice'] = 'Файл(ы) скопирован(ы) успешно.';
 $labels['uploadsizeerror'] = 'Максимальный размер файла ($size) превышен!';
+$labels['updatingfoldershares'] = 'Обновление разрешений для папок ...';
+$labels['updatingfolderupload-link'] = 'Обновление ссылки для загрузки ...';
+$labels['updatingfolderdownload-link'] = 'Обновление ссылки для скачивания ...';
 $labels['listpermanent'] = 'Всегда показывать';
 $labels['additionalfolders'] = 'Дополнительные папки';
 $labels['allfolders'] = 'искать во всех папках';
@@ -89,6 +102,7 @@
 $labels['fileoverwriteall'] = 'Перезаписать все';
 $labels['filemoveconfirm'] = 'Это действие перезапишет файл: <b>$file</b>.';
 $labels['editfiledialog'] = 'Подтвердить выполненные действия';
+$labels['editfilesessions'] = 'В выбранном файле продолжаются сеансы. Пожалуйста, выберите действие, которое вы хотите предпринять.';
 $labels['newsession'] = 'Создать новую сессию';
 $labels['newsessionro'] = 'Создать новую сессию (скопировать файл в область для для редактирования)';
 $labels['ownedsession'] = 'Продолжить существующую сессию';
@@ -115,9 +129,17 @@
 $labels['statusaccepted'] = 'Принято';
 $labels['statusdeclined'] = 'Отклонено';
 $labels['statusrequested'] = 'Запрошенный';
+$labels['documentinviting'] = 'Приглашение участника(ов)...';
+$labels['documentcancelling'] = 'Удаление участника(ов)...';
 $labels['removeparticipant'] = 'Убрать';
 $labels['invitednotice'] = 'Вы были приглашены $owner для совместного редактирования.';
+$labels['acceptedownernotice'] = '$owner принял ваш запрос на присоединение к сеансу редактирования.';
+$labels['declinedownernotice'] = '$owner отклонил ваш запрос на присоединение к сеансу редактирования.';
+$labels['acceptednotice'] = '$user принял ваше приглашение на сеанс редактирования.';
+$labels['declinednotice'] = '$user отклонил ваше приглашение на сеанс редактирования.';
+$labels['requestednotice'] = '$user попросил присоединиться к сеансу редактирования.';
 $labels['sessiondialog'] = 'Сессия редактирования документа';
+$labels['sessiondialogcontent'] = 'Продолжается сеанс редактирования $file созданного $owner.';
 $labels['more'] = 'Больше.';
 $labels['accept'] = 'Принять';
 $labels['join'] = 'Присоединиться к сессии';
@@ -134,6 +156,9 @@
 $labels['invitationrequesting'] = 'Приглашение запрашивается...';
 $labels['storepasswords'] = 'запомнить пароль';
 $labels['storepasswordsdesc'] = 'Сохранённые пароли будут зашифрованы. Включите, если не хотите, чтобы пароль запрашивался при каждом входе, или если хотите, чтобы это хранилище было доступно через WebDAV.';
+$labels['storageautherror'] = 'Ошибка аутентификации для хранилища $title.';
+$labels['sharepermissionerror'] = 'У вас нет разрешения на управление этой папкой.';
+$labels['sharestorageerror'] = 'Не удалось получить информацию об общем доступе к папкам.';
 $labels['arialabelsearchform'] = 'Искать файлы от';
 $labels['arialabelquicksearchbox'] = 'Искать';
 $labels['arialabellistoptions'] = 'Настройки списка файлов';
@@ -152,7 +177,14 @@
 $labels['arialabelfileprops'] = 'Свойства файла';
 $labels['arialabelfilecontent'] = 'Содержимое файла';
 $labels['arialabelfileeditdialog'] = 'Диалог редактирования файла';
+$labels['arialabelsessionslist'] = 'Список сессий редактирования документов';
+$labels['arialabelsessionslistoptions'] = 'Опции списка сессий';
+$labels['arialabelfilerenameform'] = 'Форма переименования файлов';
 $labels['arialabelfilesessiondialog'] = 'Сессия редактирования документа';
+$labels['arialabelcollaborators'] = 'Список редакторов документов';
+$labels['arialabelexportoptions'] = 'Параметры экспорта';
+$labels['arialabeldoceditorsdialog'] = 'Редакторы документов (приглашения)';
+$labels['arialabelmorefileactions'] = 'Дополнительные действия с файлами';
 $labels['type.plain'] = 'Простой текстовый файл';
 $labels['type.vndoasisopendocumenttext'] = 'Текстовый документ (ODF)';
 $labels['type.html'] = 'Документ HTML';

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/sl_SI.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/sl_SI.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/sv_SE.inc Changed

@@ -7,18 +7,159 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Filer';
+$labels['filepreview'] = 'Förhandsgranska';
+$labels['saveall'] = 'Spara samtliga till moln ...';
+$labels['saveto'] = 'Spara till moln ...';
+$labels['saveas'] = 'Spara som:';
+$labels['create'] = 'Skapa';
 $labels['save'] = 'Spara';
 $labels['cancel'] = 'Avbryt';
+$labels['fromcloud'] = 'Från moln ...';
+$labels['selectfiles'] = 'Välj fil(er) att bifoga ...';
+$labels['attachsel'] = 'Bifoga vald(a)';
+$labels['foldercreate'] = 'Skapa mapp';
+$labels['folderedit'] = 'Redigera mapp';
+$labels['foldermount'] = 'Lägg till lagring';
+$labels['folderdelete'] = 'Ta bort mapp';
 $labels['folderinside'] = 'Infoga inuti';
+$labels['foldername'] = 'Mappnamn';
 $labels['name'] = 'Namn';
+$labels['mtime'] = 'Ändrad';
+$labels['type'] = 'Typ';
+$labels['upload'] = 'Ladda upp';
+$labels['uploadfile'] = 'Ladda upp fil(er)';
+$labels['get'] = 'Ladda ner';
+$labels['getfile'] = 'Ladda ner fil';
+$labels['view'] = 'Visa';
+$labels['viewfile'] = 'Visa fil';
+$labels['rename'] = 'Byt namn';
+$labels['deletefile'] = 'Ta bort fil(er)';
 $labels['edit'] = 'Redigera';
+$labels['editfile'] = 'Redigera fil';
 $labels['save'] = 'Spara';
+$labels['savefile'] = 'Spara fil';
+$labels['printfile'] = 'Skriv ut fil';
+$labels['renamefile'] = 'Byt namn på fil';
+$labels['createfile'] = 'Skapa fil';
+$labels['createandedit'] = 'Skapa och redigera';
+$labels['copyfile'] = 'Kopiera fil';
+$labels['copyandedit'] = 'Kopiera och redigera';
+$labels['documenttitle'] = 'Titel';
+$labels['close'] = 'Stäng';
+$labels['submit'] = 'Skicka';
+$labels['confirmpassword'] = 'Bekräfta lösenord';
+$labels['saving'] = 'Sparar ...';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Bilder';
+$labels['collection_document'] = 'Dokument';
+$labels['sessions'] = 'Sessioner';
+$labels['abort'] = 'Avbryt';
+$labels['uploading'] = 'Laddar upp fil(er) ...';
+$labels['attaching'] = 'Bifogar fil(er) ...';
+$labels['authenticating'] = 'Autentiserar ...';
+$labels['foldercreating'] = 'Skapar mapp ...';
+$labels['folderupdating'] = 'Uppdaterar mapp ...';
+$labels['foldermounting'] = 'Lägger till extern lagring ...';
+$labels['folderdeleting'] = 'Tar bort mapp ...';
+$labels['folderdeleteconfirm'] = 'Vill du verkligen ta bort vald mapp?';
+$labels['folderdeletenotice'] = 'Mapp borttagen.';
+$labels['folderupdatenotice'] = 'Mapp uppdaterad.';
+$labels['foldercreatenotice'] = 'Mapp skapad.';
+$labels['foldermountnotice'] = 'Lagring lades till.';
+$labels['folderauthtitle'] = 'Logga in på';
+$labels['saveallnotice'] = 'Sparade $n fil(er).';
+$labels['saveallerror'] = 'Sparar $n fil(er) misslyckades.';
+$labels['attacherror'] = 'Misslyckades att bifoga fil(er) från molnet';
+$labels['fileupdating'] = 'Uppdaterar fil ...';
+$labels['filecreating'] = 'Skapar fil ...';
+$labels['filemoving'] = 'Flyttar fil(er) ...';
+$labels['filecopying'] = 'Kopierar fil(er) ...';
+$labels['filedeleting'] = 'Tar bort fil(er) ...';
+$labels['filedeleteconfirm'] = 'Vill du verkligen ta bort valda filer?';
+$labels['filedeletenotice'] = 'Fil(er) borttagna.';
+$labels['filemovenotice'] = 'Fil(er) flyttade.';
+$labels['filecopynotice'] = 'Fil(er) kopierade.';
+$labels['uploadsizeerror'] = 'Maximal filstorlek ($size) överskriden!';
 $labels['listpermanent'] = 'Lista permanent';
+$labels['additionalfolders'] = 'Ytterligare mappar';
+$labels['allfolders'] = 'sök i alla mappar';
+$labels['fileskip'] = 'Hoppa över';
+$labels['fileskipall'] = 'Hoppa över alla';
+$labels['fileoverwrite'] = 'Skriv över';
+$labels['fileoverwriteall'] = 'Skriv över alla';
+$labels['filemoveconfirm'] = 'Denna åtgärd kommer att skriva över målfilen: <b>$file</b>.';
+$labels['editfilesessions'] = 'Den valda filen används. Vänligen välj åtgärd.';
+$labels['newsession'] = 'Skapa en ny session';
+$labels['newsessionro'] = 'Skapa en ny session (kopiera filen till en läs-skriv-plats)';
+$labels['ownedsession'] = 'Fortsätt med din befintliga session';
+$labels['joinsession'] = 'Begär en inbjudan från $user';
+$labels['editfilero'] = 'Denna fil är skrivskyddad. Vill du skapa och redigera en kopia av filen?';
+$labels['editfilerotitle'] = 'Skrivskyddad fil';
 $labels['select'] = 'Välj';
+$labels['terminatesession'] = 'Avsluta sessionen';
+$labels['sessionterminatedtitle'] = 'Sessionen avslutat';
+$labels['sessionterminated'] = 'Sessionen har avslutats. Fönstret stängs.';
+$labels['terminate'] = 'Avsluta';
+$labels['sessionterminating'] = 'Avslutar sessionen ...';
+$labels['unsavedchanges'] = 'Det finns osparade ändringar i dokumentet som kommer att gå förlorade. Vill du avsluta sessionen ändå?';
+$labels['manageeditors'] = 'Bjud in till dokument';
 $labels['participant'] = 'Deltagare';
 $labels['status'] = 'Status';
 $labels['addparticipant'] = 'Lägg till deltagare';
+$labels['delparticipant'] = 'Ta bort deltagare';
 $labels['invitationtextlabel'] = 'Kommentar till inbjudan/meddelande';
 $labels['statusorganizer'] = 'Organisatör';
+$labels['statusinvited'] = 'Inbjuden';
+$labels['statusaccepted'] = 'Accepterad';
+$labels['statusdeclined'] = 'Avböjde';
+$labels['statusrequested'] = 'Begärda';
+$labels['documentinviting'] = 'Bjuder in deltagare ...';
+$labels['documentcancelling'] = 'Tar bort deltagare ...';
+$labels['removeparticipant'] = 'Ta bort';
+$labels['invitednotice'] = 'Du har blivit inbjuden till redigeringssessionen av $owner';
+$labels['acceptedownernotice'] = '$owner accepterade din begäran om att gå med i redigeringssessionen.';
+$labels['declinedownernotice'] = '$owner nekade din begäran att gå med i redigeringssessionen.';
+$labels['acceptednotice'] = '$user accepterade din inbjudan att gå med i redigeringssessionen.';
+$labels['declinednotice'] = '$user avböjde din inbjudan till redigeringssessionen.';
+$labels['requestednotice'] = '$user begärde att få gå med i redigeringssessionen.';
+$labels['sessiondialog'] = 'Dokumentredigeringssession';
+$labels['sessiondialogcontent'] = 'Det pågår en redigeringssession i $file skapad av $owner';
+$labels['more'] = 'Mer.';
+$labels['accept'] = 'Acceptera';
+$labels['join'] = 'Gå med i sessionen';
+$labels['decline'] = 'Avböj';
 $labels['owner'] = 'Ägare';
+$labels['when'] = 'När';
+$labels['file'] = 'Fil';
 $labels['comment'] = 'Kommentar';
+$labels['open'] = 'Öppna';
+$labels['request'] = 'Begär en inbjudan';
+$labels['invitationtitle'] = 'Inbjudan till $file';
+$labels['invitationaccepting'] = 'Accepterar en inbjudan ...';
+$labels['invitationdeclining'] = 'Avböjer en inbjudan ...';
+$labels['invitationrequesting'] = 'Begär en inbjudan ...';
+$labels['storepasswords'] = 'kom ihåg lösenord';
+$labels['storepasswordsdesc'] = 'Lagrade lösenord kommer att krypteras. Aktivera det här om du inte vill bli tillfrågad om lösenordet vid varje inloggning eller om du vill att denna lagring ska vara tillgänglig via WebDAV.';
+$labels['arialabelsearchform'] = 'Sökformulär för filer';
+$labels['arialabelquicksearchbox'] = 'Sökinmatning';
+$labels['arialabellistoptions'] = 'Fillistningsval';
+$labels['arialabelfolderoptions'] = 'Mappåtgärd';
+$labels['arialabelfileeditform'] = 'Filredigeringsformulär';
+$labels['arialabelfilecreateform'] = 'Formulär för skapa-fil';
+$labels['arialabelfilelist'] = 'Filförteckning';
+$labels['arialabelfoldercreateform'] = 'Formulär för skapa-mapp';
+$labels['arialabelfoldereditform'] = 'Formulär för mappredigering';
+$labels['arialabelfoldermountform'] = 'Formulär för extern lagring';
+$labels['arialabelfolderauthform'] = 'Autentiseringsformulär för extern lagring';
+$labels['arialabelfolderlist'] = 'Mapp-/samlingsurval';
+$labels['arialabelfileselectdialog'] = 'Filurvalsdialog';
+$labels['arialabelattachmentoptions'] = 'Alternativ för att spara bilagor';
+$labels['arialabelfilesavedialog'] = 'Dialog för atta spara fil(er)';
+$labels['arialabelfileprops'] = 'Filegenskaper';
+$labels['arialabelfilecontent'] = 'Filinnehåll';
+$labels['arialabelfileeditdialog'] = 'Filredigeringsdialog';
+$labels['arialabelfilesessiondialog'] = 'Dokumentredigeringssession';
+$labels['type.plain'] = 'Oformaterat textdokument';
+$labels['type.vndoasisopendocumenttext'] = 'Textdokument (ODF)';
+$labels['type.html'] = 'HTML-dokument';

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/th_TH.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/th_TH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/compose_plugin.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/compose_plugin.html Changed

@@ -6,7 +6,7 @@
 			<a class="button icon back" href="#back" data-hidden="big" onclick="$('#folderlistbox').hide();$('#filelistcontainer').css('display','flex')"><span class="inner"><roundcube:label name="back" /></span></a>
 			<span class="header-title"><roundcube:label name="folders" /></span>
 		</div>
-		<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+		<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar menu"
 			ariatag="h5" label="foldersearchform" buttontitle="kolab_files.findfolders" />
 		<div id="files-folder-list" class="scroller"></div>
 	</div>
@@ -15,7 +15,7 @@
 			<a class="button icon folders" href="#sidebar" data-hidden="big" onclick="$('#filelistcontainer').hide();$('#folderlistbox').css('display','flex')"><span class="inner"><roundcube:label name="folders" /></span></a>
 			<span class="header-title" data-hidden="big" ><roundcube:label name="kolab_files.selectfiles" /></span>
 		</div>
-		<roundcube:object name="file-search-form" id="filesearchbox" wrapper="searchbar toolbar"
+		<roundcube:object name="file-search-form" id="filesearchbox" wrapper="searchbar menu"
 			label="searchform" buttontitle="kolab_files.findfiles" label-domain="kolab_files"
 			ariatag="h3" options="filesearchmenu" />
 		<div id="filesearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="filelist">

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/docedit.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/docedit.html Changed

@@ -2,32 +2,28 @@
 
 <h1 class="voice"><roundcube:var name="env:filename" /></h1>
 
-<div class="content selected editor-<roundcube:var name="env:editor_type" />">
+<div id="layout-content" class="selected editor-<roundcube:var name="env:editor_type" />">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header document-editor-header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon members" href="#members" onclick="kolab_files_members_list(this)" data-hidden="big">
 			<span class="inner"><roundcube:label name="kolab_files.arialabelcollaborators"></span>
 		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
-		<div class="toolbar">
-			<roundcube:button command="document-close" type="link"
-				class="button delete disabled" classAct="button delete"
+		<div class="toolbar menu">
+			<roundcube:button command="document-close" type="link" class="delete disabled" classAct="delete"
 				label="kolab_files.terminate" title="kolab_files.terminatesession" innerClass="inner" />
 			<span class="dropbutton">
-				<roundcube:button command="document-export" type="link"
-					class="button export disabled" classAct="button export"
+				<roundcube:button command="document-export" type="link" class="export disabled" classAct="export"
 					label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
-				<a href="#export" class="button dropdown" id="exportmenulink" data-popup="export-menu" tabindex="0">
+				<a href="#export" class="dropdown" id="exportmenulink" data-popup="export-menu" tabindex="0">
 					<span class="inner"><roundcubemail:label name="kolab_files.exportoptions" /><span>
 				</a>
 			</span>
 			<roundcube:if condition="env:editor_type == 'wopi'" />
-				<roundcube:button command="document-print" type="link"
-					class="button print disabled" classAct="button print"
+				<roundcube:button command="document-print" type="link" class="print disabled" classAct="print"
 					label="print" title="kolab_files.printfile" innerClass="inner" data-hidden="small" />
 			<roundcube:endif />
-			<roundcube:button command="document-save" type="link"
-				class="button save disabled" classAct="button save"
+			<roundcube:button command="document-save" type="link" class="save disabled" classAct="save"
 				label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" data-hidden="small" />
 		</div>
 		<roundcube:if condition="env:editor_type != 'wopi'" />
@@ -48,18 +44,17 @@
 		<roundcube:object name="filepreviewframe" id="fileframe" role="main"
 			title="kolab_files.arialabelfilecontent" aria-labelledby="aria-label-filecontent" />
 	</div>
-	<div class="footer toolbar hidden-big">
-		<roundcube:button command="document-save" type="link"
-			class="button save disabled" classAct="button save"
+	<div class="footer toolbar menu hidden-big">
+		<roundcube:button command="document-save" type="link" class="save disabled" classAct="save"
 			label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" />
 		<roundcube:button name="close-window" type="link" onclick="parent.$('.ui-dialog:visible button.cancel').click()"
-			class="button cancel" label="cancel" title="cancel" innerClass="inner" />
+			class="cancel" label="cancel" title="cancel" innerClass="inner" />
 	</div>
 </div>
 
 <div id="export-menu" class="popupmenu">
 	<h3 id="aria-label-exportmenu" class="voice"><roundcube:label name="kolab_files.arialabelexportoptions" /></h3>
-	<ul id="exportmenu-menu" class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
+	<ul id="exportmenu-menu" class="menu listing" role="menu" aria-labelledby="aria-label-exportmenu"></ul>
 </div>
 
 <div id="document-editors-dialog" class="popupmenu editors-dialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog">

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/filepreview.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/filepreview.html Changed

@@ -2,7 +2,7 @@
 
 <h1 class="voice"><roundcube:var name="env:filename" /></h1>
 
-<div class="sidebar listbox">
+<div id="layout-sidebar" class="listbox">
 	<div class="header">
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
@@ -12,38 +12,33 @@
 	</div>
 </div>
 
-<div class="content selected">
+<div id="layout-content" class="selected">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
 			<span class="inner"><roundcube:label name="properties"></span>
 		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
-		<div id="filetoolbar" class="toolbar">
-			<roundcube:button command="files-get" type="link"
-				class="button download disabled" classAct="button download"
+		<div id="filetoolbar" class="toolbar menu">
+			<roundcube:button command="files-get" type="link" class="download disabled" classAct="download"
 				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
-			<roundcube:button command="files-edit" type="link"
-				class="button edit disabled" classAct="button edit"
+			<roundcube:button command="files-edit" type="link" class="edit disabled" classAct="edit"
 				label="kolab_files.edit" title="kolab_files.editfile" innerClass="inner" data-hidden="small" />
-			<roundcube:button command="files-save" type="link"
-				class="button save disabled" classAct="button save"
+			<roundcube:button command="files-save" type="link" class="save disabled" classAct="save"
 				label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" style="display:none" data-hidden="small" />
-			<roundcube:button command="files-delete" type="link"
-				class="button delete disabled" classAct="button delete"
+			<roundcube:button command="files-delete" type="link" class="delete disabled" classAct="delete"
 				label="delete" title="kolab_files.deletefile" innerClass="inner" />
-			<roundcube:button command="files-print" type="link"
-				class="button print disabled" classAct="button print"
+			<roundcube:button command="files-print" type="link" class="print disabled" classAct="print"
 				label="print" title="kolab_files.printfile" innerClass="inner" data-hidden="small" />
 			<roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
 				<roundcube:button command="image-scale" type="link" prop="+" data-hidden="small"
-					class="button zoomin disabled" classAct="button zoomin"
+					class="zoomin disabled" classAct="zoomin"
 					label="zoomin" title="increaseimage" innerclass="inner" />
 				<roundcube:button command="image-scale" type="link" prop="-" data-hidden="small"
-					class="button zoomout disabled" classAct="button zoomout"
+					class="zoomout disabled" classAct="zoomout"
 					label="zoomout" title="decreaseimage" innerclass="inner" />
 				<roundcube:button command="image-rotate" type="link"
-					class="button rotate disabled" classAct="button rotate" data-hidden="small"
+					class="rotate disabled" classAct="rotate" data-hidden="small"
 					label="rotate" title="rotateimage" innerclass="inner" />
 			<roundcube:endif />
 		</div>
@@ -55,15 +50,15 @@
 <roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
 	<div id="image-tools" class="image-tools" data-hidden="big">
 		<h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelimagetools" /></h3>
-		<div class="toolbar" role="menu" aria-labelledby="aria-label-imagetools">
+		<div class="toolbar menu" role="menu" aria-labelledby="aria-label-imagetools">
 			<roundcube:button command="image-scale" type="link" prop="+"
-				class="button zoomin disabled" classAct="button zoomin"
+				class="zoomin disabled" classAct="zoomin"
 				label="zoomin" title="increaseimage" innerclass="inner" />
 			<roundcube:button command="image-scale" type="link" prop="-"
-				class="button zoomout disabled" classAct="button zoomout"
+				class="zoomout disabled" classAct="zoomout"
 				label="zoomout" title="decreaseimage" innerclass="inner" />
 			<roundcube:button command="image-rotate" type="link"
-				class="button rotate disabled" classAct="button rotate"
+				class="rotate disabled" classAct="rotate"
 				label="rotate" title="rotateimage" innerclass="inner" />
 		</div>
 		<a href="#" class="button icon tools" onclick="$(this).attr('title', $(this).data('label-' + ($('#image-tools').toggleClass('open').is('.open') ? 'hide' : 'show')))"

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/files.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/files.html Changed

@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="kolab_files.files" /></h1>
 
 
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-folders">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-folders">
 	<div class="header">
 		<a class="button icon back-content-button" href="#back" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-folders" class="header-title"><roundcube:label name="folders" /></span>
@@ -12,11 +12,11 @@
 			title="moreactions" label="actions"
 			class="button icon sidebar-menu" innerClass="inner" data-popup="folderoptions" />
 	</div>
-	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar menu"
 		ariatag="h2" label="foldersearchform" buttontitle="kolab_files.findfolders" />
 	<div id="files-folder-list" class="scroller"></div>
 <roundcube:if condition="env:files_quota" />
-	<div class="footer toolbar small">
+	<div class="footer small">
 		<div id="quotadisplay" class="quota-widget">
 			<span class="voice"><roundcube:label name="quota"></span>
 			<roundcube:object name="filequotadisplay" class="count" display="text" />
@@ -26,45 +26,45 @@
 </div>
 
 
-<div class="content selected no-navbar" role="main">
+<div id="layout-content" class="selected no-navbar" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar" data-hidden="big"><span class="inner"><roundcube:label name="folders" /></span></a>
 		<span class="header-title"></span>
 		
-		<div id="filestoolbar" class="toolbar">
+		<div id="filestoolbar" class="toolbar menu">
 			<roundcube:button id="fileslistmenu-link" name="fileslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('files')"
-				label="options" class="button settings" innerClass="inner" />
+				label="options" class="options" innerClass="inner" />
 			<roundcube:button id="sessionslistmenu-link" name="sessionslistmenu-link"
 				type="link" onclick="kolab_files_listoptions('sessions')"
-				label="options" class="button hidden settings" innerClass="inner" />
+				label="options" class="hidden settings" innerClass="inner" />
 			<span class="spacer"></span>
 			<roundcube:button command="files-upload" type="link" onclick="$('#filesuploadform').click()"
-				class="button upload disabled" classAct="button upload"
+				class="upload disabled" classAct="upload"
 				label="kolab_files.upload" title="kolab_files.uploadfile" innerClass="inner" />
 			<roundcube:button command="files-get" type="link"
-				class="button download disabled" classAct="button download"
+				class="download disabled" classAct="download"
 				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
 			<roundcube:button command="files-open" type="link"
-				class="button open disabled" classAct="button open"
+				class="open disabled" classAct="open"
 				label="kolab_files.view" title="kolab_files.viewfile" innerClass="inner" />
 			<roundcube:button command="files-edit" type="link"
-				class="button edit disabled" classAct="button edit"
+				class="edit disabled" classAct="edit"
 				label="kolab_files.edit" title="kolab_files.editfile" innerClass="inner" />
 			<roundcube:button command="files-create" type="link" data-fab="true"
-				class="button create disabled" classAct="button create"
+				class="create disabled" classAct="create"
 				label="kolab_files.create" title="kolab_files.createfile" innerClass="inner "/>
 			<roundcube:button command="files-delete" type="link"
-				class="button delete disabled" classAct="button delete"
+				class="delete disabled" classAct="delete"
 				label="delete" title="kolab_files.deletefile" innerClass="inner" />
 			<roundcube:button name="filemenulink" id="filemenulink" type="link"
-				class="button more" label="more" title="moreactions"
+				class="more" label="more" title="moreactions"
 				data-popup="file-menu" innerclass="inner" />
 		</div>
 	</div>
-	<roundcube:object name="file-search-form" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="file-search-form" id="searchform" wrapper="searchbar menu"
 		label="searchform" buttontitle="kolab_files.findfiles" label-domain="kolab_files"
 		ariatag="h3" options="filesearchmenu" />
 	<div id="filesearchmenu" class="hidden searchoptions scroller propform formcontainer" aria-labelledby="aria-label-search-menu" aria-controls="filelist">
@@ -130,16 +130,16 @@
 
 <div id="folderoptions" class="popupmenu" data-editable="true">
 	<h3 id="aria-label-folderoptions" class="voice"><roundcube:label name="kolab_files.folderoptions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-folderoptions">
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-folderoptions">
 		<roundcube:button type="link-menuitem" command="folder-create" label="kolab_files.addfolder" class="create disabled" classAct="create active" />
-		<roundcube:button type="link-menuitem" command="folder-rename" label="kolab_files.folderrename" class="rename" classAct="rename active" />
+		<roundcube:button type="link-menuitem" command="folder-rename" label="kolab_files.folderrename" class="rename disabled" classAct="rename active" />
 		<roundcube:if condition="env:files_api_version &gt; 3" />
-			<roundcube:button type="link-menuitem" command="folder-share" label="kolab_files.foldershare" class="share" classAct="share active" />
+			<roundcube:button type="link-menuitem" command="folder-share" label="kolab_files.foldershare" class="share disabled" classAct="share active" />
 		<roundcube:endif />
-		<roundcube:button type="link-menuitem" command="files-folder-delete" label="kolab_files.folderdelete" class="delete" classAct="delete active" />
-		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders" classAct="folders active" />
+		<roundcube:button type="link-menuitem" command="files-folder-delete" label="kolab_files.folderdelete" class="delete disabled" classAct="delete active" />
+		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
 		<roundcube:if condition="!empty(env:external_sources)" />
-			<roundcube:button type="link-menuitem" command="folder-mount" label="kolab_files.foldermount" class="mount storage" classAct="mount storage active" />
+			<roundcube:button type="link-menuitem" command="folder-mount" label="kolab_files.foldermount" class="mount storage disabled" classAct="mount storage active" />
 		<roundcube:endif />
 	</ul>
 </div>
@@ -199,7 +199,7 @@
 </div>
 
 <div id="dragfilemenu" class="popupmenu">
-	<ul class="toolbarmenu listing" role="menu">
+	<ul class="menu listing" role="menu">
 		<roundcube:button type="link-menuitem" command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" />
 		<roundcube:button type="link-menuitem" command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" />
 	</ul>
@@ -207,10 +207,10 @@
 
 <div id="file-menu" class="popupmenu">
 	<h3 id="aria-label-message-menu" class="voice"><roundcube:label name="kolab_files.arialabelmorefileactions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-file-menu">
-		<roundcube:button type="link-menuitem" command="files-rename" label="kolab_files.rename" class="rename" classAct="rename active" />
-		<roundcube:button type="link-menuitem" command="files-move" label="moveto" class="move" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
-		<roundcube:button type="link-menuitem" command="files-copy" label="copyto" class="copy" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-file-menu">
+		<roundcube:button type="link-menuitem" command="files-rename" label="kolab_files.rename" class="rename disabled" classAct="rename active" />
+		<roundcube:button type="link-menuitem" command="files-move" label="moveto" class="move disabled" classAct="move active" innerclass="folder-selector-link" aria-haspopup="true" />
+		<roundcube:button type="link-menuitem" command="files-copy" label="copyto" class="copy disabled" classAct="copy active" innerclass="folder-selector-link" aria-haspopup="true" />
 	</ul>
 </div>

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/message_plugin.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/message_plugin.html Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_files/skins/elastic/ui.js -> iRony-0.4.3.tar.gz/lib/plugins/kolab_files/skins/elastic/ui.js Changed

@@ -2,8 +2,8 @@
 {
     if (p.command == 'files-save') {
         var toolbar = $('#toolbar-menu');
-        $('a.button.edit', toolbar).parent().hide();
-        $('a.button.save', toolbar).show().parent().show();
+        $('a.edit', toolbar).parent().hide();
+        $('a.save', toolbar).show().parent().show();
 
         if (window.editor_edit_button)
             window.editor_edit_button.addClass('hidden');
@@ -52,7 +52,7 @@
 {
     var dialog = $('<div id="members-dialog" class="session-members"><ul></ul></div>'),
         title = $(link).text(),
-        add_button = $('#collaborators a.button.add'),
+        add_button = $('#collaborators a.add'),
         save_func = function(e) {
             add_button.click();
             return true;
@@ -82,7 +82,7 @@
     rcmail.addEventListener('enable-command', kolab_files_enable_command);
 
     if (rcmail.env.action == 'open') {
-        $('#toolbar-menu a.button.save').parent().hide();
+        $('#toolbar-menu a.save').parent().hide();
     }
     else if (rcmail.env.action == 'edit') {
         if (rcmail.env.editor_type == 'wopi' && rcmail.is_framed()) {
@@ -104,8 +104,8 @@
 
     // Elastic mobile preview uses an iframe in a dialog
     if ((rcmail.env.action == 'open' || rcmail.env.editor_type != 'wopi') && rcmail.is_framed()) {
-        var edit_button = $('#filetoolbar a.button.edit'),
-            save_button = $('#filetoolbar a.button.save');
+        var edit_button = $('#filetoolbar a.edit'),
+            save_button = $('#filetoolbar a.save');
 
         parent.$('.ui-dialog:visible .ui-dialog-buttonpane .ui-dialog-buttonset').prepend(
             window.editor_save_button = $('<button type="button">')
@@ -124,12 +124,20 @@
 }
 else {
     rcmail.addEventListener('files-folder-select', function(p) {
-        var is_sess = p.folder == 'folder-collection-sessions';
-        $('#fileslistmenu-link, #layout > .content > .pagenav, #layout > .content .searchbar')[is_sess ? 'hide' : 'show']();
+        var fname, is_sess = p.folder == 'folder-collection-sessions';
+
+        $('#fileslistmenu-link, #layout-content > .pagenav, #layout-content .searchbar')[is_sess ? 'hide' : 'show']();
         $('#sessionslistmenu-link')[is_sess ? 'removeClass' : 'addClass']('hidden');
 
-        // set list header title for mobile
-        // $('#layout > .content > .header > .header-title').text($('#files-folder-list li.selected a.name:first').text());
+        if (is_sess)
+            fname = rcmail.gettext('kolab_files.sessions');
+        else if (p.folder.match(/^folder-collection-([a-z]+)$/))
+            fname = rcmail.gettext('kolab_files.collection_' + RegExp.$1);
+        else
+            fname = p.folder.split(file_api.env.directory_separator).pop();
+
+        // jump to files list and set list header title for mobile
+        rcmail.triggerEvent('show-content', {title: fname});
     });
 }

iRony-0.4.2.tar.gz/lib/plugins/kolab_folders/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_folders/kolab_folders.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/kolab_folders.php Changed

@@ -72,6 +72,11 @@
         // ACL plugin hooks
         $this->add_hook('acl_rights_simple', array($this, 'acl_rights_simple'));
         $this->add_hook('acl_rights_supported', array($this, 'acl_rights_supported'));
+
+        // Resolving other user folder names
+        $this->add_hook('render_mailboxlist', array($this, 'render_folderlist'));
+        $this->add_hook('render_folder_selector', array($this, 'render_folderlist'));
+        $this->add_hook('folders_list', array($this, 'render_folderlist'));
     }
 
     /**
@@ -709,6 +714,7 @@
      * Static getter for default folder of the given type
      *
      * @param string $type Folder type
+     *
      * @return string Folder name
      */
     public static function default_folder($type)
@@ -781,4 +787,65 @@
             );
         }
     }
+
+    /**
+     * Handler for various folders list widgets (hooks)
+     *
+     * @param array $args Hash array with hook parameters
+     *
+     * @return array Hash array with modified hook parameters
+     */
+    public function render_folderlist($args)
+    {
+        $storage  = $this->rc->get_storage();
+        $ns_other = $storage->get_namespace('other');
+        $is_fl    = $this->rc->plugins->is_processing('folders_list');
+
+        foreach ((array) $ns_other as $root) {
+            $delim  = $root[1];
+            $prefix = rtrim($root[0], $delim);
+            $length = strlen($prefix);
+
+            if (!$length) {
+                continue;
+            }
+
+            // folders_list hook mode
+            if ($is_fl) {
+                foreach ((array) $args['list'] as $folder_name => $folder) {
+                    if (strpos($folder_name, $root[0]) === 0 && !substr_count($folder_name, $root[1], $length+1)) {
+                        if ($name = kolab_storage::folder_id2user(substr($folder_name, $length+1), true)) {
+                            $old     = $args['list'][$folder_name]['display'];
+                            $content = $args['list'][$folder_name]['content'];
+
+                            $name    = rcube::Q($name);
+                            $content = str_replace(">$old<", ">$name<", $content);
+
+                            $args['list'][$folder_name]['display'] = $name;
+                            $args['list'][$folder_name]['content'] = $content;
+                        }
+                    }
+                }
+
+                // TODO: Re-sort the list
+            }
+            // render_* hooks mode
+            else if (!empty($args['list'][$prefix]) && !empty($args['list'][$prefix]['folders'])) {
+                $map = array();
+                foreach ($args['list'][$prefix]['folders'] as $folder_name => $folder) {
+                    if ($name = kolab_storage::folder_id2user($folder_name, true)) {
+                        $args['list'][$prefix]['folders'][$folder_name]['name'] = $name;
+                    }
+
+                    $map[$folder_name] = $name ?: $args['list'][$prefix]['folders'][$folder_name]['name'];
+                }
+
+                // Re-sort the list
+                uasort($map, 'strcoll');
+                $args['list'][$prefix]['folders'] = array_replace($map, $args['list'][$prefix]['folders']);
+            }
+        }
+
+        return $args;
+    }
 }

iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/de.inc Added

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['folderctype'] = 'Inhaltstyp';
+$labels['foldertypemail'] = 'E-Mail';
+$labels['foldertypeevent'] = 'Kalender';
+$labels['foldertypejournal'] = 'Journal';
+$labels['foldertypetask'] = 'Aufgaben';
+$labels['foldertypenote'] = 'Notizen';
+$labels['foldertypecontact'] = 'Kontakte';
+$labels['foldertypeconfiguration'] = 'Konfiguration';
+$labels['foldertypefile'] = 'Dateien';
+$labels['foldertypefreebusy'] = 'Frei/Belegt';
+$labels['default'] = 'Standard';
+$labels['inbox'] = 'Posteingang';
+$labels['drafts'] = 'Entwürfe';
+$labels['sentitems'] = 'Gesendet';
+$labels['outbox'] = 'Postausgang';
+$labels['wastebasket'] = 'Mülleimer';
+$labels['junkemail'] = 'Spam';
+$labels['confidential'] = 'Vertraulich';
+$labels['private'] = 'Privat';
+$labels['xdays'] = '$x Tage';
+$messages['defaultfolderexists'] = 'Es gibt bereits einen Standardordner des angegebenen Typs';
+?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_folders/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/de_DE.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_folders/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/pl_PL.inc Changed

@@ -6,7 +6,26 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
  */
+$labels['folderctype'] = 'Typ treści';
+$labels['foldertypemail'] = 'Poczta';
 $labels['foldertypeevent'] = 'Kalendarz';
+$labels['foldertypejournal'] = 'Dziennik';
 $labels['foldertypetask'] = 'Zadania';
+$labels['foldertypenote'] = 'Notatki';
+$labels['foldertypecontact'] = 'Kontakty';
+$labels['foldertypeconfiguration'] = 'Konfiguracja';
 $labels['foldertypefile'] = 'Pliki';
+$labels['foldertypefreebusy'] = 'Wolny-Zajęty';
+$labels['default'] = 'Domyślny';
+$labels['inbox'] = 'Odebrane';
+$labels['drafts'] = 'Kopie robocze';
+$labels['sentitems'] = 'Wysłane';
+$labels['outbox'] = 'Poczta wychodząca';
+$labels['wastebasket'] = 'Kosz';
+$labels['junkemail'] = 'Spam';
+$labels['confidential'] = 'Poufne';
+$labels['private'] = 'Prywatne';
+$labels['folderexpire'] = 'Usuń wiadomości starsze niż';
+$labels['xdays'] = '$x days';
+$messages['defaultfolderexists'] = 'Folder domyślny wybranego typu już istnieje';
 ?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_folders/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/ru_RU.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/sv.inc Added

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_folders/
+ */
+$labels['folderctype'] = 'Innehållstyp';
+$labels['foldertypemail'] = 'E-post';
+$labels['foldertypeevent'] = 'Kalender';
+$labels['foldertypejournal'] = 'Journal';
+$labels['foldertypetask'] = 'Uppgifter';
+$labels['foldertypenote'] = 'Anteckningar';
+$labels['foldertypecontact'] = 'Kontakter';
+$labels['foldertypeconfiguration'] = 'Konfiguration';
+$labels['foldertypefile'] = 'Filer';
+$labels['foldertypefreebusy'] = 'Ledig-upptagen';
+$labels['default'] = 'Standard';
+$labels['inbox'] = 'Inkorg';
+$labels['drafts'] = 'Utkast';
+$labels['sentitems'] = 'Skickat';
+$labels['outbox'] = 'Utkorg';
+$labels['wastebasket'] = 'Papperskorg';
+$labels['junkemail'] = 'Skräp';
+$labels['confidential'] = 'Konfidentiellt';
+$messages['defaultfolderexists'] = 'Det finns redan en standardmapp för specificerad typ';
+?>

iRony-0.4.2.tar.gz/lib/plugins/kolab_folders/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/sv_SE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_folders/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_folders/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/kolab_notes.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/kolab_notes.php Changed

@@ -96,13 +96,13 @@
 
             // add 'Append note' item to message menu
             if ($this->api->output->type == 'html' && $_REQUEST['_rel'] != 'note') {
-                $this->api->add_content(html::tag('li', null, 
+                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
                     $this->api->output->button(array(
                       'command'  => 'append-kolab-note',
                       'label'    => 'kolab_notes.appendnote',
                       'type'     => 'link',
                       'classact' => 'icon appendnote active',
-                      'class'    => 'icon appendnote',
+                      'class'    => 'icon appendnote disabled',
                       'innerclass' => 'icon note',
                     ))),
                     'messagemenu');
@@ -480,7 +480,7 @@
 
         $this->_read_lists();
         if ($folder = $this->get_folder($list_id)) {
-            foreach ($folder->select($query) as $record) {
+            foreach ($folder->select($query, empty($query)) as $record) {
                 // post-filter search results
                 if (strlen($search)) {
                     $matches = 0;

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/cs_CZ.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/cs_CZ.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/da_DK.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/da_DK.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/de.inc Added

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
+$labels['navtitle'] = 'Notizen';
+$labels['tags'] = 'Schlagworte';
+$labels['lists'] = 'Notizbücher';
+$labels['notes'] = 'Notizen';
+$labels['create'] = 'Neue Notiz';
+$labels['createnote'] = 'Neue Notiz erstellen';
+$labels['send'] = 'Senden';
+$labels['sendnote'] = 'Notiz über E-Mail versenden';
+$labels['newnote'] = 'Neue Notiz';
+$labels['notags'] = 'Keine Schlagworte';
+$labels['removetag'] = 'Schlagwort entfernen';
+$labels['created'] = 'Erstellt';
+$labels['changed'] = 'Geändert';
+$labels['title'] = 'Titel';
+$labels['now'] = 'Jetzt';
+$labels['sortby'] = 'Sortieren nach';
+$labels['newnotebook'] = 'Neues Notizbuch erstellen';
+$labels['addnotebook'] = 'Notizbuch hinzufügen';
+$labels['listname'] = 'Name';
+$labels['tabsharing'] = 'Freigabe';
+$labels['discard'] = 'Verwerfen';
+$labels['abort'] = 'Abbrechen';
+$labels['unsavedchanges'] = 'Nicht gespeicherte Änderungen!';
+$labels['appendnote'] = 'Eine Notiz hinzufügen';
+$labels['editnote'] = 'Notiz bearbeiten';
+$labels['savein'] = 'Speichern in';
+$labels['foldersubscribe'] = 'Permanent anzeigen';
+$labels['findnotebooks'] = 'Suche Notizbücher...';
+$labels['listsearchresults'] = 'Zusätzliche Notizbücher';
+$labels['nrnotebooksfound'] = '$nr Notizbücher gefunden';
+$labels['nonotebooksfound'] = 'Keine Notizbücher gefunden';
+$labels['removelist'] = 'Von der Liste entfernen';
+$labels['removelink'] = 'E-Mail-Referenz entfernen';
+$labels['savingdata'] = 'Daten werden gespeichert...';
+$labels['recordnotfound'] = 'Eintrag nicht gefunden';
+$labels['norecordsfound'] = 'Keine Notizen gefunden';
+$labels['nochanges'] = 'Keine Änderungen werden gespeichert';
+$labels['entertitle'] = 'Bitte geben Sie einen Titel für diese Notiz ein!';
+$labels['deletenotesconfirm'] = 'Willst du wirklich die ausgewählten Notizen löschen?';
+$labels['deletenotebookconfirm'] = 'Willst du wirklich die ausgewählten Notizbücher löschen? Diese Aktion kann nicht rückgängig gemacht werden.';
+$labels['discardunsavedchanges'] = 'Die aktuelle Notiz wurde noch nicht gespeichert. Die Änderungen verwerfen?';
+$labels['invalidlistproperties'] = 'Ungültige Notizbuch Eigenschaften! Bitte gebe einen gültigen Namen ein.';
+$labels['entertitle'] = 'Bitte geben Sie einen Titel für diese Notiz ein!';
+$labels['aclnorights'] = 'Dir fehlen die Administrationsrechte für dieses Notizbuch.';
+$labels['arialabelnoteslist'] = 'Notizliste';
+$labels['arialabelnotesearchform'] = 'Notizen-Suchmaske';
+$labels['arialabelnotesquicksearchbox'] = 'Notiz-Sucheingabe';
+$labels['arialabelnotessortmenu'] = 'Sortieroptionen für Notizen';
+$labels['arialabelnotesoptionsmenu'] = 'Notizbuch Aktionsmenü';
+$labels['arialabelnotebookform'] = 'Notizbucheigenschaften';
+$labels['arialabelmessagereferences'] = 'Verknüpfte E-Mail-Mitteilungen';
+$labels['arialabelfoldersearchform'] = 'Notizbücher-Suchmaske';
+$labels['arialabelnoteform'] = 'Notizbearbeitungsmaske';

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/de_CH.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/de_CH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/de_DE.inc Changed

@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Folders plugin
+ *
+ * Copyright (C) 2015, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
+ */
 $labels['navtitle'] = 'Notizen';
 $labels['tags'] = 'Schlagworte';
 $labels['lists'] = 'Notizbücher';
@@ -17,7 +24,6 @@
 $labels['sortby'] = 'Sortieren nach';
 $labels['newnotebook'] = 'Neues Notizbuch erstellen';
 $labels['addnotebook'] = 'Notizbuch hinzufügen';
-$labels['editlist'] = 'Notizbuch bearbeiten';
 $labels['listname'] = 'Name';
 $labels['tabsharing'] = 'Freigabe';
 $labels['discard'] = 'Verwerfen';
@@ -42,6 +48,7 @@
 $labels['deletenotebookconfirm'] = 'Willst du wirklich die ausgewählten Notizbücher löschen? Diese Aktion kann nicht rückgängig gemacht werden.';
 $labels['discardunsavedchanges'] = 'Die aktuelle Notiz wurde noch nicht gespeichert. Die Änderungen verwerfen?';
 $labels['invalidlistproperties'] = 'Ungültige Notizbuch Eigenschaften! Bitte gebe einen gültigen Namen ein.';
+$labels['entertitle'] = 'Bitte geben Sie einen Titel für diese Notiz ein!';
 $labels['aclnorights'] = 'Dir fehlen die Administrationsrechte für dieses Notizbuch.';
 $labels['arialabelnoteslist'] = 'Notizliste';
 $labels['arialabelnotesearchform'] = 'Notizen-Suchmaske';

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/es_AR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/es_AR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/es_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/es_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/et_EE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/et_EE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/fi_FI.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/fi_FI.inc Changed

@@ -24,7 +24,8 @@
 $labels['sortby'] = 'Lajittelujärjestys';
 $labels['newnotebook'] = 'Luo uusi muistikirja';
 $labels['addnotebook'] = 'Lisää muistikirja';
-$labels['editlist'] = 'Muokkaa muistikirjaa';
+$labels['deletelist'] = 'Poista muistikirja';
+$labels['editlist'] = 'Muokkaa tai jaa muistikirja';
 $labels['listname'] = 'Nimi';
 $labels['tabsharing'] = 'Jakaminen';
 $labels['discard'] = 'Hylkää';
@@ -51,7 +52,9 @@
 $labels['invalidlistproperties'] = 'Virheelliset muistikirjan ominaisuudet! Aseta muistikirjalle kelvollinen nimi.';
 $labels['entertitle'] = 'Anna nimi tälle muistiolle!';
 $labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän muistikirjaan.';
+$labels['arialabelnoteslist'] = 'Lista muistioista';
 $labels['arialabelnotesearchform'] = 'Muistioiden hakulomake';
+$labels['arialabelnotesquicksearchbox'] = 'Muistioiden hakusyöte';
 $labels['arialabelnotesoptionsmenu'] = 'Muistikirjan toimenpidevalikko';
 $labels['arialabelnotebookform'] = 'Muistikirjan ominaisuudet';
 $labels['arialabelmessagereferences'] = 'Linkitetyt sähköpostiviestit';

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/fr_FR.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/fr_FR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/ja_JP.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/ja_JP.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/nl_NL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/nl_NL.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/pl_PL.inc Changed

@@ -6,13 +6,58 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
  */
+$labels['navtitle'] = 'Notatki';
 $labels['tags'] = 'Tagi';
-$labels['created'] = 'Utworzone';
+$labels['lists'] = 'Notatniki';
+$labels['notes'] = 'Notatki';
+$labels['create'] = 'Nowa notatka';
+$labels['createnote'] = 'Utwórz nową notatkę';
+$labels['send'] = 'Wyślij';
+$labels['sendnote'] = 'Wyślij notatkę e-mailem';
+$labels['newnote'] = 'Nowa notatka';
+$labels['notags'] = 'Brak tagów';
+$labels['removetag'] = 'Usuń tag';
+$labels['created'] = 'Utworzono';
 $labels['changed'] = 'Ostatnia modyfikacja';
 $labels['title'] = 'Tytuł';
+$labels['now'] = 'Teraz';
+$labels['sortby'] = 'Sortuj wg';
+$labels['newnotebook'] = 'Utwórz nowy notatnik';
+$labels['addnotebook'] = 'Dodaj notatnik';
 $labels['listname'] = 'Nazwa';
 $labels['tabsharing'] = 'Udostępnianie';
+$labels['discard'] = 'Odrzuć';
+$labels['abort'] = 'Przerwij';
+$labels['unsavedchanges'] = 'Niezapisane zmiany!';
+$labels['appendnote'] = 'Dodaj notatkę';
+$labels['editnote'] = 'Edytuj notatkę';
+$labels['savein'] = 'Zapisz w';
 $labels['foldersubscribe'] = 'Dodaj do listy na stałe';
+$labels['findnotebooks'] = 'Wyszukaj notatniki...';
+$labels['findnotes'] = 'Znajdź notatki';
+$labels['listsearchresults'] = 'Dodatkowe notatniki';
+$labels['nrnotebooksfound'] = 'znaleziono $n notatników';
+$labels['nonotebooksfound'] = 'Nie znaleziono żadnych notatników';
 $labels['removelist'] = 'Usuń z listy';
 $labels['removelink'] = 'Usuń odnośnik e-mail';
+$labels['listactions'] = 'Akcje listy notatników';
 $labels['savingdata'] = 'Zapisuję dane...';
+$labels['recordnotfound'] = 'Nie znaleziono rekordu';
+$labels['norecordsfound'] = 'Nie znaleziono żadnych notatek';
+$labels['nochanges'] = 'Brak zmian do zapisania';
+$labels['entertitle'] = 'Proszę wprowadzić tytuł tej notatki!';
+$labels['deletenotesconfirm'] = 'Czy na pewno chcesz usunąć wybrane notatki?';
+$labels['deletenotebookconfirm'] = 'Czy na pewno chcesz usunąć ten notatnik z wszystkimi notatkami? Ta operacja jest nieodwracalna.';
+$labels['discardunsavedchanges'] = 'Bieżąca notatka nie została jeszcze zapisana. Porzucić zmiany?';
+$labels['invalidlistproperties'] = 'Błędne właściwości notatnika! Proszę wprowadzić poprawną nazwę.';
+$labels['entertitle'] = 'Proszę wprowadzić tytuł tej notatki!';
+$labels['aclnorights'] = 'Nie posiadasz uprawnień administracyjnych do tego notatnika.';
+$labels['arialabelnoteslist'] = 'Lista notatek';
+$labels['arialabelnotesearchform'] = 'Formularz wyszukiwania notatek';
+$labels['arialabelnotesquicksearchbox'] = 'Fraza wyszukiwania';
+$labels['arialabelnotessortmenu'] = 'Opcje sortowania listy notatek';
+$labels['arialabelnotesoptionsmenu'] = 'Menu akcji notatników';
+$labels['arialabelnotebookform'] = 'Właściwości notatnika';
+$labels['arialabelmessagereferences'] = 'Powiązane wiadomości e-mail';
+$labels['arialabelfoldersearchform'] = 'Formularz wyszukiwania notatników';
+$labels['arialabelnoteform'] = 'Formularz edycji notatki';

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/ru_RU.inc Changed

@@ -24,7 +24,8 @@
 $labels['sortby'] = 'Сортировать по';
 $labels['newnotebook'] = 'Создать новую записную книжку';
 $labels['addnotebook'] = 'Добавить записную книжку';
-$labels['editlist'] = 'Редактировать записную книжку';
+$labels['deletelist'] = 'Удалить записную книжку';
+$labels['editlist'] = 'Редактировать/Поделиться записную книжку';
 $labels['listname'] = 'Имя';
 $labels['tabsharing'] = 'Поделиться';
 $labels['discard'] = 'Отказаться';
@@ -35,11 +36,13 @@
 $labels['savein'] = 'Сохранить в';
 $labels['foldersubscribe'] = 'Всегда показывать';
 $labels['findnotebooks'] = 'Найти записные книжки...';
+$labels['findnotes'] = 'Найти заметки';
 $labels['listsearchresults'] = 'Дополнительные записные книжки';
 $labels['nrnotebooksfound'] = '$nr записных книжек найдено';
 $labels['nonotebooksfound'] = 'Записных книжек не найдено';
 $labels['removelist'] = 'Удалить из списка';
 $labels['removelink'] = 'Удалить ссылку на письмо';
+$labels['listactions'] = 'Действия со списком записных книжек';
 $labels['savingdata'] = 'Сохранение данных...';
 $labels['recordnotfound'] = 'Запись не найдена';
 $labels['norecordsfound'] = 'Заметок не найдено';
@@ -55,6 +58,7 @@
 $labels['arialabelnotesearchform'] = 'Форма поиска заметок';
 $labels['arialabelnotesquicksearchbox'] = 'Поиск заметок';
 $labels['arialabelnotessortmenu'] = 'Настройки сортировки списка заметок';
+$labels['arialabelnotesoptionsmenu'] = 'Действия с записными книжками';
 $labels['arialabelnotebookform'] = 'Свойства записной книжки';
 $labels['arialabelmessagereferences'] = 'Связанные сообщения почты';
 $labels['arialabelfoldersearchform'] = 'Форма поиска записных книжек';

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/sl_SI.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/sl_SI.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/sv_SE.inc Changed

@@ -7,22 +7,55 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
  */
 $labels['navtitle'] = 'Anteckningar';
-$labels['tags'] = 'Taggar';
+$labels['tags'] = 'Etiketter';
+$labels['lists'] = 'Anteckningsböcker';
 $labels['notes'] = 'Anteckningar';
 $labels['create'] = 'Ny anteckning';
-$labels['createnote'] = 'Skapa ny anteckning';
+$labels['createnote'] = 'Skapa en ny anteckning';
 $labels['send'] = 'Skicka';
-$labels['sendnote'] = 'Skicka anteckning med email';
+$labels['sendnote'] = 'Skicka anteckning med e-post';
 $labels['newnote'] = 'Ny anteckning';
-$labels['notags'] = 'Inga taggar';
-$labels['removetag'] = 'Ta bort tagg';
+$labels['notags'] = 'Inga etiketter';
+$labels['removetag'] = 'Ta bort etikett';
 $labels['created'] = 'Skapad';
 $labels['changed'] = 'Senast ändrad';
 $labels['title'] = 'Titel';
 $labels['now'] = 'Nu';
+$labels['sortby'] = 'Sortera enligt';
+$labels['newnotebook'] = 'Skapa en ny anteckningsbok';
+$labels['addnotebook'] = 'Lägg till anteckningsbok';
 $labels['listname'] = 'Namn';
 $labels['tabsharing'] = 'Delning';
+$labels['discard'] = 'Kassera';
+$labels['abort'] = 'Avbryt';
+$labels['unsavedchanges'] = 'Ej sparade ändringar!';
+$labels['appendnote'] = 'Lägg till en anteckning';
+$labels['editnote'] = 'Redigera anteckning';
+$labels['savein'] = 'Spara i';
 $labels['foldersubscribe'] = 'Lista permanent';
+$labels['findnotebooks'] = 'Hitta anteckningsböcker ...';
+$labels['listsearchresults'] = 'Ytterligare anteckningsböcker';
+$labels['nrnotebooksfound'] = '$nr anteckningsböcker hittades';
+$labels['nonotebooksfound'] = 'Inga anteckningsböcker hittades';
 $labels['removelist'] = 'Ta bort från lista';
 $labels['removelink'] = 'Ta bort e-postreferens';
 $labels['savingdata'] = 'Sparar data ...';
+$labels['recordnotfound'] = 'Hittade inte post';
+$labels['norecordsfound'] = 'Inga anteckningar hittades';
+$labels['nochanges'] = 'Inga ändringar att spara';
+$labels['entertitle'] = 'Vänligen ange en titel för denna anteckning!';
+$labels['deletenotesconfirm'] = 'Vill du verkligen ta bort valda anteckningar?';
+$labels['deletenotebookconfirm'] = 'Vill du verkligen ta denna anteckningsbok med alla anteckningar? Denna åtgärd kan inte ångras.';
+$labels['discardunsavedchanges'] = 'Den nuvarande anteckningen har inte sparats än. Ignorera ändringarna?';
+$labels['invalidlistproperties'] = 'Ogiltiga egenskaper för anteckningsbok! Vänligen ange ett giltigt namn.';
+$labels['entertitle'] = 'Vänligen ange en titel för denna anteckning!';
+$labels['aclnorights'] = 'Du har inte administratörsrättigheter för denna anteckningsbok.';
+$labels['arialabelnoteslist'] = 'Lista med anteckningar';
+$labels['arialabelnotesearchform'] = 'Sökformulär för anteckningar';
+$labels['arialabelnotesquicksearchbox'] = 'Sökinmatning för anteckningar';
+$labels['arialabelnotessortmenu'] = 'Sorteringsalternativ för anteckningslista';
+$labels['arialabelnotesoptionsmenu'] = 'Åtgärdsmeny för anteckningsbok';
+$labels['arialabelnotebookform'] = 'Egenskaper för anteckningsbok';
+$labels['arialabelmessagereferences'] = 'Länkade e-postmeddelanden';
+$labels['arialabelfoldersearchform'] = 'Sökformulär för anteckningsböcker';
+$labels['arialabelnoteform'] = 'Redigeringsformulär för anteckning';

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/th_TH.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/th_TH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/notes.js -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/notes.js Changed

@@ -770,9 +770,13 @@
             is_html = false;
 
         // tag-edit line
+        var tagline = $('.tagline', titlecontainer);
         if (window.kolab_tags_input) {
-            $('.tagline', titlecontainer).parent('.form-group').show();
-            taglist = kolab_tags_input($('.tagline', titlecontainer), data.tags, readonly);
+            tagline.parent('.form-group').show();
+            taglist = kolab_tags_input(tagline, data.tags, readonly);
+        }
+        else {
+            tagline.parent('.form-group').hide();
         }
 
         $('.notetitle', titlecontainer).val(data.title).prop('disabled', readonly).show();
@@ -788,7 +792,7 @@
                     .addClass('message eml')
                     .append($('<a>')
                         .attr('href', link.mailurl)
-                        .addClass('messagelink')
+                        .addClass('messagelink filename')
                         .text(link.subject || link.uri)
                     )
                     .appendTo(attachmentslist);
@@ -1316,8 +1320,8 @@
                 dialogClass: 'warning',
                 open: function(event, ui) {
                     $(this).parent().find('.ui-dialog-titlebar-close').hide();
-                    setTimeout(function(){
-                        dialog.parent().find('.ui-button:visible').first().focus();
+                    setTimeout(function() {
+                        dialog.parent().find('button:visible').first().focus();
                     }, 10);
                 },
                 close: function(event, ui) {

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/notes_mail.js -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/notes_mail.js Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates/dialogview.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates/dialogview.html Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates/notes.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates/notes.html Changed

@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
 
 
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-notebooks" class="header-title"><roundcube:label name="kolab_notes.lists" /></span>
@@ -12,7 +12,7 @@
 			title="kolab_notes.listactions" class="button icon sidebar-menu" data-popup="notebookactions-menu"
 			innerClass="inner" label="actions" />
 	</div>
-	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar toolbar"
+	<roundcube:object name="libkolab.folder_search_form" id="notebooksearch" wrapper="searchbar menu"
 		ariatag="h2" label="foldersearchform" label-domain="kolab_notes" buttontitle="findnotebooks" />
 	<div id="notebooks-content" class="scroller">
 		<roundcube:object name="plugin.notebooks" id="notebooks" class="listing treelist iconized" />
@@ -20,18 +20,18 @@
 </div>
 
 
-<div class="list listbox selected" aria-labelledby="aria-label-noteslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-noteslist">
 	<div class="header">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="kolab_notes.notebooks" /></span></a>
 		<span id="aria-label-noteslist" class="header-title"><roundcube:label name="kolab_notes.notes" /></span>
-		<div id="listcontrols" class="toolbar" role="toolbar">
-			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
+		<div id="listcontrols" class="toolbar menu" role="toolbar">
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button options active"
 				label="options" innerClass="inner" onclick="return kolab_notes_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
-	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar menu"
 		label="notesearchform" label-domain="kolab_notes" buttontitle="kolab_notes.findnotes" ariatag="h2" />
 	<div class="scroller">
 		<h2 id="aria-label-noteslist" class="voice"><roundcube:label name="kolab_notes.notes" /></h2>
@@ -43,30 +43,26 @@
 </div>
 
 
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		
-		<div id="notestoolbar" class="toolbar">
-			<roundcube:button command="createnote" type="link"
-				class="button create disabled" classAct="button create"
+		<div id="notestoolbar" class="toolbar menu">
+			<roundcube:button command="createnote" type="link" class="create disabled" classAct="create"
 				label="create" title="kolab_notes.createnote" innerclass="inner" data-fab="true" />
-			<roundcube:button command="print" type="link" data-hidden="small"
-				class="button print disabled" classAct="button print"
+			<roundcube:button command="print" type="link" class="print disabled" classAct="print" data-hidden="small"
 				label="print" title="print" innerClass="inner" />
-			<roundcube:button command="delete" type="link"
-				class="button delete disabled" classAct="button delete"
+			<roundcube:button command="delete" type="link" class="delete disabled" classAct="delete"
 				title="delete" label="delete" innerClass="inner" />
 			<span class="spacer"></span>
-			<roundcube:button command="sendnote" type="link"
-				class="button send disabled" classAct="button send"
+			<roundcube:button command="sendnote" type="link" class="send disabled" classAct="send"
 				label="kolab_notes.send" title="kolab_notes.sendnote" innerClass="inner" />
 			<roundcube:container name="toolbar" id="notestoolbar" />
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="history" type="link"
-					class="button history note-history disabled" classAct="button history note-history"
+					class="history note-history disabled" classAct="history note-history"
 					label="libkolab.objectchangelog" title="libkolab.showhistory" innerClass="inner" />
 			<roundcube:endif />
 		</div>
@@ -80,7 +76,7 @@
 			<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
 			<h3 id="aria-label-messagereferences" class="voice"><roundcube:label name="kolab_notes.arialabelmessagereferences" /></h3>
 			<div id="notereferences" class="notereferences" role="region" aria-labelledby="aria-label-messagereferences">
-				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+				<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist linkslist" />
 			</div>
 			<roundcube:container name="notedetailview" id="notedetailsbox" />
 		</div>
@@ -117,7 +113,7 @@
 
 <div id="notebookactions-menu" class="popupmenu">
 	<h3 id="aria-label-actionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-actionsmenu">
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-actionsmenu">
 		<roundcube:button type="link-menuitem" command="list-create" label="kolab_notes.addnotebook" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="list-edit" label="kolab_notes.editlist" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="kolab_notes.deletelist" class="delete disabled" classAct="delete active" />

iRony-0.4.2.tar.gz/lib/plugins/kolab_sso/README -> iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/README Changed

@@ -2,7 +2,8 @@
 ---------------------------------------
 
 This plugin adds possibility to authenticate users via external authentication
-services. Currently the only supported method of authentication is OpenID Connect.
+services. Currently it supports various authentication methods based on
+OAuth2 and OpenID Connect (and requires JWT token use).
 
 Because Kolab backends do not support token authentication it is required
 to use master user (sasl proxy) authentication where possible and service
@@ -49,7 +50,7 @@
 - supported signature algorithms: HS256, HS385, HS512, RS256, RS384, RS512.
 - supported token endpoint auth methods: client_secret_basic, client_secret_post.
 
-[IMAP] Because Kolab backend do not support token authentication it is required
+[IMAP] Because Kolab backend does not support token authentication it is required
 to use master user (sasl proxy) authentication, i.e. you have to put
 master user credentials in plugin's config.
 
@@ -57,7 +58,7 @@
 you have to specify SMTP connection parameters/user+password.
 
 [LDAP] Global addressbook (read-only) requires LDAP user/password. 'user_specific' option does
-not work as well as proxy authentication.
+not work, neither the proxy authentication.
 
 [Freebusy] Authentication into kolab-freebusy service is not yet implemented. A solution for
 now is to add Roundcube host(s) into trustednetworks.allow option in kolab-freebusy service config.

iRony-0.4.2.tar.gz/lib/plugins/kolab_sso/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/drivers/oauth2.php Added

@@ -0,0 +1,436 @@
+<?php
+
+/**
+ * kolab_sso driver implementing OAuth2 Authorization (RFC6749)
+ * with use of JWT tokens.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2018-2019, 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/>.
+ */
+class kolab_sso_oauth2
+{
+    protected $plugin;
+    protected $id       = 'oauth2';
+    protected $config   = array();
+    protected $params   = array();
+    protected $defaults = array(
+        'scope'          => 'email',
+        'token_type'     => 'access_token',
+        'user_field'     => 'email',
+        'validate_items' => array('aud'),
+    );
+
+
+    /**
+     * Object constructor
+     *
+     * @param rcube_plugin $plugin kolab_sso plugin object
+     * @param array        $config Driver configuration
+     */
+    public function __construct($plugin, $config)
+    {
+        $this->plugin = $plugin;
+        $this->config = $config;
+
+        $this->plugin->require_plugin('libkolab');
+    }
+
+    /**
+     * Authentication request (redirect to SSO service)
+     */
+    public function authorize()
+    {
+        $params = array(
+            'response_type' => 'code',
+            'scope'         => $this->get_param('scope'),
+            'client_id'     => $this->get_param('client_id'),
+            'state'         => $this->plugin->rc->get_request_token(),
+            'redirect_uri'  => $this->redirect_uri(),
+        );
+
+        // Add extra request parameters (don't overwrite params set above)
+        if (!empty($this->config['extra_params'])) {
+            $params = array_merge((array) $this->config['extra_params'], $params);
+        }
+
+        $url = $this->config['auth_uri'] ?: (unslashify($this->config['uri']) . '/authorize');
+        $url .= '?' . http_build_query($params);
+
+        $this->plugin->debug("[{$this->id}][authorize] Redirecting to $url");
+
+        header("Location: $url");
+        die;
+    }
+
+    /**
+     * Authorization response validation
+     */
+    public function response()
+    {
+        $this->plugin->debug("[{$this->id}][authorize] Response: " . $_SERVER['REQUEST_URI']);
+
+        $this->error = $this->error_message(
+            rcube_utils::get_input_value('error', rcube_utils::INPUT_GET),
+            rcube_utils::get_input_value('error_description', rcube_utils::INPUT_GET),
+            rcube_utils::get_input_value('error_uri', rcube_utils::INPUT_GET)
+        );
+
+        if ($this->error) {
+            return;
+        }
+
+        $state = rcube_utils::get_input_value('state', rcube_utils::INPUT_GET);
+        $code  = rcube_utils::get_input_value('code', rcube_utils::INPUT_GET);
+
+        if (!$state) {
+            $this->plugin->debug("[{$this->id}][response] State missing");
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            return;
+        }
+
+        if ($state != $this->plugin->rc->get_request_token()) {
+            $this->plugin->debug("[{$this->id}][response] Invalid response state");
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            return;
+        }
+
+        if (!$code) {
+            $this->plugin->debug("[{$this->id}][response] Code missing");
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            return;
+        }
+
+        return $this->request_token($code);
+    }
+
+    /**
+     * Error message for the response handler
+     */
+    public function response_error()
+    {
+        if ($this->error) {
+            return $this->plugin->rc->gettext('loginfailed') . ' ' . $this->error;
+        }
+    }
+
+    /**
+     * Existing session validation
+     */
+    public function validate_session($session)
+    {
+        $this->plugin->debug("[{$this->id}][validate] Session: " . json_encode($session));
+
+        // Sanity checks
+        if (empty($session) || empty($session['code']) || empty($session['validto']) || empty($session['email'])) {
+            $this->plugin->debug("[{$this->id}][validate] Session invalid");
+            return;
+        }
+
+        // Check expiration time
+        $now     = new DateTime('now', new DateTimezone('UTC'));
+        $validto = new DateTime($session['validto'], new DateTimezone('UTC'));
+
+        // Don't refresh often than TTL/2
+        $validto->sub(new DateInterval(sprintf('PT%dS', $session['ttl']/2)));
+        if ($now < $validto) {
+            $this->plugin->debug("[{$this->id}][validate] Token valid, skipping refresh");
+            return $session;
+        }
+
+        // No refresh_token, not possible to refresh
+        if (empty($session['refresh_token'])) {
+            $this->plugin->debug("[{$this->id}][validate] Session cannot be refreshed");
+            return;
+        }
+
+        // Renew tokens
+        $info = $this->request_token($session['code'], $session['refresh_token']);
+
+        if (!empty($info)) {
+            // Make sure the email didn't change
+            if (!empty($info['email']) && $info['email'] != $session['email']) {
+                $this->plugin->debug("[{$this->id}][validate] Email address change");
+                return;
+            }
+
+            $session = array_merge($session, $info);
+
+            $this->plugin->debug("[{$this->id}][validate] Session valid: " . json_encode($session));
+            return $session;
+        }
+    }
+
+    /**
+     * Authentication Token request (or token refresh)
+     */
+    protected function request_token($code, $refresh_token = null)
+    {
+        $mode   = $refresh_token ? 'token-refresh' : 'token';
+        $url    = $this->config['token_uri'] ?: ($this->config['uri'] . '/token');
+        $params = array(
+            'client_id'     => $this->get_param('client_id'),
+            'client_secret' => $this->get_param('client_secret'),
+            'grant_type'    => $refresh_token ? 'refresh_token' : 'authorization_code',
+        );
+
+        if ($refresh_token) {
+            $params['refresh_token'] = $refresh_token;
+            $params['scope']         = $this->get_param('scope');
+        }
+        else {
+            $params['code']         = $code;
+            $params['redirect_uri'] = $this->redirect_uri();
+        }
+
+        // Add extra request parameters (don't overwrite params set above)
+        if (!empty($this->config['extra_params'])) {
+            $params = array_merge((array) $this->config['extra_params'], $params);
+        }
+
+        $post = http_build_query($params);
+
+        $this->plugin->debug("[{$this->id}][$mode] Requesting POST $url?$post");
+
+        try {
+            // TODO: JWT-based methods of client authentication
+            // https://openid.net/specs/openid-connect-core-1_0.html#rfc.section.9
+
+            $request = $this->get_request($url, 'POST');
+            $request->setAuth($params['client_id'], $params['client_secret']);
+            $request->setBody($post);
+
+            $response = $request->send();
+            $status   = $response->getStatus();
+            $response = $response->getBody();
+
+            $this->plugin->debug("[{$this->id}][$mode] Response: $response");
+
+            $response = @json_decode($response, true);
+
+            if ($status != 200 || !is_array($response) || !empty($response['error'])) {
+                $err = $this->error_text(is_array($response) ? $response['error'] : null);
+                throw new Exception("OpenIDC request failed with error: $err");
+            }
+        }
+        catch (Exception $e) {
+            $this->error = $this->plugin->gettext('errorunknown');
+            rcube::raise_error(array(
+                'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
+                true, false);
+            return;
+        }
+
+        // Example response: {
+        //   "access_token":"ACCESS_TOKEN",
+        //   "token_type":"bearer",
+        //   "expires_in":2592000,
+        //   "refresh_token":"REFRESH_TOKEN",
+        //   "scope":"read",
+        //   "uid":100101,
+        //   "info":{"name":"Mark E. Mark","email":"mark@example.com"}
+        // }
+
+        if (empty($response['access_token']) || empty($response['token_type'])
+            || strtolower($response['token_type']) != 'bearer'
+        ) {
+            $this->error = $this->plugin->gettext('errorinvalidresponse');
+            $this->plugin->debug("[{$this->id}][$mode] Error: Invalid or unsupported response");
+            return;
+        }
+
+        $ttl     = $response['expires_in'] ?: 600;
+        $validto = new DateTime(sprintf('+%d seconds', $ttl), new DateTimezone('UTC'));
+        $token   = $response[$this->get_param('token_type')];
+
+        $result = array(
+            'code'          => $code,
+            'access_token'  => $response['access_token'],
+            // 'token_type'    => $response['token_type'],
+            'validto'       => $validto->format(DateTime::ISO8601),
+            'ttl'           => $ttl,
+        );
+
+        if (!empty($response['refresh_token'])) {
+            $result['refresh_token'] = $response['refresh_token'];
+        }
+
+        if (!empty($token)) {
+            try {
+                $key = $params['client_secret'];
+
+                if (!empty($this->config['pubkey'])) {
+                    $pubkey = trim(preg_replace('/\r?\n[\s\t]+/', "\n", $this->config['pubkey']));
+
+                    if (strpos($pubkey, '-----') !== 0) {
+                        $pubkey = "-----BEGIN PUBLIC KEY-----\n" . trim(chunk_split($pubkey, 64, "\n")) . "\n-----END PUBLIC KEY-----";
+                    }
+
+                    if ($keyid = openssl_pkey_get_public($pubkey)) {
+                        $key = $keyid;
+                    }
+                    else {
+                        throw new Exception("Failed to extract public key. " . openssl_error_string());
+                    }
+                }
+
+                $jwt = new Firebase\JWT\JWT;
+                $jwt::$leeway = 60;
+
+                $payload = $jwt->decode($token, $key, array_keys(Firebase\JWT\JWT::$supported_algs));
+
+                $result['email'] = $this->validate_token_payload($payload);
+            }
+            catch (Exception $e) {
+                $this->error = $this->plugin->gettext('errorinvalidtoken');
+                rcube::raise_error(array(
+                    'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
+                    true, false);
+                return;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validates JWT token payload and returns user/email
+     */
+    protected function validate_token_payload($payload)
+    {
+        $items = $this->get_param('validate_items');
+        $email = $this->config['debug_email'] ?: $payload->{$this->get_param('user_field')};
+
+        if (empty($email)) {
+            throw new Exception("No email address in JWT token");
+        }
+
+        foreach ((array) $items as $item_name) {
+            // More extended token validation
+            // https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
+            switch (strtolower($item_name)) {
+            case 'aud':
+                if (!in_array($this->get_param('client_id'), (array) $payload->aud)) {
+                    throw new Exception("Token audience does not match");
+                }
+                break;
+            }
+        }
+
+        return $email;
+    }
+
+    /**
+     * The URL to use when redirecting the user from SSO back to Roundcube
+     */
+    protected function redirect_uri()
+    {
+        // response_uri is useful when the Provider does not allow
+        // URIs with parameters. In such case set response_uri = '/sso'
+        // and define a redirect in http server, example for Apache:
+        // RewriteRule "^sso" "/roundcubemail/?_task=login&_action=sso" [L,QSA]
+
+        $redirect_params = empty($this->config['response_uri']) ? array('_action' => 'sso') : array();
+
+        $url = $this->plugin->rc->url($redirect_params, false, true);
+
+        if (!empty($this->config['response_uri'])) {
+            $url = unslashify(preg_replace('/\?.*$/', '', $url)) . '/' . ltrim($this->config['response_uri'], '/');
+        }
+
+        return $url;
+    }
+
+    /**
+     * Get HTTP/Request2 object
+     */
+    protected function get_request($url, $type)
+    {
+        $config = array_intersect_key($this->config, array_flip(array(
+                'ssl_verify_peer',
+                'ssl_verify_host',
+                'ssl_cafile',
+                'ssl_capath',
+                'ssl_local_cert',
+                'ssl_passphrase',
+                'follow_redirects',
+        )));
+
+        return libkolab::http_request($url, $type, $config);
+    }
+
+    /**
+     * Returns (localized) user-friendly error message
+     */
+    protected function error_message($error, $description, $uri)
+    {
+        if (empty($error)) {
+            return;
+        }
+
+        $msg = $this->error_text($error);
+
+        rcube::raise_error(array(
+            'message' => "[SSO] $msg." . ($description ? " $description" : '') . ($uri ? " ($uri)" : '')
+            ), true, false);
+
+        $label = 'error' . str_replace('_', '', $error);
+        if (!$this->plugin->rc->text_exists($label, 'kolab_sso')) {
+            $label = 'errorunknown';
+        }
+
+        return $this->plugin->gettext($label);
+    }
+
+    /**
+     * Returns error text for specified OpenIDC error code
+     */
+    protected function error_text($error)
+    {
+        switch ($error) {
+        case 'invalid_request':
+            return "Request malformed";
+        case 'unauthorized_client':
+            return "The client is not authorized";
+        case 'invalid_client':
+            return "Client authentication failed";
+        case 'access_denied':
+            return "Request denied";
+        case 'unsupported_response_type':
+            return "Unsupported response type";
+        case 'invalid_grant':
+            return "Invalid authorization grant";
+        case 'unsupported_grant_type':
+            return "Unsupported authorization grant";
+        case 'invalid_scope':
+            return "Invalid scope";
+        case 'server_error':
+            return "Server error";
+        case 'temporarily_unavailable':
+            return "Service temporarily unavailable";
+        }
+
+        return "Unknown error";
+    }
+
+    /**
+     * Returns (hardcoded/configured/default) value of a configuration param
+     */
+    protected function get_param($name)
+    {
+        return $this->params[$name] ?: ($this->config[$name] ?: $this->defaults[$name]);
+    }
+}

iRony-0.4.2.tar.gz/lib/plugins/kolab_sso/drivers/openidc.php -> iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/drivers/openidc.php Changed

@@ -23,371 +23,24 @@
  * 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/>.
  */
-class kolab_sso_openidc
-{
-    protected $id     = 'openidc';
-    protected $config = array();
-    protected $plugin;
-
-
-    public function __construct($plugin, $config)
-    {
-        $this->plugin = $plugin;
-        $this->config = $config;
-
-        $this->plugin->require_plugin('libkolab');
-    }
-
-    /**
-     * Authentication request (redirect to SSO service)
-     */
-    public function authorize()
-    {
-        $params = array(
-            'response_type' => 'code',
-            'scope'         => 'openid email offline_access',
-            'client_id'     => $this->config['client_id'],
-            'state'         => $this->plugin->rc->get_request_token(),
-            'redirect_uri'  => $this->redirect_uri(),
-        );
-
-        // TODO: Other params by config: display, prompt, max_age,
-
-        $url = $this->config['auth_uri'] ?: (unslashify($this->config['uri']) . '/authorize');
-        $url .= '?' . http_build_query($params);
-
-        $this->plugin->debug("[{$this->id}][authorize] Redirecting to $url");
-
-        header("Location: $url");
-        die;
-    }
-
-    /**
-     * Authorization response validation
-     */
-    public function response()
-    {
-        $this->plugin->debug("[{$this->id}][authorize] Response: " . $_SERVER['REQUEST_URI']);
-
-        $this->error = $this->error_message(
-            rcube_utils::get_input_value('error', rcube_utils::INPUT_GET),
-            rcube_utils::get_input_value('error_description', rcube_utils::INPUT_GET),
-            rcube_utils::get_input_value('error_uri', rcube_utils::INPUT_GET)
-        );
-
-        if ($this->error) {
-            return;
-        }
-
-        $state = rcube_utils::get_input_value('state', rcube_utils::INPUT_GET);
-        $code  = rcube_utils::get_input_value('code', rcube_utils::INPUT_GET);
-
-        if (!$state) {
-            $this->plugin->debug("[{$this->id}][response] State missing");
-            $this->error = $this->plugin->gettext('errorinvalidresponse');
-            return;
-        }
-
-        if ($state != $this->plugin->rc->get_request_token()) {
-            $this->plugin->debug("[{$this->id}][response] Invalid response state");
-            $this->error = $this->plugin->gettext('errorinvalidresponse');
-            return;
-        }
-
-        if (!$code) {
-            $this->plugin->debug("[{$this->id}][response] Code missing");
-            $this->error = $this->plugin->gettext('errorinvalidresponse');
-            return;
-        }
 
-        return $this->request_token($code);
-    }
-
-    /**
-     * Error message for the response handler
-     */
-    public function response_error()
-    {
-        if ($this->error) {
-            return $this->plugin->rc->gettext('loginfailed') . ' ' . $this->error;
-        }
-    }
-
-    /**
-     * Existing session validation
-     */
-    public function validate_session($session)
-    {
-        $this->plugin->debug("[{$this->id}][validate] Session: " . json_encode($session));
-
-        // Sanity checks
-        if (empty($session) || empty($session['code']) || empty($session['validto']) || empty($session['email'])) {
-            $this->plugin->debug("[{$this->id}][validate] Session invalid");
-            return;
-        }
-
-        // Check expiration time
-        $now     = new DateTime('now', new DateTimezone('UTC'));
-        $validto = new DateTime($session['validto'], new DateTimezone('UTC'));
-
-        // Don't refresh often than TTL/2
-        $validto->sub(new DateInterval(sprintf('PT%dS', $session['ttl']/2)));
-        if ($now < $validto) {
-            $this->plugin->debug("[{$this->id}][validate] Token valid, skipping refresh");
-            return $session;
-        }
-
-        // No refresh_token, not possible to refresh
-        if (empty($session['refresh_token'])) {
-            $this->plugin->debug("[{$this->id}][validate] Session cannot be refreshed");
-            return;
-        }
-
-        // Renew tokens
-        $info = $this->request_token($session['code'], $session['refresh_token']);
+require_once __DIR__ . '/oauth2.php';
 
-        if (!empty($info)) {
-            // Make sure the email didn't change
-            if (!empty($info['email']) && $info['email'] != $session['email']) {
-                $this->plugin->debug("[{$this->id}][validate] Email address change");
-                return;
-            }
-
-            $session = array_merge($session, $info);
-
-            $this->plugin->debug("[{$this->id}][validate] Session valid: " . json_encode($session));
-            return $session;
-        }
-    }
-
-    /**
-     * Authentication Token request (or token refresh)
-     */
-    protected function request_token($code, $refresh_token = null)
-    {
-        $mode   = $refresh_token ? 'token-refresh' : 'token';
-        $url    = $this->config['token_uri'] ?: ($this->config['uri'] . '/token');
-        $params = array(
-            'client_id'     => $this->config['client_id'],
-            'client_secret' => $this->config['client_secret'],
-            'grant_type'    => $refresh_token ? 'refresh_token' : 'authorization_code',
-        );
-
-        if ($refresh_token) {
-            $params['refresh_token'] = $refresh_token;
-            $params['scope']         = 'openid email offline_access';
-        }
-        else {
-            $params['code']         = $code;
-            $params['redirect_uri'] = $this->redirect_uri();
-        }
-
-        $post = http_build_query($params);
-
-        $this->plugin->debug("[{$this->id}][$mode] Requesting POST $url?$post");
-
-        try {
-            // TODO: JWT-based methods of client authentication
-            // https://openid.net/specs/openid-connect-core-1_0.html#rfc.section.9
-
-            $request = $this->get_request($url, 'POST');
-            $request->setAuth($this->config['client_id'], $this->config['client_secret']);
-            $request->setBody($post);
-
-            $response = $request->send();
-            $status   = $response->getStatus();
-            $response = $response->getBody();
-
-            $this->plugin->debug("[{$this->id}][$mode] Response: $response");
-
-            $response = @json_decode($response, true);
-
-            if ($status != 200 || !is_array($response) || !empty($response['error'])) {
-                $err = $this->error_text(is_array($response) ? $response['error'] : null);
-                throw new Exception("OpenIDC request failed with error: $err");
-            }
-        }
-        catch (Exception $e) {
-            $this->error = $this->plugin->gettext('errorunknown');
-            rcube::raise_error(array(
-                'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
-                true, false);
-            return;
-        }
-
-        // Example response: {
-        //   "access_token":"ACCESS_TOKEN",
-        //   "token_type":"bearer",
-        //   "expires_in":2592000,
-        //   "refresh_token":"REFRESH_TOKEN",
-        //   "scope":"read",
-        //   "uid":100101,
-        //   "info":{"name":"Mark E. Mark","email":"mark@example.com"}
-        // }
-
-        if (empty($response['access_token']) || empty($response['token_type'])
-            || strtolower($response['token_type']) != 'bearer'
-        ) {
-            $this->error = $this->plugin->gettext('errorinvalidresponse');
-            $this->plugin->debug("[{$this->id}][$mode] Error: Invalid or unsupported response");
-            return;
-        }
-
-        $ttl     = $response['expires_in'] ?: 600;
-        $validto = new DateTime(sprintf('+%d seconds', $ttl), new DateTimezone('UTC'));
-
-        $result = array(
-            'code'          => $code,
-            'access_token'  => $response['access_token'],
-            // 'token_type'    => $response['token_type'],
-            'validto'       => $validto->format(DateTime::ISO8601),
-            'ttl'           => $ttl,
-        );
-
-        if (!empty($response['refresh_token'])) {
-            $result['refresh_token'] = $response['refresh_token'];
-        }
-
-        if (!empty($response['id_token'])) {
-            try {
-                $key = $this->config['client_secret'];
-
-                if (!empty($this->config['pubkey'])) {
-                    $pubkey = trim(preg_replace('/\r?\n[\s\t]+/', "\n", $this->config['pubkey']));
-
-                    if (strpos($pubkey, '-----') !== 0) {
-                        $pubkey = "-----BEGIN PUBLIC KEY-----\n" . trim(chunk_split($pubkey, 64, "\n")) . "\n-----END PUBLIC KEY-----";
-                    }
-
-                    if ($keyid = openssl_pkey_get_public($pubkey)) {
-                        $key = $keyid;
-                    }
-                    else {
-                        throw new Exception("Failed to extract public key");
-                    }
-                }
-
-                $jwt = new Firebase\JWT\JWT;
-                $jwt::$leeway = 60;
-
-                $payload = $jwt->decode($response['id_token'], $key, array_keys(Firebase\JWT\JWT::$supported_algs));
-                $email   = $this->config['debug_email'] ?: $payload->email;
-
-                if (empty($email)) {
-                    throw new Exception("No email address in JWT token");
-                }
-
-                if (!in_array($this->config['client_id'], (array) $payload->aud)) {
-                    throw new Exception("Token audience does not match");
-                }
-
-                // More extended token validation
-                // https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
-
-                $result['email'] = $email;
-            }
-            catch (Exception $e) {
-                $this->error = $this->plugin->gettext('errorinvalidtoken');
-                rcube::raise_error(array(
-                    'line' => __LINE__, 'file' => __FILE__, 'message' => $e->getMessage()),
-                    true, false);
-                return;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * The URL to use when redirecting the user from SSO back to Roundcube
-     */
-    protected function redirect_uri()
-    {
-        // response_uri is useful when the Provider does not allow
-        // URIs with parameters. In such case set response_uri = '/sso'
-        // and define a redirect in http server, example for Apache:
-        // RewriteRule "^sso" "/roundcubemail/?_task=login&_action=sso" [L,QSA]
-
-        $redirect_params = empty($this->config['response_uri']) ? array('_action' => 'sso') : array();
-
-        $url = $this->plugin->rc->url($redirect_params, false, true);
-
-        if (!empty($this->config['response_uri'])) {
-            $url = unslashify(preg_replace('/\?.*$/', '', $url)) . '/' . ltrim($this->config['response_uri'], '/');
-        }
-
-        return $url;
-    }
-
-    /**
-     * Get HTTP/Request2 object
-     */
-    protected function get_request($url, $type)
-    {
-        $config = array_intersect_key($this->config, array_flip(array(
-                'ssl_verify_peer',
-                'ssl_verify_host',
-                'ssl_cafile',
-                'ssl_capath',
-                'ssl_local_cert',
-                'ssl_passphrase',
-                'follow_redirects',
-        )));
-
-        return libkolab::http_request($url, $type, $config);
-    }
-
-    /**
-     * Returns (localized) user-friendly error message
-     */
-    protected function error_message($error, $description, $uri)
-    {
-        if (empty($error)) {
-            return;
-        }
-
-        $msg = $this->error_text($error);
-
-        rcube::raise_error(array(
-            'message' => "[SSO] $msg." . ($description ? " $description" : '') . ($uri ? " ($uri)" : '')
-            ), true, false);
-
-        $label = 'error' . str_replace('_', '', $error);
-        if (!$this->plugin->rc->text_exists($label, 'kolab_sso')) {
-            $label = 'errorunknown';
-        }
-
-        return $this->plugin->gettext($label);
-    }
+class kolab_sso_openidc extends kolab_sso_oauth2
+{
+    protected $id     = 'openidc';
+    protected $params = array(
+        'scope'      => 'openid email offline_access',
+        'token_type' => 'id_token',
+    );
 
     /**
      * Returns error text for specified OpenIDC error code
      */
     protected function error_text($error)
     {
+        // OpenIDC-specific codes
         switch ($error) {
-        // OAuth2 codes
-        case 'invalid_request':
-            return "Request malformed";
-        case 'unauthorized_client':
-            return "The client is not authorized";
-        case 'invalid_client':
-            return "Client authentication failed";
-        case 'access_denied':
-            return "Request denied";
-        case 'unsupported_response_type':
-            return "Unsupported response type";
-        case 'invalid_grant':
-            return "Invalid authorization grant";
-        case 'unsupported_grant_type':
-            return "Unsupported authorization grant";
-        case 'invalid_scope':
-            return "Invalid scope";
-        case 'server_error':
-            return "Server error";
-        case 'temporarily_unavailable':
-            return "Service temporarily unavailable";
-        // OpenIDC codes
         case 'interaction_required':
             return "End-User interaction required";
         case 'login_required':
@@ -408,6 +61,7 @@
             return "Registration not supported";
         }
 
-        return "Unknown error";
+        // Fallback to OAuth2-specific codes
+        return parent::error_text($error);
     }
 }

iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/drivers/seas.php Added

@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * kolab_sso driver implementing Abraxas SEAS Portal OAuth2/JWT flow
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *         Beat Rubischon <beat.rubischon@adfinis-sygroup.ch>
+ *
+ * Copyright (C) 2018, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2019, Adfinis SyGroup AG
+ *
+ * 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/>.
+ */
+
+require_once __DIR__ . '/oauth2.php';
+
+
+class kolab_sso_seas extends kolab_sso_oauth2
+{
+    protected $id       = 'seas';
+    protected $defaults = array(
+        'scope'          => 'USER',
+        'token_type'     => 'access_token',
+        'user_field'     => 'user_name',
+        'validate_items' => array(),
+    );
+}

iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/localization/fi_FI.inc Added

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Localizations for the Kolab SSO plugin
+ *
+ * Copyright (C) 2018, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_sso/
+ */
+$labels['loginby'] = 'Kirjautumisen mahdollistaa $provider';
+$labels['sso'] = 'Kertakirjautuminen';
+$labels['errorunknown'] = 'Tuntematon kertakirjautumisvirhe.';
+$labels['errorinvalidresponse'] = 'Virheellinen kertakirjautumisen vastaus.';
+$labels['errorinvalidrequest'] = 'Väärinmuodostettu kertakirjautumispyyntö.';
+$labels['erroraccessdienied'] = 'Kertakirjautumispyyntö kiellettiin.';
+$labels['errorservererror'] = 'Kertakirjautumispalvelimen virhe.';
+$labels['errortemporarilyunavailable'] = 'Kertakirjautumispalvelu ei ole juuri nyt käytettävissä.';
+$labels['errorinteractionrequired'] = 'Käyttäjän vuorovaikutusta vaaditaan.';
+$labels['errorloginrequired'] = 'Käyttäjätunnistautuminen vaaditaan.';
+$labels['erroraccountselectionrequired'] = 'Käyttäjätilin valinta vaaditaan.';
+$labels['errorconsentrequired'] = 'Käyttäjän hyväksyntä vaaditaan.';
+$labels['errorrequestnotsupported'] = 'Pyyntö ei tuettu.';
+$labels['errorrequesturinotsupported'] = 'Request_uri-parametri ei tuettu.';
+$labels['errorregistrationnotsupported'] = 'Rekisteröinti ei tuettu';

iRony-0.4.2.tar.gz/lib/plugins/kolab_sso/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/localization/pl_PL.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_sso/localization/ru_RU.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_tags/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_tags/kolab_tags.js -> iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/kolab_tags.js Changed

@@ -434,7 +434,7 @@
 // ajax response handler
 function update_tags(response)
 {
-    var list = rcmail.message_list;
+    var list = main_list_widget();
 
     // reset tag selector popup
     tag_selector_reset();
@@ -513,14 +513,14 @@
     rcmail.enable_command('reset-tags', tagsfilter.length && list);
 
     // update Mark menu in case some messages are already selected
-    if (list && list.selection.length) {
+    if (list && list.selection && list.selection.length) {
         message_list_select(list);
     }
 
     // @TODO: sort tags by name/prio
 }
 
-// internal method to remove tags from messages and optionally tags cloud
+// internal method to remove tags from messages and tags cloud
 function remove_tags(tags, selection)
 {
     if (!tags || !tags.length) {
@@ -537,13 +537,14 @@
     // remove deleted tags
     $.each(tags, function() {
         var i, id = this,
-            filter = function() { return $(this).data('tag') == id; },
-            elements = tagboxes.filter(filter);
-
-        // ... from the messages list (or message page)
-        elements.remove();
+            filter = function() { return $(this).data('tag') == id; };
 
+        // When removing tags from selected messages only, we're using
+        // tag_remove_callback(), so here we can ignore that part
         if (!selection) {
+            // ... from the messages list (or message page)
+            tagboxes.filter(filter).remove();
+
             // ...from the tag cloud
             taglist.filter(filter).remove();
 
@@ -554,11 +555,11 @@
                     break;
                 }
             }
-        }
 
-        // ... from the message frame
-        if (frame_tagboxes.length) {
-            frame_tagboxes.filter(function() { return win.jQuery(this).data('tag') == id; }).remove();
+            // ... from the message frame
+            if (frame_tagboxes.length) {
+                frame_tagboxes.filter(function() { return win.jQuery(this).data('tag') == id; }).remove();
+            }
         }
 
         // if tagged messages found and tag was selected - refresh the list
@@ -692,7 +693,7 @@
 
     // remove tags from message(s) without waiting to a response
     // in case of an error the list will be refreshed
-    tag_remove_callback(this.tag_find(props));
+    $.each(tags, function() { tag_remove_callback(this); });
 }
 
 // update messages list and message frame after removing tag assignments
@@ -701,16 +702,19 @@
     if (!tag)
         return;
 
-    var frame_window = rcmail.get_frame_window(rcmail.env.contentframe),
-        list = rcmail.message_list;
+    var uids = [],
+        win = rcmail.get_frame_window(rcmail.env.contentframe),
+        frame_tagboxes = win && win.jQuery ? win.jQuery('span.tagbox') : [],
+        list = main_list_widget();
 
     if (list) {
         $.each(list.get_selection(), function (i, uid) {
             var row = list.rows[uid];
             if (row) {
                 $('span.tagbox', row.obj).each(function() {
-                    if (!tag || $(this).data('tag') == tag.uid) {
+                    if ($(this).data('tag') == tag) {
                         $(this).remove();
+                        uids.push(String(uid));
                     }
                 });
             }
@@ -718,11 +722,17 @@
 
         message_list_select(list);
     }
+    else {
+        $('span.tagbox').filter(function() { return $(this).data('tag') == tag; }).remove();
+    }
 
-    // TODO: remove tag(s) from the preview frame
+    // ... from the message frame (make sure it the selected message frame,
+    // i.e. when using contextmenu it might be not the selected one)
+    if (frame_tagboxes.length && $.inArray(String(win.rcmail.env.uid), uids) >= 0) {
+        frame_tagboxes.filter(function() { return win.jQuery(this).data('tag') == tag; }).remove();
+    }
 }
 
-
 // executes messages search according to selected messages
 function apply_tags_filter()
 {
@@ -899,7 +909,7 @@
 
     if (!container) {
         var rows = [],
-            ul = $('<ul class="toolbarmenu">'),
+            ul = $('<ul class="toolbarmenu menu">'),
             li = document.createElement('li'),
             link = document.createElement('a'),
             span = document.createElement('span');

iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/localization/de.inc Added

@@ -0,0 +1,34 @@
+<?php
+/**
+ * Localizations for the Kolab Tags plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
+ */
+$labels['tags'] = 'Schlagworte';
+$labels['unset'] = 'Alle abwählen';
+$labels['manage'] = 'Schlagworte verwalten...';
+$labels['tagactions'] = 'Schlagwort Aktion...';
+$labels['tagadd'] = 'Vergebe Schlagwort...';
+$labels['tagremove'] = 'Entferne Schlagwort..';
+$labels['untag'] = 'Entferne Schlagwort';
+$labels['notags'] = 'Keine Schlagworte';
+$labels['tagremoveall'] = 'Entferne alle Schlagworte';
+$labels['add'] = 'Hinzufügen';
+$labels['edit'] = 'Bearbeiten';
+$labels['delete'] = 'Löschen';
+$labels['tagname'] = 'Name';
+$labels['tagcolor'] = 'Farbe';
+$labels['nameempty'] = 'Schlagwort kann nicht leer sein!';
+$labels['nameexists'] = 'Das Schlagwort existiert bereits';
+$labels['colorinvalid'] = 'Ungültige Farbangabe';
+$labels['saving'] = 'Speichere...';
+$labels['updatesuccess'] = 'Schlagworte wurden erfolgreich aktualisiert.';
+$labels['updateerror'] = 'Schlagworte konnten nicht aktualisiert werden.';
+$labels['taggingsuccess'] = 'Schlagwort wurde erfolgreich zugewiesen.';
+$labels['taggingerror'] = 'Konnte Schlagwort nicht zuweisen.';
+$labels['untaggingsuccess'] = 'Schlagwort(e) wurden erfolgreich entfernt.';
+$labels['untaggingerror'] = 'Schlagwort konnte nicht entfernt werden.';
+$labels['newtag'] = 'Neues Schlagwort';
+$labels['tagsearchnew'] = 'Text eingeben zur Suche oder für die Anlage eines neuen Schlagworts';

iRony-0.4.2.tar.gz/lib/plugins/kolab_tags/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/localization/de_DE.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_tags/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/localization/pl_PL.inc Changed

@@ -7,8 +7,28 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Tagi';
+$labels['unset'] = 'Odznacz wszystkie';
+$labels['manage'] = 'Zarządzaj tagami...';
+$labels['tagactions'] = 'Akcje tagów...';
+$labels['tagadd'] = 'Otaguj jako...';
+$labels['tagremove'] = 'Usuń tag...';
+$labels['untag'] = 'Usuń tag';
+$labels['notags'] = 'Brak tagów';
+$labels['tagremoveall'] = 'Usuń wszystkie tagi';
+$labels['add'] = 'Dodaj';
 $labels['edit'] = 'Edytuj';
 $labels['delete'] = 'Usuń';
 $labels['tagname'] = 'Nazwa';
 $labels['tagcolor'] = 'Kolor';
+$labels['nameempty'] = 'Nazwa tagu jest wymagana!';
+$labels['nameexists'] = 'Tag o podanej nazwie już istnieje!';
+$labels['colorinvalid'] = 'Błędny format koloru!';
 $labels['saving'] = 'Zapisuję dane...';
+$labels['updatesuccess'] = 'Tagi zostały zaktualizowane pomyślnie.';
+$labels['updateerror'] = 'Błąd podczas zapisu danych tagów.';
+$labels['taggingsuccess'] = 'Tagi zostały przypisane pomyślnie.';
+$labels['taggingerror'] = 'Błąd podczas przypisywania tagów.';
+$labels['untaggingsuccess'] = 'Tagi zostały usunięte pomyślnie.';
+$labels['untaggingerror'] = 'Błąd podczas usuwania powiązań z tagami.';
+$labels['newtag'] = 'Nowa etykieta';
+$labels['tagsearchnew'] = 'Wprowadź tekst aby wyszukać lub utworzyć nową etykietę';

iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/kolab_tags/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/localization/sv_SE.inc Changed

@@ -6,10 +6,29 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
-$labels['tags'] = 'Taggar';
-$labels['untag'] = 'Ta bort tagg';
-$labels['notags'] = 'Inga taggar';
+$labels['tags'] = 'Etiketter';
+$labels['unset'] = 'Avmarkera alla';
+$labels['manage'] = 'Hantera etiketter ...';
+$labels['tagactions'] = 'Åtgärder för etiketter ...';
+$labels['tagadd'] = 'Etikettera som ...';
+$labels['tagremove'] = 'Ta bort etikett ...';
+$labels['untag'] = 'Ta bort etikett';
+$labels['notags'] = 'Inga etiketter';
+$labels['tagremoveall'] = 'Ta bort alla etiketter';
+$labels['add'] = 'Lägg till';
 $labels['edit'] = 'Redigera';
+$labels['delete'] = 'Ta bort';
 $labels['tagname'] = 'Namn';
 $labels['tagcolor'] = 'Färg';
+$labels['nameempty'] = 'Etikettens namn kan inte vara tomt!';
+$labels['nameexists'] = 'Etikett med angivet namn finns redan!';
+$labels['colorinvalid'] = 'Ogiltig färgspecifikation!';
 $labels['saving'] = 'Sparar data ...';
+$labels['updatesuccess'] = 'Etiketter har uppdaterats.';
+$labels['updateerror'] = 'Misslyckades att uppdatera etikettinformation.';
+$labels['taggingsuccess'] = 'Etiketter har blivit tilldelade.';
+$labels['taggingerror'] = 'Misslyckades att tilldela etiketter.';
+$labels['untaggingsuccess'] = 'Etikett(er) har tagits bort.';
+$labels['untaggingerror'] = 'Misslyckades att ta bort etikettilldelningar.';
+$labels['newtag'] = 'Ny etikett';
+$labels['tagsearchnew'] = 'Ange söktext eller skapa en ny etikett';

iRony-0.4.2.tar.gz/lib/plugins/kolab_tags/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/kolab_tags/skins/elastic/templates/ui.html -> iRony-0.4.3.tar.gz/lib/plugins/kolab_tags/skins/elastic/templates/ui.html Changed

@@ -6,7 +6,7 @@
 </div>
 
 <div id="tagsmenu" class="popupmenu" aria-hidden="true">
-	<ul class="toolbarmenu iconized">
+	<ul class="menu iconized">
 		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
 		<roundcube:button type="link-menuitem" command="reset-tags" label="kolab_tags.unset" class="tags reset disabled" classAct="tags reset active" />
 		<roundcube:button type="link-menuitem" command="manage-tags" label="kolab_tags.manage" class="tags disabled" classAct="tags active" />
@@ -15,7 +15,7 @@
 </div>
 
 <div id="tagmessagemenu" class="popupmenu" aria-hidden="true">
-	<ul class="toolbarmenu iconized">
+	<ul class="menu iconized">
 		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
 		<roundcube:button type="link-menuitem" command="tag-add" label="kolab_tags.tagadd" classAct="tag add active" class="tag add disabled" />
 		<roundcube:button type="link-menuitem" command="tag-remove" label="kolab_tags.tagremove" classAct="tag remove active" class="tag remove disabled" />

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_itip.php -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -707,14 +707,14 @@
 
             // add button to open calendar/preview
             if (!empty($preview_url)) {
-              $msgref = $this->lib->ical_message->folder . '/' . $this->lib->ical_message->uid . '#' . $mime_id;
-              $rsvp_buttons .= html::tag('input', array(
-                  'type'    => 'button',
-                  // TODO: Temp. disable this button on small screen in Elastic (Bifrost#T105747)
-                  'class'   => "button preview hidden-phone hidden-small",
-                  'onclick' => "rcube_libcalendaring.open_itip_preview('" . rcube::JQ($preview_url) . "', '" . rcube::JQ($msgref) . "')",
-                  'value'   => $this->gettext('openpreview'),
-              ));
+                $msgref = $this->lib->ical_message->folder . '/' . $this->lib->ical_message->uid . '#' . $mime_id;
+                $rsvp_buttons .= html::tag('input', array(
+                    'type'    => 'button',
+                    // TODO: Temp. disable this button on small screen in Elastic (Bifrost#T105747)
+                    'class'   => "button preview hidden-phone hidden-small",
+                    'onclick' => "rcube_libcalendaring.open_itip_preview('" . rcube::JQ($preview_url) . "', '" . rcube::JQ($msgref) . "')",
+                    'value'   => $this->gettext('openpreview'),
+                ));
             }
 
             // 2. update the local copy with minor changes
@@ -733,9 +733,9 @@
                 'value'   => $this->gettext('importtocalendar'),
             ));
 
-            // check my status
+            // check my status as an attendee
             foreach ($event['attendees'] as $attendee) {
-                if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+                if ($attendee['email'] && $attendee['role'] != 'ORGANIZER' && in_array(strtolower($attendee['email']), $emails)) {
                     $metadata['attendee'] = $attendee['email'];
                     $metadata['rsvp']     = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
                     $rsvp_status = !empty($attendee['status']) ? strtoupper($attendee['status']) : 'NEEDS-ACTION';
@@ -870,6 +870,7 @@
                 'value'    => 1,
                 'disabled' => $disable,
                 'checked'  => ($itip_sending & 1) == 0,
+                'class'    => 'pretty-checkbox',
             );
             $rsvp_additions = html::label(array('class' => 'noreply-toggle'),
                 html::tag('input', $toggle_attrib) . ' ' . $this->gettext('itipsuppressreply')
@@ -905,7 +906,7 @@
     {
         $table = new html_table(array('cols' => 2, 'border' => 0, 'class' => 'calendar-eventdetails'));
         $table->add('ititle', $title);
-        $table->add('title', rcube::Q($event['title']));
+        $table->add('title', rcube::Q(trim($event['title'])));
         if ($event['start'] && $event['end']) {
             $table->add('label', $this->gettext('date'));
             $table->add('date', rcube::Q($this->lib->event_date_text($event)));
@@ -922,21 +923,21 @@
             $table->add('label', $this->gettext('recurring'));
             $table->add('recurrence', $this->lib->recurrence_text($event['recurrence']));
         }
-        if ($event['location'] && trim($event['location'])) {
+        if ($location = trim($event['location'])) {
             $table->add('label', $this->gettext('location'));
-            $table->add('location', rcube::Q($event['location']));
+            $table->add('location', rcube::Q($location));
         }
-        if ($event['sensitivity'] && !preg_match('/^(x-|public$)/i', $event['sensitivity'])) {
+        if (($sensitivity = trim($event['sensitivity'])) && !preg_match('/^(x-|public$)/i', $sensitivity)) {
             $table->add('label', $this->gettext('sensitivity'));
-            $table->add('sensitivity', ucfirst($this->gettext($event['sensitivity'])) . '!');
+            $table->add('sensitivity', ucfirst($this->gettext($sensitivity)) . '!');
         }
         if ($event['status'] == 'COMPLETED' || $event['status'] == 'CANCELLED') {
             $table->add('label', $this->gettext('status'));
             $table->add('status', $this->gettext('status-' . strtolower($event['status'])));
         }
-        if ($event['comment'] && trim($event['comment'])) {
+        if ($comment = trim($event['comment'])) {
             $table->add('label', $this->gettext('comment'));
-            $table->add('location', rcube::Q($event['comment']));
+            $table->add('location', rcube::Q($comment));
         }
 
         return $table->show();

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/libcalendaring.js -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/libcalendaring.js Changed

@@ -49,7 +49,7 @@
     this.datepicker_settings = {
         // translate from fullcalendar (MomentJS) format to datepicker format
         dateFormat: settings.date_format.replace(/M/g, 'm').replace(/mmmm/, 'MM').replace(/mmm/, 'M')
-            .replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/DD/, 'dd')
+            .replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/DD/, 'dd').replace(/D/, 'd')
             .replace(/Y/g, 'y').replace(/yyyy/, 'yy'),
         firstDay : settings.first_day,
         dayNamesMin: settings.days_short,
@@ -348,6 +348,11 @@
         if (!color_map[color]) {
             color_map[color] = '#fff';
 
+            // Convert 3-char to 6-char
+            if (/^#?([a-f0-9]{1})([a-f0-9]{1})([a-f0-9]{1})$/i.test(color)) {
+                color = '#' + RegExp.$1 + RegExp.$1 + RegExp.$2 + RegExp.$2 + RegExp.$3 + RegExp.$3;
+            }
+
             if (/^#?([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})$/i.test(color)) {
                 // use information about brightness calculation found at
                 // http://javascriptrules.com/2009/08/05/css-color-brightness-contrast-using-javascript/
@@ -435,10 +440,15 @@
             $(this).parent().find('span.edit-alarm-values')[(this.selectedIndex>0?'show':'hide')]();
         });
         $(prefix+' select.edit-alarm-offset').change(function(){
-            var val = $(this).val(), parent = $(this).parent();
+            var val = $(this).val(),
+                parent = $(this).parent(),
+                class_map = {'0': 'ontime', '@': 'ondate'};
+
             parent.find('.edit-alarm-date, .edit-alarm-time')[val === '@' ? 'show' : 'hide']();
-            parent.find('.edit-alarm-value').prop('disabled', val === '@' || val === '0');
+            parent.find('.edit-alarm-value')[val === '@' || val === '0' ? 'hide' : 'show']();
             parent.find('.edit-alarm-related')[val === '@' ? 'hide' : 'show']();
+            parent.removeClass('offset-ontime offset-ondate offset-default')
+                .addClass('offset-' + (class_map[val] || 'default'));
         });
 
         $(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(this.datepicker_settings);
@@ -455,7 +465,7 @@
 
         // Elastic
         if (window.UI && UI.pretty_select) {
-          $(prefix + ' select').each(function() { UI.pretty_select(this); });
+            $(prefix + ' select').each(function() { UI.pretty_select(this); });
         }
 
         if (index)
@@ -754,7 +764,7 @@
             buttons: buttons,
             open: function() {
               setTimeout(function() {
-                me.alarm_dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+                me.alarm_dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
               }, 5);
             },
             close: function() {
@@ -1096,7 +1106,7 @@
     // Render message reference links to the given container
     this.render_message_links = function(links, container, edit, plugin)
     {
-        var ul = $('<ul>').addClass('attachmentslist');
+        var ul = $('<ul>').addClass('attachmentslist linkslist');
 
         $.each(links, function(i, link) {
             if (!link.mailurl)
@@ -1105,7 +1115,7 @@
             var li = $('<li>').addClass('link')
                 .addClass('message eml')
                 .append($('<a>')
-                    .attr({href: link.mailurl, 'class': 'messagelink'})
+                    .attr({href: link.mailurl, 'class': 'messagelink filename'})
                     .text(link.subject || link.uri)
                 )
                 .appendTo(ul);
@@ -1232,8 +1242,7 @@
             '<input type="text" id="itip-delegate-to" class="text" size="40" value="" />' +
         '</div>' +
         '<div class="form-section form-group form-check">' +
-            '<label for="itip-delegate-rsvp">' + rcmail.gettext('itip.delegatersvpme') + '</label>' +
-            '<input type="checkbox" id="itip-delegate-rsvp" value="1" />' +
+            '<label><input type="checkbox" id="itip-delegate-rsvp" value="1" />' + rcmail.gettext('itip.delegatersvpme') + '</label>' +
         '</div>' +
         '<div class="form-section form-group">' +
             '<textarea id="itip-delegate-comment" class="itip-comment" cols="40" rows="8" placeholder="' +
@@ -1284,7 +1293,7 @@
     dialog = rcmail.show_popup_dialog(form, rcmail.gettext('delegateinvitation', 'itip'), buttons, {
         width: 460,
         open: function(event, ui) {
-            $(this).parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
+            $(this).parent().find('button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
             $(this).find('#itip-saveto').val('');
 
             // initialize autocompletion
@@ -1313,12 +1322,11 @@
  */
 rcube_libcalendaring.itip_rsvp_recurring = function(btn, callback, event)
 {
-    var list, lc, menu = $('#itip-rsvp-menu'), action = btn.attr('rel');
+    var list, menu = $('#itip-rsvp-menu'), action = btn.attr('rel');
 
     if (!menu.length) {
-        lc = $('body > #layout').length === 1 ? 'toolbarmenu listing' : 'toolbarmenu';
         menu = $('<div>').attr({'class': 'popupmenu', id: 'itip-rsvp-menu', 'aria-hidden': 'true'}).appendTo(document.body);
-        list = $('<ul>').attr({'class': lc, role: 'menu'}).appendTo(menu);
+        list = $('<ul>').attr({'class': 'toolbarmenu menu', role: 'menu'}).appendTo(menu);
 
         $.each(['all','current'/*,'future'*/], function(i, mode) {
             var link = $('<a>').attr({'class': 'active', rel: mode})
@@ -1375,7 +1383,7 @@
     dialog = rcmail.show_popup_dialog(html, rcmail.gettext('declineattendee', 'itip'), buttons, {
         width: 460,
         open: function() {
-            $(this).parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
+            $(this).parent().find('button:not(.ui-dialog-titlebar-close)').first().addClass('mainaction');
             $('#itip-decline-comment').focus();
         }
     });

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/libcalendaring.php -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/libcalendaring.php Changed

@@ -49,12 +49,13 @@
       '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'),
-        'Y/m/d' => array('M d Y',   'm/d',  'l m/d'),
-        'm/d/Y' => array('M d 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.'),
+        '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'),
       ),
     );
 
@@ -315,8 +316,8 @@
         $time_format = self::to_php_date_format($this->rc->config->get('calendar_time_format', $this->defaults['calendar_time_format']));
 
         if ($event['allday']) {
-            $fromto = $this->rc->format_date($event['start'], $date_format);
-            if (($todate = $this->rc->format_date($event['end'], $date_format)) != $fromto)
+            $fromto = $this->rc->format_date($event['start'], $date_format, false);
+            if (($todate = $this->rc->format_date($event['end'], $date_format, false)) != $fromto)
                 $fromto .= ' - ' . $todate;
         }
         else if ($duration < 86400 && $event['start']->format('d') == $event['end']->format('d')) {
@@ -344,7 +345,7 @@
     {
         unset($attrib['name']);
 
-        $input_value    = new html_inputfield(array('name' => 'alarmvalue[]', 'class' => 'edit-alarm-value form-control input-group-prepend', 'size' => 3));
+        $input_value    = new html_inputfield(array('name' => 'alarmvalue[]', 'class' => 'edit-alarm-value form-control', 'size' => 3));
         $input_date     = new html_inputfield(array('name' => 'alarmdate[]', 'class' => 'edit-alarm-date form-control', 'size' => 10));
         $input_time     = new html_inputfield(array('name' => 'alarmtime[]', 'class' => 'edit-alarm-time form-control', 'size' => 6));
         $select_type    = new html_select(array('name' => 'alarmtype[]', 'class' => 'edit-alarm-type form-control', 'id' => $attrib['id']));
@@ -386,6 +387,7 @@
      * Get a list of email addresses of the given user (from login and identities)
      *
      * @param string User Email (default to current user)
+     *
      * @return array Email addresses related to the user
      */
     public function get_user_emails($user = null)
@@ -418,10 +420,13 @@
 
     /**
      * Set the given participant status to the attendee matching the current user's identities
+     * Unsets 'rsvp' flag too.
+     *
+     * @param array  &$event    Event data
+     * @param string $status    The PARTSTAT value to set
+     * @param bool   $recursive Recurive call
      *
-     * @param array   Hash array with event struct
-     * @param string  The PARTSTAT value to set
-     * @return mixed  Email address of the updated attendee or False if none matching found
+     * @return mixed Email address of the updated attendee or False if none matching found
      */
     public function set_partstat(&$event, $status, $recursive = true)
     {
@@ -430,6 +435,7 @@
         foreach ((array)$event['attendees'] as $i => $attendee) {
             if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
                 $event['attendees'][$i]['status'] = strtoupper($status);
+                unset($event['attendees'][$i]['rsvp']);
                 $success = $attendee['email'];
             }
         }
@@ -761,7 +767,7 @@
                 $this->gettext(array('name' => $label, 'vars' => array('min' => $n % 60, 'hrs' => intval($n / 60))))));
         }
 
-        return html::tag('ul', $attrib + array('class' => 'toolbarmenu'), join("\n", $items), html::$common_attrib);
+        return html::tag('ul', $attrib + array('class' => 'toolbarmenu menu'), join("\n", $items), html::$common_attrib);
     }

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/libvcalendar.php -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/libvcalendar.php Changed

@@ -430,7 +430,7 @@
             case 'DTEND':
             case 'DUE':
                 $propmap = array('DTSTART' => 'start', 'DTEND' => 'end', 'DUE' => 'due');
-                $event[$propmap[$prop->name]] =  self::convert_datetime($prop);
+                $event[$propmap[$prop->name]] = self::convert_datetime($prop);
                 break;
 
             case 'TRANSP':
@@ -694,16 +694,14 @@
 
         // assign current timezone to event start/end
         if ($event['start'] instanceof DateTime) {
-            if ($this->timezone)
-                $event['start']->setTimezone($this->timezone);
+            $this->_apply_timezone($event['start']);
         }
         else {
             unset($event['start']);
         }
 
         if ($event['end'] instanceof DateTime) {
-            if ($this->timezone)
-                $event['end']->setTimezone($this->timezone);
+            $this->_apply_timezone($event['end']);
         }
         else {
             unset($event['end']);
@@ -729,6 +727,27 @@
     }
 
     /**
+     * Apply user timezone to DateTime object
+     */
+    private function _apply_timezone(&$date)
+    {
+        if (empty($this->timezone)) {
+            return;
+        }
+
+        // For date-only we'll keep the date and time intact
+        if ($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);
+            $date = $dt;
+        }
+        else {
+            $date->setTimezone($this->timezone);
+        }
+    }
+
+    /**
      * Parse the given vfreebusy component into an array representation
      */
     private function _parse_freebusy($ve)
@@ -816,7 +835,6 @@
         if (empty($prop)) {
             return $as_array ? array() : null;
         }
-
         else if ($prop instanceof VObject\Property\iCalendar\DateTime) {
             if (count($prop->getDateTimes()) > 1) {
                 $dt = array();
@@ -1291,12 +1309,15 @@
      * @param string Timezone ID as used in PHP's Date functions
      * @param integer Unix timestamp with first date/time in this timezone
      * @param integer Unix timestap with last date/time in this timezone
+     * @param VObject\Component\VCalendar Optional VCalendar component
      *
      * @return mixed A Sabre\VObject\Component object representing a VTIMEZONE definition
      *               or false if no timezone information is available
      */
     public static function get_vtimezone($tzid, $from = 0, $to = 0, $cal = null)
     {
+        // TODO: Consider using tzurl.org database for better interoperability e.g. with Outlook
+
         if (!$from) $from = time();
         if (!$to)   $to = $from;
         if (!$cal)  $cal = new VObject\Component\VCalendar();
@@ -1320,6 +1341,17 @@
         $year = 86400 * 360;
         $transitions = $tz->getTransitions($from - $year, $to + $year);
 
+        // Make sure VTIMEZONE contains at least one STANDARD/DAYLIGHT component
+        // when there's only one transition in specified time period (T5626)
+        if (count($transitions) == 1) {
+            // Get more transitions and use OFFSET from the previous to last
+            $more_transitions = $tz->getTransitions(0, $to + $year);
+            if (count($more_transitions) > 1) {
+                $index  = count($more_transitions) - 2;
+                $tzfrom = $more_transitions[$index]['offset'] / 3600;
+            }
+        }
+
         $vt = $cal->createComponent('VTIMEZONE');
         $vt->TZID = $tz->getName();
 
@@ -1327,7 +1359,7 @@
         foreach ($transitions as $i => $trans) {
             $cmp = null;
 
-            if ($i == 0) {
+            if (!isset($tzfrom)) {
                 $tzfrom = $trans['offset'] / 3600;
                 continue;
             }

iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/de.inc Added

@@ -0,0 +1,162 @@
+<?php
+/**
+ * Localizations for the Kolab calendaring utilities plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
+ */
+$labels['until'] = 'bis';
+$labels['at'] = 'um';
+$labels['alarmemail'] = 'E-Mail senden';
+$labels['alarmdisplay'] = 'Nachricht anzeigen';
+$labels['alarmaudio'] = 'Audio abspielen';
+$labels['alarmdisplayoption'] = 'Nachricht';
+$labels['alarmemailoption'] = 'E-Mail';
+$labels['alarmaudiooption'] = 'Audio';
+$labels['alarmat'] = 'um $datetime';
+$labels['trigger@'] = 'genau am';
+$labels['trigger-M'] = 'Minuten davor';
+$labels['trigger-H'] = 'Stunden davor';
+$labels['trigger-D'] = 'Tage davor';
+$labels['trigger+M'] = 'Minuten danach';
+$labels['trigger+H'] = 'Stunden danach';
+$labels['trigger+D'] = 'Tage danach';
+$labels['triggerend-M'] = 'Minuten vor dem Ende';
+$labels['triggerend-H'] = 'Stunden vor dem Ende';
+$labels['triggerend-D'] = 'Tage vor dem Ende';
+$labels['triggerend+M'] = 'Minuten nach dem Ende';
+$labels['triggerend+H'] = 'Stunden nach dem Ende';
+$labels['triggerend+D'] = 'Tage nach dem Ende';
+$labels['trigger0'] = 'um exakt';
+$labels['triggerattime'] = 'zur Startzeit';
+$labels['triggerattimeend'] = 'zur Endzeit';
+$labels['relatedstart'] = 'Beginn';
+$labels['relatedendevent'] = 'Ende';
+$labels['relatedendtask'] = 'Fällig';
+$labels['addalarm'] = 'Erinnerung hinzufügen';
+$labels['removealarm'] = 'Erinnerung entfernen';
+$labels['alarmtitle'] = 'Anstehende Termine';
+$labels['dismissall'] = 'Alle ignorieren';
+$labels['dismiss'] = 'Ignorieren';
+$labels['snooze'] = 'Später erinnern';
+$labels['repeatinmin'] = 'Wiederholung in $min Minuten';
+$labels['repeatinhr'] = 'Wiederholung in 1 Stunde';
+$labels['repeatinhrs'] = 'Wiederholung in $hrs Stunden';
+$labels['repeattomorrow'] = 'Wiederholung morgen';
+$labels['repeatinweek'] = 'Wiederholung in einer Woche';
+$labels['showmore'] = 'Mehr anzeigen...';
+$labels['recurring'] = 'Wiederholungen';
+$labels['frequency'] = 'Wiederholung';
+$labels['never'] = 'nie';
+$labels['daily'] = 'täglich';
+$labels['weekly'] = 'wöchentlich';
+$labels['monthly'] = 'monatlich';
+$labels['yearly'] = 'jährlich';
+$labels['rdate'] = 'genau am';
+$labels['every'] = 'Alle';
+$labels['days'] = 'Tag(e)';
+$labels['weeks'] = 'Woche(n)';
+$labels['months'] = 'Monat(e)';
+$labels['years'] = 'Jahre(e) im:';
+$labels['bydates'] = 'Am';
+$labels['bydays'] = 'Am';
+$labels['bymonths'] = 'Am';
+$labels['untildate'] = 'am';
+$labels['each'] = 'Jeden';
+$labels['onevery'] = 'An jedem';
+$labels['onsamedate'] = 'Am gleichen Tag';
+$labels['forever'] = 'unendlich';
+$labels['recurrencend'] = 'bis';
+$labels['untilenddate'] = 'bis am';
+$labels['forntimes'] = '$nr Wiederholungen'; // old
+$labels['first'] = 'erster';
+$labels['second'] = 'zweiter';
+$labels['third'] = 'dritter';
+$labels['fourth'] = 'vierter';
+$labels['last'] = 'letzter';
+$labels['dayofmonth'] = 'Tag des Montats';
+$labels['addrdate'] = 'Datum hinzufügen';
+$labels['except'] = 'ausser';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statustentative'] = 'Mit Vorbehalt';
+$labels['statusdeclined'] = 'Abgelehnt';
+$labels['statusdelegated'] = 'Delegiert';
+$labels['statusneeds-action'] = 'Braucht Aktion';
+$labels['statusunknown'] = 'Unbekannt';
+$labels['statuscompleted'] = 'Abgeschlossen';
+$labels['statusin-process'] = 'In Bearbeitung';
+$labels['itipinvitation'] = 'Einladung zu';
+$labels['itipupdate'] = 'Aktialisiert:';
+$labels['itipcancellation'] = 'Abgesagt:';
+$labels['itipreply'] = 'Antwort zu';
+$labels['itipaccepted'] = 'Akzeptieren';
+$labels['itiptentative'] = 'Mit Vorbehalt';
+$labels['itipdeclined'] = 'Ablehnen';
+$labels['itipdelegated'] = 'Delegieren';
+$labels['itipneeds-action'] = 'Aufschieben';
+$labels['itipcomment'] = 'Ihre Antwort';
+$labels['itipeditresponse'] = 'Antwort eingeben';
+$labels['itipsendercomment'] = 'Kommentar des Absenders:';
+$labels['itipsuppressreply'] = 'Keine Antwort senden';
+$labels['itipobjectnotfound'] = 'Das Objekt auf welches sich diese Nachricht bezieht, wurde in Ihrem Konto nicht gefunden.';
+$labels['itipsubjectaccepted'] = 'Einladung zu "$title" wurde von $name angenommen';
+$labels['itipsubjecttentative'] = 'Einladung zu "$title" wurde von $name mit Vorbehalt angenommen';
+$labels['itipsubjectdeclined'] = 'Einladung zu "$title" wurde von $name abgelehnt';
+$labels['itipsubjectin-process'] = '"$title" ist nun in Bearbeitung von $name';
+$labels['itipsubjectcompleted'] = '"$title" wurde vom $name fertiggestellt';
+$labels['itipsubjectcancel'] = 'Ihre Teilnahme in "$title" wurde aufgehoben';
+$labels['itipsubjectdelegated'] = '"$title" wurde durch $name delegiert';
+$labels['itipsubjectdelegatedto'] = '"$title" wurde durch $name an Sie delegiert';
+$labels['itipnewattendee'] = 'Dies ist eine Antwort von einem neuen Teilnehmer';
+$labels['updateattendeestatus'] = 'Teilnehmerstatus aktualisieren';
+$labels['acceptinvitation'] = 'Möchten Sie die Einladung zu diesem Termin annehmen?';
+$labels['acceptattendee'] = 'Teilnehmer akzeptieren';
+$labels['declineattendee'] = 'Teilnehmer ablehnen';
+$labels['declineattendeeconfirm'] = 'Nachricht an den abgelehnten Teilnehmer verfassen (optional):';
+$labels['rsvpmodeall'] = 'Die gesamte Reihe';
+$labels['rsvpmodecurrent'] = 'Nur dieses Ereignis';
+$labels['rsvpmodefuture'] = 'Dieses und zukünftige Ereignisse';
+$labels['itipsingleoccurrence'] = 'Dieses ist eine <em>einzelne Wiederholung</em> einer Serie von Ereignissen';
+$labels['itipfutureoccurrence'] = 'Bezieht sich auf <em>diese and alle zukünftigen Wiederholungen</em> einer Serie von Ereignissen';
+$labels['itipmessagesingleoccurrence'] = 'Diese Nachricht bezieht sich nur auf eine einzelne Wiederholung';
+$labels['itipmessagefutureoccurrence'] = 'Diese Nachricht bezieht sich auf diese und alle zukünftigen Wiederholungen';
+$labels['youhaveaccepted'] = 'Sie haben die Einladung angenommen';
+$labels['youhavetentative'] = 'Sie haben die Einladung mit Vorbehalt angenommen';
+$labels['youhavedeclined'] = 'Sie haben die Einladung abgelehnt';
+$labels['youhavedelegated'] = 'Sie haben diese Einladung abgelehnt';
+$labels['youhavein-process'] = 'Sie arbeiten an dieser Aufgabe';
+$labels['youhavecompleted'] = 'Sie haben diese Aufgabe erledigt';
+$labels['youhaveneeds-action'] = 'Ihre Antwort auf diese Einladung ist noch ausstehend';
+$labels['youhavepreviouslyaccepted'] = 'Sie haben diese Einladung zuvor angenommen';
+$labels['youhavepreviouslytentative'] = 'Sie haben diese Einladung zuvor mit Vorbehalt angenommen';
+$labels['youhavepreviouslydeclined'] = 'Sie haben diese Einladung zuvor abgelehnt';
+$labels['youhavepreviouslydelegated'] = 'Sie haben diese Einladung zuvor delegiert';
+$labels['youhavepreviouslyin-process'] = 'Sie haben diese Aufgabe zuvor als In Bearbeitung gemeldet';
+$labels['youhavepreviouslycompleted'] = 'Sie haben diese Einladung zuvor erledigt';
+$labels['youhavepreviouslyneeds-action'] = 'Ihre Antwort auf diese Einladung ist noch ausstehend';
+$labels['attendeeaccepted'] = 'Teilnehmer hat akzeptiert';
+$labels['attendeetentative'] = 'Teilnehmer hat mit Vorbehalt akzeptiert';
+$labels['attendeedeclined'] = 'Teilnehmer hat abgelehnt';
+$labels['attendeedelegated'] = 'Teilnehmer hat an $delegatedto delegiert';
+$labels['attendeein-process'] = 'Teilnehmer arbeitet an dieser Aufgabe';
+$labels['attendeecompleted'] = 'Teilnehmer hat die Aufgabe erledigt';
+$labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';
+$labels['outdatedinvitation'] = 'Diese Einladung wurde durch eine neuere Version ersetzt';
+$labels['importtocalendar'] = 'In Kalender übernehmen';
+$labels['removefromcalendar'] = 'Aus meinem Kalender löschen';
+$labels['updatemycopy'] = 'Meine Kopie aktualisieren';
+$labels['openpreview'] = 'Vorschau öffnen';
+$labels['deleteobjectconfirm'] = 'Möchten Sie dieses Objekt wirklich löschen?';
+$labels['declinedeleteconfirm'] = 'Soll das abgelehnte Objekt ebenfalls aus Ihrem Konto gelöscht werden?';
+$labels['delegateinvitation'] = 'Einladung delegieren';
+$labels['delegateto'] = 'Delegieren an';
+$labels['delegatersvpme'] = 'Informiere mich über Aktualisierungen dieses Termins';
+$labels['delegateinvalidaddress'] = 'Geben Sie eine gültige E-Mail-Adresse für den Delegierten ein';
+$labels['savingdata'] = 'Speichere...';
+$labels['savein'] = 'Speichern in';
+$labels['expandattendeegroup'] = 'Mit Gruppenmitgliedern ersetzen';
+$labels['expandattendeegroupnodata'] = 'Diese Gruppe konnte nicht ersetzt werden. Keine Gruppenmitglieder gefunden.';
+$labels['expandattendeegrouperror'] = 'Diese Gruppe konnte nicht ersetzt werden. Sie hat möglicherweise zuviele Mitglieder.';
+$labels['expandattendeegroupsizelimit'] = 'Die Gruppe hat zuviele Mitglieder und konnte deshalb nicht ersetzt werden.';

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/de_DE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/localization/fi_FI.inc -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/fi_FI.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/pl_PL.inc Changed

@@ -7,10 +7,160 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
 $labels['until'] = 'dopóki';
+$labels['at'] = 'w';
+$labels['alarmemail'] = 'Wyślij e-mail';
+$labels['alarmdisplay'] = 'Pokaż wiadomość';
+$labels['alarmaudio'] = 'Odtwórz dźwięk';
+$labels['alarmdisplayoption'] = 'Wiadomość';
+$labels['alarmemailoption'] = 'E-mail';
+$labels['alarmaudiooption'] = 'Dźwięk';
+$labels['alarmat'] = 'o $datetime';
+$labels['trigger@'] = 'w dniu';
+$labels['trigger-M'] = 'minut(y) przed';
+$labels['trigger-H'] = 'godziny przed';
+$labels['trigger-D'] = 'dni przed';
+$labels['trigger+M'] = 'minut po';
+$labels['trigger+H'] = 'godzin(y) po';
+$labels['trigger+D'] = 'dni po';
+$labels['triggerend-M'] = 'minut przed zakończeniem';
+$labels['triggerend-H'] = 'godzin przed zakończeniem';
+$labels['triggerend-D'] = 'dni przed zakończeniem';
+$labels['triggerend+M'] = 'minut po zakończeniu';
+$labels['triggerend+H'] = 'godzin po zakończeniu';
+$labels['triggerend+D'] = 'dni po zakończeniu';
+$labels['trigger0'] = 'o czasie';
+$labels['triggerattime'] = 'na początku';
+$labels['triggerattimeend'] = 'na końcu';
+$labels['relatedstart'] = 'początek';
+$labels['relatedendevent'] = 'koniec';
+$labels['relatedendtask'] = 'termin';
+$labels['addalarm'] = 'Dodaj alarm';
+$labels['removealarm'] = 'Usuń alarm';
+$labels['alarmtitle'] = 'Nadchodzące zdarzenia';
+$labels['dismissall'] = 'Odrzuć wszystkie';
+$labels['dismiss'] = 'Odrzuć';
+$labels['snooze'] = 'Odłóż';
+$labels['repeatinmin'] = 'Powtórz po $min minutach';
+$labels['repeatinhr'] = 'Powtórz po godzinie';
+$labels['repeatinhrs'] = 'Powtórz po $hrs godzinach';
+$labels['repeattomorrow'] = 'Powtórz jutro';
+$labels['repeatinweek'] = 'Powtórz za tydzień';
+$labels['showmore'] = 'Pokaż więcej...';
+$labels['recurring'] = 'Powtórzenia';
 $labels['frequency'] = 'Powtórz';
+$labels['never'] = 'nigdy';
+$labels['daily'] = 'codziennie';
+$labels['weekly'] = 'cotygodniowo';
+$labels['monthly'] = 'miesięcznie';
+$labels['yearly'] = 'corocznie';
+$labels['rdate'] = 'wg dat';
+$labels['every'] = 'Każdy';
+$labels['days'] = 'dzień';
+$labels['weeks'] = 'tydzień';
+$labels['months'] = 'miesiąc';
+$labels['years'] = 'roku w:';
+$labels['bydates'] = 'W';
+$labels['bydays'] = 'W';
+$labels['bymonths'] = 'W';
+$labels['untildate'] = 'do';
+$labels['each'] = 'Każdy';
+$labels['onevery'] = 'W każdy';
+$labels['onsamedate'] = 'W tej samej dacie';
+$labels['forever'] = 'zawsze';
 $labels['recurrencend'] = 'dopóki';
-$labels['forntimes'] = ''; // old
+$labels['untilenddate'] = 'do daty';
+$labels['forntimes'] = '$nr raz(y)'; // old
+$labels['ntimes'] = '$n czas (s)';
+$labels['for'] = 'dla';
+$labels['first'] = 'pierwszy';
+$labels['second'] = 'drugi';
+$labels['third'] = 'trzeci';
+$labels['fourth'] = 'czwarty';
+$labels['last'] = 'ostatni';
+$labels['dayofmonth'] = 'Dzień miesiąca';
+$labels['addrdate'] = 'Dodaj datę powtórzenia';
+$labels['except'] = 'oprócz';
 $labels['statusorganizer'] = 'Organizator';
+$labels['statusaccepted'] = 'Zaakceptowany';
 $labels['statustentative'] = 'Niepewny';
+$labels['statusdeclined'] = 'Odrzucony';
+$labels['statusdelegated'] = 'Oddelegowano';
+$labels['statusneeds-action'] = 'Wymagane działanie';
 $labels['statusunknown'] = 'Nieznany';
+$labels['statuscompleted'] = 'Ukończone';
+$labels['statusin-process'] = 'W trakcie';
+$labels['itipinvitation'] = 'Zaproszenie do';
+$labels['itipupdate'] = 'Aktualizacja';
+$labels['itipcancellation'] = 'Anulowano:';
+$labels['itipreply'] = 'Odpowiedź do';
+$labels['itipaccepted'] = 'Akceptuj';
+$labels['itiptentative'] = 'Może';
+$labels['itipdeclined'] = 'Odrzuć';
+$labels['itipdelegated'] = 'Pełnomocnik';
+$labels['itipneeds-action'] = 'Odłóż';
+$labels['itipcomment'] = 'Twoja odpowiedź';
+$labels['itipeditresponse'] = 'Wprowadź treść odpowiedzi';
+$labels['itipsendercomment'] = 'Komentarz nadawcy:';
+$labels['itipsuppressreply'] = 'Nie wysyłaj odpowiedzi';
+$labels['itipobjectnotfound'] = 'W twoim koncie nie znaleziono obiektu powiązanego z tą wiadomością.';
+$labels['itipsubjectaccepted'] = '"$title" zostało zaakceptowane przez $name';
+$labels['itipsubjecttentative'] = '"$title" zostało warunkowo zaakceptowane przez $name';
+$labels['itipsubjectdeclined'] = '"$title" zostało odrzucone przez $name';
+$labels['itipsubjectin-process'] = '"$title" jest przetwarzane przez $name';
+$labels['itipsubjectcompleted'] = '"$title" zostało wykonane przez $name';
+$labels['itipsubjectcancel'] = 'Twój udział w "$title" został anulowany';
+$labels['itipsubjectdelegated'] = '"$title" zostało wydelegowane przez $name';
+$labels['itipsubjectdelegatedto'] = '"$title" zostało oddelegowane do ciebie przez $name';
+$labels['itipnewattendee'] = 'To jest odpowiedź od nowego uczestnika';
+$labels['updateattendeestatus'] = 'Zaktualizuj status uczestnika';
+$labels['acceptinvitation'] = 'Czy akceptujesz to zdarzenie?';
+$labels['acceptattendee'] = 'Akceptuj uczestnika';
+$labels['declineattendee'] = 'Odrzuć uczestnika';
+$labels['declineattendeeconfirm'] = 'Wprowadź wiadomość dla odrzuconego uczestnika (opcjonalnie):';
+$labels['rsvpmodeall'] = 'Cała seria';
+$labels['rsvpmodecurrent'] = 'Tylko to wystąpienie';
+$labels['rsvpmodefuture'] = 'To i przeszłe wystąpienia';
+$labels['itipsingleoccurrence'] = 'To jest <em>pojedyncze wystąpienie</em> w serii zdarzeń';
+$labels['itipfutureoccurrence'] = 'Odnosi się do <em>tego i przyszłych wystąpień</em> w serii zdarzeń';
+$labels['itipmessagesingleoccurrence'] = 'Wiadomość odnosi się tylko do tego pojedynczego wystąpienia';
+$labels['itipmessagefutureoccurrence'] = 'Wiadomość odnosi się do tego i przyszłych wystąpień';
+$labels['youhaveaccepted'] = 'Zaakceptowałeś to zaproszenie';
+$labels['youhavetentative'] = 'Zaakceptowałeś to zdarzenie warunkowo';
+$labels['youhavedeclined'] = 'Odrzuciłeś to zdarzenie';
+$labels['youhavedelegated'] = 'Wydelegowałeś to zaproszenie';
+$labels['youhavein-process'] = 'Pracujesz nad tym przedziałem';
+$labels['youhavecompleted'] = 'Wykonałeś ten przydział';
+$labels['youhaveneeds-action'] = 'To zaproszenie wciąż oczekuje na twoją odpowiedź';
+$labels['youhavepreviouslyaccepted'] = 'Poprzednio zaakceptowałeś to zaproszenie';
+$labels['youhavepreviouslytentative'] = 'Poprzednio zaakceptowałeś to zaproszenie warunkowo';
+$labels['youhavepreviouslydeclined'] = 'Poprzednio odrzuciłeś to zaproszenie';
+$labels['youhavepreviouslydelegated'] = 'Poprzednio oddelegowałeś to zaproszenie';
+$labels['youhavepreviouslyin-process'] = 'Poprzednio zgłosiłeś, że pracujesz nad tym przydziałem';
+$labels['youhavepreviouslycompleted'] = 'Poprzednio wykonałeś ten przydział';
+$labels['youhavepreviouslyneeds-action'] = 'To zaproszenie wciąż oczekuje na twoją odpowiedź';
+$labels['attendeeaccepted'] = 'Uczestnik zaakceptował';
+$labels['attendeetentative'] = 'Uczestnik zaakceptował warunkowo';
+$labels['attendeedeclined'] = 'Uczestnik odrzucił';
+$labels['attendeedelegated'] = 'Uczestnik oddelegował do $delegatedto';
+$labels['attendeein-process'] = 'Uczestnik pracuje';
+$labels['attendeecompleted'] = 'Uczestnik ukończył';
+$labels['notanattendee'] = 'Nie jesteś na liście uczestników tego zdarzenia';
+$labels['outdatedinvitation'] = 'To zaproszenie zostało zastąpione nową wersją';
+$labels['importtocalendar'] = 'Zapisz w moim kalendarzu';
+$labels['removefromcalendar'] = 'Usuń z mojego kalendarza';
+$labels['updatemycopy'] = 'Uaktualnij moją kopię';
+$labels['openpreview'] = 'Otwórz podgląd';
+$labels['deleteobjectconfirm'] = 'Czy na pewno chcesz usunąć ten obiekt?';
+$labels['declinedeleteconfirm'] = 'Czy chcesz także usunąć ten odrzucony obiekt ze swojego konta?';
+$labels['delegateinvitation'] = 'Oddeleguj zaproszenie';
+$labels['delegateto'] = 'Oddeleguj do';
+$labels['delegatersvpme'] = 'Informuj mnie o zmianach w tym wydarzeniu';
+$labels['delegateinvalidaddress'] = 'Proszę podać poprawny adres email delegata';
+$labels['delegatedto'] = 'Oddelegowane do:';
+$labels['delegatedfrom'] = 'Oddelegowane przez:';
 $labels['savingdata'] = 'Zapisuję dane...';
+$labels['savein'] = 'Zapisz w';
+$labels['expandattendeegroup'] = 'Substitute with group members';
+$labels['expandattendeegroupnodata'] = 'Nie można zamienić tej grupy. Nie znaleziono jej członków.';
+$labels['expandattendeegrouperror'] = 'Nie można zamienić tej grupy. Może posiadać zbyt wielu członków.';
+$labels['expandattendeegroupsizelimit'] = 'Ta grupa posiada zbyt wielu członków.';

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/ru_RU.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/localization/sv_SE.inc Changed

@@ -7,10 +7,155 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
 $labels['until'] = 'tills';
+$labels['at'] = ' på';
+$labels['alarmemail'] = 'Skicka e-post';
+$labels['alarmdisplay'] = 'Visa meddelande';
+$labels['alarmaudio'] = 'Spela ljud';
+$labels['alarmdisplayoption'] = 'Meddelande';
+$labels['alarmemailoption'] = 'E-post';
+$labels['alarmaudiooption'] = 'Ljud';
+$labels['alarmat'] = '$datetime';
+$labels['trigger@'] = 'datum';
+$labels['trigger-M'] = 'minuter före';
+$labels['trigger-H'] = 'timmar före';
+$labels['trigger-D'] = 'dagar före';
+$labels['trigger+M'] = 'minuter efter';
+$labels['trigger+H'] = 'timmar efter';
+$labels['trigger+D'] = 'dagar efter';
+$labels['triggerend-M'] = 'minuter innan slut';
+$labels['triggerend-H'] = 'timmar innan slut';
+$labels['triggerend-D'] = 'dagar innan slut';
+$labels['triggerend+M'] = 'minuter efter slut';
+$labels['triggerend+H'] = 'timmar efter slut';
+$labels['triggerend+D'] = 'dagar efter slut';
+$labels['trigger0'] = 'i tid';
+$labels['triggerattime'] = 'på starttid';
+$labels['triggerattimeend'] = 'på sluttid';
+$labels['relatedstart'] = 'start';
+$labels['relatedendevent'] = 'slut';
+$labels['relatedendtask'] = 'förfallotid';
+$labels['addalarm'] = 'Lägg till alarm';
+$labels['removealarm'] = 'Ta bort alarm';
+$labels['alarmtitle'] = 'Kommande händelser';
+$labels['dismissall'] = 'Avvisa alla';
+$labels['dismiss'] = 'Avvisa';
+$labels['snooze'] = 'Vila';
+$labels['repeatinmin'] = 'Upprepa om $min minuter';
+$labels['repeatinhr'] = 'Upprepa om 1 timme';
+$labels['repeatinhrs'] = 'Upprepa om $hrs timmar';
+$labels['repeattomorrow'] = 'Upprepa imorgon';
+$labels['repeatinweek'] = 'Upprepa om en vecka';
+$labels['showmore'] = 'Visa fler ...';
+$labels['recurring'] = 'Upprepningar';
 $labels['frequency'] = 'Upprepa';
+$labels['never'] = 'aldrig';
+$labels['daily'] = 'dagligen';
+$labels['weekly'] = 'veckovis';
+$labels['monthly'] = 'månadsvis';
+$labels['yearly'] = 'årligen';
+$labels['rdate'] = 'på datum';
+$labels['every'] = 'Varje';
+$labels['days'] = 'dag(ar)';
+$labels['weeks'] = 'vecka(or)';
+$labels['months'] = 'månad(er)';
+$labels['years'] = 'år';
+$labels['bydates'] = 'På';
+$labels['bydays'] = 'På';
+$labels['bymonths'] = 'På';
+$labels['untildate'] = 'den';
+$labels['each'] = 'Varje';
+$labels['onevery'] = 'På varje';
+$labels['onsamedate'] = 'På samma datum';
+$labels['forever'] = 'för alltid';
 $labels['recurrencend'] = 'tills';
-$labels['forntimes'] = ''; // old
+$labels['untilenddate'] = 'tills datum';
+$labels['forntimes'] = '$nr gång(er)'; // old
+$labels['first'] = 'första';
+$labels['second'] = 'andra';
+$labels['third'] = 'tredje';
+$labels['fourth'] = 'fjärde';
+$labels['last'] = 'sista';
+$labels['dayofmonth'] = 'Dag i månad';
+$labels['addrdate'] = 'Lägg till datum för upprepning';
+$labels['except'] = 'Förutom';
 $labels['statusorganizer'] = 'Organisatör';
+$labels['statusaccepted'] = 'Accepterad';
 $labels['statustentative'] = 'Preliminärt';
+$labels['statusdeclined'] = 'Avböjde';
+$labels['statusneeds-action'] = 'Kräver åtgärd';
 $labels['statusunknown'] = 'Okänd';
+$labels['statuscompleted'] = 'Slutförd';
+$labels['statusin-process'] = 'Pågående';
+$labels['itipinvitation'] = 'Inbjudan till';
+$labels['itipupdate'] = 'Uppdatering av';
+$labels['itipcancellation'] = 'Ställts in:';
+$labels['itipreply'] = 'Svara till';
+$labels['itipaccepted'] = 'Acceptera';
+$labels['itiptentative'] = 'Kanske';
+$labels['itipdeclined'] = 'Avböj';
+$labels['itipdelegated'] = 'Delegera';
+$labels['itipneeds-action'] = 'Skjut upp';
+$labels['itipcomment'] = 'Ditt svar';
+$labels['itipeditresponse'] = 'Ange ett svar';
+$labels['itipsendercomment'] = 'Avsändarens kommentar:';
+$labels['itipsuppressreply'] = 'Skicka inget svar';
+$labels['itipobjectnotfound'] = 'Objektet som refererats av detta meddelande hittades inte i ditt konto.';
+$labels['itipsubjectaccepted'] = '"$title" har accepterats av $name';
+$labels['itipsubjecttentative'] = '"$title" har preliminärt accepterats av $name';
+$labels['itipsubjectdeclined'] = '$name har tackat nej till "$title"';
+$labels['itipsubjectin-process'] = '"$title" bearbetas av $name';
+$labels['itipsubjectcompleted'] = '"$title" har slutförts av $name';
+$labels['itipsubjectcancel'] = 'Ditt deltagande i "$title" har ställts in';
+$labels['itipsubjectdelegated'] = '"$title" har delegerats av $name';
+$labels['itipsubjectdelegatedto'] = '"$title" har delegerats till dig av $name';
+$labels['itipnewattendee'] = 'Detta är ett svar från en ny deltagare';
+$labels['updateattendeestatus'] = 'Uppdatera deltagarens status';
+$labels['acceptinvitation'] = 'Accepterar du denna inbjudan?';
+$labels['acceptattendee'] = 'Acceptera deltagare';
+$labels['declineattendee'] = 'Neka deltagare';
+$labels['declineattendeeconfirm'] = 'Skriv ett meddelande till den nekade deltagaren (valfritt):';
+$labels['rsvpmodeall'] = 'Hela serien';
+$labels['rsvpmodecurrent'] = 'Endast denna förekomst';
+$labels['rsvpmodefuture'] = 'Denna och framtida förekomster';
+$labels['itipsingleoccurrence'] = 'Detta är en <em>enskild förekomst</em> i en serie av händelser';
+$labels['itipfutureoccurrence'] = 'Avser <em>denna och alla framtida förekomster</em> i en serie av händelser';
+$labels['itipmessagesingleoccurrence'] = 'Meddelandet avser endast denna förekomst';
+$labels['itipmessagefutureoccurrence'] = 'Meddelandet hänvisar till denna och alla framtida förekomster';
+$labels['youhaveaccepted'] = 'Du har accepterat denna inbjudan';
+$labels['youhavetentative'] = 'Du har preliminärt accepterat denna inbjudan';
+$labels['youhavedeclined'] = 'Du har tackat nej till denna inbjudan';
+$labels['youhavedelegated'] = 'Du har delegerat denna inbjudan';
+$labels['youhavein-process'] = 'Du arbetar med denna uppgift';
+$labels['youhavecompleted'] = 'Du har slutfört denna uppgift';
+$labels['youhaveneeds-action'] = 'Ditt svar till denna inbjudan har ännu inte skickats';
+$labels['youhavepreviouslyaccepted'] = 'Du har tidigare accepterat denna inbjudan';
+$labels['youhavepreviouslytentative'] = 'Du har tidigare preliminärt accepterat denna inbjudan';
+$labels['youhavepreviouslydeclined'] = 'Du har tidigare tackat nej till denna inbjudan';
+$labels['youhavepreviouslydelegated'] = 'Du har tidigare delegerat denna inbjudan';
+$labels['youhavepreviouslyin-process'] = 'Du har tidigare rapporterat att du arbetar med denna uppgift';
+$labels['youhavepreviouslycompleted'] = 'Du har tidigare slutfört denna uppgift';
+$labels['youhavepreviouslyneeds-action'] = 'Ditt svar på denna inbjudan har ännu inte skickats';
+$labels['attendeeaccepted'] = 'Deltagare har accepterat';
+$labels['attendeetentative'] = 'Deltagare har preliminärt accepterat';
+$labels['attendeedeclined'] = 'Deltagare har tackat nej';
+$labels['attendeedelegated'] = 'Deltagare har delegerat till $delegatedto';
+$labels['attendeein-process'] = 'Deltagare är i bearbetningsfas';
+$labels['attendeecompleted'] = 'Deltagare har slutfört';
+$labels['notanattendee'] = 'Du är inte listad som en deltagare av detta objekt';
+$labels['outdatedinvitation'] = 'Denna inbjudan har ersatts av en nyare version';
+$labels['importtocalendar'] = 'Spara till min kalender';
+$labels['removefromcalendar'] = 'Ta bort från min kalender';
+$labels['updatemycopy'] = 'Uppdatera min kopia';
+$labels['openpreview'] = 'Öppna förhandsgranskning';
+$labels['deleteobjectconfirm'] = 'Vill du verkligen ta bort detta objekt?';
+$labels['declinedeleteconfirm'] = 'Vill du också vill ta bort detta objekt, som du tackat nej till, från ditt konto?';
+$labels['delegateinvitation'] = 'Delegera inbjudan';
+$labels['delegateto'] = 'Delegera till';
+$labels['delegatersvpme'] = 'Håll mig informerad om uppdateringar angående denna incident';
+$labels['delegateinvalidaddress'] = 'Vänligen ange en giltig e-postadress för ombudet';
 $labels['savingdata'] = 'Sparar data ...';
+$labels['savein'] = 'Spara i';
+$labels['expandattendeegroup'] = 'Ersättare med gruppmedlemmar';
+$labels['expandattendeegroupnodata'] = 'Det går inte att ersätta denna grupp. Inga medlemmar hittades.';
+$labels['expandattendeegrouperror'] = 'Det går inte att ersätta denna grupp. Den kan innehålla för många medlemmar.';
+$labels['expandattendeegroupsizelimit'] = 'Denna grupp innehåller för många medlemmar för att ersätta.';

iRony-0.4.2.tar.gz/lib/plugins/libcalendaring/tests/libvcalendar.php -> iRony-0.4.3.tar.gz/lib/plugins/libcalendaring/tests/libvcalendar.php Changed

@@ -102,14 +102,6 @@
         $this->assertFalse(array_key_exists('changed', $event), "No changed date field");
     }
 
-    function test_invalid_vevent()
-    {
-        $this->setExpectedException('\Sabre\VObject\ParseException');
-
-        $ical = new libvcalendar();
-        $events = $ical->import_from_file(__DIR__ . '/resources/invalid-event.ics', 'UTF-8', true);
-    }
-
     /**
      * Test some extended ical properties such as attendees, recurrence rules, alarms and attachments
      */
@@ -589,6 +581,25 @@
         $this->assertInstanceOf('\Sabre\VObject\Component', $vtz);
         $this->assertContains('TZOFFSETFROM:+1245', $vtz->serialize());
         $this->assertContains('TZOFFSETTO:+1345', $vtz->serialize());
+
+        // Making sure VTIMEZOONE contains at least one STANDARD/DAYLIGHT component
+        // when there's only one transition in specified time period (T5626)
+        $vtz = libvcalendar::get_vtimezone('Europe/Istanbul', strtotime('2019-10-04T15:00:00'));
+
+        $this->assertInstanceOf('\Sabre\VObject\Component', $vtz);
+
+        $dst = $vtz->select('DAYLIGHT');
+        $std = $vtz->select('STANDARD');
+
+        $this->assertEmpty($dst);
+        $this->assertCount(1, $std);
+
+        $std = end($std);
+        $this->assertEquals('STANDARD', $std->name);
+        $this->assertEquals('20181009T150000', $std->DTSTART);
+        $this->assertEquals('+0300', $std->TZOFFSETFROM);
+        $this->assertEquals('+0300', $std->TZOFFSETTO);
+        $this->assertEquals('+03', $std->TZNAME);
     }
 
     function get_attachment_data($id, $event)
@@ -596,4 +607,3 @@
         return $this->attachment_data;
     }
 }
-

iRony-0.4.2.tar.gz/lib/plugins/libkolab/README -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/README Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/SQL/mysql.initial.sql -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/mysql.initial.sql Changed

@@ -12,7 +12,7 @@
 
 CREATE TABLE `kolab_folders` (
   `folder_id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
-  `resource` VARCHAR(255) NOT NULL,
+  `resource` VARCHAR(255) BINARY NOT NULL,
   `type` VARCHAR(32) NOT NULL,
   `synclock` INT(10) NOT NULL DEFAULT '0',
   `ctag` VARCHAR(40) DEFAULT NULL,
@@ -33,7 +33,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
@@ -57,7 +56,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -77,7 +75,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -97,7 +94,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -117,7 +113,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   CONSTRAINT `fk_kolab_cache_note_folder` FOREIGN KEY (`folder_id`)
@@ -135,7 +130,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `filename` varchar(255) DEFAULT NULL,
@@ -155,7 +149,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
@@ -175,7 +168,6 @@
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
-  `xml` LONGBLOB NOT NULL,
   `tags` TEXT NOT NULL,
   `words` TEXT NOT NULL,
   `dtstart` DATETIME,
@@ -188,4 +180,4 @@
 
 /*!40014  SET FOREIGN_KEY_CHECKS=1 */;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2018021300');
+REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2019092900');

iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/mysql/2018122700.sql Added

iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/mysql/2019092900.sql Added

iRony-0.4.2.tar.gz/lib/plugins/libkolab/SQL/oracle.initial.sql -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/oracle.initial.sql Changed

@@ -37,7 +37,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "type" varchar(32) NOT NULL,
@@ -60,7 +59,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -79,7 +77,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -98,7 +95,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -117,7 +113,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     PRIMARY KEY ("folder_id", "msguid")
@@ -134,7 +129,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "filename" varchar(255) DEFAULT NULL,
@@ -153,7 +147,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "type" varchar(32) NOT NULL,
@@ -172,7 +165,6 @@
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
-    "xml" clob NOT NULL,
     "tags" clob DEFAULT NULL,
     "words" clob DEFAULT NULL,
     "dtstart" timestamp DEFAULT NULL,
@@ -183,4 +175,4 @@
 CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
 
 
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2018021300');
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2019092900');

iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/oracle/2018122700.sql Added

iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/oracle/2019092900.sql Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/SQL/sqlite.initial.sql -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/sqlite.initial.sql Changed

@@ -25,7 +25,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   type VARCHAR(32) NOT NULL,
@@ -46,7 +45,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -63,7 +61,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -80,7 +77,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -97,7 +93,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   PRIMARY KEY(folder_id,msguid)
@@ -112,7 +107,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   filename varchar(255) DEFAULT NULL,
@@ -129,7 +123,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   type VARCHAR(32) NOT NULL,
@@ -146,7 +139,6 @@
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
-  xml TEXT NOT NULL,
   tags TEXT NOT NULL,
   words TEXT NOT NULL,
   dtstart DATETIME,
@@ -156,4 +148,4 @@
 
 CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);
 
-INSERT INTO system (name, value) VALUES ('libkolab-version', '2018021300');
+INSERT INTO system (name, value) VALUES ('libkolab-version', '2019092900');

iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/sqlite/2018122700.sql Added

@@ -0,0 +1,137 @@
+DROP TABLE kolab_cache_contact;
+CREATE TABLE kolab_cache_contact (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  type VARCHAR(32) NOT NULL,
+  name VARCHAR(255) NOT NULL,
+  firstname VARCHAR(255) NOT NULL,
+  surname VARCHAR(255) NOT NULL,
+  email VARCHAR(255) NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_contact_type ON kolab_cache_contact(folder_id,type);
+CREATE INDEX ix_contact_uid2msguid ON kolab_cache_contact(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_event;
+CREATE TABLE kolab_cache_event (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_event_uid2msguid ON kolab_cache_event(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_task;
+CREATE TABLE kolab_cache_task (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_task_uid2msguid ON kolab_cache_task(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_journal;
+CREATE TABLE kolab_cache_journal (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_journal_uid2msguid ON kolab_cache_journal(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_note;
+CREATE TABLE kolab_cache_note (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_note_uid2msguid ON kolab_cache_note(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_file;
+CREATE TABLE kolab_cache_file (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  filename varchar(255) DEFAULT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_folder_filename ON kolab_cache_file(folder_id,filename);
+CREATE INDEX ix_file_uid2msguid ON kolab_cache_file(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_configuration;
+CREATE TABLE kolab_cache_configuration (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  type VARCHAR(32) NOT NULL,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_configuration_type ON kolab_cache_configuration(folder_id,type);
+CREATE INDEX ix_configuration_uid2msguid ON kolab_cache_configuration(folder_id,uid,msguid);
+
+DROP TABLE kolab_cache_freebusy;
+CREATE TABLE kolab_cache_freebusy (
+  folder_id INTEGER NOT NULL,
+  msguid INTEGER NOT NULL,
+  uid VARCHAR(512) NOT NULL,
+  created DATETIME DEFAULT NULL,
+  changed DATETIME DEFAULT NULL,
+  data TEXT NOT NULL,
+  tags TEXT NOT NULL,
+  words TEXT NOT NULL,
+  dtstart DATETIME,
+  dtend DATETIME,
+  PRIMARY KEY(folder_id,msguid)
+);
+
+CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);

iRony-0.4.3.tar.gz/lib/plugins/libkolab/SQL/sqlite/2019092900.sql Added

iRony-0.4.2.tar.gz/lib/plugins/libkolab/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/composer.json Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/config.inc.php.dist -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/config.inc.php.dist Changed

@@ -35,7 +35,8 @@
 
 // When kolab_cache is enabled Roundcube's messages cache will be redundant
 // when working on kolab folders. Here we can:
-// 2 - bypass messages/indexes cache completely
+// 3 - bypass only indexes, but use messages cache
+// 2 - bypass both messages and indexes cache
 // 1 - bypass only messages, but use index cache
 $config['kolab_messages_cache_bypass'] = 0;
 
@@ -64,7 +65,21 @@
 // Use these attributes when searching users in LDAP
 $config['kolab_users_search_attrib'] = array('cn','mail','alias');
 
+// Which property of the LDAP user record to use as a display name.
+// Defaults to the 'kolab_auth_name' configuration option.
+$config['kolab_users_name_field'] = null;
+
+// Type of cache for uid-to-user map. Supported: 'db', 'apc', 'memcache' and 'memcached'.
+// Note: This stores only other user folder identifier to user attributes map.
+$config['kolab_users_cache'] = null;
+
+// lifetime of shared folder mapping cache
+// possible units: s, m, h, d, w
+$config['kolab_users_cache_ttl'] = '10d';
+
 // JSON-RPC endpoint configuration of the Bonnie web service providing historic data for groupware objects
+$config['kolab_bonnie_api'] = null;
+/*
 $config['kolab_bonnie_api'] = array(
     'uri'    => 'https://<kolab-hostname>:8080/api/rpc',
     'user'   => 'webclient',
@@ -73,3 +88,4 @@
     'debug'  => true,   // logs requests/responses to <log-dir>/bonnie
     'timeout' => 30,
 );
+*/

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_date_recurrence.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_date_recurrence.php Changed

@@ -32,6 +32,8 @@
     private /* DateTime */ $next;
     private /* cDateTime */ $cnext;
     private /* DateInterval */ $duration;
+    private /* bool */ $allday;
+
 
     /**
      * Default constructor
@@ -45,6 +47,7 @@
         $this->object = $object;
         $this->engine = $object->to_libcal();
         $this->start  = $this->next = $data['start'];
+        $this->allday = !empty($data['allday']);
         $this->cnext  = kolab_format::get_datetime($this->next);
 
         if (is_object($data['start']) && is_object($data['end'])) {
@@ -61,6 +64,7 @@
      * Get date/time of the next occurence of this event
      *
      * @param boolean Return a Unix timestamp instead of a DateTime object
+     *
      * @return mixed  DateTime object/unix timestamp or False if recurrence ended
      */
     public function next_start($timestamp = false)
@@ -69,9 +73,16 @@
 
         if ($this->engine && $this->next) {
             if (($cnext = new cDateTime($this->engine->getNextOccurence($this->cnext))) && $cnext->isValid()) {
-                $next = kolab_format::php_datetime($cnext);
+                $next = kolab_format::php_datetime($cnext, $this->start->getTimezone());
                 $time = $timestamp ? $next->format('U') : $next;
 
+                if ($this->allday) {
+                    // it looks that for allday events the occurrence time
+                    // is reset to 00:00:00, this is causing various issues
+                    $next->setTime($this->start->format('G'), $this->start->format('i'), $this->start->format('s'));
+                    $next->_dateonly = true;
+                }
+
                 $this->cnext = $cnext;
                 $this->next  = $next;
             }
@@ -91,11 +102,10 @@
             $next_end = clone $next_start;
             $next_end->add($this->duration);
 
-            $next          = $this->object->to_array();
-            $next['start'] = $next_start;
-            $next['end']   = $next_end;
-
+            $next                    = $this->object->to_array();
             $recurrence_id_format    = libkolab::recurrence_id_format($next);
+            $next['start']           = $next_start;
+            $next['end']             = $next_end;
             $next['recurrence_date'] = clone $next_start;
             $next['_instance']       = $next_start->format($recurrence_id_format);
 
@@ -203,10 +213,6 @@
         while ($next = $recurrence->next_start()) {
             $start = $next;
             if ($next->format('Y-m-d') >= $orig_date) {
-                if ($event['allday']) {
-                    $next->setTime($orig_start->format('G'), $orig_start->format('i'), $orig_start->format('s'));
-                }
-
                 $found = true;
                 break;
             }
@@ -223,7 +229,7 @@
             return null;
         }
 
-        if ($event['allday']) {
+        if ($this->allday) {
             $start->_dateonly = true;
         }

iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_ldap.php Added

@@ -0,0 +1,611 @@
+<?php
+
+/**
+ * Kolab Authentication and User Base
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2011-2019, 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/>.
+ */
+
+/**
+ * Wrapper class for rcube_ldap_generic
+ */
+class kolab_ldap extends rcube_ldap_generic
+{
+    private $conf     = array();
+    private $fieldmap = array();
+    private $rcache;
+
+
+    function __construct($p)
+    {
+        $rcmail = rcube::get_instance();
+
+        $this->conf = $p;
+        $this->conf['kolab_auth_user_displayname'] = $rcmail->config->get('kolab_auth_user_displayname', '{name}');
+
+        $this->fieldmap = $p['fieldmap'];
+        $this->fieldmap['uid'] = 'uid';
+
+        $p['attributes'] = array_values($this->fieldmap);
+        $p['debug']      = (bool) $rcmail->config->get('ldap_debug');
+
+        if ($cache_type = $rcmail->config->get('ldap_cache', 'db')) {
+            $cache_ttl   = $rcmail->config->get('ldap_cache_ttl', '10m');
+            $this->cache = $rcmail->get_cache('LDAP.kolab_cache', $cache_type, $cache_ttl);
+        }
+
+        // Connect to the server (with bind)
+        parent::__construct($p);
+        $this->_connect();
+
+        $rcmail->add_shutdown_function(array($this, 'close'));
+    }
+
+    /**
+    * Establish a connection to the LDAP server
+    */
+    private function _connect()
+    {
+        // try to connect + bind for every host configured
+        // with OpenLDAP 2.x ldap_connect() always succeeds but ldap_bind will fail if host isn't reachable
+        // see http://www.php.net/manual/en/function.ldap-connect.php
+        foreach ((array)$this->config['hosts'] as $host) {
+            // skip host if connection failed
+            if (!$this->connect($host)) {
+                continue;
+            }
+
+            $bind_pass      = $this->config['bind_pass'];
+            $bind_user      = $this->config['bind_user'];
+            $bind_dn        = $this->config['bind_dn'];
+            $base_dn        = $this->config['base_dn'];
+            $groups_base_dn = $this->config['groups']['base_dn'] ?: $base_dn;
+
+            // User specific access, generate the proper values to use.
+            if ($this->config['user_specific']) {
+                $rcube = rcube::get_instance();
+
+                // No password set, use the session password
+                if (empty($bind_pass)) {
+                    $bind_pass = $rcube->get_user_password();
+                }
+
+                // Get the pieces needed for variable replacement.
+                if ($fu = ($rcube->get_user_email() ?: $this->config['username'])) {
+                    list($u, $d) = explode('@', $fu);
+                }
+                else {
+                    $d = $this->config['mail_domain'];
+                }
+
+                $dc = 'dc=' . strtr($d, array('.' => ',dc=')); // hierarchal domain string
+
+                // resolve $dc through LDAP
+                if (!empty($this->config['domain_filter']) && !empty($this->config['search_bind_dn'])) {
+                    $this->bind($this->config['search_bind_dn'], $this->config['search_bind_pw']);
+                    $dc = $this->domain_root_dn($d);
+                }
+
+                $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
+
+                // Search for the dn to use to authenticate
+                if ($this->config['search_base_dn'] && $this->config['search_filter']
+                    && (strstr($bind_dn, '%dn') || strstr($base_dn, '%dn') || strstr($groups_base_dn, '%dn'))
+                ) {
+                    $search_attribs = array('uid');
+                    if ($search_bind_attrib = (array) $this->config['search_bind_attrib']) {
+                        foreach ($search_bind_attrib as $r => $attr) {
+                            $search_attribs[] = $attr;
+                            $replaces[$r] = '';
+                        }
+                    }
+
+                    $search_bind_dn = strtr($this->config['search_bind_dn'], $replaces);
+                    $search_base_dn = strtr($this->config['search_base_dn'], $replaces);
+                    $search_filter  = strtr($this->config['search_filter'], $replaces);
+
+                    $cache_key = 'DN.' . md5("$host:$search_bind_dn:$search_base_dn:$search_filter:" . $this->config['search_bind_pw']);
+
+                    if ($this->cache && ($dn = $this->cache->get($cache_key))) {
+                        $replaces['%dn'] = $dn;
+                    }
+                    else {
+                        $ldap = $this;
+                        if (!empty($search_bind_dn) && !empty($this->config['search_bind_pw'])) {
+                            // To protect from "Critical extension is unavailable" error
+                            // we need to use a separate LDAP connection
+                            if (!empty($this->config['vlv'])) {
+                                $ldap = new rcube_ldap_generic($this->config);
+                                $ldap->config_set(array('cache' => $this->cache, 'debug' => $this->debug));
+                                if (!$ldap->connect($host)) {
+                                    continue;
+                                }
+                            }
+
+                            if (!$ldap->bind($search_bind_dn, $this->config['search_bind_pw'])) {
+                                continue;  // bind failed, try next host
+                            }
+                        }
+
+                        $res = $ldap->search($search_base_dn, $search_filter, 'sub', $search_attribs);
+                        if ($res) {
+                            $res->rewind();
+                            $replaces['%dn'] = key($res->entries(true));
+
+                            // add more replacements from 'search_bind_attrib' config
+                            if ($search_bind_attrib) {
+                                $res = $res->current();
+                                foreach ($search_bind_attrib as $r => $attr) {
+                                    $replaces[$r] = $res[$attr][0];
+                                }
+                            }
+                        }
+
+                        if ($ldap != $this) {
+                            $ldap->close();
+                        }
+                    }
+
+                    // DN not found
+                    if (empty($replaces['%dn'])) {
+                        if (!empty($this->config['search_dn_default']))
+                            $replaces['%dn'] = $this->config['search_dn_default'];
+                        else {
+                            rcube::raise_error(array(
+                                'code' => 100, 'type' => 'ldap',
+                                'file' => __FILE__, 'line' => __LINE__,
+                                'message' => "DN not found using LDAP search."), true);
+                            continue;
+                        }
+                    }
+
+                    if ($this->cache && !empty($replaces['%dn'])) {
+                        $this->cache->set($cache_key, $replaces['%dn']);
+                    }
+                }
+
+                // Replace the bind_dn and base_dn variables.
+                $bind_dn        = strtr($bind_dn, $replaces);
+                $base_dn        = strtr($base_dn, $replaces);
+                $groups_base_dn = strtr($groups_base_dn, $replaces);
+
+                // replace placeholders in filter settings
+                if (!empty($this->config['filter'])) {
+                    $this->config['filter'] = strtr($this->config['filter'], $replaces);
+                }
+
+                foreach (array('base_dn', 'filter', 'member_filter') as $k) {
+                    if (!empty($this->config['groups'][$k])) {
+                        $this->config['groups'][$k] = strtr($this->config['groups'][$k], $replaces);
+                    }
+                }
+
+                if (empty($bind_user)) {
+                    $bind_user = $u;
+                }
+            }
+
+            if (empty($bind_pass)) {
+                $this->ready = true;
+            }
+            else {
+                if (!empty($this->config['auth_cid'])) {
+                    $this->ready = $this->sasl_bind($this->config['auth_cid'], $bind_pass, $bind_dn);
+                }
+                else if (!empty($bind_dn)) {
+                    $this->ready = $this->bind($bind_dn, $bind_pass);
+                }
+                else {
+                    $this->ready = $this->sasl_bind($bind_user, $bind_pass);
+                }
+            }
+
+            // connection established, we're done here
+            if ($this->ready) {
+                break;
+            }
+
+        }  // end foreach hosts
+
+        if (!is_resource($this->conn)) {
+            rcube::raise_error(array('code' => 100, 'type' => 'ldap',
+                'file' => __FILE__, 'line' => __LINE__,
+                'message' => "Could not connect to any LDAP server, last tried $host"), true);
+
+            $this->ready = false;
+        }
+
+        return $this->ready;
+    }
+
+    /**
+     * Fetches user data from LDAP addressbook
+     */
+    function get_user_record($user, $host)
+    {
+        $rcmail  = rcube::get_instance();
+        $filter  = $rcmail->config->get('kolab_auth_filter');
+        $filter  = $this->parse_vars($filter, $user, $host);
+        $base_dn = $this->parse_vars($this->config['base_dn'], $user, $host);
+        $scope   = $this->config['scope'];
+
+        // @TODO: print error if filter is empty
+
+        // get record
+        if ($result = parent::search($base_dn, $filter, $scope, $this->attributes)) {
+            if ($result->count() == 1) {
+                $entries = $result->entries(true);
+                $dn      = key($entries);
+                $entry   = array_pop($entries);
+                $entry   = $this->field_mapping($dn, $entry);
+
+                return $entry;
+            }
+        }
+    }
+
+    /**
+     * Fetches user data from LDAP addressbook
+     */
+    function get_user_groups($dn, $user, $host)
+    {
+        if (empty($dn) || empty($this->config['groups'])) {
+            return array();
+        }
+
+        $base_dn     = $this->parse_vars($this->config['groups']['base_dn'], $user, $host);
+        $name_attr   = $this->config['groups']['name_attr'] ? $this->config['groups']['name_attr'] : 'cn';
+        $member_attr = $this->get_group_member_attr();
+        $filter      = "(member=$dn)(uniqueMember=$dn)";
+
+        if ($member_attr != 'member' && $member_attr != 'uniqueMember')
+            $filter .= "($member_attr=$dn)";
+        $filter = strtr("(|$filter)", array("\\" => "\\\\"));
+
+        $result = parent::search($base_dn, $filter, 'sub', array('dn', $name_attr));
+
+        if (!$result) {
+            return array();
+        }
+
+        $groups = array();
+        foreach ($result as $entry) {
+            $dn    = $entry['dn'];
+            $entry = rcube_ldap_generic::normalize_entry($entry);
+
+            $groups[$dn] = $entry[$name_attr];
+        }
+
+        return $groups;
+    }
+
+    /**
+     * Get a specific LDAP record
+     *
+     * @param string DN
+     *
+     * @return array Record data
+     */
+    function get_record($dn)
+    {
+        if (!$this->ready) {
+            return;
+        }
+
+        if ($rec = $this->get_entry($dn, $this->attributes)) {
+            $rec = rcube_ldap_generic::normalize_entry($rec);
+            $rec = $this->field_mapping($dn, $rec);
+        }
+
+        return $rec;
+    }
+
+    /**
+     * Replace LDAP record data items
+     *
+     * @param string $dn    DN
+     * @param array  $entry LDAP entry
+     *
+     * return bool True on success, False on failure
+     */
+    function replace($dn, $entry)
+    {
+        // fields mapping
+        foreach ($this->fieldmap as $field => $attr) {
+            if (array_key_exists($field, $entry)) {
+                $entry[$attr] = $entry[$field];
+                if ($attr != $field) {
+                    unset($entry[$field]);
+                }
+            }
+        }
+
+        return $this->mod_replace($dn, $entry);
+    }
+
+    /**
+     * Search records (simplified version of rcube_ldap::search)
+     *
+     * @param mixed   $fields   The field name or array of field names to search in
+     * @param string  $value    Search value
+     * @param int     $mode     Matching mode:
+     *                          0 - partial (*abc*),
+     *                          1 - strict (=),
+     *                          2 - prefix (abc*)
+     * @param array   $required List of fields that cannot be empty
+     * @param int     $limit    Number of records
+     * @param int     $count    Returns the number of records found
+     *
+     * @return array List of LDAP records found
+     */
+    function dosearch($fields, $value, $mode=1, $required = array(), $limit = 0, &$count = 0)
+    {
+        if (empty($fields)) {
+            return array();
+        }
+
+        $mode  = intval($mode);
+
+        // try to resolve field names into ldap attributes
+        $fieldmap = $this->fieldmap;
+        $attrs = array_map(function($f) use ($fieldmap) {
+            return array_key_exists($f, $fieldmap) ? $fieldmap[$f] : $f;
+        }, (array)$fields);
+
+        // compose a full-text-search-like filter
+        if (count($attrs) > 1 || $mode != 1) {
+            $filter = self::fulltext_search_filter($value, $attrs, $mode);
+        }
+        // direct search
+        else {
+            $field  = $attrs[0];
+            $filter = "($field=" . self::quote_string($value) . ")";
+        }
+
+        // add required (non empty) fields filter
+        $req_filter = '';
+
+        foreach ((array)$required as $field) {
+            $attr = array_key_exists($field, $this->fieldmap) ? $this->fieldmap[$field] : $field;
+
+            // only add if required field is not already in search filter
+            if (!in_array($attr, $attrs)) {
+                $req_filter .= "($attr=*)";
+            }
+        }
+
+        if (!empty($req_filter)) {
+            $filter = '(&' . $req_filter . $filter . ')';
+        }
+
+        // avoid double-wildcard if $value is empty
+        $filter = preg_replace('/\*+/', '*', $filter);
+
+        // add general filter to query
+        if (!empty($this->config['filter'])) {
+            $filter = '(&(' . preg_replace('/^$|$$/', '', $this->config['filter']) . ')' . $filter . ')';
+        }
+
+        $base_dn = $this->parse_vars($this->config['base_dn']);
+        $scope   = $this->config['scope'];
+        $attrs   = array_values($this->fieldmap);
+        $list    = array();
+
+        if ($result = $this->search($base_dn, $filter, $scope, $attrs)) {
+            $count = $result->count();
+            $i = 0;
+            foreach ($result as $entry) {
+                if ($limit && $limit <= $i) {
+                    break;
+                }
+
+                $dn        = $entry['dn'];
+                $entry     = rcube_ldap_generic::normalize_entry($entry);
+                $list[$dn] = $this->field_mapping($dn, $entry);
+                $i++;
+            }
+        }
+
+        return $list;
+    }
+
+    /**
+     * Set filter used in search()
+     */
+    function set_filter($filter)
+    {
+        $this->config['filter'] = $filter;
+    }
+
+    /**
+     * Maps LDAP attributes to defined fields
+     */
+    protected function field_mapping($dn, $entry)
+    {
+        $entry['dn'] = $dn;
+
+        // fields mapping
+        foreach ($this->fieldmap as $field => $attr) {
+            // $entry might be indexed by lower-case attribute names
+            $attr_lc = strtolower($attr);
+            if (isset($entry[$attr_lc])) {
+                $entry[$field] = $entry[$attr_lc];
+            }
+            else if (isset($entry[$attr])) {
+                $entry[$field] = $entry[$attr];
+            }
+        }
+
+        // compose display name according to config
+        if (empty($this->fieldmap['displayname'])) {
+            $entry['displayname'] = rcube_addressbook::compose_search_name(
+                $entry,
+                $entry['email'],
+                $entry['name'],
+                $this->conf['kolab_auth_user_displayname']
+            );
+        }
+
+        return $entry;
+    }
+
+    /**
+     * Detects group member attribute name
+     */
+    private function get_group_member_attr($object_classes = array())
+    {
+        if (empty($object_classes)) {
+            $object_classes = $this->config['groups']['object_classes'];
+        }
+        if (!empty($object_classes)) {
+            foreach ((array)$object_classes as $oc) {
+                switch (strtolower($oc)) {
+                    case 'group':
+                    case 'groupofnames':
+                    case 'kolabgroupofnames':
+                        $member_attr = 'member';
+                        break;
+
+                    case 'groupofuniquenames':
+                    case 'kolabgroupofuniquenames':
+                        $member_attr = 'uniqueMember';
+                        break;
+                }
+            }
+        }
+
+        if (!empty($member_attr)) {
+            return $member_attr;
+        }
+
+        if (!empty($this->config['groups']['member_attr'])) {
+            return $this->config['groups']['member_attr'];
+        }
+
+        return 'member';
+    }
+
+    /**
+     * Prepares filter query for LDAP search
+     */
+    function parse_vars($str, $user = null, $host = null)
+    {
+        // When authenticating user $user is always set
+        // if not set it means we use this LDAP object for other
+        // purposes, e.g. kolab_delegation, then username with
+        // correct domain is in a session
+        if (!$user) {
+            $user = $_SESSION['username'];
+        }
+
+        if (isset($this->icache[$user])) {
+            list($user, $dc) = $this->icache[$user];
+        }
+        else {
+            $orig_user = $user;
+            $rcmail = rcube::get_instance();
+
+            // get default domain
+            if ($username_domain = $rcmail->config->get('username_domain')) {
+                if ($host && is_array($username_domain) && isset($username_domain[$host])) {
+                    $domain = rcube_utils::parse_host($username_domain[$host], $host);
+                }
+                else if (is_string($username_domain)) {
+                    $domain = rcube_utils::parse_host($username_domain, $host);
+                }
+            }
+
+            // realmed username (with domain)
+            if (strpos($user, '@')) {
+                list($usr, $dom) = explode('@', $user);
+
+                // unrealm domain, user login can contain a domain alias
+                if ($dom != $domain && ($dc = $this->domain_root_dn($dom))) {
+                    // @FIXME: we should replace domain in $user, I suppose
+                }
+            }
+            else if ($domain) {
+                $user .= '@' . $domain;
+            }
+
+            $this->icache[$orig_user] = array($user, $dc);
+        }
+
+        // replace variables in filter
+        list($u, $d) = explode('@', $user);
+
+        // hierarchal domain string
+        if (empty($dc)) {
+            $dc = 'dc=' . strtr($d, array('.' => ',dc='));
+        }
+
+        $replaces = array('%dc' => $dc, '%d' => $d, '%fu' => $user, '%u' => $u);
+
+        $this->parse_replaces = $replaces;
+
+        return strtr($str, $replaces);
+    }
+
+    /**
+     * Returns variables used for replacement in (last) parse_vars() call
+     *
+     * @return array Variable-value hash array
+     */
+    public function get_parse_vars()
+    {
+        return $this->parse_replaces;
+    }
+
+    /**
+     * Register additional fields
+     */
+    public function extend_fieldmap($map)
+    {
+        foreach ((array)$map as $name => $attr) {
+            if (!in_array($attr, $this->attributes)) {
+                $this->attributes[]    = $attr;
+                $this->fieldmap[$name] = $attr;
+            }
+        }
+    }
+
+    /**
+     * HTML-safe DN string encoding
+     *
+     * @param string $str DN string
+     *
+     * @return string Encoded HTML identifier string
+     */
+    static function dn_encode($str)
+    {
+        return rtrim(strtr(base64_encode($str), '+/', '-_'), '=');
+    }
+
+    /**
+     * Decodes DN string encoded with _dn_encode()
+     *
+     * @param string $str Encoded HTML identifier string
+     *
+     * @return string DN string
+     */
+    static function dn_decode($str)
+    {
+        $str = str_pad(strtr($str, '-_', '+/'), strlen($str) % 4, '=', STR_PAD_RIGHT);
+        return base64_decode($str);
+    }
+}

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php Changed

@@ -46,11 +46,13 @@
     private static $ready = false;
     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;
     private static $imap;
-    private static $ldap;
+
 
     // Default folder names
     private static $default_folders = array(
@@ -94,7 +96,7 @@
                 'message' => "required kolabformat module not found"
             ), true);
         }
-        else {
+        else if (self::$imap->get_error_code()) {
             rcube::raise_error(array(
                 'code' => 900, 'type' => 'php', 'message' => "IMAP error"
             ), true);
@@ -114,16 +116,23 @@
 
     /**
      * Initializes LDAP object to resolve Kolab users
+     *
+     * @param string $name Name of the configuration option with LDAP config
      */
-    public static function ldap()
+    public static function ldap($name = 'kolab_users_directory')
     {
-        if (self::$ldap) {
-            return self::$ldap;
-        }
-
         self::setup();
 
-        $config = self::$config->get('kolab_users_directory', self::$config->get('kolab_auth_addressbook'));
+        $config = self::$config->get($name);
+
+        if (empty($config)) {
+            $name   = 'kolab_auth_addressbook';
+            $config = self::$config->get($name);
+        }
+
+        if (self::$ldap[$name]) {
+            return self::$ldap[$name];
+        }
 
         if (!is_array($config)) {
             $ldap_config = (array)self::$config->get('ldap_public');
@@ -134,17 +143,27 @@
             return null;
         }
 
+        $ldap = new kolab_ldap($config);
+
         // overwrite filter option
         if ($filter = self::$config->get('kolab_users_filter')) {
             self::$config->set('kolab_auth_filter', $filter);
         }
 
-        // re-use the LDAP wrapper class from kolab_auth plugin
-        require_once rtrim(RCUBE_PLUGINS_DIR, '/') . '/kolab_auth/kolab_auth_ldap.php';
+        $user_field = $user_attrib = self::$config->get('kolab_users_id_attrib');
+
+        // Fallback to kolab_auth_login, which is not attribute, but field name
+        if (!$user_field && ($user_field = self::$config->get('kolab_auth_login', 'email'))) {
+            $user_attrib = $config['fieldmap'][$user_field];
+        }
+
+        if ($user_field && $user_attrib) {
+            $ldap->extend_fieldmap(array($user_field => $user_attrib));
+        }
 
-        self::$ldap = new kolab_auth_ldap($config);
+        self::$ldap[$name] = $ldap;
 
-        return self::$ldap;
+        return $ldap;
     }
 
     /**
@@ -354,7 +373,6 @@
         return '';
     }
 
-
     /**
      * Deletes IMAP folder
      *
@@ -421,7 +439,6 @@
         return false;
     }
 
-
     /**
      * Renames IMAP folder
      *
@@ -457,20 +474,22 @@
         return $success;
     }
 
-
     /**
      * Rename or Create a new IMAP folder.
      *
      * Does additional checks for permissions and folder name restrictions
      *
-     * @param array Hash array with folder properties and metadata
+     * @param array &$prop Hash array with folder properties and metadata
      *  - name:       Folder name
      *  - oldname:    Old folder name when changed
      *  - parent:     Parent folder to create the new one in
      *  - type:       Folder type to create
      *  - subscribed: Subscribed flag (IMAP subscription)
      *  - active:     Activation flag (client-side subscription)
-     * @return mixed New folder name or False on failure
+     *
+     * @return string|false New folder name or False on failure
+     *
+     * @see self::set_folder_props() for list of other properties
      */
     public static function folder_update(&$prop)
     {
@@ -549,7 +568,6 @@
         return $result ? $folder : false;
     }
 
-
     /**
      * Getter for human-readable name of Kolab object (folder)
      * with kolab_custom_display_names support.
@@ -634,20 +652,20 @@
         if (!$found && !empty($namespace['other'])) {
             foreach ($namespace['other'] as $ns) {
                 if (strlen($ns[0]) && strpos($folder, $ns[0]) === 0) {
-                    // remove namespace prefix
+                    // remove namespace prefix and extract username
                     $folder = substr($folder, strlen($ns[0]));
                     $delim  = $ns[1];
-                    // get username
-                    $pos    = strpos($folder, $delim);
-                    if ($pos) {
-                        $prefix = '('.substr($folder, 0, $pos).')';
-                        $folder = substr($folder, $pos+1);
-                    }
-                    else {
-                        $prefix = '('.$folder.')';
-                        $folder = '';
+
+                    // get username part and map it to user name
+                    $pos = strpos($folder, $delim);
+                    $fid = $pos ? substr($folder, 0, $pos) : $folder;
+
+                    if ($user = self::folder_id2user($fid, true)) {
+                        $fid = str_replace($delim, '', $user);
                     }
 
+                    $prefix = "($fid)";
+                    $folder = $pos ? substr($folder, $pos + 1) : '';
                     $found  = true;
                     $folder_ns = 'other';
                     break;
@@ -726,7 +744,6 @@
         return $name;
     }
 
-
     /**
      * Creates a SELECT field with folders list
      *
@@ -809,7 +826,6 @@
         return $select;
     }
 
-
     /**
      * Returns a list of folder names
      *
@@ -973,7 +989,6 @@
         return $folders;
     }
 
-
     /**
      * Sort the given list of kolab folders by namespace/name
      *
@@ -1003,7 +1018,6 @@
         return $out;
     }
 
-
     /**
      * Check the folder tree and add the missing parents as virtual folders
      *
@@ -1079,7 +1093,6 @@
         return $_folders;
     }
 
-
     /**
      * Returns folder types indexed by folder name
      *
@@ -1146,7 +1159,6 @@
         return self::$typedata[$prefix];
     }
 
-
     /**
      * Callback for array_map to select the correct annotation value
      */
@@ -1162,7 +1174,6 @@
         return null;
     }
 
-
     /**
      * Returns type of IMAP folder
      *
@@ -1194,7 +1205,6 @@
         return 'mail';
     }
 
-
     /**
      * Sets folder content-type.
      *
@@ -1217,7 +1227,6 @@
         return $success;
     }
 
-
     /**
      * Check subscription status of this folder
      *
@@ -1239,7 +1248,6 @@
             ($temp && in_array($folder, (array)$_SESSION['kolab_subscribed_folders']));
     }
 
-
     /**
      * Change subscription status of this folder
      *
@@ -1270,7 +1278,6 @@
         return false;
     }
 
-
     /**
      * Change subscription status of this folder
      *
@@ -1298,7 +1305,6 @@
         return false;
     }
 
-
     /**
      * Check activation status of this folder
      *
@@ -1313,7 +1319,6 @@
         return in_array($folder, $active_folders);
     }
 
-
     /**
      * Change activation status of this folder
      *
@@ -1328,7 +1333,6 @@
         return self::set_state($folder, true);
     }
 
-
     /**
      * Change activation status of this folder
      *
@@ -1344,7 +1348,6 @@
         return self::set_state($folder, false);
     }
 
-
     /**
      * Return list of active folders
      */
@@ -1376,7 +1379,6 @@
         return self::$states;
     }
 
-
     /**
      * Update list of active folders
      */
@@ -1473,7 +1475,7 @@
      * Sets folder metadata properties
      *
      * @param string $folder Folder name
-     * @param array  $prop   Folder properties
+     * @param array  &$prop  Folder properties (color, displayname)
      */
     public static function set_folder_props($folder, &$prop)
     {
@@ -1501,8 +1503,8 @@
         }
     }
 
-
     /**
+     * Search users in Kolab LDAP storage
      *
      * @param mixed   $query    Search value (or array of field => value pairs)
      * @param int     $mode     Matching mode: 0 - partial (*abc*), 1 - strict (=), 2 - prefix (abc*)
@@ -1510,19 +1512,23 @@
      * @param int     $limit    Maximum number of records
      * @param int     $count    Returns the number of records found
      *
-     * @return array List or false on error
+     * @return array List of users
      */
     public static function search_users($query, $mode = 1, $required = array(), $limit = 0, &$count = 0)
     {
         $query = str_replace('*', '', $query);
 
         // requires a working LDAP setup
-        if (!self::ldap() || strlen($query) == 0) {
+        if (!strlen($query) || !($ldap = self::ldap())) {
             return array();
         }
 
+        $root          = self::namespace_root('other');
+        $user_attrib   = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
+        $search_attrib = self::$config->get('kolab_users_search_attrib', array('cn','mail','alias'));
+
         // search users using the configured attributes
-        $results = self::$ldap->dosearch(self::$config->get('kolab_users_search_attrib', array('cn','mail','alias')), $query, $mode, $required, $limit, $count);
+        $results = $ldap->dosearch($search_attrib, $query, $mode, $required, $limit, $count);
 
         // exclude myself
         if ($_SESSION['kolab_dn']) {
@@ -1530,9 +1536,6 @@
         }
 
         // resolve to IMAP folder name
-        $root = self::namespace_root('other');
-        $user_attrib = self::$config->get('kolab_users_id_attrib', self::$config->get('kolab_auth_login', 'mail'));
-
         array_walk($results, function(&$user, $dn) use ($root, $user_attrib) {
             list($localpart, ) = explode('@', $user[$user_attrib]);
             $user['kolabtargetfolder'] = $root . $localpart;
@@ -1541,7 +1544,6 @@
         return $results;
     }
 
-
     /**
      * Returns a list of IMAP folders shared by the given user
      *
@@ -1581,7 +1583,6 @@
         return $folders;
     }
 
-
     /**
      * Get a list of (virtual) top-level folders from the other users namespace
      *
@@ -1632,7 +1633,6 @@
         return $folders;
     }
 
-
     /**
      * Handler for user_delete plugin hooks
      *
@@ -1670,4 +1670,141 @@
             return $metadata[$folder];
         }
     }
+
+    /**
+     * Get user attributes for specified other user (imap) folder identifier.
+     *
+     * @param string $folder_id Folder name w/o path (imap user identifier)
+     * @param bool   $as_string Return configured display name attribute value
+     *
+     * @return array User attributes
+     * @see self::ldap()
+     */
+    public static function folder_id2user($folder_id, $as_string = false)
+    {
+        static $domain, $cache, $name_attr;
+
+        $rcube = rcube::get_instance();
+
+        if ($domain === null) {
+            list(, $domain) = explode('@', $rcube->get_user_name());
+        }
+
+        if ($name_attr === null) {
+            $name_attr = (array) ($rcube->config->get('kolab_users_name_field', $rcube->config->get('kolab_auth_name')) ?: 'name');
+        }
+
+        $token = $folder_id;
+        if ($domain && strpos($find, '@') === false) {
+            $token .= '@' . $domain;
+        }
+
+        if ($cache === null) {
+            $cache = $rcube->get_cache_shared('kolab_users') ?: false;
+        }
+
+        // use value cached in memory for repeated lookups
+        if (!$cache && array_key_exists($token, self::$ldapcache)) {
+            $user = self::$ldapcache[$token];
+        }
+
+        if (empty($user) && $cache) {
+            $user = $cache->get($token);
+        }
+
+        if (empty($user) && ($ldap = self::ldap())) {
+            $user = $ldap->get_user_record($token, $_SESSION['imap_host']);
+
+            if (!empty($user)) {
+                $keys = array('displayname', 'name', 'mail'); // supported keys
+                $user = array_intersect_key($user, array_flip($keys));
+
+                if (!empty($user)) {
+                    if ($cache) {
+                        $cache->set($token, $user);
+                    }
+                    else {
+                        self::$ldapcache[$token] = $user;
+                    }
+                }
+            }
+        }
+
+        if (!empty($user)) {
+            if ($as_string) {
+                foreach ($name_attr as $attr) {
+                    if ($display = $user[$attr]) {
+                        break;
+                    }
+                }
+
+                if (!$display) {
+                    $display = $user['displayname'] ?: $user['name'];
+                }
+
+                if ($display && $display != $folder_id) {
+                    $display = "$display ($folder_id)";
+                }
+
+                return $display;
+            }
+
+            return $user;
+        }
+    }
+
+    /**
+     * Chwala's 'folder_mod' hook handler for mapping other users folder names
+     */
+    public static function folder_mod($args)
+    {
+        static $roots;
+
+        if ($roots === null) {
+            self::setup();
+            $roots = self::$imap->get_namespace('other');
+        }
+
+        // Note: We're working with UTF7-IMAP encoding here
+
+        if ($args['dir'] == 'in') {
+            foreach ((array) $roots as $root) {
+                if (strpos($args['folder'], $root[0]) === 0) {
+                    // remove root and explode folder
+                    $delim  = $root[1];
+                    $folder = explode($delim, substr($args['folder'], strlen($root[0])));
+                    // compare first (user) part with a regexp, it's supposed
+                    // to look like this: "Doe, Jane (uid)", so we can extract the uid
+                    // and replace the folder with it
+                    if (preg_match('~^[^/]+ $([^)]+)$$~', $folder[0], $m)) {
+                        $folder[0] = $m[1];
+                        $args['folder'] = $root[0] . implode($delim, $folder);
+                    }
+
+                    break;
+                }
+            }
+        }
+        else { // dir == 'out'
+            foreach ((array) $roots as $root) {
+                if (strpos($args['folder'], $root[0]) === 0) {
+                    // remove root and explode folder
+                    $delim  = $root[1];
+                    $folder = explode($delim, substr($args['folder'], strlen($root[0])));
+
+                    // Replace uid with "Doe, Jane (uid)"
+                    if ($user = self::folder_id2user($folder[0], true)) {
+                        $user      = str_replace($delim, '', $user);
+                        $folder[0] = rcube_charset::convert($user, RCUBE_CHARSET, 'UTF7-IMAP');
+
+                        $args['folder'] = $root[0] . implode($delim, $folder);
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        return $args;
+    }
 }

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache.php Changed

@@ -46,8 +46,8 @@
     protected $folders_table;
     protected $max_sql_packet;
     protected $max_sync_lock_time = 600;
-    protected $binary_items = array();
     protected $extra_cols = array();
+    protected $data_props = array();
     protected $order_by = null;
     protected $limit = null;
     protected $error = 0;
@@ -201,7 +201,7 @@
                   $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()
-                ) {
+            ) {
                 // lock synchronization for this folder or wait if locked
                 $this->_sync_lock();
 
@@ -242,7 +242,9 @@
                     // fetch new objects from imap
                     $i = 0;
                     foreach (array_diff($imap_index, $old_index) as $msguid) {
-                        if ($object = $this->folder->read_object($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
@@ -447,7 +449,7 @@
             $sql_data['uid']       = $object['uid'];
 
             $args = array();
-            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'xml', 'tags', 'words');
+            $cols = array('folder_id', 'msguid', 'uid', 'changed', 'data', 'tags', 'words');
             $cols = array_merge($cols, $this->extra_cols);
 
             foreach ($cols as $idx => $col) {
@@ -585,9 +587,12 @@
      * @param array Pseudo-SQL query as list of filter parameter triplets
      *   triplet: array('<colname>', '<comparator>', '<value>')
      * @param boolean Set true to only return UIDs instead of complete objects
+     * @param boolean Use fast mode to fetch only minimal set of information
+     *                (no xml fetching and parsing, etc.)
+     *
      * @return array List of Kolab data objects (each represented as hash array) or UIDs
      */
-    public function select($query = array(), $uids = false)
+    public function select($query = array(), $uids = false, $fast = false)
     {
         $result = $uids ? array() : new kolab_storage_dataset($this);
 
@@ -621,6 +626,9 @@
             }
 
             while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+                if ($fast) {
+                    $sql_arr['fast-mode'] = true;
+                }
                 if ($uids) {
                     $this->uid2msg[$sql_arr['uid']] = $sql_arr['_msguid'];
                     $result[] = $sql_arr['uid'];
@@ -679,7 +687,6 @@
         return $result;
     }
 
-
     /**
      * Get number of objects mathing the given query
      *
@@ -851,43 +858,36 @@
      */
     protected function _serialize($object)
     {
-        $sql_data = array('changed' => null, 'xml' => '', 'tags' => '', 'words' => '');
+        $data     = array();
+        $sql_data = array('changed' => null, 'tags' => '', 'words' => '');
 
         if ($object['changed']) {
             $sql_data['changed'] = date(self::DB_DATE_FORMAT, is_object($object['changed']) ? $object['changed']->format('U') : $object['changed']);
         }
 
         if ($object['_formatobj']) {
-            $sql_data['xml']   = preg_replace('!(</?[a-z0-9:-]+>)[\n\r\t\s]+!ms', '$1', (string)$object['_formatobj']->write(3.0));
+            $xml = (string) $object['_formatobj']->write(3.0);
+
+            $data['_size']     = strlen($xml);
             $sql_data['tags']  = ' ' . join(' ', $object['_formatobj']->get_tags()) . ' ';  // pad with spaces for strict/prefix search
             $sql_data['words'] = ' ' . join(' ', $object['_formatobj']->get_words()) . ' ';
         }
 
-        // extract object data
-        $data = array();
-        foreach ($object as $key => $val) {
-            // skip empty properties
-            if ($val === "" || $val === null) {
-                continue;
-            }
-            // mark binary data to be extracted from xml on unserialize()
-            if (isset($this->binary_items[$key])) {
-                $data[$key] = true;
-            }
-            else if ($key[0] != '_') {
-                $data[$key] = $val;
-            }
-            else if ($key == '_attachments') {
-                foreach ($val as $k => $att) {
-                    unset($att['content'], $att['path']);
-                    if ($att['id'])
-                        $data[$key][$k] = $att;
+        // Store only minimal set of object properties
+        foreach ($this->data_props as $prop) {
+            if (isset($object[$prop])) {
+                $data[$prop] = $object[$prop];
+                if ($data[$prop] instanceof DateTime) {
+                    $data[$prop] = array(
+                        'cl' => 'DateTime',
+                        'dt' => $data[$prop]->format('Y-m-d H:i:s'),
+                        'tz' => $data[$prop]->getTimezone()->getName(),
+                    );
                 }
             }
         }
 
-        // use base64 encoding (Bug #1912, #2662)
-        $sql_data['data'] = base64_encode(serialize($data));
+        $sql_data['data'] = json_encode(rcube_charset::clean($data));
 
         return $sql_data;
     }
@@ -897,44 +897,38 @@
      */
     protected function _unserialize($sql_arr)
     {
-        // check if data is a base64-encoded string, for backward compat.
-        if (strpos(substr($sql_arr['data'], 0, 64), ':') === false) {
-            $sql_arr['data'] = base64_decode($sql_arr['data']);
-        }
-
-        $object = unserialize($sql_arr['data']);
-
-        // de-serialization failed
-        if ($object === false) {
-            rcube::raise_error(array(
-                'code' => 900, 'type' => 'php',
-                'message' => "Malformed data for {$this->resource_uri}/{$sql_arr['msguid']} object."
-            ), true);
-
-            return null;
-        }
+        if ($sql_arr['fast-mode'] && !empty($sql_arr['data']) && ($object = json_decode($sql_arr['data'], true))) {
+            $object['uid'] = $sql_arr['uid'];
 
-        // decode binary properties
-        foreach ($this->binary_items as $key => $regexp) {
-            if (!empty($object[$key]) && preg_match($regexp, $sql_arr['xml'], $m)) {
-                $object[$key] = base64_decode($m[1]);
+            foreach ($this->data_props as $prop) {
+                if (isset($object[$prop]) && is_array($object[$prop]) && $object[$prop]['cl'] == 'DateTime') {
+                    $object[$prop] = new DateTime($object[$prop]['dt'], new DateTimeZone($object[$prop]['tz']));
+                }
+                else if (!isset($object[$prop]) && isset($sql_arr[$prop])) {
+                    $object[$prop] = $sql_arr[$prop];
+                }
             }
-        }
 
-        $object_type = $sql_arr['type'] ?: $this->folder->type;
-        $format_type = $this->folder->type == 'configuration' ? 'configuration' : $object_type;
+            if ($sql_arr['created'] && empty($object['created'])) {
+                $object['created'] = new DateTime($sql_arr['created']);
+            }
 
-        // add meta data
-        $object['_type']      = $object_type;
-        $object['_msguid']    = $sql_arr['msguid'];
-        $object['_mailbox']   = $this->folder->name;
-        $object['_size']      = strlen($sql_arr['xml']);
-        $object['_formatobj'] = kolab_format::factory($format_type, 3.0, $sql_arr['xml']);
+            if ($sql_arr['changed'] && empty($object['changed'])) {
+                $object['changed'] = new DateTime($sql_arr['changed']);
+            }
 
-        // Fix old broken objects with missing creation date
-        if (empty($object['created']) && method_exists($object['_formatobj'], 'to_array')) {
-            $new_object        = $object['_formatobj']->to_array();
-            $object['created'] = $new_object['created'];
+            $object['_type']     = $sql_arr['type'] ?: $this->folder->type;
+            $object['_msguid']   = $sql_arr['msguid'];
+            $object['_mailbox']  = $this->folder->name;
+        }
+        // Fetch object xml
+        else {
+            // FIXME: Because old cache solution allowed storing objects that
+            // do not match folder type we may end up with invalid objects.
+            // 2nd argument of read_object() here makes sure they are still
+            // usable. However, not allowing them here might be also an intended
+            // solution in future.
+            $object = $this->folder->read_object($sql_arr['msguid'], '*');
         }
 
         return $object;
@@ -951,36 +945,38 @@
         static $buffer = '';
 
         $line = '';
+        $cols = array('folder_id', 'msguid', 'uid', 'created', 'changed', 'data', 'tags', 'words');
+        if ($this->extra_cols) {
+            $cols = array_merge($cols, $this->extra_cols);
+        }
+
         if ($object) {
             $sql_data = $this->_serialize($object);
 
-            // Skip multifolder insert for Oracle, we can't put long data inline
-            if ($this->db->db_provider == 'oracle') {
-                $extra_cols = '';
-                if ($this->extra_cols) {
-                    $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
-                    $extra_cols = ', ' . join(', ', $extra_cols);
-                    $extra_args = str_repeat(', ?', count($this->extra_cols));
-                }
-
+            // Skip multi-folder insert for all databases but MySQL
+            // In Oracle we can't put long data inline, others we don't support yet
+            if (strpos($this->db->db_provider, 'mysql') !== 0) {
+                $extra_args = array();
                 $params = array($this->folder_id, $msguid, $object['uid'], $sql_data['changed'],
-                    $sql_data['data'], $sql_data['xml'], $sql_data['tags'], $sql_data['words']);
+                    $sql_data['data'], $sql_data['tags'], $sql_data['words']);
 
                 foreach ($this->extra_cols as $col) {
                     $params[] = $sql_data[$col];
+                    $extra_args[] = '?';
                 }
 
+                $cols = implode(', ', array_map(function($n) { return "`{$n}`"; }, $cols));
+                $extra_args = count($extra_args) ? ', ' . implode(', ', $extra_args) : '';
+
                 $result = $this->db->query(
-                    "INSERT INTO `{$this->cache_table}` "
-                    . " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)"
-                    . " VALUES (?, ?, ?, " . $this->db->now() . ", ?, ?, ?, ?, ? $extra_args)",
+                    "INSERT INTO `{$this->cache_table}` ($cols)"
+                    . " VALUES (?, ?, ?, " . $this->db->now() . ", ?, ?, ?, ?$extra_args)",
                     $params
                 );
 
                 if (!$this->db->affected_rows($result)) {
                     rcube::raise_error(array(
-                        'code' => 900, 'type' => 'php',
-                        'message' => "Failed to write to kolab cache"
+                        'code' => 900, 'message' => "Failed to write to kolab cache"
                     ), true);
                 }
 
@@ -994,7 +990,6 @@
                 $this->db->now(),
                 $this->db->quote($sql_data['changed']),
                 $this->db->quote($sql_data['data']),
-                $this->db->quote($sql_data['xml']),
                 $this->db->quote($sql_data['tags']),
                 $this->db->quote($sql_data['words']),
             );
@@ -1005,22 +1000,17 @@
         }
 
         if ($buffer && (!$msguid || (strlen($buffer) + strlen($line) > $this->max_sql_packet()))) {
-            $extra_cols = '';
-            if ($this->extra_cols) {
-                $extra_cols = array_map(function($n) { return "`{$n}`"; }, $this->extra_cols);
-                $extra_cols = ', ' . join(', ', $extra_cols);
-            }
+            $columns = implode(', ', array_map(function($n) { return "`{$n}`"; }, $cols));
+            $update  = implode(', ', array_map(function($i) { return "`{$i}` = VALUES(`{$i}`)"; }, array_slice($cols, 2)));
 
             $result = $this->db->query(
-                "INSERT INTO `{$this->cache_table}` ".
-                " (`folder_id`, `msguid`, `uid`, `created`, `changed`, `data`, `xml`, `tags`, `words` $extra_cols)".
-                " VALUES $buffer"
+                "INSERT INTO `{$this->cache_table}` ($columns) VALUES $buffer"
+                . " ON DUPLICATE KEY UPDATE $update"
             );
 
             if (!$this->db->affected_rows($result)) {
                 rcube::raise_error(array(
-                    'code' => 900, 'type' => 'php',
-                    'message' => "Failed to write to kolab cache"
+                    'code' => 900, 'message' => "Failed to write to kolab cache"
                 ), true);
             }
 
@@ -1190,7 +1180,7 @@
     }
 
     /**
-     * Set Roundcube storage options and bypass messages cache.
+     * Set Roundcube storage options and bypass messages/indexes cache.
      *
      * We use skip_deleted and threading settings specific to Kolab,
      * we have to change these global settings only temporarily.
@@ -1245,17 +1235,18 @@
 
             switch ($cache_bypass) {
                 case 2:
-                    // Disable messages cache completely
+                    // Disable messages and index cache completely
                     $this->imap->set_messages_caching(!$force);
                     break;
 
+                case 3:
                 case 1:
-                    // We'll disable messages cache, but keep index cache.
+                    // We'll disable messages cache, but keep index cache (1) or vice-versa (3)
                     // Default mode is both (MODE_INDEX | MODE_MESSAGE)
-                    $mode = rcube_imap_cache::MODE_INDEX;
+                    $mode = $cache_bypass == 3 ? rcube_imap_cache::MODE_MESSAGE : rcube_imap_cache::MODE_INDEX;
 
                     if (!$force) {
-                        $mode |= rcube_imap_cache::MODE_MESSAGE;
+                        $mode |= $cache_bypass == 3 ? rcube_imap_cache::MODE_INDEX : rcube_imap_cache::MODE_MESSAGE;
                     }
 
                     $this->imap->set_messages_caching(true, $mode);

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_configuration.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_configuration.php Changed

@@ -32,6 +32,8 @@
      */
     protected function _serialize($object)
     {
+        $this->set_data_props($object['type']);
+
         $sql_data = parent::_serialize($object);
         $sql_data['type'] = $object['type'];
 
@@ -39,13 +41,28 @@
     }
 
     /**
+     * Helper method to convert database record to the given Kolab object
+     *
+     * @override
+     */
+    protected function _unserialize($sql_arr)
+    {
+        $this->set_data_props($sql_arr['type']);
+
+        return parent::_unserialize($sql_arr);
+    }
+
+    /**
      * Select Kolab objects filtered by the given query
      *
-     * @param array Pseudo-SQL query as list of filter parameter triplets
+     * @param array   Pseudo-SQL query as list of filter parameter triplets
      * @param boolean Set true to only return UIDs instead of complete objects
+     * @param boolean Use fast mode to fetch only minimal set of information
+     *                (no xml fetching and parsing, etc.)
+     *
      * @return array List of Kolab data objects (each represented as hash array) or UIDs
      */
-    public function select($query = array(), $uids = false)
+    public function select($query = array(), $uids = false, $fast = false)
     {
         // modify query for IMAP search: query param 'type' is actually a subtype
         if (!$this->ready) {
@@ -57,7 +74,7 @@
             }
         }
 
-        return parent::select($query, $uids);
+        return parent::select($query, $uids, $fast);
     }
 
     /**
@@ -85,4 +102,35 @@
 
         return parent::_sql_where($query);
     }
+
+    /**
+     * Set $data_props property depending on object type
+     */
+    protected function set_data_props($type)
+    {
+        switch ($type) {
+        case 'dictionary':
+            $this->data_props = array('language', 'e');
+            break;
+
+        case 'file_driver':
+            $this->data_props = array('driver', 'title', 'enabled', 'host', 'port', 'username', 'password');
+            break;
+
+        case 'relation':
+            // Note: Because relations are heavily used, for performance reasons
+            // we store all properties for them
+            $this->data_props = array('name', 'category', 'color', 'parent', 'iconName', 'priority', 'members');
+            break;
+
+        case 'snippet':
+            $this->data_props = array('name');
+            break;
+
+        case 'category':
+        default:
+            // TODO: implement this
+            $this->data_props = array();
+        }
+    }
 }

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_contact.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_contact.php Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_event.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_event.php Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_file.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_file.php Changed

@@ -24,6 +24,7 @@
 class kolab_storage_cache_file extends kolab_storage_cache
 {
     protected $extra_cols = array('filename');
+    protected $data_props = array('type', 'size', 'filename', 'fileid');
 
     /**
      * Helper method to convert the given Kolab object into a dataset to be written to cache
@@ -32,13 +33,42 @@
      */
     protected function _serialize($object)
     {
-        $sql_data = parent::_serialize($object);
-
         if (!empty($object['_attachments'])) {
             reset($object['_attachments']);
-            $sql_data['filename'] = $object['_attachments'][key($object['_attachments'])]['name'];
+
+            $file = $object['_attachments'][key($object['_attachments'])];
+
+            $object['type']   = $file['mimetype'];
+            $object['size']   = $file['size'];
+            $object['fileid'] = $file['id'];
+        }
+
+        $sql_data = parent::_serialize($object);
+
+        if (!empty($file)) {
+            $sql_data['filename'] = $file['name'];
         }
 
         return $sql_data;
     }
-}
\ No newline at end of file
+
+    /**
+     * Helper method to turn stored cache data into a valid storage object
+     *
+     * @override
+     */
+    protected function _unserialize($sql_arr)
+    {
+        $object = parent::_unserialize($sql_arr);
+
+        if ($object && !empty($object['_attachments'])) {
+            $file = $object['_attachments'][key($object['_attachments'])];
+
+            $object['type']   = $file['mimetype'];
+            $object['size']   = $file['size'];
+            $object['fileid'] = $file['id'];
+        }
+
+        return $object;
+    }
+}

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_journal.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_journal.php Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_note.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_note.php Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_task.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache_task.php Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_config.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_config.php Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder.php Changed

@@ -281,12 +281,14 @@
     /**
      * Select Kolab objects matching the given query
      *
-     * @param mixed Pseudo-SQL query as list of filter parameter triplets
-     *    or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @param mixed   Pseudo-SQL query as list of filter parameter triplets
+     *                or string with object type (e.g. contact, event, todo, journal, note, configuration)
+     * @param boolean Use fast mode to fetch only minimal set of information
+     *                (no xml fetching and parsing, etc.)
      *
      * @return array List of Kolab data objects (each represented as hash array)
      */
-    public function select($query = array())
+    public function select($query = array(), $fast = false)
     {
         if (!$this->valid) {
             return array();
@@ -296,7 +298,7 @@
         $this->cache->synchronize();
 
         // fetch objects from cache
-        return $this->cache->select($this->_prepare_query($query));
+        return $this->cache->select($this->_prepare_query($query), false, $fast);
     }
 
     /**
@@ -419,6 +421,8 @@
             }
             else {
                 // return message part from IMAP directly
+                // TODO: We could improve performance if we cache part's encoding
+                //       without 3rd argument get_message_part() will request BODYSTRUCTURE from IMAP
                 return $this->imap->get_message_part($msguid, $part, null, $print, $fp, $skip_charset_conv);
             }
         }
@@ -486,8 +490,9 @@
         $content_type = kolab_format::KTYPE_PREFIX . $object_type;
 
         // check object type header and abort on mismatch
-        if ($type != '*' && $object_type != $type)
+        if ($type != '*' && strpos($object_type, $type) !== 0 && !($object_type == 'distribution-list' && $type == 'contact')) {
             return false;
+        }
 
         $attachments = array();
 
@@ -557,6 +562,7 @@
             $object['_msguid']    = $msguid;
             $object['_mailbox']   = $this->name;
             $object['_formatobj'] = $format;
+            $object['_size']      = strlen($xml);
 
             return $object;
         }
@@ -588,7 +594,7 @@
      */
     public function save(&$object, $type = null, $uid = null)
     {
-        if (!$this->valid) {
+        if (!$this->valid && empty($object)) {
             return false;
         }

iRony-0.4.2.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder_user.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder_user.php Changed

@@ -23,8 +23,6 @@
  */
 class kolab_storage_folder_user extends kolab_storage_folder_virtual
 {
-    protected static $ldapcache = array();
-
     public $ldaprec;
     public $type;
 
@@ -36,21 +34,13 @@
         parent::__construct($name, kolab_storage::object_prettyname($name), 'other', $parent);
 
         if (!empty($ldaprec)) {
-            self::$ldapcache[$name] = $this->ldaprec = $ldaprec;
-        }
-        // use value cached in memory for repeated lookups
-        else if (array_key_exists($name, self::$ldapcache)) {
-            $this->ldaprec = self::$ldapcache[$name];
+            $this->ldaprec = $ldaprec;
         }
-        // lookup user in LDAP and set $this->ldaprec
-        else if ($ldap = kolab_storage::ldap()) {
-            // get domain from current user
-            list(,$domain) = explode('@', rcube::get_instance()->get_user_name());
-            $this->ldaprec = $ldap->get_user_record(parent::get_foldername($this->name) . '@' . $domain, $_SESSION['imap_host']);
+        else {
+            $this->ldaprec = kolab_storage::folder_id2user(parent::get_foldername($this->name));
             if (!empty($this->ldaprec)) {
                 $this->ldaprec['kolabtargetfolder'] = $name;
             }
-            self::$ldapcache[$name] = $this->ldaprec;
         }
     }

iRony-0.4.2.tar.gz/lib/plugins/libkolab/libkolab.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/libkolab.php Changed

@@ -28,7 +28,7 @@
 class libkolab extends rcube_plugin
 {
     static $http_requests = array();
-    static $bonnie_api = false;
+    static $bonnie_api    = false;
 
     /**
      * Required startup method of a Roundcube plugin
@@ -46,6 +46,9 @@
         $this->add_hook('storage_connect', array($this, 'storage_connect'));
         $this->add_hook('user_delete', array('kolab_storage', 'delete_user_folders'));
 
+        // For Chwala
+        $this->add_hook('folder_mod', array('kolab_storage', 'folder_mod'));
+
         $rcmail = rcube::get_instance();
         try {
             kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
@@ -69,13 +72,13 @@
                 $this->include_script('libkolab.js');
 
                 // add 'Show history' item to message menu
-                $this->api->add_content(html::tag('li', null,
+                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
                     $this->api->output->button(array(
                         'command'  => 'kolab-mail-history',
                         'label'    => 'libkolab.showhistory',
                         'type'     => 'link',
                         'classact' => 'icon history active',
-                        'class'    => 'icon history',
+                        'class'    => 'icon history disabled',
                         'innerclass' => 'icon history',
                     ))),
                     'messagemenu');

iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/de.inc Added

iRony-0.4.2.tar.gz/lib/plugins/libkolab/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/de_DE.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/pl.inc Added

iRony-0.4.2.tar.gz/lib/plugins/libkolab/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/pl_PL.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/localization/pt_BR.inc -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/pt_BR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/libkolab/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/ru_RU.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/sv.inc Added

iRony-0.4.2.tar.gz/lib/plugins/libkolab/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/localization/sv_SE.inc Changed

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

@@ -21,9 +21,9 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-.toolbarmenu.listing li {
+.menu {
     a.calendarlink:before {
-        .font-icon-regular(@fa-var-calendar);
+        content: @fa-var-calendar-alt;
     }
 
     a.send:before {
@@ -36,20 +36,32 @@
     content: @fa-var-cube;
 }
 
-a.button.today:before {
-    .font-icon-regular(@fa-var-calendar);
-}
+a.button {
+    &.today:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
 
-a.button.date:before {
-    .font-icon-regular(@fa-var-calendar-alt);
+    &.date:before {
+        .font-icon-regular(@fa-var-calendar-alt);
+    }
 }
 
 .listing {
     li {
         & > div {
-            &.calendar .calname:before {
-                &:extend(.font-icon-class);
-                content: @fa-var-calendar-alt;
+            &.calendar {
+                .calname:before {
+                    &:extend(.font-icon-class);
+                    content: @fa-var-calendar-alt;
+                }
+
+                .actions {
+                    padding-right: .25rem;
+
+                    :last-child {
+                        margin-right: 0;
+                    }
+                }
             }
 
             &.calendar.cal---invitation--pending .calname:before,
@@ -66,16 +78,12 @@
             &.calendar.cal-__bdays__ {
                 font-style: italic;
 
-                a.quickview {
-                    padding-right: .25rem;
-                }
-
                 a.calname {
-                    padding-right: 4em;
+                    padding-right: 2.5em;
                 }
 
                 .count {
-                    right: 5.5em;
+                    right: 4.2em;
                     font-style: normal;
                 }
             }
@@ -320,16 +328,10 @@
             margin-top: 1.1rem;
         }
 
-        &.fc-invitation-needs-action {
-            border: 1px dashed #5757c7;
-        }
-
-        &.fc-invitation-tentative {
-            border: 1px dashed #eb8900;
-        }
-
+        &.fc-invitation-needs-action,
+        &.fc-invitation-tentative,
         &.fc-invitation-declined {
-            border: 1px dashed #c00;
+            border: 1px dashed #999;
         }
 
         &.fc-event-ns-other.fc-invitation-declined {
@@ -652,9 +654,10 @@
     }
 
     @media screen and (min-width: (@screen-width-small + 1px)) {
-        & > #layout > div.sidebar {
-            flex: 2 !important;
+        #layout-sidebar {
+            flex: 2;
             max-width: 400px;
+            min-width: 240px;
         }
     }
 
@@ -1247,18 +1250,14 @@
     }
 }
 
-.task-calendar .content .searchbar {
-    border-color: @color-layout-border;
-}
-
 .searchbar a.button.date {
     @media screen and (min-width: (@screen-width-small + 1px)) {
         display: none;
     }
+}
 
-    &:before {
-        line-height: 1.25;
-    }
+#rcmfd_alarmvalue {
+    max-width: 80px;
 }
 
 @media screen and (max-width: @screen-width-small) {
@@ -1272,7 +1271,7 @@
         }
     }
 
-    .sidebar .calendar-datepicker {
+    #layout-sidebar .calendar-datepicker {
         display: none;
     }

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

@@ -29,24 +29,22 @@
     content: @fa-var-folder;
 }
 
-.toolbarmenu.listing li a.mount.storage:before {
-    content: @fa-var-database;
-}
-
-.toolbar a.button.open:before {
-    content: @fa-var-eye;
-}
+.menu {
+    a.mount.storage:before {
+        content: @fa-var-database;
+    }
 
-.toolbar a.button.rename:before {
-    content: @fa-var-pen-square;
-}
+    a.open:before {
+        content: @fa-var-eye;
+    }
 
-.toolbar a.button.cancel:before {
-    content: @fa-var-times;
-}
+    a.cancel:before {
+        content: @fa-var-times;
+    }
 
-.listing li a.share:before {
-    content: @fa-var-share-alt;
+    a.share:before {
+        content: @fa-var-share-alt;
+    }
 }
 
 .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset a.btn-link.options.add-folder {
@@ -111,6 +109,11 @@
     position: relative;
 }
 
+#filesuploadform {
+    // force upload form position, otherwise it breaks layout
+    position: absolute !important;
+}
+
 #filelistbox {
     height: 100%;
 
@@ -375,10 +378,11 @@
 .document-editor-header {
     .toolbar {
         text-align: left !important;
-    }
+        flex: 1;
 
-    .header-title {
-        margin: 0 !important;
+        a {
+            text-align: center;
+        }
     }
 
     a.button.icon.members:before {

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

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

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

@@ -82,6 +82,7 @@
     .itip-reply-controls {
         margin-top: .25rem;
         width: 100%;
+        line-height: 2;
 
         & > label {
             display: inline;
@@ -360,21 +361,6 @@
     }
 }
 
-.attachmentslist li.link {
-    &.message.eml:before {
-        content: @fa-var-envelope;
-    }
-
-    a.messagelink {
-        .overflow-ellipsis;
-        margin-right: .25rem;
-    }
-
-    a.delete .inner {
-        display: none;
-    }
-}
-
 .attachmentslist li.ics:before,
 .attachmentslist li.text.calendar:before,
 .messagelist tbody .attachment span.ical:before {
@@ -388,18 +374,30 @@
         & + .edit-alarm-item {
             margin-top: .25rem;
         }
+
+        &.first .delete-alarm,
+        &:not(.first) .add-alarm {
+            display: none;
+        }
     }
 
     .edit-alarm-buttons {
         a {
-            line-height: 1;
-            padding: .375em .25em;
-            margin: 0 .25rem;
+            border-top-right-radius: .25rem !important;
+            border-bottom-right-radius: .25rem !important;
 
             &:before {
                 margin: 0;
                 width: 1em;
             }
+
+            &:focus {
+                box-shadow: none;
+            }
+
+            &.add:before {
+                content: @fa-var-plus;
+            }
         }
 
         .inner {
@@ -407,16 +405,14 @@
         }
     }
 
-    .edit-alarm-item.first .delete-alarm {
-        display: none;
-    }
-
-    .edit-alarm-item:not(.first) .add-alarm {
-        display: none;
-    }
-
     .edit-alarm-type {
         flex: 1;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+
+        &:focus {
+            z-index: 2;
+        }
     }
 
     .edit-alarm-set {
@@ -425,8 +421,15 @@
     }
 
     .edit-alarm-values {
-        margin-left: .25rem;
         flex: 5;
+
+        .form-control {
+            border-radius: 0;
+        }
+
+        :first-child {
+            border-left: 0;
+        }
     }
 
     .edit-alarm-offset {

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

@@ -21,14 +21,12 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#taskmenu a.tasklist:before {
-    content: @fa-var-calendar-check;
-}
 
-.toolbarmenu.listing li {
+.menu {
+    a.tasklist:before,
     a.tasklistlink:before,
     a.taskaddlink:before {
-        .font-icon-regular(@fa-var-calendar-check);
+        content: @fa-var-calendar-check;
     }
 }
 
@@ -73,6 +71,16 @@
             &.droptarget {
                 background-color: @color-list-droptarget-background;
             }
+
+            &.complete {
+                span.title {
+                    color: @color-list-deleted;
+                }
+
+                .progressbar {
+                    display: none;
+                }
+            }
         }
 
         & > div,
@@ -141,16 +149,6 @@
         &.collapsed:before {
             content: @fa-var-angle-right;
         }
-
-        &.complete {
-            span.title {
-                text-decoration: line-through;
-            }
-
-            .progressbar {
-                display: none;
-            }
-        }
     }
 
     span.title {
@@ -284,7 +282,7 @@
     }
 
     &.status-completed h2 {
-        text-decoration: line-through;
+        color: @color-list-deleted;
     }
 
     &.status-flagged h2:before {
@@ -313,6 +311,11 @@
         list-style-type: none;
         margin: 0;
         padding: 0;
+
+        li {
+            display: flex;
+            align-items: center;
+        }
     }
 
     input {

iRony-0.4.2.tar.gz/lib/plugins/libkolab/skins/elastic/libkolab.less -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/skins/elastic/libkolab.less Changed

@@ -51,15 +51,6 @@
                 position: relative;
                 flex-grow: 1;
 
-                &:after {
-                    color: #ccc;
-                    position: absolute;
-                    top: 0;
-                    right: 0;
-                    height: @listing-line-height !important;
-                    font-size: 1.1em !important;
-                }
-
                 & + input {
                     position: initial;
                 }
@@ -96,6 +87,13 @@
                         display: none;
                     }
                 }
+
+                html.touch & {
+                    padding-left: .2rem;
+                    a {
+                        margin-right: .5rem;
+                    }
+                }
             }
 
             a.quickview {
@@ -145,18 +143,32 @@
             }
         }
 
-        &.selected > div {
+        &.selected > div > * {
             color: @color-list-selected;
             background-color: @color-list-selected-background;
         }
 
         & > div.readonly a:first-child,
         &.readonly:not(.virtual) > div a:first-child {
-            padding-right: 1.6em;
-
             &:after {
                 &:extend(.font-icon-class);
                 content: @fa-var-lock;
+                position: absolute;
+                left: 2.25rem;
+                top: @listing-line-height / 2;
+                font-size: .9em !important;
+                width: .9em;
+                line-height: 1;
+                height: 1em !important;
+                background-color: #fff;
+                border-radius: 50% 50% 0 0;
+                color: @color-font;
+                opacity: .9;
+
+                html.touch & {
+                    top: @listing-touch-line-height / 2;
+                    left: 2.7rem;
+                }
             }
         }
 
@@ -207,7 +219,7 @@
         right: 0;
         min-width: 2em;
         line-height: 1.4rem;
-        margin: (@listing-line-height - 1.4rem)/2;
+        margin: (@listing-line-height - 1.4 * @page-font-size)/2;
         padding: 0 .3em;
         border-radius: .4em;
         background: @color-list-secondary;
@@ -217,26 +229,56 @@
 
         html.touch & {
             line-height: 2rem;
-            margin: (@listing-touch-line-height - 2rem)/2;
+            margin: (@listing-touch-line-height - 2 * @page-font-size)/2;
         }
     }
 }
 
-html.touch .listing {
-    li {
-        & > div {
-            a:after {
-                height: @listing-touch-line-height !important;
+@treelist-readonly-icon-margin: 1.7em;
+.treelist {
+    ul {
+        li {
+            a:first-child:after {
+                margin-left: 1 * @treelist-readonly-icon-margin !important;
             }
-        }
 
-        .actions {
-            margin-left: .2rem;
-            a {
-                margin-right: .5rem;
+            li {
+                a:first-child:after {
+                    margin-left: 2 * @treelist-readonly-icon-margin !important;
+                }
+
+                li {
+                    a:first-child:after {
+                        margin-left: 3 * @treelist-readonly-icon-margin !important;
+                    }
+
+                    li {
+                        a:first-child:after {
+                            margin-left: 4 * @treelist-readonly-icon-margin !important;
+                        }
+
+                        li {
+                            a:first-child:after {
+                                margin-left: 5 * @treelist-readonly-icon-margin !important;
+                            }
+
+                            li {
+                                a:first-child:after {
+                                    margin-left: 6 * @treelist-readonly-icon-margin !important;
+                                }
+                            }
+                        }
+                    }
+                }
             }
         }
     }
+
+    &.notree {
+        li a:first-child:after {
+            left: 1.3rem !important;
+        }
+    }
 }
 
 .searchresults {
@@ -279,20 +321,9 @@
     }
 }
 
-.toolbarmenu.listing li {
-    &.search {
+.menu {
+    li.search {
         padding: .25rem .5rem;
-        .input-group {
-
-            i.icon {
-                font-size: 80%;
-                padding: .5rem;
-            }
-
-            input {
-                font-size: 100%;
-            }
-        }
     }
 
     a.history:before {
@@ -300,12 +331,13 @@
     }
 }
 
-a.history {
-    &:before {
-        &:extend(.font-icon-class);
-        content: @fa-var-history;
-        display: inline;
-        float: none;
+button.btn {
+    &.save.notify:before {
+        content: @fa-var-envelope;
+    }
+
+    &.print:before {
+        content: @fa-var-print;
     }
 }
 
@@ -340,7 +372,12 @@
         }
 
         & > * {
-            display: initial;
+            display: block;
+        }
+
+        html.layout-small &,
+        html.layout-phone & {
+            overflow-y: auto !important;
         }
     }
 }
@@ -375,16 +412,30 @@
     }
 }
 
-button.btn.save.notify:before {
-    content: @fa-var-envelope;
+.formcontent.text-only .faded * {
+    color: @color-black-shade-text;
 }
 
-button.btn.print:before {
-    content: @fa-var-print;
-}
+.linkslist {
+    // Reset .attachmentslist style
+    border: 0 !important;
+    background: transparent !important;
 
-.formcontent.text-only .faded * {
-    color: @color-black-shade-text;
+    li.link {
+        padding: 0;
+
+        &.message.eml:before {
+            content: @fa-var-envelope;
+        }
+
+        a.messagelink {
+            .overflow-ellipsis;
+        }
+
+        a.delete .inner {
+            display: none;
+        }
+    }
 }
 
 .print-config {
@@ -461,6 +512,15 @@
         position: relative; // for absolute positioning of searchbar
         overflow: hidden;
         white-space: nowrap;
+
+        a.button {
+            color: @color-toolbar-button;
+            margin: 0 .3rem;
+
+            &:before {
+                margin: 0;
+            }
+        }
     }
 
     .header-title {
@@ -504,15 +564,16 @@
             padding: 0 !important;
         }
 
-        .selection-list {
-            border: 0;
-        }
-
         .ui-dialog-titlebar {
             display: none;
             margin: 0;
         }
 
+        .selection-list {
+            border: 0;
+        }
+
+        .selection-list,
         .selection-content {
             .header-title {
                 margin-left: 0;
@@ -529,23 +590,20 @@
 
 // Use icons-only on taskmenu with small screen height
 @media screen and (max-height: 640px) and (min-width: (@screen-width-small + 1px)) {
-    body > #layout > .menu {
-        width: 2.5rem;
+    #layout-menu .popover-header img,
+    #layout-menu {
+        width: @layout-menu-width-sm;
     }
 
     #taskmenu {
         a {
-            height: auto;
+            height: @layout-menu-width-sm;
             width: 100%;
-
-            &:before {
-                height: 2.1rem;
-                width: 100%;
-            }
+            font-size: 1.2rem !important;
         }
 
         .special-buttons {
-            width: 2.5rem;
+            width: @layout-menu-width-sm;
         }
 
         span.inner {

iRony-0.4.2.tar.gz/lib/plugins/libkolab/skins/elastic/templates/attachment.html -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/skins/elastic/templates/attachment.html Changed

@@ -2,7 +2,7 @@
 
 <h1 class="voice"><roundcube:var name="env:filename" /></h1>
 
-<div class="sidebar listbox">
+<div id="layout-sidebar" class="listbox">
 	<div class="header">
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title" id="aria-label-contentinfo"><roundcube:label name="properties" /></span>
@@ -13,14 +13,14 @@
 	</div>
 </div>
 
-<div class="content selected">
+<div id="layout-content" class="selected">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon properties" id="properties-button" href="#properties" onclick="UI.show_sidebar()" data-hidden="big">
 			<span class="inner"><roundcube:label name="properties"></span>
 		</a>
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
-		<div id="messagetoolbar" class="toolbar">
+		<div id="messagetoolbar" class="toolbar menu">
 			<roundcube:button command="download-attachment" type="link" label="download" title="download"
 				class="button download disabled" classAct="button download" innerclass="inner" />
 			<roundcube:button command="print-attachment" type="link" label="print" title="print"
@@ -46,7 +46,7 @@
 <roundcube:if condition="stripos(env:mimetype, 'image/') === 0" />
 	<div id="image-tools" class="image-tools" data-hidden="big">
 		<h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelimagetools" /></h3>
-		<div class="toolbar" role="menu" aria-labelledby="aria-label-imagetools">
+		<div class="toolbar menu" role="menu" aria-labelledby="aria-label-imagetools">
 			<roundcube:button command="image-scale" type="link" prop="+"
 				class="button zoomin disabled" classAct="button zoomin"
 				label="zoomin" title="increaseimage" innerclass="inner" />

iRony-0.4.2.tar.gz/lib/plugins/libkolab/tests/kolab_date_recurrence.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/tests/kolab_date_recurrence.php Changed

@@ -36,6 +36,10 @@
      */
     function test_first_occurrence($recurrence_data, $start, $expected)
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $start = new DateTime($start);
         if (!empty($recurrence_data['UNTIL'])) {
             $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
@@ -216,6 +220,10 @@
      */
     function test_first_occurrence_allday($recurrence_data, $start, $expected)
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $start = new DateTime($start);
         if (!empty($recurrence_data['UNTIL'])) {
             $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
@@ -230,5 +238,33 @@
 
         $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
     }
-}
 
+    /**
+     * kolab_date_recurrence::next_instance()
+     */
+    function test_next_instance()
+    {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
+        date_default_timezone_set('America/New_York');
+
+        $start = new DateTime('2017-08-31 11:00:00', new DateTimeZone('Europe/Berlin'));
+        $event = array(
+            'start'      => $start,
+            'recurrence' => array('FREQ' => 'WEEKLY', 'INTERVAL' => '1'),
+            'allday'     => true,
+        );
+
+        $object = kolab_format::factory('event', 3.0);
+        $object->set($event);
+
+        $recurrence = new kolab_date_recurrence($object);
+        $next       = $recurrence->next_instance();
+
+        $this->assertEquals($start->format('2017-09-07 H:i:s'), $next['start']->format('Y-m-d H:i:s'), 'Same time');
+        $this->assertEquals($start->getTimezone()->getName(), $next['start']->getTimezone()->getName(), 'Same timezone');
+        $this->assertSame($next['start']->_dateonly, true, '_dateonly flag');
+    }
+}

iRony-0.4.2.tar.gz/lib/plugins/libkolab/tests/kolab_storage_config.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/tests/kolab_storage_config.php Changed

@@ -34,6 +34,10 @@
         $rcube = rcmail::get_instance();
         $rcube->plugins->load_plugin('libkolab', true, true);
 
+        if (!kolab_format::supports(3)) {
+            return;
+        }
+
         if ($rcube->config->get('tests_username')) {
             $authenticated = $rcube->login(
                 $rcube->config->get('tests_username'),
@@ -70,6 +74,10 @@
 
     function test_001_build_member_url()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcube    = rcube::get_instance();
         $email    = $rcube->get_user_email();
         $personal = str_replace('$user', urlencode($email), $this->url_personal);
@@ -89,6 +97,10 @@
 
     function test_002_parse_member_url()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcube    = rcube::get_instance();
         $email    = $rcube->get_user_email();
         $personal = str_replace('$user', urlencode($email), $this->url_personal);
@@ -113,6 +125,10 @@
 
     function test_003_build_parse_member_url()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         // personal namespace
         $params = $this->params_personal;
         $params_ = kolab_storage_config::parse_member_url(kolab_storage_config::build_member_url($params));
@@ -138,6 +154,10 @@
      */
     function test_save()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $config = kolab_storage_config::get_instance();
         $tags   = array(
             array(
@@ -171,6 +191,10 @@
      */
     function test_T133()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $config = kolab_storage_config::get_instance();
 
         // get tags
@@ -206,5 +230,9 @@
         // get tags again, make sure it contains the new tag
         $tags = $config->get_tags();
         $this->assertCount(4, $tags);
+
+        foreach ($tags as $_tag) {
+            $this->assertTrue($_tag['uid'] != $tag['uid']);
+        }
     }
 }

iRony-0.4.2.tar.gz/lib/plugins/libkolab/tests/kolab_storage_folder.php -> iRony-0.4.3.tar.gz/lib/plugins/libkolab/tests/kolab_storage_folder.php Changed

@@ -29,6 +29,10 @@
         $rcmail = rcmail::get_instance();
         $rcmail->plugins->load_plugin('libkolab', true, true);
 
+        if (!kolab_format::supports(3)) {
+            return;
+        }
+
         if ($rcmail->config->get('tests_username')) {
             $authenticated = $rcmail->login(
                 $rcmail->config->get('tests_username'),
@@ -65,6 +69,10 @@
 
     function test_001_folder_type_check()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Calendar', 'event', 'event.default');
         $this->assertTrue($folder->valid);
         $this->assertEquals($folder->get_error(), 0);
@@ -80,6 +88,10 @@
 
     function test_002_get_owner()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail = rcmail::get_instance();
         $folder = new kolab_storage_folder('Calendar', 'event', 'event');
         $this->assertEquals($folder->get_owner(), $rcmail->config->get('tests_username'));
@@ -97,6 +109,10 @@
 
     function test_003_get_resource_uri()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail     = rcmail::get_instance();
         $foldername = 'Calendar';
         $uri        = parse_url($rcmail->config->get('default_host'));
@@ -112,6 +128,10 @@
 
     function test_004_get_uid()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail = rcmail::get_instance();
         $folder = new kolab_storage_folder('Doesnt-Exist', 'event', 'event');
 
@@ -123,6 +143,10 @@
 
     function test_005_subscribe()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Contacts', 'contact');
         $this->assertTrue($folder->subscribe(true));
         $this->assertTrue($folder->is_subscribed());
@@ -135,6 +159,10 @@
 
     function test_006_activate()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Calendar', 'event');
         $this->assertTrue($folder->activate(true));
         $this->assertTrue($folder->is_active());
@@ -145,16 +173,25 @@
 
     function test_010_write_contacts()
     {
-        $contacts = array(
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
+        $folder = new kolab_storage_folder('Contacts', 'contact');
+
+        $saved = $folder->save(null, 'contact');
+        $this->assertFalse($saved);
+
+        $contact = array(
             'name' => 'FN',
             'surname' => 'Last',
             'firstname' => 'First',
             'email' => array(
                 array('type' => 'home', 'address' => 'first.last@example.org'),
             ),
+            'organization' => 'Company A.G.'
         );
 
-        $folder = new kolab_storage_folder('Contacts', 'contact');
         $saved = $folder->save($contact, 'contact');
         $this->assertTrue((bool)$saved);
     }
@@ -164,12 +201,20 @@
      */
     function test_011_list_contacts()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $folder = new kolab_storage_folder('Contacts', 'contact');
         $this->assertEquals($folder->count(), 1);
     }
 
     function test_T491_get_uid()
     {
+        if (!kolab_format::supports(3)) {
+            $this->markTestSkipped('No Kolab support');
+        }
+
         $rcmail = rcmail::get_instance();
         $imap   = $rcmail->get_storage();
         $db     = $rcmail->get_dbh();

iRony-0.4.3.tar.gz/lib/plugins/loginfail/LICENSE Changed

iRony-0.4.3.tar.gz/lib/plugins/loginfail/composer.json Added

iRony-0.4.2.tar.gz/lib/plugins/loginfail/loginfail.php -> iRony-0.4.3.tar.gz/lib/plugins/loginfail/loginfail.php Changed

@@ -1,20 +1,23 @@
 <?php
-    class loginfail extends rcube_plugin {
-        public $task = 'login';
 
-        function init() {
-            $this->add_hook('login_failed', array($this, 'login_failed'));
-        }
+class loginfail extends rcube_plugin
+{
+    public $task = 'login';
+
+    function init()
+    {
+        $this->add_hook('login_failed', array($this, 'login_failed'));
+    }
 
-        public function login_failed($args) {
-            $rcmail = rcmail::get_instance();
+    public function login_failed($args)
+    {
+        $rcmail = rcmail::get_instance();
 
-            $filename = $this->home . '/loginfail.html';
+        $filename = $this->home . '/loginfail.html';
 
-            if (file_exists($filename)) {
-                $html = file_get_contents($filename);
-                $rcmail->output->add_footer($html);
-            }
+        if (file_exists($filename)) {
+            $html = file_get_contents($filename);
+            $rcmail->output->add_footer($html);
         }
     }
-?>
+}

iRony-0.4.2.tar.gz/lib/plugins/tasklist/README -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/README Changed

@@ -4,20 +4,68 @@
 This plugin currently supports a local database as well as a Kolab groupware
 server as backends for tasklists and todo items storage.
 
+
+REQUIREMENTS
+------------
+
+Some functions are shared with other plugins and therefore being moved to
+library plugins. Thus in order to run the tasklist plugin, you also need the
+following plugins installed:
+
+* kolab/libcalendaring [1]
+* kolab/libkolab [1]
+
+
 INSTALLATION
 ------------
 
-When usigng the database driver, some initialization of the local database is
-necessary. To do so, execute the SQL commands in
-drivers/database/SQL/<yourdatabase>.initial.sql
+For a manual installation of the plugin (and its dependencies),
+execute the following steps. This will set it up with the database backend
+driver.
+
+1. Get the source from git
+
+  $ cd /tmp
+  $ git clone https://git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git
+  $ cd /<path-to-roundcube>/plugins
+  $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/tasklist .
+  $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libcalendaring .
+  $ cp -r /tmp/roundcubemail-plugins-kolab/plugins/libkolab .
+
+2. Create tasklist plugin configuration
+
+  $ cd tasklist/
+  $ cp config.inc.php.dist config.inc.php
+  $ edit config.inc.php
+
+3. Initialize the tasklist database tables
+
+  $ cd ../../
+  $ bin/initdb.sh --dir=plugins/tasklist/drivers/database/SQL
+
+4. Build css styles for the Elastic skin
+
+  $ lessc --relative-urls -x plugins/libkolab/skins/elastic/libkolab.less > plugins/libkolab/skins/elastic/libkolab.min.css
+
+5. Enable the tasklist plugin
+
+  $ edit config/config.inc.php
+
+Add 'tasklist' to the list of active plugins:
+
+  $config['plugins'] = array(
+    (...)
+    'tasklist',
+  );
 
-For some general calendar-based operations such as alarms handling, this
-plugin requires the `libcalendaring` plugin, as well as libkolab plugin
-for more skins support, which are also part of the Kolab Roundcube Plugins
-repository. Make sure these plugins are installed and configured correctly.
 
 IMPORTANT
 ---------
 
-This plugin doesn't work with the classic skin of Roundcube because no
+This plugin doesn't work with the Classic skin of Roundcube because no
 templates are available for that skin.
+
+Use Roundcube `skins_allowed` option to limit skins available to the user
+or remove incompatible skins from the skins folder.
+
+[1] https://git.kolab.org/diffusion/RPK/

iRony-0.4.2.tar.gz/lib/plugins/tasklist/composer.json -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/composer.json Changed

iRony-0.4.3.tar.gz/lib/plugins/tasklist/drivers/database/SQL/sqlite.initial.sql Added

@@ -0,0 +1,51 @@
+/**
+ * Roundcube Tasklist plugin database
+ *
+ * @author Thomas Bruederli
+ * @licence GNU AGPL
+ * @copyright (C) 2014, Kolab Systems AG
+ */
+
+CREATE TABLE tasklists (
+    tasklist_id integer NOT NULL PRIMARY KEY,
+    user_id integer NOT NULL,
+    name varchar(255) NOT NULL,
+    color varchar(8) NOT NULL,
+    showalarms tinyint NOT NULL DEFAULT '0',
+    CONSTRAINT fk_tasklists_user_id FOREIGN KEY (user_id)
+        REFERENCES users (user_id) ON UPDATE CASCADE ON DELETE CASCADE
+);
+
+CREATE INDEX ix_tasklists_user_id ON tasklists (user_id, name);
+
+CREATE TABLE tasks (
+    task_id integer NOT NULL PRIMARY KEY,
+    tasklist_id integer NOT NULL,
+    parent_id integer DEFAULT NULL,
+    uid varchar(255) NOT NULL,
+    created datetime NOT NULL DEFAULT (datetime('now', 'localtime')),
+    changed datetime NOT NULL DEFAULT (datetime('now', 'localtime')),
+    del tinyint NOT NULL DEFAULT '0',
+    title varchar(255) NOT NULL,
+    description text,
+    tags text,
+    "date" varchar(10) DEFAULT NULL,
+    "time" varchar(5) DEFAULT NULL,
+    startdate varchar(10) DEFAULT NULL,
+    starttime varchar(5) DEFAULT NULL,
+    flagged tinyint NOT NULL DEFAULT '0',
+    complete real NOT NULL DEFAULT '0',
+    status varchar(16) NOT NULL DEFAULT '',
+    alarms varchar(255) DEFAULT NULL,
+    recurrence varchar(255) DEFAULT NULL,
+    organizer varchar(255) DEFAULT NULL,
+    attendees text,
+    notify datetime DEFAULT NULL,
+    CONSTRAINT fk_tasks_tasklist_id FOREIGN KEY (tasklist_id)
+        REFERENCES tasklists (tasklist_id) ON UPDATE CASCADE ON DELETE CASCADE
+);
+
+CREATE INDEX ix_tasks_tasklisting ON tasks (tasklist_id, del, date);
+CREATE INDEX ix_tasks_uid ON tasks (uid);
+
+INSERT INTO system (name, value) VALUES ('tasklist-database-version', '2014051900');

iRony-0.4.2.tar.gz/lib/plugins/tasklist/drivers/database/tasklist_database_driver.php -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/drivers/database/tasklist_database_driver.php Changed

@@ -24,18 +24,17 @@
 
 class tasklist_database_driver extends tasklist_driver
 {
-    const IS_COMPLETE_SQL = "(status='COMPLETED' OR (complete=1 AND status=''))";
+    const IS_COMPLETE_SQL = "(`status` = 'COMPLETED' OR (`complete` = 1 AND `status` = ''))";
 
-    public $undelete = true; // yes, we can
-    public $sortable = false;
+    public $undelete    = true; // yes, we can
+    public $sortable    = false;
     public $alarm_types = array('DISPLAY');
 
     private $rc;
     private $plugin;
-    private $lists = array();
+    private $lists    = array();
+    private $tags     = array();
     private $list_ids = '';
-    private $tags = array();
-
     private $db_tasks = 'tasks';
     private $db_lists = 'tasklists';
 
@@ -45,7 +44,7 @@
      */
     public function __construct($plugin)
     {
-        $this->rc = $plugin->rc;
+        $this->rc     = $plugin->rc;
         $this->plugin = $plugin;
 
         // read database config
@@ -61,29 +60,31 @@
      */
     private function _read_lists()
     {
-      $hidden = array_filter(explode(',', $this->rc->config->get('hidden_tasklists', '')));
+        $hidden = array_filter(explode(',', $this->rc->config->get('hidden_tasklists', '')));
+
+        if (!empty($this->rc->user->ID)) {
+            $list_ids = array();
+            $result = $this->rc->db->query(
+                "SELECT *, `tasklist_id` AS id FROM " . $this->db_lists
+                . " WHERE `user_id` = ?"
+                . " ORDER BY CASE WHEN `name` = 'INBOX' THEN 0 ELSE 1 END, `name`",
+                $this->rc->user->ID
+            );
 
-      if (!empty($this->rc->user->ID)) {
-        $list_ids = array();
-        $result = $this->rc->db->query(
-          "SELECT *, tasklist_id AS id FROM " . $this->db_lists . "
-           WHERE user_id=?
-           ORDER BY CASE WHEN name='INBOX' THEN 0 ELSE 1 END, name",
-           $this->rc->user->ID
-        );
+            while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
+                $arr['showalarms'] = intval($arr['showalarms']);
+                $arr['active']     = !in_array($arr['id'], $hidden);
+                $arr['name']       = html::quote($arr['name']);
+                $arr['listname']   = html::quote($arr['name']);
+                $arr['editable']   = true;
+                $arr['rights']     = 'lrswikxtea';
 
-        while ($result && ($arr = $this->rc->db->fetch_assoc($result))) {
-          $arr['showalarms'] = intval($arr['showalarms']);
-          $arr['active'] = !in_array($arr['id'], $hidden);
-          $arr['name'] = html::quote($arr['name']);
-          $arr['listname'] = html::quote($arr['name']);
-          $arr['editable'] = true;
-          $arr['rights'] = 'lrswikxtea';
-          $this->lists[$arr['id']] = $arr;
-          $list_ids[] = $this->rc->db->quote($arr['id']);
-        }
-        $this->list_ids = join(',', $list_ids);
-      }
+                $this->lists[$arr['id']] = $arr;
+                $list_ids[] = $this->rc->db->quote($arr['id']);
+            }
+
+            $this->list_ids = join(',', $list_ids);
+        }
     }
 
     /**
@@ -91,14 +92,15 @@
      */
     public function get_lists($filter = 0)
     {
-      // attempt to create a default list for this user
-      if (empty($this->lists)) {
-        $prop = array('name' => 'Default', 'color' => '000000');
-        if ($this->create_list($prop))
-          $this->_read_lists();
-      }
-
-      return $this->lists;
+        // attempt to create a default list for this user
+        if (empty($this->lists)) {
+            $prop = array('name' => 'Default', 'color' => '000000');
+            if ($this->create_list($prop)) {
+                $this->_read_lists();
+            }
+        }
+
+        return $this->lists;
     }
 
     /**
@@ -111,17 +113,19 @@
     public function create_list(&$prop)
     {
         $result = $this->rc->db->query(
-            "INSERT INTO " . $this->db_lists . "
-             (user_id, name, color, showalarms)
-             VALUES (?, ?, ?, ?)",
+            "INSERT INTO " . $this->db_lists
+             . " (`user_id`, `name`, `color`, `showalarms`)"
+             . " VALUES (?, ?, ?, ?)",
             $this->rc->user->ID,
             strval($prop['name']),
             strval($prop['color']),
-            $prop['showalarms']?1:0
+            $prop['showalarms'] ? 1 : 0
         );
 
-        if ($result)
+        if ($result) {
+            $prop['rights'] = 'lrswikxtea';
             return $this->rc->db->insert_id($this->db_lists);
+        }
 
         return false;
     }
@@ -136,13 +140,11 @@
     public function edit_list(&$prop)
     {
         $query = $this->rc->db->query(
-            "UPDATE " . $this->db_lists . "
-             SET   name=?, color=?, showalarms=?
-             WHERE tasklist_id=?
-             AND   user_id=?",
-            $prop['name'],
-            $prop['color'],
-            $prop['showalarms']?1:0,
+            "UPDATE " . $this->db_lists . " SET `name` = ?, `color` = ?, `showalarms` = ?"
+             . " WHERE `tasklist_id` = ? AND `user_id` = ?",
+            strval($prop['name']),
+            strval($prop['color']),
+            $prop['showalarms'] ? 1 : 0,
             $prop['id'],
             $this->rc->user->ID
         );
@@ -161,10 +163,12 @@
     {
         $hidden = array_flip(explode(',', $this->rc->config->get('hidden_tasklists', '')));
 
-        if ($prop['active'])
+        if ($prop['active']) {
             unset($hidden[$prop['id']]);
-        else
+        }
+        else {
             $hidden[$prop['id']] = 1;
+        }
 
         return $this->rc->user->save_prefs(array('hidden_tasklists' => join(',', array_keys($hidden))));
     }
@@ -181,18 +185,8 @@
         $list_id = $prop['id'];
 
         if ($this->lists[$list_id]) {
-            // delete all tasks linked with this list
-            $this->rc->db->query(
-                "DELETE FROM " . $this->db_tasks . "
-                 WHERE tasklist_id=?",
-                $list_id
-            );
-
-            // delete list record
             $query = $this->rc->db->query(
-                "DELETE FROM " . $this->db_lists . "
-                 WHERE tasklist_id=?
-                 AND user_id=?",
+                "DELETE FROM " . $this->db_lists . " WHERE `tasklist_id` = ? AND `user_id` = ?",
                 $list_id,
                 $this->rc->user->ID
             );
@@ -208,6 +202,7 @@
      *
      * @param string Search string
      * @param string Section/source to search
+     *
      * @return array List of tasklists
      */
     public function search_lists($query, $source)
@@ -234,23 +229,24 @@
      */
     function count_tasks($lists = null)
     {
-        if (empty($lists))
+        if (empty($lists)) {
             $lists = array_keys($this->lists);
-        else if (is_string($lists))
-            $lists = explode(',', $lists);
+        }
+        else if (!is_array($lists)) {
+            $lists = explode(',', (string) $lists);
+        }
 
         // only allow to select from lists of this user
         $list_ids = array_map(array($this->rc->db, 'quote'), array_intersect($lists, array_keys($this->lists)));
 
-        $today_date = new DateTime('now', $this->plugin->timezone);
-        $today = $today_date->format('Y-m-d');
+        $today_date    = new DateTime('now', $this->plugin->timezone);
+        $today         = $today_date->format('Y-m-d');
         $tomorrow_date = new DateTime('now + 1 day', $this->plugin->timezone);
-        $tomorrow = $tomorrow_date->format('Y-m-d');
+        $tomorrow      = $tomorrow_date->format('Y-m-d');
 
         $result = $this->rc->db->query(sprintf(
-            "SELECT task_id, flagged, date FROM " . $this->db_tasks . "
-             WHERE tasklist_id IN (%s)
-             AND del=0 AND NOT " . self::IS_COMPLETE_SQL,
+            "SELECT `task_id`, `flagged`, `date` FROM " . $this->db_tasks
+             . " WHERE `tasklist_id` IN (%s) AND `del` = 0 AND NOT " . self::IS_COMPLETE_SQL,
             join(',', $list_ids)
         ));
 
@@ -277,30 +273,35 @@
      *
      * @param array Hash array wiht filter criterias
      * @param array List of lists to get tasks from
+     *
      * @return array List of tasks records matchin the criteria
      * @see tasklist_driver::list_tasks()
      */
     function list_tasks($filter, $lists = null)
     {
-        if (empty($lists))
+        if (empty($lists)) {
             $lists = array_keys($this->lists);
-        else if (is_string($lists))
-            $lists = explode(',', $lists);
+        }
+        else if (!is_array($lists)) {
+            $lists = explode(',', (string) $lists);
+        }
 
         // only allow to select from lists of this user
         $list_ids = array_map(array($this->rc->db, 'quote'), array_intersect($lists, array_keys($this->lists)));
-        $sql_add = '';
+        $sql_add  = '';
 
         // add filter criteria
         if ($filter['from'] || ($filter['mask'] & tasklist::FILTER_MASK_TODAY)) {
-            $sql_add .= ' AND (date IS NULL OR date >= ?)';
+            $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['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']) . ")";
+            }
         }
 
         // special case 'today': also show all events with date before today
@@ -308,47 +309,48 @@
             $datefrom = date('Y-m-d', 0);
         }
 
-        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'].'%');
-            $sql_add = 'AND (' . join(' OR ', $sql_query) . ')';
+            foreach (array('title', 'description', 'organizer', 'attendees') as $col) {
+                $sql_query[] = $this->rc->db->ilike($col, '%' . $filter['search'] . '%');
+            }
+            $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']));
+            $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'])) . ')';
+            $sql_add .= " AND `uid` IN (" . implode(',', array_map(array($this->rc->db, 'quote'), $filter['uid'])) . ")";
         }
 
         $tasks = array();
         if (!empty($list_ids)) {
-            $result = $this->rc->db->query(sprintf(
-                "SELECT * FROM " . $this->db_tasks . "
-                 WHERE tasklist_id IN (%s)
-                 AND del=0
-                 %s
-                 ORDER BY parent_id, task_id ASC",
-                 join(',', $list_ids),
-                 $sql_add
-                ),
+            $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
-           );
+            );
 
             while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
                 $tasks[] = $this->_read_postprocess($rec);
@@ -369,20 +371,16 @@
      */
     public function get_task($prop, $filter = 0)
     {
-        if (is_string($prop))
+        if (is_string($prop)) {
             $prop['uid'] = $prop;
+        }
 
         $query_col = $prop['id'] ? 'task_id' : 'uid';
 
-        $result = $this->rc->db->query(sprintf(
-             "SELECT * FROM " . $this->db_tasks . "
-              WHERE tasklist_id IN (%s)
-              AND %s=?
-              AND del=0",
-              $this->list_ids,
-              $query_col
-             ),
-             $prop['id'] ? $prop['id'] : $prop['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']
         );
 
         if ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
@@ -395,46 +393,46 @@
     /**
      * Get all decendents of the given task record
      *
-     * @param mixed  Hash array with task properties or task UID
+     * @param mixed   Hash array with task properties or task UID
      * @param boolean True if all childrens children should be fetched
+     *
      * @return array List of all child task IDs
      */
     public function get_childs($prop, $recursive = false)
     {
         // resolve UID first
         if (is_string($prop)) {
-            $result = $this->rc->db->query(sprintf(
-                "SELECT task_id AS id, tasklist_id AS list FROM " . $this->db_tasks . "
-                 WHERE tasklist_id IN (%s)
-                 AND uid=?",
-                 $this->list_ids
-                ),
-                $prop);
+            $result = $this->rc->db->query(
+                "SELECT `task_id` AS id, `tasklist_id` AS list FROM " . $this->db_tasks
+                . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"
+                    . " AND `uid` = ?",
+                $prop
+            );
+
             $prop = $this->rc->db->fetch_assoc($result);
         }
 
-        $childs = array();
+        $childs   = array();
         $task_ids = array($prop['id']);
 
         // query for childs (recursively)
         while (!empty($task_ids)) {
-            $result = $this->rc->db->query(sprintf(
-                "SELECT task_id AS id FROM " . $this->db_tasks . "
-                 WHERE tasklist_id IN (%s)
-                 AND parent_id IN (%s)
-                 AND del=0",
-                $this->list_ids,
-                join(',', array_map(array($this->rc->db, 'quote'), $task_ids))
-            ));
+            $result = $this->rc->db->query(
+                "SELECT `task_id` AS id FROM " . $this->db_tasks
+                . " WHERE `tasklist_id` IN (" . $this->list_ids . ")"
+                    . " AND `parent_id` IN (" . join(',', array_map(array($this->rc->db, 'quote'), $task_ids)) . ")"
+                    . " AND `del` = 0"
+            );
 
             $task_ids = array();
             while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
-                $childs[] = $rec['id'];
+                $childs[]   = $rec['id'];
                 $task_ids[] = $rec['id'];
             }
 
-            if (!$recursive)
+            if (!$recursive) {
                 break;
+            }
         }
 
         return $childs;
@@ -443,38 +441,41 @@
     /**
      * Get a list of pending alarms to be displayed to the user
      *
-     * @param  integer Current time (unix timestamp)
-     * @param  mixed   List of list IDs to show alarms for (either as array or comma-separated string)
+     * @param integer Current time (unix timestamp)
+     * @param mixed   List of list IDs to show alarms for (either as array or comma-separated string)
+     *
      * @return array   A list of alarms, each encoded as hash array with task properties
      * @see tasklist_driver::pending_alarms()
      */
     public function pending_alarms($time, $lists = null)
     {
-        if (empty($lists))
+        if (empty($lists)) {
             $lists = array_keys($this->lists);
-        else if (is_string($lists))
-            $lists = explode(',', $lists);
+        }
+        else if (!is_array($lists)) {
+            $lists = explode(',', (string) $lists);
+        }
 
         // only allow to select from calendars with activated alarms
         $list_ids = array();
         foreach ($lists as $lid) {
-            if ($this->lists[$lid] && $this->lists[$lid]['showalarms'])
+            if ($this->lists[$lid] && $this->lists[$lid]['showalarms']) {
                 $list_ids[] = $lid;
+            }
         }
         $list_ids = array_map(array($this->rc->db, 'quote'), $list_ids);
 
         $alarms = array();
         if (!empty($list_ids)) {
-            $result = $this->rc->db->query(sprintf(
-                "SELECT * FROM " . $this->db_tasks . "
-                 WHERE tasklist_id IN (%s)
-                 AND notify <= %s AND NOT " . self::IS_COMPLETE_SQL,
-                join(',', $list_ids),
-                $this->rc->db->fromunixtime($time)
-            ));
-
-            while ($result && ($rec = $this->rc->db->fetch_assoc($result)))
+            $result = $this->rc->db->query("SELECT * FROM " . $this->db_tasks
+                . " WHERE `tasklist_id` IN (" . join(',', $list_ids) . ")"
+                    . " AND `notify` <= " . $this->rc->db->fromunixtime($time)
+                    . " AND NOT " . self::IS_COMPLETE_SQL
+            );
+
+            while ($result && ($rec = $this->rc->db->fetch_assoc($result))) {
                 $alarms[] = $this->_read_postprocess($rec);
+            }
         }
 
         return $alarms;
@@ -490,12 +491,9 @@
         // set new notifyat time or unset if not snoozed
         $notify_at = $snooze > 0 ? date('Y-m-d H:i:s', time() + $snooze) : null;
 
-        $query = $this->rc->db->query(sprintf(
-            "UPDATE " . $this->db_tasks . "
-             SET   changed=%s, notify=?
-             WHERE task_id=?
-             AND tasklist_id IN (" . $this->list_ids . ")",
-            $this->rc->db->now()),
+        $query = $this->rc->db->query("UPDATE " . $this->db_tasks
+            . " SET `changed` = " . $this->rc->db->now() . ", `notify` = ?"
+            . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
             $notify_at,
             $task_id
         );
@@ -518,13 +516,15 @@
      */
     private function _read_postprocess($rec)
     {
-        $rec['id'] = $rec['task_id'];
-        $rec['list'] = $rec['tasklist_id'];
+        $rec['id']      = $rec['task_id'];
+        $rec['list']    = $rec['tasklist_id'];
         $rec['changed'] = new DateTime($rec['changed']);
-        $rec['tags'] = array_filter(explode(',', $rec['tags']));
+        $rec['created'] = new DateTime($rec['created']);
+        $rec['tags']    = array_filter(explode(',', $rec['tags']));
 
-        if (!$rec['parent_id'])
+        if (!$rec['parent_id']) {
             unset($rec['parent_id']);
+        }
 
         // decode serialized alarms
         if ($rec['alarms']) {
@@ -541,7 +541,8 @@
             $this->tags = array_merge($this->tags, (array)$rec['tags']);
         }
 
-        unset($rec['task_id'], $rec['tasklist_id'], $rec['created']);
+        unset($rec['task_id'], $rec['tasklist_id']);
+
         return $rec;
     }
 
@@ -549,6 +550,7 @@
      * Add a single task to the database
      *
      * @param array Hash array with task properties (see header of this file)
+     *
      * @return mixed New event ID on success, False on error
      * @see tasklist_driver::create_task()
      */
@@ -556,8 +558,9 @@
     {
         // check list permissions
         $list_id = $prop['list'] ? $prop['list'] : reset(array_keys($this->lists));
-        if (!$this->lists[$list_id] || $this->lists[$list_id]['readonly'])
+        if (!$this->lists[$list_id] || $this->lists[$list_id]['readonly']) {
             return false;
+        }
 
         if (is_array($prop['valarms'])) {
             $prop['alarms'] = $this->serialize_alarms($prop['valarms']);
@@ -570,18 +573,19 @@
         }
 
         foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status') as $col) {
-            if (empty($prop[$col]))
+            if (empty($prop[$col])) {
                 $prop[$col] = null;
+            }
         }
 
         $notify_at = $this->_get_notification($prop);
-        $result = $this->rc->db->query(sprintf(
-            "INSERT INTO " . $this->db_tasks . "
-             (tasklist_id, uid, parent_id, created, changed, title, date, time, startdate, starttime, description, tags, flagged, complete, status, alarms, recurrence, notify)
-             VALUES (?, ?, ?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
-             $this->rc->db->now(),
-             $this->rc->db->now()
-            ),
+        $now       = $this->rc->db->now();
+
+        $result = $this->rc->db->query("INSERT INTO " . $this->db_tasks
+            . " (`tasklist_id`, `uid`, `parent_id`, `created`, `changed`, `title`, `date`, `time`,"
+                . " `startdate`, `starttime`, `description`, `tags`, `flagged`, `complete`, `status`,"
+                . " `alarms`, `recurrence`, `notify`)"
+            . " VALUES (?, ?, ?, $now, $now, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
             $list_id,
             $prop['uid'],
             $prop['parent_id'],
@@ -593,15 +597,16 @@
             strval($prop['description']),
             join(',', (array)$prop['tags']),
             $prop['flagged'] ? 1 : 0,
-            intval($prop['complete']),
+            $prop['complete'] ?: 0,
             strval($prop['status']),
             $prop['alarms'],
             $prop['recurrence'],
             $notify_at
         );
 
-        if ($result)
+        if ($result) {
             return $this->rc->db->insert_id($this->db_tasks);
+        }
 
         return false;
     }
@@ -610,6 +615,7 @@
      * Update an task entry with the given data
      *
      * @param array Hash array with task properties
+     *
      * @return boolean True on success, False on error
      * @see tasklist_driver::edit_task()
      */
@@ -627,15 +633,21 @@
 
         $sql_set = array();
         foreach (array('title', 'description', 'flagged', 'complete') as $col) {
-            if (isset($prop[$col]))
+            if (isset($prop[$col])) {
                 $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($prop[$col]);
+            }
         }
-        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence', 'status') as $col) {
-            if (isset($prop[$col]))
+        foreach (array('parent_id', 'date', 'time', 'startdate', 'starttime', 'alarms', 'recurrence') as $col) {
+            if (isset($prop[$col])) {
                 $sql_set[] = $this->rc->db->quote_identifier($col) . '=' . (empty($prop[$col]) ? 'NULL' : $this->rc->db->quote($prop[$col]));
+            }
+        }
+        if (isset($prop['status'])) {
+            $sql_set[] = $this->rc->db->quote_identifier('status') . '=' . $this->rc->db->quote($prop['status']);
         }
-        if (isset($prop['tags']))
+        if (isset($prop['tags'])) {
             $sql_set[] = $this->rc->db->quote_identifier('tags') . '=' . $this->rc->db->quote(join(',', (array)$prop['tags']));
+        }
 
         if (isset($prop['date']) || isset($prop['time']) || isset($prop['alarms'])) {
             $notify_at = $this->_get_notification($prop);
@@ -644,28 +656,23 @@
 
         // moved from another list
         if ($prop['_fromlist'] && ($newlist = $prop['list'])) {
-            $sql_set[] = 'tasklist_id=' . $this->rc->db->quote($newlist);
-        }
-
-        $query = $this->rc->db->query(sprintf(
-            "UPDATE " . $this->db_tasks . "
-             SET   changed=%s %s
-             WHERE task_id=?
-             AND   tasklist_id IN (%s)",
-            $this->rc->db->now(),
-            ($sql_set ? ', ' . join(', ', $sql_set) : ''),
-            $this->list_ids
-          ),
-          $prop['id']
+            $sql_set[] = $this->rc->db->quote_identifier('tasklist_id') . '=' . $this->rc->db->quote($newlist);
+        }
+
+        $result = $this->rc->db->query("UPDATE " . $this->db_tasks
+            . " SET `changed` = " . $this->rc->db->now() . ($sql_set ? ', ' . join(', ', $sql_set) : '')
+            . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
+            $prop['id']
         );
 
-        return $this->rc->db->affected_rows($query);
+        return $this->rc->db->affected_rows($result);
     }
 
     /**
      * Move a single task to another list
      *
-     * @param array   Hash array with task properties:
+     * @param array   Hash array with task properties
+     *
      * @return boolean True on success, False on error
      * @see tasklist_driver::move_task()
      */
@@ -679,6 +686,7 @@
      *
      * @param array   Hash array with task properties
      * @param boolean Remove record irreversible
+     *
      * @return boolean True on success, False on error
      * @see tasklist_driver::delete_task()
      */
@@ -687,50 +695,39 @@
         $task_id = $prop['id'];
 
         if ($task_id && $force) {
-            $query = $this->rc->db->query(
-                "DELETE FROM " . $this->db_tasks . "
-                 WHERE task_id=?
-                 AND tasklist_id IN (" . $this->list_ids . ")",
+            $result = $this->rc->db->query("DELETE FROM " . $this->db_tasks
+                . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
                 $task_id
             );
         }
         else if ($task_id) {
-            $query = $this->rc->db->query(sprintf(
-                "UPDATE " . $this->db_tasks . "
-                 SET   changed=%s, del=1
-                 WHERE task_id=?
-                 AND   tasklist_id IN (%s)",
-                $this->rc->db->now(),
-                $this->list_ids
-              ),
-              $task_id
+            $result = $this->rc->db->query("UPDATE " . $this->db_tasks
+                . " SET `changed` = " . $this->rc->db->now() . ", `del` = 1"
+                . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
+                $task_id
             );
         }
 
-        return $this->rc->db->affected_rows($query);
+        return $this->rc->db->affected_rows($result);
     }
 
     /**
      * Restores a single deleted task (if supported)
      *
      * @param array Hash array with task properties
+     *
      * @return boolean True on success, False on error
      * @see tasklist_driver::undelete_task()
      */
     public function undelete_task($prop)
     {
-        $query = $this->rc->db->query(sprintf(
-            "UPDATE " . $this->db_tasks . "
-             SET   changed=%s, del=0
-             WHERE task_id=?
-             AND   tasklist_id IN (%s)",
-            $this->rc->db->now(),
-            $this->list_ids
-          ),
-          $prop['id']
+        $result = $this->rc->db->query("UPDATE " . $this->db_tasks
+            . " SET `changed` = " . $this->rc->db->now() . ", `del` = 0"
+            . " WHERE `task_id` = ? AND `tasklist_id` IN (" . $this->list_ids . ")",
+            $prop['id']
         );
 
-        return $this->rc->db->affected_rows($query);
+        return $this->rc->db->affected_rows($result);
     }
 
     /**
@@ -741,11 +738,10 @@
         if ($task['valarms'] && !$this->is_complete($task)) {
             $alarm = libcalendaring::get_next_alarm($task, 'task');
 
-        if ($alarm['time'] && in_array($alarm['action'], $this->alarm_types))
-          return date('Y-m-d H:i:s', $alarm['time']);
-      }
-
-      return null;
+            if ($alarm['time'] && in_array($alarm['action'], $this->alarm_types)) {
+                return date('Y-m-d H:i:s', $alarm['time']);
+            }
+        }
     }
 
     /**
@@ -837,15 +833,17 @@
     public function user_delete($args)
     {
         $db = $this->rc->db;
+
+        $lists = $db->query("SELECT `tasklist_id` FROM " . $this->db_lists . " WHERE `user_id` = ?", $args['user']->ID);
+
         $list_ids = array();
-        $lists = $db->query("SELECT tasklist_id FROM " . $this->db_lists . " WHERE user_id=?", $args['user']->ID);
         while ($row = $db->fetch_assoc($lists)) {
             $list_ids[] = $row['tasklist_id'];
         }
 
         if (!empty($list_ids)) {
             foreach (array($this->db_tasks, $this->db_lists) as $table) {
-                $db->query(sprintf("DELETE FROM $table WHERE tasklist_id IN (%s)", join(',', $list_ids)));
+                $db->query(sprintf("DELETE FROM $table WHERE `tasklist_id` IN (%s)", join(',', $list_ids)));
             }
         }
     }

iRony-0.4.2.tar.gz/lib/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/drivers/tasklist_driver.php -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/drivers/tasklist_driver.php Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv_SE/LC_MESSAGES/index.po -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv_SE/LC_MESSAGES/index.po Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv_SE/LC_MESSAGES/manage.po -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv_SE/LC_MESSAGES/manage.po Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv_SE/LC_MESSAGES/overview.po -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv_SE/LC_MESSAGES/overview.po Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/bg_BG.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/bg_BG.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/ca_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/ca_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/cs_CZ.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/cs_CZ.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/da_DK.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/da_DK.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/de.inc Added

@@ -0,0 +1,191 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['navtitle'] = 'Aufgaben';
+$labels['lists'] = 'Aufgabenlisten';
+$labels['list'] = 'Aufgabenliste';
+$labels['tags'] = 'Schlagworte';
+$labels['export'] = 'Exportieren';
+$labels['exporttitle'] = 'Kalender als iCalendar exportieren';
+$labels['exportattachments'] = 'Mit Anhängen';
+$labels['currentview'] = 'Aktuelle Ansicht';
+$labels['tasklistsubscribe'] = 'Permanent anzeigen';
+$labels['listsearchresults'] = 'Verfügbare Aufgaben';
+$labels['findlists'] = 'Finde Aufgabenlisten,..';
+$labels['searchterms'] = 'Suchbegriffe';
+$labels['notasklistsfound'] = 'Keine Aufgabenlisten gefunden';
+$labels['nrtasklistsfound'] = '$nr Aufgabenlisten gefunden';
+$labels['removelist'] = 'Von der Liste entfernen';
+$labels['showcaldavurl'] = 'CalDAV URL anzeigen';
+$labels['caldavurldescription'] = 'Kopieren dieser Adresse in eine <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> Client-Anwendung (z.B. Evolution oder Mozilla Thunderbird), um diese spezifische Aufgabenliste mit Ihrem Computer oder Mobilgerät zu synchronisieren.';
+$labels['newtask'] = 'Neue Aufgabe';
+$labels['createtask'] = 'Aufgabe erstellen <Enter>';
+$labels['createnewtask'] = 'Neue Aufgabe erstellen (z.B. Samstag, Rasen mähen)';
+$labels['createfrommail'] = 'Aufgabe speichern';
+$labels['printtitle'] = 'Aufgaben drucken';
+$labels['printdescriptions'] = 'Beschreibungen drucken';
+$labels['mark'] = 'Markieren';
+$labels['unmark'] = 'Markierung entfernen';
+$labels['edit'] = 'Bearbeiten';
+$labels['delete'] = 'Löschen';
+$labels['title'] = 'Titel';
+$labels['description'] = 'Beschreibung';
+$labels['datetime'] = 'Fällig';
+$labels['duetime'] = 'Fällig';
+$labels['start'] = 'Beginn';
+$labels['starttime'] = 'Startzeit';
+$labels['alarms'] = 'Erinnerung';
+$labels['repeat'] = 'Wiederholung';
+$labels['links'] = 'Referenz';
+$labels['status'] = 'Status';
+$labels['status-needs-action'] = 'Braucht Aktion';
+$labels['status-in-process'] = 'In Bearbeitung';
+$labels['status-completed'] = 'Abgeschlossen';
+$labels['status-cancelled'] = 'Abgesagt';
+$labels['assignedto'] = 'Zugewiesen an';
+$labels['created'] = 'Erstellt';
+$labels['changed'] = 'Zuletzt geändert';
+$labels['taskoptions'] = 'Optionen';
+$labels['all'] = 'Alle';
+$labels['flagged'] = 'Markiert';
+$labels['complete'] = 'Abgeschlossen';
+$labels['completeness'] = 'Fortschritt';
+$labels['overdue'] = 'Überfällig';
+$labels['today'] = 'Heute';
+$labels['tomorrow'] = 'Morgen';
+$labels['next7days'] = 'Innerhalb von 7 Tagen';
+$labels['later'] = 'Später';
+$labels['assigned'] = 'Zugewiesen';
+$labels['assignedtitle'] = 'Aufgaben, welche an andere vergeben wurden';
+$labels['mytasks'] = 'Meine Aufgaben';
+$labels['mytaskstitle'] = 'An mich übertragene Aufgaben';
+$labels['nodate'] = 'Ohne Datum';
+$labels['removetag'] = 'Entfernen';
+$labels['removelink'] = 'E-Mail-Referenz entfernen';
+$labels['auto'] = 'Automatisch';
+$labels['newtask'] = 'Neue Aufgabe';
+$labels['edittask'] = 'Aufgabe ändern';
+$labels['save'] = 'Speichern';
+$labels['cancel'] = 'Abbrechen';
+$labels['saveandnotify'] = 'Speichern und Benachrichtigen';
+$labels['addsubtask'] = 'Teilaufgabe hinzufügen';
+$labels['deletetask'] = 'Aufgabe löschen';
+$labels['deletethisonly'] = 'Nur diese Aufgabe löschen';
+$labels['deletewithchilds'] = 'Mit allen Teilaufgaben löschen';
+$labels['taskactions'] = 'Aufgabeneinstellungen...';
+$labels['tabsummary'] = 'Titel';
+$labels['tabrecurrence'] = 'Wiederholung';
+$labels['tabassignments'] = 'Zuweisungen';
+$labels['tabattachments'] = 'Anhänge';
+$labels['tabsharing'] = 'Freigabe';
+$labels['createlist'] = 'Liste hinzufügen';
+$labels['listactions'] = 'Listeneinstellungen…';
+$labels['listname'] = 'Name';
+$labels['showalarms'] = 'Erinnerungen anzeigen';
+$labels['import'] = 'Importieren';
+$labels['viewactions'] = 'Ansicht-Aktionen';
+$labels['focusview'] = 'Nur diese Liste anzeigen';
+$labels['on'] = 'am';
+$labels['at'] = 'um';
+$labels['this'] = 'dies';
+$labels['next'] = 'weiter';
+$labels['yes'] = 'Ja';
+$labels['savingdata'] = 'Daten werden gespeichert…';
+$labels['errorsaving'] = 'Daten konnten nicht gespeichert werden.';
+$labels['notasksfound'] = 'Keine Aufgabe erfüllt die angelegten Kriterien';
+$labels['invalidstartduedates'] = 'Das Anfangsdatum muss vor dem Fälligkeitsdatum liegen.';
+$labels['invalidstartduetimes'] = 'Start- und Enddatum müssen entweder beide oder keins eine Zeit enthalten.';
+$labels['recurrencerequiresdate'] = 'Wiederkehrende Aufgaben erfordern entweder ein Start- oder Enddatum.';
+$labels['deletetasktconfirm'] = 'Diese Aufgabe wirklich löschen?';
+$labels['deleteparenttasktconfirm'] = 'Diese Aufgabe wirklich mit allen Teilaufgaben löschen?';
+$labels['deletelistconfirm'] = 'Diese Aufgabenliste wirklich mit allen Aufgaben löschen?';
+$labels['deletelistconfirmrecursive'] = 'Soll diese Liste wirklich mit allen Aufgaben und Unterlisten gelöscht werden?';
+$labels['aclnorights'] = 'Der Zugriff auf diese Aufgabenliste erfordert Administrator-Rechte.';
+$labels['changetaskconfirm'] = 'Aufgabe ändern';
+$labels['changeconfirmnotifications'] = 'Wollen Sie die beauftragten Teilnehmer über diese Änderung informieren?';
+$labels['partstatupdatenotification'] = 'Wollen Sie den Organisator über die Statusänderung benachrichtigen?';
+$labels['quickaddinput'] = 'Neue Aufgabe Datum und Titel';
+$labels['arialabelquickaddbox'] = 'Neue Aufgabe schnell hinzufügen';
+$labels['arialabelsearchform'] = 'Suchformular für Aufgaben';
+$labels['arialabelquicksearchbox'] = 'Sucheingabe für Aufgaben';
+$labels['arialabellistsearchform'] = 'Sucheingabe für Aufgabenlisten';
+$labels['arialabeltaskselector'] = 'Listenmodus';
+$labels['arialabeltasklisting'] = 'Aufgabenauflistung';
+$labels['arialabelsortmenu'] = 'Aufgaben-Sortierungsoptionen';
+$labels['attendee'] = 'Beauftragter';
+$labels['role'] = 'Rolle';
+$labels['availability'] = 'Verfüg.';
+$labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Beauftragten hinzufügen';
+$labels['roleorganizer'] = 'Organisator';
+$labels['rolerequired'] = 'Erforderlich';
+$labels['roleoptional'] = 'Optional';
+$labels['rolechair'] = 'Vorsitz';
+$labels['rolenonparticipant'] = 'Beobachter';
+$labels['sendinvitations'] = 'Einladungen versenden';
+$labels['sendnotifications'] = 'Beauftragte Teilnehmer über die Änderung informieren';
+$labels['sendcancellation'] = 'Beauftragte Teilnehmer über die Stornierung informieren';
+$labels['invitationsubject'] = 'Ihnen wurde "$title" zugewiesen';
+$labels['invitationmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\n\$description\n\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['itipupdatesubject'] = '"$title" wurde aktualisiert';
+$labels['itipupdatesubjectempty'] = 'Eine ihrer Aufgabe wurde aktualisiert';
+$labels['itipupdatemailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['itipcancelsubject'] = '"$title" wurde abgesagt';
+$labels['itipcancelmailbody'] = "*\$title*\n\nFällig: \$date\n\nTeilnehmer: \$attendees\n\nDie Aufgabe wurde durch \$organizer storniert.\n\nAngehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
+$labels['saveintasklist'] = 'speichern in';
+$labels['taskhistory'] = 'Historie';
+$labels['objectchangelog'] = 'Änderungshistorie';
+$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
+$labels['objectnotfound'] = 'Fehler beim Laden der Aufgabendaten';
+$labels['objectchangelognotavailable'] = 'Änderung der Historie ist nicht verfügbar für diese Aufgabe.';
+$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
+$labels['revisionrestoreconfirm'] = 'Möchten Sie wirklich die Version $rev dieser Aufgabe wiederherstellen? Dies wird die aktuelle Aufgabe mit der alten Version ersetzen.';
+$labels['objectrestoresuccess'] = 'Revision $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Revision';
+$labels['itipobjectnotfound'] = 'Die Aufgabe, auf welche sich diese Nachricht bezieht, wurde nicht in Ihrer Aufgabenliste gefunden.';
+$labels['itipmailbodyaccepted'] = "\$sender hat die Zuweisung folgender Aufgabe akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender hat die Zuweisung folgender Aufgabe unter Vorbehalt akzeptiert:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender hat die Zuweisung folgender Aufgabe abgeleht:\n\n*\$title*\n\nFällig: \$date\n\nVerantwortlich: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender hat die Zuweisung folgender Aufgabe abgeleht:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodyin-process'] = "\$sender hat den Status folgender Aufgabe auf in-Bearbeitung gesetzt:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodycompleted'] = "\$sender hat folgende Aufgabe abgeschlossen:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodydelegated'] = "\$sender hat folgende Aufgabe delegiert:\n\n*\$title*\n\nFällig: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender hat folgende Aufgabe an Sie delegiert:\n\n*\$title*\n\nFällig: \$date";
+$labels['attendeeaccepted'] = 'Delegierter hat akzeptiert';
+$labels['attendeetentative'] = 'Delegierter hat unter Vorbehalt akzeptiert';
+$labels['attendeedeclined'] = 'Delegierter hat abgelehnt';
+$labels['attendeedelegated'] = 'Zugewiesener hat zu $delegatedto delegiert';
+$labels['attendeein-process'] = 'Delegierter ist in Bearbeitung ';
+$labels['attendeecompleted'] = 'Delegierter hat abgeschlossen';
+$labels['acceptinvitation'] = 'Akzeptieren Sie die Zuweisung?';
+$labels['itipdeclinetask'] = 'Lehnen Sie to Zuweisung dieser Aufgabe ab';
+$labels['declinedeleteconfirm'] = 'Möchten Sie diese abgelehnete Aufgabe aus Ihrer Aufgabenliste löschen?';
+$labels['itipcomment'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';
+$labels['itipcommenttitle'] = 'Dieser Kommentar wird der Benachrichtigung an andere Delegierte hinzugefügt';
+$labels['itipsendsuccess'] = 'Benachrichtigung an Delegierte gesendet';
+$labels['errornotifying'] = 'Senden der Benachrichtigung an Delegierte fehlgeschlagen';
+$labels['removefromcalendar'] = 'Aus meinen Aufgaben entfernen';
+$labels['delegateinvitation'] = 'Zuweisung delegieren';
+$labels['andnmore'] = '$nr weitere...';
+$labels['savetotasklist'] = 'In den Aufgaben speichern';
+$labels['comment'] = 'Kommentar';
+$labels['rsvpcomment'] = 'Kommentar';
+$labels['errorimportingtask'] = 'Fehler beim Importieren der Aufgabe(n)';
+$labels['importwarningexists'] = 'Eine Kopie dieser Aufgabe exisistiert bereits in Ihrer Aufgabenliste';
+$labels['importsuccess'] = '$nr Aufgaben erfolgreich importiert';
+$labels['importerror'] = 'Fehler beim Importieren';
+$labels['newerversionexists'] = 'Eine neuere Version dieser Aufgabe existiert bereits! Abbruch.';
+$labels['nowritetasklistfound'] = 'Keine Aufgabenliste zum Speichern der Aufgabe gefunden';
+$labels['importedsuccessfully'] = 'Die Aufgabe wurde erfolgreich unter \'$list\' gespeichert';
+$labels['updatedsuccessfully'] = 'Die Aufgabe wurde erfolgreich in \'$list\' aktualisiert';
+$labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
+$labels['itipresponseerror'] = 'Senden der Antwort auf diese Aufgabenzuweisung fehlgeschlagen';
+$labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig.';
+$labels['sentresponseto'] = 'Antwort auf Aufgabenzuweisung erfolgreich an $mailto versendet';
+$labels['successremoval'] = 'Diese Aufgabe wurde erfolgreich gelöscht.';
+$labels['invalidlistproperties'] = 'Ungültige Listeneigenschaften! Bitte einen gültigen Namen eingeben.';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/de_CH.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/de_CH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/de_DE.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/de_DE.inc Changed

@@ -1,4 +1,11 @@
 <?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
 $labels['navtitle'] = 'Aufgaben';
 $labels['lists'] = 'Aufgabenlisten';
 $labels['list'] = 'Aufgabenliste';
@@ -61,6 +68,7 @@
 $labels['removetag'] = 'Entfernen';
 $labels['removelink'] = 'E-Mail-Referenz entfernen';
 $labels['auto'] = 'Automatisch';
+$labels['newtask'] = 'Neue Aufgabe';
 $labels['edittask'] = 'Aufgabe ändern';
 $labels['save'] = 'Speichern';
 $labels['cancel'] = 'Abbrechen';
@@ -75,7 +83,6 @@
 $labels['tabassignments'] = 'Zuweisungen';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
-$labels['editlist'] = 'Liste bearbeiten';
 $labels['createlist'] = 'Liste hinzufügen';
 $labels['listactions'] = 'Listeneinstellungen…';
 $labels['listname'] = 'Name';
@@ -124,34 +131,23 @@
 $labels['sendnotifications'] = 'Beauftragte Teilnehmer über die Änderung informieren';
 $labels['sendcancellation'] = 'Beauftragte Teilnehmer über die Stornierung informieren';
 $labels['invitationsubject'] = 'Ihnen wurde "$title" zugewiesen';
-$labels['invitationmailbody'] = '*$title*
-
+$labels['invitationmailbody'] = "*$title*
 Fällig: $date
-
 Teilnehmer: $attendees
-
 $description
-
-Angehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.';
+Angehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipupdatesubject'] = '"$title" wurde aktualisiert';
 $labels['itipupdatesubjectempty'] = 'Eine ihrer Aufgabe wurde aktualisiert';
-$labels['itipupdatemailbody'] = '*$title*
-
+$labels['itipupdatemailbody'] = "*$title*
 Fällig: $date
-
 Teilnehmer: $attendees
-
-Angehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.';
+Angehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
 $labels['itipcancelsubject'] = '"$title" wurde abgesagt';
-$labels['itipcancelmailbody'] = '*$title*
-
+$labels['itipcancelmailbody'] = "*$title*
 Fällig: $date
-
 Teilnehmer: $attendees
-
 Die Aufgabe wurde durch $organizer storniert.
-
-Angehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.';
+Angehängt finden Sie eine iCalendar-Datei mit den aktualisierten Aufgabendetails.";
 $labels['saveintasklist'] = 'speichern in';
 $labels['taskhistory'] = 'Historie';
 $labels['objectchangelog'] = 'Änderungshistorie';
@@ -163,52 +159,33 @@
 $labels['objectrestoresuccess'] = 'Revision $rev erfolgreich wiederhergestellt';
 $labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Revision';
 $labels['itipobjectnotfound'] = 'Die Aufgabe, auf welche sich diese Nachricht bezieht, wurde nicht in Ihrer Aufgabenliste gefunden.';
-$labels['itipmailbodyaccepted'] = '$sender hat die Zuweisung folgender Aufgabe akzeptiert:
-
+$labels['itipmailbodyaccepted'] = "$sender hat die Zuweisung folgender Aufgabe akzeptiert:
 *$title*
-
 Fällig: $date
-
-Verantwortlich: $attendees';
-$labels['itipmailbodytentative'] = '$sender hat die Zuweisung folgender Aufgabe unter Vorbehalt akzeptiert:
-
+Verantwortlich: $attendees";
+$labels['itipmailbodytentative'] = "$sender hat die Zuweisung folgender Aufgabe unter Vorbehalt akzeptiert:
 *$title*
-
 Fällig: $date
-
-Verantwortlich: $attendees';
-$labels['itipmailbodydeclined'] = '$sender hat die Zuweisung folgender Aufgabe abgeleht:
-
+Verantwortlich: $attendees";
+$labels['itipmailbodydeclined'] = "$sender hat die Zuweisung folgender Aufgabe abgeleht:
 *$title*
-
 Fällig: $date
-
-Verantwortlich: $attendees';
-$labels['itipmailbodycancel'] = '$sender hat die Zuweisung folgender Aufgabe abgeleht:
-
+Verantwortlich: $attendees";
+$labels['itipmailbodycancel'] = "$sender hat die Zuweisung folgender Aufgabe abgeleht:
 *$title*
-
-Fällig: $date';
-$labels['itipmailbodyin-process'] = '$sender hat den Status folgender Aufgabe auf in-Bearbeitung gesetzt:
-
+Fällig: $date";
+$labels['itipmailbodyin-process'] = "$sender hat den Status folgender Aufgabe auf in-Bearbeitung gesetzt:
 *$title*
-
-Fällig: $date';
-$labels['itipmailbodycompleted'] = '$sender hat folgende Aufgabe abgeschlossen:
-
+Fällig: $date";
+$labels['itipmailbodycompleted'] = "$sender hat folgende Aufgabe abgeschlossen:
 *$title*
-
-Fällig: $date';
-$labels['itipmailbodydelegated'] = '$sender hat folgende Aufgabe delegiert:
-
+Fällig: $date";
+$labels['itipmailbodydelegated'] = "$sender hat folgende Aufgabe delegiert:
 *$title*
-
-Fällig: $date';
-$labels['itipmailbodydelegatedto'] = '$sender hat folgende Aufgabe an Sie delegiert:
-
+Fällig: $date";
+$labels['itipmailbodydelegatedto'] = "$sender hat folgende Aufgabe an Sie delegiert:
 *$title*
-
-Fällig: $date';
+Fällig: $date";
 $labels['attendeeaccepted'] = 'Delegierter hat akzeptiert';
 $labels['attendeetentative'] = 'Delegierter hat unter Vorbehalt akzeptiert';
 $labels['attendeedeclined'] = 'Delegierter hat abgelehnt';
@@ -234,8 +211,6 @@
 $labels['importerror'] = 'Fehler beim Importieren';
 $labels['newerversionexists'] = 'Eine neuere Version dieser Aufgabe existiert bereits! Abbruch.';
 $labels['nowritetasklistfound'] = 'Keine Aufgabenliste zum Speichern der Aufgabe gefunden';
-$labels['importedsuccessfully'] = 'Die Aufgabe wurde erfolgreich unter \'$list\' gespeichert';
-$labels['updatedsuccessfully'] = 'Die Aufgabe wurde erfolgreich in \'$list\' aktualisiert';
 $labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
 $labels['itipresponseerror'] = 'Senden der Antwort auf diese Aufgabenzuweisung fehlgeschlagen';
 $labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig.';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/es_AR.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/es_AR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/es_ES.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/es_ES.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/et_EE.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/et_EE.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/fi_FI.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/fi_FI.inc Changed

@@ -83,7 +83,8 @@
 $labels['tabrecurrence'] = 'Toistuminen';
 $labels['tabattachments'] = 'Liitteet';
 $labels['tabsharing'] = 'Jakaminen';
-$labels['editlist'] = 'Muokkaa listaa';
+$labels['editlist'] = 'Muokkaa tai jaa lista';
+$labels['deletelist'] = 'Poista lista';
 $labels['createlist'] = 'Lisää lista';
 $labels['listactions'] = 'Listan valinnat...';
 $labels['listname'] = 'Nimi';
@@ -91,6 +92,7 @@
 $labels['import'] = 'Tuo';
 $labels['importtasks'] = 'Tuo tehtäviä';
 $labels['viewactions'] = 'Näytä toiminnot';
+$labels['focusview'] = 'Näytä vain tämä lista';
 $labels['yes'] = 'kyllä';
 $labels['savingdata'] = 'Tallennetaan tietoja...';
 $labels['errorsaving'] = 'Tietojen tallenntaminen epäonnistui.';
@@ -103,8 +105,16 @@
 $labels['deletelistconfirmrecursive'] = 'Haluatko varmasti poistaa tämän listan, sen alilistat ja tehtävät?';
 $labels['aclnorights'] = 'Sinulla ei ole ylläpitäjän oikeuksia tähän tehtävälistaan.';
 $labels['changetaskconfirm'] = 'Päivitä tehtävä';
+$labels['changeconfirmnotifications'] = 'Haluatko ilmoittaa osanottajille muokkauksesta?';
 $labels['partstatupdatenotification'] = 'Haluatko huomauttaa järjestäjää tilamuutoksesta?';
 $labels['arialabelquickaddbox'] = 'Tehtävän pikalisäys';
+$labels['arialabelsearchform'] = 'Tehtävän hakulomake';
+$labels['arialabelquicksearchbox'] = 'Tehtävän hakusyöte';
+$labels['arialabellistsearchform'] = 'Tehtävälistojen hakulomake';
+$labels['arialabeltasklisting'] = 'Tehtävälistaus';
+$labels['arialabelsortmenu'] = 'Tehtävien järjestysvalinnat';
+$labels['arialabeltasklistform'] = 'Tehtävien listaominaisuudet';
+$labels['arialabeltaskform'] = 'Tehtävän muokkauslomake';
 $labels['role'] = 'Rooli';
 $labels['availability'] = 'Saatavilla';
 $labels['confirmstate'] = 'Tila';
@@ -123,10 +133,12 @@
 $labels['objectnotfound'] = 'Tehtävän tietojen lataaminen epäonnistui';
 $labels['objectchangelognotavailable'] = 'Muutoshistoria ei ole käytettävissä tälle tehtävälle';
 $labels['objectdiffnotavailable'] = 'Valituille versioille ei ole mahdollista tehdä vertailua';
+$labels['revisionrestoreconfirm'] = 'Haluatko palauttaa tämän tehtävän version $rev? Toimenpide korvaa nykyisen tehtävän vanhemmalla versiolla.';
 $labels['objectrestoresuccess'] = 'Versio $rev palautettu onnistuneesti';
 $labels['objectrestoreerror'] = 'Vanhan version palauttaminen epäonnistui';
 $labels['itipcomment'] = 'Kutsun/herätteen kommentit';
 $labels['removefromcalendar'] = 'Poista omista tehtävistä';
+$labels['importtext'] = 'Voit lähettää tehtäviä <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a>-muodossa (.ics).';
 $labels['andnmore'] = '$nr lisää...';
 $labels['savetotasklist'] = 'Tallenna tehtäviin';
 $labels['comment'] = 'Kommentti';
@@ -134,10 +146,13 @@
 $labels['errorimportingtask'] = 'Tehtävien tuonti epäonnistui';
 $labels['importwarningexists'] = 'Kopio tästä tehtävästä on jo olemassa tehtävälistassasi.';
 $labels['importsuccess'] = '$nr tehtävää tuotiin onnistuneesti';
+$labels['importnone'] = 'Tehtäviä ei löytynyt tuotavaksi';
 $labels['importerror'] = 'Tuotaessa tapahtui virhe';
 $labels['newerversionexists'] = 'Tästä tehtävästä on jo uudempi versio! Peruttiin toiminto.';
 $labels['nowritetasklistfound'] = 'Ei löytynyt tehtävälistaa, johon tallentaa tehtävä';
 $labels['importedsuccessfully'] = 'Tehtävä lisättiin listaan \'$list\'';
+$labels['updatedsuccessfully'] = 'Tehtävä päivitettiin listassa \'$list\'';
 $labels['attendeupdateesuccess'] = 'Osallistujan tila päivitetty onnistuneesti';
 $labels['itipinvalidrequest'] = 'Kutsu ei ole enää kelvollinen';
 $labels['successremoval'] = 'Tehtävä poistettiin onnistuneesti.';
+$labels['invalidlistproperties'] = 'Virheelliset listan ominaisuudet! Aseta listalle kelvollinen nimi.';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/fr_FR.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/fr_FR.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/hu_HU.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/hu_HU.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/it_IT.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/it_IT.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/ja_JP.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/ja_JP.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/nl_NL.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/nl_NL.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/pl.inc Added

@@ -0,0 +1,94 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['navtitle'] = 'Zadania';
+$labels['lists'] = 'Lista zadań';
+$labels['list'] = 'Lista zadań';
+$labels['tags'] = 'Tagi';
+$labels['export'] = 'Eksport';
+$labels['exporttitle'] = 'Eksport w formacie iCalendar';
+$labels['exportattachments'] = 'Z załącznikami';
+$labels['tasklistsubscribe'] = 'Dodaj do listy na stałe';
+$labels['listsearchresults'] = 'Dostępne listy zadań';
+$labels['findlists'] = 'Szukaj list zadań...';
+$labels['searchterms'] = 'Szukana fraza';
+$labels['notasklistsfound'] = 'Nie znaleziono list zadań';
+$labels['removelist'] = 'Usuń z listy';
+$labels['newtask'] = 'Nowe zadanie';
+$labels['createtask'] = 'Utwórz zadanie <Enter>';
+$labels['createnewtask'] = 'Utwórz nowe zadanie (np sobota, zrobić zakupy)';
+$labels['createfrommail'] = 'Zapisz jako zadanie';
+$labels['printdescriptions'] = 'Drukuj opisy';
+$labels['edit'] = 'Edytuj';
+$labels['delete'] = 'Usuń';
+$labels['title'] = 'Tytuł';
+$labels['description'] = 'Opis';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Początek';
+$labels['alarms'] = 'Przypomnienie';
+$labels['repeat'] = 'Powtórz';
+$labels['links'] = 'Reference';
+$labels['status'] = 'Status';
+$labels['status-cancelled'] = 'Anulowane';
+$labels['created'] = 'Utworzone';
+$labels['changed'] = 'Ostatnia modyfikacja';
+$labels['taskoptions'] = 'Opcje';
+$labels['all'] = 'Wszystko';
+$labels['today'] = 'Dzisiaj';
+$labels['tomorrow'] = 'Jutro';
+$labels['next7days'] = 'Następne 7 dni';
+$labels['later'] = 'Później';
+$labels['assigned'] = 'Przydzielone';
+$labels['mytasks'] = 'Moje zadania';
+$labels['mytaskstitle'] = 'Zadania przypisane do Ciebie';
+$labels['nodate'] = 'brak daty';
+$labels['removetag'] = 'Usuń';
+$labels['removelink'] = 'Usuń odnośnik e-mail';
+$labels['auto'] = 'Auto';
+$labels['newtask'] = 'Nowe zadanie';
+$labels['edittask'] = 'Edytuj zadanie';
+$labels['save'] = 'Zapisz';
+$labels['cancel'] = 'Anuluj';
+$labels['addsubtask'] = 'Dodaj podzadanie';
+$labels['deletetask'] = 'Usuń zadanie';
+$labels['deletethisonly'] = 'Usuń tylko to zadanie';
+$labels['deletewithchilds'] = 'Usuń wraz z podzadaniami';
+$labels['taskactions'] = 'Opcje zadania';
+$labels['tabsummary'] = 'Podsumowanie';
+$labels['tabrecurrence'] = 'Powtarzalność';
+$labels['tabattachments'] = 'Załączniki';
+$labels['tabsharing'] = 'Udostępnianie';
+$labels['createlist'] = 'Dodaj listę';
+$labels['listactions'] = 'Opcje listy...';
+$labels['listname'] = 'Nazwa';
+$labels['showalarms'] = 'Pokaż powiadomienia';
+$labels['import'] = 'Importuj';
+$labels['savingdata'] = 'Zapisuję dane...';
+$labels['role'] = 'Rola';
+$labels['availability'] = 'Dostępny';
+$labels['confirmstate'] = 'Status';
+$labels['roleorganizer'] = 'Organizator';
+$labels['rolerequired'] = 'Wymagane';
+$labels['roleoptional'] = 'Opcjonalny';
+$labels['rolechair'] = 'Przewodniczący';
+$labels['sendinvitations'] = 'Wyślij zaproszenia';
+$labels['itipupdatesubject'] = '"$title" zostało zaktualizowane';
+$labels['itipcancelsubject'] = '"$title" zostało anulowane';
+$labels['taskhistory'] = 'Historia';
+$labels['objectchangelog'] = 'Historia zmian';
+$labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
+$labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
+$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
+$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
+$labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
+$labels['andnmore'] = '$nr więcej...';
+$labels['comment'] = 'Komentarz';
+$labels['rsvpcomment'] = 'Komentarz';
+$labels['importerror'] = 'Wystąpił błąd podczas importu.';
+$labels['attendeupdateesuccess'] = 'Zaktualizowano status uczestnika.';
+$labels['itipinvalidrequest'] = 'To zaproszenie nie jest już aktualne.';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/pl_PL.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/pl_PL.inc Changed

@@ -7,89 +7,193 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
 $labels['navtitle'] = 'Zadania';
-$labels['lists'] = 'Lista zadań';
+$labels['lists'] = 'Listy zadań';
 $labels['list'] = 'Lista zadań';
 $labels['tags'] = 'Tagi';
 $labels['export'] = 'Eksport';
 $labels['exporttitle'] = 'Eksport w formacie iCalendar';
 $labels['exportattachments'] = 'Z załącznikami';
+$labels['currentview'] = 'bieżący widok';
 $labels['tasklistsubscribe'] = 'Dodaj do listy na stałe';
 $labels['listsearchresults'] = 'Dostępne listy zadań';
-$labels['findlists'] = 'Szukaj list zadań...';
+$labels['findlists'] = 'Wyszukaj listy zadań...';
+$labels['findtasks'] = 'Znajdź zadania...';
 $labels['searchterms'] = 'Szukana fraza';
-$labels['notasklistsfound'] = 'Nie znaleziono list zadań';
+$labels['notasklistsfound'] = 'Nie znaleziono żanych list zadań';
+$labels['nrtasklistsfound'] = 'Znaleziono $nr list zadań';
 $labels['removelist'] = 'Usuń z listy';
+$labels['showcaldavurl'] = 'Pokaż CalDAV URL';
+$labels['caldavurldescription'] = 'Skopiuj ten adres do aplikacji obsługującej <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (np. Evolution lub Mozilla Thunderbird) aby zsynchronizować wybraną listę zadań z twoim komputerem lub urządzeniem mobilnym.';
 $labels['newtask'] = 'Nowe zadanie';
 $labels['createtask'] = 'Utwórz zadanie <Enter>';
-$labels['createnewtask'] = 'Utwórz nowe zadanie (np sobota, zrobić zakupy)';
+$labels['createnewtask'] = 'Utwórz nowe zadanie (n.p. sobota, skosić trawnik)';
 $labels['createfrommail'] = 'Zapisz jako zadanie';
+$labels['printtitle'] = 'Drukuj zadania';
 $labels['printdescriptions'] = 'Drukuj opisy';
+$labels['mark'] = 'Zaznacz';
+$labels['unmark'] = 'Odznacz';
 $labels['edit'] = 'Edytuj';
 $labels['delete'] = 'Usuń';
 $labels['title'] = 'Tytuł';
 $labels['description'] = 'Opis';
+$labels['datetime'] = 'Termin';
+$labels['duetime'] = 'Due time';
 $labels['start'] = 'Start';
 $labels['starttime'] = 'Początek';
 $labels['alarms'] = 'Przypomnienie';
 $labels['repeat'] = 'Powtórz';
 $labels['links'] = 'Reference';
 $labels['status'] = 'Status';
-$labels['status-cancelled'] = 'Anulowane';
-$labels['created'] = 'Utworzone';
+$labels['status-needs-action'] = 'Wymagane działanie';
+$labels['status-in-process'] = 'W trakcie';
+$labels['status-completed'] = 'Ukończone';
+$labels['status-cancelled'] = 'Anulowany';
+$labels['assignedto'] = 'Przypisane do';
+$labels['created'] = 'Utworzono';
 $labels['changed'] = 'Ostatnia modyfikacja';
 $labels['taskoptions'] = 'Opcje';
-$labels['all'] = 'Wszystko';
+$labels['all'] = 'Wszystkie';
+$labels['flagged'] = 'Oflagowane';
+$labels['complete'] = 'Ukończone';
+$labels['completeness'] = 'Postęp';
+$labels['overdue'] = 'Po terminie';
 $labels['today'] = 'Dzisiaj';
 $labels['tomorrow'] = 'Jutro';
-$labels['next7days'] = 'Następne 7 dni';
-$labels['later'] = 'Później';
-$labels['assigned'] = 'Przydzielone';
+$labels['next7days'] = 'Kolejne 7 dni';
+$labels['later'] = 'Późniejsze';
+$labels['assigned'] = 'Przypisane';
+$labels['assignedtitle'] = 'Zadania które przypisałeś innym';
 $labels['mytasks'] = 'Moje zadania';
-$labels['mytaskstitle'] = 'Zadania przypisane do Ciebie';
-$labels['nodate'] = 'brak daty';
+$labels['mytaskstitle'] = 'Zadania przypisane do ciebie';
+$labels['nodate'] = 'Bez daty';
 $labels['removetag'] = 'Usuń';
 $labels['removelink'] = 'Usuń odnośnik e-mail';
-$labels['auto'] = 'Auto';
+$labels['auto'] = 'Automatycznie';
+$labels['taskdetails'] = 'Szczegóły zadania';
 $labels['newtask'] = 'Nowe zadanie';
 $labels['edittask'] = 'Edytuj zadanie';
 $labels['save'] = 'Zapisz';
 $labels['cancel'] = 'Anuluj';
+$labels['saveandnotify'] = 'Zapisz i powiadom';
 $labels['addsubtask'] = 'Dodaj podzadanie';
 $labels['deletetask'] = 'Usuń zadanie';
 $labels['deletethisonly'] = 'Usuń tylko to zadanie';
-$labels['deletewithchilds'] = 'Usuń wraz z podzadaniami';
-$labels['taskactions'] = 'Opcje zadania';
+$labels['deletewithchilds'] = 'Usuń z wszystkimi podzadaniami';
+$labels['taskactions'] = 'Opcje zadań...';
 $labels['tabsummary'] = 'Podsumowanie';
 $labels['tabrecurrence'] = 'Powtarzalność';
+$labels['tabassignments'] = 'Przypisania';
 $labels['tabattachments'] = 'Załączniki';
 $labels['tabsharing'] = 'Udostępnianie';
-$labels['editlist'] = 'Edytuj listę';
 $labels['createlist'] = 'Dodaj listę';
 $labels['listactions'] = 'Opcje listy...';
 $labels['listname'] = 'Nazwa';
 $labels['showalarms'] = 'Pokaż powiadomienia';
 $labels['import'] = 'Importuj';
+$labels['importtasks'] = 'Importuj zadania';
+$labels['viewactions'] = 'Podgląd akcji';
+$labels['focusview'] = 'Pokaż tylko tę listę';
+$labels['activate'] = 'Aktywuj';
+$labels['on'] = 'na';
+$labels['at'] = 'w';
+$labels['this'] = 'ten';
+$labels['next'] = 'następny';
+$labels['yes'] = 'tak';
 $labels['savingdata'] = 'Zapisuję dane...';
+$labels['errorsaving'] = 'Błąd podczas zapisu danych.';
+$labels['notasksfound'] = 'Nie znaleziono zadań spełniających kryteria';
+$labels['invalidstartduedates'] = 'Data rozpoczęcia nie może być wcześniejsza od ukończenia. ';
+$labels['invalidstartduetimes'] = 'Obie daty muszą określać godzinę albo żadna z nich.';
+$labels['recurrencerequiresdate'] = 'Zadania powtarzające się muszą zawierać datę początku lub końca.';
+$labels['deletetasktconfirm'] = 'Na pewno chcesz usunąć to zadanie ?';
+$labels['deleteparenttasktconfirm'] = 'Na pewno chcesz usunąć to zadanie z wszystkimi podzadaniami ?';
+$labels['deletelistconfirm'] = 'Na pewno chcesz usunąć tą listę z wszystkimi zadaniami ?';
+$labels['deletelistconfirmrecursive'] = 'Czy na pewno chcesz usunąć tą listę wraz z wszystkimi zadaniami oraz pod-listami?';
+$labels['aclnorights'] = 'Nie posiadasz praw administracyjnych do tej listy zadań.';
+$labels['changetaskconfirm'] = 'Aktualizuj zadanie';
+$labels['changeconfirmnotifications'] = 'Czy chcesz powiadomić uczestników o tej modyfikacji?';
+$labels['partstatupdatenotification'] = 'Czy chcesz powiadomić organizatora o zmianie statusu?';
+$labels['quickaddinput'] = 'Data i tytuł nowego zadania';
+$labels['arialabelquickaddbox'] = 'Szybkie tworzenie nowego zadania';
+$labels['arialabelsearchform'] = 'Formularz wyszukiwania zadań';
+$labels['arialabelquicksearchbox'] = 'Fraza wyszukiwania';
+$labels['arialabellistsearchform'] = 'Formularz wyszukiwania list zadań';
+$labels['arialabeltaskselector'] = 'Tryb listy';
+$labels['arialabeltasklisting'] = 'Lista zadań';
+$labels['arialabelsortmenu'] = 'Opcje sortowania zadań';
+$labels['arialabeltasklistform'] = 'Właściwości listy zadań';
+$labels['arialabeltaskform'] = 'Formularz edycji zadania';
+$labels['attendee'] = 'Przypisany';
 $labels['role'] = 'Rola';
 $labels['availability'] = 'Dostępny';
 $labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Dodaj przypisanie';
 $labels['roleorganizer'] = 'Organizator';
-$labels['rolerequired'] = 'Wymagane';
+$labels['rolerequired'] = 'Wymagany';
 $labels['roleoptional'] = 'Opcjonalny';
 $labels['rolechair'] = 'Przewodniczący';
+$labels['rolenonparticipant'] = 'Obserwator';
 $labels['sendinvitations'] = 'Wyślij zaproszenia';
+$labels['sendnotifications'] = 'Powiadom przypisanych o modyfikacjach';
+$labels['sendcancellation'] = 'Powiadom przypisanych o anulowaniu zadania';
+$labels['invitationsubject'] = 'Zostałeś przypisany do "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nDo kiedy: \$date\n\nPrzypisani: \$attendees\n\n\$description\n\nW załączeniu plik w formacie iCalendar ze szczegółami zadania, który możesz zaimportować do twojej aplikacji.";
 $labels['itipupdatesubject'] = '"$title" zostało zaktualizowane';
+$labels['itipupdatesubjectempty'] = 'Zadanie które cię dotyczy zostało zaktualizowane';
+$labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with the updated task details which you can import to your tasks application.";
 $labels['itipcancelsubject'] = '"$title" zostało anulowane';
+$labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nThe task has been cancelled by \$organizer.\n\nPlease find attached an iCalendar file with the updated task details.";
+$labels['saveintasklist'] = 'zapisz w';
 $labels['taskhistory'] = 'Historia';
 $labels['objectchangelog'] = 'Historia zmian';
 $labels['objectdiff'] = 'Zmiany od $rev1 do $rev2';
+$labels['objectnotfound'] = 'Błąd pobierania danych zadania';
+$labels['objectchangelognotavailable'] = 'Historia zmian nie jest dostępna dla tego zadania';
 $labels['objectdiffnotavailable'] = 'Nie można porównać wybranych wersji';
-$labels['objectrestoresuccess'] = 'Wersja $rev została pomyślnie przywrócona';
-$labels['objectrestoreerror'] = 'Nie udało się przywrócić starej wersji';
+$labels['revisionrestoreconfirm'] = 'Czy na pewno chcesz przywrócić rewizję $rev tego zadania? Starsza wersja nadpisze obecną.';
+$labels['objectrestoresuccess'] = 'Wersja $rev poprawnie przywrócona';
+$labels['objectrestoreerror'] = 'Błąd przywracania starej wersji';
+$labels['itipobjectnotfound'] = 'W twojej liście zadań nie znaleziono zadania związanego z tą wiadomością';
+$labels['itipmailbodyaccepted'] = "\$sender zaakceptował przydzielenie do następującego zadania:\n\n*\$title*\n\nTermin: \$date\n\nUczestnicy: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender wstęnie zaakceptował przydzielenie do następującego zadania:\n\n*\$title*\n\nTermin: \$date\n\nUczestnicy: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender obniżył przydzielenie do następującego zadania:\n\n*\$title*\n\nTermin: \$date\n\nUczestnicy: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender odrzucił przydzielenie do następującego zadania:\n\n*\$title*\n\nTermin: \$date";
+$labels['itipmailbodyin-process'] = "\$sender ustanowił status następującego zadania na w trakcie:\n\n*\$title*\n\nTermin: \$date";
+$labels['itipmailbodycompleted'] = "\$sender has completed the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegated'] = "\$sender has delegated the following task:\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender has delegated the following task to you:\n\n*\$title*\n\nDue: \$date";
+$labels['attendeeaccepted'] = 'Przydzielenie zaakceptowane';
+$labels['attendeetentative'] = 'Przydzielenie warunkowo zaakceptowane';
+$labels['attendeedeclined'] = 'Przydzielenie obniżone';
+$labels['attendeedelegated'] = 'Przydzielenie oddelegowane do $delegatedto';
+$labels['attendeein-process'] = 'Przydzielenie w trakcie';
+$labels['attendeecompleted'] = 'Przydzielenie zakończone';
+$labels['acceptinvitation'] = 'Zatwierdzasz to przydzielenie?';
+$labels['itipdeclinetask'] = 'Decline your assignment to this task to the organizer';
+$labels['declinedeleteconfirm'] = 'Do you also want to delete this declined task from your tasks list?';
 $labels['itipcomment'] = 'Komentarz zaproszenia/powiadomienia';
+$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
+$labels['itipsendsuccess'] = 'Powiadomienie wysłane do beneficjentów';
+$labels['errornotifying'] = 'Nie można wysłać wiadomości do beneficjentów zadania';
+$labels['removefromcalendar'] = 'Usuń z moich zadań';
+$labels['delegateinvitation'] = 'Oddelegowanie przydzieleń';
+$labels['importtext'] = 'Możesz przesyłać zadania w formacie <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> (.ics).';
 $labels['andnmore'] = '$nr więcej...';
+$labels['savetotasklist'] = 'Zapisz w zadaniach';
 $labels['comment'] = 'Komentarz';
 $labels['rsvpcomment'] = 'Komentarz';
+$labels['errorimportingtask'] = 'Nie można dokonać importu zadań(ia) ';
+$labels['importwarningexists'] = 'Kopia tego zadania już istnieje w twojej liście zadań';
+$labels['importsuccess'] = 'Pomyślnie zaimportowano $nr zadań';
+$labels['importnone'] = 'Nie znaleziono zadań do zaimportowania';
 $labels['importerror'] = 'Wystąpił błąd podczas importu.';
+$labels['newerversionexists'] = 'Nowsza wersja tego zadania już istnieje! Przerwano';
+$labels['nowritetasklistfound'] = 'Nie znaleziono listy zadań do zapisu zadania.';
+$labels['importedsuccessfully'] = 'Zadanie zostało pomyślnie dodane do \'$list\'';
+$labels['updatedsuccessfully'] = 'Zadanie zostało pomyślnie zaktualizowane w \'$list\'';
 $labels['attendeupdateesuccess'] = 'Zaktualizowano status uczestnika.';
+$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
 $labels['itipinvalidrequest'] = 'To zaproszenie nie jest już aktualne.';
+$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
+$labels['successremoval'] = 'Zadanie zostało pomyślnie usunięte.';
+$labels['invalidlistproperties'] = 'Błędne właściwości listy! Wprowadź poprawną nazwę.';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/pt_BR.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/pt_BR.inc Changed

@@ -68,6 +68,7 @@
 $labels['removetag'] = 'Remover';
 $labels['removelink'] = 'Remover referência do email';
 $labels['auto'] = 'Automático';
+$labels['taskdetails'] = 'Detalhes';
 $labels['newtask'] = 'Nova Tarefa';
 $labels['edittask'] = 'Editar Tarefa';
 $labels['save'] = 'Gravar';
@@ -83,7 +84,6 @@
 $labels['tabassignments'] = 'Atribuições';
 $labels['tabattachments'] = 'Anexos';
 $labels['tabsharing'] = 'Compartilhamento';
-$labels['editlist'] = 'Editar lista';
 $labels['createlist'] = 'Adicionar lista';
 $labels['listactions'] = 'Opções da lista...';
 $labels['listname'] = 'Nome';
@@ -100,8 +100,7 @@
 $labels['errorsaving'] = 'Falha ao salvar dados.';
 $labels['notasksfound'] = 'Nenhuma tarefa encontrada com estes critérios';
 $labels['invalidstartduedates'] = 'Data de início não deve ser maior que data de término.';
-$labels['invalidstartduetimes'] = 'Ambas as datas de início e término devem ser especificadas ou não com um horário.
-';
+$labels['invalidstartduetimes'] = 'Ambas as datas de início e término devem ser especificadas ou não com um horário.';
 $labels['recurrencerequiresdate'] = 'Tarefas recursivas requerem ou uma data de início ou de término.';
 $labels['deletetasktconfirm'] = 'Você realmente quer excluir esta tarefa?';
 $labels['deleteparenttasktconfirm'] = 'Você realmente quer excluir esta tarefa e todas suas subtarefas?';
@@ -118,6 +117,7 @@
 $labels['arialabellistsearchform'] = 'Formulário de busca de listas de tarefas';
 $labels['arialabeltaskselector'] = 'Modo lista';
 $labels['arialabeltasklisting'] = 'Listagem de tarefas';
+$labels['arialabelsortmenu'] = 'Opções de classificação de tarefas';
 $labels['attendee'] = 'Designar';
 $labels['role'] = 'Papel';
 $labels['availability'] = 'Disp.';
@@ -132,13 +132,61 @@
 $labels['sendnotifications'] = 'Notificar designados sobre as modificações';
 $labels['sendcancellation'] = 'Notificar designados sobre tarefa cancelada';
 $labels['invitationsubject'] = 'Você foi designado para "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com todos os detalhes da tarefa na qual você pode importar para sua aplicação de tarefas.";
 $labels['itipupdatesubject'] = '"$title" foi atualizado';
 $labels['itipupdatesubjectempty'] = 'Uma tarefa de sua atenção foi atualizada';
+$labels['itipupdatemailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados da tarefa na qual você pode importar para sua aplicação de tarefa.";
+$labels['itipcancelsubject'] = '"$title" has been cancelled';
+$labels['itipcancelmailbody'] = "*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees\n\nA tarefa foi cancelada por \$organizer.\n\nSegue em anexo um arquivo iCalendar com os detalhes atualizados da tarefa.";
 $labels['saveintasklist'] = 'salvar em';
 $labels['taskhistory'] = 'Histórico';
 $labels['objectchangelog'] = 'Mudar Histórico';
+$labels['objectdiff'] = 'Alterações da $rev1 para $rev2';
+$labels['objectnotfound'] = 'Falha ao ler os dados da tarefa';
+$labels['objectchangelognotavailable'] = 'Não é possível alterar o histórico desta tarefa';
+$labels['objectdiffnotavailable'] = 'Não é possível comparar as revisões selecionadas';
+$labels['revisionrestoreconfirm'] = 'Confirmar a restauração da revisão $rev desta tarefa? Os dados atuais serão substituídos pelos da versão anterior.';
+$labels['objectrestoresuccess'] = 'Revisão $rev restaurada com sucesso';
+$labels['objectrestoreerror'] = 'Falha ao restaurar a revisão antiga';
+$labels['itipobjectnotfound'] = 'A tarefa referenciada por esta mensagem não foi encontrada em sua lista de tarefas.';
+$labels['itipmailbodyaccepted'] = "\$sender aceitou o convite para a seguinte tarefa:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender aceitou como tentativa o convite para a seguinte tarefa:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender recusou o convite para a seguinte tarefa:\n\n*\$title*\n\nQuando: \$date\n\nConvidados: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender rejeitou sua participação na seguinte tarefa:\n\n*\$title*\n\nQuando: \$date";
+$labels['itipmailbodyin-process'] = "\$sender definiu a situação da tarefa a seguir para em progresso:\n\n*\$title*\n\nQuando: \$date";
+$labels['itipmailbodycompleted'] = "\$sender completou a seguinte tarefa:\n\n*\$title*\n\nQuando: \$date";
+$labels['itipmailbodydelegated'] = "\$sender delegou a participação na seguinte tarefa:\n\n*\$title*\n\Quando: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender delegou a sua participação na seguinte tarefa:\n\n*\$title*\n\nQuando: \$date";
+$labels['attendeeaccepted'] = 'Designado aceitou';
+$labels['attendeetentative'] = 'Designado aceitou provisoriamente';
+$labels['attendeedeclined'] = 'Designado recusou';
+$labels['attendeedelegated'] = 'Designado delegou para $delegatedto';
+$labels['attendeein-process'] = 'Designado está em processo';
+$labels['attendeecompleted'] = 'Designado completou';
+$labels['acceptinvitation'] = 'Você aceita essa tarefa?';
+$labels['itipdeclinetask'] = 'Recusar atribuição a essa tarefa para o organizador';
+$labels['declinedeleteconfirm'] = 'Também deseja apagar a tarefa recusada da sua lista de tarefas?';
+$labels['itipcomment'] = 'Observações — Convite/notificação';
+$labels['itipcommenttitle'] = 'Estas observações serão enviadas com o convite/notificação aos participantes.';
+$labels['itipsendsuccess'] = 'Convite enviado aos participantes.';
+$labels['errornotifying'] = 'Falha ao enviar notificações para os participantes da tarefa.';
+$labels['removefromcalendar'] = 'Remover das minhas tarefas';
+$labels['delegateinvitation'] = 'Delegar atribuição';
+$labels['andnmore'] = '$nr mais...';
+$labels['savetotasklist'] = 'Salvar em tarefas';
 $labels['comment'] = 'Comentário';
 $labels['rsvpcomment'] = 'Comentário';
+$labels['errorimportingtask'] = 'Falha ao importar tarefa(s)';
+$labels['importwarningexists'] = 'Uma cópia desta tarefa já existe em sua lista de tarefas.';
+$labels['importsuccess'] = 'Importado com sucesso $nr tarefas';
 $labels['importerror'] = 'Ocorreu um erro na importação';
+$labels['newerversionexists'] = 'Já existe uma nova versão desta tarefa! Abortado.';
+$labels['nowritetasklistfound'] = 'Nenhuma lista de tarefas encontrada para salvar a tarefa';
+$labels['importedsuccessfully'] = 'A tarefa foi adicionada com sucesso em \'$list\'';
+$labels['updatedsuccessfully'] = 'A tarefa foi atualizada com sucesso em \'$list\'';
 $labels['attendeupdateesuccess'] = 'O status do participante foi atualizado com sucesso.';
+$labels['itipresponseerror'] = 'Falha ao enviar a resposta para este convite de tarefa';
 $labels['itipinvalidrequest'] = 'Este convite não é mais válido';
+$labels['sentresponseto'] = 'Resposta de convite enviada com sucesso para $mailto';
+$labels['successremoval'] = 'A tarefa foi excluída com sucesso.';
+$labels['invalidlistproperties'] = 'Propriedades de lista inválidas! Por favor, defina um nome válido.';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/ru_RU.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/ru_RU.inc Changed

@@ -17,6 +17,7 @@
 $labels['tasklistsubscribe'] = 'Всегда показывать';
 $labels['listsearchresults'] = 'Доступные списки задач';
 $labels['findlists'] = 'Найти списки задач...';
+$labels['findtasks'] = 'Найти задачи ...';
 $labels['searchterms'] = 'Условия поиска';
 $labels['notasklistsfound'] = 'Списки задач не найдены';
 $labels['nrtasklistsfound'] = '$nr списков задач найдено';
@@ -68,6 +69,7 @@
 $labels['removetag'] = 'Убрать';
 $labels['removelink'] = 'Удалить ссылку на письмо';
 $labels['auto'] = 'Авто';
+$labels['taskdetails'] = 'Детали задачи';
 $labels['newtask'] = 'Новая задача';
 $labels['edittask'] = 'Редактировать задачу';
 $labels['save'] = 'Сохранить';
@@ -83,14 +85,17 @@
 $labels['tabassignments'] = 'Задания';
 $labels['tabattachments'] = 'Вложения';
 $labels['tabsharing'] = 'Поделиться';
-$labels['editlist'] = 'Изменить список';
+$labels['editlist'] = 'Редактировать/Поделиться списком';
+$labels['deletelist'] = 'Удалить список';
 $labels['createlist'] = 'Добавить список';
 $labels['listactions'] = 'Действия со списком...';
 $labels['listname'] = 'Название';
 $labels['showalarms'] = 'Показывать напоминания';
 $labels['import'] = 'Импорт';
+$labels['importtasks'] = 'Задачи импорта';
 $labels['viewactions'] = 'Просмотр действий';
 $labels['focusview'] = 'Просмотреть только этот список';
+$labels['activate'] = 'Активировать';
 $labels['on'] = 'в';
 $labels['at'] = 'в';
 $labels['this'] = 'этот';
@@ -118,6 +123,8 @@
 $labels['arialabeltaskselector'] = 'Списком';
 $labels['arialabeltasklisting'] = 'Список задач';
 $labels['arialabelsortmenu'] = 'Настройки сортировки списка задач';
+$labels['arialabeltasklistform'] = 'Параметры списка задач';
+$labels['arialabeltaskform'] = 'Форма редактирования задачи';
 $labels['attendee'] = 'Ответственный';
 $labels['role'] = 'Роль';
 $labels['availability'] = 'Доступность';
@@ -132,6 +139,7 @@
 $labels['sendnotifications'] = 'Оповестить ответственных о изменениях';
 $labels['sendcancellation'] = 'Оповестить ответственных об отмене задачи';
 $labels['invitationsubject'] = 'Вас назначили ответственным за "$title"';
+$labels['invitationmailbody'] = "*\$title*\n\nКогда: \$date\n\nОтветственные: \$attendees\n\n\$description\n\nПожалуйста, найдите вложение в iCalendar со всеми деталями задач, которые вы можете импортировать в программу задач.";
 $labels['itipupdatesubject'] = '"$title" было обновлено';
 $labels['itipupdatesubjectempty'] = 'Задача, касающаяся вас, была обновлена';
 $labels['itipupdatemailbody'] = "*\$title*\n\nКогда: \$date\n\nОтветственные: \$attendees\n\nПожалуйста найдите вложения в iCalendar файл со всеми деталями задач которое Вы можете импортировать в вашу программу задач.";
@@ -171,6 +179,7 @@
 $labels['errornotifying'] = 'Не удалось отправить оповещения ответственным';
 $labels['removefromcalendar'] = 'Удалить из моих задач';
 $labels['delegateinvitation'] = 'Назначение представителей';
+$labels['importtext'] = 'Вы можете загружать задачи в формате <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a>  (.ics).';
 $labels['andnmore'] = '$nr больше...';
 $labels['savetotasklist'] = 'Сохранить в задачи';
 $labels['comment'] = 'Комментарий';
@@ -178,6 +187,7 @@
 $labels['errorimportingtask'] = 'Не удалось импортировать задачи';
 $labels['importwarningexists'] = 'Копия этой задачи уже есть в вашем списке задач.';
 $labels['importsuccess'] = 'Успешно импортированы $nr задач';
+$labels['importnone'] = 'Не найдено задач для импорта';
 $labels['importerror'] = 'Ошибка при импорте';
 $labels['newerversionexists'] = 'Новая версия этой задачи уже существует! Отменено.';
 $labels['nowritetasklistfound'] = 'Не найден список задач для сохранения этой задачи';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/sl_SI.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/sl_SI.inc Changed

iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/sv.inc Added

@@ -0,0 +1,62 @@
+<?php
+/**
+ * Localizations for the Kolab Tasks plugin
+ *
+ * Copyright (C) 2014, Kolab Systems AG
+ *
+ * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
+ */
+$labels['navtitle'] = 'Uppgifter';
+$labels['tags'] = 'Taggar';
+$labels['export'] = 'Exportera';
+$labels['exporttitle'] = 'Exportera till iCalendar';
+$labels['exportattachments'] = 'Med bilagor';
+$labels['tasklistsubscribe'] = 'Lista permanent';
+$labels['searchterms'] = 'Sökord';
+$labels['removelist'] = 'Ta bort från lista';
+$labels['printdescriptions'] = 'Skriv ut beskrivning';
+$labels['edit'] = 'Redigera';
+$labels['title'] = 'Titel';
+$labels['description'] = 'Beskrivning';
+$labels['start'] = 'Start';
+$labels['starttime'] = 'Starttid';
+$labels['alarms'] = 'Påminnelse';
+$labels['repeat'] = 'Upprepa';
+$labels['links'] = 'Referens';
+$labels['status'] = 'Status';
+$labels['status-cancelled'] = 'Inställd';
+$labels['created'] = 'Skapad';
+$labels['changed'] = 'Senast ändrad';
+$labels['taskoptions'] = 'Alternativ';
+$labels['all'] = 'Alla';
+$labels['today'] = 'Idag';
+$labels['tomorrow'] = 'Imorgon';
+$labels['removelink'] = 'Ta bort e-postreferens';
+$labels['save'] = 'Spara';
+$labels['cancel'] = 'Avbryt';
+$labels['tabsummary'] = 'Sammanfattning';
+$labels['tabrecurrence'] = 'Återkommande';
+$labels['tabattachments'] = 'Bilagor';
+$labels['tabsharing'] = 'Delning';
+$labels['listname'] = 'Namn';
+$labels['showalarms'] = 'Visa påminnelser';
+$labels['savingdata'] = 'Sparar data ...';
+$labels['role'] = 'Roll';
+$labels['availability'] = 'Tillg.';
+$labels['confirmstate'] = 'Status';
+$labels['roleorganizer'] = 'Organisatör';
+$labels['rolerequired'] = 'Obligatorisk';
+$labels['roleoptional'] = 'Valfritt';
+$labels['rolechair'] = 'Stol';
+$labels['sendinvitations'] = 'Skicka inbjudningar';
+$labels['itipupdatesubject'] = '"$title" har uppdaterats';
+$labels['taskhistory'] = 'Historik';
+$labels['objectchangelog'] = 'Ändringshistorik';
+$labels['objectdiffnotavailable'] = 'Ingen jämförelse möjlig för valda revisioner';
+$labels['itipcomment'] = 'Kommentar till inbjudan/meddelande';
+$labels['andnmore'] = '$nr fler ...';
+$labels['comment'] = 'Kommentar';
+$labels['rsvpcomment'] = 'Kommentar';
+$labels['importerror'] = 'Ett fel uppstod vid import';
+$labels['attendeupdateesuccess'] = 'Uppdaterade deltagarens status';
+$labels['itipinvalidrequest'] = 'Denna inbjudan är inte längre giltig';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/sv_SE.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/sv_SE.inc Changed

@@ -7,56 +7,184 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/tasklist/
  */
 $labels['navtitle'] = 'Uppgifter';
-$labels['tags'] = 'Taggar';
+$labels['lists'] = 'Uppgiftslistor';
+$labels['list'] = 'Uppgiftslista';
+$labels['tags'] = 'Etiketter';
 $labels['export'] = 'Exportera';
 $labels['exporttitle'] = 'Exportera till iCalendar';
 $labels['exportattachments'] = 'Med bilagor';
+$labels['currentview'] = 'nuvarande vy';
 $labels['tasklistsubscribe'] = 'Lista permanent';
+$labels['listsearchresults'] = 'Tillgängliga uppgiftslistor';
+$labels['findlists'] = 'Hitta uppgiftslistor ...';
 $labels['searchterms'] = 'Sökord';
+$labels['notasklistsfound'] = 'Inga uppgiftslistor hittades';
+$labels['nrtasklistsfound'] = '$nr uppgiftslistor hittades';
 $labels['removelist'] = 'Ta bort från lista';
+$labels['showcaldavurl'] = 'Visa CalDAV-URL';
+$labels['caldavurldescription'] = 'Kopiera denna adress till ett klientprogram som hanterar <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (t ex Evolution eller Mozilla Thunderbird), för att synkronisera denna specifika uppgiftslista med din dator eller mobila enhet.';
+$labels['newtask'] = 'Ny uppgift';
+$labels['createtask'] = 'Skapa uppgift';
+$labels['createnewtask'] = 'Skapa ny uppgift (t.ex. lördag, klipp gräsmattan)';
+$labels['createfrommail'] = 'Spara som uppgift';
+$labels['printtitle'] = 'Skriv ut uppgifter';
 $labels['printdescriptions'] = 'Skriv ut beskrivning';
+$labels['mark'] = 'Märk';
+$labels['unmark'] = 'Avmarkera';
 $labels['edit'] = 'Redigera';
+$labels['delete'] = 'Ta bort';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beskrivning';
+$labels['datetime'] = 'Förfallodatum';
+$labels['duetime'] = 'Förfallotid';
 $labels['start'] = 'Start';
 $labels['starttime'] = 'Starttid';
 $labels['alarms'] = 'Påminnelse';
 $labels['repeat'] = 'Upprepa';
 $labels['links'] = 'Referens';
 $labels['status'] = 'Status';
+$labels['status-needs-action'] = 'Kräver åtgärd';
+$labels['status-in-process'] = 'Pågående';
+$labels['status-completed'] = 'Slutförd';
 $labels['status-cancelled'] = 'Inställd';
+$labels['assignedto'] = 'Tilldelad till';
 $labels['created'] = 'Skapad';
 $labels['changed'] = 'Senast ändrad';
 $labels['taskoptions'] = 'Alternativ';
 $labels['all'] = 'Alla';
+$labels['flagged'] = 'Markerade';
+$labels['complete'] = 'Slutförda';
+$labels['completeness'] = 'Förlopp';
+$labels['overdue'] = 'Försenade';
 $labels['today'] = 'Idag';
 $labels['tomorrow'] = 'Imorgon';
+$labels['next7days'] = 'Kommande 7 dagar';
+$labels['later'] = 'Senare';
+$labels['assigned'] = 'Tilldelad';
+$labels['assignedtitle'] = 'Uppgifter tilldelade andra';
+$labels['mytasks'] = 'Mina uppgifter';
+$labels['mytaskstitle'] = 'Uppgifter tilldelade dig';
+$labels['nodate'] = 'inget datum';
+$labels['removetag'] = 'Ta bort';
 $labels['removelink'] = 'Ta bort e-postreferens';
+$labels['auto'] = 'Automatisk';
+$labels['newtask'] = 'Ny uppgift';
+$labels['edittask'] = 'Redigera uppgift';
 $labels['save'] = 'Spara';
 $labels['cancel'] = 'Avbryt';
+$labels['saveandnotify'] = 'Spara och notifiera';
+$labels['addsubtask'] = 'Lägg till deluppgift';
+$labels['deletetask'] = 'Ta bort uppgift';
+$labels['deletethisonly'] = 'Ta endast bort denna uppgift';
+$labels['deletewithchilds'] = 'Ta bort med alla deluppgifter';
+$labels['taskactions'] = 'Alternativ för uppgift';
 $labels['tabsummary'] = 'Sammanfattning';
 $labels['tabrecurrence'] = 'Återkommande';
+$labels['tabassignments'] = 'Tilldelningar';
 $labels['tabattachments'] = 'Bilagor';
 $labels['tabsharing'] = 'Delning';
+$labels['createlist'] = 'Lägg till lista';
+$labels['listactions'] = 'Alternativ för lista';
 $labels['listname'] = 'Namn';
 $labels['showalarms'] = 'Visa påminnelser';
+$labels['import'] = 'Importera';
+$labels['viewactions'] = 'Visa åtgärder';
+$labels['focusview'] = 'Visa endast denna lista';
+$labels['on'] = 'på';
+$labels['at'] = ' på';
+$labels['this'] = 'denna';
+$labels['next'] = 'nästa';
+$labels['yes'] = 'ja';
 $labels['savingdata'] = 'Sparar data ...';
+$labels['errorsaving'] = 'Misslyckades att spara data.';
+$labels['notasksfound'] = 'Inga uppgifter hittades med angivna kriterier';
+$labels['invalidstartduedates'] = 'Startdatum måste vara större än förfallodatum';
+$labels['invalidstartduetimes'] = 'Tid för både start- och slutdatum måste anges eller lämnas tomt.';
+$labels['recurrencerequiresdate'] = 'Återkommande uppgifter kräver antingen start- eller slutdatum.';
+$labels['deletetasktconfirm'] = 'Vill du verkligen ta bort denna uppgift?';
+$labels['deleteparenttasktconfirm'] = 'Vill du verkligen ta bort denna uppgift och alla dess deluppgifter?';
+$labels['deletelistconfirm'] = 'Vill du verkligen ta bort denna lista med alla dess uppgifter?';
+$labels['deletelistconfirmrecursive'] = 'Vill du verkligen ta bort denna lista med alla dellistor och uppgifter?';
+$labels['aclnorights'] = 'Du har inte administratörsrättigheter för denna uppgiftslista.';
+$labels['changetaskconfirm'] = 'Uppdatera uppgift';
+$labels['changeconfirmnotifications'] = 'Vill du meddela deltagarna om ändringen?';
+$labels['partstatupdatenotification'] = 'Vill du meddela organisatören om statusförändringen?';
+$labels['quickaddinput'] = 'Nytt uppgiftsdatum och ny titel';
+$labels['arialabelquickaddbox'] = 'Snabb-lägg-till ny uppgift';
+$labels['arialabelsearchform'] = 'Sökformulär för uppgifter';
+$labels['arialabelquicksearchbox'] = 'Sökinmatning för uppgifter';
+$labels['arialabellistsearchform'] = 'Sökformulär för uppgiftslistor';
+$labels['arialabeltaskselector'] = 'Listläge';
+$labels['arialabeltasklisting'] = 'Uppgiftslistning';
+$labels['arialabelsortmenu'] = 'Alternativ för sortering av uppgifter';
+$labels['attendee'] = 'Tilldelad';
 $labels['role'] = 'Roll';
 $labels['availability'] = 'Tillg.';
 $labels['confirmstate'] = 'Status';
+$labels['addattendee'] = 'Lägg till förvärvare';
 $labels['roleorganizer'] = 'Organisatör';
 $labels['rolerequired'] = 'Obligatorisk';
 $labels['roleoptional'] = 'Valfritt';
 $labels['rolechair'] = 'Stol';
+$labels['rolenonparticipant'] = 'Observatör';
 $labels['sendinvitations'] = 'Skicka inbjudningar';
+$labels['sendnotifications'] = 'Meddela förvärvare om ändringar';
+$labels['sendcancellation'] = 'Meddela förvärvare om annullering av uppgift';
+$labels['invitationsubject'] = 'Du har blivit tilldelad "$title"';
 $labels['itipupdatesubject'] = '"$title" har uppdaterats';
+$labels['itipupdatesubjectempty'] = 'En uppgift som berör dig har uppdaterats';
+$labels['itipupdatemailbody'] = "*\$title*\n\nFörfaller: \$date\n\nTilldelade: \$attendees\n\nVänligen se bifogad iCalendar-fil, med uppdaterade detaljer om uppgiften, som du kan importera till ditt program för uppgifter.";
+$labels['itipcancelsubject'] = '"$title" har ställts in';
+$labels['itipcancelmailbody'] = "*\$title*\n\nFörfaller: \$date\n\nTilldelade: \$attendees\n\nUppgiften har ställts in av \$organizer.\n\nVänligen se bifogad iCalendar-fil med uppdaterade detaljer angående uppgiften.";
+$labels['saveintasklist'] = 'spara i';
 $labels['taskhistory'] = 'Historik';
 $labels['objectchangelog'] = 'Ändringshistorik';
+$labels['objectdiff'] = 'Ändringar från $rev1 till $rev2';
+$labels['objectnotfound'] = 'Misslyckades att ladda data för uppgiften';
+$labels['objectchangelognotavailable'] = 'Ändring av historik finns inte tillgängligt för denna uppgift';
 $labels['objectdiffnotavailable'] = 'Ingen jämförelse möjlig för valda revisioner';
+$labels['revisionrestoreconfirm'] = 'Vill du verkligen återställa version $rev av denna uppgift? Detta kommer att ersätta den aktuella uppgiften med den gamla versionen.';
+$labels['objectrestoresuccess'] = 'Revision $rev har återställts ';
+$labels['objectrestoreerror'] = 'Det gick inte att återställa den gamla versionen';
+$labels['itipobjectnotfound'] = 'Uppgiften som refererats av detta meddelande hittades inte i din uppgiftslista.';
+$labels['itipmailbodyaccepted'] = "\$sender har accepterat att tilldelas följande uppgift:\n\n*\$title*\n\nFörfaller: \$date\n\nTilldelade: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender har preliminärt accepterat att tilldelas följande uppgift:\n\n*\$title*\n\nFörfaller: \$date\n\nTilldelade: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender har avböjt att tilldelas följande uppgift:\n\n*\$title*\n\nFörfaller: \$date\n\nTilldelade: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender har avvisat din tilldelning av följande uppgift:\n\n*\$title*\n\nFörfaller: \$date";
+$labels['itipmailbodyin-process'] = "\$sender har satt status för följande uppgift till i bearbetningsfas:\n\n*\$title*\n\nFörfaller: \$date";
+$labels['itipmailbodycompleted'] = "\$sender har slutfört följande uppgift:\n\n*\$title*\n\nFörfaller: \$date";
+$labels['itipmailbodydelegated'] = "\$sender har delegerat följande uppgift:\n\n*\$title*\n\nFörfaller: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender har delegerat följande uppgift till dig:\n\n*\$title*\n\nFörfaller: \$date";
+$labels['attendeeaccepted'] = 'Den tilldelade har accepterat';
+$labels['attendeetentative'] = 'Den tilldelade har preliminärt accepterat';
+$labels['attendeedeclined'] = 'Den tilldelade har tackat nej';
+$labels['attendeedelegated'] = 'Den tilldelade har delegerat till $delegatedto';
+$labels['attendeein-process'] = 'Den tilldelade är i bearbetningsfas';
+$labels['attendeecompleted'] = 'Förvärvare har slutfört';
+$labels['acceptinvitation'] = 'Accepterar du denna tilldelade uppgift?';
+$labels['itipdeclinetask'] = 'Avböj denna, till dig tilldelade, uppgift till organisatören';
+$labels['declinedeleteconfirm'] = 'Vill du även ta bort denna avböjda uppgift från din uppgiftslista?';
 $labels['itipcomment'] = 'Kommentar till inbjudan/meddelande';
+$labels['itipcommenttitle'] = 'Denna kommentar kommer att bifogas till inbjudnings-/notifieringsmeddelandet som skickas till de tilldelade';
+$labels['itipsendsuccess'] = 'Meddelande har skickats till förvärvare';
+$labels['errornotifying'] = 'Misslyckades att skicka notifieringar till uppgiftsförvärvare';
+$labels['removefromcalendar'] = 'Ta bort från mina uppgifter';
+$labels['delegateinvitation'] = 'Delegera uppgift';
 $labels['andnmore'] = '$nr fler ...';
+$labels['savetotasklist'] = 'Spara till uppgifter';
 $labels['comment'] = 'Kommentar';
 $labels['rsvpcomment'] = 'Kommentar';
+$labels['errorimportingtask'] = 'Det gick inte att importera uppgift(er)';
+$labels['importwarningexists'] = 'En kopia av denna uppgift finns redan i din uppgiftslista.';
+$labels['importsuccess'] = '$nr uppgifter har importerats';
 $labels['importerror'] = 'Ett fel uppstod vid import';
+$labels['newerversionexists'] = 'En nyare version av denna uppgift finns redan! Åtgärd avbruten.';
+$labels['nowritetasklistfound'] = 'Ingen uppgiftslista hittades att spara uppgiften till';
+$labels['importedsuccessfully'] = 'Uppgiften lades till \'$list\'';
+$labels['updatedsuccessfully'] = 'Uppgiften uppdaterades i \'$list\'';
 $labels['attendeupdateesuccess'] = 'Uppdaterade deltagarens status';
+$labels['itipresponseerror'] = 'Misslyckades att skicka ett svar på tilldelandet av denna uppgift';
 $labels['itipinvalidrequest'] = 'Denna inbjudan är inte längre giltig';
+$labels['sentresponseto'] = 'Skickade respons på uppgift till $mailto';
+$labels['successremoval'] = 'Uppgiften har tagits bort.';
+$labels['invalidlistproperties'] = 'Ogiltiga listegenskaper! Vänligen ange ett giltigt namn.';

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/th_TH.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/th_TH.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/localization/zh_CN.inc -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/localization/zh_CN.inc Changed

iRony-0.4.2.tar.gz/lib/plugins/tasklist/skins/elastic/templates/mainview.html -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/skins/elastic/templates/mainview.html Changed

@@ -4,7 +4,7 @@
 <h1 class="voice"><roundcube:label name="tasklist.navtitle" /></h1>
 
 
-<div class="sidebar listbox" role="navigation" aria-labelledby="arial-label-notebooks">
+<div id="layout-sidebar" class="listbox" role="navigation" aria-labelledby="arial-label-notebooks">
 	<div class="header">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-tasklists" class="header-title"><roundcube:label name="tasklist.lists" /></span>
@@ -12,7 +12,7 @@
 			title="tasklist.listactions" class="button icon sidebar-menu" data-popup="tasklistactions-menu"
 			innerClass="inner" label="actions" />
 	</div>
-	<roundcube:object name="libkolab.folder_search_form" id="tasklistsearch" wrapper="searchbar toolbar"
+	<roundcube:object name="libkolab.folder_search_form" id="tasklistsearch" wrapper="searchbar menu"
 		ariatag="h2" label="foldersearchform" label-domain="tasklist" buttontitle="findlists" />
 	<div id="tasklists-content" class="scroller">
 		<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing iconized" />
@@ -20,21 +20,21 @@
 </div>
 
 
-<div class="list listbox selected" aria-labelledby="aria-label-taskslist">
+<div id="layout-list" class="listbox selected" aria-labelledby="aria-label-taskslist">
 	<div class="header">
-		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+		<a class="button icon task-menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="tasklist.lists" /></span></a>
 		<span id="aria-label-taskslist" class="header-title"><roundcube:label name="tasklist.navtitle" /></span>
-		<div id="listcontrols" class="toolbar" role="toolbar">
+		<div id="listcontrols" class="toolbar menu" role="toolbar">
 			<a href="#threads" class="button threads active" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
-			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button settings active"
+			<roundcube:button name="optionsmenu" id="listmenulink" type="link" class="button options active"
 				label="options" innerClass="inner" onclick="tasklist_options_menu()" />
 		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
-	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar menu"
 		label="tasksearchform" label-domain="tasklist" buttontitle="tasklist.findtasks" ariatag="h2" />
-	<div class="pagenav pagenav-list toolbar" onclick="UI.switch_nav_list(this)">
+	<div class="pagenav pagenav-list menu" onclick="UI.switch_nav_list(this)">
 		<a class="button icon expand"><span class="inner"></span></a>
 		<span id="taskselector-name" class="pagenav-text"><roundcube:label name="tasklist.all" /></span>
 	</div>
@@ -67,33 +67,33 @@
 </div>
 
 
-<div class="content" role="main">
+<div id="layout-content" role="main">
 	<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
 	<div class="header" role="toolbar" aria-labelledby="aria-label-toolbar">
 		<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span class="header-title"></span>
 		
-		<div id="taskstoolbar" class="toolbar">
+		<div id="taskstoolbar" class="toolbar menu">
 			<roundcube:button command="newtask" type="link"
-				class="button create disabled" classAct="button create"
+				class="create disabled" classAct="create"
 				label="create" title="tasklist.newtask" innerClass="inner" data-fab="true" />
 			<roundcube:button command="print" type="link" data-hidden="small"
-				class="button print disabled" classAct="button print"
+				class="print disabled" classAct="print"
 				label="print" title="tasklist.printtitle" innerClass="inner" />
 			<roundcube:button command="delete-task" type="link"
 				label="delete" title="tasklist.deletetask"
-				class="button delete disabled" classAct="button delete" innerclass="inner" />
+				class="delete disabled" classAct="delete" innerclass="inner" />
 			<span class="spacer"></span>
 			<roundcube:if condition="config:kolab_bonnie_api" />
 				<roundcube:button command="task-history" type="link"
-					class="button history task-history disabled" classAct="button history task-history"
+					class="history task-history disabled" classAct="history task-history"
 					label="tasklist.taskhistory" title="libkolab.showhistory" innerClass="inner" />
 			<roundcube:endif />
 			<roundcube:button command="import" type="link"
-				class="button import disabled" classAct="button import"
+				class="import disabled" classAct="import"
 				label="import" title="tasklist.importtasks" innerClass="inner" />
 			<roundcube:button command="export" type="link"
-				class="button export disabled" classAct="button export"
+				class="export disabled" classAct="export"
 				label="tasklist.export" title="tasklist.exporttitle" innerClass="inner" />
 			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
@@ -253,7 +253,7 @@
 
 <div id="tasklistactions-menu" class="popupmenu">
 	<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-tasklistoptions">
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-tasklistoptions">
 		<roundcube:button type="link-menuitem" command="list-create" label="tasklist.createlist" class="create disabled" classAct="create active" />
 		<roundcube:button type="link-menuitem" command="list-edit" label="tasklist.editlist" class="edit disabled" classAct="edit active" />
 		<roundcube:button type="link-menuitem" command="list-delete" label="tasklist.deletelist" class="delete disabled" classAct="delete active" />
@@ -298,9 +298,9 @@
 
 <div id="threadselect-menu" class="popupmenu">
 	<h3 id="aria-label-threadselectmenu" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
-	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
-		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all" classAct="expand all active" />
-		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none" classAct="expand none active" />
+	<ul class="menu listing" role="menu" aria-labelledby="aria-label-threadselectmenu">
+		<roundcube:button command="expand-all" type="link-menuitem" label="expand-all" class="expand all disabled" classAct="expand all active" />
+		<roundcube:button command="collapse-all" type="link-menuitem" label="collapse-all" class="expand none disabled" classAct="expand none active" />
 	</ul>
 </div>

iRony-0.4.2.tar.gz/lib/plugins/tasklist/skins/elastic/templates/taskedit.html -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/skins/elastic/templates/taskedit.html Changed

@@ -34,11 +34,11 @@
 			<div class="form-group row" id="taskedit-alarms">
 				<label for="edit-alarm-item" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.alarms" /></label>
 				<div class="col-sm-10 alarms-input">
-					<div class="edit-alarm-item first">
+					<div class="edit-alarm-item input-group first">
 						<roundcube:object name="plugin.alarm_select" id="edit-alarm-item" />
-						<span class="edit-alarm-buttons">
-							<a href="#add" class="icon btn button create add-alarm"><span class="inner"><roundcube:label name="libcalendaring.addalarm" /></span></a>
-							<a href="#delete" class="icon btn button delete delete-alarm"><span class="inner"><roundcube:label name="libcalendaring.removealarm" /></span></a>
+						<span class="edit-alarm-buttons input-group-append">
+							<a href="#add" class="icon btn button add add-alarm input-group-text"><span class="inner"><roundcube:label name="libcalendaring.addalarm" /></span></a>
+							<a href="#delete" class="icon btn button delete delete-alarm input-group-text"><span class="inner"><roundcube:label name="libcalendaring.removealarm" /></span></a>
 						</span>
 					</div>
 				</div>

iRony-0.4.2.tar.gz/lib/plugins/tasklist/tasklist.js -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/tasklist.js Changed

@@ -893,7 +893,7 @@
                 rcmail.async_upload_form(form, 'import', function(e) {
                     rcmail.set_busy(false, null, saving_lock);
                     saving_lock = null;
-                    $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
+                    $('.ui-dialog-buttonpane button', $dialog.parent()).prop('disabled', false);
 
                     // display error message if no sophisticated response from server arrived (e.g. iframe load error)
                     if (me.import_succeeded === null)
@@ -905,7 +905,7 @@
                 rcmail.env.request_timeout = 600;
                 me.import_succeeded = null;
                 saving_lock = rcmail.set_busy(true, 'uploading');
-                $('.ui-dialog-buttonpane button', $dialog.parent()).button('disable');
+                $('.ui-dialog-buttonpane button', $dialog.parent()).prop('disabled', true);
 
                 // restore settings
                 rcmail.env.request_timeout = timeout;
@@ -1300,7 +1300,6 @@
         if (!rcmail.busy) {
             saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
             rcmail.http_post('tasks/task', { action:action, t:rec, filter:filtermask });
-            $('button.ui-button:ui-button').button('option', 'disabled', rcmail.busy);
             return true;
         }
 
@@ -1382,7 +1381,7 @@
                 buttons: buttons,
                 open: function() {
                     setTimeout(function(){
-                      $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+                      $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
                     }, 5);
                 },
                 close: function(){
@@ -1404,7 +1403,6 @@
     {
         if (saving_lock) {
             rcmail.set_busy(false, null, saving_lock);
-            $('button.ui-button:ui-button').button('option', 'disabled', false);
             saving_lock = null;
 
             // Elastic
@@ -2183,7 +2181,7 @@
                 closeOnEscape: true,
                 title: rcmail.gettext('taskdetails', 'tasklist'),
                 open: function() {
-                    $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+                    $dialog.parent().find('button:not(.ui-dialog-titlebar-close)').first().focus();
                 },
                 close: function() {
                     $dialog.dialog('destroy').appendTo(document.body);
@@ -2400,8 +2398,8 @@
     function task_edit_dialog(id, action, presets)
     {
         var elastic = false, infodialog = $('#taskshow');
-        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
 
+        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
             elastic = true;
             infodialog.addClass('hidden').parent().addClass('watermark'); // Elastic
         }
@@ -2481,9 +2479,13 @@
         tasklist.val(rec.list || me.selected_list || selected_list);
 
         // tag-edit line
+        var tagline = $('#taskedit-tagline');
         if (window.kolab_tags_input) {
-            $('#taskedit-tagline').parent('.form-group').show();
-            taglist = kolab_tags_input($('#taskedit-tagline'), rec.tags, readonly);
+            tagline.parent().show();
+            taglist = kolab_tags_input(tagline, rec.tags, readonly);
+        }
+        else {
+            tagline.parent().hide();
         }
 
         // set alarm(s)
@@ -3052,8 +3054,6 @@
                 data = form.serializeJSON();
                 if (list.id)
                     data.id = list.id;
-                if (form.find('#taskedit-tasklistname').is(':checked'))
-                    data.showalarms = 1;
 
                 saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
                 rcmail.http_post('tasklist', {action: (list.id ? 'edit' : 'new'), l: data});
@@ -3147,13 +3147,18 @@
         }, prop.parent || null, prop.group);
 
         // flag as tasklist for drag & drop
-        $(tasklists_widget.get_item(prop.id)).data('type', 'tasklist');
+        var li = $(tasklists_widget.get_item(prop.id)).data('type', 'tasklist');
 
         delete prop.html;
         me.tasklists[prop.id] = prop;
 
         // append to list selector in task edit dialog, too (#2985)
         $('<option>').attr('value', prop.id).html(Q(prop.name)).appendTo('#taskedit-tasklist');
+
+        // Elastic skin
+        if (window.UI && UI.pretty_checkbox) {
+            UI.pretty_checkbox($(li).find('input'));
+        }
     }
 
     /**
@@ -3174,7 +3179,7 @@
             me.tasklists[prop.id] = prop;
             $(li).find('input').first().val(prop.id);
             $(li).find('.listname').first().html(Q(prop.name));
-            tasklists_widget.update(id, { id:prop.id, html:li.children().first() });
+            tasklists_widget.update(id, {id: prop.id, html: $(li).children().first()});
         }
     }

iRony-0.4.2.tar.gz/lib/plugins/tasklist/tasklist.php -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/tasklist.php Changed

@@ -75,7 +75,6 @@
     {
         $this->require_plugin('libcalendaring');
         $this->require_plugin('libkolab');
-        $this->require_plugin('jqueryui');
 
         $this->rc  = rcube::get_instance();
         $this->lib = libcalendaring::get_instance();
@@ -141,13 +140,13 @@
 
             // add 'Create event' item to message menu
             if ($this->api->output->type == 'html' && $_GET['_rel'] != 'task') {
-                $this->api->add_content(html::tag('li', null, 
+                $this->api->add_content(html::tag('li', array('role' => 'menuitem'),
                     $this->api->output->button(array(
                         'command'  => 'tasklist-create-from-mail',
                         'label'    => 'tasklist.createfrommail',
                         'type'     => 'link',
                         'classact' => 'icon taskaddlink active',
-                        'class'    => 'icon taskaddlink',
+                        'class'    => 'icon taskaddlink disabled',
                         'innerclass' => 'icon taskadd',
                     ))),
                 'messagemenu');
@@ -984,8 +983,11 @@
         $list    = rcube_utils::get_input_value('l', rcube_utils::INPUT_GPC, true);
         $success = false;
 
-        if (isset($list['showalarms']))
-          $list['showalarms'] = intval($list['showalarms']);
+        unset($list['_token']);
+
+        if (isset($list['showalarms'])) {
+            $list['showalarms'] = intval($list['showalarms']);
+        }
 
         switch ($action) {
         case 'form-new':
@@ -1869,7 +1871,7 @@
         foreach ($this->message_tasks as $task) {
             $checkbox = new html_checkbox(array(
                 'name' => 'completed',
-                'class' => 'complete',
+                'class' => 'complete pretty-checkbox',
                 'title' => $this->gettext('complete'),
                 'data-list' => $task['list'],
             ));
@@ -1910,7 +1912,7 @@
                 'type'       => 'link',
                 'wrapper'    => 'li',
                 'command'    => 'attachment-save-task',
-                'class'      => 'icon tasklistlink',
+                'class'      => 'icon tasklistlink disabled',
                 'classact'   => 'icon tasklistlink active',
                 'innerclass' => 'icon taskadd',
                 'label'      => 'tasklist.savetotasklist',

iRony-0.4.2.tar.gz/lib/plugins/tasklist/tasklist_ui.php -> iRony-0.4.3.tar.gz/lib/plugins/tasklist/tasklist_ui.php Changed

iRony-0.4.2.tar.gz/public_html/index.php -> iRony-0.4.3.tar.gz/public_html/index.php Changed

iRony-0.4.2.tar.gz/vendor/autoload.php -> iRony-0.4.3.tar.gz/vendor/autoload.php Changed

iRony-0.4.2.tar.gz/vendor/composer/autoload_real.php -> iRony-0.4.3.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInite43509a532340e04aa036f89feee94ef
+class ComposerAutoloaderInit19391cad60298ed18ee44f901f020bb5
 {
     private static $loader;
 
@@ -19,15 +19,15 @@
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInite43509a532340e04aa036f89feee94ef', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit19391cad60298ed18ee44f901f020bb5', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInite43509a532340e04aa036f89feee94ef', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit19391cad60298ed18ee44f901f020bb5', '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';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInite43509a532340e04aa036f89feee94ef::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit19391cad60298ed18ee44f901f020bb5::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

iRony-0.4.2.tar.gz/vendor/composer/autoload_static.php -> iRony-0.4.3.tar.gz/vendor/composer/autoload_static.php Changed

iRony.dsc Changed

Overview

Request 2683 (accepted)

Request History