Request 2271 (accepted)

Overview

Request 2271 (accepted)

Check in 0.4.1

Created by vanmeeuwen over 6 years ago
In state accepted

Submit iRony

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

iRony.spec Changed

@@ -37,8 +37,8 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           iRony
-Version:        0.4.0
-Release:	    0.20170502.git%{?dist}
+Version:        0.4.1
+Release:	    1%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
@@ -54,6 +54,8 @@
 
 Requires:       chwala
 Requires:       php-sabre-dav >= 2.1.3
+Requires:       php-sabre-event >= 1.0.1
+Requires:       php-sabre-http >= 3.0.5
 Requires:       php-sabre-vobject >= 3.2.4
 Requires:       roundcubemail(core) >= 1.1
 %if 0%{?plesk} < 1
@@ -73,9 +75,18 @@
 # by any package.
 BuildRequires:  chwala
 BuildRequires:  composer
+%if 0%{?fedora}
+# fix issue:
+# have choice for php-composer(justinrainbow/json-schema) >= 2.0 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema
+# have choice for php-composer(justinrainbow/json-schema) < 5 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema php-JsonSchema
+BuildRequires:  php-justinrainbow-json-schema4
+%endif
+
 BuildRequires:  roundcubemail
 BuildRequires:  roundcubemail-plugins-kolab
 BuildRequires:  php-sabre-dav >= 2.1.3
+BuildRequires:  php-sabre-event >= 1.0.1
+BuildRequires:  php-sabre-http >= 3.0.5
 BuildRequires:  php-sabre-vobject >= 3.2.4
 
 %if 0%{?fedora} >= 21
@@ -91,6 +102,8 @@
 %setup -q
 
 %build
+rm -rvf vendor/sabre
+
 rm -rf composer.json
 mv composer.json-dist composer.json
 mkdir -p $HOME/.composer/
@@ -172,6 +185,12 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Wed Jun 13 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.1-1
+- Release of version 0.4.1
+
+* Thu May 25 2017 Timotheus Pokorra <tp@tbits.net> - 0.4.0-3
+- Fix build error on Fedora 25, composer needs php-justinrainbow-json-schema4
+
 * Wed May 10 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.0-2
 - Fix log rotation on Plesk

debian.changelog Changed

debian.control Changed

@@ -3,7 +3,16 @@
 Priority: extra
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
-Build-Depends: debhelper (>= 8), composer
+Build-Depends:
+        debhelper (>= 8),
+        composer,
+        php-sabre-dav-2.1 (>= 2.1.5),
+        php-sabre-event (>= 1.0.1),
+        php-sabre-http-3 (>= 3.0.5),
+        php-sabre-vobject-3,
+        roundcubemail-core,
+        roundcubemail-plugin-libcalendaring (>= 3.1.12),
+        roundcubemail-plugin-libkolab (>= 3.1.12)
 Standards-Version: 3.9.3
 Homepage: http://www.kolab.org/
 Vcs-Browser: http://git.kolabsys.com/apt/iRony/
@@ -17,8 +26,8 @@
         libapache2-mod-php5 | libapache2-mod-php,
         php5 | php,
         php-sabre-dav-2.1 (>= 2.1.3),
-        php-sabre-http-3 (>= 3.0.5),
         php-sabre-event (>= 1.0.1),
+        php-sabre-http-3 (>= 3.0.5),
         php-sabre-vobject-3 (>= 3.2.4),
         roundcubemail-core,
         roundcubemail-plugin-libcalendaring (>= 3.1.12),

debian.rules Changed

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

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

iRony-0.4.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/composer.json Deleted

iRony-0.4.0.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.0.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.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization Deleted

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

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

iRony-0.4.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/kolab_auth/localization/de_DE.inc Deleted

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

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

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

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

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

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

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

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

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

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

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

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

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

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

iRony-0.4.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013041900.sql Deleted

iRony-0.4.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/mysql/2013110400.sql Deleted

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

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

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

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

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

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

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

iRony-0.4.0.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.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/SQL/postgres.initial.sql Deleted

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

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

iRony-0.4.0.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.0.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.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/composer.json Deleted

iRony-0.4.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/js Deleted

iRony-0.4.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib Deleted

iRony-0.4.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/lib/kolab_storage_cache_note.php Deleted

iRony-0.4.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.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.0.tar.gz/lib/FileAPI/drivers/kolab/plugins/libkolab/vendor Deleted

iRony-0.4.0.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.0.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.0.tar.gz/lib/FileAPI/ext Deleted

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_cache_shared.php Deleted

@@ -1,655 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2013, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2013, 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:                                                              |
- |   Shared (cross-user) caching engine                                  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Interface class for accessing Roundcube shared cache
- *
- * @package    Framework
- * @subpackage Cache
- * @author     Thomas Bruederli <roundcube@gmail.com>
- * @author     Aleksander Machniak <alec@alec.pl>
- */
-class rcube_cache_shared
-{
-    /**
-     * Instance of database handler
-     *
-     * @var rcube_db|Memcache|bool
-     */
-    private $db;
-    private $type;
-    private $prefix;
-    private $ttl;
-    private $packed;
-    private $index;
-    private $table;
-    private $debug;
-    private $index_changed = false;
-    private $cache         = array();
-    private $cache_changes = array();
-    private $cache_sums    = array();
-    private $max_packet    = -1;
-
-
-    /**
-     * Object constructor.
-     *
-     * @param string $type   Engine type ('db' or 'memcache' or 'apc')
-     * @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
-     */
-    function __construct($type, $prefix='', $ttl=0, $packed=true)
-    {
-        $rcube = rcube::get_instance();
-        $type  = strtolower($type);
-
-        if ($type == 'memcache') {
-            $this->type  = 'memcache';
-            $this->db    = $rcube->get_memcache();
-            $this->debug = $rcube->config->get('memcache_debug');
-        }
-        else if ($type == 'apc') {
-            $this->type  = 'apc';
-            $this->db    = function_exists('apc_exists'); // APC 3.1.4 required
-            $this->debug = $rcube->config->get('apc_debug');
-        }
-        else {
-            $this->type  = 'db';
-            $this->db    = $rcube->get_dbh();
-            $this->table = $this->db->table_name('cache_shared', true);
-        }
-
-        // convert ttl string to seconds
-        $ttl = get_offset_sec($ttl);
-        if ($ttl > 2592000) $ttl = 2592000;
-
-        $this->ttl       = $ttl;
-        $this->packed    = $packed;
-        $this->prefix    = $prefix;
-    }
-
-    /**
-     * Returns cached value.
-     *
-     * @param string $key Cache key name
-     *
-     * @return mixed Cached value
-     */
-    function get($key)
-    {
-        if (!array_key_exists($key, $this->cache)) {
-            return $this->read_record($key);
-        }
-
-        return $this->cache[$key];
-    }
-
-    /**
-     * Sets (add/update) value in cache.
-     *
-     * @param string $key  Cache key name
-     * @param mixed  $data Cache data
-     */
-    function set($key, $data)
-    {
-        $this->cache[$key]         = $data;
-        $this->cache_changes[$key] = true;
-    }
-
-    /**
-     * Returns cached value without storing it in internal memory.
-     *
-     * @param string $key Cache key name
-     *
-     * @return mixed Cached value
-     */
-    function read($key)
-    {
-        if (array_key_exists($key, $this->cache)) {
-            return $this->cache[$key];
-        }
-
-        return $this->read_record($key, true);
-    }
-
-    /**
-     * Sets (add/update) value in cache and immediately saves
-     * it in the backend, no internal memory will be used.
-     *
-     * @param string $key  Cache key name
-     * @param mixed  $data Cache data
-     *
-     * @param boolean True on success, False on failure
-     */
-    function write($key, $data)
-    {
-        return $this->write_record($key, $this->serialize($data));
-    }
-
-    /**
-     * Clears the cache.
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    function remove($key=null, $prefix_mode=false)
-    {
-        // Remove all keys
-        if ($key === null) {
-            $this->cache         = array();
-            $this->cache_changes = array();
-            $this->cache_sums    = array();
-        }
-        // Remove keys by name prefix
-        else if ($prefix_mode) {
-            foreach (array_keys($this->cache) as $k) {
-                if (strpos($k, $key) === 0) {
-                    $this->cache[$k] = null;
-                    $this->cache_changes[$k] = false;
-                    unset($this->cache_sums[$k]);
-                }
-            }
-        }
-        // Remove one key by name
-        else {
-            $this->cache[$key] = null;
-            $this->cache_changes[$key] = false;
-            unset($this->cache_sums[$key]);
-        }
-
-        // Remove record(s) from the backend
-        $this->remove_record($key, $prefix_mode);
-    }
-
-    /**
-     * Remove cache records older than ttl
-     */
-    function expunge()
-    {
-        if ($this->type == 'db' && $this->db && $this->ttl) {
-            $this->db->query(
-                "DELETE FROM {$this->table}"
-                . " WHERE `cache_key` LIKE ?"
-                . " AND `expires` < " . $this->db->now(),
-                $this->prefix . '.%');
-        }
-    }
-
-    /**
-     * Remove expired records of all caches
-     */
-    static function gc()
-    {
-        $rcube = rcube::get_instance();
-        $db    = $rcube->get_dbh();
-
-        $db->query("DELETE FROM " . $db->table_name('cache_shared', true) . " WHERE `expires` < " . $db->now());
-    }
-
-    /**
-     * Writes the cache back to the DB.
-     */
-    function close()
-    {
-        foreach ($this->cache as $key => $data) {
-            // The key has been used
-            if ($this->cache_changes[$key]) {
-                // Make sure we're not going to write unchanged data
-                // by comparing current md5 sum with the sum calculated on DB read
-                $data = $this->serialize($data);
-
-                if (!$this->cache_sums[$key] || $this->cache_sums[$key] != md5($data)) {
-                    $this->write_record($key, $data);
-                }
-            }
-        }
-
-        if ($this->index_changed) {
-            $this->write_index();
-        }
-
-        // reset internal cache index, thanks to this we can force index reload
-        $this->index         = null;
-        $this->index_changed = false;
-        $this->cache         = array();
-        $this->cache_sums    = array();
-        $this->cache_changes = array();
-    }
-
-    /**
-     * Reads cache entry.
-     *
-     * @param string  $key     Cache key name
-     * @param boolean $nostore Enable to skip in-memory store
-     *
-     * @return mixed Cached value
-     */
-    private function read_record($key, $nostore=false)
-    {
-        if (!$this->db) {
-            return null;
-        }
-
-        if ($this->type != 'db') {
-            $this->load_index();
-
-            // Consistency check (#1490390)
-            if (!in_array($key, $this->index)) {
-                // we always check if the key exist in the index
-                // to have data in consistent state. Keeping the index consistent
-                // is needed for keys delete operation when we delete all keys or by prefix.
-            }
-            else {
-                $ckey = $this->ckey($key);
-
-                if ($this->type == 'memcache') {
-                    $data = $this->db->get($ckey);
-                }
-                else if ($this->type == 'apc') {
-                    $data = apc_fetch($ckey);
-                }
-
-                if ($this->debug) {
-                    $this->debug('get', $ckey, $data);
-                }
-            }
-
-            if ($data !== false) {
-                $md5sum = md5($data);
-                $data   = $this->unserialize($data);
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache_sums[$key] = $md5sum;
-                $this->cache[$key]      = $data;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
-        }
-        else {
-            $sql_result = $this->db->limitquery(
-                "SELECT `data`, `cache_key`".
-                " FROM {$this->table}" .
-                " WHERE `cache_key` = ?".
-                // for better performance we allow more records for one key
-                // get the newer one
-                " ORDER BY `created` DESC",
-                0, 1, $this->prefix . '.' . $key);
-
-            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                if (strlen($sql_arr['data']) > 0) {
-                    $md5sum = md5($sql_arr['data']);
-                    $data   = $this->unserialize($sql_arr['data']);
-                }
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache[$key]      = $data;
-                $this->cache_sums[$key] = $md5sum;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
-        }
-
-        return $this->cache[$key];
-    }
-
-    /**
-     * Writes single cache record into DB.
-     *
-     * @param string $key  Cache key name
-     * @param mixed  $data Serialized cache data
-     *
-     * @param boolean True on success, False on failure
-     */
-    private function write_record($key, $data)
-    {
-        if (!$this->db) {
-            return false;
-        }
-
-        // don't attempt to write too big data sets
-        if (strlen($data) > $this->max_packet_size()) {
-            trigger_error("rcube_cache: max_packet_size ($this->max_packet) exceeded for key $key. Tried to write " . strlen($data) . " bytes", E_USER_WARNING);
-            return false;
-        }
-
-        if ($this->type == 'memcache' || $this->type == 'apc') {
-            $result = $this->add_record($this->ckey($key), $data);
-
-            // make sure index will be updated
-            if ($result) {
-                if (!array_key_exists($key, $this->cache_sums)) {
-                    $this->cache_sums[$key] = true;
-                }
-
-                $this->load_index();
-
-                if (!$this->index_changed && !in_array($key, $this->index)) {
-                    $this->index_changed = true;
-                }
-            }
-
-            return $result;
-        }
-
-        $key_exists = array_key_exists($key, $this->cache_sums);
-        $key        = $this->prefix . '.' . $key;
-
-        // Remove NULL rows (here we don't need to check if the record exist)
-        if ($data == 'N;') {
-            $this->db->query("DELETE FROM {$this->table} WHERE `cache_key` = ?", $key);
-            return true;
-        }
-
-        // update existing cache record
-        if ($key_exists) {
-            $result = $this->db->query(
-                "UPDATE {$this->table}" .
-                " SET `created` = " . $this->db->now() .
-                    ", `expires` = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') .
-                    ", `data` = ?".
-                " WHERE `cache_key` = ?",
-                $data, $key);
-        }
-        // add new cache record
-        else {
-            // for better performance we allow more records for one key
-            // so, no need to check if record exist (see rcube_cache::read_record())
-            $result = $this->db->query(
-                "INSERT INTO {$this->table}".
-                " (`created`, `expires`, `cache_key`, `data`)".
-                " VALUES (".$this->db->now().", " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?, ?)",
-                $key, $data);
-        }
-
-        return $this->db->affected_rows($result);
-    }
-
-    /**
-     * Deletes the cache record(s).
-     *
-     * @param string  $key         Cache key name or pattern
-     * @param boolean $prefix_mode Enable it to clear all keys starting
-     *                             with prefix specified in $key
-     */
-    private function remove_record($key=null, $prefix_mode=false)
-    {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->type != 'db') {
-            $this->load_index();
-
-            // Remove all keys
-            if ($key === null) {
-                foreach ($this->index as $key) {
-                    $this->delete_record($this->ckey($key));
-                }
-
-                $this->index = array();
-            }
-            // Remove keys by name prefix
-            else if ($prefix_mode) {
-                foreach ($this->index as $idx => $k) {
-                    if (strpos($k, $key) === 0) {
-                        $this->delete_record($this->ckey($k));
-                        unset($this->index[$idx]);
-                    }
-                }
-            }
-            // Remove one key by name
-            else {
-                $this->delete_record($this->ckey($key));
-                if (($idx = array_search($key, $this->index)) !== false) {
-                    unset($this->index[$idx]);
-                }
-            }
-
-            $this->index_changed = true;
-
-            return;
-        }
-
-        // Remove all keys (in specified cache)
-        if ($key === null) {
-            $where = " WHERE `cache_key` LIKE " . $this->db->quote($this->prefix.'.%');
-        }
-        // Remove keys by name prefix
-        else if ($prefix_mode) {
-            $where = " WHERE `cache_key` LIKE " . $this->db->quote($this->prefix.'.'.$key.'%');
-        }
-        // Remove one key by name
-        else {
-            $where = " WHERE `cache_key` = " . $this->db->quote($this->prefix.'.'.$key);
-        }
-
-        $this->db->query("DELETE FROM " . $this->table . $where);
-    }
-
-    /**
-     * Adds entry into memcache/apc DB.
-     *
-     * @param string $key  Cache internal key name
-     * @param mixed  $data Serialized cache data
-     *
-     * @param boolean True on success, False on failure
-     */
-    private function add_record($key, $data)
-    {
-        if ($this->type == 'memcache') {
-            $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-
-            if (!$result) {
-                $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-            }
-        }
-        else if ($this->type == 'apc') {
-            if (apc_exists($key)) {
-                apc_delete($key);
-            }
-
-            $result = apc_store($key, $data, $this->ttl);
-        }
-
-        if ($this->debug) {
-            $this->debug('set', $key, $data, $result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Deletes entry from memcache/apc DB.
-     *
-     * @param string $key Cache internal key name
-     *
-     * @param boolean True on success, False on failure
-     */
-    private function delete_record($key)
-    {
-        if ($this->type == 'memcache') {
-            // #1488592: use 2nd argument
-            $result = $this->db->delete($key, 0);
-        }
-        else {
-            $result = apc_delete($key);
-        }
-
-        if ($this->debug) {
-            $this->debug('delete', $key, null, $result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Writes the index entry into memcache/apc DB.
-     */
-    private function write_index()
-    {
-        if (!$this->db || $this->type == 'db') {
-            return;
-        }
-
-        $this->load_index();
-
-        // Make sure index contains new keys
-        foreach ($this->cache as $key => $value) {
-            if ($value !== null && !in_array($key, $this->index)) {
-                $this->index[] = $key;
-            }
-        }
-
-        // new keys added using self::write()
-        foreach ($this->cache_sums as $key => $value) {
-            if ($value === true && !in_array($key, $this->index)) {
-                $this->index[] = $key;
-            }
-        }
-
-        $data = serialize($this->index);
-        $this->add_record($this->ikey(), $data);
-    }
-
-    /**
-     * Gets the index entry from memcache/apc DB.
-     */
-    private function load_index()
-    {
-        if (!$this->db || $this->type == 'db') {
-            return;
-        }
-
-        if ($this->index !== null) {
-            return;
-        }
-
-        $index_key = $this->ikey();
-
-        if ($this->type == 'memcache') {
-            $data = $this->db->get($index_key);
-        }
-        else if ($this->type == 'apc') {
-            $data = apc_fetch($index_key);
-        }
-
-        if ($this->debug) {
-            $this->debug('get', $index_key, $data);
-        }
-
-        $this->index = $data ? unserialize($data) : array();
-    }
-
-    /**
-     * Creates cache key name (for memcache and apc)
-     *
-     * @param string $key Cache key name
-     *
-     * @return string Cache key
-     */
-    private function ckey($key)
-    {
-        return $this->prefix . ':' . $key;
-    }
-
-    /**
-     * Creates index cache key name (for memcache and apc)
-     *
-     * @return string Cache key
-     */
-    private function ikey()
-    {
-        // This way each cache will have its own index
-        return $this->prefix . 'INDEX';
-    }
-
-    /**
-     * Serializes data for storing
-     */
-    private function serialize($data)
-    {
-        if ($this->type == 'db') {
-            return $this->db->encode($data, $this->packed);
-        }
-
-        return $this->packed ? serialize($data) : $data;
-    }
-
-    /**
-     * Unserializes serialized data
-     */
-    private function unserialize($data)
-    {
-        if ($this->type == 'db') {
-            return $this->db->decode($data, $this->packed);
-        }
-
-        return $this->packed ? @unserialize($data) : $data;
-    }
-
-    /**
-     * Determine the maximum size for cache data to be written
-     */
-    private function max_packet_size()
-    {
-        if ($this->max_packet < 0) {
-            $this->max_packet = 2097152; // default/max is 2 MB
-
-            if ($this->type == 'db') {
-                if ($value = $this->db->get_variable('max_allowed_packet', $this->max_packet)) {
-                    $this->max_packet = $value;
-                }
-                $this->max_packet -= 2000;
-            }
-            else {
-                $max_packet = rcube::get_instance()->config->get($this->type . '_max_allowed_packet');
-                $this->max_packet = parse_bytes($max_packet) ?: $this->max_packet;
-            }
-        }
-
-        return $this->max_packet;
-    }
-
-    /**
-     * Write memcache/apc debug info to the log
-     */
-    private function debug($type, $key, $data = null, $result = null)
-    {
-        $line = strtoupper($type) . ' ' . $key;
-
-        if ($data !== null) {
-            $line .= ' ' . ($this->packed ? $data : serialize($data));
-        }
-
-        rcube::debug($this->type, $line, $result);
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_db_mysql.php Deleted

@@ -1,239 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | 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:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- |   for MySQL database                                                  |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- *
- * This is a wrapper for the PHP PDO
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_mysql extends rcube_db
-{
-    public $db_provider = 'mysql';
-
-    /**
-     * Object constructor
-     *
-     * @param string $db_dsnw DSN for read/write operations
-     * @param string $db_dsnr Optional DSN for read only operations
-     * @param bool   $pconn   Enables persistent connections
-     */
-    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
-    {
-        parent::__construct($db_dsnw, $db_dsnr, $pconn);
-
-        // SQL identifiers quoting
-        $this->options['identifier_start'] = '`';
-        $this->options['identifier_end'] = '`';
-    }
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        $dbh->query("SET NAMES 'utf8'");
-    }
-
-    /**
-     * Abstract SQL statement for value concatenation
-     *
-     * @return string SQL statement to be used in query
-     */
-    public function concat(/* col1, col2, ... */)
-    {
-        $args = func_get_args();
-
-        if (is_array($args[0])) {
-            $args = $args[0];
-        }
-
-        return 'CONCAT(' . join(', ', $args) . ')';
-    }
-
-    /**
-     * Returns PDO DSN string from DSN array
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return string Connection string
-     */
-    protected function dsn_string($dsn)
-    {
-        $params = array();
-        $result = 'mysql:';
-
-        if ($dsn['database']) {
-            $params[] = 'dbname=' . $dsn['database'];
-        }
-
-        if ($dsn['hostspec']) {
-            $params[] = 'host=' . $dsn['hostspec'];
-        }
-
-        if ($dsn['port']) {
-            $params[] = 'port=' . $dsn['port'];
-        }
-
-        if ($dsn['socket']) {
-            $params[] = 'unix_socket=' . $dsn['socket'];
-        }
-
-        $params[] = 'charset=utf8';
-
-        if (!empty($params)) {
-            $result .= implode(';', $params);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns driver-specific connection options
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return array Connection options
-     */
-    protected function dsn_options($dsn)
-    {
-        $result = parent::dsn_options($dsn);
-
-        if (!empty($dsn['key'])) {
-            $result[PDO::MYSQL_ATTR_SSL_KEY] = $dsn['key'];
-        }
-
-        if (!empty($dsn['cipher'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CIPHER] = $dsn['cipher'];
-        }
-
-        if (!empty($dsn['cert'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CERT] = $dsn['cert'];
-        }
-
-        if (!empty($dsn['capath'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CAPATH] = $dsn['capath'];
-        }
-
-        if (!empty($dsn['ca'])) {
-            $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca'];
-        }
-
-        // Always return matching (not affected only) rows count
-        $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
-
-        // Enable AUTOCOMMIT mode (#1488902)
-        $result[PDO::ATTR_AUTOCOMMIT] = true;
-
-        return $result;
-    }
-
-    /**
-     * Returns list of tables in a database
-     *
-     * @return array List of all tables of the current database
-     */
-    public function list_tables()
-    {
-        // get tables if not cached
-        if ($this->tables === null) {
-            // first fetch current database name
-            $d = $this->query("SELECT database()");
-            $d = $this->fetch_array($d);
-
-            // get list of tables in current database
-            $q = $this->query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES"
-                . " WHERE TABLE_SCHEMA = ? AND TABLE_TYPE = 'BASE TABLE'"
-                . " ORDER BY TABLE_NAME", $d ? $d[0] : '');
-
-            $this->tables = $q ? $q->fetchAll(PDO::FETCH_COLUMN, 0) : array();
-        }
-
-        return $this->tables;
-    }
-
-    /**
-     * Get database runtime variables
-     *
-     * @param string $varname Variable name
-     * @param mixed  $default Default value if variable is not set
-     *
-     * @return mixed Variable value or default
-     */
-    public function get_variable($varname, $default = null)
-    {
-        if (!isset($this->variables)) {
-            $this->variables = array();
-        }
-
-        if (array_key_exists($varname, $this->variables)) {
-            return $this->variables[$varname];
-        }
-
-        // configured value has higher prio
-        $conf_value = rcube::get_instance()->config->get('db_' . $varname);
-        if ($conf_value !== null) {
-            return $this->variables[$varname] = $conf_value;
-        }
-
-        $result = $this->query('SHOW VARIABLES LIKE ?', $varname);
-
-        while ($row = $this->fetch_array($result)) {
-            $this->variables[$row[0]] = $row[1];
-        }
-
-        // not found, use default
-        if (!isset($this->variables[$varname])) {
-            $this->variables[$varname] = $default;
-        }
-
-        return $this->variables[$varname];
-    }
-
-    /**
-     * Handle DB errors, re-issue the query on deadlock errors from InnoDB row-level locking
-     *
-     * @param string Query that triggered the error
-     * @return mixed Result to be stored and returned
-     */
-    protected function handle_error($query)
-    {
-        $error = $this->dbh->errorInfo();
-
-        // retry after "Deadlock found when trying to get lock" errors
-        $retries = 2;
-        while ($error[1] == 1213 && $retries >= 0) {
-            usleep(50000);  // wait 50 ms
-            $result = $this->dbh->query($query);
-            if ($result !== false) {
-                return $result;
-            }
-            $error = $this->dbh->errorInfo();
-            $retries--;
-        }
-
-        return parent::handle_error($query);
-    }
-
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_db_oracle.php Deleted

@@ -1,618 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2011-2014, 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:                                                              |
- |   Database wrapper class that implements database functions           |
- |   for Oracle database using OCI8 extension                            |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_oracle extends rcube_db
-{
-    public $db_provider = 'oracle';
-
-
-    /**
-     * Create connection instance
-     */
-    protected function conn_create($dsn)
-    {
-        // Get database specific connection options
-        $dsn_options = $this->dsn_options($dsn);
-
-        $function = $this->db_pconn ? 'oci_pconnect' : 'oci_connect';
-
-        if (!function_exists($function)) {
-            $this->db_error     = true;
-            $this->db_error_msg = 'OCI8 extension not loaded. See http://php.net/manual/en/book.oci8.php';
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg), true, false);
-
-            return;
-        }
-
-        // connect
-        $dbh = @$function($dsn['username'], $dsn['password'], $dsn_options['database'], $dsn_options['charset']);
-
-        if (!$dbh) {
-            $error              = oci_error();
-            $this->db_error     = true;
-            $this->db_error_msg = $error['message'];
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg), true, false);
-
-            return;
-        }
-
-        // configure session
-        $this->conn_configure($dsn, $dbh);
-
-        return $dbh;
-    }
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        $init_queries = array(
-            "ALTER SESSION SET nls_date_format = 'YYYY-MM-DD'",
-            "ALTER SESSION SET nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'",
-        );
-
-        foreach ($init_queries as $query) {
-            $stmt = oci_parse($dbh, $query);
-            oci_execute($stmt);
-        }
-    }
-
-    /**
-     * Connection state checker
-     *
-     * @return boolean True if in connected state
-     */
-    public function is_connected()
-    {
-        return empty($this->dbh) ? false : $this->db_connected;
-    }
-
-    /**
-     * Execute a SQL query with limits
-     *
-     * @param string $query   SQL query to execute
-     * @param int    $offset  Offset for LIMIT statement
-     * @param int    $numrows Number of rows for LIMIT statement
-     * @param array  $params  Values to be inserted in query
-     *
-     * @return PDOStatement|bool Query handle or False on error
-     */
-    protected function _query($query, $offset, $numrows, $params)
-    {
-        $query = ltrim($query);
-
-        $this->db_connect($this->dsn_select($query), true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        if ($numrows || $offset) {
-            $query = $this->set_limit($query, $numrows, $offset);
-        }
-
-        // replace self::DEFAULT_QUOTE with driver-specific quoting
-        $query = $this->query_parse($query);
-
-        // Because in Roundcube we mostly use queries that are
-        // executed only once, we will not use prepared queries
-        $pos  = 0;
-        $idx  = 0;
-        $args = array();
-
-        if (count($params)) {
-            while ($pos = strpos($query, '?', $pos)) {
-                if ($query[$pos+1] == '?') {  // skip escaped '?'
-                    $pos += 2;
-                }
-                else {
-                    $val = $this->quote($params[$idx++]);
-
-                    // long strings are not allowed inline, need to be parametrized
-                    if (strlen($val) > 4000) {
-                        $key = ':param' . (count($args) + 1);
-                        $args[$key] = $params[$idx-1];
-                        $val = $key;
-                    }
-
-                    unset($params[$idx-1]);
-                    $query = substr_replace($query, $val, $pos, 1);
-                    $pos += strlen($val);
-                }
-            }
-        }
-
-        $query = rtrim($query, " \t\n\r\0\x0B;");
-
-        // replace escaped '?' and quotes back to normal, see self::quote()
-        $query = str_replace(
-            array('??', self::DEFAULT_QUOTE.self::DEFAULT_QUOTE),
-            array('?', self::DEFAULT_QUOTE),
-            $query
-        );
-
-        // log query
-        $this->debug($query);
-
-        // destroy reference to previous result
-        $this->last_result  = null;
-        $this->db_error_msg = null;
-
-        // prepare query
-        $result = @oci_parse($this->dbh, $query);
-        $mode   = $this->in_transaction ? OCI_NO_AUTO_COMMIT : OCI_COMMIT_ON_SUCCESS;
-
-        if ($result) {
-            foreach (array_keys($args) as $param) {
-                oci_bind_by_name($result, $param, $args[$param], -1, SQLT_LNG);
-            }
-        }
-
-        // execute query
-        if (!$result || !@oci_execute($result, $mode)) {
-            $result = $this->handle_error($query, $result);
-        }
-
-        return $this->last_result = $result;
-    }
-
-    /**
-     * Helper method to handle DB errors.
-     * This by default logs the error but could be overriden by a driver implementation
-     *
-     * @param string Query that triggered the error
-     * @return mixed Result to be stored and returned
-     */
-    protected function handle_error($query, $result = null)
-    {
-        $error = oci_error(is_resource($result) ? $result : $this->dbh);
-
-        // @TODO: Find error codes for key errors
-        if (empty($this->options['ignore_key_errors']) || !in_array($error['code'], array('23000', '23505'))) {
-            $this->db_error = true;
-            $this->db_error_msg = sprintf('[%s] %s', $error['code'], $error['message']);
-
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg . " (SQL Query: $query)"
-                ), true, false);
-        }
-
-        return false;
-    }
-
-    /**
-     * Get last inserted record ID
-     *
-     * @param string $table Table name (to find the incremented sequence)
-     *
-     * @return mixed ID or false on failure
-     */
-    public function insert_id($table = null)
-    {
-        if (!$this->db_connected || $this->db_mode == 'r' || empty($table)) {
-            return false;
-        }
-
-        $sequence = $this->quote_identifier($this->sequence_name($table));
-        $result   = $this->query("SELECT $sequence.currval FROM dual");
-        $result   = $this->fetch_array($result);
-
-        return $result[0] ?: false;
-    }
-
-    /**
-     * Get number of affected rows for the last query
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return int Number of (matching) rows
-     */
-    public function affected_rows($result = null)
-    {
-        if ($result || ($result === null && ($result = $this->last_result))) {
-            return oci_num_rows($result);
-        }
-
-        return 0;
-    }
-
-    /**
-     * Get number of rows for a SQL query
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     * @return mixed   Number of rows or false on failure
-     * @deprecated This method shows very poor performance and should be avoided.
-     */
-    public function num_rows($result = null)
-    {
-        // not implemented
-        return false;
-    }
-
-    /**
-     * Get an associative array for one row
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    public function fetch_assoc($result = null)
-    {
-        return $this->_fetch_row($result, OCI_ASSOC);
-    }
-
-    /**
-     * Get an index array for one row
-     * If no query handle is specified, the last query will be taken as reference
-     *
-     * @param mixed $result Optional query handle
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    public function fetch_array($result = null)
-    {
-        return $this->_fetch_row($result, OCI_NUM);
-    }
-
-    /**
-     * Get col values for a result row
-     *
-     * @param mixed $result Optional query handle
-     * @param int   $mode   Fetch mode identifier
-     *
-     * @return mixed Array with col values or false on failure
-     */
-    protected function _fetch_row($result, $mode)
-    {
-        if ($result || ($result === null && ($result = $this->last_result))) {
-            return oci_fetch_array($result, $mode + OCI_RETURN_NULLS + OCI_RETURN_LOBS);
-        }
-
-        return false;
-    }
-
-    /**
-     * Formats input so it can be safely used in a query
-     * PDO_OCI does not implement quote() method
-     *
-     * @param mixed  $input Value to quote
-     * @param string $type  Type of data (integer, bool, ident)
-     *
-     * @return string Quoted/converted string for use in query
-     */
-    public function quote($input, $type = null)
-    {
-        // handle int directly for better performance
-        if ($type == 'integer' || $type == 'int') {
-            return intval($input);
-        }
-
-        if (is_null($input)) {
-            return 'NULL';
-        }
-
-        if ($type == 'ident') {
-            return $this->quote_identifier($input);
-        }
-
-        switch ($type) {
-        case 'bool':
-        case 'integer':
-            return intval($input);
-        default:
-            return "'" . strtr($input, array(
-                    '?' => '??',
-                    "'" => "''",
-                    rcube_db::DEFAULT_QUOTE => rcube_db::DEFAULT_QUOTE . rcube_db::DEFAULT_QUOTE
-            )) . "'";
-        }
-    }
-
-    /**
-     * Return correct name for a specific database sequence
-     *
-     * @param string $table Table name
-     *
-     * @return string Translated sequence name
-     */
-    protected function sequence_name($table)
-    {
-        // Note: we support only one sequence per table
-        // Note: The sequence name must be <table_name>_seq
-        $sequence = $table . '_seq';
-
-        // modify sequence name if prefix is configured
-        if ($prefix = $this->options['table_prefix']) {
-            return $prefix . $sequence;
-        }
-
-        return $sequence;
-    }
-
-    /**
-     * Return SQL statement for case insensitive LIKE
-     *
-     * @param string $column Field name
-     * @param string $value  Search value
-     *
-     * @return string SQL statement to use in query
-     */
-    public function ilike($column, $value)
-    {
-        return 'UPPER(' . $this->quote_identifier($column) . ') LIKE UPPER(' . $this->quote($value) . ')';
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $interval = intval($interval);
-            return "current_timestamp + INTERVAL '$interval' SECOND";
-        }
-
-        return "current_timestamp";
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * @param string $field Field name
-     *
-     * @return string SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "(($field - to_date('1970-01-01','YYYY-MM-DD')) * 60 * 60 * 24)";
-    }
-
-    /**
-     * Adds TOP (LIMIT,OFFSET) clause to the query
-     *
-     * @param string $query  SQL query
-     * @param int    $limit  Number of rows
-     * @param int    $offset Offset
-     *
-     * @return string SQL query
-     */
-    protected function set_limit($query, $limit = 0, $offset = 0)
-    {
-        $limit  = intval($limit);
-        $offset = intval($offset);
-        $end    = $offset + $limit;
-
-        // @TODO: Oracle 12g has better OFFSET support
-
-        if (!$offset) {
-            $query = "SELECT * FROM ($query) a WHERE rownum <= $end";
-        }
-        else {
-            $query = "SELECT * FROM (SELECT a.*, rownum as rn FROM ($query) a WHERE rownum <= $end) b WHERE rn > $offset";
-        }
-
-        return $query;
-    }
-
-    /**
-     * Parse SQL file and fix table names according to table prefix
-     */
-    protected function fix_table_names($sql)
-    {
-        if (!$this->options['table_prefix']) {
-            return $sql;
-        }
-
-        $sql = parent::fix_table_names($sql);
-
-        // replace sequence names, and other Oracle-specific commands
-        $sql = preg_replace_callback('/((SEQUENCE ["]?)([^" \r\n]+)/',
-            array($this, 'fix_table_names_callback'),
-            $sql
-        );
-
-        $sql = preg_replace_callback(
-            '/([ \r\n]+["]?)([^"\' \r\n\.]+)(["]?\.nextval)/',
-            array($this, 'fix_table_names_seq_callback'),
-            $sql
-        );
-
-        return $sql;
-    }
-
-    /**
-     * Preg_replace callback for fix_table_names()
-     */
-    protected function fix_table_names_seq_callback($matches)
-    {
-        return $matches[1] . $this->options['table_prefix'] . $matches[2] . $matches[3];
-    }
-
-    /**
-     * Returns connection options from DSN array
-     */
-    protected function dsn_options($dsn)
-    {
-        $params = array();
-
-        if ($dsn['hostspec']) {
-            $host = $dsn['hostspec'];
-            if ($dsn['port']) {
-                $host .= ':' . $dsn['port'];
-            }
-
-            $params['database'] = $host . '/' . $dsn['database'];
-        }
-
-        $params['charset'] = 'UTF8';
-
-        return $params;
-    }
-
-    /**
-     * Execute the given SQL script
-     *
-     * @param string SQL queries to execute
-     *
-     * @return boolen True on success, False on error
-     */
-    public function exec_script($sql)
-    {
-        $sql  = $this->fix_table_names($sql);
-        $buff = '';
-        $body = false;
-
-        foreach (explode("\n", $sql) as $line) {
-            $tok = strtolower(trim($line));
-            if (preg_match('/^--/', $line) || $tok == '' || $tok == '/') {
-                continue;
-            }
-
-            $buff .= $line . "\n";
-
-            // detect PL/SQL function bodies, don't break on semicolon
-            if ($body && $tok == 'end;') {
-                $body = false;
-            }
-            else if (!$body && $tok == 'begin') {
-                $body = true;
-            }
-
-            if (!$body && substr($tok, -1) == ';') {
-                $this->query($buff);
-                $buff = '';
-                if ($this->db_error) {
-                    break;
-                }
-            }
-        }
-
-        return !$this->db_error;
-    }
-
-    /**
-     * Start transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function startTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('BEGIN TRANSACTION');
-
-        return $this->last_result = $this->in_transaction = true;
-    }
-
-    /**
-     * Commit transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function endTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('COMMIT TRANSACTION');
-
-        if ($result = @oci_commit($this->dbh)) {
-            $this->in_transaction = true;
-        }
-        else {
-            $this->handle_error('COMMIT');
-        }
-
-        return $this->last_result = $result;
-    }
-
-    /**
-     * Rollback transaction
-     *
-     * @return bool True on success, False on failure
-     */
-    public function rollbackTransaction()
-    {
-        $this->db_connect('w', true);
-
-        // check connection before proceeding
-        if (!$this->is_connected()) {
-            return $this->last_result = false;
-        }
-
-        $this->debug('ROLLBACK TRANSACTION');
-
-        if (@oci_rollback($this->dbh)) {
-            $this->in_transaction = false;
-        }
-        else {
-            $this->handle_error('ROLLBACK');
-        }
-
-        return $this->last_result = $this->dbh->rollBack();
-    }
-
-    /**
-     * Terminate database connection.
-     */
-    public function closeConnection()
-    {
-        // release statement and close connection(s)
-        $this->last_result = null;
-        foreach ($this->dbhs as $dbh) {
-            oci_close($dbh);
-        }
-
-        parent::closeConnection();
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_db_pgsql.php Deleted

@@ -1,233 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
- |                                                                       |
- | 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:                                                              |
- |   Database wrapper class that implements PHP PDO functions            |
- |   for PostgreSQL database                                             |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Database independent query interface
- * This is a wrapper for the PHP PDO
- *
- * @package    Framework
- * @subpackage Database
- */
-class rcube_db_pgsql extends rcube_db
-{
-    public $db_provider = 'postgres';
-
-    /**
-     * Driver-specific configuration of database connection
-     *
-     * @param array $dsn DSN for DB connections
-     * @param PDO   $dbh Connection handler
-     */
-    protected function conn_configure($dsn, $dbh)
-    {
-        $dbh->query("SET NAMES 'utf8'");
-    }
-
-    /**
-     * Get last inserted record ID
-     *
-     * @param string $table Table name (to find the incremented sequence)
-     *
-     * @return mixed ID or false on failure
-     */
-    public function insert_id($table = null)
-    {
-        if (!$this->db_connected || $this->db_mode == 'r') {
-            return false;
-        }
-
-        if ($table) {
-            $table = $this->sequence_name($table);
-        }
-
-        $id = $this->dbh->lastInsertId($table);
-
-        return $id;
-    }
-
-    /**
-     * Return correct name for a specific database sequence
-     *
-     * @param string $table Table name
-     *
-     * @return string Translated sequence name
-     */
-    protected function sequence_name($table)
-    {
-        // Note: we support only one sequence per table
-        // Note: The sequence name must be <table_name>_seq
-        $sequence = $table . '_seq';
-
-        // modify sequence name if prefix is configured
-        if ($prefix = $this->options['table_prefix']) {
-            return $prefix . $sequence;
-        }
-
-        return $sequence;
-    }
-
-    /**
-     * Return SQL statement to convert a field value into a unix timestamp
-     *
-     * @param string $field Field name
-     *
-     * @return string SQL statement to use in query
-     * @deprecated
-     */
-    public function unixtimestamp($field)
-    {
-        return "EXTRACT (EPOCH FROM $field)";
-    }
-
-    /**
-     * Return SQL function for current time and date
-     *
-     * @param int $interval Optional interval (in seconds) to add/subtract
-     *
-     * @return string SQL function to use in query
-     */
-    public function now($interval = 0)
-    {
-        if ($interval) {
-            $add = ' ' . ($interval > 0 ? '+' : '-') . " interval '";
-            $add .= $interval > 0 ? intval($interval) : intval($interval) * -1;
-            $add .= " seconds'";
-        }
-
-        return "now()" . $add;
-    }
-
-    /**
-     * Return SQL statement for case insensitive LIKE
-     *
-     * @param string $column Field name
-     * @param string $value  Search value
-     *
-     * @return string SQL statement to use in query
-     */
-    public function ilike($column, $value)
-    {
-        return $this->quote_identifier($column) . ' ILIKE ' . $this->quote($value);
-    }
-
-    /**
-     * Get database runtime variables
-     *
-     * @param string $varname Variable name
-     * @param mixed  $default Default value if variable is not set
-     *
-     * @return mixed Variable value or default
-     */
-    public function get_variable($varname, $default = null)
-    {
-        // There's a known case when max_allowed_packet is queried
-        // PostgreSQL doesn't have such limit, return immediately
-        if ($varname == 'max_allowed_packet') {
-            return rcube::get_instance()->config->get('db_' . $varname, $default);
-        }
-
-        $this->variables[$varname] = rcube::get_instance()->config->get('db_' . $varname);
-
-        if (!isset($this->variables)) {
-            $this->variables = array();
-
-            $result = $this->query('SHOW ALL');
-
-            while ($row = $this->fetch_array($result)) {
-                $this->variables[$row[0]] = $row[1];
-            }
-        }
-
-        return isset($this->variables[$varname]) ? $this->variables[$varname] : $default;
-    }
-
-    /**
-     * Returns list of tables in a database
-     *
-     * @return array List of all tables of the current database
-     */
-    public function list_tables()
-    {
-        // get tables if not cached
-        if ($this->tables === null) {
-            $q = $this->query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES"
-                . " WHERE TABLE_TYPE = 'BASE TABLE' AND TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')"
-                . " ORDER BY TABLE_NAME");
-
-            $this->tables = $q ? $q->fetchAll(PDO::FETCH_COLUMN, 0) : array();
-        }
-
-        return $this->tables;
-    }
-
-    /**
-     * Returns PDO DSN string from DSN array
-     *
-     * @param array $dsn DSN parameters
-     *
-     * @return string DSN string
-     */
-    protected function dsn_string($dsn)
-    {
-        $params = array();
-        $result = 'pgsql:';
-
-        if ($dsn['hostspec']) {
-            $params[] = 'host=' . $dsn['hostspec'];
-        }
-        else if ($dsn['socket']) {
-            $params[] = 'host=' . $dsn['socket'];
-        }
-
-        if ($dsn['port']) {
-            $params[] = 'port=' . $dsn['port'];
-        }
-
-        if ($dsn['database']) {
-            $params[] = 'dbname=' . $dsn['database'];
-        }
-
-        if (!empty($params)) {
-            $result .= implode(';', $params);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Parse SQL file and fix table names according to table prefix
-     */
-    protected function fix_table_names($sql)
-    {
-        if (!$this->options['table_prefix']) {
-            return $sql;
-        }
-
-        $sql = parent::fix_table_names($sql);
-
-        // replace sequence names, and other postgres-specific commands
-        $sql = preg_replace_callback(
-            '/((SEQUENCE |RENAME TO |nextval\()["\']*)([^"\' \r\n]+)/',
-            array($this, 'fix_table_names_callback'),
-            $sql
-        );
-
-        return $sql;
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_session_db.php Deleted

@@ -1,176 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011, 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                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Author: Cor Bosman <cor@roundcu.be>                                   |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class to provide database session storage
- *
- * @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
-{
-    private $db;
-    private $table_name;
-
-    /**
-     * @param Object $config
-     */
-    public function __construct($config)
-    {
-        parent::__construct($config);
-
-        // get db instance
-        $this->db = rcube::get_instance()->get_dbh();
-
-        // session table name
-        $this->table_name = $this->db->table_name('session', true);
-
-        // register sessions handler
-        $this->register_session_handler();
-
-        // register db gc handler
-        $this->register_gc_handler(array($this, 'gc_db'));
-    }
-
-    /**
-     * @param $save_path
-     * @param $session_name
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * Handler for session_destroy()
-     *
-     * @param $key
-     * @return bool
-     */
-    public function destroy($key)
-    {
-        if ($key) {
-            $this->db->query("DELETE FROM {$this->table_name} WHERE `sess_id` = ?", $key);
-        }
-
-        return true;
-    }
-
-    /**
-     * Read session data from database
-     *
-     * @param string Session ID
-     *
-     * @return string Session vars
-     */
-    public function read($key)
-    {
-        $sql_result = $this->db->query(
-            "SELECT `vars`, `ip`, `changed`, " . $this->db->now() . " AS ts"
-            . " FROM {$this->table_name} WHERE `sess_id` = ?", $key);
-
-        if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
-            $this->time_diff = time() - strtotime($sql_arr['ts']);
-            $this->changed   = strtotime($sql_arr['changed']);
-            $this->ip        = $sql_arr['ip'];
-            $this->vars      = base64_decode($sql_arr['vars']);
-            $this->key       = $key;
-
-            return !empty($this->vars) ? (string) $this->vars : '';
-        }
-
-        return '';
-    }
-
-    /**
-     * insert new data into db session store
-     *
-     * @param $key
-     * @param $vars
-     * @return bool
-     */
-    public function write($key, $vars)
-    {
-        $now = $this->db->now();
-
-        $this->db->query("INSERT INTO {$this->table_name}"
-            . " (`sess_id`, `vars`, `ip`, `created`, `changed`)"
-            . " VALUES (?, ?, ?, $now, $now)",
-            $key, base64_encode($vars), (string)$this->ip);
-
-        return true;
-    }
-
-    /**
-     * update session data
-     *
-     * @param $key
-     * @param $newvars
-     * @param $oldvars
-     *
-     * @return bool
-     */
-    public function update($key, $newvars, $oldvars)
-    {
-        $now = $this->db->now();
-        $ts  = microtime(true);
-
-        // if new and old data are not the same, update data
-        // else update expire timestamp only when certain conditions are met
-        if ($newvars !== $oldvars) {
-            $this->db->query("UPDATE {$this->table_name} "
-                . "SET `changed` = $now, `vars` = ? WHERE `sess_id` = ?",
-                base64_encode($newvars), $key);
-        }
-        else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
-            $this->db->query("UPDATE {$this->table_name} SET `changed` = $now"
-                . " WHERE `sess_id` = ?", $key);
-        }
-
-        return true;
-    }
-
-    /**
-     * Clean up db sessions.
-     */
-    public function gc_db()
-    {
-        // just clean all old sessions when this GC is called
-        $this->db->query("DELETE FROM " . $this->db->table_name('session')
-            . " WHERE changed < " . $this->db->now(-$this->gc_enabled));
-
-        $this->log("Session GC (DB): remove records < "
-            . date('Y-m-d H:i:s', time() - $this->gc_enabled)
-            . '; rows = ' . intval($this->db->affected_rows()));
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_session_memcache.php Deleted

@@ -1,179 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011, 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                       |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- | Author: Aleksander Machniak <alec@alec.pl>                            |
- | Author: Cor Bosman <cor@roundcu.bet>                                  |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class to provide memcache session storage
- *
- * @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
-{
-    private $memcache;
-    private $debug;
-
-    /**
-     * @param Object $config
-     */
-    public function __construct($config)
-    {
-        parent::__construct($config);
-
-        $this->memcache = rcube::get_instance()->get_memcache();
-        $this->debug    = $config->get('memcache_debug');
-
-        if (!$this->memcache) {
-            rcube::raise_error(array(
-                    'code' => 604, 'type' => 'db',
-                    'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "Failed to connect to memcached. Please check configuration"),
-                true, true);
-        }
-
-        // register sessions handler
-        $this->register_session_handler();
-    }
-
-    /**
-     * @param $save_path
-     * @param $session_name
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * Handler for session_destroy() with memcache backend
-     *
-     * @param $key
-     * @return bool
-     */
-    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 $key
-     * @return null|string
-     */
-    public function read($key)
-    {
-        if ($value = $this->memcache->get($key)) {
-            $arr = unserialize($value);
-            $this->changed = $arr['changed'];
-            $this->ip      = $arr['ip'];
-            $this->vars    = $arr['vars'];
-            $this->key     = $key;
-        }
-
-        if ($this->debug) {
-            $this->debug('get', $key, $value);
-        }
-
-        return $this->vars ?: '';
-    }
-
-    /**
-     * Write data to memcache storage
-     *
-     * @param $key
-     * @param $vars
-     *
-     * @return bool
-     */
-    public function write($key, $vars)
-    {
-        $data   = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars));
-        $result = $this->memcache->set($key, $data, MEMCACHE_COMPRESSED, $this->lifetime + 60);
-
-        if ($this->debug) {
-            $this->debug('set', $key, $data, $result);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Update memcache session data
-     *
-     * @param $key
-     * @param $newvars
-     * @param $oldvars
-     *
-     * @return bool
-     */
-    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->memcache->set($key, $data, MEMCACHE_COMPRESSED, $this->lifetime + 60);
-
-            if ($this->debug) {
-                $this->debug('set', $key, $data, $result);
-            }
-
-            return $result;
-        }
-
-        return true;
-    }
-
-    /**
-     * Write memcache debug info to the log
-     */
-    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.0.tar.gz/lib/Roundcube/rcube_session_redis.php Deleted

@@ -1,209 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- |                                                                       |
- | 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 redis supported session management                          |
- +-----------------------------------------------------------------------+
- | Author: Cor Bosman <cor@roundcu.be>                                   |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Class to provide redis session storage
- *
- * @package    Framework
- * @subpackage Core
- * @author     Cor Bosman <cor@roundcu.be>
- */
-class rcube_session_redis extends rcube_session {
-
-    private $redis;
-
-    /**
-     * @param Object $config
-     */
-    public function __construct($config)
-    {
-        parent::__construct($config);
-
-        // instantiate Redis object
-        $this->redis = new Redis();
-
-        if (!$this->redis) {
-            rcube::raise_error(array('code' => 604, 'type' => 'session',
-                                   'line' => __LINE__, 'file' => __FILE__,
-                                   'message' => "Failed to find Redis. Make sure php-redis is included"),
-                               true, true);
-        }
-
-        // get config instance
-        $hosts = $this->config->get('redis_hosts', array('localhost'));
-
-        // host config is wrong
-        if (!is_array($hosts) || empty($hosts)) {
-            rcube::raise_error(array('code' => 604, 'type' => 'session',
-                                   'line' => __LINE__, 'file' => __FILE__,
-                                   'message' => "Redis host not configured"),
-                               true, true);
-        }
-
-        // only allow 1 host for now until we support clustering
-        if (count($hosts) > 1) {
-            rcube::raise_error(array('code' => 604, 'type' => 'session',
-                                   'line' => __LINE__, 'file' => __FILE__,
-                                   'message' => "Redis cluster not yet supported"),
-                               true, true);
-        }
-
-        foreach ($hosts as $host) {
-            // explode individual fields
-            list($host, $port, $database, $password) = array_pad(explode(':', $host, 4), 4, 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 ($this->redis->connect($host, $port) === false) {
-                rcube::raise_error(
-                    array(
-                        'code' => 604,
-                        'type' => 'session',
-                        'line' => __LINE__,
-                        'file' => __FILE__,
-                        'message' => "Could not connect to Redis server. Please check host and port"
-                    ),
-                    true,
-                    true
-                );
-            }
-
-            if ($password != null && $this->redis->auth($password) === false) {
-                rcube::raise_error(
-                    array(
-                        'code' => 604,
-                        'type' => 'session',
-                        'line' => __LINE__,
-                        'file' => __FILE__,
-                        'message' => "Could not authenticate with Redis server. Please check password."
-                    ),
-                    true,
-                    true
-                );
-            }
-
-            if ($database != 0 && $this->redis->select($database) === false) {
-                rcube::raise_error(
-                    array(
-                        'code' => 604,
-                        'type' => 'session',
-                        'line' => __LINE__,
-                        'file' => __FILE__,
-                        'message' => "Could not select Redis database. Please check database setting."
-                    ),
-                    true,
-                    true
-                );
-            }
-        }
-
-        // register sessions handler
-        $this->register_session_handler();
-    }
-
-    /**
-     * @param $save_path
-     * @param $session_name
-     * @return bool
-     */
-    public function open($save_path, $session_name)
-    {
-        return true;
-    }
-
-    /**
-     * @return bool
-     */
-    public function close()
-    {
-        return true;
-    }
-
-    /**
-     * remove data from store
-     *
-     * @param $key
-     * @return bool
-     */
-    public function destroy($key)
-    {
-        if ($key) {
-            $this->redis->del($key);
-        }
-
-        return true;
-    }
-
-    /**
-     * read data from redis store
-     *
-     * @param $key
-     * @return null
-     */
-    public function read($key)
-    {
-        if ($value = $this->redis->get($key)) {
-            $arr = unserialize($value);
-            $this->changed = $arr['changed'];
-            $this->ip      = $arr['ip'];
-            $this->vars    = $arr['vars'];
-            $this->key     = $key;
-
-            return !empty($this->vars) ? (string) $this->vars : '';
-        }
-
-        return '';
-    }
-
-    /**
-     * write data to redis store
-     *
-     * @param $key
-     * @param $newvars
-     * @param $oldvars
-     * @return bool
-     */
-    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));
-            $this->redis->setex($key, $this->lifetime + 60, $data);
-        }
-
-        return true;
-    }
-
-    /**
-     * write data to redis store
-     *
-     * @param $key
-     * @param $vars
-     * @return bool
-     */
-    public function write($key, $vars)
-    {
-        $data = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars));
-
-        return $this->redis->setex($key, $this->lifetime + 60, $data);
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_spellcheck_atd.php Deleted

@@ -1,202 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2013, The Roundcube Dev Team                            |
- |                                                                       |
- | 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:                                                              |
- |   Spellchecking backend implementation for afterthedeadline services  |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with an After the Deadline service
- * See http://www.afterthedeadline.com/ for more information
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_atd extends rcube_spellcheck_engine
-{
-    const SERVICE_HOST = 'service.afterthedeadline.com';
-    const SERVICE_PORT = 80;
-
-    private $matches = array();
-    private $content;
-    private $langhosts = array(
-        'fr' => 'fr.',
-        'de' => 'de.',
-        'pt' => 'pt.',
-        'es' => 'es.',
-    );
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        $langs = array_values($this->langhosts);
-        $langs[] = 'en';
-        return $langs;
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->content = $text;
-
-        // spell check uri is configured
-        $rcube = rcube::get_instance();
-        $url = $rcube->config->get('spellcheck_uri');
-        $key = $rcube->config->get('spellcheck_atd_key');
-
-        if ($url) {
-            $a_uri = parse_url($url);
-            $ssl   = ($a_uri['scheme'] == 'https' || $a_uri['scheme'] == 'ssl');
-            $port  = $a_uri['port'] ?: ($ssl ? 443 : 80);
-            $host  = ($ssl ? 'ssl://' : '') . $a_uri['host'];
-            $path  = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $this->lang;
-        }
-        else {
-            $host = self::SERVICE_HOST;
-            $port = self::SERVICE_PORT;
-            $path = '/checkDocument';
-
-            // prefix host for other languages than 'en'
-            $lang = substr($this->lang, 0, 2);
-            if ($this->langhosts[$lang])
-                $host = $this->langhosts[$lang] . $host;
-        }
-
-        $postdata = 'data=' . urlencode($text);
-
-        if (!empty($key))
-            $postdata .= '&key=' . urlencode($key);
-
-        $response = $headers = '';
-        $in_header = true;
-        if ($fp = fsockopen($host, $port, $errno, $errstr, 30)) {
-            $out = "POST $path HTTP/1.0\r\n";
-            $out .= "Host: " . str_replace('ssl://', '', $host) . "\r\n";
-            $out .= "Content-Length: " . strlen($postdata) . "\r\n";
-            $out .= "Content-Type: application/x-www-form-urlencoded\r\n";
-            $out .= "Connection: Close\r\n\r\n";
-            $out .= $postdata;
-            fwrite($fp, $out);
-
-            while (!feof($fp)) {
-                if ($in_header) {
-                    $line = fgets($fp, 512);
-                    $headers .= $line;
-                    if (trim($line) == '')
-                        $in_header = false;
-                }
-                else {
-                    $response .= fgets($fp, 1024);
-                }
-            }
-            fclose($fp);
-        }
-
-        // parse HTTP response headers
-        if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $headers, $m)) {
-            $http_status = $m[1];
-            if ($http_status != '200')
-                $this->error = 'HTTP ' . $m[1] . $m[2];
-        }
-
-        if (!$response) {
-            $this->error = "Empty result from spelling engine";
-        }
-
-        try {
-            $result = new SimpleXMLElement($response);
-        }
-        catch (Exception $e) {
-            $this->error = "Unexpected response from server: " . $response;
-            return array();
-        }
-
-        foreach ($result->error as $error) {
-            if (strval($error->type) == 'spelling') {
-                $word = strval($error->string);
-
-                // skip exceptions
-                if ($this->dictionary->is_exception($word)) {
-                    continue;
-                }
-
-                $prefix = strval($error->precontext);
-                $start = $prefix ? mb_strpos($text, $prefix) : 0;
-                $pos = mb_strpos($text, $word, $start);
-                $len = mb_strlen($word);
-                $num = 0;
-
-                $match = array($word, $pos, $len, null, array());
-                foreach ($error->suggestions->option as $option) {
-                    $match[4][] = strval($option);
-                    if (++$num == self::MAX_SUGGESTIONS)
-                        break;
-                }
-                $matches[] = $match;
-            }
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $matches = $word ? $this->check($word) : $this->matches;
-
-        if ($matches[0][4]) {
-            return $matches[0][4];
-        }
-
-        return array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        if ($text) {
-            $matches = $this->check($text);
-        }
-        else {
-            $matches = $this->matches;
-            $text    = $this->content;
-        }
-
-        $result = array();
-
-        foreach ($matches as $m) {
-            $result[] = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
-        }
-
-        return $result;
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_spellcheck_enchant.php Deleted

@@ -1,181 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- | Copyright (C) 20011-2013, The Roundcube Dev Team                      |
- |                                                                       |
- | 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:                                                              |
- |   Spellchecking backend implementation to work with Enchant           |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with Pspell
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_enchant extends rcube_spellcheck_engine
-{
-    private $enchant_broker;
-    private $enchant_dictionary;
-    private $matches = array();
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        $this->init();
-
-        $langs = array();
-        if ($dicts = enchant_broker_list_dicts($this->enchant_broker)) {
-            foreach ($dicts as $dict) {
-                $langs[] = preg_replace('/-.*$/', '', $dict['lang_tag']);
-            }
-        }
-
-        return array_unique($langs);
-    }
-
-    /**
-     * Initializes Enchant dictionary
-     */
-    private function init()
-    {
-        if (!$this->enchant_broker) {
-            if (!extension_loaded('enchant')) {
-                $this->error = "Enchant extension not available";
-                return;
-            }
-
-            $this->enchant_broker = enchant_broker_init();
-        }
-
-        if (!enchant_broker_dict_exists($this->enchant_broker, $this->lang)) {
-            $this->error = "Unable to load dictionary for selected language using Enchant";
-            return;
-        }
-
-        $this->enchant_dictionary = enchant_broker_request_dict($this->enchant_broker, $this->lang);
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->init();
-
-        if (!$this->enchant_dictionary) {
-            return array();
-        }
-
-        // tokenize
-        $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-        $diff       = 0;
-        $matches    = array();
-
-        foreach ($text as $w) {
-            $word = trim($w[0]);
-            $pos  = $w[1] - $diff;
-            $len  = mb_strlen($word);
-
-            // skip exceptions
-            if ($this->dictionary->is_exception($word)) {
-            }
-            else if (!enchant_dict_check($this->enchant_dictionary, $word)) {
-                $suggestions = enchant_dict_suggest($this->enchant_dictionary, $word);
-
-                if (sizeof($suggestions) > self::MAX_SUGGESTIONS) {
-                    $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-                }
-
-                $matches[] = array($word, $pos, $len, null, $suggestions);
-            }
-
-            $diff += (strlen($word) - $len);
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $this->init();
-
-        if (!$this->enchant_dictionary) {
-            return array();
-        }
-
-        $suggestions = enchant_dict_suggest($this->enchant_dictionary, $word);
-
-        if (sizeof($suggestions) > self::MAX_SUGGESTIONS)
-            $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-
-        return is_array($suggestions) ? $suggestions : array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        $result = array();
-
-        if ($text) {
-            // init spellchecker
-            $this->init();
-
-            if (!$this->enchant_dictionary) {
-                return array();
-            }
-
-            // With Enchant we don't need to get suggestions to return misspelled words
-            $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-            foreach ($text as $w) {
-                $word = trim($w[0]);
-
-                // skip exceptions
-                if ($this->dictionary->is_exception($word)) {
-                    continue;
-                }
-
-                if (!enchant_dict_check($this->enchant_dictionary, $word)) {
-                    $result[] = $word;
-                }
-            }
-
-            return $result;
-        }
-
-        foreach ($this->matches as $m) {
-            $result[] = $m[0];
-        }
-
-        return $result;
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_spellcheck_engine.php Deleted

@@ -1,89 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2011-2013, Kolab Systems AG                             |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | 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:                                                              |
- |   Interface class for a spell-checking backend                        |
- +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Interface class for a spell-checking backend
- *
- * @package    Framework
- * @subpackage Utils
- */
-abstract class rcube_spellcheck_engine
-{
-    const MAX_SUGGESTIONS = 10;
-
-    protected $lang;
-    protected $error;
-    protected $dictionary;
-    protected $separator = '/[\s\r\n\t\/\[\]{}<>\\"]+|[:;?!,\.](?=\W|$)/';
-
-    /**
-     * Default constructor
-     */
-    public function __construct($dict, $lang)
-    {
-        $this->dictionary = $dict;
-        $this->lang = $lang;
-    }
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @return array Indexed list of language codes
-     */
-    abstract function languages();
-
-    /**
-     * Set content and check spelling
-     *
-     * @param string $text    Text content for spellchecking
-     *
-     * @return bool True when no mispelling found, otherwise false
-     */
-    abstract function check($text);
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @param string $word The word
-     *
-     * @return array Suggestions list
-     */
-    abstract function get_suggestions($word);
-
-    /**
-     * Returns misspelled words
-     *
-     * @param string $text The content for spellchecking. If empty content
-     *                     used for check() method will be used.
-     *
-     * @return array List of misspelled words
-     */
-    abstract function get_words($text = null);
-
-    /**
-     * Returns error message
-     *
-     * @return string Error message
-     */
-    public function error()
-    {
-        return $this->error;
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_spellcheck_googie.php Deleted

@@ -1,177 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | 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:                                                              |
- |   Spellchecking backend implementation to work with Googiespell       |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with a Googiespell service
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_googie extends rcube_spellcheck_engine
-{
-    const GOOGIE_HOST = 'ssl://spell.roundcube.net';
-    const GOOGIE_PORT = 443;
-
-    private $matches = array();
-    private $content;
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        return array('am','ar','ar','bg','br','ca','cs','cy','da',
-            'de_CH','de_DE','el','en_GB','en_US',
-            'eo','es','et','eu','fa','fi','fr_FR','ga','gl','gl',
-            'he','hr','hu','hy','is','it','ku','lt','lv','nl',
-            'pl','pt_BR','pt_PT','ro','ru',
-            'sk','sl','sv','uk');
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->content = $text;
-
-        if (empty($text)) {
-            return $this->matches = array();
-        }
-
-        // spell check uri is configured
-        $url = rcube::get_instance()->config->get('spellcheck_uri');
-
-        if ($url) {
-            $a_uri = parse_url($url);
-            $ssl   = ($a_uri['scheme'] == 'https' || $a_uri['scheme'] == 'ssl');
-            $port  = $a_uri['port'] ? $a_uri['port'] : ($ssl ? 443 : 80);
-            $host  = ($ssl ? 'ssl://' : '') . $a_uri['host'];
-            $path  = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $this->lang;
-        }
-        else {
-            $host = self::GOOGIE_HOST;
-            $port = self::GOOGIE_PORT;
-            $path = '/tbproxy/spell?lang=' . $this->lang;
-        }
-
-        $path .= sprintf('&key=%06d', $_SESSION['user_id']);
-
-        $gtext = '<?xml version="1.0" encoding="utf-8" ?>'
-            .'<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">'
-            .'<text>' . htmlspecialchars($text, ENT_QUOTES, RCUBE_CHARSET) . '</text>'
-            .'</spellrequest>';
-
-        $store = '';
-        if ($fp = fsockopen($host, $port, $errno, $errstr, 30)) {
-            $out = "POST $path HTTP/1.0\r\n";
-            $out .= "Host: " . str_replace('ssl://', '', $host) . "\r\n";
-            $out .= "User-Agent: Roundcube Webmail/" . RCUBE_VERSION . " (Googiespell Wrapper)\r\n";
-            $out .= "Content-Length: " . strlen($gtext) . "\r\n";
-            $out .= "Content-Type: text/xml\r\n";
-            $out .= "Connection: Close\r\n\r\n";
-            $out .= $gtext;
-            fwrite($fp, $out);
-
-            while (!feof($fp))
-                $store .= fgets($fp, 128);
-            fclose($fp);
-        }
-
-        // parse HTTP response
-        if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $store, $m)) {
-            $http_status = $m[1];
-            if ($http_status != '200') {
-                $this->error = 'HTTP ' . $m[1] . rtrim($m[2]);
-            }
-        }
-
-        if (!$store) {
-            $this->error = "Empty result from spelling engine";
-        }
-        else if (preg_match('/<spellresult error="([^"]+)"/', $store, $m) && $m[1]) {
-            $this->error = "Error code $m[1] returned";
-            $this->error .= preg_match('/<errortext>([^<]+)/', $store, $m) ? ": " . html_entity_decode($m[1]) : '';
-        }
-
-        preg_match_all('/<c o="([^"]*)" l="([^"]*)" s="([^"]*)">([^<]*)<\/c>/', $store, $matches, PREG_SET_ORDER);
-
-        // skip exceptions (if appropriate options are enabled)
-        foreach ($matches as $idx => $m) {
-            $word = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
-            // skip  exceptions
-            if ($this->dictionary->is_exception($word)) {
-                unset($matches[$idx]);
-            }
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $matches = $word ? $this->check($word) : $this->matches;
-
-        if ($matches[0][4]) {
-            $suggestions = explode("\t", $matches[0][4]);
-            if (sizeof($suggestions) > self::MAX_SUGGESTIONS) {
-                $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-            }
-
-            return $suggestions;
-        }
-
-        return array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        if ($text) {
-            $matches = $this->check($text);
-        }
-        else {
-            $matches = $this->matches;
-            $text    = $this->content;
-        }
-
-        $result = array();
-
-        foreach ($matches as $m) {
-            $result[] = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
-        }
-
-        return $result;
-    }
-}

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_spellcheck_pspell.php Deleted

@@ -1,187 +0,0 @@
-<?php
-
-/**
- +-----------------------------------------------------------------------+
- | This file is part of the Roundcube Webmail client                     |
- |                                                                       |
- | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
- |                                                                       |
- | 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:                                                              |
- |   Spellchecking backend implementation to work with Pspell            |
- +-----------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
- +-----------------------------------------------------------------------+
-*/
-
-/**
- * Spellchecking backend implementation to work with Pspell
- *
- * @package    Framework
- * @subpackage Utils
- */
-class rcube_spellcheck_pspell extends rcube_spellcheck_engine
-{
-    private $plink;
-    private $matches = array();
-
-    /**
-     * Return a list of languages supported by this backend
-     *
-     * @see rcube_spellcheck_engine::languages()
-     */
-    function languages()
-    {
-        $defaults = array('en');
-        $langs = array();
-
-        // get aspell dictionaries
-        exec('aspell dump dicts', $dicts);
-        if (!empty($dicts)) {
-            $seen = array();
-            foreach ($dicts as $lang) {
-                $lang = preg_replace('/-.*$/', '', $lang);
-                $langc = strlen($lang) == 2 ? $lang.'_'.strtoupper($lang) : $lang;
-                if (!$seen[$langc]++)
-                    $langs[] = $lang;
-            }
-            $langs = array_unique($langs);
-        }
-        else {
-            $langs = $defaults;
-        }
-
-        return $langs;
-    }
-
-    /**
-     * Initializes PSpell dictionary
-     */
-    private function init()
-    {
-        if (!$this->plink) {
-            if (!extension_loaded('pspell')) {
-                $this->error = "Pspell extension not available";
-                return;
-            }
-
-            $this->plink = pspell_new($this->lang, null, null, RCUBE_CHARSET, PSPELL_FAST);
-        }
-
-        if (!$this->plink) {
-            $this->error = "Unable to load Pspell engine for selected language";
-        }
-    }
-
-    /**
-     * Set content and check spelling
-     *
-     * @see rcube_spellcheck_engine::check()
-     */
-    function check($text)
-    {
-        $this->init();
-
-        if (!$this->plink) {
-            return array();
-        }
-
-        // tokenize
-        $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-        $diff       = 0;
-        $matches    = array();
-
-        foreach ($text as $w) {
-            $word = trim($w[0]);
-            $pos  = $w[1] - $diff;
-            $len  = mb_strlen($word);
-
-            // skip exceptions
-            if ($this->dictionary->is_exception($word)) {
-            }
-            else if (!pspell_check($this->plink, $word)) {
-                $suggestions = pspell_suggest($this->plink, $word);
-
-                if (sizeof($suggestions) > self::MAX_SUGGESTIONS) {
-                    $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-                }
-
-                $matches[] = array($word, $pos, $len, null, $suggestions);
-            }
-
-            $diff += (strlen($word) - $len);
-        }
-
-        $this->matches = $matches;
-        return $matches;
-    }
-
-    /**
-     * Returns suggestions for the specified word
-     *
-     * @see rcube_spellcheck_engine::get_words()
-     */
-    function get_suggestions($word)
-    {
-        $this->init();
-
-        if (!$this->plink) {
-            return array();
-        }
-
-        $suggestions = pspell_suggest($this->plink, $word);
-
-        if (sizeof($suggestions) > self::MAX_SUGGESTIONS)
-            $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
-
-        return is_array($suggestions) ? $suggestions : array();
-    }
-
-    /**
-     * Returns misspelled words
-     *
-     * @see rcube_spellcheck_engine::get_suggestions()
-     */
-    function get_words($text = null)
-    {
-        $result = array();
-
-        if ($text) {
-            // init spellchecker
-            $this->init();
-
-            if (!$this->plink) {
-                return array();
-            }
-
-            // With PSpell we don't need to get suggestions to return misspelled words
-            $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
-
-            foreach ($text as $w) {
-                $word = trim($w[0]);
-
-                // skip exceptions
-                if ($this->dictionary->is_exception($word)) {
-                    continue;
-                }
-
-                if (!pspell_check($this->plink, $word)) {
-                    $result[] = $word;
-                }
-            }
-
-            return $result;
-        }
-
-        foreach ($this->matches as $m) {
-            $result[] = $m[0];
-        }
-
-        return $result;
-    }
-}

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/README Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/calendar.css Deleted

@@ -1,1790 +0,0 @@
-/*** Style for Calendar plugin ***/
-
-body.calendarmain {
-	overflow: hidden;
-}
-
-#taskbar a.button-calendar {
-	background: url(images/calendar.png) 0px 1px no-repeat;
-}
-
-/* hack for IE 6/7 */
-* html #taskbar a.button-calendar {
-	background-image: url(images/calendar.gif);
-}
-
-#main {
-	position: absolute;
-	clear: both;
-	top: 72px;
-	left: 0;
-	right: 0;
-	bottom: 10px;
-}
-
-#calendarsidebar {
-	position: absolute;
-	top: 0px;
-	left: 10px;
-	bottom: 0;
-	width: 230px;
-}
-
-#datepicker {
-	position: relative;
-	top: 42px;
-	width: 100%;
-}
-
-#datepicker .ui-datepicker {
-	width: 97% !important;
-	box-shadow: none;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-}
-
-#datepicker .ui-datepicker-activerange a {
-	border-color: #c33;
-	color: #a22;
-}
-
-#datepicker .ui-datepicker-activerange a.ui-state-active {
-	color: #fff;
-}
-
-#datepicker .ui-priority-secondary {
-	opacity: 0.4;
-}
-
-#datepicker td.ui-datepicker-week-col {
-	cursor: pointer;
-}
-
-#calendarsidebartoggle {
-	position: absolute;
-	left: 244px;
-	width: 8px;
-	top: 4px;
-	bottom: 0;
-	background: url(images/toggle.gif) 0 48% no-repeat transparent;
-	cursor: pointer;
-}
-
-div.sidebarclosed {
-	background-position: -8px 48% !important;
-}
-
-#calendarsidebartoggle:hover {
-	background-color: #ddd;
-}
-
-#calendar {
-	position: absolute;
-	top: 4px;
-	left: 256px;
-	right: 10px;
-	bottom: 0;
-}
-
-#print {
-	width: 680px;
-}
-
-pre {
- font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-}
-
-#calendars {
-	position: absolute;
-	top: 228px;
-	left: 0;
-	bottom: 0;
-	right: 0;
-	background-color: #F9F9F9;
-	border: 1px solid #999999;
-	overflow: hidden;
-}
-
-#calendars .boxlistcontent {
-	top: 43px;
-}
-
-#calendars .listsearchbox {
-	padding: 2px 4px;
-}
-
-#calendarslist {
-	list-style: none;
-	margin: 0;
-	padding: 0;
-}
-
-#attachmentlist li,
-#calendarslist li {
-	margin: 0;
-	padding: 1px;
-	display: block;
-	background: #fff;
-	border-bottom: 1px solid #EBEBEB;
-	white-space: nowrap;
-	cursor: default;
-}
-
-#calendars .treelist li {
-	margin: 0;
-	padding: 0;
-	position: relative;
-}
-
-#calendars .treelist ul li:last-child {
-	border-bottom: 0;
-}
-
-#calendars .treelist li div.folder,
-#calendars .treelist li div.calendar {
-	position: relative;
-	height: 22px;
-}
-
-#calendars .treelist li span.calname {
-	display: block;
-	padding: 0px 30px 2px 2px;
-	position: absolute;
-	top: 4px;
-	left: 38px;
-	right: 40px;
-	cursor: default;
-	background: url(images/calendars.png) right 20px no-repeat;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-
-#calendars .treelist li div.virtual > span.calname {
-	color: #aaa;
-	left: 20px;
-}
-
-#calendars .treelist.flat li span.calname {
-	left: 24px;
-	right: 22px;
-}
-
-#calendars .treelist li span.handle {
-	display: inline-block;
-	position: absolute;
-	top: 5px;
-	right: 6px;
-	padding: 0;
-	width: 12px;
-	height: 12px;
-	border-radius: 3px;
-	font-size: 0.8em;
-}
-
-#calendars .treelist li a.subscribed {
-	display: inline-block;
-	position: absolute;
-	top: 2px;
-	right: 22px;
-	height: 16px;
-	width: 16px;
-	padding: 0;
-	background: url(images/calendars.png) -100px 0 no-repeat;
-	overflow: hidden;
-	text-indent: -5000px;
-	cursor: pointer;
-}
-
-#calendars .treelist div:hover > a.subscribed {
-	background-position: 0 -126px;
-}
-
-#calendars .treelist div.subscribed a.subscribed {
-	background-position: 0 -144px;
-}
-
-#calendars .treelist li input {
-	position: absolute;
-	top: 1px;
-	left: 18px;
-}
-
-#calendars .treelist li div.treetoggle {
-	top: -1px;
-	left: 1px !important;
-}
-
-#calendars .treelist ul li div.treetoggle {
-	left: 17px !important;
-}
-
-#calendars .treelist ul ul li div.treetoggle {
-	left: 33px !important;
-}
-
-#calendars .treelist.flat li input {
-	left: 4px;
-}
-
-#calendars .treelist ul li div.folder,
-#calendars .treelist ul li div.calendar {
-	margin-left: 16px;
-}
-
-#calendars .treelist ul ul li div.folder,
-#calendars .treelist ul ul li div.calendar {
-	margin-left: 32px;
-}
-
-#calendars .treelist ul ul ul li div.folder,
-#calendars .treelist ul ul ul li div.calendar {
-	margin-left: 48px;
-}
-
-#calendars .treelist li.selected {
-	background-color: #ccc;
-}
-
-#calendars .treelist li.selected > span.calname {
-	font-weight: bold;
-}
-
-#calendars .treelist div.readonly span.calname {
-	background-position: right -20px;
-}
-
-#calendars .treelist li.user > div > span.calname {
-	background-position: right -38px;
-}
-
-#calendarslist li.virtual span.calname {
-	color: #666;
-}
-
-#calendars .searchresults .boxtitle {
-	border-top: 1px solid #aaa;
-	margin-bottom: 0;
-}
-
-#calfeedurl,
-#caldavurl {
-	width: 98%;
-	background: #fbfbfb;
-	padding: 4px;
-	margin-bottom: 1em;
-	resize: none;
-}
-
-#agendalist {
-	width: 100%;
-	margin: 0 auto;
-	margin-top: 60px;
-	border: 1px solid #C1DAD7;
-	display: none;
-}
-
-#agendalist table {
-	width: 100%;
-}
-
-#agendalist td,
-#agendalist th {
-	border-right: 1px solid #C1DAD7;
-	border-bottom: 1px solid #C1DAD7;
-	background: #fff;
-	padding: 6px 6px 6px 12px;
-}
-
-#agendalist tr {
-	vertical-align: top;
-}
-
-#agendalist th {
-	font-weight: bold;
-}
-
-#calendartoolbar {
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	height: 35px;
-}
-
-#calendartoolbar a {
-	padding-right: 10px;
-}
-
-#calendartoolbar a.button,
-#calendartoolbar a.buttonPas {
-	display: block;
-	float: left;
-	width: 32px;
-	height: 32px;
-	padding: 0;
-	margin-right: 10px;
-	overflow: hidden;
-	background: url(images/toolbar.png) 0 0 no-repeat transparent;
-	opacity: 0.99; /* this is needed to make buttons appear correctly in Chrome */
-}
-
-#calendartoolbar a.buttonPas {
-	opacity: 0.35;
-}
-
-#calendartoolbar a.addeventSel {
-	background-position: 0 -32px;
-}
-
-#calendartoolbar a.delete {
-  background-position: -32px 0;
-}
-
-#calendartoolbar a.deleteSel {
-  background-position: -32px -32px;
-}
-
-#calendartoolbar a.print {
-  background-position: -64px 0;
-}
-
-#calendartoolbar a.printSel {
-  background-position: -64px -32px;
-}
-
-#calendartoolbar a.import {
-	background-position: -168px 0;
-}
-
-#calendartoolbar a.importSel {
-	background-position: -168px -32px;
-}
-
-#calendartoolbar a.export {
-	background-position: -128px 0;
-}
-
-#calendartoolbar a.exportSel {
-	background-position: -128px -32px;
-}
-
-.calendarmain #quicksearchbar {
-	top: 80px;
-	right: 4px;
-}
-
-#eventedit.uidialog,
-.calendarmain div.uidialog {
-	display: none;
-}
-
-#user {
-	position: absolute;
-	top: 10px;
-	right: 100px;
-	left: 100px;
-	text-align: center;
-}
-
-a.morelink {
-	font-size: 90%;
-	color: #C33;
-	text-decoration: none;
-}
-
-a.morelink:hover {
-	text-decoration: underline;
-}
-
-a.miniColors-trigger {
-	margin-top: -3px;
-}
-
-#attachmentcontainer {
-	position: absolute;
-	top: 80px;
-	left: 20px;
-	right: 20px;
-	bottom: 20px;
-}
-
-#attachmentframe {
-	width: 100%;
-	height: 100%;
-	border: 1px solid #999999;
-	background-color: #F9F9F9;
-}
-
-#partheader {
-	position: absolute;
-	top: 20px;
-	left: 220px;
-	right: 20px;
-	height: 40px;
-}
-
-#partheader table td {
-	padding-left: 2px;
-	padding-right: 4px;
-	vertical-align: middle;
-	font-size: 11px;
-}
-
-#partheader table td.title {
-	color: #666;
-	font-weight: bold;
-}
-
-.attachments-list ul {
-	margin: 0px;
-	padding: 0px;
-	list-style-image: none;
-	list-style-type: none;
-}
-
-.attachments-list ul li {
-	height: 18px;
-	font-size: 12px;
-	padding-top: 2px;
-	padding-right: 8px;
-	white-space: nowrap;
-}
-
-.attachments-list ul li img {
-	padding-right: 2px;
-	vertical-align: middle;
-}
-
-.attachments-list ul li a {
-	text-decoration: none;
-}
-
-.attachments-list ul li a:hover {
-	text-decoration: underline;
-}
-
-#attachmentlist {
-	margin: 0 -0.8em;
-}
-
-#attachmentlist li {
-	padding: 2px 2px 3px 0.8em;
-}
-
-#eventshow .attachments-list ul li {
-	float: left;
-}
-
-#edit-attachments-form {
-	padding-top: 1.2em;
-}
-
-#edit-attachments-form .formbuttons {
-	margin: 0.5em 0;
-}
-
-.event-attendees span.attendee {
-	padding-right: 18px;
-	margin-right: 0.5em;
-	background: url(images/attendee-status.gif) right 0 no-repeat;
-}
-
-.event-attendees span.attendee a.mailtolink {
-	text-decoration: none;
-	white-space: nowrap;
-}
-
-.event-attendees span.attendee a.mailtolink:hover {
-	text-decoration: underline;
-}
-
-.event-attendees span.accepted {
-	background-position: right -20px;
-}
-
-.event-attendees span.declined {
-	background-position: right -40px;
-}
-
-.event-attendees span.tentative {
-	background-position: right -60px;
-}
-
-.event-attendees span.delegated {
-	background-position: right -180px;
-}
-
-.event-attendees span.organizer {
-	background-position: right -80px;
-}
-
-#all-event-attendees span.attendee {
-	display: block;
-	margin-bottom: 4px;
-	padding-bottom: 3px;
-	border-bottom: 1px solid #ddd;
-}
-
-/* jQuery UI overrides */
-
-.calendarmain .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
-	float: left;
-}
-
-#eventshow h1 {
-	font-size: 20px;
-	margin: 0.1em 0 0.4em 0;
-}
-
-#eventshow label,
-#eventshow h5.label {
-	font-weight: normal;
-	font-size: 0.9em;
-	color: #999;
-	margin: 0 0 0.2em 0;
-}
-
-#eventshow {
-	margin: 0 -0.2em;
-}
-
-#event-status-badge {
-	width: 100px;
-	height: 100px;
-	position: absolute;
-	top: 0;
-	right: 0;
-	overflow: hidden;
-}
-
-#event-status-badge span {
-	display: none;
-	text-transform: uppercase;
-	width: 150px;
-	height: 20px;
-	line-height: 20px;
-	position: absolute;
-	left: -20px;
-	top: 35px;
-	padding-left: 10px;
-	text-align: center;
-	font-weight: bold;
-	font-size: 12px;
-	color: #fff;
-	box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc;
-	-webkit-transform: rotate(45deg);
-	-moz-transform: rotate(45deg);
-	-ms-transform: rotate(45deg);
-	-o-transform: rotate(45deg);
-	transform: rotate(45deg);
-}
-
-#eventshow.status-cancelled #event-status-badge span {
-	background: url(images/badge.png) 26px -24px no-repeat #cc0000;
-	display: block;
-}
-
-#eventshow.sensitivity-private #event-status-badge span {
-	background: url(images/badge.png) 40px -52px no-repeat #0066ff;
-	display: block;
-}
-
-#eventshow.sensitivity-confidential #event-status-badge span {
-	background: url(images/badge.png) 20px 2px no-repeat #cc0000;
-	display: block;
-}
-
-#eventshow.status-cancelled #event-title,
-#eventshow.sensitivity-private #event-title,
-#eventshow.sensitivity-confidential #event-title {
-	margin-right: 80px;
-}
-
-#eventshow div.event-line {
-	margin-top: 0.1em;
-	margin-bottom: 0.3em;
-}
-
-#eventshow #event-url .event-text {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-#event-rsvp .itip-reply-controls {
-	margin-top: 0.5em;
-}
-
-#eventshow .itip-reply-controls label {
-	font-size: 1em;
-	color: #333;
-}
-
-#event-partstat .changersvp {
-	cursor: pointer;
-	color: #333;
-	text-decoration: none;
-}
-
-#event-partstat:hover .changersvp {
-	text-decoration: underline;
-}
-
-#event-partstat .changersvp.accepted {
-	color: #589b1e;
-}
-
-#event-partstat .changersvp.tentative {
-	color: #f0bb1d;
-}
-
-#event-partstat .changersvp.declined {
-	color: #ea0000;
-}
-
-#event-partstat .changersvp.delegated {
-	color: #018be9;
-}
-
-#eventedit {
-	position: relative;
-	padding: 0.5em 0.1em;
-}
-
-#eventedit input.text,
-#eventedit textarea {
-	width: 97%;
-}
-
-#eventtabs {
-	position: relative;
-	padding: 0;
-	border: 0;
-	border-radius: 0;
-}
-
-div.form-section,
-#eventshow div.event-section,
-#eventtabs div.event-section {
-	margin-top: 0.2em;
-	margin-bottom: 0.8em;
-}
-
-#eventtabs .tabsbar {
-	position: absolute;
-	top: 0;
-}
-
-#eventtabs .ui-tabs-panel {
-	padding: 1em 0.8em;
-	border: 1px solid #aaa;
-	border-width: 0 1px 1px 1px;
-}
-
-#eventtabs .ui-tabs-nav {
-	background: none;
-	padding: 0;
-	border-width: 0 0 1px 0;
-	border-radius: 0;
-}
-
-#eventtabs .border-after {
-	padding-bottom: 0.6em;
-	margin-bottom: 0.6em;
-	border-bottom: 1px solid #999;
-}
-
-#eventshow label,
-#eventedit label,
-.form-section label {
-	display: inline-block;
-	min-width: 7em;
-	padding-right: 0.5em;
-}
-
-#eventedit .formtable td.label {
-	min-width: 6em;
-}
-
-td.topalign {
-	vertical-align: top;
-}
-
-#eventedit .edit-alarm-item {
-	position: relative;
-	padding-right: 30px;
-	margin-bottom: 2px;
-}
-
-#eventedit .edit-alarm-buttons {
-	position: absolute;
-	top: 2px;
-	right: 0;
-}
-
-#eventedit .edit-alarm-buttons a.iconlink {
-	display: none;
-	width: 18px;
-	height: 17px;
-	padding: 1px;
-	text-indent: -5000px;
-	overflow: hidden;
-}
-
-#eventedit .edit-alarm-buttons a.add-alarm {
-	background: url(images/plus.png) 1px 1px no-repeat;
-}
-
-#eventedit .edit-alarm-buttons a.delete-alarm {
-	background: url(images/delete.png) 1px 1px no-repeat;
-}
-
-#eventedit .edit-alarm-buttons a.delete-alarm,
-#eventedit .first .edit-alarm-buttons a.add-alarm {
-	display: inline-block;
-}
-
-#eventedit .first .edit-alarm-buttons a.delete-alarm {
-	display: none;
-}
-
-#eventedit label.weekday,
-#eventedit label.monthday {
-	min-width: 3em;
-}
-
-#eventedit label.month {
-	min-width: 5em;
-}
-
-#edit-recurrence-yearly-bymonthblock {
-	margin-left: 7.5em;
-}
-
-#edit-recurrence-rdates {
-	display: block;
-	list-style: none;
-	margin: 0 0 0.8em 0;
-	padding: 0;
-	max-height: 300px;
-	overflow: auto;
-}
-
-#edit-recurrence-rdates li {
-	display: block;
-	position: relative;
-	width: 14em;
-	padding: 1px;
-}
-
-#edit-recurrence-rdates li a.delete {
-	position: absolute;
-	top: 1px;
-	right: 0;
-}
-
-#eventedit .recurrence-form {
-	display: none;
-}
-
-#eventedit .formtable td {
-	padding: 0.2em 0;
-}
-
-.ui-dialog .event-update-confirm {
-	padding: 0 0.5em 0.5em 0.5em;
-}
-
-.event-dialog-message,
-.event-update-confirm .message {
-	margin-top: 0.5em;
-	padding: 0.8em;
-	background-color: #F7FDCB;
-	border: 1px solid #C2D071;
-}
-
-.event-dialog-message .message,
-.event-update-confirm .message {
-	margin-bottom: 0.5em;
-}
-
-.edit-recurring-warning .savemode {
-	padding-left: 20px;
-}
-
-.event-update-confirm .savemode {
-	padding-left: 30px;
-}
-
-.event-dialog-message span.ui-icon,
-.event-update-confirm span.ui-icon {
-	float: left;
-	margin: 0 7px 20px 0;
-}
-
-.event-dialog-message label,
-.event-update-confirm label {
-	min-width: 3em;
-	padding-right: 1em;
-}
-
-.event-update-confirm a.button {
-	margin: 0 0.5em 0 0.2em;
-	min-width: 5em;
-}
-
-#event-rsvp,
-#edit-attendees-notify {
-	margin: 0.3em 0;
-	padding: 0.5em;
-	background-color: #F7FDCB;
-	border: 1px solid #C2D071;
-}
-
-.edit-attendees-table {
-	width: 100%;
-	display: table;
-	table-layout: fixed;
-	border-collapse: collapse;
-	border: 1px solid #ccc;
-}
-
-.edit-attendees-table th,
-.edit-attendees-table td {
-	padding: 3px;
-	border-bottom: 1px solid #ccc;
-	text-align: left;
-}
-
-.edit-attendees-table th.role,
-.edit-attendees-table td.role {
-	width: 8em;
-}
-
-.edit-attendees-table th.availability,
-.edit-attendees-table th.confirmstate,
-.edit-attendees-table td.availability,
-.edit-attendees-table td.confirmstate {
-	width: 4em;
-}
-
-.edit-attendees-table th.options,
-.edit-attendees-table td.options {
-	width: 2em;
-	text-align: right;
-	padding-right: 4px;
-}
-
-.edit-attendees-table th.invite,
-.edit-attendees-table td.invite {
-	width: 24px;
-	padding: 2px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: hidden;
-}
-
-#eventedit .edit-attendees-table th.invite label {
-	display: none;
-}
-
-.edit-attendees-table th.name,
-.edit-attendees-table td.name {
-	width: auto;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.edit-attendees-table thead th,
-.edit-attendees-table thead td {
-	background: url(images/listheader.gif) top left repeat-x #CCC;
-}
-
-#edit-attendees-form,
-#edit-resources-form {
-	position: relative;
-	margin-top: 1em;
-}
-
-#edit-attendees-form #edit-attendee-schedule,
-#edit-resources-form #edit-resource-find {
-	position: absolute;
-	top: 0;
-	right: 0;
-}
-
-.edit-attendees-table select.edit-attendee-role {
-	border: 0;
-	padding: 2px;
-	background: white;
-}
-
-.availability img.availabilityicon {
-	margin: 1px;
-	width: 14px;
-	height: 14px;
-	border-radius: 4px;
-	-moz-border-radius: 4px;
-}
-
-.availability img.availabilityicon.loading {
-	background: url(images/loading_blue.gif) center no-repeat;
-}
-
-#schedule-freebusy-times td.unknown,
-.availability img.availabilityicon.unknown {
-	background: #ddd;
-}
-
-#schedule-freebusy-times td.free,
-.availability img.availabilityicon.free {
-	background: #0c0;
-}
-
-#schedule-freebusy-times td.busy,
-.availability img.availabilityicon.busy {
-	background: #c00;
-}
-
-#schedule-freebusy-times td.tentative,
-.availability img.availabilityicon.tentative {
-	background: #66d;
-}
-
-#schedule-freebusy-times td.out-of-office,
-.availability img.availabilityicon.out-of-office {
-	background: #f0b400;
-}
-
-#schedule-freebusy-times td.all-busy,
-#schedule-freebusy-times td.all-tentative,
-#schedule-freebusy-times td.all-out-of-office {
-	background-image: url(images/freebusy-colors.png);
-	background-position: top right;
-	background-repeat: no-repeat;
-}
-
-#schedule-freebusy-times td.all-tentative {
-	background-position: right -40px;
-}
-
-#schedule-freebusy-times td.all-out-of-office {
-	background-position: right -80px;
-}
-
-#edit-attendees-legend {
-	margin-top: 3em;
-	margin-bottom: 0.5em;
-}
-
-#edit-attendees-legend .legend {
-	margin-right: 2em;
-	white-space: nowrap;
-}
-
-#edit-attendees-legend img.availabilityicon {
-	vertical-align: middle;
-}
-
-.edit-attendees-table tbody td.confirmstate {
-	overflow: hidden;
-	white-space: nowrap;
-	text-indent: -2000%;
-}
-
-.edit-attendees-table td.confirmstate span {
-	display: block;
-	width: 20px;
-	background: url(images/attendee-status.gif) 5px 0 no-repeat;
-}
-
-.edit-attendees-table td.confirmstate span.needs-action {
-}
-
-.edit-attendees-table td.confirmstate span.accepted {
-	background-position: 5px -20px;
-}
-
-.edit-attendees-table td.confirmstate span.declined {
-	background-position: 5px -40px;
-}
-
-.edit-attendees-table td.confirmstate span.tentative {
-	background-position: 5px -60px;
-}
-
-.edit-attendees-table td.confirmstate span.delegated {
-	background-position: 5px -180px;
-}
-
-#attendees-freebusy-table {
-	width: 100%;
-	table-layout: fixed;
-	border-collapse: collapse;
-	margin: 0.5em 0;
-}
-
-#attendees-freebusy-table td.attendees {
-	width: 18em;
-	border: 1px solid #ccc;
-	vertical-align: top;
-	overflow: hidden;
-}
-
-#attendees-freebusy-table td.times {
-	width: auto;
-	vertical-align: top;
-	border: 1px solid #ccc;
-}
-
-#attendees-freebusy-table div.scroll {
-	position: relative;
-	overflow: auto;
-}
-
-#attendees-freebusy-table h3.boxtitle {
-	margin: 0;
-	height: auto !important;
-	border-color: #ccc;
-}
-
-.attendees-list .attendee {
-	padding: 3px 4px 3px 1px;
-	background: url(images/attendee-status.gif) 2px -97px no-repeat;
-	white-space: nowrap;
-}
-
-.attendees-list a.attendee-role-toggle {
-	display: inline-block;
-	width: 16px;
-	margin-right: 3px;
-	cursor: pointer;
-}
-
-.attendees-list div.attendee {
-	border-top: 1px solid #ccc;
-}
-
-.attendees-list span.attendee {
-	padding-left: 20px;
-	margin-right: 2em;
-}
-
-.attendees-list .organizer {
-	background-position: 3px -77px;
-}
-
-.attendees-list .opt-participant {
-	background-position: 2px -117px;
-}
-
-.attendees-list .non-participant {
-	background-position: 2px -137px;
-}
-
-.attendees-list .chair {
-	background-position: 2px -157px;
-}
-
-.attendees-list .loading {
-	background: url(images/loading_blue.gif) 1px 50% no-repeat;
-}
-
-.attendees-list .total {
-	background: none;
-	padding-left: 4px;
-	font-weight: bold;
-}
-
-.attendees-list .spacer,
-#schedule-freebusy-times tr.spacer td {
-	background: 0;
-	font-size: 50%;
-}
-
-#schedule-freebusy-times {
-	border-collapse: collapse;
-	width: 100%;
-}
-
-#schedule-freebusy-times td {
-	padding: 3px;
-	border: 1px solid #ccc;
-}
-
-#schedule-freebusy-times tr.dates th {
-	border-color: #aaa;
-	border-style: solid;
-	border-width: 0 1px 0 1px;
-	white-space: nowrap;
-}
-
-#attendees-freebusy-table div.timesheader,
-#schedule-freebusy-times tr.times td {
-	min-width: 30px;
-	font-size: 9px;
-	padding: 5px 2px 6px 2px;
-	text-align: center;
-}
-
-#schedule-freebusy-times tr.times td.allday {
-	min-width: 60px;
-}
-
-#schedule-freebusy-times tr.times td {
-	cursor: pointer;
-}
-
-#schedule-event-time {
-	position: absolute;
-	border: 2px solid #333;
-	background: #777;
-	background: rgba(60, 60, 60, 0.6);
-	opacity: 0.5;
-	border-radius: 4px;
-	cursor: move;
-	filter: alpha(opacity=40); /* IE8 */
-}
-
-#eventfreebusy .schedule-options {
-	position: relative;
-	margin-bottom: 1.5em;
-}
-
-#eventfreebusy .schedule-buttons {
-	position: absolute;
-	top: 0;
-	right: 0;
-}
-
-#eventfreebusy .schedule-find-buttons {
-	padding-bottom:0.5em;
-}
-
-#eventfreebusy .schedule-find-buttons button {
-	min-width: 9em;
-	text-align: center;
-}
-
-span.edit-alarm-set {
-	white-space: nowrap;
-}
-
-a.dropdown-link {
-	color: #CC0000;
-	font-size: 12px;
-	text-decoration: none;
-}
-
-a.dropdown-link:after {
-	content: ' ▼';
-	font-size: 11px;
-	color: #666;
-}
-
-#eventedit .ui-tabs-panel {
-	min-height: 20em;
-}
-
-.alarm-item {
-	margin: 0.4em 0 1em 0;
-}
-
-.alarm-item .event-title {
-	font-size: 14px;
-	margin: 0.1em 0 0.3em 0;
-}
-
-.alarm-item div.event-section {
-	margin-top: 0.1em;
-	margin-bottom: 0.3em;
-}
-
-.alarm-item .alarm-actions {
-	margin-top: 0.4em;
-}
-
-.alarm-item div.alarm-actions a {
-	color: #CC0000;
-	margin-right: 0.8em;
-	text-decoration: none;
-}
-
-a.alarm-action-snooze:after {
-	content: ' ▼';
-	font-size: 10px;
-	color: #666;
-}
-
-#alarm-snooze-dropdown {
-	z-index: 5000;
-}
-
-.ui-dialog-buttonset a.dropdown-link {
-	margin-right: 1em;
-}
-
-.ui-datepicker-calendar .ui-datepicker-today .ui-state-default {
-	border-color: #cccccc;
-	background: #ffffcc;
-	color: #000;
-}
-
-.ui-datepicker-calendar .ui-datepicker-week-col {
-	text-align: right;
-	padding-right: 0.5em;
-}
-
-.ui-datepicker th {
-    padding: 0.3em 0;
-    font-size: 10px;
-}
-
-.ui-datepicker td span,
-.ui-datepicker td a {
-	padding-left: 0.1em;
-}
-
-.ui-autocomplete {
-	max-height: 160px;
-	overflow-y: auto;
-	overflow-x: hidden;
-}
-
-.ui-autocomplete .ui-menu-item {
-	white-space: nowrap;
-}
-
-* html .ui-autocomplete {
-	height: 160px;
-}
-
-span.spacer {
-	padding-left: 3em;
-}
-
-#agendaoptions {
-	position: absolute;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	height: auto;
-	z-index: 200;
-	border: 1px solid #ccc;
-	padding: 2px 5px 1px;
-	font-size: 90%;
-}
-
-#agendaoptions label {
-	color: #444;
-	text-shadow: 1px 1px #eee;
-	padding-right: 0.5em;
-}
-
-#calendar-kolabform {
-	position: relative;
-	padding-top: 24px;
-	margin: 0 -8px;
-	min-width: 660px;
-	min-height: 400px;
-}
-
-#calendar-kolabform div.tabsbar {
-	top: 0;
-	right: 2px;
-	left: 2px;
-	height: 24px;
-}
-
-#calendar-kolabform fieldset.tabbed {
-	background-color: #fff;
-	margin-top: 0;
-}
-
-#calendar-kolabform span.tablink {
-	background-color: #e8e8e9;
-	background-image: -moz-linear-gradient(center top, #f4f4f4, #e6e6e6);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.0, #f4f4f4), color-stop(1.0, #e6e6e6));
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr=#f4f4f4, endColorstr=#e6e6e6, GradientType=0);
-	height: 24px !important;
-}
-
-#calendar-kolabform span.tablink-selected {
-	background: #fff;
-	height: 25px !important;
-}
-
-#calendar-kolabform span.tablink a,
-#calendar-kolabform span.tablink-selected a {
-	background: none;
-	border: 1px solid #AAAAAA;
-	border-top-left-radius: 2px;
-	border-top-right-radius: 2px;
-	padding: 4px 10px 0 10px;
-	margin-left: 0;
-}
-
-#calendar-kolabform table td.title {
-  font-weight: bold;
-  white-space: nowrap;
-  color: #666;
-  padding-right: 10px;
-}
-
-#resource-dialog-right {
-	position: absolute;
-	top: 10px;
-	left: 300px;
-	right: 8px;
-	bottom: 10px;
-}
-
-#resource-info,
-#resource-availability {
-	position: absolute;
-	top: 0;
-	left: 0;
-	right: 0;
-	height: 48%;
-	border: 1px solid #999;
-	background-color: #F9F9F9;
-	overflow: auto;
-}
-
-#resource-availability {
-	top: auto;
-	bottom: 0;
-	height: 49%;
-	overflow: hidden;
-}
-
-#resource-info .boxtitle,
-#resource-availability .boxtitle {
-	margin-top: 0;
-}
-
-#resource-freebusy-calendar {
-	position: absolute;
-	top: 20px;
-	left: -1px;
-	right: -1px;
-	bottom: -1px;
-}
-
-#resource-freebusy-calendar .fc-content {
-	top: 0;
-}
-
-#resource-freebusy-calendar .fc-content .fc-event-bg {
-	background: 0;
-}
-
-#resource-freebusy-calendar .fc-event.status-busy,
-#resource-freebusy-calendar .status-busy .fc-event-skin {
-	border-color: #e26569;
-	background-color: #e26569;
-}
-
-#resource-freebusy-calendar .fc-event.status-tentative,
-#resource-freebusy-calendar .status-tentative .fc-event-skin {
-	border-color: #8383fc;
-	background: #8383fc;
-}
-
-#resource-freebusy-calendar .fc-event.status-outofoffice,
-#resource-freebusy-calendar .status-outofoffice .fc-event-skin {
-	border-color: #fbaa68;
-	background: #fbaa68;
-}
-
-#resources-list div.treetoggle {
-	left: 3px !important;
-	top: -2px;
-}
-
-#resources-list li ul div.treetoggle {
-	left: 23px !important;
-}
-
-#resource-selection {
-  position: absolute;
-	top: 10px;
-	bottom: 10px;
-	left: 8px;
-	width: 280px;
-	border: 1px solid #999999;
-	background-color: #F9F9F9;
-	overflow: hidden;
-}
-
-#resource-selection .boxlistcontent {
-	top: 25px;
-	border-top: 1px solid #eee;
-}
-
-#resourcequicksearch {
-	position: absolute;
-	top: 3px;
-	left: 7px;
-	right: 4px;
-	height: 17px;
-	background: #fff;
-	border: 1px solid #888;
-	border-radius: 10px;
-	-webkit-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
-	box-shadow: inset 1px 1px 1px 0px rgba(0, 0, 0, 0.3);
-}
-
-#resourcesearchbox {
-	position: absolute;
-	top: 1px;
-	left: 24px;
-	width: 140px;
-	height: 15px;
-	font-size: 11px;
-	padding: 0px;
-	border: none;
-	outline: none;
-	background: #fff;
-}
-
-#resourcesearchreset {
-	position: absolute;
-	top: 2px;
-	right: 2px;
-	text-decoration: none;
-}
-
-#resource-details,
-#resource-details-owner {
-	margin: 8px;
-}
-
-#resource-details td.title,
-#resource-details-owner td.title {
-	color: #666;
-	padding-right: 10px;
-	min-width: 10em;
-}
-
-#resource-details-owner thead td {
-	color: #333;
-	font-size: 13px;
-	font-weight: bold;
-}
-
-/* fullcalendar style overrides */
-
-#calendar .fc-header-right {
-	padding-right: 200px;
-	padding-top: 0;
-}
-
-.rcube-fc-content {
-	position: absolute !important;
-	top: 38px;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	overflow: hidden;
-}
-
-.fc-event-title {
-	font-weight: bold;
-}
-
-.cal-event-status-cancelled .fc-event-title {
-	text-decoration: line-through;
-}
-
-.fc-event-hori .fc-event-title {
-	font-weight: normal;
-	white-space: nowrap;
-}
-
-.fc-event-hori .fc-event-time {
-	white-space: nowrap;
-	font-weight: normal !important;
-	font-size: 10px;
-	padding-right: 0.6em;
-}
-
-.fc-event-vert.fc-invitation-needs-action,
-.fc-event-hori.fc-invitation-needs-action {
-	border: 1px dashed #5757c7 !important;
-}
-
-.fc-event-vert.fc-invitation-tentative,
-.fc-event-hori.fc-invitation-tentative {
-	border: 1px dashed #eb8900 !important;
-}
-
-.fc-event-vert.fc-invitation-declined,
-.fc-event-hori.fc-invitation-declined {
-	border: 1px dashed #c00 !important;
-}
-
-.fc-grid .fc-event-time {
-	font-weight: normal !important;
-	padding-right: 0.3em;
-}
-
-.fc-event-cateories {
-	font-style:italic; 
-}
-
-.fc-event-location {
-	font-size: 90%;
-}
-
-.fc-more-link {
-	color: #999;
-	padding-top: 1px;
-	cursor: pointer;
-}
-
-.fc-agenda-slots td div {
-	height: 22px;
-}
-
-.fc-mon, .fc-tue, .fc-wed, .fc-thu, .fc-fri {
-	background-color: #fdfdfd;
-}
-
-.fc-widget-header {
-	background-color: #fff;
-}
-
-.fc-icon-alarms,
-.fc-icon-sensitive,
-.fc-icon-recurring {
-	display: inline-block;
-	width: 11px;
-	height: 11px;
-	background: url(images/eventicons.gif) 0 0 no-repeat;
-	margin-left: 3px;
-	line-height: 10px;
-}
-
-.fc-icon-alarms {
-	background-position: 0 -13px;
-}
-
-.fc-icon-sensitive {
-	background-position: 0 -25px;
-}
-
-.fc-list-section .fc-event {
-	cursor: pointer;
-}
-
-#calendar .fc-event-vert .fc-event-head,
-#calendar .fc-event-vert .fc-event-content {
-	position: relative;
-	z-index: 2;
-	width: 100%;
-	overflow: hidden;
-}
-
-.fc-view-list div.fc-list-header,
-.fc-view-table td.fc-list-header,
-.edit-attendees-table thead td {
-	padding: 3px;
-	background: #dddddd;
-	background-image: -moz-linear-gradient(center top, #f4f4f4, #d2d2d2);
-	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0.00, #f4f4f4), color-stop(1.00, #d2d2d2));
-	filter: progid:DXImageTransform.Microsoft.gradient(enabled='true', startColorstr=#f4f4f4, endColorstr=#d2d2d2, GradientType=0);
-	font-weight: bold;
-	color: #333;
-}
-
-.fc-view-list .fc-event-skin .fc-event-content {
-	background: #F6F6F6;
-	padding: 2px;
-}
-
-.fc-view-list .fc-event-skin .fc-event-title,
-.fc-view-list .fc-event-skin .fc-event-location {
-	color: #333;
-}
-
-.fc-view-table table.fc-list-smart {
-	table-layout: auto;
-}
-
-.fc-listappend {
-	text-align: center;
-	margin: 1em 0;
-}
-
-.fc-listappend .message {
-	padding: 0.5em;
-	margin-bottom: 0.5em;
-	font-size: 150%;
-	color: #999;
-}
-
-.fc-listappend .formlinks a {
-	font-size: 12px;
-	padding: 0 0.3em;
-}
-
-.fc-event-temp {
-	opacity: 0.4;
-	filter: alpha(opacity=40); /* IE8 */
-}
-
-/* Settings section */
-
-fieldset #calendarcategories div {
-	margin-bottom: 0.3em;
-}
-
-/* Invitation UI in mail */
-
-.messagelist tbody .attachment span.ical {
-	display: inline-block;
-	vertical-align: middle;
-	height: 18px;
-	width: 20px;
-	padding: 0;
-	background: url(images/calendar-small.png) 1px 1px no-repeat;
-}
-
-#messagemenu li a.calendarlink,
-#attachmentmenu li a.calendarlink {
-	background-image: url(images/calendars.png);
-	background-position: 7px -109px;
-	background-repeat: no-repeat;
-}
-
-div.calendar-invitebox {
-	min-height: 20px;
-	margin: 5px 8px;
-	padding: 3px 6px 6px 34px;
-	border: 1px solid #C2D071;
-	background: url(images/calendar.png) 6px 5px no-repeat #F7FDCB;
-}
-
-div.calendar-invitebox td.ititle {
-	font-weight: bold;
-	padding-right: 0.5em;
-}
-
-div.calendar-invitebox td.label {
-	color: #666;
-	padding-right: 1em;
-}
-
-#event-rsvp .rsvp-buttons,
-div.calendar-invitebox .itip-buttons div {
-	margin-top: 0.5em;
-}
-
-#event-rsvp input.button,
-div.calendar-invitebox input.button,
-div.calendar-invitebox select {
-	font-size: 11px;
-	margin-right: 0.5em;
-}
-
-div.calendar-invitebox .folder-select {
-	font-size: 11px;
-	margin-left: 1em;
-}
-
-div.calendar-invitebox .rsvp-status.loading {
-	color: #666;
-	padding: 1px 0 2px 24px;
-	background: url(images/loading_blue.gif) top left no-repeat;
-}
-
-div.calendar-invitebox .rsvp-status.declined,
-div.calendar-invitebox .rsvp-status.tentative,
-div.calendar-invitebox .rsvp-status.delegated,
-div.calendar-invitebox .rsvp-status.accepted {
-	padding: 0 0 1px 22px;
-	background: url(images/attendee-status.gif) 2px -20px no-repeat;
-}
-
-div.calendar-invitebox .rsvp-status.declined {
-	background-position: 2px -40px;
-}
-
-div.calendar-invitebox .rsvp-status.tentative {
-	background-position: 2px -60px;
-}
-
-div.calendar-invitebox .rsvp-status.delegated {
-	background-position: 2px -180px;
-}
-
-div.calendar-invitebox .calendar-agenda-preview {
-	display: none;
-	border-top: 1px solid #dfdfdf;
-	margin-top: 1em;
-	padding-top: 0.6em;
-}
-
-div.calendar-invitebox .calendar-agenda-preview h3.preview-title {
-	margin: 0 0 0.5em 0;
-	font-size: 12px;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-row {
-	color: #777;
-	padding: 2px 0;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-row.current {
-	color: #000;
-	font-weight: bold;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-row.no-event {
-	font-style: italic;
-}
-
-div.calendar-invitebox .calendar-agenda-preview .event-date {
-	display: inline-block;
-	min-width: 8em;
-	margin-right: 1em;
-	white-space: nowrap;
-}
-
-/* iTIP attend reply page */
-
-.calendaritipattend .centerbox {
-	width: 40em;
-	margin: 80px auto;
-	padding: 10px 10px 10px 90px;
-	border: 1px solid #ccc;
-	box-shadow: 1px 1px 24px #ccc;
-	-moz-box-shadow: 1px 1px 18px #ccc;
-	-webkit-box-shadow: #ccc 1px 1px 18px;
-	background: url(images/invitation.png) 10px 10px no-repeat #fbfbfb;
-}
-
-.calendaritipattend .calendar-invitebox {
-	background: none;
-	padding-left: 0;
-	border: 0;
-	margin: 0 0 2em 0;
-}
-
-.calendaritipattend .calendar-invitebox .rsvp-status {
-	margin-top: 2.5em;
-	font-size: 110%;
-	font-weight: bold;
-}
-
-.calendaritipattend .calendar-invitebox td.title,
-.calendaritipattend .calendar-invitebox td.ititle {
-	font-size: 120%;
-}
-

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/fullcalendar.css Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/iehacks.css Deleted

@@ -1,80 +0,0 @@
-/* CSS hacks for IE 6/7 */
-
-#main {
-	width: expression(Math.max(300, parseInt(document.documentElement.clientWidth)-10)+'px');
-	height: expression(Math.max(300, parseInt(document.documentElement.clientHeight)-100)+'px');
-}
-
-#calendarsidebar,
-#calendarsidebartoggle {
-	height: expression((parseInt(this.parentNode.offsetHeight)-37)+'px');
-}
-
-#calendar {
-	width: expression((parseInt(this.parentNode.offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetWidth)-parseInt(document.getElementById('calendarsidebartoggle').offsetLeft)-4)+'px');
-	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
-}
-
-#calendars {
-	height: expression((parseInt(this.parentNode.offsetHeight)-220)+'px');
-}
-
-#agendaoptions {
-	width: expression((parseInt(this.parentNode.offsetWidth)-12)+'px');
-}
-
-#calendartoolbar a.buttonPas {
-	filter: alpha(opacity=35);
-}
-
-html #calendartoolbar a.button,
-html #calendartoolbar a.buttonPas {
-	background-image: url(images/toolbar.gif);
-}
-
-#datepicker a.ui-priority-secondary {
-	filter: alpha(opacity=40);
-}
-
-#calendarslist li span.handle {
-	background-image: url(images/calendars.gif);
-}
-
-#datepicker .ui-widget-header {
-	width: 102%;
-}
-
-.fc-day-content {
-	cursor: default;
-}
-
-.fc-header-title h2 {
-	font-size: 16px;
-}
-
-.fc-event-temp .fc-event-bg {
-	display: none; /* nested opacity filters while dragging don't work */
-}
-
-#schedule-event-time {
-	filter: alpha(opacity=40);
-}
-
-#eventfreebusy .schedule-buttons,
-#edit-attendees-form #edit-attendee-schedule {
-	right: 0.6em;
-}
-
-#schedule-freebusy-times td.all-busy,
-#schedule-freebusy-times td.all-tentative,
-#schedule-freebusy-times td.all-out-of-office {
-	background-image: url('images/freebusy-colors.gif');
-}
-
-#schedule-freebusy-times tr.times td.allday {
-	width: expression(Math.max(60, parseInt(this.offsetWidth))+'px');
-}
-
-.ui-dialog .ui-dialog-titlebar {
-	width: expression((parseInt(this.parentNode.offsetWidth)-26)+'px');
-}

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/attendee-status.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/calendar-blue.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/calendar.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/calendar.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/calendars.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/calendars.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/delete.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/eventicons.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/export.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/freebusy-colors.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/freebusy-colors.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/ical-attachment.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/invitation.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/listheader.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/loading_blue.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/plus.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/preview.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/print.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/spacer.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/toggle.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/toolbar.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/images/toolbar.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/print.css Deleted

@@ -1,209 +0,0 @@
-/*** Printing styles for Calendar plugin ***/
-
-body {
-	margin: 0;
-	color: #000;
-	background: #fff;
-}
-
-body, td, th, div, p, h3, select, input, textarea {
-	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
-	font-size: 8pt;
-}
-
-#calendar {
-	position: relative;
-	top: 0;
-	left: 0;
-	height: auto;
-	margin: 5em auto 0 auto;
-	overflow: visible;
-}
-
-#calendar .fc-header-right {
-	padding-right: 0;
-}
-
-#printconfig {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	z-index: 10000;
-	padding: 0.5em;
-	background: #ebebeb;
-	border-bottom: 1px solid #999;
-	box-shadow: 0 3px 4px #ccc;
-	-moz-box-shadow: 0 3px 4px #ccc;
-	-webkit-box-shadow: 0 3px 4px #ccc;
-}
-
-#printconfig .prop {
-	padding-right: 2em;
-}
-
-#message {
-	position: absolute;
-	top: 5.5em;
-	left: 1em;
-}
-
-#message div.loading {
-	color: #666;
-	font-style: italic;
-}
-
-#calendarlist {
-	list-style-type: square;
-	margin: 2em 0;
-	padding-left: 1em;
-}
-
-#calendarlist li {
-	float: left;
-	padding-left: 0;
-	padding-right: 3em;
-	margin-left: 0;
-	font-weight: bold;
-}
-
-#calendarlist input,
-#calendarlist .handle {
-	display: none;
-}
-
-.calwidth {
-	width: 700px;
-	margin: 0 auto;
-}
-
-.rightalign {
-	float: right;
-	padding-top: 0.3em;
-}
-
-@media print {
-	.noprint,
-	.fc-header-right span {
-		display: none;
-	}
-	
-	#calendar {
-		margin-top: 0;
-	}
-}
-
-/* fullcalendar style overrides */
-
-.fc-view {
-	overflow: visible;
-}
-
-.fc-event-skin,
-.fc-event-inner .fc-event-skin {
-	color: black;
-	background-color: #fff !important;
-}
-
-.fc-event-title {
-	font-weight: bold;
-}
-
-.fc-event-hori .fc-event-title {
-	font-weight: normal;
-	white-space: nowrap;
-}
-
-.fc-event-hori .fc-event-time {
-	white-space: nowrap;
-	font-weight: normal !important;
-	font-size: 10px;
-	padding-right: 0.6em;
-}
-
-.fc-grid .fc-event-time {
-	font-weight: normal !important;
-	padding-right: 0.3em;
-}
-
-.fc-event-cateories {
-	font-style: italic;
-}
-
-.fc-event-location {
-	font-size: 90%;
-}
-
-.fc-agenda-slots td div {
-	height: 1.4em;
-}
-
-.fc-widget-header,
-.fc-mon, .fc-tue, .fc-wed, .fc-thu, .fc-fri {
-	background-color: #fff;
-}
-
-.fc-widget-header, .fc-widget-content {
-	border-color: #ccc;
-}
-
-.fc-icon-alarms,
-.fc-icon-recurring {
-	display: inline-block;
-	width: 11px;
-	height: 11px;
-	background: url('images/eventicons.gif') 0 0 no-repeat;
-	margin-left: 3px;
-	line-height: 10px;
-}
-
-.fc-icon-alarms {
-	background-position: 0 -13px;
-}
-
-.fc-view-list, .fc-view-table {
-	border: 0;
-}
-
-.fc-view-list div.fc-list-header,
-.fc-view-table td.fc-list-header {
-	padding: 0.3em;
-	background: #fff;
-	font-weight: bold;
-	font-size: 1.2em;
-	color: #333;
-	border-color: #333;
-	border-style: solid;
-	border-width: 1px 0;
-	filter: none;
-}
-
-.fc-list-section .fc-event {
-	cursor: auto;
-}
-
-.fc-view-table tr.fc-event td,
-.fc-view-table tr.fc-event td.fc-event-handle {
-	border-color: #999;
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-.fc-view-table tr.fc-last td {
-	border: 0;
-}
-
-.fc-view-table tr.fc-event .fc-event-description {
-	padding-left: 2em;
-	padding-top: 0em;
-}
-
-.fc-event-vert .fc-event-description {
-	font-size: 90%;
-	font-style: italic;
-}
-
-
-.fc-view-table col.fc-event-location {
-	width: 20%;
-}

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/print.iehacks.css Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/attachment.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/calendar.html Deleted

@@ -1,261 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-
-</head>
-<roundcube:if condition="env:extwin" /><body class="calendarmain extwin"><roundcube:else /><body class="calendarmain"><roundcube:endif />
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-
-<div id="main">
-  <div id="calendarsidebar">
-    <div id="calendartoolbar">
-      <roundcube:button command="addevent" type="link" class="buttonPas addevent" classAct="button addevent" classSel="button addeventSel" title="calendar.new_event" content=" " />
-      <roundcube:button command="print" type="link" class="buttonPas print" classAct="button print" classSel="button printSel" title="calendar.print" content=" " />
-      <roundcube:button command="events-import" type="link" class="buttonPas import" classAct="button import" classSel="button importSel" title="calendar.importevents" content=" " />
-      <roundcube:button command="export" type="link" class="buttonPas export" classAct="button export" classSel="button exportSel" title="calendar.export" content=" " />
-      <roundcube:container name="toolbar" id="calendartoolbar" />
-    </div>
-
-    <div id="datepicker"></div>
-    <div id="calendars" style="visibility:hidden">
-      <div class="boxtitle"><roundcube:label name="calendar.calendars" /></div>
-      <div class="listsearchbox">
-        <div class="searchbox">
-          <input type="text" name="q" id="calendarlistsearch" placeholder="<roundcube:label name='calendar.findcalendars' />" />
-          <a class="iconbutton searchicon"></a>
-          <roundcube:button command="reset-listsearch" id="calendarlistsearch-reset" class="reset searchreset" title="resetsearch" content="x" />
-        </div>
-      </div>
-      <div class="boxlistcontent">
-      <roundcube:object name="plugin.calendar_list" id="calendarslist" class="treelist" />
-      </div>
-      <div class="boxfooter">
-        <roundcube:button command="calendar-create" type="link" title="calendar.createcalendar" class="buttonPas addgroup" classAct="button addgroup" content=" " />
-        <roundcube:button name="calendaroptionslink" id="calendaroptionslink" type="link" title="moreactions" class="button groupactions" onclick="rcmail_ui.show_popup('calendaroptions');return false" content=" " />
-      </div>
-    </div>
-  </div>
-  <div id="calendarsidebartoggle"></div>
-  <div id="calendar">
-    <roundcube:object name="plugin.angenda_options" class="boxfooter" id="agendaoptions" />
-  </div>
-</div>
-
-<div id="calendaroptionsmenu" class="popupmenu">
-  <ul>
-    <li><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
-    <li><roundcube:button command="calendar-delete" label="delete" classAct="active" /></li>
-    <roundcube:if condition="env:calendar_driver == 'kolab'" />
-    <li><roundcube:button command="calendar-remove" label="calendar.removelist" classAct="active" /></li>
-    <roundcube:endif />
-    <li><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
-    <roundcube:if condition="env:calendar_driver == 'kolab'" />
-    <li class="separator_above"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
-    <roundcube:endif />
-  </ul>
-</div>
-
-<div id="eventshow" class="uidialog">
-  <h1 id="event-title">Event Title</h1>
-  <div id="event-status-badge"><span></span></div>
-  <div class="event-section" id="event-location">Location</div>
-  <div class="event-section" id="event-date">From-To</div>
-  <div class="event-section" id="event-description">
-    <h5 class="label"><roundcube:label name="calendar.description" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section" id="event-url">
-    <h5 class="label"><roundcube:label name="calendar.url" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section" id="event-repeat">
-    <h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section" id="event-alarm">
-    <h5 class="label"><roundcube:label name="calendar.alarms" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-section event-attendees" id="event-attendees">
-    <h5 class="label"><roundcube:label name="calendar.tabattendees" /></h5>
-    <div class="event-text"></div>
-  </div>
-  <div class="event-line" id="event-partstat">
-    <label><roundcube:label name="calendar.mystatus" /></label>
-    <a href="#change" class="changersvp" title="<roundcube:label name='calendar.changepartstat' />">
-      <span class="event-text"></span>
-    </a>
-  </div>
-  <div class="event-line" id="event-calendar">
-    <label><roundcube:label name="calendar.calendar" /></label>
-    <span class="event-text">Default</span>
-  </div>
-  <div class="event-line" id="event-category">
-    <label><roundcube:label name="calendar.category" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-line" id="event-free-busy">
-    <label><roundcube:label name="calendar.freebusy" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-line" id="event-priority">
-    <label><roundcube:label name="calendar.priority" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-line" id="event-sensitivity">
-    <label><roundcube:label name="calendar.sensitivity" /></label>
-    <span class="event-text"></span>
-  </div>
-  <div class="event-section" id="event-attachments">
-    <label><roundcube:label name="attachments" /></label>
-    <div class="event-text attachments-list"></div>
-  </div>
-  
-  <roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" style="display:none" />
-</div>
-
-<div id="eventoptionsmenu" class="popupmenu">
-  <ul>
-    <li><roundcube:button command="event-download" label="download" classAct="active" /></li>
-    <li><roundcube:button command="event-sendbymail" label="send" classAct="active" /></li>
-    <li><roundcube:button command="event-copy" label="copy" classAct="active" /></li>
-  </ul>
-</div>
-
-<roundcube:include file="/templates/eventedit.html" />
-
-<div id="eventresourcesdialog" class="uidialog">
-  <div id="resource-dialog-left">
-    <div id="resource-selection" class="">
-      <div id="resourcequicksearch">
-        <roundcube:object name="plugin.resources_searchform" id="resourcesearchbox" />
-        <roundcube:button command="reset-resource-search" id="resourcesearchreset" image="/images/icons/reset.gif" title="resetsearch" width="13" height="13" />
-      </div>
-      <div class="boxlistcontent">
-        <roundcube:object name="plugin.resources_list" id="resources-list" class="treelist" />
-      </div>
-    </div>
-  </div>
-
-  <div id="resource-dialog-right">
-    <div id="resource-info">
-      <h2 class="boxtitle"><roundcube:label name="calendar.resourcedetails" /></h2>
-      <roundcube:object name="plugin.resource_info" id="resource-details" />
-    </div>
-
-    <div id="resource-availability">
-      <h2 class="boxtitle"><roundcube:label name="calendar.resourceavailability" /></h2>
-      <roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" />
-    </div>
-  </div>
-</div>
-
-<div id="eventfreebusy" class="uidialog">
-  <roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table" cellspacing="0" cellpadding="0" border="0" />
-  
-  <div class="schedule-options">
-    &nbsp;
-    <div class="schedule-buttons">
-      <button id="shedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button><button id="shedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
-    </div>
-  </div>
-  
-  <div style="float:left; width:28em">
-    <div class="form-section">
-      <label for="schedule-startdate"><roundcube:label name="calendar.start" /></label>
-      <input type="text" name="startdate" size="11" id="schedule-startdate" disabled="true" /> &nbsp;
-      <input type="text" name="starttime" size="6" id="schedule-starttime" disabled="true" />
-    </div>
-    <div class="form-section">
-      <label for="schedule-enddate"><roundcube:label name="calendar.end" /></label>
-      <input type="text" name="enddate" size="11" id="schedule-enddate" disabled="true" /> &nbsp;
-      <input type="text" name="endtime" size="6"  id="schedule-endtime" disabled="true" />
-    </div>
-  </div>
-  <div style="float:left">
-    <div class="schedule-find-buttons">
-      <button id="shedule-find-prev">&#9668; <roundcube:label name="calendar.prevslot" /></button>
-      <button id="shedule-find-next"><roundcube:label name="calendar.nextslot" /> &#9658;</button>
-    </div>
-    <div class="schedule-options">
-      <label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" /><roundcube:label name="calendar.onlyworkinghours" /></label>
-    </div>
-  </div>
-  <br style="clear:both;" />
-  
-  <roundcube:include file="/templates/freebusylegend.html" />
-  <div class="attendees-list">
-    <span class="attendee organizer"><roundcube:label name="calendar.roleorganizer" /></span>
-    <span class="attendee req-participant"><roundcube:label name="calendar.rolerequired" /></span>
-    <span class="attendee opt-participant"><roundcube:label name="calendar.roleoptional" /></span>
-    <span class="attendee non-participant"><roundcube:label name="calendar.rolenonparticipant" /></span>
-    <span class="attendee chair"><roundcube:label name="calendar.rolechair" /></span>
-  </div>
-</div>
-
-<div id="calendarform" class="uidialog">
-  <roundcube:label name="loading" />
-</div>
-
-<div id="eventsimport" class="uidialog">
-  <roundcube:object name="plugin.events_import_form" id="events-import-form" uploadFieldSize="30" />
-</div>
-
-<div id="eventsexport" class="uidialog">
-  <roundcube:object name="plugin.events_export_form" id="events-export-form" />
-</div>
-
-<div id="calendarurlbox" class="uidialog">
-  <p><roundcube:label name="calendar.showurldescription" /></p>
-  <textarea id="calfeedurl" rows="2" readonly="readonly"></textarea>
-  <div id="calendarcaldavurl" style="display:none">
-    <p><roundcube:label name="calendar.caldavurldescription" html="yes" /></p>
-    <textarea id="caldavurl" rows="2" readonly="readonly"></textarea>
-  </div>
-</div>
-
-<div id="quicksearchbar">
-<roundcube:button name="searchmenulink" id="searchmenulink" image="/images/icons/glass.png" />
-<roundcube:object name="plugin.searchform" id="quicksearchbox" />
-<roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
-</div>
-
-<roundcube:object name="plugin.calendar_css" />
-
-<script type="text/javascript">
-
-// use skin functions to handle popup-menus
-rcube_init_mail_ui();
-rcmail_ui.popups.calendaroptions = { id:'calendaroptionsmenu', above:1, obj:$('#calendaroptionsmenu') };
-
-$(document).ready(function(e){
-  // initialize sidebar toggle
-  $('#calendarsidebartoggle').click(function() {
-    var width = $(this).data('sidebarwidth');
-    var offset = $(this).data('offset');
-    var $sidebar = $('#calendarsidebar'), time = 250;
-    
-    if ($sidebar.is(':visible')) {
-      $sidebar.animate({ left:'-'+(width+10)+'px' }, time, function(){ $('#calendarsidebar').hide(); });
-      $(this).animate({ left:'8px'}, time, function(){ $('#calendarsidebartoggle').addClass('sidebarclosed') });
-      $('#calendar').animate({ left:'20px'}, time, function(){ $(this).fullCalendar('render'); });
-    }
-    else {
-      $sidebar.show().animate({ left:'10px' }, time);
-      $(this).animate({ left:offset+'px'}, time, function(){ $('#calendarsidebartoggle').removeClass('sidebarclosed'); });
-      $('#calendar').animate({ left:(width+16)+'px'}, time, function(){ $(this).fullCalendar('render'); });
-    }
-  })
-  .data('offset', $('#calendarsidebartoggle').position().left)
-  .data('sidebarwidth', $('#calendarsidebar').width() + $('#calendarsidebar').position().left);
-});
-
-</script>
-
-</body>
-</html>

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/eventedit.html Deleted

@@ -1,128 +0,0 @@
-<div id="eventedit" class="uidialog">
-  <form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
-    <ul>
-      <li><a href="#event-panel-1"><roundcube:label name="calendar.tabsummary" /></a></li>
-      <li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li>
-      <li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li>
-      <li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li>
-      <li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
-    </ul>
-    
-    <div id="event-panel-1">
-      <div class="event-section">
-        <label for="edit-title"><roundcube:label name="calendar.title" /></label>
-        <br />
-        <input type="text" class="text" name="title" id="edit-title" size="40" />
-      </div>
-      <div class="event-section">
-        <label for="edit-location"><roundcube:label name="calendar.location" /></label>
-        <br />
-        <input type="text" class="text" name="location" id="edit-location" size="40" />
-      </div>
-      <div class="event-section">
-        <label for="edit-description"><roundcube:label name="calendar.description" /></label>
-        <br />
-        <textarea name="description" id="edit-description" class="text" rows="5" cols="40"></textarea>
-      </div>
-      <div class="event-section">
-        <label for="edit-url"><roundcube:label name="calendar.url" /></label>
-        <br />
-        <input type="text" class="text" name="vurl" id="edit-url" size="40" />
-      </div>
-      <div class="event-section">
-        <label style="float:right;padding-right:0.5em"><input type="checkbox" name="allday" id="edit-allday" value="1" /><roundcube:label name="calendar.all-day" /></label>
-        <label for="edit-startdate"><roundcube:label name="calendar.start" /></label>
-        <input type="text" name="startdate" size="11" id="edit-startdate" /> &nbsp;
-        <input type="text" name="starttime" size="6" id="edit-starttime" />
-      </div>
-      <div class="event-section">
-        <label for="edit-enddate"><roundcube:label name="calendar.end" /></label>
-        <input type="text" name="enddate" size="11" id="edit-enddate" /> &nbsp;
-        <input type="text" name="endtime" size="6"  id="edit-endtime" />
-      </div>
-      <div class="event-section" id="edit-alarms">
-        <div class="edit-alarm-item first">
-          <label for="edit-alarm"><roundcube:label name="calendar.alarms" /></label>
-          <roundcube:object name="plugin.alarm_select" />
-          <span class="edit-alarm-buttons">
-            <a href="#add" class="iconlink add add-alarm">+</a>
-            <a href="#delete" class="iconlink delete delete-alarm">-</a>
-          </span>
-        </div>
-      </div>
-      <div class="event-section" id="calendar-select">
-        <label for="edit-calendar"><roundcube:label name="calendar.calendar" /></label>
-        <roundcube:object name="plugin.calendar_select" id="edit-calendar" />
-      </div>
-      <div class="event-section">
-        <label for="edit-categories"><roundcube:label name="calendar.category" /></label>
-        <roundcube:object name="plugin.category_select" id="edit-categories" />
-      </div>
-      <div class="event-section">
-        <label for="edit-event-status"><roundcube:label name="calendar.status" /></label>
-        <roundcube:object name="plugin.status_select" id="edit-event-status" />
-      </div>
-      <div class="event-section">
-        <label for="edit-free-busy"><roundcube:label name="calendar.freebusy" /></label>
-        <roundcube:object name="plugin.freebusy_select" id="edit-free-busy" />
-      </div>
-      <div class="event-section">
-        <label for="edit-priority"><roundcube:label name="calendar.priority" /></label>
-        <roundcube:object name="plugin.priority_select" id="edit-priority" />
-      </div>
-      <div class="event-section">
-        <label for="edit-sensitivity"><roundcube:label name="calendar.sensitivity" /></label>
-        <roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" />
-      </div>
-    </div>
-    
-    <div id="event-panel-recurrence">
-      <div class="event-section border-after">
-        <roundcube:object name="plugin.recurrence_form" part="frequency" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-daily">
-        <roundcube:object name="plugin.recurrence_form" part="daily" class="event-section" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-weekly">
-        <roundcube:object name="plugin.recurrence_form" part="weekly" class="event-section" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-monthly">
-        <roundcube:object name="plugin.recurrence_form" part="monthly" class="event-section" />
-      </div>
-      <div class="recurrence-form border-after" id="recurrence-form-yearly">
-        <roundcube:object name="plugin.recurrence_form" part="yearly" class="event-section" />
-      </div>
-      <div class="recurrence-form" id="recurrence-form-until">
-        <roundcube:object name="plugin.recurrence_form" part="until" class="event-section" />
-      </div>
-      <div class="recurrence-form" id="recurrence-form-rdate">
-        <roundcube:object name="plugin.recurrence_form" part="rdate" class="event-section" />
-      </div>
-    </div>
-    
-    <div id="event-panel-attendees">
-      <roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="edit-attendees-table" cellspacing="0" cellpadding="0" border="0" />
-      <roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
-      <roundcube:include file="/templates/freebusylegend.html" />
-    </div>
-    
-    <div id="event-panel-resources">
-      <roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="edit-attendees-table" cellspacing="0" cellpadding="0" border="0" coltitle="resource" />
-      <roundcube:object name="plugin.resources_form" id="edit-resources-form" />
-      <roundcube:include file="/templates/freebusylegend.html" />
-    </div>
-    
-    <div id="event-panel-attachments">
-      <div id="edit-attachments" class="attachments-list">
-        <roundcube:object name="plugin.attachments_list" id="attachmentlist" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
-      </div>
-      <div id="edit-attachments-form">
-        <roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
-      </div>
-    </div>
-  </form>
-
-  <roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" />
-  <roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" />
-  <div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
-</div>
\ No newline at end of file

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/freebusylegend.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/itipattend.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/kolabacl.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/kolabform.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/classic/templates/print.html Deleted

@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-</head>
-<body class="calendarprint">
-
-<div id="printconfig" class="noprint">
-  <div class="calwidth">
-    <a href="#close" onclick="window.close()" class="rightalign"><roundcube:label name="close" /></a>
-    <span class="prop"><input type="button" id="printme" value="<roundcube:label name='print' />" onclick="window.print()"></span>
-    <span class="prop"><label><input type="checkbox" id="propdescription" checked="checked" /> <roundcube:label name="calendar.printdescriptions" /></label></span>
-  </div>
-</div>
-
-<roundcube:object name="message" id="message" class="noprint" />
-
-<div id="calendar" class="calwidth"></div>
-
-<div class="calwidth">
-  <roundcube:object name="plugin.calendar_list" activeonly="true" id="calendarlist" />
-</div>
-
-<roundcube:object name="plugin.calendar_css" printmode="true" />
-
-
-</body>
-</html>
\ No newline at end of file

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/print.iehacks.css Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/templates/attachment.html Deleted

@@ -1,64 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="extwin calendar attachmentwin">
-
-<div id="header">
-<div id="topline" role="banner" aria-labelledby="aria-label-topnav">
-	<div class="topleft">
-		<roundcube:container name="topline-left" id="topline-left" />
-	</div>
-	<roundcube:container name="topline-center" id="topline-center" />
-	<div class="topright">
-		<roundcube:container name="topline-right" id="topline-right" />
-		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
-	</div>
-</div>
-</div>
-
-<div id="mainscreen">
-
-<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
-
-<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
-<div id="attachmenttoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
-	<roundcube:button command="download-attachment" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" title="download" />
-	<roundcube:button command="print-attachment" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="print" />
-	<roundcube:container name="toolbar" id="messagetoolbar" />
-</div>
-
-<div id="mainscreencontent">
-
-	<div id="partheader" class="uibox listbox" role="contentinfo" aria-labelledby="aria-label-contentinfo">
-		<h2 class="boxtitle" id="aria-label-contentinfo"><roundcube:label name="properties" /></h2>
-		<div class="scroller">
-			<roundcube:object name="plugin.attachmentcontrols" class="listing" />
-		</div>
-	</div>
-
-	<div id="attachmentcontainer" class="uibox" role="main" aria-labelledby="aria-label-messagepart">
-		<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
-		<div class="iframebox">
-		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" frameborder="0" title="arialabelattachmentpreview" />
-		</div>
-	</div>
-
-</div>
-
-</div>
-
-<script type="text/javascript">
-
-$(document).ready(function() {
-	if (window.rcube_splitter) {
-		new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
-			orientation:'v', relative:true, start:226, min:150, size:12}).init();
-	}
-});
-
-</script>
-</body>
-</html>

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/templates/kolabacl.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/templates/kolabform.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/alarm-clock.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/config.css Deleted

@@ -1,124 +0,0 @@
-/* Stylesheets for the Kolab ActiveSync configuration UI */
-
-#devices-table {
-	width: 100%;
-	table-layout: fixed;
-	cursor: default;
-}
-
-#devices-table td span.devicetype {
-	padding-left: 1em;
-	font-style: italic;
-	color: #666;
-}
-
-#devices-table tr.selected td span.devicetype {
-	color: #ccc;
-}
-
-.boxfooter a.button.delete,
-.boxfooter a.buttonPas.delete {
-	background-image: url(deviceactions.png);
-}
-
-div.subscriptionblock {
-	float: left;
-	margin: 0.5em 3em 2em 0;
-	padding: 0;
-	border: 1px solid #ddd;
-}
-
-div.subscriptionblock h3 {
-	font-size: 12px;
-	color: #333;
-	margin: 0 0 0.4em 0;
-	padding: 4px 4px 0 30px;
-	background: url(foldertypes.png) 5px 4px no-repeat #eee;
-}
-
-div.subscriptionblock h3.contact {
-	background-position: 5px -16px;
-}
-
-div.subscriptionblock h3.event {
-	background-position: 5px -36px;
-}
-
-div.subscriptionblock h3.task {
-	background-position: 5px -56px;
-}
-
-div.subscriptionblock h3.note {
-	background-position: 5px -76px;
-}
-
-#foldersubscriptions thead th {
-	color: #999;
-	font-weight: bold;
-	padding: 2px;
-	text-align: center;
-}
-
-#foldersubscriptions thead tr th {
-	border-top: 1px solid #ddd;
-}
-
-#foldersubscriptions thead th {
-	cursor: pointer;
-}
-
-#foldersubscriptions thead th.foldername {
-    text-align: left;
-}
-
-#foldersubscriptions tbody td {
-	padding: 1px 2px;
-	border-top: 1px solid #ddd;
-	background-color: white;
-}
-
-#foldersubscriptions td label {
-	display: block;
-}
-
-#foldersubscriptions td.mailbox {
-	min-width: 12em;
-	padding-right: 10px;
-}
-
-#foldersubscriptions td.virtual {
-	color: #999;
-}
-
-#foldersubscriptions {
-	overflow: auto;
-	margin-top: 0.5em;
-}
-
-#introtext {
-	position: absolute;
-	top: 12px;
-	left: 5px;
-	padding-left: 10px;
-	max-width: 40em;
-}
-
-#introtext .pointer-left {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 14px;
-	height: 100%;
-	background: url(pointer-left.gif) right center no-repeat;
-}
-
-#introtext .inner {
-	border: 3px solid #e7e7e7;
-	background: #fff;
-}
-
-#introtext .bordered {
-	padding: 12px;
-	border: 1px solid #ccc;
-	background: #fff;
-}

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/deviceactions.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/foldertypes.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/pointer-left.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/synchronize.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/templates Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/templates/config.html Deleted

@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-<script type="text/javascript" src="/splitter.js"></script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="mainscreen">
-
-<div id="sectionslist">
-	<div id="directorylist-title" class="boxtitle"><roundcube:label name="kolab_activesync.devices" /></div>
-	<div class="boxlistcontent">
-		<roundcube:object name="plugin.devicelist" id="devices-table" class="records-table" cellspacing="0" />
-	</div>
-	<div class="boxfooter">
-		<roundcube:button type="link" command="plugin.delete-device" title="kolab_activesync.deletedevice" class="buttonPas delete" classAct="button delete" content=" " />
-	</div>
-</div>
-
-<script type="text/javascript">
-	var viewsplit = new rcube_splitter({ id:'devicelistsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 195 });
-	rcmail.add_onload('viewsplit.init()');
-</script>
-
-<div id="prefs-box">
-	<roundcube:frame contentframe="activesync-frame" id="activesync-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
-</div>
-
-</div>
-
-</body>
-</html>

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/templates/configedit.html Deleted

@@ -1,30 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="iframe">
-
-<div id="prefs-title" class="boxtitle"><roundcube:label name="kolab_activesync.syncsettings"></div>
-
-<div id="prefs-details" class="boxcontent">
-	<form action="#" method="post" id="configform">
-		<fieldset>
-			<legend><roundcube:label name="kolab_activesync.deviceconfig" /></legend>
-			<roundcube:object name="plugin.deviceconfigform" form="configform" class="propform" />
-		</fieldset>
-		<fieldset>
-			<legend><roundcube:label name="kolab_activesync.folderstosync" /></legend>
-			<roundcube:object name="plugin.foldersubscriptions" form="configform" id="foldersubscriptions" syncicon="synchronize.png" alarmicon="alarm-clock.png" />
-		</fieldset>
-	</form>
-	<div id="formfooter">
-		<div class="footerleft">
-			<roundcube:button type="input" class="button mainaction" command="plugin.save-config" label="save" />
-		</div>
-	</div>
-</div>
-
-</body>
-</html>

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/skins/classic/templates/configempty.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/classic Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/classic/kolab_addressbook.css Deleted

@@ -1,49 +0,0 @@
-#directorylistbox ul.treelist li.virtual {
-	background-image: none !important;
-}
-
-#directorylistbox ul.treelist li.virtual > div a {
-	color: #aaa;
-	background-image: none;
-}
-
-#directorylistbox ul.treelist li.virtual > .treetoggle {
-	top: -2px !important;
-}
-
-/*
-#directorylist li.addressbook.readonly
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px 0px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.shared
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -54px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.shared.readonly
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -72px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.other
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -18px;
-  background-repeat: no-repeat;
-}
-
-#directorylist li.addressbook.other.readonly
-{
-  background-image: url(kolab_folders.png);
-  background-position: 5px -36px;
-  background-repeat: no-repeat;
-}
-*/
\ No newline at end of file

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/classic/kolab_folders.gif Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/classic/kolab_folders.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/classic/templates Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/classic/templates/audittrail.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/classic/templates/bookedit.html Deleted

@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<link rel="stylesheet" type="text/css" href="/settings.css" />
-<script type="text/javascript" src="/functions.js"></script>
-</head>
-<body class="iframe">
-
-<div id="folder-title" class="boxtitle"><roundcube:label name="kolab_addressbook.bookproperties" /></div>
-
-<div id="folder-details" class="boxcontent">
-  <roundcube:object name="bookdetails" />
-  <p>
-
-    <roundcube:button command="book-save" type="input" class="button mainaction" label="save" />
-  </p>
-</div>
-<script type="text/javascript">rcube_init_tabs('folder-details > form')</script>
-
-</body>
-</html>

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/larry/templates/bookedit.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/deviceactions.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/foldertypes.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/read.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/style.css Deleted

@@ -1,95 +0,0 @@
-/* Stylesheets for the Kolab ActiveSync configuration UI */
-
-#delegates-table {
-	width: 100%;
-	table-layout: fixed;
-	cursor: default;
-}
-
-.boxfooter a.button.delete,
-.boxfooter a.buttonPas.delete {
-	background-image: url(deviceactions.png);
-}
-
-div.foldersblock {
-	float: left;
-	margin: 0.5em 3em 2em 0;
-	padding: 0;
-	border: 1px solid #ddd;
-}
-
-div.foldersblock h3 {
-	font-size: 12px;
-	color: #333;
-	margin: 0 0 0.4em 0;
-	padding: 4px 4px 0 30px;
-	background: url(foldertypes.png) 5px 4px no-repeat #eee;
-}
-
-div.foldersblock h3.contact {
-	background-position: 5px -16px;
-}
-
-div.foldersblock h3.event {
-	background-position: 5px -36px;
-}
-
-div.foldersblock h3.task {
-	background-position: 5px -56px;
-}
-
-div.foldersblock h3.note {
-	background-position: 5px -76px;
-}
-
-#delegatefolders thead th {
-	color: #999;
-	font-weight: bold;
-	padding: 2px;
-	text-align: center;
-}
-
-#delegatefolders thead tr th {
-	border-top: 1px solid #ddd;
-}
-
-#delegatefolders thead th.read,
-#delegatefolders thead th.write {
-	cursor: pointer;
-}
-
-#delegatefolders thead th.foldername {
-    text-align: left;
-}
-
-#delegatefolders tbody td {
-	padding: 1px 2px;
-	border-top: 1px solid #ddd;
-	background-color: white;
-}
-
-#delegatefolders td label {
-	display: block;
-}
-
-#delegatefolders td.mailbox {
-	min-width: 12em;
-	padding-right: 10px;
-}
-
-#delegatefolders td.virtual {
-	color: #999;
-}
-
-#delegatefolders {
-	overflow: auto;
-	margin-top: 0.5em;
-}
-
-#delegate-delete-dialog {
-	display: none;
-}
-
-#delegate-delete-dialog p {
-	font-weight: bold;
-}

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/templates Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/templates/editform.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/templates/settings.html Deleted

@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-<script type="text/javascript" src="/functions.js"></script>
-<script type="text/javascript" src="/splitter.js"></script>
-</head>
-<body>
-
-<roundcube:include file="/includes/taskbar.html" />
-<roundcube:include file="/includes/header.html" />
-<roundcube:include file="/includes/settingstabs.html" />
-
-<div id="mainscreen">
-
-<div id="sectionslist">
-	<div id="delegateslist-title" class="boxtitle"><roundcube:label name="kolab_delegation.delegates" /></div>
-	<div class="boxlistcontent">
-		<roundcube:object name="plugin.delegatelist" id="delegates-table" class="records-table" cellspacing="0" />
-	</div>
-	<div class="boxfooter">
-		<roundcube:button command="delegate-add" type="link" title="kolab_delegation.adddelegate" class="buttonPas addgroup" classAct="button addgroup" content=" " /><roundcube:button type="link" command="delegate-elete" title="kolab_delegation.deletedelegate" class="buttonPas delete" classAct="button delete" content=" " />
-	</div>
-</div>
-
-<script type="text/javascript">
-	var viewsplit = new rcube_splitter({ id:'delegatelistsplitter', p1: 'sectionslist', p2: 'prefs-box', orientation: 'v', relative: true, start: 300 });
-	rcmail.add_onload('viewsplit.init()');
-</script>
-
-<div id="prefs-box">
-	<roundcube:frame contentframe="delegation-frame" id="delegation-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
-</div>
-
-</div>
-
-<div id="delegate-delete-dialog">
-	<p><roundcube:label name="kolab_delegation.delegatedeleteconfirm" /></p>
-	<span><input type="checkbox" value="1" checked="checked" /><roundcube:label name="kolab_delegation.delegateremoveacl" /></span>
-</div>
-
-</body>
-</html>

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/skins/classic/write.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/skins/larry/templates/kolabacl.html Deleted

iRony-0.4.0.tar.gz/lib/plugins/libkolab/js Deleted

iRony-0.4.0.tar.gz/lib/plugins/libkolab/js/audittrail.js Deleted

@@ -1,268 +0,0 @@
-/**
- * Kolab groupware audit trail utilities
- *
- * @author Thomas Bruederli <bruederli@kolabsys.com>
- *
- * @licstart  The following is the entire license notice for the
- * JavaScript code in this file.
- *
- * Copyright (C) 2015, 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.
- */
-
-var libkolab_audittrail = {}
-
-libkolab_audittrail.quote_html = function(str)
-{
-    return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-};
-
-
-// show object changelog in a dialog
-libkolab_audittrail.object_history_dialog = function(p)
-{
-    // render dialog
-    var $dialog = $(p.container);
-
-    // close show dialog first
-    if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-
-    // hide and reset changelog table
-    $dialog.find('div.notfound-message').remove();
-    $dialog.find('.changelog-table').show().children('tbody')
-        .html('<tr><td colspan="4"><span class="loading">' + rcmail.gettext('loading') + '</span></td></tr>');
-
-    // open jquery UI dialog
-    $dialog.dialog({
-        modal: false,
-        resizable: true,
-        closeOnEscape: true,
-        title: p.title,
-        open: function() {
-            $dialog.attr('aria-hidden', 'false');
-        },
-        close: function() {
-            $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-        },
-        buttons: [
-            {
-                text: rcmail.gettext('close'),
-                click: function() { $dialog.dialog('close'); },
-                autofocus: true
-            }
-        ],
-        minWidth: 450,
-        width: 650,
-        height: 350,
-        minHeight: 200
-    })
-    .show().children('.compare-button').hide();
-
-    // initialize event handlers for history dialog UI elements
-    if (!$dialog.data('initialized')) {
-      // compare button
-      $dialog.find('.compare-button input').click(function(e) {
-        var rev1 = $dialog.find('.changelog-table input.diff-rev1:checked').val(),
-          rev2 = $dialog.find('.changelog-table input.diff-rev2:checked').val();
-
-          if (rev1 && rev2 && rev1 != rev2) {
-            // swap revisions if the user got it wrong
-            if (rev1 > rev2) {
-              var tmp = rev2;
-              rev2 = rev1;
-              rev1 = tmp;
-            }
-
-            if (p.comparefunc) {
-                p.comparefunc(rev1, rev2);
-            }
-          }
-          else {
-              alert('Invalid selection!')
-          }
-
-          if (!rcube_event.is_keyboard(e) && this.blur) {
-              this.blur();
-          }
-          return false;
-      });
-
-      // delegate handlers for list actions
-      $dialog.find('.changelog-table tbody').on('click', 'td.actions a', function(e) {
-          var link = $(this),
-            action = link.hasClass('restore') ? 'restore' : 'show',
-            event = $('#eventhistory').data('event'),
-            rev = link.attr('data-rev');
-
-            // ignore clicks on first row (current revision)
-            if (link.closest('tr').hasClass('first')) {
-                return false;
-            }
-
-            // let the user confirm the restore action
-            if (action == 'restore' && !confirm(rcmail.gettext('revisionrestoreconfirm', p.module).replace('$rev', rev))) {
-                return false;
-            }
-
-            if (p.listfunc) {
-                p.listfunc(action, rev);
-            }
-
-            if (!rcube_event.is_keyboard(e) && this.blur) {
-                this.blur();
-            }
-            return false;
-      })
-      .on('click', 'input.diff-rev1', function(e) {
-          if (!this.checked) return true;
-
-          var rev1 = this.value, selection_valid = false;
-          $dialog.find('.changelog-table input.diff-rev2').each(function(i, elem) {
-              $(elem).prop('disabled', elem.value <= rev1);
-              if (elem.checked && elem.value > rev1) {
-                  selection_valid = true;
-              }
-          });
-          if (!selection_valid) {
-              $dialog.find('.changelog-table input.diff-rev2:not([disabled])').last().prop('checked', true);
-          }
-      });
-
-      $dialog.addClass('changelog-dialog').data('initialized', true);
-    }
-
-    return $dialog;
-};
-
-// callback from server with changelog data
-libkolab_audittrail.render_changelog = function(data, object, folder)
-{
-    var Q = libkolab_audittrail.quote_html;
-
-    var $dialog = $('.changelog-dialog')
-    if (data === false || !data.length) {
-        return false;
-    }
-
-    var i, change, accessible, op_append,
-      first = data.length - 1, last = 0,
-      is_writeable = !!folder.editable,
-      op_labels = {
-          RECEIVE:   'actionreceive',
-          APPEND:    'actionappend',
-          MOVE:      'actionmove',
-          DELETE:    'actiondelete',
-          READ:      'actionread',
-          FLAGSET:   'actionflagset',
-          FLAGCLEAR: 'actionflagclear'
-      },
-      actions = '<a href="#show" class="iconbutton preview" title="'+ rcmail.gettext('showrevision','libkolab') +'" data-rev="{rev}" /> ' +
-          (is_writeable ? '<a href="#restore" class="iconbutton restore" title="'+ rcmail.gettext('restore','libkolab') + '" data-rev="{rev}" />' : ''),
-      tbody = $dialog.find('.changelog-table tbody').html('');
-
-    for (i=first; i >= 0; i--) {
-        change = data[i];
-        accessible = change.date && change.user;
-
-        if (change.op == 'MOVE' && change.mailbox) {
-            op_append = ' ⇢ ' + change.mailbox;
-        }
-        else if ((change.op == 'FLAGSET' || change.op == 'FLAGCLEAR') && change.flags) {
-            op_append = ': ' + change.flags;
-        }
-        else {
-            op_append = '';
-        }
-
-        $('<tr class="' + (i == first ? 'first' : (i == last ? 'last' : '')) + (accessible ? '' : 'undisclosed') + '">')
-            .append('<td class="diff">' + (accessible && change.op != 'DELETE' ? 
-                '<input type="radio" name="rev1" class="diff-rev1" value="' + change.rev + '" title="" '+ (i == last ? 'checked="checked"' : '') +' /> '+
-                '<input type="radio" name="rev2" class="diff-rev2" value="' + change.rev + '" title="" '+ (i == first ? 'checked="checked"' : '') +' /></td>'
-                : ''))
-            .append('<td class="revision">' + Q(i+1) + '</td>')
-            .append('<td class="date">' + Q(change.date || '') + '</td>')
-            .append('<td class="user">' + Q(change.user || 'undisclosed') + '</td>')
-            .append('<td class="operation" title="' + op_append + '">' + Q(rcmail.gettext(op_labels[change.op] || '', 'libkolab') + op_append) + '</td>')
-            .append('<td class="actions">' + (accessible && change.op != 'DELETE' ? actions.replace(/\{rev\}/g, change.rev) : '') + '</td>')
-            .appendTo(tbody);
-    }
-
-    if (first > 0) {
-        $dialog.find('.compare-button').fadeIn(200);
-        $dialog.find('.changelog-table tr.last input.diff-rev1').click();
-    }
-
-    // set dialog size according to content
-    libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height() + 15, 600);
-
-    return $dialog;
-};
-
-// resize and reposition (center) the dialog window
-libkolab_audittrail.dialog_resize = function(id, height, width)
-{
-    var win = $(window), w = win.width(), h = win.height();
-    $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) });
-};
-
-
-// register handlers for mail message history
-window.rcmail && rcmail.addEventListener('init', function(e) {
-    var loading_lock;
-
-    if (rcmail.env.task == 'mail') {
-        rcmail.register_command('kolab-mail-history', function() {
-            var dialog, uid = rcmail.get_single_uid(), rec = { uid: uid, mbox: rcmail.get_message_mailbox(uid) };
-            if (!uid || !window.libkolab_audittrail) {
-                return false;
-            }
-
-            // render dialog
-            $dialog = libkolab_audittrail.object_history_dialog({
-                module: 'libkolab',
-                container: '#mailmessagehistory',
-                title: rcmail.gettext('objectchangelog','libkolab')
-            });
-
-            $dialog.data('rec', rec);
-
-            // fetch changelog data
-            loading_lock = rcmail.set_busy(true, 'loading', loading_lock);
-            rcmail.http_post('plugin.message-changelog', { _uid: rec.uid, _mbox: rec.mbox }, loading_lock);
-
-        }, rcmail.env.action == 'show');
-
-        rcmail.addEventListener('plugin.message_render_changelog', function(data) {
-            var $dialog = $('#mailmessagehistory'),
-                rec = $dialog.data('rec');
-
-            if (data === false || !data.length || !rec) {
-              // display 'unavailable' message
-              $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','libkolab') + '</div>')
-                  .insertBefore($dialog.find('.changelog-table').hide());
-              return;
-            }
-
-            data.module = 'libkolab';
-            libkolab_audittrail.render_changelog(data, rec, {});
-        });
-
-        rcmail.env.message_commands.push('kolab-mail-history');
-    }
-});

iRony-0.4.0.tar.gz/lib/plugins/libkolab/js/folderlist.js Deleted

@@ -1,353 +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);
-
-                      if (!rcube_event.is_keyboard(e) && e.target.blur)
-                        e.target.blur();
-
-                      // 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.0.tar.gz/lib/plugins/tasklist/skins/larry/images/badge_cancelled.png Deleted

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/templates/attachment.html Deleted

@@ -1,65 +0,0 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="extwin tasklist attachmentwin">
-
-<div id="header">
-<div id="topline" role="banner" aria-labelledby="aria-label-topnav">
-	<div class="topleft">
-		<roundcube:container name="topline-left" id="topline-left" />
-	</div>
-	<roundcube:container name="topline-center" id="topline-center" />
-	<div class="topright">
-		<roundcube:container name="topline-right" id="topline-right" />
-		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
-	</div>
-</div>
-</div>
-
-<div id="mainscreen">
-
-<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
-
-<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
-<div id="attachmenttoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
-	<roundcube:button command="download-attachment" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" title="download" />
-	<roundcube:button command="print-attachment" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="print" />
-	<roundcube:container name="toolbar" id="messagetoolbar" />
-</div>
-
-<div id="mainscreencontent">
-
-	<div id="partheader" class="uibox listbox" role="contentinfo" aria-labelledby="aria-label-contentinfo">
-		<h2 class="boxtitle" id="aria-label-contentinfo"><roundcube:label name="properties" /></h2>
-		<div class="scroller">
-			<roundcube:object name="plugin.attachmentcontrols" class="listing" />
-		</div>
-	</div>
-
-	<div id="attachmentcontainer" class="uibox" role="main" aria-labelledby="aria-label-messagepart">
-		<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
-		<div class="iframebox">
-		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" frameborder="0" title="arialabelattachmentpreview" />
-		</div>
-	</div>
-
-</div>
-
-</div>
-
-<script type="text/javascript">
-
-$(document).ready(function() {
-	if (window.rcube_splitter) {
-		new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
-			orientation:'v', relative:true, start:226, min:150, size:12}).init();
-	}
-});
-
-</script>
-
-</body>
-</html>

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/templates/kolabacl.html Deleted

iRony-0.4.0.tar.gz/autogen.sh -> iRony-0.4.1.tar.gz/autogen.sh Changed

iRony-0.4.0.tar.gz/composer-dev.json -> iRony-0.4.1.tar.gz/composer-dev.json Changed

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

iRony-0.4.0.tar.gz/composer.json -> iRony-0.4.1.tar.gz/composer.json Changed

iRony-0.4.0.tar.gz/composer.lock -> iRony-0.4.1.tar.gz/composer.lock Changed

@@ -1,22 +1,22 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "406fe2fc8afba1ce33d0701d4839860c",
+    "content-hash": "2522ac982792c1851af4cdb1e4462898",
     "packages": [
         {
             "name": "sabre/dav",
-            "version": "2.1.x-dev",
+            "version": "2.1.11",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fruux/sabre-dav.git",
+                "url": "https://github.com/sabre-io/dav.git",
                 "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/fa10928802aea9b3136519640aa3c3c59e9e1084",
+                "url": "https://api.github.com/repos/sabre-io/dav/zipball/fa10928802aea9b3136519640aa3c3c59e9e1084",
                 "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084",
                 "shasum": ""
             },
@@ -78,19 +78,19 @@
                 "framework",
                 "iCalendar"
             ],
-            "time": "2016-10-07 03:29:06"
+            "time": "2016-10-07T03:29:06+00:00"
         },
         {
             "name": "sabre/event",
-            "version": "2.0.x-dev",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fruux/sabre-event.git",
+                "url": "https://github.com/sabre-io/event.git",
                 "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruux/sabre-event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
+                "url": "https://api.github.com/repos/sabre-io/event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
                 "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
                 "shasum": ""
             },
@@ -129,19 +129,19 @@
                 "promise",
                 "signal"
             ],
-            "time": "2015-05-19 10:24:22"
+            "time": "2015-05-19T10:24:22+00:00"
         },
         {
             "name": "sabre/http",
-            "version": "3.0.x-dev",
+            "version": "3.0.5",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fruux/sabre-http.git",
+                "url": "https://github.com/sabre-io/http.git",
                 "reference": "6b06c03376219b3d608e1f878514ec105ed1b577"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruux/sabre-http/zipball/6b06c03376219b3d608e1f878514ec105ed1b577",
+                "url": "https://api.github.com/repos/sabre-io/http/zipball/6b06c03376219b3d608e1f878514ec105ed1b577",
                 "reference": "6b06c03376219b3d608e1f878514ec105ed1b577",
                 "shasum": ""
             },
@@ -180,19 +180,19 @@
             "keywords": [
                 "http"
             ],
-            "time": "2015-05-11 15:25:57"
+            "time": "2015-05-11T15:25:57+00:00"
         },
         {
             "name": "sabre/vobject",
-            "version": "3.5.x-dev",
+            "version": "3.5.3",
             "source": {
                 "type": "git",
-                "url": "https://github.com/fruux/sabre-vobject.git",
+                "url": "https://github.com/sabre-io/vobject.git",
                 "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c",
+                "url": "https://api.github.com/repos/sabre-io/vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c",
                 "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c",
                 "shasum": ""
             },
@@ -246,17 +246,71 @@
                 "jCard",
                 "vCard"
             ],
-            "time": "2016-10-07 03:20:40"
+            "time": "2016-10-07T03:20:40+00:00"
         }
     ],
     "packages-dev": [
         {
+            "name": "doctrine/instantiator",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "^6.2.3",
+                "squizlabs/php_codesniffer": "^3.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2017-07-22T11:58:36+00:00"
+        },
+        {
             "name": "kolab/net_ldap3",
             "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git",
-                "reference": "51afe33906e1c9f5cf0811271b29b08c615c95ce"
+                "reference": "56210fdaec70bc1f8f7455a75a6cd34e3a2f7e6d"
             },
             "require": {
                 "pear/net_ldap2": ">=2.0.12",
@@ -295,66 +349,60 @@
                 "pear",
                 "vlv"
             ],
-            "time": "2017-03-08T07:40:52+00:00"
+            "time": "2017-12-26T08:13:24+00:00"
         },
         {
-            "name": "pear-pear.php.net/Net_IDNA2",
-            "version": "0.2.0",
-            "dist": {
-                "type": "file",
-                "url": "https://pear.php.net/get/Net_IDNA2-0.2.0.tgz",
-                "reference": null,
-                "shasum": null
-            },
-            "require": {
-                "php": ">=5.4.0.0"
-            },
-            "replace": {
-                "pear-pear/net_idna2": "== 0.2.0.0"
-            },
-            "type": "pear-library",
-            "autoload": {
-                "classmap": [
-                    ""
-                ]
+            "name": "pear/auth_sasl",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pear/Auth_SASL.git",
+                "reference": "db1ead3dc0bf986d2bab0dbc04d114800cf91dee"
             },
-            "include-path": [
-                "/"
-            ],
-            "license": [
-                "LGPL"
-            ],
-            "description": "This package helps you to encode and decode punycode strings easily."
-        },
-        {
-            "name": "pear-pear.php.net/Net_LDAP2",
-            "version": "2.2.0",
             "dist": {
-                "type": "file",
-                "url": "https://pear.php.net/get/Net_LDAP2-2.2.0.tgz",
-                "reference": null,
-                "shasum": null
+                "type": "zip",
+                "url": "https://api.github.com/repos/pear/Auth_SASL/zipball/db1ead3dc0bf986d2bab0dbc04d114800cf91dee",
+                "reference": "db1ead3dc0bf986d2bab0dbc04d114800cf91dee",
+                "shasum": ""
             },
             "require": {
-                "ext-ldap": "*",
-                "php": ">=5.4.0.0"
+                "pear/pear_exception": "@stable"
             },
-            "replace": {
-                "pear-pear/net_ldap2": "== 2.2.0.0"
+            "require-dev": {
+                "phpunit/phpunit": "@stable"
             },
-            "type": "pear-library",
+            "type": "library",
             "autoload": {
-                "classmap": [
-                    ""
-                ]
+                "psr-0": {
+                    "Auth": "./"
+                }
             },
+            "notification-url": "https://packagist.org/downloads/",
             "include-path": [
-                "/"
+                "./"
             ],
             "license": [
-                "LGPLv3 License"
+                "BSD"
+            ],
+            "authors": [
+                {
+                    "name": "Anish Mistry",
+                    "email": "amistry@am-productions.biz",
+                    "role": "Lead"
+                },
+                {
+                    "name": "Richard Heyes",
+                    "email": "richard@php.net",
+                    "role": "Lead"
+                },
+                {
+                    "name": "Michael Bretterklieber",
+                    "email": "michael@bretterklieber.com",
+                    "role": "Lead"
+                }
             ],
-            "description": "Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP\n                object interface to directory servers. It does contain most of Net::LDAPs\n                features but has some own too.\n                 With Net_LDAP2 you have:\n                 * A simple object-oriented interface to connections, searches entries and filters.\n                 * Support for TLS and LDAP v3.\n                 * Simple modification, deletion and creation of LDAP entries.\n                 * Support for schema handling.\n\n                 Net_LDAP2 layers itself on top of PHP's existing ldap extensions."
+            "description": "Abstraction of various SASL mechanism responses",
+            "time": "2017-03-07T14:37:05+00:00"
         },
         {
             "name": "pear/console_getopt",
@@ -405,16 +453,16 @@
         },
         {
             "name": "pear/mail_mime",
-            "version": "dev-master",
+            "version": "1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Mail_Mime.git",
-                "reference": "179235d12ac1be4b7b62b5bcba5ca09334c5f529"
+                "reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/179235d12ac1be4b7b62b5bcba5ca09334c5f529",
-                "reference": "179235d12ac1be4b7b62b5bcba5ca09334c5f529",
+                "url": "https://api.github.com/repos/pear/Mail_Mime/zipball/7b2f93fa5219da99e9997f497b916b5bb27eb57a",
+                "reference": "7b2f93fa5219da99e9997f497b916b5bb27eb57a",
                 "shasum": ""
             },
             "require": {
@@ -447,32 +495,32 @@
             ],
             "description": "Mail_Mime provides classes to create MIME messages",
             "homepage": "http://pear.php.net/package/Mail_Mime",
-            "time": "2016-07-14T17:53:27+00:00"
+            "time": "2017-11-17T09:21:45+00:00"
         },
         {
-            "name": "pear/mail_mime-decode",
-            "version": "1.5.5.2",
+            "name": "pear/net_idna2",
+            "version": "v0.2.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/dreamfactorysoftware/Mail_mimeDecode.git",
-                "reference": "a53c1ce051b212e23f7f67ea8d31015640de1129"
+                "url": "https://github.com/pear/Net_IDNA2.git",
+                "reference": "51734eaf8be2df58e8aad5835b9966459b2fb37c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dreamfactorysoftware/Mail_mimeDecode/zipball/a53c1ce051b212e23f7f67ea8d31015640de1129",
-                "reference": "a53c1ce051b212e23f7f67ea8d31015640de1129",
+                "url": "https://api.github.com/repos/pear/Net_IDNA2/zipball/51734eaf8be2df58e8aad5835b9966459b2fb37c",
+                "reference": "51734eaf8be2df58e8aad5835b9966459b2fb37c",
                 "shasum": ""
             },
             "require": {
-                "pear/pear_exception": "*"
+                "pear/pear_exception": "@stable"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phpunit/phpunit": "^4"
             },
             "type": "library",
             "autoload": {
                 "psr-0": {
-                    "Mail_mimeDecode": ""
+                    "Net": "./"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -480,26 +528,26 @@
                 "./"
             ],
             "license": [
-                "BSD-2-Clause"
+                "LGPL"
             ],
             "authors": [
                 {
-                    "name": "Cipriano Groenendal",
-                    "email": "cipri@php.net",
+                    "name": "Stefan Neufeind",
+                    "email": "pear.neufeind@speedpartner.de",
                     "role": "Lead"
                 },
                 {
-                    "name": "Aleksander Machniak",
-                    "email": "alec@php.net",
+                    "name": "Daniel O'Connor",
+                    "email": "daniel.oconnor@gmail.com",
                     "role": "Lead"
                 }
             ],
-            "description": "More info available on: http://pear.php.net/package/Mail_mimeDecode",
-            "time": "2014-04-15T19:29:16+00:00"
+            "description": "More info available on: https://pear.php.net/package/Net_IDNA2",
+            "time": "2017-03-06T20:46:41+00:00"
         },
         {
             "name": "pear/net_ldap2",
-            "version": "dev-master",
+            "version": "v2.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Net_LDAP2.git",
@@ -537,6 +585,120 @@
             "time": "2015-10-30T20:34:22+00:00"
         },
         {
+            "name": "pear/net_smtp",
+            "version": "1.7.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pear/Net_SMTP.git",
+                "reference": "e066e5ee011ae056c03db1a95d210fc09649b477"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pear/Net_SMTP/zipball/e066e5ee011ae056c03db1a95d210fc09649b477",
+                "reference": "e066e5ee011ae056c03db1a95d210fc09649b477",
+                "shasum": ""
+            },
+            "require": {
+                "pear/net_socket": "*",
+                "pear/pear-core-minimal": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "*"
+            },
+            "suggest": {
+                "pear/auth_sasl": "Install optionally via your project's composer.json"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Net": "./"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "./"
+            ],
+            "license": [
+                "PHP-3.01"
+            ],
+            "authors": [
+                {
+                    "name": "Jon Parise",
+                    "email": "jon@php.net",
+                    "homepage": "http://www.indelible.org",
+                    "role": "Lead"
+                },
+                {
+                    "name": "Chuck Hagenbuch",
+                    "email": "chuck@horde.org",
+                    "role": "Lead"
+                }
+            ],
+            "description": "An implementation of the SMTP protocol",
+            "homepage": "http://pear.github.io/Net_SMTP/",
+            "keywords": [
+                "email",
+                "mail",
+                "smtp"
+            ],
+            "time": "2017-01-14T18:19:55+00:00"
+        },
+        {
+            "name": "pear/net_socket",
+            "version": "v1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/pear/Net_Socket.git",
+                "reference": "f31d75ac352d49908f8987bbb1496c02a409812a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/pear/Net_Socket/zipball/f31d75ac352d49908f8987bbb1496c02a409812a",
+                "reference": "f31d75ac352d49908f8987bbb1496c02a409812a",
+                "shasum": ""
+            },
+            "require": {
+                "pear/pear_exception": "@stable",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Net": "./"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "./"
+            ],
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Chuck Hagenbuch",
+                    "email": "chuck@horde.org",
+                    "role": "Lead"
+                },
+                {
+                    "name": "Aleksander Machniak",
+                    "email": "alec@php.net",
+                    "role": "Lead"
+                },
+                {
+                    "name": "Stig Bakken",
+                    "email": "stig@php.net",
+                    "role": "Lead"
+                }
+            ],
+            "description": "More info available on: http://pear.php.net/package/Net_Socket",
+            "time": "2017-04-06T15:16:38+00:00"
+        },
+        {
             "name": "pear/pear-core-minimal",
             "version": "v1.10.3",
             "source": {
@@ -582,7 +744,7 @@
         },
         {
             "name": "pear/pear_exception",
-            "version": "dev-master",
+            "version": "v1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/PEAR_Exception.git",
@@ -634,10 +796,861 @@
                 "exception"
             ],
             "time": "2015-02-10T20:07:52+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06T15:47:00+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "reference": "acd690379117b042d1c8af1fafd61bde001bf6bb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2013-10-10T15:34:57+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21T13:50:34+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2017-02-26T11:10:40+00:00"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.12",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2017-12-04T08:55:13+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.4.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "2e8580deebb7d1ac92ac878595e6bffe01069c2a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2e8580deebb7d1ac92ac878595e6bffe01069c2a",
+                "reference": "2e8580deebb7d1ac92ac878595e6bffe01069c2a",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpunit/php-code-coverage": "~2.0",
+                "phpunit/php-file-iterator": "~1.3.2",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "~1.0.2",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.0",
+                "sebastian/diff": "~1.1",
+                "sebastian/environment": "~1.1",
+                "sebastian/exporter": "~1.1",
+                "sebastian/global-state": "~1.0",
+                "sebastian/recursion-context": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-01-27T16:06:15+00:00"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02T06:51:40+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2 || ~2.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2017-01-29T09:50:25+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2017-05-22T07:24:03+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8 || ^5.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-08-18T05:49:44+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17T09:04:28+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12T03:26:01+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2016-10-03T07:41:43+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21T13:59:46+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "reference": "7cc359f1b7b80fc25ed7796be7d96adc9b354bae",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2018-04-30T19:57:29+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.8.41",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
+                "reference": "51356b7a2ff7c9fd06b2f1681cc463bb62b5c1ff",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2018-05-01T22:52:40+00:00"
         }
     ],
     "aliases": [],
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "stability-flags": {
         "kolab/net_ldap3": 20
     },

iRony-0.4.0.tar.gz/config/dav.inc.php.sample -> iRony-0.4.1.tar.gz/config/dav.inc.php.sample Changed

iRony-0.4.0.tar.gz/lib/FileAPI/api/common.php -> iRony-0.4.1.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,48 @@
 
         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;
+    }
+
+    /**
+     * 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.1.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.0.tar.gz/lib/FileAPI/api/file_create.php -> iRony-0.4.1.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.0.tar.gz/lib/FileAPI/api/file_get.php -> iRony-0.4.1.tar.gz/lib/FileAPI/api/file_get.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/api/file_info.php -> iRony-0.4.1.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.0.tar.gz/lib/FileAPI/api/file_move.php -> iRony-0.4.1.tar.gz/lib/FileAPI/api/file_move.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/api/folder_create.php -> iRony-0.4.1.tar.gz/lib/FileAPI/api/folder_create.php Changed

iRony-0.4.1.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.0.tar.gz/lib/FileAPI/api/folder_list.php -> iRony-0.4.1.tar.gz/lib/FileAPI/api/folder_list.php Changed

@@ -31,9 +31,26 @@
     {
         parent::handle();
 
-        // get folders from main driver
+        // List parameters
+        $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'];
+            $search = mb_strtoupper($this->args['search']);
+        }
+        if (!empty($this->args['permissions']) && rcube_utils::get_boolean((string) $this->args['permissions'])) {
+            $params['extended']    = true;
+            $params['permissions'] = true;
+        }
+
+        // get folders from default driver
         $backend = $this->api->get_backend();
-        $folders = $backend->folder_list();
+        $folders = $this->folder_list($backend, $params);
 
         // old result format
         if ($this->api->client_version() < 2) {
@@ -52,19 +69,47 @@
             // folder exists in main source, replace it with external one
             if (($idx = array_search($title, $folders)) !== false) {
                 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 (!isset($search) || strpos(mb_strtoupper($title), $search) !== false) {
+                $has_more = count($folders) > 0;
+                $folder   = $params['extended'] ? array('folder' => $title) : $title;
+
+                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;
+                }
+
+                if (!$readonly || !($params['type'] & file_storage::FILTER_WRITABLE)) {
+                    $folders[] = $folder;
+                }
+            }
 
             if ($driver != $backend) {
                 try {
-                    foreach ($driver->folder_list() as $folder) {
-                        $folders[] = $prefix . $folder;
+                    foreach ($this->folder_list($driver, $params) as $folder) {
+                        if (is_array($folder)) {
+                            $folder['folder'] = $prefix . $folder['folder'];
+                        }
+                        else {
+                            $folder = $prefix . $folder;
+                        }
+
+                        $folders[] = $folder;
+                        $has_more  = true;
                     }
                 }
                 catch (Exception $e) {
@@ -78,7 +123,7 @@
 
         // re-sort the list
         if ($has_more) {
-            usort($folders, array($this, 'sort_folder_comparator'));
+            usort($folders, array('file_utils', 'sort_folder_comparator'));
         }
 
         return array(
@@ -88,22 +133,17 @@
     }
 
     /**
-     * Callback for uasort() that implements correct
-     * locale-aware case-sensitive sorting
+     * Wrapper for folder_list() method on specified driver
      */
-    protected function sort_folder_comparator($str1, $str2)
+    protected function folder_list($driver, $params)
     {
-        $path1 = explode(file_storage::SEPARATOR, $str1);
-        $path2 = explode(file_storage::SEPARATOR, $str2);
-
-        foreach ($path1 as $idx => $folder1) {
-            $folder2 = $path2[$idx];
-
-            if ($folder1 === $folder2) {
-                continue;
+        if ($params['type'] & file_storage::FILTER_UNSUBSCRIBED) {
+            $caps = $driver->capabilities();
+            if (empty($caps[file_storage::CAPS_SUBSCRIPTIONS])) {
+                return array();
             }
-
-            return strcoll($folder1, $folder2);
         }
+
+        return $driver->folder_list($params);
     }
 }

iRony-0.4.0.tar.gz/lib/FileAPI/api/folder_move.php -> iRony-0.4.1.tar.gz/lib/FileAPI/api/folder_move.php Changed

iRony-0.4.1.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.0.tar.gz/lib/FileAPI/api/folder_types.php -> iRony-0.4.1.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.1.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.0.tar.gz/lib/FileAPI/drivers/kolab/kolab_file_storage.php -> iRony-0.4.1.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,10 @@
         $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,
         );
     }
 
@@ -561,7 +580,7 @@
      */
     public function file_get($file_name, $params = array(), $fp = null)
     {
-        $file = $this->get_file_object($file_name, $folder);
+        $file = $this->get_file_object($file_name, $folder, true);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -605,7 +624,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 +638,7 @@
      */
     public function file_info($file_name)
     {
-        $file = $this->get_file_object($file_name, $folder);
+        $file = $this->get_file_object($file_name, $folder, true);
         if (empty($file)) {
             throw new Exception("Storage error. File not found.", file_storage::ERROR);
         }
@@ -630,8 +649,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 +686,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 +703,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,
             );
@@ -761,7 +779,7 @@
         // Update object
         $file['_attachments'] = array(
             0 => array(
-                'name'     => $file['name'],
+                'name'     => $new_name,
                 'path'     => $file_path,
                 'mimetype' => $file['type'],
                 'size'     => $file['size'],
@@ -853,10 +871,10 @@
     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');
+        $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);
         }
     }
 
@@ -873,7 +891,7 @@
         $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);
         }
     }
 
@@ -892,39 +910,201 @@
         $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 = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
+        $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 = rcube_charset::convert($folder_name, RCUBE_CHARSET, 'UTF7-IMAP');
+        $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')
+     *
      * @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();
+        $folders      = $imap->list_folders_subscribed('', '*', '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) {
+            $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('', '*', 'file', $rights);
+                $folders    = array_diff($folders, $subscribed);
+            }
+
+            // convert folder names to UTF-8
+            $callback = function($folder) {
+                if (strpos($folder, '&') !== false) {
+                    return rcube_charset::convert($folder, 'UTF7-IMAP', RCUBE_CHARSET);
+                }
+
+                return $folder;
+            };
+
+            $folders = array_map($callback, $folders);
+        }
+
+        // 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  = rcube_charset::convert($folder, RCUBE_CHARSET, 'UTF7-IMAP');
+        $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 +1113,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 +1140,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 +1150,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 +1165,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 +1202,34 @@
     }
 
     /**
+     * Get files from a folder (with performance fix)
+     */
+    protected function get_files($folder, $filter, $all = 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);
+    }
+
+    /**
      * 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
      */
-    protected function get_file_object(&$file_name, &$folder = null)
+    protected function get_file_object(&$file_name, &$folder = null, $cache = 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 +1239,25 @@
             throw new Exception("Missing folder name", file_storage::ERROR);
         }
 
-        // get folder object
         $folder = $this->get_folder_object($folder_name);
-        $files  = $folder->select(array(
+
+        if ($cache && !empty($this->icache[$original_name])) {
+            return $this->icache[$original_name];
+        }
+
+        $filter = array(
             array('type', '=', 'file'),
             array('filename', '=', $file_name)
-        ));
+        );
+
+        $files = $this->get_files($folder, $filter, false);
+        $file  = $files[0];
+
+        if ($cache) {
+            $this->icache[$original_name] = $file;
+        }
 
-        return $files[0];
+        return $file;
     }
 
     /**
@@ -1073,6 +1282,15 @@
             $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);
             }
 
@@ -1129,19 +1347,27 @@
         return $file;
     }
 
-    protected function uri2resource($uri)
+    /**
+     * 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();
-        $uri       = str_replace(file_storage::SEPARATOR, $separator, $uri);
+        $path      = str_replace(file_storage::SEPARATOR, $separator, $path);
         $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]));
+                if (is_array($root) && $root[0] && strpos($path, $root[0]) === 0) {
+                    $path = substr($path, strlen($root[0]));
 
                     switch ($type) {
                     case 'shared':
@@ -1151,7 +1377,7 @@
                         break;
 
                     case 'other':
-                        list($user, $uri) = explode($separator, $uri, 2);
+                        list($user, $path) = explode($separator, $path, 2);
 
                         if (strpos($user, '@') === false) {
                             $domain = strstr($owner, '@');
@@ -1169,15 +1395,21 @@
             }
         }
 
-        // 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;
+        return 'imap://' . rawurlencode($owner) . '@' . $storage->options['host']
+            . '/' . file_utils::encode_path($path);
     }
 
-    protected function resource2uri($resource)
+    /**
+     * 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://([^@]+)@([^/]+)/(.*)$|', $resource, $matches)) {
+        if (!preg_match('|^imap://([^@]+)@([^/]+)/(.*)$|', $uri, $matches)) {
             throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
         }
 
@@ -1185,11 +1417,8 @@
         $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);
+        $user = rawurldecode($matches[1]);
+        $path = file_utils::decode_path($matches[3]);
 
         // personal namespace
         if ($user == $owner) {
@@ -1198,7 +1427,7 @@
         }
         // shared namespace
         else if (preg_match('/^shared$(.*)$$/', $user, $matches)) {
-            $uri = $matches[1] . $uri;
+            $path = $matches[1] . $path;
         }
         // other users namespace
         else {
@@ -1207,12 +1436,10 @@
             list($local, $domain) = explode('@', $user);
 
             // here we assume there's only one other users namespace root
-            $uri = $namespace[0][0] . $local . $separator . $uri;
+            $path = $namespace[0][0] . $local . $separator . $path;
         }
 
-        $uri = str_replace($separator, file_storage::SEPARATOR, $uri);
-
-        return $uri;
+        return str_replace($separator, file_storage::SEPARATOR, $path);
     }
 
     /**

iRony-0.4.0.tar.gz/lib/FileAPI/drivers/seafile/seafile_api.php -> iRony-0.4.1.tar.gz/lib/FileAPI/drivers/seafile/seafile_api.php Changed

@@ -77,16 +77,30 @@
      */
     protected $token;
 
+    /**
+     * API URL prefix (schema and host[:port])
+     *
+     * @var string
+     */
+    protected $url_prefix;
+
 
     public function __construct($config = array())
     {
         $this->config = $config;
 
         // 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 +123,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);
@@ -139,6 +157,9 @@
             // Note: It didn't work for me without the last backslash
             $url = rtrim($url, '/') . '/';
         }
+        else {
+            $url = $this->mod_url($url);
+        }
 
         if (!$this->request) {
             $this->config['store_body']       = true;
@@ -375,12 +396,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 +433,17 @@
         //    "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);
     }
 
     /**
@@ -846,4 +879,18 @@
 
         return $this->is_error() === false;
     }
+
+    /**
+     * 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.0.tar.gz/lib/FileAPI/drivers/seafile/seafile_file_storage.php -> iRony-0.4.1.tar.gz/lib/FileAPI/drivers/seafile/seafile_file_storage.php Changed

@@ -117,7 +117,7 @@
             '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),
         );
 
@@ -445,7 +445,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 +463,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 +506,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 +545,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,
         );
@@ -568,7 +578,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 +598,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 +614,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,22 +824,69 @@
     }
 
     /**
+     * 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')
+     *
      * @return array List of folders
      * @throws Exception
      */
-    public function folder_list()
+    public function folder_list($params = array())
     {
+        $writable  = ($params['type'] & file_storage::FILTER_WRITABLE) ? true : false;
         $libraries = $this->libraries();
         $folders   = array();
 
         if ($this->config['cache']) {
-            $cache = $this->rc->get_cache('seafile_' . $this->title,
+            $repos    = array();
+            $repo_ids = array();
+            $cache    = $this->rc->get_cache('seafile_' . $this->title,
                 $this->config['cache'], $this->config['cache_ttl'], true);
 
             if ($cache) {
-                $cached = $cache->get('folders');
+                $repos = (array) $cache->get('repos');
+            }
+
+            // Mark unmodified repos
+            foreach ($libraries as $idx => $library) {
+                if ($mtime = $repos[$library['id']]) {
+                    if ($mtime == $library['mtime']) {
+                        $libraries[$idx]['use-cache'] = true;
+                    }
+                    else {
+                        $cache_update = true;
+                    }
+                }
+                else {
+                    $cache_update = true;
+                }
+
+                $repos[$library['id']] = $library['mtime'];
+                $repo_ids[]            = $library['id'];
             }
         }
 
@@ -838,10 +895,17 @@
                 continue;
             }
 
-            $folders[$library['name']] = $library['mtime'];
+            if (strpos($library['permission'], 'w') === false) {
+                $readonly_prefixes[] = $library['name'];
+            }
 
-            if ($folder_tree = $this->folders_tree($library, '', $library, $cached)) {
-                $folders = array_merge($folders, $folder_tree);
+            $folders[$library['name']] = array(
+                'mtime'      => $library['mtime'],
+                'permission' => $library['permission'],
+            );
+
+            foreach ($this->folders_tree($library) as $folder_name => $folder) {
+                $folders[$library['name'] . '/' . $folder_name] = $folder;
             }
         }
 
@@ -849,18 +913,92 @@
             throw new Exception("Storage error. Unable to get folders list.", file_storage::ERROR);
         }
 
-        if ($cache) {
-            $cache->set('folders', $folders);
+        if ($cache && $cache_update) {
+            // Cleanup repos data
+            $repos = array_intersect_key($repos, array_flip($repo_ids));
+
+            $cache->set('repos', $repos);
+        }
+
+        // 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 +1007,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 +1034,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 +1044,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 +1059,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 +1106,43 @@
     }
 
     /**
-     * Recursively builds folders list
+     * Get folders tree in the Seafile library
      */
-    protected function folders_tree($library, $path, $folder, $cached)
+    protected function folders_tree($library)
     {
-        $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 ($this->config['cache']) {
+            $cache = $this->rc->get_cache('seafile_' . $this->title,
+                $this->config['cache'], $this->config['cache_ttl'], true);
+
+            if ($cache && $library['use-cache']) {
+                $folders = $cache->get('folders.' . $library['id']);
             }
         }
-        // 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 .= '/';
-            }
 
-            foreach ($content as $item) {
-                if ($item['type'] == 'dir' && strlen($item['name'])) {
-                    $folders[$root . '/' . $item['name']] = $item['mtime'];
+        if (!isset($folders) || !is_array($folders)) {
+            $folders = array();
+
+            // get folders in the repo (requires Seafile 4.4.1)
+            if ($content = $this->api->directory_entries($library['id'], '', 'dir', true)) {
+                foreach ($content as $item) {
+                    if ($item['type'] == 'dir' && strlen($item['name'])) {
+                        $parent = trim($item['parent_dir'], '/');
+                        $name   = (strlen($parent) > 0 ? "$parent/" : '') . $item['name'];
 
-                    // get subfolders recursively
-                    $folders_tree = $this->folders_tree($library, $fname, $item, $cached);
-                    if (!empty($folders_tree)) {
-                        $folders = array_merge($folders, $folders_tree);
+                        $folders[$name] = array(
+                            'mtime'      => $item['mtime'],
+                            'permission' => $item['permission'],
+                        );
                     }
                 }
             }
-        }
-
-        return $folders;
-    }
 
-    /**
-     * Callback for uasort() that implements correct
-     * locale-aware case-sensitive sorting
-     */
-    protected function sort_folder_comparator($str1, $str2)
-    {
-        $path1 = explode('/', $str1);
-        $path2 = explode('/', $str2);
-
-        foreach ($path1 as $idx => $folder1) {
-            $folder2 = $path2[$idx];
-
-            if ($folder1 === $folder2) {
-                continue;
+            if ($cache && is_array($content)) {
+                $cache->set('folders.' . $library['id'], $folders);
             }
-
-            return strcoll($folder1, $folder2);
         }
+
+        return $folders;
     }
 
     /**
@@ -1160,7 +1278,7 @@
         $observer->set_fp($fp);
 
         try {
-            $request->setUrl($location);
+            $request->setUrl($this->api->mod_url($location));
             $request->attach($observer);
 
             $response = $request->send();
@@ -1181,29 +1299,49 @@
         return true;
     }
 
-    protected function uri2resource($uri)
+    /**
+     * Convert file/folder path into a global URI.
+     *
+     * @param string $path File/folder path
+     *
+     * @return string URI
+     * @throws Exception
+     */
+    public function path2uri($path)
     {
-        list($file, $repo_id, $library) = $this->find_library($uri);
+        list($file, $repo_id, $library) = $this->find_library($path);
 
-        // convert to imap charset (to be safe to store in DB)
-        $uri = rcube_charset::convert($uri, RCUBE_CHARSET, 'UTF7-IMAP');
+        $host = preg_replace('|https?://|i', '', $this->config['host']);
 
-        return 'seafile://' . urlencode($library['owner']) . '@' . $this->config['host'] . '/' . $uri;
+        return 'seafile://' . rawurlencode($library['owner']) . '@' . $host . '/' . file_utils::encode_path($path);
     }
 
-    protected function resource2uri($resource)
+    /**
+     * 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://([^@]+)@([^/]+)/(.*)$|', $resource, $matches)) {
+        if (!preg_match('|^seafile://([^@]+)@([^/]+)/(.*)$|', $uri, $matches)) {
             throw new Exception("Internal storage error. Unexpected data format.", file_storage::ERROR);
         }
 
-        $user = urldecode($matches[1]);
-        $uri  = $matches[3];
+        $user   = rawurldecode($matches[1]);
+        $host   = $matches[2];
+        $path   = file_utils::decode_path($matches[3]);
+        $c_host = preg_replace('|https?://|i', '', $this->config['host']);
+
+        list($file, $repo_id, $library) = $this->find_library($path, true);
 
-        // convert from imap charset (to be safe to store in DB)
-        $uri = rcube_charset::convert($uri, 'UTF7-IMAP', RCUBE_CHARSET);
+        if (empty($library) || $host != $c_host || $user != $library['owner']) {
+            throw new Exception("Internal storage error. Unresolvable URI.", file_storage::ERROR);
+        }
 
-        return $uri;
+        return $path;
     }
 
     /**

iRony-0.4.0.tar.gz/lib/FileAPI/drivers/seafile/seafile_request_observer.php -> iRony-0.4.1.tar.gz/lib/FileAPI/drivers/seafile/seafile_request_observer.php Changed

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

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

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

@@ -0,0 +1,1030 @@
+<?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'  => $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'];
+        }
+
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request('PUT', $file_name, $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'];
+        }
+
+        $file_name = $this->encode_path($file_name);
+        $response  = $this->client->request('PUT', $file_name, $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 = in_array('{DAV:}collection', $props['{DAV:}resourcetype']->resourceType);
+            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')
+     *
+     * @return array List of folders
+     * @throws Exception
+     */
+    public function folder_list($params = array())
+    {
+        $this->init();
+
+        try {
+            $items = $this->client->propfind('', array(
+                '{DAV:}resourcetype',
+            ), 'infinity');
+
+            // TODO: Replace infinity by recursion
+            // Many servers just do not support 'Depth: infinity' for security reasons
+            // E.g. SabreDAV has this optional and disabled by default
+        }
+        catch (Exception $e) {
+            throw new Exception("User credentials not provided", file_storage::ERROR_NOAUTH);
+        }
+
+        $result = array();
+
+        foreach ($items as $file => $props) {
+            // Skip files
+            $is_dir = in_array('{DAV:}collection', $props['{DAV:}resourcetype']->resourceType);
+            if (!$is_dir) {
+                continue;
+            }
+
+            $path = $this->get_relative_url($file);
+            $path = $this->decode_path($path);
+
+            if ($path !== '') {
+                $result[] = $path;
+            }
+        }
+
+        // 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,
+        );
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * Initializes file_locks object
+     */
+    protected function init_lock_db()
+    {
+        if (!$this->lock_db) {
+            $this->lock_db = new file_locks;
+        }
+    }
+}

iRony-0.4.0.tar.gz/lib/FileAPI/file_api.php -> iRony-0.4.1.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'));
 
-        $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,27 @@
     public function shutdown()
     {
         // write performance stats to logs/console
-        if ($this->conf->get('devel_mode')) {
-            if (function_exists('memory_get_peak_usage'))
+        if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) {
+            // 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_peak_usage')) {
                 $mem = memory_get_peak_usage();
-            else if (function_exists('memory_get_usage'))
+            }
+            else if (function_exists('memory_get_usage')) {
                 $mem = memory_get_usage();
+            }
+
+            $request = ($this instanceof file_api_wopi ? 'wopi/' : '')
+                . $this->request
+                . (!empty($this->path) ? '/' . implode($this->path, '/') : '');
+
+            $log = trim(sprintf('%s: %s %s',
+                $this->method ?: $_SERVER['REQUEST_METHOD'],
+                $request,
+                $mem ? sprintf('[%.1f MB]', $mem/1024/1024) : ''
+            ));
 
-            $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 +210,7 @@
     /**
      * Authentication request handler (HTTP Auth)
      */
-    private function authenticate()
+    protected function authenticate()
     {
         if (isset($_POST['username'])) {
             $username = $_POST['username'];
@@ -205,15 +244,15 @@
         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 +261,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 +273,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 +294,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 +334,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 +359,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 +450,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 +474,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.0.tar.gz/lib/FileAPI/file_api_core.php -> iRony-0.4.1.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 = 3;
 
-    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;
     }
@@ -81,16 +87,28 @@
     public function get_drivers($as_objects = false)
     {
         $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');
 
         if (!empty($enabled)) {
-            $backend = $this->get_backend();
             $drivers = $backend->driver_list();
 
             foreach ($drivers as $item) {
+                // Disable webdav sources/drivers in iRony that point to the
+                // same host to prevent infinite recursion
+                if ($iRony && $item['driver'] == 'webdav') {
+                    $self_url = parse_url($_SERVER['SCRIPT_URI']);
+                    $item_url = parse_url($item['host']);
+
+                    if ($self_url['host'] == $item_url['host']) {
+                        continue;
+                    }
+                }
+
                 $all[] = $item['title'];
 
                 if ($item['enabled'] && in_array($item['driver'], (array) $enabled)) {
@@ -167,7 +185,7 @@
             }
 
             // configure api
-            $driver->configure(array_merge($config, $this->config), $key);
+            $driver->configure(array_merge($config, $this->env), $key);
         }
 
         return $this->drivers[$key];
@@ -192,9 +210,11 @@
     /**
      * 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();
@@ -216,6 +236,30 @@
             }
         }
 
+        // Manticore support
+        if ($rcube->config->get('fileapi_manticore')) {
+            $caps['MANTICORE'] = true;
+        }
+
+        // WOPI support
+        if ($rcube->config->get('fileapi_wopi_office')) {
+            $caps['WOPI'] = 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 +269,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 +279,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 +329,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.0.tar.gz/lib/FileAPI/file_api_lib.php -> iRony-0.4.1.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();
@@ -89,12 +89,22 @@
                 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 +129,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 +145,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.1.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.1.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.0.tar.gz/lib/FileAPI/file_locale.php -> iRony-0.4.1.tar.gz/lib/FileAPI/file_locale.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/file_locks.php -> iRony-0.4.1.tar.gz/lib/FileAPI/file_locks.php Changed

iRony-0.4.1.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.1.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.0.tar.gz/lib/FileAPI/file_storage.php -> iRony-0.4.1.tar.gz/lib/FileAPI/file_storage.php Changed

@@ -31,13 +31,16 @@
     const CAPS_PROGRESS_TIME = 'PROGRESS_TIME';
     const CAPS_QUOTA         = 'QUOTA';
     const CAPS_LOCKS         = 'LOCKS';
+    const CAPS_SUBSCRIPTIONS = 'SUBSCRIPTIONS';
 
     // 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 +50,13 @@
     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;
 
     /**
      * Authenticates a user
@@ -250,12 +260,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 +347,24 @@
      * @throws Exception
      */
     public function quota($folder);
+
+    /**
+     * Convert file/folder path into a global URI.
+     *
+     * @param string $path File/folder path
+     *
+     * @return string URI
+     * @throws Exception
+     */
+    public function path2uri($path);
+
+    /**
+     * Convert global URI into file/folder path.
+     *
+     * @param string $uri URI
+     *
+     * @return string File/folder path
+     * @throws Exception
+     */
+    public function uri2path($uri);
 }

iRony-0.4.0.tar.gz/lib/FileAPI/file_ui.php -> iRony-0.4.1.tar.gz/lib/FileAPI/file_ui.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/file_ui_api.php -> iRony-0.4.1.tar.gz/lib/FileAPI/file_ui_api.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/file_ui_api_result.php -> iRony-0.4.1.tar.gz/lib/FileAPI/file_ui_api_result.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/file_utils.php -> iRony-0.4.1.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.0.tar.gz/lib/FileAPI/file_viewer.php -> iRony-0.4.1.tar.gz/lib/FileAPI/file_viewer.php Changed

iRony-0.4.1.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.0.tar.gz/lib/FileAPI/init.php -> iRony-0.4.1.tar.gz/lib/FileAPI/init.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/locale/en_US.php -> iRony-0.4.1.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';
@@ -78,6 +80,12 @@
 $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.1.tar.gz/lib/FileAPI/templates Added

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

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

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

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

iRony-0.4.1.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.1.tar.gz/lib/FileAPI/viewers/doc/file_editor.js Added

iRony-0.4.0.tar.gz/lib/FileAPI/viewers/image.php -> iRony-0.4.1.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.0.tar.gz/lib/FileAPI/viewers/media.php -> iRony-0.4.1.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.0.tar.gz/lib/FileAPI/viewers/odf.php -> iRony-0.4.1.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.0.tar.gz/lib/FileAPI/viewers/pdf.php -> iRony-0.4.1.tar.gz/lib/FileAPI/viewers/pdf.php Changed

iRony-0.4.0.tar.gz/lib/FileAPI/viewers/text.php -> iRony-0.4.1.tar.gz/lib/FileAPI/viewers/text.php Changed

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

iRony-0.4.1.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.1.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.1.tar.gz/lib/FileAPI/wopi/files.php Added

@@ -0,0 +1,181 @@
+<?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'],
+            '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,
+            // TODO: 'UserExtraInfo' => ['avatar' => 'http://url/to/user/avatar', 'mail' => 'user@server.com']
+        );
+
+        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.0.tar.gz/lib/Kolab/CalDAV/Calendar.php -> iRony-0.4.1.tar.gz/lib/Kolab/CalDAV/Calendar.php Changed

iRony-0.4.0.tar.gz/lib/Kolab/CalDAV/SchedulePlugin.php -> iRony-0.4.1.tar.gz/lib/Kolab/CalDAV/SchedulePlugin.php Changed

iRony-0.4.0.tar.gz/lib/Kolab/CardDAV/AddressBook.php -> iRony-0.4.1.tar.gz/lib/Kolab/CardDAV/AddressBook.php Changed

iRony-0.4.0.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php -> iRony-0.4.1.tar.gz/lib/Kolab/CardDAV/ContactsBackend.php Changed

@@ -928,14 +928,20 @@
                     break;
 
                 case 'BDAY':
-                    $contact['birthday'] = new \DateTime($value);
-                    $contact['birthday']->_dateonly = true;
-                    break;
-
                 case 'ANNIVERSARY':
                 case 'X-ANNIVERSARY':
-                    $contact['anniversary'] = new \DateTime($value);
-                    $contact['anniversary']->_dateonly = true;
+                    // We use getDateTime() method to support partial date format from vCard 4
+                    // and to not throw exceptions on invalid input (T2492)
+                    if (method_exists($prop, 'getDateTime')) {
+                        $key = $prop->name == 'BDAY' ? 'birthday' : 'anniversary';
+                        try {
+                            $contact[$key] = $prop->getDateTime();
+                            $contact[$key]->_dateonly = true;
+                        }
+                        catch (\Exception $e) {
+                            // ignore
+                        }
+                    }
                     break;
 
                 case 'SEX':

iRony-0.4.0.tar.gz/lib/Kolab/CardDAV/Plugin.php -> iRony-0.4.1.tar.gz/lib/Kolab/CardDAV/Plugin.php Changed

@@ -119,23 +119,30 @@
      * An exception is thrown if it's not.
      *
      * @param resource|string $data
+     * @param bool $modified Should be set to true, if this event handler
+     *                       changed &$data.
      * @return void
      */
-    protected function validateVCard(&$data)
+    protected function validateVCard(&$data, &$modified)
     {
         // If it's a stream, we convert it to a string first.
         if (is_resource($data)) {
             $data = stream_get_contents($data);
         }
 
+        $before = md5($data);
+
         // Converting the data to unicode, if needed.
         $data = DAV\StringUtil::ensureUTF8($data);
 
+        if (md5($data) !== $before) $modified = true;
+
         try {
             $vobj = VObject\Reader::read($data, VObject\Reader::OPTION_FORGIVING | VObject\Reader::OPTION_IGNORE_INVALID_LINES);
 
-            if ($vobj->name == 'VCARD')
+            if ($vobj->name == 'VCARD') {
                 $this->parsed_vcard = $vobj;
+            }
         }
         catch (VObject\ParseException $e) {
             throw new DAV\Exception\UnsupportedMediaType('This resource only supports valid vcard data. Parse error: ' . $e->getMessage());

iRony-0.4.0.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php -> iRony-0.4.1.tar.gz/lib/Kolab/DAV/Auth/HTTPBasic.php Changed

iRony-0.4.0.tar.gz/lib/Kolab/Utils/DAVLogger.php -> iRony-0.4.1.tar.gz/lib/Kolab/Utils/DAVLogger.php Changed

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

iRony-0.4.0.tar.gz/lib/Roundcube/README.md -> iRony-0.4.1.tar.gz/lib/Roundcube/README.md Changed

iRony-0.4.0.tar.gz/lib/Roundcube/bootstrap.php -> iRony-0.4.1.tar.gz/lib/Roundcube/bootstrap.php Changed

@@ -3,7 +3,7 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube PHP suite                          |
- | Copyright (C) 2005-2015, The Roundcube Dev Team                       |
+ | Copyright (C) 2005-2017, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -25,13 +25,13 @@
  */
 
 $config = array(
-    'error_reporting'         => E_ALL & ~E_NOTICE & ~E_STRICT,
+    'error_reporting' => E_ALL & ~E_NOTICE & ~E_STRICT,
+    'display_errors'  => false,
+    'log_errors'      => true,
     // Some users are not using Installer, so we'll check some
     // critical PHP settings here. Only these, which doesn't provide
     // an error/warning in the logs later. See (#1486307).
-    'mbstring.func_overload'  => 0,
-    'magic_quotes_runtime'    => false,
-    'magic_quotes_sybase'     => false, // #1488506
+    'mbstring.func_overload' => 0,
 );
 
 // check these additional ini settings if not called via CLI
@@ -39,6 +39,8 @@
     $config += array(
         'suhosin.session.encrypt' => false,
         'file_uploads'            => true,
+        'session.auto_start'      => false,
+        'zlib.output_compression' => false,
     );
 }
 
@@ -55,7 +57,7 @@
 }
 
 // framework constants
-define('RCUBE_VERSION', '1.2.4');
+define('RCUBE_VERSION', '1.4-git');
 define('RCUBE_CHARSET', 'UTF-8');
 
 if (!defined('RCUBE_LIB_DIR')) {
@@ -427,6 +429,7 @@
 function rcube_autoload($classname)
 {
     if (strpos($classname, 'rcube') === 0) {
+        $classname = preg_replace('/^rcube_(cache|db|session|spellchecker)_/', '\\1/', $classname);
         $classname = 'Roundcube/' . $classname;
     }
     else if (strpos($classname, 'html_') === 0 || $classname === 'html') {
@@ -442,6 +445,11 @@
         $classname = 'Auth/' . substr($classname, 5);
     }
 
+    // Translate PHP namespaces into directories,
+    // i.e. use \Sabre\VObject; $vcf = VObject\Reader::read(...)
+    //      -> Sabre/VObject/Reader.php
+    $classname = str_replace('\\', '/', $classname);
+
     if ($fp = @fopen("$classname.php", 'r', true)) {
         fclose($fp);
         include_once "$classname.php";

iRony-0.4.1.tar.gz/lib/Roundcube/cache Added

iRony-0.4.1.tar.gz/lib/Roundcube/cache/apc.php Added

@@ -0,0 +1,146 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
+ | Copyright (C) 2011-2018, 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 - APC                                                |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Interface class for accessing APC cache
+ *
+ * @package    Framework
+ * @subpackage Cache
+ * @author     Thomas Bruederli <roundcube@gmail.com>
+ * @author     Aleksander Machniak <alec@alec.pl>
+ */
+class rcube_cache_apc extends rcube_cache
+{
+    /**
+     * Indicates if APC module is enabled and in a required version
+     *
+     * @var bool
+     */
+    protected $enabled;
+
+
+    /**
+     * 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);
+
+        $rcube = rcube::get_instance();
+
+        $this->type    = 'apc';
+        $this->enabled = function_exists('apc_exists'); // APC 3.1.4 required
+        $this->debug   = $rcube->config->get('apc_debug');
+    }
+
+    /**
+     * 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 (!$this->enabled) {
+            return false;
+        }
+
+        $data = apc_fetch($key);
+
+        if ($this->debug) {
+            $this->debug('get', $key, $data);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Adds entry into memcache/apc/redis DB.
+     *
+     * @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 (!$this->enabled) {
+            return false;
+        }
+
+        if (apc_exists($key)) {
+            apc_delete($key);
+        }
+
+        $result = apc_store($key, $data, $this->ttl);
+
+        if ($this->debug) {
+            $this->debug('set', $key, $data, $result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes entry from memcache/apc/redis DB.
+     *
+     * @param string $key Cache internal key name
+     *
+     * @param boolean True on success, False on failure
+     */
+    protected function delete_item($key)
+    {
+        if (!$this->enabled) {
+            return false;
+        }
+
+        $result = apc_delete($key);
+
+        if ($this->debug) {
+            $this->debug('delete', $key, null, $result);
+        }
+
+        return $result;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/cache/db.php Added

@@ -0,0 +1,271 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
+ | Copyright (C) 2011-2018, 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 - SQL DB                                             |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Interface class for accessing SQL Database cache
+ *
+ * @package    Framework
+ * @subpackage Cache
+ * @author     Thomas Bruederli <roundcube@gmail.com>
+ * @author     Aleksander Machniak <alec@alec.pl>
+ */
+class rcube_cache_db extends rcube_cache
+{
+    /**
+     * Instance of database handler
+     *
+     * @var rcube_db
+     */
+    protected $db;
+
+    /**
+     * (Escaped) Cache table name (cache or cache_shared)
+     *
+     * @var string
+     */
+    protected $table;
+
+
+    /**
+     * 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);
+
+        $rcube = rcube::get_instance();
+
+        $this->type  = 'db';
+        $this->db    = $rcube->get_dbh();
+        $this->table = $this->db->table_name($userid ? 'cache' : 'cache_shared', true);
+    }
+
+    /**
+     * Remove cache records older than ttl
+     */
+    public function expunge()
+    {
+        if ($this->db && $this->ttl) {
+            $this->db->query(
+                "DELETE FROM {$this->table} WHERE "
+                . ($this->userid ? "`user_id` = {$this->userid} AND " : "")
+                . "`cache_key` LIKE ?"
+                . " AND `expires` < " . $this->db->now(),
+                $this->prefix . '.%');
+        }
+    }
+
+    /**
+     * Remove expired records of all caches
+     */
+    public static function gc()
+    {
+        $rcube = rcube::get_instance();
+        $db    = $rcube->get_dbh();
+
+        $db->query("DELETE FROM " . $db->table_name('cache', true) . " WHERE `expires` < " . $db->now());
+        $db->query("DELETE FROM " . $db->table_name('cache_shared', true) . " WHERE `expires` < " . $db->now());
+    }
+
+    /**
+     * Reads cache entry.
+     *
+     * @param string  $key     Cache key name
+     * @param boolean $nostore Enable to skip in-memory store
+     *
+     * @return mixed Cached value
+     */
+    protected function read_record($key, $nostore=false)
+    {
+        if (!$this->db) {
+            return;
+        }
+
+        $sql_result = $this->db->query(
+                "SELECT `data`, `cache_key` FROM {$this->table} WHERE "
+                . ($this->userid ? "`user_id` = {$this->userid} AND " : "")
+                ."`cache_key` = ?",
+                $this->prefix . '.' . $key);
+
+        if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
+            if (strlen($sql_arr['data']) > 0) {
+                $md5sum = md5($sql_arr['data']);
+                $data   = $this->unserialize($sql_arr['data']);
+            }
+
+            $this->db->reset();
+
+            if ($nostore) {
+                return $data;
+            }
+
+            $this->cache[$key]      = $data;
+            $this->cache_sums[$key] = $md5sum;
+        }
+        else {
+            $this->cache[$key] = null;
+        }
+
+        return $this->cache[$key];
+    }
+
+    /**
+     * Writes single cache record into DB.
+     *
+     * @param string $key  Cache key name
+     * @param mixed  $data Serialized cache data
+     *
+     * @param boolean True on success, False on failure
+     */
+    protected function write_record($key, $data)
+    {
+        if (!$this->db) {
+            return false;
+        }
+
+        // don't attempt to write too big data sets
+        if (strlen($data) > $this->max_packet_size()) {
+            trigger_error("rcube_cache: max_packet_size ($this->max_packet) exceeded for key $key. Tried to write " . strlen($data) . " bytes", E_USER_WARNING);
+            return false;
+        }
+
+        $db_key = $this->prefix . '.' . $key;
+
+        // Remove NULL rows (here we don't need to check if the record exist)
+        if ($data == 'N;') {
+            $result = $this->db->query(
+                "DELETE FROM {$this->table} WHERE "
+                . ($this->userid ? "`user_id` = {$this->userid} AND " : "")
+                ."`cache_key` = ?",
+                $db_key);
+
+            return !$this->db->is_error($result);
+        }
+
+        $key_exists = array_key_exists($key, $this->cache_sums);
+        $expires    = $this->ttl ? $this->db->now($this->ttl) : 'NULL';
+
+        if (!$key_exists) {
+            // Try INSERT temporarily ignoring "duplicate key" errors
+            $this->db->set_option('ignore_key_errors', true);
+
+            if ($this->userid) {
+                $result = $this->db->query(
+                    "INSERT INTO {$this->table} (`expires`, `user_id`, `cache_key`, `data`)"
+                    . " VALUES ($expires, ?, ?, ?)",
+                    $this->userid, $db_key, $data);
+            }
+            else {
+                $result = $this->db->query(
+                    "INSERT INTO {$this->table} (`expires`, `cache_key`, `data`)"
+                    . " VALUES ($expires, ?, ?)",
+                    $db_key, $data);
+            }
+
+            $this->db->set_option('ignore_key_errors', false);
+        }
+
+        // otherwise try UPDATE
+        if (!isset($result) || !($count = $this->db->affected_rows($result))) {
+            $result = $this->db->query(
+                "UPDATE {$this->table} SET `expires` = $expires, `data` = ? WHERE "
+                . ($this->userid ? "`user_id` = {$this->userid} AND " : "")
+                . "`cache_key` = ?",
+                $data, $db_key);
+
+            $count = $this->db->affected_rows($result);
+        }
+
+        return $count > 0;
+    }
+
+    /**
+     * Deletes the cache record(s).
+     *
+     * @param string  $key         Cache key name or pattern
+     * @param boolean $prefix_mode Enable it to clear all keys starting
+     *                             with prefix specified in $key
+     */
+    protected function remove_record($key = null, $prefix_mode = false)
+    {
+        if (!$this->db) {
+            return;
+        }
+
+        // Remove all keys (in specified cache)
+        if ($key === null) {
+            $where = "`cache_key` LIKE " . $this->db->quote($this->prefix . '.%');
+        }
+        // Remove keys by name prefix
+        else if ($prefix_mode) {
+            $where = "`cache_key` LIKE " . $this->db->quote($this->prefix . '.' . $key . '%');
+        }
+        // Remove one key by name
+        else {
+            $where = "`cache_key` = " . $this->db->quote($this->prefix . '.' . $key);
+        }
+
+        $this->db->query(
+            "DELETE FROM {$this->table} WHERE "
+            . ($this->userid ? "`user_id` = {$this->userid} AND " : "") . $where
+        );
+    }
+
+    /**
+     * Serializes data for storing
+     */
+    protected function serialize($data)
+    {
+        return $this->db ? $this->db->encode($data, $this->packed) : false;
+    }
+
+    /**
+     * Unserializes serialized data
+     */
+    protected function unserialize($data)
+    {
+        return $this->db ? $this->db->decode($data, $this->packed) : false;
+    }
+
+    /**
+     * Determine the maximum size for cache data to be written
+     */
+    protected function max_packet_size()
+    {
+        if ($this->max_packet < 0) {
+            $this->max_packet = 2097152; // default/max is 2 MB
+
+            if ($value = $this->db->get_variable('max_allowed_packet', $this->max_packet)) {
+                $this->max_packet = $value;
+            }
+
+            $this->max_packet -= 2000;
+        }
+
+        return $this->max_packet;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/cache/memcache.php Added

@@ -0,0 +1,217 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
+ | Copyright (C) 2011-2018, 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 Memcache cache
+ *
+ * @package    Framework
+ * @subpackage Cache
+ * @author     Thomas Bruederli <roundcube@gmail.com>
+ * @author     Aleksander Machniak <alec@alec.pl>
+ */
+class rcube_cache_memcache extends rcube_cache
+{
+    /**
+     * Instance of memcache handler
+     *
+     * @var Memcache
+     */
+    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');
+
+        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('Memcache')) {
+            self::$memcache = false;
+
+            rcube::raise_error(array(
+                    'code' => 604,
+                    'type' => 'memcache',
+                    'line' => __LINE__,
+                    'file' => __FILE__,
+                    'message' => "Failed to find Memcache. Make sure php-memcache is included"
+                ),
+                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);
+        $seen           = array();
+        $available      = 0;
+
+        // Callback for memcache failure
+        $error_callback = function($host, $port) use ($seen, $available) {
+            // only report once
+            if (!$seen["$host:$port"]++) {
+                $available--;
+                rcube::raise_error(array(
+                        'code' => 604, 'type' => 'db',
+                        'line' => __LINE__, 'file' => __FILE__,
+                        'message' => "Memcache failure on host $host:$port"),
+                    true, false);
+            }
+        };
+
+        self::$memcache = new Memcache;
+
+        foreach ((array) $rcube->config->get('memcache_hosts') as $host) {
+            if (substr($host, 0, 7) != 'unix://') {
+                list($host, $port) = explode(':', $host);
+                if (!$port) $port = 11211;
+            }
+            else {
+                $port = 0;
+            }
+
+            $available += intval(self::$memcache->addServer(
+                $host, $port, $pconnect, 1, $timeout, $retry_interval, false, $error_callback));
+        }
+
+        // test connection and failover (will result in $available == 0 on complete failure)
+        self::$memcache->increment('__CONNECTIONTEST__', 1);  // NOP if key doesn't exist
+
+        if (!$available) {
+            self::$memcache = 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->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
+
+        if (!$result) {
+            $result = self::$memcache->set($key, $data, MEMCACHE_COMPRESSED, $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.1.tar.gz/lib/Roundcube/cache/redis.php Added

@@ -0,0 +1,254 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2011-2018, The Roundcube Dev Team                       |
+ | Copyright (C) 2011-2018, 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 - Redis                                              |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Interface class for accessing Redis cache
+ *
+ * @package    Framework
+ * @subpackage Cache
+ * @author     Thomas Bruederli <roundcube@gmail.com>
+ * @author     Aleksander Machniak <alec@alec.pl>
+ */
+class rcube_cache_redis extends rcube_cache
+{
+    /**
+     * Instance of Redis object
+     *
+     * @var Redis
+     */
+    protected static $redis;
+
+
+    /**
+     * 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);
+
+        $rcube = rcube::get_instance();
+
+        $this->type  = 'redis';
+        $this->debug = $rcube->config->get('redis_debug');
+
+        self::engine();
+    }
+
+    /**
+     * Get global handle for redis access
+     *
+     * @return object Redis
+     */
+    public static function engine()
+    {
+        if (self::$redis !== null) {
+            return self::$redis;
+        }
+
+        if (!class_exists('Redis')) {
+            self::$redis = false;
+
+            rcube::raise_error(array(
+                    'code' => 604,
+                    'type' => 'redis',
+                    'line' => __LINE__,
+                    'file' => __FILE__,
+                    'message' => "Failed to find Redis. Make sure php-redis is included"
+                ),
+                true, true);
+        }
+
+        $rcube     = rcube::get_instance();
+        $hosts     = $rcube->config->get('redis_hosts');
+
+        // host config is wrong
+        if (!is_array($hosts) || empty($hosts)) {
+            rcube::raise_error(array(
+                    'code' => 604,
+                    'type' => 'redis',
+                    'line' => __LINE__,
+                    'file' => __FILE__,
+                    'message' => "Redis host not configured"
+                ),
+                true, true);
+        }
+
+        // only allow 1 host for now until we support clustering
+        if (count($hosts) > 1) {
+            rcube::raise_error(array(
+                    'code' => 604,
+                    'type' => 'redis',
+                    'line' => __LINE__,
+                    'file' => __FILE__,
+                    'message' => "Redis cluster not yet supported"
+                ),
+                true, true);
+        }
+
+        self::$redis = new Redis;
+
+        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;
+            }
+
+            // 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);
+            }
+
+            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);
+            }
+
+            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 (self::$redis->ping() != "+PONG") {
+            self::$redis = false;
+        }
+
+        return self::$redis;
+    }
+
+    /**
+     * Remove cache records older than ttl
+     */
+    public function expunge()
+    {
+        // No need for GC, entries are expunged automatically
+    }
+
+    /**
+     * Remove expired records
+     */
+    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::$redis) {
+            return false;
+        }
+
+        $data = self::$redis->get($key);
+
+        if ($this->debug) {
+            $this->debug('get', $key, $data);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Adds entry into Redis.
+     *
+     * @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::$redis) {
+            return false;
+        }
+
+        $result = self::$redis->setEx($key, $this->ttl, $data);
+
+        if ($this->debug) {
+            $this->debug('set', $key, $data, $result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Deletes entry from Redis.
+     *
+     * @param string $key Cache internal key name
+     *
+     * @param boolean True on success, False on failure
+     */
+    protected function delete_item($key)
+    {
+        if (!self::$redis) {
+            return false;
+        }
+
+        $result = self::$redis->delete($key);
+
+        if ($this->debug) {
+            $this->debug('delete', $key, null, $result);
+        }
+
+        return $result;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/db Added

iRony-0.4.1.tar.gz/lib/Roundcube/db/mssql.php Changed

iRony-0.4.1.tar.gz/lib/Roundcube/db/mysql.php Added

@@ -0,0 +1,254 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | 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:                                                              |
+ |   Database wrapper class that implements PHP PDO functions            |
+ |   for MySQL database                                                  |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Database independent query interface
+ *
+ * This is a wrapper for the PHP PDO
+ *
+ * @package    Framework
+ * @subpackage Database
+ */
+class rcube_db_mysql extends rcube_db
+{
+    public $db_provider = 'mysql';
+
+    /**
+     * Object constructor
+     *
+     * @param string $db_dsnw DSN for read/write operations
+     * @param string $db_dsnr Optional DSN for read only operations
+     * @param bool   $pconn   Enables persistent connections
+     */
+    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
+    {
+        parent::__construct($db_dsnw, $db_dsnr, $pconn);
+
+        // SQL identifiers quoting
+        $this->options['identifier_start'] = '`';
+        $this->options['identifier_end'] = '`';
+    }
+
+    /**
+     * Driver-specific configuration of database connection
+     *
+     * @param array $dsn DSN for DB connections
+     * @param PDO   $dbh Connection handler
+     */
+    protected function conn_configure($dsn, $dbh)
+    {
+        $dbh->query("SET NAMES 'utf8'");
+    }
+
+    /**
+     * Abstract SQL statement for value concatenation
+     *
+     * @return string SQL statement to be used in query
+     */
+    public function concat(/* col1, col2, ... */)
+    {
+        $args = func_get_args();
+
+        if (is_array($args[0])) {
+            $args = $args[0];
+        }
+
+        return 'CONCAT(' . join(', ', $args) . ')';
+    }
+
+    /**
+     * Returns PDO DSN string from DSN array
+     *
+     * @param array $dsn DSN parameters
+     *
+     * @return string Connection string
+     */
+    protected function dsn_string($dsn)
+    {
+        $params = array();
+        $result = 'mysql:';
+
+        if ($dsn['database']) {
+            $params[] = 'dbname=' . $dsn['database'];
+        }
+
+        if ($dsn['hostspec']) {
+            $params[] = 'host=' . $dsn['hostspec'];
+        }
+
+        if ($dsn['port']) {
+            $params[] = 'port=' . $dsn['port'];
+        }
+
+        if ($dsn['socket']) {
+            $params[] = 'unix_socket=' . $dsn['socket'];
+        }
+
+        $params[] = 'charset=utf8';
+
+        if (!empty($params)) {
+            $result .= implode(';', $params);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns driver-specific connection options
+     *
+     * @param array $dsn DSN parameters
+     *
+     * @return array Connection options
+     */
+    protected function dsn_options($dsn)
+    {
+        $result = parent::dsn_options($dsn);
+
+        if (!empty($dsn['key'])) {
+            $result[PDO::MYSQL_ATTR_SSL_KEY] = $dsn['key'];
+        }
+
+        if (!empty($dsn['cipher'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CIPHER] = $dsn['cipher'];
+        }
+
+        if (!empty($dsn['cert'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CERT] = $dsn['cert'];
+        }
+
+        if (!empty($dsn['capath'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CAPATH] = $dsn['capath'];
+        }
+
+        if (!empty($dsn['ca'])) {
+            $result[PDO::MYSQL_ATTR_SSL_CA] = $dsn['ca'];
+        }
+
+        // Always return matching (not affected only) rows count
+        $result[PDO::MYSQL_ATTR_FOUND_ROWS] = true;
+
+        // Enable AUTOCOMMIT mode (#1488902)
+        $result[PDO::ATTR_AUTOCOMMIT] = true;
+
+        return $result;
+    }
+
+    /**
+     * Returns list of tables in a database
+     *
+     * @return array List of all tables of the current database
+     */
+    public function list_tables()
+    {
+        // get tables if not cached
+        if ($this->tables === null) {
+            $q = $this->query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES"
+                . " WHERE TABLE_SCHEMA = ? AND TABLE_TYPE = 'BASE TABLE'"
+                . " ORDER BY TABLE_NAME", $this->db_dsnw_array['database']);
+
+            $this->tables = $q ? $q->fetchAll(PDO::FETCH_COLUMN, 0) : array();
+        }
+
+        return $this->tables;
+    }
+
+    /**
+     * Returns list of columns in database table
+     *
+     * @param string $table Table name
+     *
+     * @return array List of table cols
+     */
+    public function list_cols($table)
+    {
+        $q = $this->query("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS"
+            . " WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ?",
+            $this->db_dsnw_array['database'], $table);
+
+        if ($q) {
+            return $q->fetchAll(PDO::FETCH_COLUMN, 0);
+        }
+
+        return array();
+    }
+
+    /**
+     * Get database runtime variables
+     *
+     * @param string $varname Variable name
+     * @param mixed  $default Default value if variable is not set
+     *
+     * @return mixed Variable value or default
+     */
+    public function get_variable($varname, $default = null)
+    {
+        if (!isset($this->variables)) {
+            $this->variables = array();
+        }
+
+        if (array_key_exists($varname, $this->variables)) {
+            return $this->variables[$varname];
+        }
+
+        // configured value has higher prio
+        $conf_value = rcube::get_instance()->config->get('db_' . $varname);
+        if ($conf_value !== null) {
+            return $this->variables[$varname] = $conf_value;
+        }
+
+        $result = $this->query('SHOW VARIABLES LIKE ?', $varname);
+
+        while ($row = $this->fetch_array($result)) {
+            $this->variables[$row[0]] = $row[1];
+        }
+
+        // not found, use default
+        if (!isset($this->variables[$varname])) {
+            $this->variables[$varname] = $default;
+        }
+
+        return $this->variables[$varname];
+    }
+
+    /**
+     * Handle DB errors, re-issue the query on deadlock errors from InnoDB row-level locking
+     *
+     * @param string Query that triggered the error
+     * @return mixed Result to be stored and returned
+     */
+    protected function handle_error($query)
+    {
+        $error = $this->dbh->errorInfo();
+
+        // retry after "Deadlock found when trying to get lock" errors
+        $retries = 2;
+        while ($error[1] == 1213 && $retries >= 0) {
+            usleep(50000);  // wait 50 ms
+            $result = $this->dbh->query($query);
+            if ($result !== false) {
+                return $result;
+            }
+            $error = $this->dbh->errorInfo();
+            $retries--;
+        }
+
+        return parent::handle_error($query);
+    }
+
+}

iRony-0.4.1.tar.gz/lib/Roundcube/db/oracle.php Added

@@ -0,0 +1,622 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2011-2014, 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:                                                              |
+ |   Database wrapper class that implements database functions           |
+ |   for Oracle database using OCI8 extension                            |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Database independent query interface
+ *
+ * @package    Framework
+ * @subpackage Database
+ */
+class rcube_db_oracle extends rcube_db
+{
+    public $db_provider = 'oracle';
+
+
+    /**
+     * Create connection instance
+     */
+    protected function conn_create($dsn)
+    {
+        // Get database specific connection options
+        $dsn_options = $this->dsn_options($dsn);
+
+        $function = $this->db_pconn ? 'oci_pconnect' : 'oci_connect';
+
+        if (!function_exists($function)) {
+            $this->db_error     = true;
+            $this->db_error_msg = 'OCI8 extension not loaded. See http://php.net/manual/en/book.oci8.php';
+
+            rcube::raise_error(array('code' => 500, 'type' => 'db',
+                'line' => __LINE__, 'file' => __FILE__,
+                'message' => $this->db_error_msg), true, false);
+
+            return;
+        }
+
+        // connect
+        $dbh = @$function($dsn['username'], $dsn['password'], $dsn_options['database'], $dsn_options['charset']);
+
+        if (!$dbh) {
+            $error              = oci_error();
+            $this->db_error     = true;
+            $this->db_error_msg = $error['message'];
+
+            rcube::raise_error(array('code' => 500, 'type' => 'db',
+                'line' => __LINE__, 'file' => __FILE__,
+                'message' => $this->db_error_msg), true, false);
+
+            return;
+        }
+
+        // configure session
+        $this->conn_configure($dsn, $dbh);
+
+        return $dbh;
+    }
+
+    /**
+     * Driver-specific configuration of database connection
+     *
+     * @param array $dsn DSN for DB connections
+     * @param PDO   $dbh Connection handler
+     */
+    protected function conn_configure($dsn, $dbh)
+    {
+        $init_queries = array(
+            "ALTER SESSION SET nls_date_format = 'YYYY-MM-DD'",
+            "ALTER SESSION SET nls_timestamp_format = 'YYYY-MM-DD HH24:MI:SS'",
+        );
+
+        foreach ($init_queries as $query) {
+            $stmt = oci_parse($dbh, $query);
+            oci_execute($stmt);
+        }
+    }
+
+    /**
+     * Connection state checker
+     *
+     * @return boolean True if in connected state
+     */
+    public function is_connected()
+    {
+        return empty($this->dbh) ? false : $this->db_connected;
+    }
+
+    /**
+     * Execute a SQL query with limits
+     *
+     * @param string $query   SQL query to execute
+     * @param int    $offset  Offset for LIMIT statement
+     * @param int    $numrows Number of rows for LIMIT statement
+     * @param array  $params  Values to be inserted in query
+     *
+     * @return PDOStatement|bool Query handle or False on error
+     */
+    protected function _query($query, $offset, $numrows, $params)
+    {
+        $query = ltrim($query);
+
+        $this->db_connect($this->dsn_select($query), true);
+
+        // check connection before proceeding
+        if (!$this->is_connected()) {
+            return $this->last_result = false;
+        }
+
+        if ($numrows || $offset) {
+            $query = $this->set_limit($query, $numrows, $offset);
+        }
+
+        // replace self::DEFAULT_QUOTE with driver-specific quoting
+        $query = $this->query_parse($query);
+
+        // Because in Roundcube we mostly use queries that are
+        // executed only once, we will not use prepared queries
+        $pos  = 0;
+        $idx  = 0;
+        $args = array();
+
+        if (!empty($params)) {
+            while ($pos = strpos($query, '?', $pos)) {
+                if ($query[$pos+1] == '?') {  // skip escaped '?'
+                    $pos += 2;
+                }
+                else {
+                    $val = $this->quote($params[$idx++]);
+
+                    // long strings are not allowed inline, need to be parametrized
+                    if (strlen($val) > 4000) {
+                        $key = ':param' . (count($args) + 1);
+                        $args[$key] = $params[$idx-1];
+                        $val = $key;
+                    }
+
+                    unset($params[$idx-1]);
+                    $query = substr_replace($query, $val, $pos, 1);
+                    $pos += strlen($val);
+                }
+            }
+        }
+
+        $query = rtrim($query, " \t\n\r\0\x0B;");
+
+        // replace escaped '?' and quotes back to normal, see self::quote()
+        $query = str_replace(
+            array('??', self::DEFAULT_QUOTE.self::DEFAULT_QUOTE),
+            array('?', self::DEFAULT_QUOTE),
+            $query
+        );
+
+        // log query
+        $this->debug($query);
+
+        // destroy reference to previous result
+        $this->last_result  = null;
+        $this->db_error_msg = null;
+
+        // prepare query
+        $result = @oci_parse($this->dbh, $query);
+        $mode   = $this->in_transaction ? OCI_NO_AUTO_COMMIT : OCI_COMMIT_ON_SUCCESS;
+
+        if ($result) {
+            foreach (array_keys($args) as $param) {
+                oci_bind_by_name($result, $param, $args[$param], -1, SQLT_LNG);
+            }
+        }
+
+        // execute query
+        if (!$result || !@oci_execute($result, $mode)) {
+            $result = $this->handle_error($query, $result);
+        }
+
+        return $this->last_result = $result;
+    }
+
+    /**
+     * Helper method to handle DB errors.
+     * This by default logs the error but could be overridden by a driver implementation
+     *
+     * @param string Query that triggered the error
+     * @return mixed Result to be stored and returned
+     */
+    protected function handle_error($query, $result = null)
+    {
+        $error = oci_error(is_resource($result) ? $result : $this->dbh);
+
+        // @TODO: Find error codes for key errors
+        if (empty($this->options['ignore_key_errors']) || !in_array($error['code'], array('23000', '23505'))) {
+            $this->db_error = true;
+            $this->db_error_msg = sprintf('[%s] %s', $error['code'], $error['message']);
+
+            rcube::raise_error(array('code' => 500, 'type' => 'db',
+                'line' => __LINE__, 'file' => __FILE__,
+                'message' => $this->db_error_msg . " (SQL Query: $query)"
+                ), true, false);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get last inserted record ID
+     *
+     * @param string $table Table name (to find the incremented sequence)
+     *
+     * @return mixed ID or false on failure
+     */
+    public function insert_id($table = null)
+    {
+        if (!$this->db_connected || $this->db_mode == 'r' || empty($table)) {
+            return false;
+        }
+
+        $sequence = $this->quote_identifier($this->sequence_name($table));
+        $result   = $this->query("SELECT $sequence.currval FROM dual");
+        $result   = $this->fetch_array($result);
+
+        return $result[0] ?: false;
+    }
+
+    /**
+     * Get number of affected rows for the last query
+     *
+     * @param mixed $result Optional query handle
+     *
+     * @return int Number of (matching) rows
+     */
+    public function affected_rows($result = null)
+    {
+        if ($result || ($result === null && ($result = $this->last_result))) {
+            return oci_num_rows($result);
+        }
+
+        return 0;
+    }
+
+    /**
+     * Get number of rows for a SQL query
+     * If no query handle is specified, the last query will be taken as reference
+     *
+     * @param mixed $result Optional query handle
+     * @return mixed   Number of rows or false on failure
+     * @deprecated This method shows very poor performance and should be avoided.
+     */
+    public function num_rows($result = null)
+    {
+        // not implemented
+        return false;
+    }
+
+    /**
+     * Get an associative array for one row
+     * If no query handle is specified, the last query will be taken as reference
+     *
+     * @param mixed $result Optional query handle
+     *
+     * @return mixed Array with col values or false on failure
+     */
+    public function fetch_assoc($result = null)
+    {
+        return $this->_fetch_row($result, OCI_ASSOC);
+    }
+
+    /**
+     * Get an index array for one row
+     * If no query handle is specified, the last query will be taken as reference
+     *
+     * @param mixed $result Optional query handle
+     *
+     * @return mixed Array with col values or false on failure
+     */
+    public function fetch_array($result = null)
+    {
+        return $this->_fetch_row($result, OCI_NUM);
+    }
+
+    /**
+     * Get col values for a result row
+     *
+     * @param mixed $result Optional query handle
+     * @param int   $mode   Fetch mode identifier
+     *
+     * @return mixed Array with col values or false on failure
+     */
+    protected function _fetch_row($result, $mode)
+    {
+        if ($result || ($result === null && ($result = $this->last_result))) {
+            return oci_fetch_array($result, $mode + OCI_RETURN_NULLS + OCI_RETURN_LOBS);
+        }
+
+        return false;
+    }
+
+    /**
+     * Formats input so it can be safely used in a query
+     * PDO_OCI does not implement quote() method
+     *
+     * @param mixed  $input Value to quote
+     * @param string $type  Type of data (integer, bool, ident)
+     *
+     * @return string Quoted/converted string for use in query
+     */
+    public function quote($input, $type = null)
+    {
+        // handle int directly for better performance
+        if ($type == 'integer' || $type == 'int') {
+            return intval($input);
+        }
+
+        if (is_null($input)) {
+            return 'NULL';
+        }
+
+        if ($input instanceof DateTime) {
+            return $this->quote($input->format($this->options['datetime_format']));
+        }
+
+        if ($type == 'ident') {
+            return $this->quote_identifier($input);
+        }
+
+        switch ($type) {
+        case 'bool':
+        case 'integer':
+            return intval($input);
+        default:
+            return "'" . strtr($input, array(
+                    '?' => '??',
+                    "'" => "''",
+                    rcube_db::DEFAULT_QUOTE => rcube_db::DEFAULT_QUOTE . rcube_db::DEFAULT_QUOTE
+            )) . "'";
+        }
+    }
+
+    /**
+     * Return correct name for a specific database sequence
+     *
+     * @param string $table Table name
+     *
+     * @return string Translated sequence name
+     */
+    protected function sequence_name($table)
+    {
+        // Note: we support only one sequence per table
+        // Note: The sequence name must be <table_name>_seq
+        $sequence = $table . '_seq';
+
+        // modify sequence name if prefix is configured
+        if ($prefix = $this->options['table_prefix']) {
+            return $prefix . $sequence;
+        }
+
+        return $sequence;
+    }
+
+    /**
+     * Return SQL statement for case insensitive LIKE
+     *
+     * @param string $column Field name
+     * @param string $value  Search value
+     *
+     * @return string SQL statement to use in query
+     */
+    public function ilike($column, $value)
+    {
+        return 'UPPER(' . $this->quote_identifier($column) . ') LIKE UPPER(' . $this->quote($value) . ')';
+    }
+
+    /**
+     * Return SQL function for current time and date
+     *
+     * @param int $interval Optional interval (in seconds) to add/subtract
+     *
+     * @return string SQL function to use in query
+     */
+    public function now($interval = 0)
+    {
+        if ($interval) {
+            $interval = intval($interval);
+            return "current_timestamp + INTERVAL '$interval' SECOND";
+        }
+
+        return "current_timestamp";
+    }
+
+    /**
+     * Return SQL statement to convert a field value into a unix timestamp
+     *
+     * @param string $field Field name
+     *
+     * @return string SQL statement to use in query
+     * @deprecated
+     */
+    public function unixtimestamp($field)
+    {
+        return "(($field - to_date('1970-01-01','YYYY-MM-DD')) * 60 * 60 * 24)";
+    }
+
+    /**
+     * Adds TOP (LIMIT,OFFSET) clause to the query
+     *
+     * @param string $query  SQL query
+     * @param int    $limit  Number of rows
+     * @param int    $offset Offset
+     *
+     * @return string SQL query
+     */
+    protected function set_limit($query, $limit = 0, $offset = 0)
+    {
+        $limit  = intval($limit);
+        $offset = intval($offset);
+        $end    = $offset + $limit;
+
+        // @TODO: Oracle 12g has better OFFSET support
+
+        if (!$offset) {
+            $query = "SELECT * FROM ($query) a WHERE rownum <= $end";
+        }
+        else {
+            $query = "SELECT * FROM (SELECT a.*, rownum as rn FROM ($query) a WHERE rownum <= $end) b WHERE rn > $offset";
+        }
+
+        return $query;
+    }
+
+    /**
+     * Parse SQL file and fix table names according to table prefix
+     */
+    protected function fix_table_names($sql)
+    {
+        if (!$this->options['table_prefix']) {
+            return $sql;
+        }
+
+        $sql = parent::fix_table_names($sql);
+
+        // replace sequence names, and other Oracle-specific commands
+        $sql = preg_replace_callback('/((SEQUENCE ["]?)([^" \r\n]+)/',
+            array($this, 'fix_table_names_callback'),
+            $sql
+        );
+
+        $sql = preg_replace_callback(
+            '/([ \r\n]+["]?)([^"\' \r\n\.]+)(["]?\.nextval)/',
+            array($this, 'fix_table_names_seq_callback'),
+            $sql
+        );
+
+        return $sql;
+    }
+
+    /**
+     * Preg_replace callback for fix_table_names()
+     */
+    protected function fix_table_names_seq_callback($matches)
+    {
+        return $matches[1] . $this->options['table_prefix'] . $matches[2] . $matches[3];
+    }
+
+    /**
+     * Returns connection options from DSN array
+     */
+    protected function dsn_options($dsn)
+    {
+        $params = array();
+
+        if ($dsn['hostspec']) {
+            $host = $dsn['hostspec'];
+            if ($dsn['port']) {
+                $host .= ':' . $dsn['port'];
+            }
+
+            $params['database'] = $host . '/' . $dsn['database'];
+        }
+
+        $params['charset'] = 'UTF8';
+
+        return $params;
+    }
+
+    /**
+     * Execute the given SQL script
+     *
+     * @param string $sql SQL queries to execute
+     *
+     * @return boolen True on success, False on error
+     */
+    public function exec_script($sql)
+    {
+        $sql  = $this->fix_table_names($sql);
+        $buff = '';
+        $body = false;
+
+        foreach (explode("\n", $sql) as $line) {
+            $tok = strtolower(trim($line));
+            if (preg_match('/^--/', $line) || $tok == '' || $tok == '/') {
+                continue;
+            }
+
+            $buff .= $line . "\n";
+
+            // detect PL/SQL function bodies, don't break on semicolon
+            if ($body && $tok == 'end;') {
+                $body = false;
+            }
+            else if (!$body && $tok == 'begin') {
+                $body = true;
+            }
+
+            if (!$body && substr($tok, -1) == ';') {
+                $this->query($buff);
+                $buff = '';
+                if ($this->db_error) {
+                    break;
+                }
+            }
+        }
+
+        return !$this->db_error;
+    }
+
+    /**
+     * Start transaction
+     *
+     * @return bool True on success, False on failure
+     */
+    public function startTransaction()
+    {
+        $this->db_connect('w', true);
+
+        // check connection before proceeding
+        if (!$this->is_connected()) {
+            return $this->last_result = false;
+        }
+
+        $this->debug('BEGIN TRANSACTION');
+
+        return $this->last_result = $this->in_transaction = true;
+    }
+
+    /**
+     * Commit transaction
+     *
+     * @return bool True on success, False on failure
+     */
+    public function endTransaction()
+    {
+        $this->db_connect('w', true);
+
+        // check connection before proceeding
+        if (!$this->is_connected()) {
+            return $this->last_result = false;
+        }
+
+        $this->debug('COMMIT TRANSACTION');
+
+        if ($result = @oci_commit($this->dbh)) {
+            $this->in_transaction = true;
+        }
+        else {
+            $this->handle_error('COMMIT');
+        }
+
+        return $this->last_result = $result;
+    }
+
+    /**
+     * Rollback transaction
+     *
+     * @return bool True on success, False on failure
+     */
+    public function rollbackTransaction()
+    {
+        $this->db_connect('w', true);
+
+        // check connection before proceeding
+        if (!$this->is_connected()) {
+            return $this->last_result = false;
+        }
+
+        $this->debug('ROLLBACK TRANSACTION');
+
+        if (@oci_rollback($this->dbh)) {
+            $this->in_transaction = false;
+        }
+        else {
+            $this->handle_error('ROLLBACK');
+        }
+
+        return $this->last_result = $this->dbh->rollBack();
+    }
+
+    /**
+     * Terminate database connection.
+     */
+    public function closeConnection()
+    {
+        // release statement and close connection(s)
+        $this->last_result = null;
+        foreach ($this->dbhs as $dbh) {
+            oci_close($dbh);
+        }
+
+        parent::closeConnection();
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/db/pgsql.php Added

@@ -0,0 +1,300 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2017, The Roundcube Dev Team                       |
+ |                                                                       |
+ | 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:                                                              |
+ |   Database wrapper class that implements PHP PDO functions            |
+ |   for PostgreSQL database                                             |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Database independent query interface
+ * This is a wrapper for the PHP PDO
+ *
+ * @package    Framework
+ * @subpackage Database
+ */
+class rcube_db_pgsql extends rcube_db
+{
+    public $db_provider = 'postgres';
+
+    // See https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-PARAMKEYWORDS
+    private static $libpq_connect_params = array("application_name", "sslmode", "sslcert", "sslkey", "sslrootcert", "sslcrl", "sslcompression", "service");
+
+    /**
+     * Object constructor
+     *
+     * @param string $db_dsnw DSN for read/write operations
+     * @param string $db_dsnr Optional DSN for read only operations
+     * @param bool   $pconn   Enables persistent connections
+     */
+    public function __construct($db_dsnw, $db_dsnr = '', $pconn = false)
+    {
+        parent::__construct($db_dsnw, $db_dsnr, $pconn);
+
+        // use date/time input format with timezone spec.
+        $this->options['datetime_format'] = 'c';
+    }
+
+    /**
+     * Driver-specific configuration of database connection
+     *
+     * @param array $dsn DSN for DB connections
+     * @param PDO   $dbh Connection handler
+     */
+    protected function conn_configure($dsn, $dbh)
+    {
+        $dbh->query("SET NAMES 'utf8'");
+        $dbh->query("SET DATESTYLE TO ISO");
+
+        // if ?schema= is set in dsn, set the search_path
+        if ($dsn['schema']) {
+            $dbh->query("SET search_path TO " . $this->quote($dsn['schema']));
+        }
+    }
+
+    /**
+     * Get last inserted record ID
+     *
+     * @param string $table Table name (to find the incremented sequence)
+     *
+     * @return mixed ID or false on failure
+     */
+    public function insert_id($table = null)
+    {
+        if (!$this->db_connected || $this->db_mode == 'r') {
+            return false;
+        }
+
+        if ($table) {
+            $table = $this->sequence_name($table);
+        }
+
+        $id = $this->dbh->lastInsertId($table);
+
+        return $id;
+    }
+
+    /**
+     * Return correct name for a specific database sequence
+     *
+     * @param string $table Table name
+     *
+     * @return string Translated sequence name
+     */
+    protected function sequence_name($table)
+    {
+        // Note: we support only one sequence per table
+        // Note: The sequence name must be <table_name>_seq
+        $sequence = $table . '_seq';
+
+        // modify sequence name if prefix is configured
+        if ($prefix = $this->options['table_prefix']) {
+            return $prefix . $sequence;
+        }
+
+        return $sequence;
+    }
+
+    /**
+     * Return SQL statement to convert a field value into a unix timestamp
+     *
+     * @param string $field Field name
+     *
+     * @return string SQL statement to use in query
+     * @deprecated
+     */
+    public function unixtimestamp($field)
+    {
+        return "EXTRACT (EPOCH FROM $field)";
+    }
+
+    /**
+     * Return SQL function for current time and date
+     *
+     * @param int $interval Optional interval (in seconds) to add/subtract
+     *
+     * @return string SQL function to use in query
+     */
+    public function now($interval = 0)
+    {
+        if ($interval) {
+            $add = ' ' . ($interval > 0 ? '+' : '-') . " interval '";
+            $add .= $interval > 0 ? intval($interval) : intval($interval) * -1;
+            $add .= " seconds'";
+        }
+
+        return "now()" . $add;
+    }
+
+    /**
+     * Return SQL statement for case insensitive LIKE
+     *
+     * @param string $column Field name
+     * @param string $value  Search value
+     *
+     * @return string SQL statement to use in query
+     */
+    public function ilike($column, $value)
+    {
+        return $this->quote_identifier($column) . ' ILIKE ' . $this->quote($value);
+    }
+
+    /**
+     * Get database runtime variables
+     *
+     * @param string $varname Variable name
+     * @param mixed  $default Default value if variable is not set
+     *
+     * @return mixed Variable value or default
+     */
+    public function get_variable($varname, $default = null)
+    {
+        // There's a known case when max_allowed_packet is queried
+        // PostgreSQL doesn't have such limit, return immediately
+        if ($varname == 'max_allowed_packet') {
+            return rcube::get_instance()->config->get('db_' . $varname, $default);
+        }
+
+        $this->variables[$varname] = rcube::get_instance()->config->get('db_' . $varname);
+
+        if (!isset($this->variables)) {
+            $this->variables = array();
+
+            $result = $this->query('SHOW ALL');
+
+            while ($row = $this->fetch_array($result)) {
+                $this->variables[$row[0]] = $row[1];
+            }
+        }
+
+        return isset($this->variables[$varname]) ? $this->variables[$varname] : $default;
+    }
+
+    /**
+     * Returns list of tables in a database
+     *
+     * @return array List of all tables of the current database
+     */
+    public function list_tables()
+    {
+        // 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);
+            }
+            else {
+                $add = " AND TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')";
+            }
+
+            $q = $this->query("SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES"
+                . " WHERE TABLE_TYPE = 'BASE TABLE'" . $add
+                . " ORDER BY TABLE_NAME");
+
+            $this->tables = $q ? $q->fetchAll(PDO::FETCH_COLUMN, 0) : array();
+        }
+
+        return $this->tables;
+    }
+
+    /**
+     * Returns list of columns in database table
+     *
+     * @param string $table Table name
+     *
+     * @return array List of table cols
+     */
+    public function list_cols($table)
+    {
+        $args = array($table);
+
+        if ($schema = $this->options['table_prefix']) {
+            $add    = " AND TABLE_SCHEMA = ?";
+            $args[] = str_replace('.', '', $schema);
+        }
+        else {
+            $add = " AND TABLE_SCHEMA NOT IN ('pg_catalog', 'information_schema')";
+        }
+
+        $q = $this->query("SELECT COLUMN_NAME FROM INFORMATION_SCHEMA.COLUMNS"
+            . " WHERE TABLE_NAME = ?" . $add, $args);
+
+        if ($q) {
+            return $q->fetchAll(PDO::FETCH_COLUMN, 0);
+        }
+
+        return array();
+    }
+
+    /**
+     * Returns PDO DSN string from DSN array
+     *
+     * @param array $dsn DSN parameters
+     *
+     * @return string DSN string
+     */
+    protected function dsn_string($dsn)
+    {
+        $params = array();
+        $result = 'pgsql:';
+
+        if ($dsn['hostspec']) {
+            $params[] = 'host=' . $dsn['hostspec'];
+        }
+        else if ($dsn['socket']) {
+            $params[] = 'host=' . $dsn['socket'];
+        }
+
+        if ($dsn['port']) {
+            $params[] = 'port=' . $dsn['port'];
+        }
+
+        if ($dsn['database']) {
+            $params[] = 'dbname=' . $dsn['database'];
+        }
+
+        foreach (self::$libpq_connect_params as $param) {
+            if ($dsn[$param]) {
+                $params[] = $param . '=' . $dsn[$param];
+            }
+        }
+
+        if (!empty($params)) {
+            $result .= implode(';', $params);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Parse SQL file and fix table names according to table prefix
+     */
+    protected function fix_table_names($sql)
+    {
+        if (!$this->options['table_prefix']) {
+            return $sql;
+        }
+
+        $sql = parent::fix_table_names($sql);
+
+        // replace sequence names, and other postgres-specific commands
+        $sql = preg_replace_callback(
+            '/((SEQUENCE |RENAME TO |nextval\()["\']*)([^"\' \r\n]+)/',
+            array($this, 'fix_table_names_callback'),
+            $sql
+        );
+
+        return $sql;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/db/sqlite.php Changed

iRony-0.4.1.tar.gz/lib/Roundcube/db/sqlsrv.php Changed

iRony-0.4.0.tar.gz/lib/Roundcube/html.php -> iRony-0.4.1.tar.gz/lib/Roundcube/html.php Changed

@@ -32,7 +32,7 @@
     public static $doctype = 'xhtml';
     public static $lc_tags = true;
     public static $common_attrib = array('id','class','style','title','align','unselectable','tabindex','role');
-    public static $containers    = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script');
+    public static $containers    = array('iframe','div','span','p','h1','h2','h3','ul','form','textarea','table','thead','tbody','tr','th','td','style','script','a');
     public static $bool_attrib   = array('checked','multiple','disabled','selected','autofocus','readonly');
 
 
@@ -65,7 +65,7 @@
      *
      * @param string $tagname Tag name
      * @param array  $attrib  Tag attributes as key/value pairs
-     * @param string $content Optinal Tag content (creates a container tag)
+     * @param string $content Optional Tag content (creates a container tag)
      * @param array  $allowed List with allowed attributes, omit to allow all
      *
      * @return string The XHTML tag
@@ -163,7 +163,7 @@
         }
 
         return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib,
-            array('src','alt','width','height','border','usemap','onclick','onerror')));
+            array('src','alt','width','height','border','usemap','onclick','onerror','onload')));
     }
 
     /**
@@ -218,7 +218,8 @@
             $attr = array('for' => $attr);
         }
 
-        return self::tag('label', $attr, $cont, array_merge(self::$common_attrib, array('for')));
+        return self::tag('label', $attr, $cont, array_merge(self::$common_attrib,
+            array('for','onkeypress')));
     }
 
     /**
@@ -267,7 +268,7 @@
     /**
      * Derrived method for line breaks
      *
-     * @param array $attrib  Associative arry with tag attributes
+     * @param array $attrib Associative arry with tag attributes
      *
      * @return string HTML code
      * @see html::tag()
@@ -322,8 +323,12 @@
             // attributes with no value
             if (in_array($key, self::$bool_attrib)) {
                 if ($value) {
-                    // @TODO: minimize attribute in non-xhtml mode
-                    $attrib_arr[] = $key . '="' . $key . '"';
+                    $value = $key;
+                    if (self::$doctype == 'xhtml') {
+                        $value .= '="' . $value . '"';
+                    }
+
+                    $attrib_arr[] = $value;
                 }
             }
             else {
@@ -337,21 +342,24 @@
     /**
      * Convert a HTML attribute string attributes to an associative array (name => value)
      *
-     * @param string Input string
+     * @param string $str Input string
      *
      * @return array Key-value pairs of parsed attributes
      */
     public static function parse_attrib_string($str)
     {
         $attrib = array();
-        $regexp = '/\s*([-_a-z]+)=(["\'])??(?(2)([^\2]*)\2|(\S+?))/Ui';
+        $html   = '<html>'
+            . '<head><meta http-equiv="Content-Type" content="text/html; charset=' . RCUBE_CHARSET . '" /></head>'
+            . '<body><div ' . rtrim($str, '/ ') . ' /></body>'
+            . '</html>';
 
-        preg_match_all($regexp, stripslashes($str), $regs, PREG_SET_ORDER);
+        $document = new DOMDocument('1.0', RCUBE_CHARSET);
+        @$document->loadHTML($html);
 
-        // convert attributes to an associative array (name => value)
-        if ($regs) {
-            foreach ($regs as $attr) {
-                $attrib[strtolower($attr[1])] = html_entity_decode($attr[3] . $attr[4]);
+        if ($node = $document->getElementsByTagName('div')->item(0)) {
+            foreach ($node->attributes as $name => $attr) {
+                $attrib[strtolower($name)] = $attr->nodeValue;
             }
         }
 
@@ -367,16 +375,7 @@
      */
     public static function quote($str)
     {
-        static $flags;
-
-        if (!$flags) {
-            $flags = ENT_COMPAT;
-            if (defined('ENT_SUBSTITUTE')) {
-                $flags |= ENT_SUBSTITUTE;
-            }
-        }
-
-        return @htmlspecialchars($str, $flags, RCUBE_CHARSET);
+        return @htmlspecialchars($str, ENT_COMPAT | ENT_SUBSTITUTE, RCUBE_CHARSET);
     }
 }
 
@@ -395,7 +394,7 @@
         'type','name','value','size','tabindex','autocapitalize','required',
         'autocomplete','checked','onchange','onclick','disabled','readonly',
         'spellcheck','results','maxlength','src','multiple','accept',
-        'placeholder','autofocus','pattern'
+        'placeholder','autofocus','pattern','oninput'
     );
 
     /**
@@ -567,6 +566,38 @@
 }
 
 /**
+ * Class to create HTML button
+ *
+ * @package    Framework
+ * @subpackage View
+ */
+class html_button extends html_inputfield
+{
+    protected $tagname = 'button';
+    protected $type    = 'button';
+
+    /**
+     * Get HTML code for this object
+     *
+     * @param string $content Text Content of the button
+     * @param array  $attrib  Additional attributes to override
+     *
+     * @return string HTML output
+     */
+    public function show($content = '', $attrib = null)
+    {
+        // overwrite object attributes
+        if (is_array($attrib)) {
+            $this->attrib = array_merge($this->attrib, $attrib);
+        }
+
+        $this->content = $content;
+
+        return parent::show();
+    }
+}
+
+/**
  * Class to create an HTML textarea
  *
  * @package    Framework
@@ -625,7 +656,7 @@
  * $select->add(array('Switzerland','Germany'), array('CH','DE'));
  *
  * // generate pulldown with selection 'Switzerland'  and return html-code
- * // as second argument the same attributes available to instanciate can be used
+ * // as second argument the same attributes available to instantiate can be used
  * print $select->show('CH');
  * </pre>
  *
@@ -773,12 +804,12 @@
      * Remove a column from a table
      * Useful for plugins making alterations
      *
-     * @param string $class
+     * @param string $class Class name
      */
     public function remove_column($class)
     {
         // Remove the header
-        foreach ($this->header as $index=>$header){
+        foreach ($this->header as $index => $header){
             if ($header->attrib['class'] == $class){
                 unset($this->header[$index]);
                 break;
@@ -786,8 +817,8 @@
         }
 
         // Remove cells from rows
-        foreach ($this->rows as $i=>$row){
-            foreach ($row->cells as $j=>$cell){
+        foreach ($this->rows as $i => $row){
+            foreach ($row->cells as $j => $cell){
                 if ($cell->attrib['class'] == $class){
                     unset($this->rows[$i]->cells[$j]);
                     break;
@@ -863,26 +894,35 @@
             $this->attrib = array_merge($this->attrib, $attrib);
         }
 
-        $thead = $tbody = "";
+        $thead        = '';
+        $tbody        = '';
+        $col_tagname  = $this->_col_tagname();
+        $row_tagname  = $this->_row_tagname();
+        $head_tagname = $this->_head_tagname();
 
         // include <thead>
         if (!empty($this->header)) {
             $rowcontent = '';
             foreach ($this->header as $c => $col) {
-                $rowcontent .= self::tag($this->_head_tagname(), $col->attrib, $col->content);
+                $rowcontent .= self::tag($head_tagname, $col->attrib, $col->content);
             }
             $thead = $this->tagname == 'table' ? self::tag('thead', null, self::tag('tr', null, $rowcontent, parent::$common_attrib)) :
-                self::tag($this->_row_tagname(), array('class' => 'thead'), $rowcontent, parent::$common_attrib);
+                self::tag($row_tagname, array('class' => 'thead'), $rowcontent, parent::$common_attrib);
         }
 
         foreach ($this->rows as $r => $row) {
             $rowcontent = '';
             foreach ($row->cells as $c => $col) {
-                $rowcontent .= self::tag($this->_col_tagname(), $col->attrib, $col->content);
+                if ($row_tagname == 'li' && empty($col->attrib) && count($row->cells) == 1) {
+                    $rowcontent .= $col->content;
+                }
+                else {
+                    $rowcontent .= self::tag($col_tagname, $col->attrib, $col->content);
+                }
             }
 
             if ($r < $this->rowindex || count($row->cells)) {
-                $tbody .= self::tag($this->_row_tagname(), $row->attrib, $rowcontent, parent::$common_attrib);
+                $tbody .= self::tag($row_tagname, $row->attrib, $rowcontent, parent::$common_attrib);
             }
         }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube.php Changed

@@ -39,7 +39,7 @@
     const DEBUG_LINE_LENGTH = 4096;
 
     /**
-     * Singleton instace of rcube
+     * Singleton instance of rcube
      *
      * @var rcube
      */
@@ -53,21 +53,28 @@
     public $config;
 
     /**
-     * Instace of database class.
+     * Instance of database class.
      *
      * @var rcube_db
      */
     public $db;
 
     /**
-     * Instace of Memcache class.
+     * Instance of Memcache class.
      *
      * @var Memcache
      */
     public $memcache;
 
+    /**
+     * Instance of Redis class.
+     *
+     * @var Redis
+     */
+    public $redis;
+
    /**
-     * Instace of rcube_session class.
+     * Instance of rcube_session class.
      *
      * @var rcube_session
      */
@@ -202,86 +209,40 @@
     public function get_memcache()
     {
         if (!isset($this->memcache)) {
-            // no memcache support in PHP
-            if (!class_exists('Memcache')) {
-                $this->memcache = false;
-                return false;
-            }
-
-            $this->memcache     = new Memcache;
-            $this->memcache_init();
-
-            // test connection and failover (will result in $this->mc_available == 0 on complete failure)
-            $this->memcache->increment('__CONNECTIONTEST__', 1);  // NOP if key doesn't exist
-
-            if (!$this->mc_available) {
-                $this->memcache = false;
-            }
+            $this->memcache = rcube_cache_memcache::engine();
         }
 
         return $this->memcache;
     }
 
     /**
-     * Get global handle for memcache access
+     * Get global handle for redis access
      *
-     * @return object Memcache
+     * @return object Redis
      */
-    protected function memcache_init()
+    public function get_redis()
     {
-        $this->mc_available = 0;
-
-        // add all configured hosts to pool
-        $pconnect       = $this->config->get('memcache_pconnect', true);
-        $timeout        = $this->config->get('memcache_timeout', 1);
-        $retry_interval = $this->config->get('memcache_retry_interval', 15);
-
-        foreach ($this->config->get('memcache_hosts', array()) as $host) {
-            if (substr($host, 0, 7) != 'unix://') {
-                list($host, $port) = explode(':', $host);
-                if (!$port) $port = 11211;
-            }
-            else {
-                $port = 0;
-            }
-
-            $this->mc_available += intval($this->memcache->addServer(
-                $host, $port, $pconnect, 1, $timeout, $retry_interval, false, array($this, 'memcache_failure')));
+        if (!isset($this->redis)) {
+            $this->redis = rcube_cache_redis::engine();
         }
-    }
-
-    /**
-     * Callback for memcache failure
-     */
-    public function memcache_failure($host, $port)
-    {
-        static $seen = array();
 
-        // only report once
-        if (!$seen["$host:$port"]++) {
-            $this->mc_available--;
-            self::raise_error(array(
-                'code' => 604, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => "Memcache failure on host $host:$port"),
-                true, false);
-        }
+        return $this->redis;
     }
 
     /**
-     * Initialize and get cache object
+     * Initialize and get user cache object
      *
      * @param string $name   Cache identifier
-     * @param string $type   Cache type ('db', 'apc' or 'memcache')
+     * @param string $type   Cache type ('db', 'apc', 'memcache', 'redis')
      * @param string $ttl    Expiration time for cache items
      * @param bool   $packed Enables/disables data serialization
      *
-     * @return rcube_cache Cache object
+     * @return rcube_cache User cache object
      */
     public function get_cache($name, $type='db', $ttl=0, $packed=true)
     {
         if (!isset($this->caches[$name]) && ($userid = $this->get_user_id())) {
-            $this->caches[$name] = new rcube_cache($type, $userid, $name, $ttl, $packed);
+            $this->caches[$name] = rcube_cache::factory($type, $userid, $name, $ttl, $packed);
         }
 
         return $this->caches[$name];
@@ -293,9 +254,9 @@
      * @param string $name   Cache identifier
      * @param bool   $packed Enables/disables data serialization
      *
-     * @return rcube_cache_shared Cache object
+     * @return rcube_cache Shared cache object
      */
-    public function get_cache_shared($name, $packed=true)
+    public function get_cache_shared($name, $packed = true)
     {
         $shared_name = "shared_$name";
 
@@ -313,7 +274,7 @@
                 $ttl = $this->config->get('shared_cache_ttl', '10d');
             }
 
-            $this->caches[$shared_name] = new rcube_cache_shared($type, $name, $ttl, $packed);
+            $this->caches[$shared_name] = rcube_cache::factory($type, null, $name, $ttl, $packed);
         }
 
         return $this->caches[$shared_name];
@@ -390,6 +351,7 @@
         );
 
         if (!empty($_SESSION['storage_host'])) {
+            $options['language'] = $_SESSION['language'];
             $options['host']     = $_SESSION['storage_host'];
             $options['user']     = $_SESSION['username'];
             $options['port']     = $_SESSION['storage_port'];
@@ -514,6 +476,8 @@
             ini_set('session.gc_maxlifetime', $lifetime * 2);
         }
 
+        // set session cookie lifetime so it never expires (#5961)
+        ini_set('session.cookie_lifetime', 0);
         ini_set('session.cookie_secure', $is_secure);
         ini_set('session.name', $sess_name ?: 'roundcube_sessid');
         ini_set('session.use_cookies', 1);
@@ -536,15 +500,13 @@
     public function gc()
     {
         rcube_cache::gc();
-        rcube_cache_shared::gc();
         $this->get_storage()->cache_gc();
-
         $this->gc_temp();
     }
 
     /**
      * Garbage collector function for temp files.
-     * Remove temp files older than two days
+     * Removes temporary files older than temp_dir_ttl.
      */
     public function gc_temp()
     {
@@ -553,8 +515,9 @@
         // expire in 48 hours by default
         $temp_dir_ttl = $this->config->get('temp_dir_ttl', '48h');
         $temp_dir_ttl = get_offset_sec($temp_dir_ttl);
-        if ($temp_dir_ttl < 6*3600)
+        if ($temp_dir_ttl < 6*3600) {
             $temp_dir_ttl = 6*3600;   // 6 hours sensible lower bound.
+        }
 
         $expire = time() - $temp_dir_ttl;
 
@@ -564,8 +527,8 @@
                     continue;
                 }
 
-                if (@filemtime($tmp.'/'.$fname) < $expire) {
-                    @unlink($tmp.'/'.$fname);
+                if (@filemtime("$tmp/$fname") < $expire) {
+                    @unlink("$tmp/$fname");
                 }
             }
 
@@ -594,12 +557,12 @@
     /**
      * Get localized text in the desired language
      *
-     * @param mixed   $attrib  Named parameters array or label name
-     * @param string  $domain  Label domain (plugin) name
+     * @param mixed  $attrib Named parameters array or label name
+     * @param string $domain Label domain (plugin) name
      *
      * @return string Localized text
      */
-    public function gettext($attrib, $domain=null)
+    public function gettext($attrib, $domain = null)
     {
         // load localization files if not done yet
         if (empty($this->texts)) {
@@ -633,26 +596,33 @@
             }
         }
 
-        // format output
-        if (($attrib['uppercase'] && strtolower($attrib['uppercase'] == 'first')) || $attrib['ucfirst']) {
-            return ucfirst($text);
+        // replace \n with real line break
+        $text = strtr($text, array('\n' => "\n"));
+
+        // case folding
+        if (($attrib['uppercase'] && strtolower($attrib['uppercase']) == 'first') || $attrib['ucfirst']) {
+            $case_mode = MB_CASE_TITLE;
         }
         else if ($attrib['uppercase']) {
-            return mb_strtoupper($text);
+            $case_mode = MB_CASE_UPPER;
         }
         else if ($attrib['lowercase']) {
-            return mb_strtolower($text);
+            $case_mode = MB_CASE_LOWER;
+        }
+
+        if (isset($case_mode)) {
+            $text = mb_convert_case($text, $case_mode);
         }
 
-        return strtr($text, array('\n' => "\n"));
+        return $text;
     }
 
     /**
      * 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)
      */
@@ -678,9 +648,9 @@
             }
         }
         // specified domain
-        else if ($domain) {
+        else if ($domain && isset($this->texts[$domain.'.'.$name])) {
             $ref_domain = $domain;
-            return isset($this->texts[$domain.'.'.$name]);
+            return true;
         }
 
         return false;
@@ -741,6 +711,65 @@
     }
 
     /**
+     * Read localized texts from an additional location (plugins, skins).
+     * Then you can use the result as 2nd arg to load_language().
+     *
+     * @param string $dir Directory to search in
+     *
+     * @return array Localization texts
+     */
+    public function read_localization($dir)
+    {
+        $lang   = $_SESSION['language'];
+        $langs  = array_unique(array('en_US', $lang));
+        $locdir = slashify($dir);
+        $texts  = array();
+
+        // Language aliases used to find localization in similar lang, see below
+        $aliases = array(
+            'de_CH' => 'de_DE',
+            'es_AR' => 'es_ES',
+            'fa_AF' => 'fa_IR',
+            'nl_BE' => 'nl_NL',
+            'pt_BR' => 'pt_PT',
+            'zh_CN' => 'zh_TW',
+        );
+
+        // use buffering to handle empty lines/spaces after closing PHP tag
+        ob_start();
+
+        foreach ($langs as $lng) {
+            $fpath = $locdir . $lng . '.inc';
+            if (is_file($fpath) && is_readable($fpath)) {
+                include $fpath;
+                $texts = (array) $labels + (array) $messages + (array) $texts;
+            }
+            else if ($lng != 'en_US') {
+                // Find localization in similar language (#1488401)
+                $alias = null;
+                if (!empty($aliases[$lng])) {
+                    $alias = $aliases[$lng];
+                }
+                else if ($key = array_search($lng, $aliases)) {
+                    $alias = $key;
+                }
+
+                if (!empty($alias)) {
+                    $fpath = $locdir . $alias . '.inc';
+                    if (is_file($fpath) && is_readable($fpath)) {
+                        include $fpath;
+                        $texts = (array) $labels + (array) $messages + (array) $texts;
+                    }
+                }
+            }
+        }
+
+        ob_end_clean();
+
+        return $texts;
+    }
+
+    /**
      * Check the given string and return a valid language code
      *
      * @param string $lang Language code
@@ -799,7 +828,7 @@
     {
         static $sa_languages = array();
 
-        if (!sizeof($sa_languages)) {
+        if (!count($sa_languages)) {
             @include(RCUBE_LOCALIZATION_DIR . 'index.inc');
 
             if ($dh = @opendir(RCUBE_LOCALIZATION_DIR)) {
@@ -946,7 +975,7 @@
         $sess_tok = $this->get_request_token();
 
         // ajax requests
-        if (rcube_utils::request_header('X-Roundcube-Request') == $sess_tok) {
+        if (rcube_utils::request_header('X-Roundcube-Request') === $sess_tok) {
             return true;
         }
 
@@ -961,7 +990,7 @@
         $token   = rcube_utils::get_input_value('_token', $mode);
         $sess_id = $_COOKIE[ini_get('session.name')];
 
-        if (empty($sess_id) || $token != $sess_tok) {
+        if (empty($sess_id) || $token !== $sess_tok) {
             $this->request_status = self::REQUEST_ERROR_TOKEN;
             return false;
         }
@@ -1024,7 +1053,7 @@
      * The functions will be executed before destroying any
      * objects like smtp, imap, session, etc.
      *
-     * @param callback Function callback
+     * @param callback $function Function callback
      */
     public function add_shutdown_function($function)
     {
@@ -1033,7 +1062,7 @@
 
     /**
      * When you're going to sleep the script execution for a longer time
-     * it is good to close all external connections (sql, memcache, SMTP, IMAP).
+     * it is good to close all external connections (sql, memcache, redis, SMTP, IMAP).
      *
      * No action is required on wake up, all connections will be
      * re-established automatically.
@@ -1063,6 +1092,10 @@
         if ($this->smtp) {
             $this->smtp->disconnect();
         }
+
+        if ($this->redis) {
+            $this->redis->close();
+        }
     }
 
     /**
@@ -1172,6 +1205,8 @@
      *
      * @param string $name Name of the log file
      * @param mixed  $line Line to append
+     *
+     * @return bool True on success, False on failure
      */
     public static function write_log($name, $line)
     {
@@ -1209,19 +1244,24 @@
 
         if ($log_driver == 'syslog') {
             $prio = $name == 'errors' ? LOG_ERR : LOG_INFO;
-            syslog($prio, $line);
-            return true;
+            return syslog($prio, $line);
+        }
+
+        // write message with file name when configured to log to STDOUT
+        if ($log_driver == 'stdout') {
+            $stdout = "php://stdout";
+            $line = "$name: $line";
+            return file_put_contents($stdout, $line, FILE_APPEND) !== false;
         }
 
         // log_driver == 'file' is assumed here
 
         $line = sprintf("[%s]: %s\n", $date, $line);
-        $log_dir = null;
 
         // per-user logging is activated
-        if (self::$instance && self::$instance->config->get('per_user_logging', false) && self::$instance->get_user_id()) {
+        if (self::$instance && self::$instance->config->get('per_user_logging') && self::$instance->get_user_id()) {
             $log_dir = self::$instance->get_user_log_dir();
-            if (empty($log_dir) && $name != 'errors') {
+            if (empty($log_dir) && !in_array($name, array('errors', 'userlogins', 'sendmail'))) {
                 return false;
             }
         }
@@ -1239,6 +1279,13 @@
             $log_dir = RCUBE_INSTALL_PATH . 'logs';
         }
 
+        if (self::$instance) {
+            $name .= self::$instance->config->get('log_file_ext', '.log');
+        }
+        else {
+            $name .= '.log';
+        }
+
         return file_put_contents("$log_dir/$name", $line, FILE_APPEND) !== false;
     }
 
@@ -1247,7 +1294,7 @@
      *
      * @param array $arg Named parameters
      *      - code:    Error code (required)
-     *      - type:    Error type [php|db|imap|javascript] (required)
+     *      - type:    Error type [php|db|imap|javascript]
      *      - message: Error message
      *      - file:    File where error occurred
      *      - line:    Line where error occurred
@@ -1273,15 +1320,15 @@
             $arg['code'] = 500;
         }
 
+        $cli = php_sapi_name() == 'cli';
+
         // installer
-        if (class_exists('rcmail_install', false)) {
+        if (!$cli && class_exists('rcmail_install', false)) {
             $rci = rcmail_install::get_instance();
             $rci->raise_error($arg);
             return;
         }
 
-        $cli = php_sapi_name() == 'cli';
-
         if (($log || $terminate) && !$cli && $arg['message']) {
             $arg['fatal'] = $terminate;
             self::log_bug($arg);
@@ -1305,7 +1352,7 @@
     }
 
     /**
-     * Report error according to configured debug_level
+     * Log an error
      *
      * @param array $arg_arr Named parameters
      * @see self::raise_error()
@@ -1313,65 +1360,38 @@
     public static function log_bug($arg_arr)
     {
         $program = strtoupper($arg_arr['type'] ?: 'php');
-        $level   = self::get_instance()->config->get('debug_level');
-
-        // disable errors for ajax requests, write to log instead (#1487831)
-        if (($level & 4) && !empty($_REQUEST['_remote'])) {
-            $level = ($level ^ 4) | 1;
-        }
 
         // write error to local log file
-        if (($level & 1) || !empty($arg_arr['fatal'])) {
-            if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-                foreach (array('_task', '_action') as $arg) {
-                    if ($_POST[$arg] && !$_GET[$arg]) {
-                        $post_query[$arg] = $_POST[$arg];
-                    }
-                }
-
-                if (!empty($post_query)) {
-                    $post_query = (strpos($_SERVER['REQUEST_URI'], '?') != false ? '&' : '?')
-                        . http_build_query($post_query, '', '&');
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            foreach (array('_task', '_action') as $arg) {
+                if ($_POST[$arg] && !$_GET[$arg]) {
+                    $post_query[$arg] = $_POST[$arg];
                 }
             }
 
-            $log_entry = sprintf("%s Error: %s%s (%s %s)",
-                $program,
-                $arg_arr['message'],
-                $arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
-                $_SERVER['REQUEST_METHOD'],
-                $_SERVER['REQUEST_URI'] . $post_query);
-
-            if (!self::write_log('errors', $log_entry)) {
-                // send error to PHPs error handler if write_log didn't succeed
-                trigger_error($arg_arr['message'], E_USER_WARNING);
+            if (!empty($post_query)) {
+                $post_query = (strpos($_SERVER['REQUEST_URI'], '?') != false ? '&' : '?')
+                    . http_build_query($post_query, '', '&');
             }
         }
 
-        // report the bug to the global bug reporting system
-        if ($level & 2) {
-            // TODO: Send error via HTTP
-        }
-
-        // show error if debug_mode is on
-        if ($level & 4) {
-            print "<b>$program Error";
+        $log_entry = sprintf("%s Error: %s%s (%s %s)",
+            $program,
+            $arg_arr['message'],
+            $arg_arr['file'] ? sprintf(' in %s on line %d', $arg_arr['file'], $arg_arr['line']) : '',
+            $_SERVER['REQUEST_METHOD'],
+            $_SERVER['REQUEST_URI'] . $post_query);
 
-            if (!empty($arg_arr['file']) && !empty($arg_arr['line'])) {
-                print " in $arg_arr[file] ($arg_arr[line])";
-            }
-
-            print ':</b>&nbsp;';
-            print nl2br($arg_arr['message']);
-            print '<br />';
-            flush();
+        if (!self::write_log('errors', $log_entry)) {
+            // send error to PHPs error handler if write_log didn't succeed
+            trigger_error($arg_arr['message'], E_USER_WARNING);
         }
     }
 
     /**
      * Write debug info to the log
      *
-     * @param string $engine Engine type - file name (memcache, apc)
+     * @param string $engine Engine type - file name (memcache, apc, redis)
      * @param string $data   Data string to log
      * @param bool   $result Operation result
      */
@@ -1506,8 +1526,8 @@
      */
     protected function get_user_log_dir()
     {
-        $log_dir = $this->config->get('log_dir', RCUBE_INSTALL_PATH . 'logs');
-        $user_name = $this->get_user_name();
+        $log_dir      = $this->config->get('log_dir', RCUBE_INSTALL_PATH . 'logs');
+        $user_name    = $this->get_user_name();
         $user_log_dir = $log_dir . '/' . $user_name;
 
         return !empty($user_name) && is_writable($user_log_dir) ? $user_log_dir : false;
@@ -1571,10 +1591,12 @@
      * @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.
      */
-    public function deliver_message(&$message, $from, $mailto, &$error, &$body_file = null, $options = null)
+    public function deliver_message(&$message, $from, $mailto, &$error,
+        &$body_file = null, $options = null, $disconnect = false)
     {
         $plugin = $this->plugins->exec_hook('message_before_send', array(
             'message' => $message,
@@ -1600,153 +1622,89 @@
         $message = $plugin['message'];
         $headers = $message->headers();
 
-        // send thru SMTP server using custom SMTP library
-        if ($this->config->get('smtp_server')) {
-            // generate list of recipients
-            $a_recipients = (array) $mailto;
-
-            if (strlen($headers['Cc']))
-                $a_recipients[] = $headers['Cc'];
-            if (strlen($headers['Bcc']))
-                $a_recipients[] = $headers['Bcc'];
-
-            // remove Bcc header and get the whole head of the message as string
-            $smtp_headers = $this->message_head($message, array('Bcc'));
-
-            if ($message->getParam('delay_file_io')) {
-                // use common temp dir
-                $temp_dir    = $this->config->get('temp_dir');
-                $body_file   = tempnam($temp_dir, 'rcmMsg');
-                $mime_result = $message->saveMessageBody($body_file);
-
-                if (is_a($mime_result, 'PEAR_Error')) {
-                    self::raise_error(array('code' => 650, 'type' => 'php',
-                        'file' => __FILE__, 'line' => __LINE__,
-                        'message' => "Could not create message: ".$mime_result->getMessage()),
-                        true, false);
-                    return false;
-                }
-
-                $msg_body = fopen($body_file, 'r');
-            }
-            else {
-                $msg_body = $message->get();
-            }
-
-            // send message
-            if (!is_object($this->smtp)) {
-                $this->smtp_init(true);
-            }
-
-            $sent     = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $options);
-            $response = $this->smtp->get_response();
-            $error    = $this->smtp->get_error();
+        // generate list of recipients
+        $a_recipients = (array) $mailto;
 
-            // log error
-            if (!$sent) {
-                self::raise_error(array('code' => 800, 'type' => 'smtp',
-                    'line' => __LINE__, 'file' => __FILE__,
-                    'message' => join("\n", $response)), true, false);
-            }
+        if (strlen($headers['Cc'])) {
+            $a_recipients[] = $headers['Cc'];
+        }
+        if (strlen($headers['Bcc'])) {
+            $a_recipients[] = $headers['Bcc'];
         }
-        // send mail using PHP's mail() function
-        else {
-            // unset To,Subject headers because they will be added by the mail() function
-            $header_str = $this->message_head($message, array('To', 'Subject'));
-
-            if (is_array($mailto)) {
-                $mailto = implode(', ', $mailto);
-            }
 
-            // #1485779
-            if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-                if (preg_match_all('/<([^@]+@[^>]+)>/', $mailto, $m)) {
-                    $mailto = implode(', ', $m[1]);
-                }
-            }
+        // remove Bcc header and get the whole head of the message as string
+        $smtp_headers = $message->txtHeaders(array('Bcc' => null), true);
 
-            $msg_body = $message->get();
+        if ($message->getParam('delay_file_io')) {
+            // use common temp dir
+            $temp_dir    = $this->config->get('temp_dir');
+            $body_file   = tempnam($temp_dir, 'rcmMsg');
+            $mime_result = $message->saveMessageBody($body_file);
 
-            if (is_a($msg_body, 'PEAR_Error')) {
+            if (is_a($mime_result, 'PEAR_Error')) {
                 self::raise_error(array('code' => 650, 'type' => 'php',
                     'file' => __FILE__, 'line' => __LINE__,
-                    'message' => "Could not create message: ".$msg_body->getMessage()),
+                    'message' => "Could not create message: ".$mime_result->getMessage()),
                     true, false);
+                return false;
             }
-            else {
-                $delim      = $this->config->header_delimiter();
-                $to         = $message->encodeHeader('To', $mailto, RCUBE_CHARSET, 'quoted-printable');
-                $subject    = $headers['Subject'];
-                $header_str = rtrim($header_str);
-
-                if ($delim != "\r\n") {
-                    $header_str = str_replace("\r\n", $delim, $header_str);
-                    $msg_body   = str_replace("\r\n", $delim, $msg_body);
-                    $to         = str_replace("\r\n", $delim, $to);
-                    $subject    = str_replace("\r\n", $delim, $subject);
-                }
 
-                if (filter_var(ini_get('safe_mode'), FILTER_VALIDATE_BOOLEAN))
-                    $sent = mail($to, $subject, $msg_body, $header_str);
-                else
-                    $sent = mail($to, $subject, $msg_body, $header_str, '-f ' . escapeshellarg($from));
-            }
+            $msg_body = fopen($body_file, 'r');
+        }
+        else {
+            $msg_body = $message->get();
+        }
+
+        // initialize SMTP connection
+        if (!is_object($this->smtp)) {
+            $this->smtp_init(true);
         }
 
-        if ($sent) {
-            $this->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body));
+        // send message
+        $sent     = $this->smtp->send_mail($from, $a_recipients, $smtp_headers, $msg_body, $options);
+        $response = $this->smtp->get_response();
+        $error    = $this->smtp->get_error();
+
+        if (!$sent) {
+            self::raise_error(array('code' => 800, 'type' => 'smtp',
+                'line' => __LINE__, 'file' => __FILE__,
+                'message' => join("\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));
+        }
+        else {
+            $this->plugins->exec_hook('message_sent', array('headers' => $headers, 'body' => $msg_body, 'message' => $message));
 
             // remove MDN headers after sending
             unset($headers['Return-Receipt-To'], $headers['Disposition-Notification-To']);
 
             if ($this->config->get('smtp_log')) {
                 // get all recipient addresses
-                if (is_array($mailto)) {
-                    $mailto = implode(',', $mailto);
-                }
-                if ($headers['Cc']) {
-                    $mailto .= ',' . $headers['Cc'];
-                }
-                if ($headers['Bcc']) {
-                    $mailto .= ',' . $headers['Bcc'];
-                }
-
+                $mailto = implode(',', $a_recipients);
                 $mailto = rcube_mime::decode_address_list($mailto, null, false, null, true);
 
-                self::write_log('sendmail', sprintf("User %s [%s]; Message for %s; %s",
+                self::write_log('sendmail', sprintf("User %s [%s]; Message %s for %s; %s",
                     $this->user->get_username(),
                     rcube_utils::remote_addr(),
+                    $headers['Message-ID'],
                     implode(', ', $mailto),
                     !empty($response) ? join('; ', $response) : ''));
             }
         }
-        else {
-            // 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));
-        }
 
         if (is_resource($msg_body)) {
             fclose($msg_body);
         }
 
+        if ($disconnect) {
+            $this->smtp->disconnect();
+        }
+
         $message->headers($headers, true);
 
         return $sent;
     }
-
-    /**
-     * Return message headers as a string
-     */
-    protected function message_head($message, $unset = array())
-    {
-        // requires Mail_mime >= 1.9.0
-        $headers = array();
-        foreach ((array) $unset as $header) {
-            $headers[$header] = null;
-        }
-
-        return $message->txtHeaders($headers, true);
-    }
 }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_addressbook.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_addressbook.php Changed

@@ -68,7 +68,7 @@
     /**
      * Save a search string for future listings
      *
-     * @param mixed Search params to use in listing method, obtained by get_search_set()
+     * @param mixed $filter Search params to use in listing method, obtained by get_search_set()
      */
     abstract function set_search_set($filter);
 
@@ -97,21 +97,22 @@
     /**
      * List the current set of contact records
      *
-     * @param  array  List of cols to show
-     * @param  int    Only return this number of records, use negative values for tail
-     * @return array  Indexed list of contact records, each a hash array
+     * @param array $cols   List of cols to show
+     * @param int   $subset Only return this number of records, use negative values for tail
+     *
+     * @return array Indexed list of contact records, each a hash array
      */
     abstract function list_records($cols=null, $subset=0);
 
     /**
      * Search records
      *
-     * @param array   List of fields to search in
-     * @param string  Search value
-     * @param int     Search mode. Sum of self::SEARCH_*.
-     * @param boolean True if results are requested, False if count only
-     * @param boolean True to skip the count query (select only)
-     * @param array   List of fields that cannot be empty
+     * @param array   $fields   List of fields to search in
+     * @param string  $value    Search value
+     * @param int     $mode     Search mode. Sum of self::SEARCH_*.
+     * @param boolean $select   True if results are requested, False if count only
+     * @param boolean $nocount  True to skip the count query (select only)
+     * @param array   $required List of fields that cannot be empty
      *
      * @return object rcube_result_set List of contact records and 'count' value
      */
@@ -134,8 +135,8 @@
     /**
      * Get a specific contact record
      *
-     * @param mixed   Record identifier(s)
-     * @param boolean True to return record as associative array, otherwise a result set is returned
+     * @param mixed   $id    Record identifier(s)
+     * @param boolean $assoc True to return record as associative array, otherwise a result set is returned
      *
      * @return rcube_result_set|array Result object with all record fields
      */
@@ -154,8 +155,8 @@
     /**
      * Setter for errors for internal use
      *
-     * @param int    Error type (one of this class' error constants)
-     * @param string Error message (name of a text label)
+     * @param int    $type    Error type (one of this class' error constants)
+     * @param string $message Error message (name of a text label)
      */
     protected function set_error($type, $message)
     {
@@ -171,7 +172,7 @@
     /**
      * Set internal list page
      *
-     * @param number Page number to list
+     * @param number $page Page number to list
      */
     function set_page($page)
     {
@@ -181,7 +182,7 @@
     /**
      * Set internal page size
      *
-     * @param number Number of messages to display on one page
+     * @param number $size Number of messages to display on one page
      */
     function set_pagesize($size)
     {
@@ -191,7 +192,7 @@
     /**
      * Set internal sort settings
      *
-     * @param string $sort_col Sort column
+     * @param string $sort_col   Sort column
      * @param string $sort_order Sort order
      */
     function set_sort_order($sort_col, $sort_order = null)
@@ -208,8 +209,8 @@
      * Check the given data before saving.
      * If input isn't valid, the message to display can be fetched using get_error()
      *
-     * @param array   Assoziative array with data to save
-     * @param boolean Attempt to fix/complete record automatically
+     * @param array   &$save_data Associative array with data to save
+     * @param boolean $autofix    Attempt to fix/complete record automatically
      *
      * @return boolean True if input is valid, False if not.
      */
@@ -251,10 +252,11 @@
     /**
      * Create a new contact record
      *
-     * @param array Assoziative array with save data
+     * @param array $save_data 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 boolean $check True to check for duplicates first
+     *
      * @return mixed The created record ID on success, False on error
      */
     function insert($save_data, $check=false)
@@ -265,8 +267,9 @@
     /**
      * Create new contact records for every item in the record set
      *
-     * @param object rcube_result_set Recordset to insert
-     * @param boolean True to check for duplicates first
+     * @param rcube_result_set $recset Recordset to insert
+     * @param boolean          $check  True to check for duplicates first
+     *
      * @return array List of created record IDs
      */
     function insertMultiple($recset, $check=false)
@@ -284,8 +287,8 @@
     /**
      * Update a specific contact record
      *
-     * @param mixed Record identifier
-     * @param array Assoziative array with save data
+     * @param mixed $id        Record identifier
+     * @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
      *
@@ -299,8 +302,8 @@
     /**
      * Mark one or more contact records as deleted
      *
-     * @param array Record identifiers
-     * @param bool  Remove records irreversible (see self::undelete)
+     * @param array $ids   Record identifiers
+     * @param bool  $force Remove records irreversible (see self::undelete)
      */
     function delete($ids, $force = true)
     {
@@ -310,7 +313,7 @@
     /**
      * Unmark delete flag on contact record(s)
      *
-     * @param array Record identifiers
+     * @param array $ids Record identifiers
      */
     function undelete($ids)
     {
@@ -331,13 +334,13 @@
      * Setter for the current group
      * (empty, has to be re-implemented by extending class)
      */
-    function set_group($gid) { }
+    function set_group($group_id) { }
 
     /**
      * List all active contact groups of this source
      *
-     * @param string  Optional search string to match group name
-     * @param int     Search mode. Sum of self::SEARCH_*
+     * @param string $search Optional search string to match group name
+     * @param int    $mode   Search mode. Sum of self::SEARCH_*
      *
      * @return array  Indexed list of contact groups, each a hash array
      */
@@ -350,7 +353,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)
@@ -362,7 +366,8 @@
     /**
      * Create a contact group with the given name
      *
-     * @param string The group name
+     * @param string $name The group name
+     *
      * @return mixed False on error, array with record props in success
      */
     function create_group($name)
@@ -374,10 +379,11 @@
     /**
      * 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($gid)
+    function delete_group($group_id)
     {
         /* empty for address books don't supporting groups */
         return false;
@@ -386,12 +392,13 @@
     /**
      * 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 $newname  New name to set for this group
+     * @param string &$newid   New group identifier (if changed, otherwise don't set)
+     *
      * @return boolean New name on success, false if no data was changed
      */
-    function rename_group($gid, $newname, &$newid)
+    function rename_group($group_id, $newname, &$newid)
     {
         /* empty for address books don't supporting groups */
         return false;
@@ -400,8 +407,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 $ids      List of contact identifiers to be added
      *
      * @return int Number of contacts added
      */
@@ -414,8 +421,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 $ids      List of contact identifiers to be removed
      *
      * @return int Number of deleted group members
      */
@@ -430,7 +437,7 @@
      *
      * @param mixed Record identifier
      *
-     * @return array List of assigned groups as ID=>Name pairs
+     * @return array $id List of assigned groups as ID=>Name pairs
      * @since 0.5-beta
      */
     function get_record_groups($id)
@@ -443,9 +450,11 @@
      * Utility function to return all values of a certain data column
      * either as flat list or grouped by subtype
      *
-     * @param string Col name
-     * @param array  Record data array as used for saving
-     * @param boolean True to return one array with all values, False for hash array with values grouped by type
+     * @param string $col  Col name
+     * @param array  $data Record data array as used for saving
+     * @param bool   $flat True to return one array with all values,
+     *                     False for hash array with values grouped by type
+     *
      * @return array List of column values
      */
     public static function get_col_values($col, $data, $flat = false)
@@ -475,7 +484,7 @@
      * Normalize the given string for fulltext search.
      * Currently only optimized for Latin-1 characters; to be extended
      *
-     * @param string Input string (UTF-8)
+     * @param string $str Input string (UTF-8)
      * @return string Normalized string
      * @deprecated since 0.9-beta
      */
@@ -487,8 +496,8 @@
     /**
      * Compose a valid display name from the given structured contact data
      *
-     * @param array  Hash array with contact data as key-value pairs
-     * @param bool   Don't attempt to extract components from the email address
+     * @param array $contact    Hash array with contact data as key-value pairs
+     * @param bool  $full_email Don't attempt to extract components from the email address
      *
      * @return string Display name
      */
@@ -526,7 +535,8 @@
      * Compose the name to display in the contacts list for the given contact record.
      * This respects the settings parameter how to list conacts.
      *
-     * @param array  Hash array with contact data as key-value pairs
+     * @param array $contact Hash array with contact data as key-value pairs
+     *
      * @return string List name
      */
     public static function compose_list_name($contact)
@@ -574,10 +584,10 @@
     /**
      * Build contact display name for autocomplete listing
      *
-     * @param array  Hash array with contact data as key-value pairs
-     * @param string Optional email address
-     * @param string Optional name (self::compose_list_name() result)
-     * @param string Optional template to use (defaults to the 'contact_search_name' config option)
+     * @param array  $contact Hash array with contact data as key-value pairs
+     * @param string $email   Optional email address
+     * @param string $name    Optional name (self::compose_list_name() result)
+     * @param string $templ   Optional template to use (defaults to the 'contact_search_name' config option)
      *
      * @return string Display name
      */
@@ -636,16 +646,24 @@
 
     /**
      * Create a unique key for sorting contacts
+     *
+     * @param array  $contact  Contact record
+     * @param string $sort_col Sorting column name
+     *
+     * @return string Unique key
      */
     public static function compose_contact_key($contact, $sort_col)
     {
-        $key = $contact[$sort_col] . ':' . $contact['sourceid'];
+        $key = $contact[$sort_col];
 
         // add email to a key to not skip contacts with the same name (#1488375)
         if (($email = self::get_col_values('email', $contact, true)) && !empty($email)) {
             $key .= ':' . implode(':', (array)$email);
         }
 
+        // Make the key really unique (as we e.g. support contacts with no email)
+        $key .= ':' . $contact['sourceid'] . ':' . $contact['ID'];
+
         return $key;
     }
 
@@ -657,7 +675,7 @@
      * @param string       $search  Search value
      * @param int          $mode    Search mode
      *
-     * @return bool Comparision result
+     * @return bool Comparison result
      */
     protected function compare_search_value($colname, $value, $search, $mode)
     {
@@ -670,6 +688,11 @@
                 && $value->format('Ymd') == $search->format('Ymd'));
         }
 
+        // Gender is a special value, must use strict comparison (#5757)
+        if ($colname == 'gender') {
+            $mode = self::SEARCH_STRICT;
+        }
+
         // composite field, e.g. address
         foreach ((array)$value as $val) {
             $val = mb_strtolower($val);

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_cache.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_cache.php Changed

@@ -28,31 +28,51 @@
  */
 class rcube_cache
 {
+    protected $type;
+    protected $userid;
+    protected $prefix;
+    protected $ttl;
+    protected $packed;
+    protected $index;
+    protected $index_changed = false;
+    protected $debug         = false;
+    protected $cache         = array();
+    protected $cache_changes = array();
+    protected $cache_sums    = array();
+    protected $max_packet    = -1;
+
+
     /**
-     * Instance of database handler
+     * Object factory
+     *
+     * @param string $type   Engine type ('db', 'memcache', 'apc', 'redis')
+     * @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
      *
-     * @var rcube_db|Memcache|bool
+     * @param rcube_cache Cache object
      */
-    private $db;
-    private $type;
-    private $userid;
-    private $prefix;
-    private $table;
-    private $ttl;
-    private $packed;
-    private $index;
-    private $debug;
-    private $index_changed = false;
-    private $cache         = array();
-    private $cache_changes = array();
-    private $cache_sums    = array();
-    private $max_packet    = -1;
+    public static function factory($type, $userid, $prefix = '', $ttl = 0, $packed = true)
+    {
+        $driver = strtolower($type) ?: 'db';
+        $class  = "rcube_cache_$driver";
 
+        if (!$driver || !class_exists($class)) {
+            rcube::raise_error(array('code' => 600, 'type' => 'db',
+                'line' => __LINE__, 'file' => __FILE__,
+                'message' => "Configuration error. Unsupported cache driver: $driver"),
+                true, true);
+        }
+
+        return new $class($userid, $prefix, $ttl, $packed);
+    }
 
     /**
      * Object constructor.
      *
-     * @param string $type   Engine type ('db' or 'memcache' or 'apc')
      * @param int    $userid User identifier
      * @param string $prefix Key name prefix
      * @param string $ttl    Expiration time of memcache/apc items
@@ -60,27 +80,8 @@
      *                       It's possible to disable data serialization if you're sure
      *                       stored data will be always a safe string
      */
-    function __construct($type, $userid, $prefix='', $ttl=0, $packed=true)
+    public function __construct($userid, $prefix = '', $ttl = 0, $packed = true)
     {
-        $rcube = rcube::get_instance();
-        $type  = strtolower($type);
-
-        if ($type == 'memcache') {
-            $this->type  = 'memcache';
-            $this->db    = $rcube->get_memcache();
-            $this->debug = $rcube->config->get('memcache_debug');
-        }
-        else if ($type == 'apc') {
-            $this->type  = 'apc';
-            $this->db    = function_exists('apc_exists'); // APC 3.1.4 required
-            $this->debug = $rcube->config->get('apc_debug');
-        }
-        else {
-            $this->type  = 'db';
-            $this->db    = $rcube->get_dbh();
-            $this->table = $this->db->table_name('cache', true);
-        }
-
         // convert ttl string to seconds
         $ttl = get_offset_sec($ttl);
         if ($ttl > 2592000) $ttl = 2592000;
@@ -98,7 +99,7 @@
      *
      * @return mixed Cached value
      */
-    function get($key)
+    public function get($key)
     {
         if (!array_key_exists($key, $this->cache)) {
             return $this->read_record($key);
@@ -113,7 +114,7 @@
      * @param string $key  Cache key name
      * @param mixed  $data Cache data
      */
-    function set($key, $data)
+    public function set($key, $data)
     {
         $this->cache[$key]         = $data;
         $this->cache_changes[$key] = true;
@@ -126,7 +127,7 @@
      *
      * @return mixed Cached value
      */
-    function read($key)
+    public function read($key)
     {
         if (array_key_exists($key, $this->cache)) {
             return $this->cache[$key];
@@ -144,7 +145,7 @@
      *
      * @param boolean True on success, False on failure
      */
-    function write($key, $data)
+    public function write($key, $data)
     {
         return $this->write_record($key, $this->serialize($data));
     }
@@ -156,7 +157,7 @@
      * @param boolean $prefix_mode Enable it to clear all keys starting
      *                             with prefix specified in $key
      */
-    function remove($key=null, $prefix_mode=false)
+    public function remove($key=null, $prefix_mode=false)
     {
         // Remove all keys
         if ($key === null) {
@@ -188,34 +189,24 @@
     /**
      * Remove cache records older than ttl
      */
-    function expunge()
+    public function expunge()
     {
-        if ($this->type == 'db' && $this->db && $this->ttl) {
-            $this->db->query(
-                "DELETE FROM {$this->table}".
-                " WHERE `user_id` = ?".
-                " AND `cache_key` LIKE ?".
-                " AND `expires` < " . $this->db->now(),
-                $this->userid,
-                $this->prefix.'.%');
-        }
+        // to be overwritten by engine class
     }
 
     /**
      * Remove expired records of all caches
      */
-    static function gc()
+    public static function gc()
     {
-        $rcube = rcube::get_instance();
-        $db    = $rcube->get_dbh();
-
-        $db->query("DELETE FROM " . $db->table_name('cache', true) . " WHERE `expires` < " . $db->now());
+        // Only DB cache requires an action to remove expired entries
+        rcube_cache_db::gc();
     }
 
     /**
      * Writes the cache back to the DB.
      */
-    function close()
+    public function close()
     {
         foreach ($this->cache as $key => $data) {
             // The key has been used
@@ -250,77 +241,34 @@
      *
      * @return mixed Cached value
      */
-    private function read_record($key, $nostore=false)
+    protected function read_record($key, $nostore = false)
     {
-        if (!$this->db) {
-            return null;
-        }
-
-        if ($this->type != 'db') {
-            $this->load_index();
+        $this->load_index();
 
-            // Consistency check (#1490390)
-            if (!in_array($key, $this->index)) {
-                // we always check if the key exist in the index
-                // to have data in consistent state. Keeping the index consistent
-                // is needed for keys delete operation when we delete all keys or by prefix.
-            }
-            else {
-                $ckey = $this->ckey($key);
+        // Consistency check (#1490390)
+        if (!in_array($key, $this->index)) {
+            // we always check if the key exist in the index
+            // to have data in consistent state. Keeping the index consistent
+            // is needed for keys delete operation when we delete all keys or by prefix.
+        }
+        else {
+            $ckey = $this->ckey($key);
+            $data = $this->get_item($ckey);
+        }
 
-                if ($this->type == 'memcache') {
-                    $data = $this->db->get($ckey);
-                }
-                else if ($this->type == 'apc') {
-                    $data = apc_fetch($ckey);
-                }
+        if ($data !== false) {
+            $md5sum = md5($data);
+            $data   = $this->unserialize($data);
 
-                if ($this->debug) {
-                    $this->debug('get', $ckey, $data);
-                }
+            if ($nostore) {
+                return $data;
             }
 
-            if ($data !== false) {
-                $md5sum = md5($data);
-                $data   = $this->unserialize($data);
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache_sums[$key] = $md5sum;
-                $this->cache[$key]      = $data;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
+            $this->cache_sums[$key] = $md5sum;
+            $this->cache[$key]      = $data;
         }
         else {
-            $sql_result = $this->db->limitquery(
-                "SELECT `data`, `cache_key`".
-                " FROM {$this->table}".
-                " WHERE `user_id` = ? AND `cache_key` = ?".
-                // for better performance we allow more records for one key
-                // get the newer one
-                " ORDER BY `created` DESC",
-                0, 1, $this->userid, $this->prefix.'.'.$key);
-
-            if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
-                if (strlen($sql_arr['data']) > 0) {
-                    $md5sum = md5($sql_arr['data']);
-                    $data   = $this->unserialize($sql_arr['data']);
-                }
-
-                if ($nostore) {
-                    return $data;
-                }
-
-                $this->cache[$key]      = $data;
-                $this->cache_sums[$key] = $md5sum;
-            }
-            else {
-                $this->cache[$key] = null;
-            }
+            $this->cache[$key] = null;
         }
 
         return $this->cache[$key];
@@ -334,73 +282,30 @@
      *
      * @param boolean True on success, False on failure
      */
-    private function write_record($key, $data)
+    protected function write_record($key, $data)
     {
-        if (!$this->db) {
-            return false;
-        }
-
         // don't attempt to write too big data sets
         if (strlen($data) > $this->max_packet_size()) {
             trigger_error("rcube_cache: max_packet_size ($this->max_packet) exceeded for key $key. Tried to write " . strlen($data) . " bytes", E_USER_WARNING);
             return false;
         }
 
-        if ($this->type == 'memcache' || $this->type == 'apc') {
-            $result = $this->add_record($this->ckey($key), $data);
-
-            // make sure index will be updated
-            if ($result) {
-                if (!array_key_exists($key, $this->cache_sums)) {
-                    $this->cache_sums[$key] = true;
-                }
+        $result = $this->add_item($this->ckey($key), $data);
 
-                $this->load_index();
-
-                if (!$this->index_changed && !in_array($key, $this->index)) {
-                    $this->index_changed = true;
-                }
+        // make sure index will be updated
+        if ($result) {
+            if (!array_key_exists($key, $this->cache_sums)) {
+                $this->cache_sums[$key] = true;
             }
 
-            return $result;
-        }
-
-        $key_exists = array_key_exists($key, $this->cache_sums);
-        $key        = $this->prefix . '.' . $key;
-
-        // Remove NULL rows (here we don't need to check if the record exist)
-        if ($data == 'N;') {
-            $this->db->query(
-                "DELETE FROM {$this->table}".
-                " WHERE `user_id` = ? AND `cache_key` = ?",
-                $this->userid, $key);
-
-            return true;
-        }
+            $this->load_index();
 
-        // update existing cache record
-        if ($key_exists) {
-            $result = $this->db->query(
-                "UPDATE {$this->table}".
-                " SET `created` = " . $this->db->now().
-                    ", `expires` = " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL').
-                    ", `data` = ?".
-                " WHERE `user_id` = ?".
-                " AND `cache_key` = ?",
-                $data, $this->userid, $key);
-        }
-        // add new cache record
-        else {
-            // for better performance we allow more records for one key
-            // so, no need to check if record exist (see rcube_cache::read_record())
-            $result = $this->db->query(
-                "INSERT INTO {$this->table}".
-                " (`created`, `expires`, `user_id`, `cache_key`, `data`)".
-                " VALUES (" . $this->db->now() . ", " . ($this->ttl ? $this->db->now($this->ttl) : 'NULL') . ", ?, ?, ?)",
-                $this->userid, $key, $data);
+            if (!$this->index_changed && !in_array($key, $this->index)) {
+                $this->index_changed = true;
+            }
         }
 
-        return $this->db->affected_rows($result);
+        return $result;
     }
 
     /**
@@ -410,128 +315,80 @@
      * @param boolean $prefix_mode Enable it to clear all keys starting
      *                             with prefix specified in $key
      */
-    private function remove_record($key=null, $prefix_mode=false)
+    protected function remove_record($key = null, $prefix_mode = false)
     {
-        if (!$this->db) {
-            return;
-        }
-
-        if ($this->type != 'db') {
-            $this->load_index();
-
-            // Remove all keys
-            if ($key === null) {
-                foreach ($this->index as $key) {
-                    $this->delete_record($this->ckey($key));
-                }
+        $this->load_index();
 
-                $this->index = array();
-            }
-            // Remove keys by name prefix
-            else if ($prefix_mode) {
-                foreach ($this->index as $idx => $k) {
-                    if (strpos($k, $key) === 0) {
-                        $this->delete_record($this->ckey($k));
-                        unset($this->index[$idx]);
-                    }
-                }
-            }
-            // Remove one key by name
-            else {
-                $this->delete_record($this->ckey($key));
-                if (($idx = array_search($key, $this->index)) !== false) {
-                    unset($this->index[$idx]);
-                }
+        // Remove all keys
+        if ($key === null) {
+            foreach ($this->index as $key) {
+                $this->delete_item($this->ckey($key));
             }
 
-            $this->index_changed = true;
-
-            return;
-        }
-
-        // Remove all keys (in specified cache)
-        if ($key === null) {
-            $where = " AND `cache_key` LIKE " . $this->db->quote($this->prefix.'.%');
+            $this->index = array();
         }
         // Remove keys by name prefix
         else if ($prefix_mode) {
-            $where = " AND `cache_key` LIKE " . $this->db->quote($this->prefix.'.'.$key.'%');
+            foreach ($this->index as $idx => $k) {
+                if (strpos($k, $key) === 0) {
+                    $this->delete_item($this->ckey($k));
+                    unset($this->index[$idx]);
+                }
+            }
         }
         // Remove one key by name
         else {
-            $where = " AND `cache_key` = " . $this->db->quote($this->prefix.'.'.$key);
+            $this->delete_item($this->ckey($key));
+            if (($idx = array_search($key, $this->index)) !== false) {
+                unset($this->index[$idx]);
+            }
         }
 
-        $this->db->query(
-            "DELETE FROM {$this->table} WHERE `user_id` = ?" . $where,
-            $this->userid);
+        $this->index_changed = true;
     }
 
     /**
-     * Adds entry into memcache/apc DB.
+     * Fetches cache entry.
      *
-     * @param string $key  Cache key name
+     * @param string $key Cache internal key name
+     *
+     * @return mixed Cached value
+     */
+    protected function get_item($key)
+    {
+        // to be overwritten by engine class
+    }
+
+    /**
+     * Adds entry into memcache/apc/redis DB.
+     *
+     * @param string $key  Cache internal key name
      * @param mixed  $data Serialized cache data
      *
      * @param boolean True on success, False on failure
      */
-    private function add_record($key, $data)
+    protected function add_item($key, $data)
     {
-        if ($this->type == 'memcache') {
-            $result = $this->db->replace($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-
-            if (!$result) {
-                $result = $this->db->set($key, $data, MEMCACHE_COMPRESSED, $this->ttl);
-            }
-        }
-        else if ($this->type == 'apc') {
-            if (apc_exists($key)) {
-                apc_delete($key);
-            }
-
-            $result = apc_store($key, $data, $this->ttl);
-        }
-
-        if ($this->debug) {
-            $this->debug('set', $key, $data, $result);
-        }
-
-        return $result;
+        // to be overwritten by engine class
     }
 
     /**
-     * Deletes entry from memcache/apc DB.
+     * Deletes entry from memcache/apc/redis DB.
      *
-     * @param string $key Cache key name
+     * @param string $key Cache internal key name
      *
      * @param boolean True on success, False on failure
      */
-    private function delete_record($key)
+    protected function delete_item($key)
     {
-        if ($this->type == 'memcache') {
-            // #1488592: use 2nd argument
-            $result = $this->db->delete($key, 0);
-        }
-        else {
-            $result = apc_delete($key);
-        }
-
-        if ($this->debug) {
-            $this->debug('delete', $key, null, $result);
-        }
-
-        return $result;
+        // to be overwritten by engine class
     }
 
     /**
-     * Writes the index entry into memcache/apc DB.
+     * Writes the index entry into memcache/apc/redis DB.
      */
-    private function write_index()
+    protected function write_index()
     {
-        if (!$this->db || $this->type == 'db') {
-            return;
-        }
-
         $this->load_index();
 
         // Make sure index contains new keys
@@ -548,113 +405,93 @@
             }
         }
 
-        $data = serialize($this->index);
-        $this->add_record($this->ikey(), $data);
+        $data = serialize(array_values($this->index));
+
+        $this->add_item($this->ikey(), $data);
     }
 
     /**
-     * Gets the index entry from memcache/apc DB.
+     * Gets the index entry from memcache/apc/redis DB.
      */
-    private function load_index()
+    protected function load_index()
     {
-        if (!$this->db || $this->type == 'db') {
-            return;
-        }
-
         if ($this->index !== null) {
             return;
         }
 
-        $index_key = $this->ikey();
-
-        if ($this->type == 'memcache') {
-            $data = $this->db->get($index_key);
-        }
-        else if ($this->type == 'apc') {
-            $data = apc_fetch($index_key);
-        }
-
-        if ($this->debug) {
-            $this->debug('get', $index_key, $data);
-        }
-
+        $index_key   = $this->ikey();
+        $data        = $this->get_item($index_key);
         $this->index = $data ? unserialize($data) : array();
     }
 
     /**
-     * Creates per-user cache key name (for memcache and apc)
+     * Creates per-user cache key name (for memcache, apc, redis)
      *
      * @param string $key Cache key name
      *
      * @return string Cache key
      */
-    private function ckey($key)
+    protected function ckey($key)
     {
-        return sprintf('%d:%s:%s', $this->userid, $this->prefix, $key);
+        $key = $this->prefix . ':' . $key;
+
+        if ($this->userid) {
+            $key = $this->userid . ':' . $key;
+        }
+
+        return $key;
     }
 
     /**
-     * Creates per-user index cache key name (for memcache and apc)
+     * Creates per-user index cache key name (for memcache, apc, redis)
      *
      * @return string Cache key
      */
-    private function ikey()
+    protected function ikey()
     {
-        // This way each cache will have its own index
-        return sprintf('%d:%s%s', $this->userid, $this->prefix, 'INDEX');
+        $key = $this->prefix . 'INDEX';
+
+        if ($this->userid) {
+            $key = $this->userid . ':' . $key;
+        }
+
+        return $key;
     }
 
     /**
      * Serializes data for storing
      */
-    private function serialize($data)
+    protected function serialize($data)
     {
-        if ($this->type == 'db') {
-            return $this->db->encode($data, $this->packed);
-        }
-
         return $this->packed ? serialize($data) : $data;
     }
 
     /**
      * Unserializes serialized data
      */
-    private function unserialize($data)
+    protected function unserialize($data)
     {
-        if ($this->type == 'db') {
-            return $this->db->decode($data, $this->packed);
-        }
-
         return $this->packed ? @unserialize($data) : $data;
     }
 
     /**
      * Determine the maximum size for cache data to be written
      */
-    private function max_packet_size()
+    protected function max_packet_size()
     {
         if ($this->max_packet < 0) {
-            $this->max_packet = 2097152; // default/max is 2 MB
-
-            if ($this->type == 'db') {
-                if ($value = $this->db->get_variable('max_allowed_packet', $this->max_packet)) {
-                    $this->max_packet = $value;
-                }
-                $this->max_packet -= 2000;
-            }
-            else {
-                $max_packet = rcube::get_instance()->config->get($this->type . '_max_allowed_packet');
-                $this->max_packet = parse_bytes($max_packet) ?: $this->max_packet;
-            }
+            $config           = rcube::get_instance()->config;
+            $max_packet       = $config->get($this->type . '_max_allowed_packet');
+            $this->max_packet = parse_bytes($max_packet) ?: 2097152; // default/max is 2 MB
         }
 
         return $this->max_packet;
     }
 
     /**
-     * Write memcache/apc debug info to the log
+     * Write memcache/apc/redis debug info to the log
      */
-    private function debug($type, $key, $data = null, $result = null)
+    protected function debug($type, $key, $data = null, $result = null)
     {
         $line = strtoupper($type) . ' ' . $key;

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_charset.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_charset.php Changed

@@ -66,6 +66,111 @@
         'WINDOWS949'    => 'UHC',
     );
 
+    /**
+     * Windows codepages
+     *
+     * @var array
+     */
+    static public $windows_codepages = array(
+         37 => 'IBM037',    // IBM EBCDIC US-Canada
+        437 => 'IBM437',    // OEM United States
+        500 => 'IBM500',    // IBM EBCDIC International
+        708 => 'ASMO-708',  // Arabic (ASMO 708)
+        720 => 'DOS-720',   // Arabic (Transparent ASMO); Arabic (DOS)
+        737 => 'IBM737',    // OEM Greek (formerly 437G); Greek (DOS)
+        775 => 'IBM775',    // OEM Baltic; Baltic (DOS)
+        850 => 'IBM850',    // OEM Multilingual Latin 1; Western European (DOS)
+        852 => 'IBM852',    // OEM Latin 2; Central European (DOS)
+        855 => 'IBM855',    // OEM Cyrillic (primarily Russian)
+        857 => 'IBM857',    // OEM Turkish; Turkish (DOS)
+        858 => 'IBM00858',  // OEM Multilingual Latin 1 + Euro symbol
+        860 => 'IBM860',    // OEM Portuguese; Portuguese (DOS)
+        861 => 'IBM861',    // OEM Icelandic; Icelandic (DOS)
+        862 => 'DOS-862',   // OEM Hebrew; Hebrew (DOS)
+        863 => 'IBM863',    // OEM French Canadian; French Canadian (DOS)
+        864 => 'IBM864',    // OEM Arabic; Arabic (864)
+        865 => 'IBM865',    // OEM Nordic; Nordic (DOS)
+        866 => 'cp866',     // OEM Russian; Cyrillic (DOS)
+        869 => 'IBM869',    // OEM Modern Greek; Greek, Modern (DOS)
+        870 => 'IBM870',    // IBM EBCDIC Multilingual/ROECE (Latin 2); IBM EBCDIC Multilingual Latin 2
+        874 => 'windows-874',  // ANSI/OEM Thai (ISO 8859-11); Thai (Windows)
+        875 => 'cp875',     // IBM EBCDIC Greek Modern
+        932 => 'shift_jis', // ANSI/OEM Japanese; Japanese (Shift-JIS)
+        936 => 'gb2312',    // ANSI/OEM Simplified Chinese (PRC, Singapore); Chinese Simplified (GB2312)
+        950 => 'big5',      // ANSI/OEM Traditional Chinese (Taiwan; Hong Kong SAR, PRC); Chinese Traditional (Big5)
+        1026 => 'IBM1026',      // IBM EBCDIC Turkish (Latin 5)
+        1047 => 'IBM01047',     // IBM EBCDIC Latin 1/Open System
+        1140 => 'IBM01140',     // IBM EBCDIC US-Canada (037 + Euro symbol); IBM EBCDIC (US-Canada-Euro)
+        1141 => 'IBM01141',     // IBM EBCDIC Germany (20273 + Euro symbol); IBM EBCDIC (Germany-Euro)
+        1142 => 'IBM01142',     // IBM EBCDIC Denmark-Norway (20277 + Euro symbol); IBM EBCDIC (Denmark-Norway-Euro)
+        1143 => 'IBM01143',     // IBM EBCDIC Finland-Sweden (20278 + Euro symbol); IBM EBCDIC (Finland-Sweden-Euro)
+        1144 => 'IBM01144',     // IBM EBCDIC Italy (20280 + Euro symbol); IBM EBCDIC (Italy-Euro)
+        1145 => 'IBM01145',     // IBM EBCDIC Latin America-Spain (20284 + Euro symbol); IBM EBCDIC (Spain-Euro)
+        1146 => 'IBM01146',     // IBM EBCDIC United Kingdom (20285 + Euro symbol); IBM EBCDIC (UK-Euro)
+        1147 => 'IBM01147',     // IBM EBCDIC France (20297 + Euro symbol); IBM EBCDIC (France-Euro)
+        1148 => 'IBM01148',     // IBM EBCDIC International (500 + Euro symbol); IBM EBCDIC (International-Euro)
+        1149 => 'IBM01149',     // IBM EBCDIC Icelandic (20871 + Euro symbol); IBM EBCDIC (Icelandic-Euro)
+        1200 => 'UTF-16',       // Unicode UTF-16, little endian byte order (BMP of ISO 10646); available only to managed applications
+        1201 => 'UTF-16BE',     // Unicode UTF-16, big endian byte order; available only to managed applications
+        1250 => 'windows-1250', // ANSI Central European; Central European (Windows)
+        1251 => 'windows-1251', // ANSI Cyrillic; Cyrillic (Windows)
+        1252 => 'windows-1252', // ANSI Latin 1; Western European (Windows)
+        1253 => 'windows-1253', // ANSI Greek; Greek (Windows)
+        1254 => 'windows-1254', // ANSI Turkish; Turkish (Windows)
+        1255 => 'windows-1255', // ANSI Hebrew; Hebrew (Windows)
+        1256 => 'windows-1256', // ANSI Arabic; Arabic (Windows)
+        1257 => 'windows-1257', // ANSI Baltic; Baltic (Windows)
+        1258 => 'windows-1258', // ANSI/OEM Vietnamese; Vietnamese (Windows)
+        10000 => 'macintosh',   // MAC Roman; Western European (Mac)
+        12000 => 'UTF-32',      // Unicode UTF-32, little endian byte order; available only to managed applications
+        12001 => 'UTF-32BE',    // Unicode UTF-32, big endian byte order; available only to managed applications
+        20127 => 'US-ASCII',    // US-ASCII (7-bit)
+        20273 => 'IBM273',      // IBM EBCDIC Germany
+        20277 => 'IBM277',      // IBM EBCDIC Denmark-Norway
+        20278 => 'IBM278',      // IBM EBCDIC Finland-Sweden
+        20280 => 'IBM280',      // IBM EBCDIC Italy
+        20284 => 'IBM284',      // IBM EBCDIC Latin America-Spain
+        20285 => 'IBM285',      // IBM EBCDIC United Kingdom
+        20290 => 'IBM290',      // IBM EBCDIC Japanese Katakana Extended
+        20297 => 'IBM297',      // IBM EBCDIC France
+        20420 => 'IBM420',      // IBM EBCDIC Arabic
+        20423 => 'IBM423',      // IBM EBCDIC Greek
+        20424 => 'IBM424',      // IBM EBCDIC Hebrew
+        20838 => 'IBM-Thai',    // IBM EBCDIC Thai
+        20866 => 'koi8-r',      // Russian (KOI8-R); Cyrillic (KOI8-R)
+        20871 => 'IBM871',      // IBM EBCDIC Icelandic
+        20880 => 'IBM880',      // IBM EBCDIC Cyrillic Russian
+        20905 => 'IBM905',      // IBM EBCDIC Turkish
+        20924 => 'IBM00924',    // IBM EBCDIC Latin 1/Open System (1047 + Euro symbol)
+        20932 => 'EUC-JP',      // Japanese (JIS 0208-1990 and 0212-1990)
+        20936 => 'cp20936',     // Simplified Chinese (GB2312); Chinese Simplified (GB2312-80)
+        20949 => 'cp20949',     // Korean Wansung
+        21025 => 'cp1025',      // IBM EBCDIC Cyrillic Serbian-Bulgarian
+        21866 => 'koi8-u',      // Ukrainian (KOI8-U); Cyrillic (KOI8-U)
+        28591 => 'iso-8859-1',  // ISO 8859-1 Latin 1; Western European (ISO)
+        28592 => 'iso-8859-2',  // ISO 8859-2 Central European; Central European (ISO)
+        28593 => 'iso-8859-3',  // ISO 8859-3 Latin 3
+        28594 => 'iso-8859-4',  // ISO 8859-4 Baltic
+        28595 => 'iso-8859-5',  // ISO 8859-5 Cyrillic
+        28596 => 'iso-8859-6',  // ISO 8859-6 Arabic
+        28597 => 'iso-8859-7',  // ISO 8859-7 Greek
+        28598 => 'iso-8859-8',  // ISO 8859-8 Hebrew; Hebrew (ISO-Visual)
+        28599 => 'iso-8859-9',  // ISO 8859-9 Turkish
+        28603 => 'iso-8859-13', // ISO 8859-13 Estonian
+        28605 => 'iso-8859-15', // ISO 8859-15 Latin 9
+        38598 => 'iso-8859-8-i', // ISO 8859-8 Hebrew; Hebrew (ISO-Logical)
+        50220 => 'iso-2022-jp', // ISO 2022 Japanese with no halfwidth Katakana; Japanese (JIS)
+        50221 => 'csISO2022JP', // ISO 2022 Japanese with halfwidth Katakana; Japanese (JIS-Allow 1 byte Kana)
+        50222 => 'iso-2022-jp', // ISO 2022 Japanese JIS X 0201-1989; Japanese (JIS-Allow 1 byte Kana - SO/SI)
+        50225 => 'iso-2022-kr', // ISO 2022 Korean
+        51932 => 'EUC-JP',      // EUC Japanese
+        51936 => 'EUC-CN',      // EUC Simplified Chinese; Chinese Simplified (EUC)
+        51949 => 'EUC-KR',      // EUC Korean
+        52936 => 'hz-gb-2312',  // HZ-GB2312 Simplified Chinese; Chinese Simplified (HZ)
+        54936 => 'GB18030',     // Windows XP and later: GB18030 Simplified Chinese (4 byte); Chinese Simplified (GB18030)
+        65000 => 'UTF-7',
+        65001 => 'UTF-8',
+    );
 
     /**
      * Catch an error and throw an exception.
@@ -144,7 +249,7 @@
             else if (!empty($aliases[$m[1]])) {
                 $result = 'ISO-8859-'.$aliases[$m[1]];
             }
-            // iconv requires convertion of e.g. LATIN-1 to LATIN1
+            // iconv requires conversion of e.g. LATIN-1 to LATIN1
             else {
                 $result = $str;
             }
@@ -201,7 +306,9 @@
         }
 
         // convert charset using iconv module
-        if ($iconv_options !== false && $from != 'UTF7-IMAP' && $to != 'UTF7-IMAP') {
+        if ($iconv_options !== false && $from != 'UTF7-IMAP' && $to != 'UTF7-IMAP'
+            && $from !== 'ISO-2022-JP'
+        ) {
             // throw an exception if iconv reports an illegal character in input
             // it means that input string has been truncated
             set_error_handler(array('rcube_charset', 'error_handler'), E_NOTICE);
@@ -227,6 +334,7 @@
             $aliases = array(
                 'WINDOWS-1257' => 'ISO-8859-13',
                 'US-ASCII'     => 'ASCII',
+                'ISO-2022-JP'  => 'ISO-2022-JP-MS',
             );
 
             $mb_from = $aliases[$from] ?: $from;
@@ -265,9 +373,6 @@
                     return $out;
                 }
             }
-            else if ($from == 'ISO-8859-1' && function_exists('utf8_encode')) {
-                return utf8_encode($str);
-            }
         }
 
         // encode string for output
@@ -278,9 +383,6 @@
                     return $out;
                 }
             }
-            else if ($to == 'ISO-8859-1' && function_exists('utf8_decode')) {
-                return utf8_decode($str);
-            }
         }
 
         if (!isset($out)) {

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_config.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_config.php Changed

@@ -31,6 +31,7 @@
     private $prop      = array();
     private $errors    = array();
     private $userprefs = array();
+    private $immutable = array();
 
 
     /**
@@ -46,13 +47,14 @@
         'refresh_interval'     => 'keep_alive',
         'min_refresh_interval' => 'min_keep_alive',
         'messages_cache_ttl'   => 'message_cache_lifetime',
+        'mail_read_time'       => 'preview_pane_mark_read',
         'redundant_attachments_cache_ttl' => 'redundant_attachments_memcache_ttl',
     );
 
     /**
      * Object constructor
      *
-     * @param string Environment suffix for config files to load
+     * @param string $env Environment suffix for config files to load
      */
     public function __construct($env = '')
     {
@@ -98,7 +100,7 @@
      *
      * Look inside the string to determine what type might be best as a container.
      *
-     * @param $value The value to inspect
+     * @param mixed $value The value to inspect
      *
      * @return The guess at the type.
      */
@@ -108,13 +110,13 @@
 
         // array requires hint to be passed.
 
-        if (preg_match('/^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$/', $value) !== false) {
+        if (preg_match('/^[-+]?(\d+(\.\d*)?|\.\d+)([eE][-+]?\d+)?$/', $value)) {
             $type = 'double';
         }
-        else if (preg_match('/^\d+$/', $value) !== false) {
+        else if (preg_match('/^\d+$/', $value)) {
             $type = 'integer';
         }
-        else if (preg_match('/(t(rue)?)|(f(alse)?)/i', $value) !== false) {
+        else if (preg_match('/^(t(rue)?)|(f(alse)?)$/i', $value)) {
             $type = 'boolean';
         }
 
@@ -126,8 +128,8 @@
      *
      * Perform an appropriate parsing of the string to create the desired PHP type.
      *
-     * @param $string String to parse into PHP type
-     * @param $type   Type of value to return
+     * @param string $string String to parse into PHP type
+     * @param string $type   Type of value to return
      *
      * @return Appropriately typed interpretation of $string.
      */
@@ -168,9 +170,9 @@
      * Retrieve an environment variable's value or if it's not found, return the
      * provided default value.
      *
-     * @param $varname       Environment variable name
-     * @param $default_value Default value to return if necessary
-     * @param $type          Type of value to return
+     * @param string $varname       Environment variable name
+     * @param mixed  $default_value Default value to return if necessary
+     * @param string $type          Type of value to return
      *
      * @return Value of the environment variable or default if not found.
      */
@@ -190,8 +192,6 @@
 
     /**
      * Load config from local config file
-     *
-     * @todo Remove global $CONFIG
      */
     private function load()
     {
@@ -245,25 +245,16 @@
         }
 
         // set PHP error logging according to config
-        if ($this->prop['debug_level'] & 1) {
-            ini_set('log_errors', 1);
+        $error_log = $this->prop['log_driver'];
+        if ($error_log != 'syslog') {
+            $error_log  = $this->prop['log_dir'] . '/errors';
+            $error_log .= isset($this->prop['log_file_ext']) ? $this->prop['log_file_ext'] : '.log';
 
-            if ($this->prop['log_driver'] == 'syslog') {
-                ini_set('error_log', 'syslog');
-            }
-            else {
-                ini_set('error_log', $this->prop['log_dir'].'/errors');
-            }
+            ini_set('error_log', $error_log);
         }
 
-        // enable display_errors in 'show' level, but not for ajax requests
-        ini_set('display_errors', intval(empty($_REQUEST['_remote']) && ($this->prop['debug_level'] & 4)));
-
         // remove deprecated properties
         unset($this->prop['dst_active']);
-
-        // export config data
-        $GLOBALS['CONFIG'] = &$this->prop;
     }
 
     /**
@@ -302,6 +293,7 @@
      * and merge with the already stored config values
      *
      * @param string $file Name of the config file to be loaded
+     *
      * @return booelan True on success, false on failure
      */
     public function load_from_file($file)
@@ -334,9 +326,10 @@
      * Helper method to resolve absolute paths to the given config file.
      * This also takes the 'env' property into account.
      *
-     * @param string  Filename or absolute file path
-     * @param boolean Return -$env file path if exists
-     * @return array  List of candidates in config dir path(s)
+     * @param string  $file    Filename or absolute file path
+     * @param boolean $use_env Return -$env file path if exists
+     *
+     * @return array List of candidates in config dir path(s)
      */
     public function resolve_paths($file, $use_env = true)
     {
@@ -372,6 +365,7 @@
      *
      * @param  string $name Parameter name
      * @param  mixed  $def  Default value if not set
+     *
      * @return mixed  The requested config value
      */
     public function get($name, $def = null)
@@ -393,7 +387,9 @@
         }
         else if ($name == 'client_mimetypes') {
             if (!$result && !$def) {
-                $result = 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash';
+                $result = 'text/plain,text/html,text/xml'
+                    . ',image/jpeg,image/gif,image/png,image/bmp,image/tiff,image/webp'
+                    . ',application/x-javascript,application/pdf,application/x-shockwave-flash';
             }
             if ($result && is_string($result)) {
                 $result = explode(',', $result);
@@ -409,12 +405,17 @@
     /**
      * Setter for a config parameter
      *
-     * @param string $name  Parameter name
-     * @param mixed  $value Parameter value
+     * @param string $name      Parameter name
+     * @param mixed  $value     Parameter value
+     * @param bool   $immutable Make the value immutable
      */
-    public function set($name, $value)
+    public function set($name, $value, $immutable = false)
     {
         $this->prop[$name] = $value;
+
+        if ($immutable) {
+            $this->immutable[$name] = $value;
+        }
     }
 
     /**
@@ -425,7 +426,7 @@
     public function merge($prefs)
     {
         $prefs = $this->fix_legacy_props($prefs);
-        $this->prop = array_merge($this->prop, $prefs, $this->userprefs);
+        $this->prop = array_merge($this->prop, $prefs, $this->userprefs, $this->immutable);
     }
 
     /**
@@ -458,7 +459,7 @@
     /**
      * Getter for all config options
      *
-     * @return array  Hash array containing all config properties
+     * @return array Hash array containing all config properties
      */
     public function all()
     {
@@ -478,7 +479,7 @@
     /**
      * Special getter for user's timezone offset including DST
      *
-     * @return float  Timezone offset (in hours)
+     * @return float Timezone offset (in hours)
      * @deprecated
      */
     public function get_timezone()
@@ -530,6 +531,7 @@
      * Try to autodetect operating system and find the correct line endings
      *
      * @return string The appropriate mail header delimiter
+     * @deprecated Since 1.3 we don't use mail()
      */
     public function header_delimiter()
     {
@@ -564,6 +566,7 @@
      *
      * @param string  $host   IMAP host
      * @param boolean $encode If true, domain name will be converted to IDN ASCII
+     *
      * @return string Resolved SMTP host
      */
     public function mail_domain($host, $encode=true)
@@ -644,6 +647,18 @@
             }
         }
 
+        // translate old `preview_pane` settings to `layout`
+        if (isset($props['preview_pane']) && !isset($props['layout'])) {
+            $props['layout'] = $props['preview_pane'] ? 'desktop' : 'list';
+            unset($props['preview_pane']);
+        }
+
+        // translate old `display_version` settings to `display_product_info`
+        if (isset($props['display_version']) && !isset($props['display_product_info'])) {
+            $props['display_product_info'] = $props['display_version'] ? 2 : 1;
+            unset($props['display_version']);
+        }
+
         return $props;
     }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_contacts.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_contacts.php Changed

@@ -68,7 +68,7 @@
      * Object constructor
      *
      * @param object  $dbconn Instance of the rcube_db class
-     * @param integer $user User-ID
+     * @param integer $user   User-ID
      */
     function __construct($dbconn, $user)
     {
@@ -88,7 +88,7 @@
     /**
      * Save a search string for future listings
      *
-     * @param string SQL params to use in listing method
+     * @param string $filter SQL params to use in listing method
      */
     function set_search_set($filter)
     {
@@ -199,7 +199,7 @@
      * @param  int     Only return this number of records, use negative values for tail
      * @param  boolean True to skip the count query (select only)
      *
-     * @return array  Indexed list of contact records, each a hash array
+     * @return array Indexed list of contact records, each a hash array
      */
     function list_records($cols = null, $subset = 0, $nocount = false)
     {
@@ -234,7 +234,7 @@
             " WHERE c.`del` <> 1" .
                 " AND c.`user_id` = ?" .
                 ($this->group_id ? " AND m.`contactgroup_id` = ?" : "").
-                ($this->filter ? " AND (".$this->filter.")" : "") .
+                ($this->filter ? " AND ".$this->filter : "") .
             " ORDER BY ". $this->db->concat($order_cols) .
             " " . $this->sort_order,
             $start_row,
@@ -308,25 +308,13 @@
             foreach ((array)$fields as $idx => $col) {
                 $val = $value[$idx];
 
-                if (!strlen($val))
+                if (!strlen($val)) {
                     continue;
+                }
 
                 // table column
                 if (in_array($col, $this->table_cols)) {
-                    switch ($mode) {
-                    case 1: // strict
-                        $where[] = '(' . $this->db->quote_identifier($col) . ' = ' . $this->db->quote($val)
-                            . ' OR ' . $this->db->ilike($col, $val . $AS . '%')
-                            . ' OR ' . $this->db->ilike($col, '%' . $AS . $val . $AS . '%')
-                            . ' OR ' . $this->db->ilike($col, '%' . $AS . $val) . ')';
-                        break;
-                    case 2: // prefix
-                        $where[] = '(' . $this->db->ilike($col, $val . '%')
-                            . ' OR ' . $this->db->ilike($col, $AS . $val . '%') . ')';
-                        break;
-                    default: // partial
-                        $where[] = $this->db->ilike($col, '%' . $val . '%');
-                    }
+                    $where[] = $this->fulltext_sql_where($val, $mode, $col);
                 }
                 // vCard field
                 else {
@@ -354,7 +342,7 @@
         }
 
         foreach (array_intersect($required, $this->table_cols) as $col) {
-            $and_where[] = $this->db->quote_identifier($col).' <> '.$this->db->quote('');
+            $where[] = $this->db->quote_identifier($col).' <> '.$this->db->quote('');
         }
         $required = array_diff($required, $this->table_cols);
 
@@ -363,9 +351,6 @@
             $where = join(" AND ", $where);
         }
 
-        if (!empty($and_where))
-            $where = ($where ? "($where) AND " : '') . join(' AND ', $and_where);
-
         // Post-searching in vCard data fields
         // we will search in all records and then build a where clause for their IDs
         if (!empty($post_search) || !empty($required)) {
@@ -379,7 +364,7 @@
             // count result pages
             $cnt   = $this->count()->count;
             $pages = ceil($cnt / $this->page_size);
-            $scnt  = count($post_search);
+            $scnt  = !empty($post_search) ? count($post_search) : 0;
 
             // get (paged) result
             for ($i=0; $i<$pages; $i++) {
@@ -502,7 +487,7 @@
 
         // count contacts for this user
         $sql_result = $this->db->query(
-            "SELECT COUNT(c.`contact_id`) AS rows".
+            "SELECT COUNT(c.`contact_id`) AS cnt".
             " FROM " . $this->db->table_name($this->db_name, true) . " AS c".
                 $join.
             " WHERE c.`del` <> 1".
@@ -515,7 +500,7 @@
 
         $sql_arr = $this->db->fetch_assoc($sql_result);
 
-        $this->cache['count'] = (int) $sql_arr['rows'];
+        $this->cache['count'] = (int) $sql_arr['cnt'];
 
         return $this->cache['count'];
     }
@@ -600,8 +585,8 @@
      * Check the given data before saving.
      * If input not valid, the message to display can be fetched using get_error()
      *
-     * @param array   $save_data Associative array with data to save
-     * @param boolean $autofix   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.
      */
@@ -610,9 +595,12 @@
         // validate e-mail addresses
         $valid = parent::validate($save_data, $autofix);
 
-        // require at least one email address or a name
-        if ($valid && !strlen($save_data['firstname'].$save_data['surname'].$save_data['name']) && !array_filter($this->get_col_values('email', $save_data, true))) {
-            $this->set_error(self::ERROR_VALIDATE, 'noemailwarning');
+        // require at least some name or email
+        if ($valid
+            && !strlen($save_data['firstname'].$save_data['surname'].$save_data['name'])
+            && !count(array_filter($this->get_col_values('email', $save_data, true)))
+        ) {
+            $this->set_error(self::ERROR_VALIDATE, 'nonamewarning');
             $valid = false;
         }
 
@@ -998,8 +986,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 $ids      List of contact identifiers to be removed
      *
      * @return int Number of deleted group members
      */

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_db.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_db.php Changed

@@ -47,6 +47,8 @@
         // column/table quotes
         'identifier_start' => '"',
         'identifier_end'   => '"',
+        // date/time input format
+        'datetime_format'  => 'Y-m-d H:i:s',
     );
 
     const DEBUG_LINE_LENGTH = 4096;
@@ -133,7 +135,6 @@
 
         // connect to database
         if ($dbh = $this->conn_create($dsn)) {
-            $this->dbh          = $dbh;
             $this->dbhs[$mode]  = $dbh;
             $this->db_mode      = $mode;
             $this->db_connected = true;
@@ -158,12 +159,12 @@
 
             $this->conn_prepare($dsn);
 
-            $dbh = new PDO($dsn_string, $dsn['username'], $dsn['password'], $dsn_options);
+            $this->dbh = new PDO($dsn_string, $dsn['username'], $dsn['password'], $dsn_options);
 
             // don't throw exceptions or warnings
-            $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
+            $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_SILENT);
 
-            $this->conn_configure($dsn, $dbh);
+            $this->conn_configure($dsn, $this->dbh);
         }
         catch (Exception $e) {
             $this->db_error     = true;
@@ -176,7 +177,7 @@
             return null;
         }
 
-        return $dbh;
+        return $this->dbh;
     }
 
     /**
@@ -201,7 +202,7 @@
     /**
      * Connect to appropriate database depending on the operation
      *
-     * @param string $mode Connection mode (r|w)
+     * @param string  $mode  Connection mode (r|w)
      * @param boolean $force Enforce using the given mode
      */
     public function db_connect($mode, $force = false)
@@ -522,9 +523,10 @@
 
     /**
      * Helper method to handle DB errors.
-     * This by default logs the error but could be overriden by a driver implementation
+     * This by default logs the error but could be overridden by a driver implementation
+     *
+     * @param string $query Query that triggered the error
      *
-     * @param string Query that triggered the error
      * @return mixed Result to be stored and returned
      */
     protected function handle_error($query)
@@ -535,10 +537,12 @@
             $this->db_error = true;
             $this->db_error_msg = sprintf('[%s] %s', $error[1], $error[2]);
 
-            rcube::raise_error(array('code' => 500, 'type' => 'db',
-                'line' => __LINE__, 'file' => __FILE__,
-                'message' => $this->db_error_msg . " (SQL Query: $query)"
-                ), true, false);
+            if (empty($this->options['ignore_errors'])) {
+                rcube::raise_error(array(
+                        'code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__,
+                        'message' => $this->db_error_msg . " (SQL Query: $query)"
+                    ), true, false);
+            }
         }
 
         return false;
@@ -567,7 +571,8 @@
      * If no query handle is specified, the last query will be taken as reference
      *
      * @param mixed $result Optional query handle
-     * @return mixed   Number of rows or false on failure
+     *
+     * @return mixed Number of rows or false on failure
      * @deprecated This method shows very poor performance and should be avoided.
      */
     public function num_rows($result = null)
@@ -774,6 +779,16 @@
     }
 
     /**
+     * Release resources related to the last query result.
+     * When we know we don't need to access the last query result we can destroy it
+     * and release memory. Useful especially if the query returned big chunk of data.
+     */
+    public function reset()
+    {
+        $this->last_result = null;
+    }
+
+    /**
      * Terminate database connection.
      */
     public function closeConnection()
@@ -806,6 +821,10 @@
             return 'NULL';
         }
 
+        if ($input instanceof DateTime) {
+            return $this->quote($input->format($this->options['datetime_format']));
+        }
+
         if ($type == 'ident') {
             return $this->quote_identifier($input);
         }
@@ -958,10 +977,11 @@
      * @param int $timestamp Unix timestamp
      *
      * @return string Date string in db-specific format
+     * @deprecated
      */
     public function fromunixtime($timestamp)
     {
-        return date("'Y-m-d H:i:s'", $timestamp);
+        return $this->quote(date($this->options['datetime_format'], $timestamp));
     }
 
     /**
@@ -1102,8 +1122,8 @@
     /**
      * Set DSN connection to be used for the given table
      *
-     * @param string Table name
-     * @param string DSN connection ('r' or 'w') to be used
+     * @param string $table Table name
+     * @param string $mode  DSN connection ('r' or 'w') to be used
      */
     public function set_table_dsn($table, $mode)
     {
@@ -1299,7 +1319,7 @@
     /**
      * Execute the given SQL script
      *
-     * @param string SQL queries to execute
+     * @param string $sql SQL queries to execute
      *
      * @return boolen True on success, False on error
      */
@@ -1307,19 +1327,32 @@
     {
         $sql  = $this->fix_table_names($sql);
         $buff = '';
+        $exec = '';
 
         foreach (explode("\n", $sql) as $line) {
-            if (preg_match('/^--/', $line) || trim($line) == '')
+            $trimmed = trim($line);
+            if ($trimmed == '' || preg_match('/^--/', $trimmed)) {
                 continue;
+            }
 
-            $buff .= $line . "\n";
-            if (preg_match('/(;|^GO)$/', trim($line))) {
-                $this->query($buff);
+            if ($trimmed == 'GO') {
+                $exec = $buff;
+            }
+            else if ($trimmed[strlen($trimmed)-1] == ';') {
+                $exec = $buff . substr(rtrim($line), 0, -1);
+            }
+
+            if ($exec) {
+                $this->query($exec);
                 $buff = '';
+                $exec = '';
                 if ($this->db_error) {
                     break;
                 }
             }
+            else {
+                $buff .= $line . "\n";
+            }
         }
 
         return !$this->db_error;

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_html2text.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_html2text.php Changed

@@ -234,7 +234,7 @@
         '-',
         '*',
         'Â£',
-        'EUR',                                  // Euro sign.  ?
+        'EUR',                                  // Euro sign. â¬
         '|+|amp|+|',                            // Ampersand: see _converter()
         ' ',                                    // Runs of spaces, post-handling
     );
@@ -328,10 +328,10 @@
      * will instantiate with that source propagated, all that has
      * to be done it to call get_text().
      *
-     * @param string $source HTML content
+     * @param string  $source    HTML content
      * @param boolean $from_file Indicates $source is a file to pull content from
-     * @param boolean $do_links Indicate whether a table of link URLs is desired
-     * @param integer $width Maximum width of the formatted text, 0 for no limit
+     * @param boolean $do_links  Indicate whether a table of link URLs is desired
+     * @param integer $width     Maximum width of the formatted text, 0 for no limit
      */
     function __construct($source = '', $from_file = false, $do_links = true, $width = 75, $charset = 'UTF-8')
     {
@@ -349,7 +349,7 @@
     /**
      * Loads source HTML into memory, either from $source string or a file.
      *
-     * @param string $source HTML content
+     * @param string  $source    HTML content
      * @param boolean $from_file Indicates $source is a file to pull content from
      */
     function set_html($source, $from_file = false)
@@ -454,7 +454,7 @@
      * and newlines to a readable format, and word wraps the text to
      * $width characters.
      *
-     * @param string Reference to HTML content string
+     * @param string &$text Reference to HTML content string
      */
     protected function _converter(&$text)
     {
@@ -512,12 +512,12 @@
      * appeared. Also makes an effort at identifying and handling absolute
      * and relative links.
      *
-     * @param string $link URL of the link
+     * @param string $link    URL of the link
      * @param string $display Part of the text to associate number with
      */
     protected function _build_link_list($link, $display)
     {
-        if (!$this->_do_links || empty($link)) {
+        if (empty($link)) {
             return $display;
         }
 
@@ -542,6 +542,19 @@
             $url .= "$link";
         }
 
+        if (!$this->_do_links) {
+            // When not using link list use URL if there's no content (#5795)
+            // The content here is HTML, convert it to text first
+            $h2t     = new rcube_html2text($display, false, false, 1024, $this->charset);
+            $display = $h2t->get_text();
+
+            if (empty($display) && preg_match('!^([a-z][a-z0-9.+-]+://)!i', $link)) {
+                return $link;
+            }
+
+            return $display;
+        }
+
         if (($index = array_search($url, $this->_link_list)) === false) {
             $index = count($this->_link_list);
             $this->_link_list[] = $url;
@@ -553,7 +566,7 @@
     /**
      * Helper function for PRE body conversion.
      *
-     * @param string HTML content
+     * @param string &$text HTML content
      */
     protected function _convert_pre(&$text)
     {
@@ -581,7 +594,7 @@
     /**
      * Helper function for BLOCKQUOTE body conversion.
      *
-     * @param string HTML content
+     * @param string &$text HTML content
      */
     protected function _convert_blockquotes(&$text)
     {
@@ -623,7 +636,7 @@
 
                     // Add citation markers and create <pre> block
                     $body = preg_replace_callback('/((?:^|\n)>*)([^\n]*)/', array($this, 'blockquote_citation_callback'), trim($body));
-                    $body = '<pre>' . htmlspecialchars($body) . '</pre>';
+                    $body = '<pre>' . htmlspecialchars($body, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE, $this->charset) . '</pre>';
 
                     $text = substr_replace($text, $body . "\n", $start, $end + 13 - $start);
                     $offset = 0;
@@ -653,7 +666,7 @@
     /**
      * Callback function for preg_replace_callback use.
      *
-     * @param  array PREG matches
+     * @param array $matches PREG matches
      * @return string
      */
     public function tags_preg_callback($matches)
@@ -676,7 +689,7 @@
     /**
      * Callback function for preg_replace_callback use in PRE content handler.
      *
-     * @param array PREG matches
+     * @param array $matches PREG matches
      * @return string
      */
     public function pre_preg_callback($matches)
@@ -692,7 +705,7 @@
      */
     private function _toupper($str)
     {
-        // string can containg HTML tags
+        // string can containing HTML tags
         $chunks = preg_split('/(<[^>]*>)/', $str, null, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
 
         // convert toupper only the text between HTML tags

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_image.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_image.php Changed

@@ -62,8 +62,8 @@
         if (function_exists('getimagesize') && ($imsize = @getimagesize($this->image_file))) {
             $width   = $imsize[0];
             $height  = $imsize[1];
-            $gd_type = $imsize['2'];
-            $type    = image_type_to_extension($imsize['2'], false);
+            $gd_type = $imsize[2];
+            $type    = image_type_to_extension($gd_type, false);
             $channels = $imsize['channels'];
         }
 
@@ -211,11 +211,11 @@
                 $image = imagecreatefromjpeg($this->image_file);
                 $type  = 'jpg';
             }
-            else if($props['gd_type'] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) {
+            else if ($props['gd_type'] == IMAGETYPE_GIF && function_exists('imagecreatefromgif')) {
                 $image = imagecreatefromgif($this->image_file);
                 $type  = 'gif';
             }
-            else if($props['gd_type'] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')) {
+            else if ($props['gd_type'] == IMAGETYPE_PNG && function_exists('imagecreatefrompng')) {
                 $image = imagecreatefrompng($this->image_file);
                 $type  = 'png';
             }
@@ -256,9 +256,9 @@
                 imagecopyresampled($new_image, $image, 0, 0, 0, 0, $width, $height, $props['width'], $props['height']);
                 $image = $new_image;
 
-                // fix rotation of image if EXIF data exists and specifies rotation (GD strips the EXIF data)
+                // fix orientation of image if EXIF data exists and specifies orientation (GD strips the EXIF data)
                 if ($this->image_file && $type == 'jpg' && function_exists('exif_read_data')) {
-                    $exif = exif_read_data($this->image_file);
+                    $exif = @exif_read_data($this->image_file);
                     if ($exif && $exif['Orientation']) {
                         switch ($exif['Orientation']) {
                             case 3:
@@ -360,7 +360,6 @@
             return false;
         }
 
-
         if ($props['gd_type']) {
             if ($props['gd_type'] == IMAGETYPE_JPEG && function_exists('imagecreatefromjpeg')) {
                 $image = imagecreatefromjpeg($this->image_file);

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_imap.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_imap.php Changed

@@ -152,6 +152,9 @@
                 $pass = $data['pass'];
             }
 
+            // Handle per-host socket options
+            rcube_utils::parse_socket_options($data['socket_options'], $data['host']);
+
             $this->conn->connect($data['host'], $data['user'], $pass, $data);
         } while(!$this->conn->connected() && $data['retry']);
 
@@ -186,8 +189,8 @@
         // write error log
         else if ($this->conn->error) {
             if ($pass && $user) {
-                $message = sprintf("Login failed for %s from %s. %s",
-                    $user, rcube_utils::remote_ip(), $this->conn->error);
+                $message = sprintf("Login failed for %s against %s from %s. %s",
+                    $user, $host, rcube_utils::remote_ip(), $this->conn->error);
 
                 rcube::raise_error(array('code' => 403, 'type' => 'imap',
                     'file' => __FILE__, 'line' => __LINE__,
@@ -305,7 +308,7 @@
 
     /**
      * Set internal folder reference.
-     * All operations will be perfomed on this folder.
+     * All operations will be performed on this folder.
      *
      * @param string $folder Folder name
      */
@@ -377,7 +380,12 @@
                 return false;
             }
 
-            $_SESSION[$sess_key] = $this->conn->getCapability($cap);
+            if ($cap == rcube_storage::DUAL_USE_FOLDERS) {
+                $_SESSION[$sess_key] = $this->detect_dual_use_folders();
+            }
+            else {
+                $_SESSION[$sess_key] = $this->conn->getCapability($cap);
+            }
         }
 
         return $_SESSION[$sess_key];
@@ -958,7 +966,7 @@
 
     /**
      * protected method for setting threaded messages flags:
-     * depth, has_children and unread_children
+     * depth, has_children, unread_children, flagged_children
      *
      * @param array               $headers  Reference to headers array indexed by message UID
      * @param rcube_result_thread $threads  Threads data object
@@ -977,8 +985,12 @@
 
             if (!empty($parents)) {
                 $headers[$uid]->parent_uid = end($parents);
-                if (empty($header->flags['SEEN']))
+                if (empty($header->flags['SEEN'])) {
                     $headers[$parents[0]]->unread_children++;
+                }
+                if (!empty($header->flags['FLAGGED'])) {
+                    $headers[$parents[0]]->flagged_children++;
+                }
             }
             array_push($parents, $uid);
 
@@ -1378,8 +1390,7 @@
                     $index  = new rcube_result_index($folder, '* ESEARCH ALL ' . $search);
                 }
                 else {
-                    $index = $this->index_direct($folder, $this->search_charset,
-                        $this->sort_field, $this->search_set);
+                    $index = $this->index_direct($folder, $this->sort_field, $this->sort_order, $this->search_set);
                 }
             }
 
@@ -2098,7 +2109,10 @@
 
         if (is_array($part[$di]) && count($part[$di]) == 2) {
             $struct->disposition = strtolower($part[$di][0]);
-
+            if ($struct->disposition && $struct->disposition !== 'inline' && $struct->disposition !== 'attachment') {
+                // RFC2183, Section 2.8 - unrecognized type should be treated as "attachment"
+                $struct->disposition = 'attachment';
+            }
             if (is_array($part[$di][1])) {
                 for ($n=0; $n<count($part[$di][1]); $n+=2) {
                     $struct->d_parameters[strtolower($part[$di][1][$n])] = $part[$di][1][$n+1];
@@ -2483,13 +2497,12 @@
 
             // clear cached counters
             if ($flag == 'SEEN' || $flag == 'UNSEEN') {
-                $this->clear_messagecount($folder, 'SEEN');
-                $this->clear_messagecount($folder, 'UNSEEN');
+                $this->clear_messagecount($folder, array('SEEN', 'UNSEEN'));
             }
             else if ($flag == 'DELETED' || $flag == 'UNDELETED') {
-                $this->clear_messagecount($folder, 'DELETED');
-                // remove cached messages
+                $this->clear_messagecount($folder, array('ALL', 'THREADS'));
                 if ($this->options['skip_deleted']) {
+                    // remove cached messages
                     $this->clear_message_cache($folder, $all_mode ? null : explode(',', $uids));
                 }
             }
@@ -2791,7 +2804,7 @@
 
 
     /* --------------------------------
-     *        folder managment
+     *        folder management
      * --------------------------------*/
 
     /**
@@ -2918,12 +2931,17 @@
         else {
             // unsubscribe non-existent folders, remove them from the list
             if (!empty($result) && $name == '*') {
-                $existing    = $this->list_folders($root, $name);
-                $nonexisting = array_diff($result, $existing);
-                $result      = array_diff($result, $nonexisting);
+                $existing = $this->list_folders($root, $name);
+
+                // Try to make sure the list of existing folders is not malformed,
+                // we don't want to unsubscribe existing folders on error
+                if (is_array($existing) && (!empty($root) || count($existing) > 1)) {
+                    $nonexisting = array_diff($result, $existing);
+                    $result      = array_diff($result, $nonexisting);
 
-                foreach ($nonexisting as $folder) {
-                    $this->conn->unsubscribe($folder);
+                    foreach ($nonexisting as $folder) {
+                        $this->conn->unsubscribe($folder);
+                    }
                 }
             }
         }
@@ -3202,15 +3220,22 @@
      * @param string  $folder    New folder name
      * @param boolean $subscribe True if the new folder should be subscribed
      * @param string  $type      Optional folder type (junk, trash, drafts, sent, archive)
+     * @param boolean $noselect  Make the folder a \NoSelect folder by adding hierarchy
+     *                           separator at the end (useful for server that do not support
+     *                           both folders and messages as folder children)
      *
      * @return boolean True on success
      */
-    public function create_folder($folder, $subscribe = false, $type = null)
+    public function create_folder($folder, $subscribe = false, $type = null, $noselect = false)
     {
         if (!$this->check_connection()) {
             return false;
         }
 
+        if ($noselect) {
+            $folder .= $this->delimiter;
+        }
+
         $result = $this->conn->createFolder($folder, $type ? array("\\" . ucfirst($type)) : null);
 
         // try to subscribe it
@@ -3218,7 +3243,7 @@
             // clear cache
             $this->clear_cache('mailboxes', true);
 
-            if ($subscribe) {
+            if ($subscribe && !$noselect) {
                 $this->subscribe($folder);
             }
         }
@@ -3292,7 +3317,7 @@
      *
      * @return boolean True on success, False on failure
      */
-    function delete_folder($folder)
+    public function delete_folder($folder)
     {
         if (!$this->check_connection()) {
             return false;
@@ -3715,6 +3740,35 @@
     }
 
     /**
+     * Check if the folder name is valid
+     *
+     * @param string $folder Folder name (UTF-8)
+     * @param string &$char  First forbidden character found
+     *
+     * @return bool True if the name is valid, False otherwise
+     */
+    public function folder_validate($folder, &$char = null)
+    {
+        if (parent::folder_validate($folder, $char)) {
+            $vendor = $this->get_vendor();
+            $regexp = '\\x00-\\x1F\\x7F%*';
+
+            if ($vendor == 'cyrus') {
+                // List based on testing Kolab's Cyrus-IMAP 2.5
+                $regexp .= '!`@(){}|\\?<;"';
+            }
+
+            if (!preg_match("/[$regexp]/", $folder, $m)) {
+                return true;
+            }
+
+            $char = $m[0];
+        }
+
+        return false;
+    }
+
+    /**
      * Get message header names for rcube_imap_generic::fetchHeader(s)
      *
      * @return string Space-separated list of header names
@@ -4170,6 +4224,38 @@
      * --------------------------------*/
 
     /**
+     * Determines if server supports dual use folders (those can
+     * contain both sub-folders and messages).
+     *
+     * @return bool
+     */
+    protected function detect_dual_use_folders()
+    {
+        $val = rcube::get_instance()->config->get('imap_dual_use_folders');
+        if ($val !== null) {
+            return (bool) $val;
+        }
+
+        if (!$this->check_connection()) {
+            return false;
+        }
+
+        $folder    = str_replace('.', '', 'foldertest' . microtime(true));
+        $folder    = $this->mod_folder($folder, 'in');
+        $subfolder = $folder . $this->delimiter . 'foldertest';
+
+        if ($this->conn->createFolder($folder)) {
+            if ($created = $this->conn->createFolder($subfolder)) {
+                $this->conn->deleteFolder($subfolder);
+            }
+
+            $this->conn->deleteFolder($folder);
+
+            return $created;
+        }
+    }
+
+    /**
      * Validate the given input and save to local properties
      *
      * @param string $sort_field Sort column
@@ -4234,7 +4320,7 @@
      */
     protected function sort_folder_specials($folder, &$list, &$specials, &$out)
     {
-        while (list($key, $name) = each($list)) {
+        foreach ($list as $key => $name) {
             if ($folder === null || strpos($name, $folder.$this->delimiter) === 0) {
                 $out[] = $name;
                 unset($list[$key]);
@@ -4255,6 +4341,17 @@
      */
     protected function sort_folder_comparator($str1, $str2)
     {
+        if ($this->sort_folder_collator === null) {
+            $this->sort_folder_collator = false;
+
+            // strcoll() does not work with UTF8 locale on Windows,
+            // use Collator from the intl extension
+            if (stripos(PHP_OS, 'win') === 0 && function_exists('collator_compare')) {
+                $locale = $this->options['language'] ?: 'en_US';
+                $this->sort_folder_collator = collator_create($locale) ?: false;
+            }
+        }
+
         $path1 = explode($this->delimiter, $str1);
         $path2 = explode($this->delimiter, $str2);
 
@@ -4265,6 +4362,10 @@
                 continue;
             }
 
+            if ($this->sort_folder_collator) {
+                return collator_compare($this->sort_folder_collator, $folder1, $folder2);
+            }
+
             return strcoll($folder1, $folder2);
         }
     }
@@ -4349,13 +4450,15 @@
     /**
      * Remove messagecount of a specific folder from cache
      */
-    protected function clear_messagecount($folder, $mode=null)
+    protected function clear_messagecount($folder, $mode = array())
     {
         $a_folder_cache = $this->get_cache('messagecount');
 
         if (is_array($a_folder_cache[$folder])) {
-            if ($mode) {
-                unset($a_folder_cache[$folder][$mode]);
+            if (!empty($mode)) {
+                foreach ((array) $mode as $key) {
+                    unset($a_folder_cache[$folder][$key]);
+                }
             }
             else {
                 unset($a_folder_cache[$folder]);

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_imap_cache.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_imap_cache.php Changed

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_imap_generic.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_imap_generic.php Changed

@@ -114,8 +114,7 @@
         $res = fwrite($this->fp, $string);
 
         if ($res === false) {
-            @fclose($this->fp);
-            $this->fp = null;
+            $this->closeSocket();
         }
 
         return $res;
@@ -542,6 +541,14 @@
                 // RFC2195: CRAM-MD5
                 $ipad = '';
                 $opad = '';
+                $xor  = function($str1, $str2) {
+                    $result = '';
+                    $size   = strlen($str1);
+                    for ($i=0; $i<$size; $i++) {
+                        $result .= chr(ord($str1[$i]) ^ ord($str2[$i]));
+                    }
+                    return $result;
+                };
 
                 // initialize ipad, opad
                 for ($i=0; $i<64; $i++) {
@@ -550,14 +557,11 @@
                 }
 
                 // pad $pass so it's 64 bytes
-                $padLen = 64 - strlen($pass);
-                for ($i=0; $i<$padLen; $i++) {
-                    $pass .= chr(0);
-                }
+                $pass = str_pad($pass, 64, chr(0));
 
                 // generate hash
-                $hash  = md5($this->_xor($pass, $opad) . pack("H*",
-                    md5($this->_xor($pass, $ipad) . base64_decode($challenge))));
+                $hash  = md5($xor($pass, $opad) . pack("H*",
+                    md5($xor($pass, $ipad) . base64_decode($challenge))));
                 $reply = base64_encode($user . ' ' . $hash);
 
                 // send result
@@ -663,7 +667,7 @@
             $line   = $this->readReply();
             $result = $this->parseResult($line);
         }
-        else { // PLAIN
+        else if ($type == 'PLAIN') {
             // proxy authorization
             if (!empty($this->prefs['auth_cid'])) {
                 $authc = $this->prefs['auth_cid'];
@@ -695,8 +699,29 @@
                 $result = $this->parseResult($line);
             }
         }
+        else if ($type == 'LOGIN') {
+            $this->putLine($this->nextTag() . " AUTHENTICATE LOGIN");
 
-        if ($result == self::ERROR_OK) {
+            $line = trim($this->readReply());
+            if ($line[0] != '+') {
+                return $this->parseResult($line);
+            }
+
+            $this->putLine(base64_encode($user), true, true);
+
+            $line = trim($this->readReply());
+            if ($line[0] != '+') {
+                return $this->parseResult($line);
+            }
+
+            // send result, get reply and process it
+            $this->putLine(base64_encode($pass), true, true);
+
+            $line   = $this->readReply();
+            $result = $this->parseResult($line);
+        }
+
+        if ($result === self::ERROR_OK) {
             // optional CAPABILITY response
             if ($line && preg_match('/\[CAPABILITY ([^]]+)\]/i', $line, $matches)) {
                 $this->parseCapability($matches[1], true);
@@ -720,6 +745,12 @@
      */
     protected function login($user, $password)
     {
+        // Prevent from sending credentials in plain text when connection is not secure
+        if ($this->getCapability('LOGINDISABLED')) {
+            $this->setError(self::ERROR_BAD, "Login disabled by IMAP server");
+            return false;
+        }
+
         list($code, $response) = $this->execute('LOGIN', array(
             $this->escape($user), $this->escape($password)), self::COMMAND_CAPABILITY | self::COMMAND_ANONYMIZED);
 
@@ -846,39 +877,27 @@
         $result       = null;
 
         // check for supported auth methods
-        if ($auth_method == 'CHECK') {
+        if (!$auth_method || $auth_method == 'CHECK') {
             if ($auth_caps = $this->getCapability('AUTH')) {
                 $auth_methods = $auth_caps;
             }
-            // RFC 2595 (LOGINDISABLED) LOGIN disabled when connection is not secure
-            $login_disabled = $this->getCapability('LOGINDISABLED');
-            if (($key = array_search('LOGIN', $auth_methods)) !== false) {
-                if ($login_disabled) {
-                    unset($auth_methods[$key]);
-                }
-            }
-            else if (!$login_disabled) {
-                $auth_methods[] = 'LOGIN';
-            }
 
             // Use best (for security) supported authentication method
-            $all_methods = array('GSSAPI', 'DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN');
+            $all_methods = array('DIGEST-MD5', 'CRAM-MD5', 'CRAM_MD5', 'PLAIN', 'LOGIN');
+
+            if (!empty($this->prefs['gssapi_cn'])) {
+                array_unshift($all_methods, 'GSSAPI');
+            }
+
             foreach ($all_methods as $auth_method) {
                 if (in_array($auth_method, $auth_methods)) {
                     break;
                 }
             }
-        }
-        else {
-            // Prevent from sending credentials in plain text when connection is not secure
-            if ($auth_method == 'LOGIN' && $this->getCapability('LOGINDISABLED')) {
-                $this->setError(self::ERROR_BAD, "Login disabled by IMAP server");
-                $this->closeConnection();
-                return false;
-            }
-            // replace AUTH with CRAM-MD5 for backward compat.
-            if ($auth_method == 'AUTH') {
-                $auth_method = 'CRAM-MD5';
+
+            // Prefer LOGIN over AUTHENTICATE LOGIN for performance reasons
+            if ($auth_method == 'LOGIN' && !$this->getCapability('LOGINDISABLED')) {
+                $auth_method = 'IMAP';
             }
         }
 
@@ -891,13 +910,16 @@
                 $auth_method = 'CRAM-MD5';
             case 'CRAM-MD5':
             case 'DIGEST-MD5':
-            case 'PLAIN':
             case 'GSSAPI':
+            case 'PLAIN':
+            case 'LOGIN':
                 $result = $this->authenticate($user, $password, $auth_method);
                 break;
-            case 'LOGIN':
+
+            case 'IMAP':
                 $result = $this->login($user, $password);
                 break;
+
             default:
                 $this->setError(self::ERROR_BAD, "Configuration error. Unknown auth method: $auth_method");
         }
@@ -1096,16 +1118,7 @@
         if ($this->selected === $mailbox) {
             return true;
         }
-/*
-    Temporary commented out because Courier returns \Noselect for INBOX
-    Requires more investigation
 
-        if (is_array($this->data['LIST']) && is_array($opts = $this->data['LIST'][$mailbox])) {
-            if (in_array('\\Noselect', $opts)) {
-                return false;
-            }
-        }
-*/
         $params = array($this->escape($mailbox));
 
         // QRESYNC data items
@@ -1129,35 +1142,61 @@
 
             $response = explode("\r\n", $response);
             foreach ($response as $line) {
-                if (preg_match('/^\* ([0-9]+) (EXISTS|RECENT)$/i', $line, $m)) {
-                    $this->data[strtoupper($m[2])] = (int) $m[1];
-                }
-                else if (preg_match('/^\* OK \[/i', $line, $match)) {
-                    $line = substr($line, 6);
-                    if (preg_match('/^(UIDNEXT|UIDVALIDITY|UNSEEN) ([0-9]+)/i', $line, $match)) {
-                        $this->data[strtoupper($match[1])] = (int) $match[2];
-                    }
-                    else if (preg_match('/^(HIGHESTMODSEQ) ([0-9]+)/i', $line, $match)) {
-                        $this->data[strtoupper($match[1])] = (string) $match[2];
-                    }
-                    else if (preg_match('/^(NOMODSEQ)/i', $line, $match)) {
-                        $this->data[strtoupper($match[1])] = true;
-                    }
-                    else if (preg_match('/^PERMANENTFLAGS $([^$]+)\)/iU', $line, $match)) {
-                        $this->data['PERMANENTFLAGS'] = explode(' ', $match[1]);
+                if (preg_match('/^\* OK \[/i', $line)) {
+                    $pos   = strcspn($line, ' ]', 6);
+                    $token = strtoupper(substr($line, 6, $pos));
+                    $pos   += 7;
+
+                    switch ($token) {
+                    case 'UIDNEXT':
+                    case 'UIDVALIDITY':
+                    case 'UNSEEN':
+                        if ($len = strspn($line, '0123456789', $pos)) {
+                            $this->data[$token] = (int) substr($line, $pos, $len);
+                        }
+                        break;
+
+                    case 'HIGHESTMODSEQ':
+                        if ($len = strspn($line, '0123456789', $pos)) {
+                            $this->data[$token] = (string) substr($line, $pos, $len);
+                        }
+                        break;
+
+                    case 'NOMODSEQ':
+                        $this->data[$token] = true;
+                        break;
+
+                    case 'PERMANENTFLAGS':
+                        $start = strpos($line, '(', $pos);
+                        $end   = strrpos($line, ')');
+                        if ($start && $end) {
+                            $flags = substr($line, $start + 1, $end - $start - 1);
+                            $this->data[$token] = explode(' ', $flags);
+                        }
+                        break;
                     }
                 }
-                // QRESYNC FETCH response (RFC5162)
-                else if (preg_match('/^\* ([0-9+]) FETCH/i', $line, $match)) {
-                    $line       = substr($line, strlen($match[0]));
-                    $fetch_data = $this->tokenizeResponse($line, 1);
-                    $data       = array('id' => $match[1]);
+                else if (preg_match('/^\* ([0-9]+) (EXISTS|RECENT|FETCH)/i', $line, $match)) {
+                    $token = strtoupper($match[2]);
+                    switch ($token) {
+                    case 'EXISTS':
+                    case 'RECENT':
+                        $this->data[$token] = (int) $match[1];
+                        break;
 
-                    for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) {
-                        $data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
-                    }
+                    case 'FETCH':
+                        // QRESYNC FETCH response (RFC5162)
+                        $line       = substr($line, strlen($match[0]));
+                        $fetch_data = $this->tokenizeResponse($line, 1);
+                        $data       = array('id' => $match[1]);
 
-                    $this->data['QRESYNC'][$data['uid']] = $data;
+                        for ($i=0, $size=count($fetch_data); $i<$size; $i+=2) {
+                            $data[strtolower($fetch_data[$i])] = $fetch_data[$i+1];
+                        }
+
+                        $this->data['QRESYNC'][$data['uid']] = $data;
+                        break;
+                    }
                 }
                 // QRESYNC VANISHED response (RFC5162)
                 else if (preg_match('/^\* VANISHED [()EARLIER]*/i', $line, $match)) {
@@ -1202,7 +1241,7 @@
         }
 
         list($code, $response) = $this->execute('STATUS', array($this->escape($mailbox),
-            '(' . implode(' ', (array) $items) . ')'));
+            '(' . implode(' ', $items) . ')'));
 
         if ($code == self::ERROR_OK && preg_match('/^\* STATUS /i', $response)) {
             $result   = array();
@@ -1215,10 +1254,10 @@
             if (!is_array($items) && ($pos = strpos($response, '(')) !== false) {
                 $response = substr($response, $pos);
                 $items    = $this->tokenizeResponse($response, 1);
+            }
 
-                if (!is_array($items)) {
-                    return $result;
-                }
+            if (!is_array($items)) {
+                return $result;
             }
 
             for ($i=0, $len=count($items); $i<$len; $i += 2) {
@@ -2035,12 +2074,12 @@
                     if (preg_match('/BODY\[HEADER\.FIELDS $"*DATE"*$\] (.*)/', $line, $matches)) {
                         $value = preg_replace(array('/^"*[a-z]+:/i'), '', $matches[1]);
                         $value = trim($value);
-                        $result[$id] = $this->strToTime($value);
+                        $result[$id] = rcube_utils::strtotime($value);
                     }
                     // non-existent/empty Date: header, use INTERNALDATE
                     if (empty($result[$id])) {
                         if (preg_match('/INTERNALDATE "([^"]+)"/', $line, $matches)) {
-                            $result[$id] = $this->strToTime($matches[1]);
+                            $result[$id] = rcube_utils::strtotime($matches[1]);
                         }
                         else {
                             $result[$id] = 0;
@@ -2072,7 +2111,7 @@
                 }
                 else if ($mode == 4) {
                     if (preg_match('/INTERNALDATE "([^"]+)"/', $line, $matches)) {
-                        $result[$id] = $this->strToTime($matches[1]);
+                        $result[$id] = rcube_utils::strtotime($matches[1]);
                     }
                     else {
                         $result[$id] = 0;
@@ -2401,7 +2440,7 @@
                     else if ($name == 'INTERNALDATE') {
                         $result[$id]->internaldate = $value;
                         $result[$id]->date         = $value;
-                        $result[$id]->timestamp    = $this->StrToTime($value);
+                        $result[$id]->timestamp    = rcube_utils::strtotime($value);
                     }
                     else if ($name == 'FLAGS') {
                         if (!empty($value)) {
@@ -2465,14 +2504,16 @@
 
                         switch ($field) {
                         case 'date';
-                            $result[$id]->date = $string;
-                            $result[$id]->timestamp = $this->strToTime($string);
+                            $string                 = substr($string, 0, 128);
+                            $result[$id]->date      = $string;
+                            $result[$id]->timestamp = rcube_utils::strtotime($string);
                             break;
                         case 'to':
                             $result[$id]->to = preg_replace('/undisclosed-recipients:[;,]*/', '', $string);
                             break;
                         case 'from':
                         case 'subject':
+                            $string = substr($string, 0, 2048);
                         case 'cc':
                         case 'bcc':
                         case 'references':
@@ -2482,7 +2523,7 @@
                             $result[$id]->replyto = $string;
                             break;
                         case 'content-transfer-encoding':
-                            $result[$id]->encoding = $string;
+                            $result[$id]->encoding = substr($string, 0, 32);
                         break;
                         case 'content-type':
                             $ctype_parts = preg_split('/[; ]+/', $string);
@@ -2497,10 +2538,10 @@
                         case 'return-receipt-to':
                         case 'disposition-notification-to':
                         case 'x-confirm-reading-to':
-                            $result[$id]->mdn_to = $string;
+                            $result[$id]->mdn_to = substr($string, 0, 2048);
                             break;
                         case 'message-id':
-                            $result[$id]->messageID = $string;
+                            $result[$id]->messageID = substr($string, 0, 2048);
                             break;
                         case 'x-priority':
                             if (preg_match('/^(\d+)/', $string, $matches)) {
@@ -2606,7 +2647,7 @@
 
         reset($messages);
 
-        while (list($key, $headers) = each($messages)) {
+        foreach ($messages as $key => $headers) {
             $value = null;
 
             switch ($field) {
@@ -2615,7 +2656,7 @@
             case 'date':
             case 'internaldate':
             case 'timestamp':
-                $value = self::strToTime($headers->$field);
+                $value = rcube_utils::strtotime($headers->$field);
                 if (!$value && $field != 'timestamp') {
                     $value = $headers->timestamp;
                 }
@@ -2648,7 +2689,7 @@
             }
 
             // form new array based on index
-            while (list($key, $val) = each($index)) {
+            foreach ($index as $key => $val) {
                 $result[$key] = $messages[$key];
             }
         }
@@ -3089,8 +3130,9 @@
                 if (preg_match('/^\* QUOTA /', $line)) {
                     list(, , $quota_root) = $this->tokenizeResponse($line, 3);
 
-                    while ($line) {
-                        list($type, $used, $total) = $this->tokenizeResponse($line, 1);
+                    $quotas = $this->tokenizeResponse($line, 1);
+                    foreach (array_chunk($quotas, 3) as $quota) {
+                        list($type, $used, $total) = $quota;
                         $type = strtolower($type);
 
                         if ($type && $total) {
@@ -3367,37 +3409,16 @@
 
             // The METADATA response can contain multiple entries in a single
             // response or multiple responses for each entry or group of entries
-            if (!empty($data) && ($size = count($data))) {
-                for ($i=0; $i<$size; $i++) {
-                    if (isset($mbox) && is_array($data[$i])) {
-                        $size_sub = count($data[$i]);
-                        for ($x=0; $x<$size_sub; $x+=2) {
-                            if ($data[$i][$x+1] !== null)
-                                $result[$mbox][$data[$i][$x]] = $data[$i][$x+1];
+            for ($i = 0, $size = count($data); $i < $size; $i++) {
+                if ($data[$i] === '*'
+                    && $data[++$i] === 'METADATA'
+                    && is_string($mbox = $data[++$i])
+                    && is_array($data[++$i])
+                ) {
+                    for ($x = 0, $size2 = count($data[$i]); $x < $size2; $x += 2) {
+                        if ($data[$i][$x+1] !== null) {
+                            $result[$mbox][$data[$i][$x]] = $data[$i][$x+1];
                         }
-                        unset($data[$i]);
-                    }
-                    else if ($data[$i] == '*') {
-                        if ($data[$i+1] == 'METADATA') {
-                            $mbox = $data[$i+2];
-                            unset($data[$i]);   // "*"
-                            unset($data[++$i]); // "METADATA"
-                            unset($data[++$i]); // Mailbox
-                        }
-                        // get rid of other untagged responses
-                        else {
-                            unset($mbox);
-                            unset($data[$i]);
-                        }
-                    }
-                    else if (isset($mbox)) {
-                        if ($data[++$i] !== null)
-                            $result[$mbox][$data[$i-1]] = $data[$i];
-                        unset($data[$i]);
-                        unset($data[$i-1]);
-                    }
-                    else {
-                        unset($data[$i]);
                     }
                 }
             }
@@ -3593,14 +3614,12 @@
             $data['type'] = 'multipart';
         }
         else {
-            $data['type'] = strtolower($part_a[0]);
-
-            // encoding
+            $data['type']     = strtolower($part_a[0]);
             $data['encoding'] = strtolower($part_a[5]);
 
             // charset
             if (is_array($part_a[2])) {
-               while (list($key, $val) = each($part_a[2])) {
+               foreach ($part_a[2] as $key => $val) {
                     if (strcasecmp($val, 'charset') == 0) {
                         $data['charset'] = $part_a[2][$key+1];
                         break;
@@ -3693,9 +3712,17 @@
         // Parse response
         do {
             $line = $this->readLine(4096);
+
             if ($response !== null) {
                 $response .= $line;
             }
+
+            // parse untagged response for [COPYUID 1204196876 3456:3457 123:124] (RFC6851)
+            if ($line && $command == 'UID MOVE') {
+                if (preg_match("/^\* OK \[COPYUID [0-9]+ ([0-9,:]+) ([0-9,:]+)\]/i", $line, $m)) {
+                    $this->data['COPYUID'] = array($m[1], $m[2]);
+                }
+            }
         }
         while (!$this->startsWith($line, $tag . ' ', true, true));
 
@@ -3804,6 +3831,9 @@
         return $num == 1 ? $result[0] : $result;
     }
 
+    /**
+     * Joins IMAP command line elements (recursively)
+     */
     protected static function r_implode($element)
     {
         $string = '';
@@ -3833,16 +3863,15 @@
     {
         // given a comma delimited list of independent mid's,
         // compresses by grouping sequences together
-
         if (!is_array($messages)) {
             // if less than 255 bytes long, let's not bother
-            if (!$force && strlen($messages)<255) {
-                return $messages;
+            if (!$force && strlen($messages) < 255) {
+                return preg_match('/[^0-9:,*]/', $messages) ? 'INVALID' : $messages;
             }
 
             // see if it's already been compressed
             if (strpos($messages, ':') !== false) {
-                return $messages;
+                return preg_match('/[^0-9:,*]/', $messages) ? 'INVALID' : $messages;
             }
 
             // separate, then sort
@@ -3877,7 +3906,9 @@
         }
 
         // return as comma separated string
-        return implode(',', $result);
+        $result = implode(',', $result);
+
+        return preg_match('/[^0-9:,*]/', $result) ? 'INVALID' : $result;
     }
 
     /**
@@ -3909,18 +3940,6 @@
         return $result;
     }
 
-    protected function _xor($string, $string2)
-    {
-        $result = '';
-        $size   = strlen($string);
-
-        for ($i=0; $i<$size; $i++) {
-            $result .= chr(ord($string[$i]) ^ ord($string2[$i]));
-        }
-
-        return $result;
-    }
-
     /**
      * Clear internal status cache
      */
@@ -3969,44 +3988,6 @@
     }
 
     /**
-     * Converts datetime string into unix timestamp
-     *
-     * @param string $date Date string
-     *
-     * @return int Unix timestamp
-     */
-    protected static function strToTime($date)
-    {
-        // Clean malformed data
-        $date = preg_replace(
-            array(
-                '/GMT\s*([+-][0-9]+)/',                     // support non-standard "GMTXXXX" literal
-                '/[^a-z0-9\x20\x09:+-]/i',                  // remove any invalid characters
-                '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i',   // remove weekday names
-            ),
-            array(
-                '\\1',
-                '',
-                '',
-            ), $date);
-
-        $date = trim($date);
-
-        // if date parsing fails, we have a date in non-rfc format
-        // remove token from the end and try again
-        while (($ts = intval(@strtotime($date))) <= 0) {
-            $d = explode(' ', $date);
-            array_pop($d);
-            if (empty($d)) {
-                break;
-            }
-            $date = implode(' ', $d);
-        }
-
-        return $ts < 0 ? 0 : $ts;
-    }
-
-    /**
      * CAPABILITY response parser
      */
     protected function parseCapability($str, $trusted=false)
@@ -4078,7 +4059,7 @@
     /**
      * Write the given debug text to the current debug output handler.
      *
-     * @param string $message Debug mesage text.
+     * @param string $message Debug message text.
      *
      * @since 0.5-stable
      */

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_ldap.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_ldap.php Changed

@@ -171,12 +171,14 @@
             $this->coltypes['address'] = array(
                'limit'    => max(1, $this->coltypes['locality']['limit'] + $this->coltypes['address']['limit']),
                'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], (array)$this->coltypes['locality']['subtypes']),
-               'childs' => array(),
+               'childs'   => array(),
+               'attributes' => array(),
                ) + (array)$this->coltypes['address'];
 
             foreach (array('street','locality','zipcode','region','country') as $childcol) {
                 if ($this->coltypes[$childcol]) {
                     $this->coltypes['address']['childs'][$childcol] = array('type' => 'text');
+                    $this->coltypes['address']['attributes'] = array_merge($this->coltypes['address']['attributes'], $this->coltypes[$childcol]['attributes']);
                     unset($this->coltypes[$childcol]);  // remove address child col from global coltypes list
                 }
             }
@@ -282,9 +284,10 @@
                 $this->readonly = false;
             }
 
-            $bind_pass = $this->prop['bind_pass'];
-            $bind_user = $this->prop['bind_user'];
-            $bind_dn   = $this->prop['bind_dn'];
+            $bind_pass   = $this->prop['bind_pass'];
+            $bind_user   = $this->prop['bind_user'];
+            $bind_dn     = $this->prop['bind_dn'];
+            $auth_method = $this->prop['auth_method'];
 
             $this->base_dn        = $this->prop['base_dn'];
             $this->groups_base_dn = $this->prop['groups']['base_dn'] ?: $this->base_dn;
@@ -420,7 +423,7 @@
                 }
             }
 
-            if (empty($bind_pass)) {
+            if (empty($bind_pass) && strcasecmp($auth_method, 'GSSAPI') != 0) {
                 $this->ready = true;
             }
             else {
@@ -868,7 +871,8 @@
             $filter = 'e:' . $filter;
         }
 
-        $this->set_search_set($prefix . $filter);
+        // set filter string and execute search
+        $this->set_search_set($filter);
 
         if ($select)
             $this->list_records();
@@ -911,7 +915,7 @@
     protected function extended_search($count = false)
     {
         $prop    = $this->group_id ? $this->group_data : $this->prop;
-        $base_dn = $this->group_id ? $this->groups_base_dn : $this->base_dn;
+        $base_dn = $this->group_id ? $prop['base_dn'] : $this->base_dn;
         $attrs   = $count ? array('dn') : $this->prop['attributes'];
         $entries = array();
 
@@ -1471,16 +1475,23 @@
                 if (strpos($templ, '(') !== false) {
                     // replace {attr} placeholders with (escaped!) attribute values to be safely eval'd
                     $code = preg_replace('/\{\w+\}/', '', strtr($templ, array_map('addslashes', $attrvals)));
-                    $fn   = create_function('', "return ($code);");
-                    if (!$fn) {
+                    $res  = false;
+
+                    try {
+                        $res = eval("return ($code);");
+                    }
+                    catch (ParseError $e) {
+                        // ignore
+                    }
+
+                    if ($res === false) {
                         rcube::raise_error(array(
-                            'code' => 505, 'type' => 'php',
-                            'file' => __FILE__, 'line' => __LINE__,
+                            'code' => 505, 'file' => __FILE__, 'line' => __LINE__,
                             'message' => "Expression parse error on: ($code)"), true, false);
                         continue;
                     }
 
-                    $attrs[$lf] = $fn();
+                    $attrs[$lf] = $res;
                 }
                 else {
                     // replace {attr} placeholders with concrete attribute values

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_ldap_generic.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_ldap_generic.php Changed

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_message.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_message.php Changed

@@ -28,7 +28,7 @@
 class rcube_message
 {
     /**
-     * Instace of framework class.
+     * Instance of framework class.
      *
      * @var rcube
      */
@@ -54,6 +54,7 @@
     public $folder;
     public $headers;
     public $sender;
+    public $context;
     public $parts        = array();
     public $mime_parts   = array();
     public $inline_parts = array();
@@ -78,11 +79,17 @@
     function __construct($uid, $folder = null, $is_safe = false)
     {
         // decode combined UID-folder identifier
-        if (preg_match('/^\d+-.+/', $uid)) {
+        if (preg_match('/^[0-9.]+-.+/', $uid)) {
             list($uid, $folder) = explode('-', $uid, 2);
         }
 
+        if (preg_match('/^([0-9]+)\.([0-9.]+)$/', $uid, $matches)) {
+            $uid     = $matches[1];
+            $context = $matches[2];
+        }
+
         $this->uid     = $uid;
+        $this->context = $context;
         $this->app     = rcube::get_instance();
         $this->storage = $this->app->get_storage();
         $this->folder  = strlen($folder) ? $folder : $this->storage->get_folder();
@@ -97,10 +104,6 @@
             return;
         }
 
-        $this->mime    = new rcube_mime($this->headers->charset);
-        $this->subject = $this->headers->get('subject');
-        list(, $this->sender) = each($this->mime->decode_address_list($this->headers->from, 1));
-
         $this->set_safe($is_safe || $_SESSION['safe_messages'][$this->folder.':'.$uid]);
         $this->opt = array(
             'safe'        => $this->is_safe,
@@ -116,10 +119,15 @@
             $this->get_mime_numbers($this->headers->structure);
             $this->parse_structure($this->headers->structure);
         }
-        else {
+        else if ($this->context === null) {
             $this->body = $this->storage->get_body($uid);
         }
 
+        $this->mime    = new rcube_mime($this->headers->charset);
+        $this->subject = $this->headers->get('subject');
+        $from          = $this->mime->decode_address_list($this->headers->from, 1);
+        $this->sender  = current($from);
+
         // notify plugins and let them analyze this structured message object
         $this->app->plugins->exec_hook('message_load', array('object' => $this));
     }
@@ -169,7 +177,7 @@
      * Get content of a specific part of this message
      *
      * @param string   $mime_id           Part MIME-ID
-     * @param resource $fp File           pointer to save the message part
+     * @param resource $fp                File pointer to save the message part
      * @param boolean  $skip_charset_conv Disables charset conversion
      * @param int      $max_bytes         Only read this number of bytes
      * @param boolean  $formatted         Enables formatting of text/* parts bodies
@@ -243,7 +251,7 @@
             if (is_resource($mode)) {
                 if ($body !== false) {
                     fwrite($mode, $body);
-                    rewind($mode);
+                    @rewind($mode);
                 }
 
                 return $body !== false;
@@ -268,7 +276,7 @@
             !($mode && $formatted), $max_bytes, $mode && $formatted);
 
         if (is_resource($mode)) {
-            rewind($mode);
+            @rewind($mode);
             return $body !== false;
         }
 
@@ -338,6 +346,14 @@
                     continue;
                 }
 
+                if (!$part->size) {
+                    continue;
+                }
+
+                if (!$this->check_context($part)) {
+                    continue;
+                }
+
                 $level = explode('.', $part->mime_id);
                 $depth = count($level);
                 $last  = '';
@@ -350,19 +366,22 @@
                         return true;
                     }
 
-                    $parent    = $this->mime_parts[join('.', $level)];
+                    $parent = $this->mime_parts[join('.', $level)];
+
+                    if (!$this->check_context($parent)) {
+                        return true;
+                    }
+
                     $max_delta = $depth - (1 + ($last == 'multipart/alternative' ? 1 : 0));
-                    $last      = $parent->mimetype;
+                    $last      = $parent->real_mimetype ?: $parent->mimetype;
 
-                    if (!preg_match('/^multipart\/(alternative|related|signed|encrypted|mixed)$/', $parent->mimetype)
-                        || ($parent->mimetype == 'multipart/mixed' && $parent_depth < $max_delta)) {
+                    if (!preg_match('/^multipart\/(alternative|related|signed|encrypted|mixed)$/', $last)
+                        || ($last == 'multipart/mixed' && $parent_depth < $max_delta)) {
                         continue 2;
                     }
                 }
 
-                if ($part->size) {
-                    return true;
-                }
+                return true;
             }
         }
 
@@ -389,6 +408,14 @@
                     continue;
                 }
 
+                if (!$part->size) {
+                    continue;
+                }
+
+                if (!$this->check_context($part)) {
+                    continue;
+                }
+
                 $level = explode('.', $part->mime_id);
 
                 // Check if the part belongs to higher-level's alternative/related
@@ -398,14 +425,17 @@
                     }
 
                     $parent = $this->mime_parts[join('.', $level)];
+
+                    if (!$this->check_context($parent)) {
+                        return true;
+                    }
+
                     if ($parent->mimetype != 'multipart/alternative' && $parent->mimetype != 'multipart/related') {
                         continue 2;
                     }
                 }
 
-                if ($part->size) {
-                    return true;
-                }
+                return true;
             }
         }
 
@@ -464,6 +494,26 @@
     }
 
     /**
+     * Return message parts in current context
+     */
+    public function mime_parts()
+    {
+        if ($this->context === null) {
+            return $this->mime_parts;
+        }
+
+        $parts = array();
+
+        foreach ($this->mime_parts as $part_id => $part) {
+            if ($this->check_context($part)) {
+                $parts[$part_id] = $part;
+            }
+        }
+
+        return $parts;
+    }
+
+    /**
      * Checks if part of the message is an attachment (or part of it)
      *
      * @param rcube_message_part $part Message part
@@ -527,6 +577,10 @@
             if (!isset($structure->headers['subject']) && !isset($structure->headers['from'])) {
                 list($headers, ) = explode("\r\n\r\n", $this->get_part_body($structure->mime_id, false, 32768));
                 $structure->headers = rcube_mime::parse_headers($headers);
+
+                if ($this->context == $structure->mime_id) {
+                    $this->headers = rcube_message_header::from_array($structure->headers);
+                }
             }
         }
         else {
@@ -535,11 +589,12 @@
 
         // show message headers
         if ($recursive && is_array($structure->headers) &&
-                (isset($structure->headers['subject']) || $structure->headers['from'] || $structure->headers['to'])) {
+            (isset($structure->headers['subject']) || $structure->headers['from'] || $structure->headers['to'])
+        ) {
             $c = new stdClass;
             $c->type = 'headers';
             $c->headers = $structure->headers;
-            $this->parts[] = $c;
+            $this->add_part($c);
         }
 
         // Allow plugins to handle message parts
@@ -561,25 +616,25 @@
         if ($message_ctype_primary == 'text' && !$recursive) {
             // parts with unsupported type add to attachments list
             if (!in_array($message_ctype_secondary, array('plain', 'html', 'enriched'))) {
-                $this->attachments[] = $structure;
+                $this->add_part($structure, 'attachment');
                 return;
             }
 
             $structure->type = 'content';
-            $this->parts[] = $structure;
+            $this->add_part($structure);
 
             // Parse simple (plain text) message body
             if ($message_ctype_secondary == 'plain') {
                 foreach ((array)$this->uu_decode($structure) as $uupart) {
                     $this->mime_parts[$uupart->mime_id] = $uupart;
-                    $this->attachments[] = $uupart;
+                    $this->add_part($uupart, 'attachment');
                 }
             }
         }
         // the same for pgp signed messages
         else if ($mimetype == 'application/pgp' && !$recursive) {
             $structure->type = 'content';
-            $this->parts[] = $structure;
+            $this->add_part($structure);
         }
         // message contains (more than one!) alternative parts
         else if ($mimetype == 'multipart/alternative'
@@ -613,7 +668,7 @@
                     $enriched_part = $p;
                 else {
                     // add unsupported/unrecognized parts to attachments list
-                    $this->attachments[] = $sub_part;
+                    $this->add_part($sub_part, 'attachment');
                 }
             }
 
@@ -624,8 +679,9 @@
                 $this->parse_alternative = false;
 
                 // if plain part was found, we should unset it if html is preferred
-                if ($this->opt['prefer_html'] && count($this->parts))
+                if ($this->opt['prefer_html'] && count($this->parts)) {
                     $plain_part = null;
+                }
             }
 
             // choose html/plain part to print
@@ -642,7 +698,15 @@
             // add the right message body
             if (is_object($print_part)) {
                 $print_part->type = 'content';
-                $this->parts[] = $print_part;
+
+                // Allow plugins to handle also this part
+                $plugin = $this->app->plugins->exec_hook('message_part_structure',
+                    array('object' => $this, 'structure' => $print_part,
+                        'mimetype' => $print_part->mimetype, 'recursive' => true));
+
+                if (!$plugin['abort']) {
+                    $this->add_part($print_part);
+                }
             }
             // show plaintext warning
             else if ($html_part !== null && empty($this->parts)) {
@@ -653,7 +717,7 @@
                 $c->mimetype        = 'text/plain';
                 $c->realtype        = 'text/html';
 
-                $this->parts[] = $c;
+                $this->add_part($c);
             }
         }
         // this is an ecrypted message -> create a plaintext body with the according message
@@ -666,14 +730,14 @@
             $p->realtype        = 'multipart/encrypted';
             $p->mime_id         = $structure->mime_id;
 
-            $this->parts[] = $p;
+            $this->add_part($p);
 
             // add encrypted payload part as attachment
             if (is_array($structure->parts)) {
                 for ($i=0; $i < count($structure->parts); $i++) {
                     $subpart = $structure->parts[$i];
                     if ($subpart->mimetype == 'application/octet-stream' || !empty($subpart->filename)) {
-                        $this->attachments[] = $subpart;
+                        $this->add_part($subpart, 'attachment');
                     }
                 }
             }
@@ -688,10 +752,10 @@
             $p->realtype        = 'application/pkcs7-mime';
             $p->mime_id         = $structure->mime_id;
 
-            $this->parts[] = $p;
+            $this->add_part($p);
 
             if (!empty($structure->filename)) {
-                $this->attachments[] = $structure;
+                $this->add_part($structure, 'attachment');
             }
         }
         // message contains multiple parts
@@ -709,7 +773,7 @@
 
                     // list message/rfc822 as attachment as well (mostly .eml)
                     if ($primary_type == 'message' && !empty($mail_part->filename)) {
-                        $this->attachments[] = $mail_part;
+                        $this->add_part($mail_part, 'attachment');
                     }
                 }
                 // part text/[plain|html] or delivery status
@@ -738,12 +802,12 @@
                         ($secondary_type == 'plain' && !$this->opt['prefer_html'])
                     ) {
                         $mail_part->type = 'content';
-                        $this->parts[] = $mail_part;
+                        $this->add_part($mail_part);
                     }
 
                     // list as attachment as well
                     if (!empty($mail_part->filename)) {
-                        $this->attachments[] = $mail_part;
+                        $this->add_part($mail_part, 'attachment');
                     }
                 }
                 // ignore "virtual" protocol parts
@@ -755,13 +819,13 @@
                     $tnef_parts = (array) $this->tnef_decode($mail_part);
                     foreach ($tnef_parts as $tpart) {
                         $this->mime_parts[$tpart->mime_id] = $tpart;
-                        $this->attachments[] = $tpart;
+                        $this->add_part($tpart, 'attachment');
                     }
 
                     // add winmail.dat to the list if it's content is unknown
                     if (empty($tnef_parts) && !empty($mail_part->filename)) {
                         $this->mime_parts[$mail_part->mime_id] = $mail_part;
-                        $this->attachments[] = $mail_part;
+                        $this->add_part($mail_part, 'attachment');
                     }
                 }
                 // part is a file/attachment
@@ -771,33 +835,37 @@
                         (empty($mail_part->disposition) || preg_match('/^[a-z0-9!#$&.+^_-]+$/i', $mail_part->disposition)))
                 ) {
                     // skip apple resource forks
-                    if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
+                    if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile') {
                         continue;
+                    }
 
-                    // part belongs to a related message and is linked
-                    if (preg_match('/^multipart\/(related|relative)/', $mimetype)
-                        && ($mail_part->headers['content-id'] || $mail_part->headers['content-location'])
-                    ) {
-                        if ($mail_part->headers['content-id'])
-                            $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
-                        if ($mail_part->headers['content-location'])
-                            $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
+                    if ($mail_part->headers['content-id']) {
+                        $mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
+                    }
 
-                        $this->inline_parts[] = $mail_part;
+                    if ($mail_part->headers['content-location']) {
+                        $mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
                     }
-                    // regular attachment with valid content type
-                    // (content-type name regexp according to RFC4288.4.2)
-                    else if (preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
-                        $this->attachments[] = $mail_part;
+
+                    // part belongs to a related message and is linked
+                    // Note: mixed is not supposed to contain inline images, but we've found such examples (#5905)
+                    if (preg_match('/^multipart\/(related|relative|mixed)/', $mimetype)
+                        && ($mail_part->content_id || $mail_part->content_location)
+                    ) {
+                        $this->add_part($mail_part, 'inline');
                     }
-                    // attachment with invalid content type
-                    // replace malformed content type with application/octet-stream (#1487767)
-                    else if ($mail_part->filename) {
-                        $mail_part->ctype_primary   = 'application';
-                        $mail_part->ctype_secondary = 'octet-stream';
-                        $mail_part->mimetype        = 'application/octet-stream';
-
-                        $this->attachments[] = $mail_part;
+
+                    // Any non-inline attachment
+                    if (!preg_match('/^inline/i', $mail_part->disposition)) {
+                        // Content-Type name regexp according to RFC4288.4.2
+                        if (!preg_match('/^[a-z0-9!#$&.+^_-]+\/[a-z0-9!#$&.+^_-]+$/i', $part_mimetype)) {
+                            // replace malformed content type with application/octet-stream (#1487767)
+                            $mail_part->ctype_primary   = 'application';
+                            $mail_part->ctype_secondary = 'octet-stream';
+                            $mail_part->mimetype        = 'application/octet-stream';
+                        }
+
+                        $this->add_part($mail_part, 'attachment');
                     }
                 }
                 // calendar part not marked as attachment (#1490325)
@@ -806,19 +874,21 @@
                         $mail_part->filename = 'calendar.ics';
                     }
 
-                    $this->attachments[] = $mail_part;
+                    $this->add_part($mail_part, 'attachment');
                 }
             }
 
-            // if this was a related part try to resolve references
-            if (preg_match('/^multipart\/(related|relative)/', $mimetype) && sizeof($this->inline_parts)) {
+            // if this is a related part try to resolve references
+            // Note: mixed is not supposed to contain inline images, but we've found such examples (#5905)
+            if (preg_match('/^multipart\/(related|relative|mixed)/', $mimetype) && count($this->inline_parts)) {
                 $a_replaces = array();
                 $img_regexp = '/^image\/(gif|jpe?g|png|tiff|bmp|svg)/';
 
                 foreach ($this->inline_parts as $inline_object) {
                     $part_url = $this->get_part_url($inline_object->mime_id, $inline_object->ctype_primary);
-                    if (isset($inline_object->content_id))
+                    if (isset($inline_object->content_id)) {
                         $a_replaces['cid:'.$inline_object->content_id] = $part_url;
+                    }
                     if ($inline_object->content_location) {
                         $a_replaces[$inline_object->content_location] = $part_url;
                     }
@@ -828,13 +898,13 @@
                         // In this case multipart/related message has only one text part
                         // We'll add all such attachments to the attachments list
                         if (!isset($this->got_html_part)) {
-                            $this->attachments[] = $inline_object;
+                            $this->add_part($inline_object, 'attachment');
                         }
                         // MS Outlook sometimes also adds non-image attachments as related
                         // We'll add all such attachments to the attachments list
                         // Warning: some browsers support pdf in <img/>
                         else if (!preg_match($img_regexp, $inline_object->mimetype)) {
-                            $this->attachments[] = $inline_object;
+                            $this->add_part($inline_object, 'attachment');
                         }
                         // @TODO: we should fetch HTML body and find attachment's content-id
                         // to handle also image attachments without reference in the body
@@ -845,23 +915,20 @@
                 // add replace array to each content part
                 // (will be applied later when part body is available)
                 foreach ($this->parts as $i => $part) {
-                    if ($part->type == 'content')
+                    if ($part->type == 'content') {
                         $this->parts[$i]->replaces = $a_replaces;
+                    }
                 }
             }
         }
         // message is a single part non-text
-        else if ($structure->filename) {
-            $this->attachments[] = $structure;
-        }
-        // message is a single part non-text (without filename)
-        else if (preg_match('/application\//i', $mimetype)) {
-            $this->attachments[] = $structure;
+        else if ($structure->filename || preg_match('/^application\//i', $mimetype)) {
+            $this->add_part($structure, 'attachment');
         }
     }
 
     /**
-     * Fill aflat array with references to all parts, indexed by part numbers
+     * Fill a flat array with references to all parts, indexed by part numbers
      *
      * @param rcube_message_part $part Message body structure
      */
@@ -876,6 +943,28 @@
     }
 
     /**
+     * Add a part to object parts array(s) (with context check)
+     */
+    private function add_part($part, $type = null)
+    {
+        if ($this->check_context($part)) {
+            switch ($type) {
+                case 'inline': $this->inline_parts[] = $part; break;
+                case 'attachment': $this->attachments[] = $part; break;
+                default: $this->parts[] = $part; break;
+            }
+        }
+    }
+
+    /**
+     * Check if specified part belongs to the current context
+     */
+    private function check_context($part)
+    {
+        return $this->context === null || strpos($part->mime_id, $this->context . '.') === 0;
+    }
+
+    /**
      * Decode a Microsoft Outlook TNEF part (winmail.dat)
      *
      * @param rcube_message_part $part Message part to decode
@@ -891,7 +980,7 @@
 
         unset($body);
 
-        foreach ($tnef_arr as $pid => $winatt) {
+        foreach ($tnef_arr['attachments'] as $pid => $winatt) {
             $tpart = new rcube_message_part;
 
             $tpart->filename        = $this->fix_attachment_name(trim($winatt['name']), $part);

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_mime.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_mime.php Changed

@@ -3,8 +3,8 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
- | Copyright (C) 2011-2014, Kolab Systems AG                             |
+ | Copyright (C) 2005-2016, The Roundcube Dev Team                       |
+ | Copyright (C) 2011-2016, Kolab Systems AG                             |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -42,7 +42,7 @@
     /**
      * Returns message/object character set name
      *
-     * @return string Characted set name
+     * @return string Character set name
      */
     public static function get_charset()
     {
@@ -84,16 +84,21 @@
     /**
      * Split an address list into a structured array list
      *
-     * @param string  $input    Input string
-     * @param int     $max      List only this number of addresses
-     * @param boolean $decode   Decode address strings
-     * @param string  $fallback Fallback charset if none specified
-     * @param boolean $addronly Return flat array with e-mail addresses only
+     * @param string|array $input    Input string (or list of strings)
+     * @param int          $max      List only this number of addresses
+     * @param boolean      $decode   Decode address strings
+     * @param string       $fallback Fallback charset if none specified
+     * @param boolean      $addronly Return flat array with e-mail addresses only
      *
      * @return array Indexed list of addresses
      */
     static function decode_address_list($input, $max = null, $decode = true, $fallback = null, $addronly = false)
     {
+        // A common case when the same header is used many times in a mail message
+        if (is_array($input)) {
+            $input = implode(', ', $input);
+        }
+
         $a   = self::parse_address_list($input, $decode, $fallback);
         $out = array();
         $j   = 0;
@@ -101,8 +106,9 @@
         // Special chars as defined by RFC 822 need to in quoted string (or escaped).
         $special_chars = '[\<\>\\\.\[\]@,;:"]';
 
-        if (!is_array($a))
+        if (!is_array($a)) {
             return $out;
+        }
 
         foreach ($a as $val) {
             $j++;
@@ -211,9 +217,21 @@
 
                 // Decode and join encoded-word's chunks
                 if ($encoding == 'B' || $encoding == 'b') {
-                    // base64 must be decoded a segment at a time
-                    for ($i=0; $i<$count; $i++)
-                        $text .= base64_decode($tmp[$i]);
+                    $rest  = '';
+                    // base64 must be decoded a segment at a time.
+                    // However, there are broken implementations that continue
+                    // in the following word, we'll handle that (#6048)
+                    for ($i=0; $i<$count; $i++) {
+                        $chunk  = $rest . $tmp[$i];
+                        $length = strlen($chunk);
+                        if ($length % 4) {
+                            $length = floor($length / 4) * 4;
+                            $rest   = substr($chunk, $length);
+                            $chunk  = substr($chunk, 0, $length);
+                        }
+
+                        $text .= base64_decode($chunk);
+                    }
                 }
                 else { //if ($encoding == 'Q' || $encoding == 'q') {
                     // quoted printable can be combined and processed at once
@@ -273,16 +291,17 @@
     public static function parse_headers($headers)
     {
         $a_headers = array();
-        $headers = preg_replace('/\r?\n(\t| )+/', ' ', $headers);
-        $lines = explode("\n", $headers);
-        $c = count($lines);
+        $headers   = preg_replace('/\r?\n(\t| )+/', ' ', $headers);
+        $lines     = explode("\n", $headers);
+        $count     = count($lines);
 
-        for ($i=0; $i<$c; $i++) {
+        for ($i=0; $i<$count; $i++) {
             if ($p = strpos($lines[$i], ': ')) {
                 $field = strtolower(substr($lines[$i], 0, $p));
                 $value = trim(substr($lines[$i], $p+1));
-                if (!empty($value))
+                if (!empty($value)) {
                     $a_headers[$field] = $value;
+                }
             }
         }
 
@@ -435,12 +454,13 @@
     /**
      * Interpret a format=flowed message body according to RFC 2646
      *
-     * @param string $text Raw body formatted as flowed text
-     * @param string $mark Mark each flowed line with specified character
+     * @param string  $text  Raw body formatted as flowed text
+     * @param string  $mark  Mark each flowed line with specified character
+     * @param boolean $delsp Remove the trailing space of each flowed line
      *
      * @return string Interpreted text with unwrapped lines and stuffed space removed
      */
-    public static function unfold_flowed($text, $mark = null)
+    public static function unfold_flowed($text, $mark = null, $delsp = false)
     {
         $text    = preg_split('/\r?\n/', $text);
         $last    = -1;
@@ -448,12 +468,11 @@
         $marks   = array();
 
         foreach ($text as $idx => $line) {
-            if (preg_match('/^(>+)/', $line, $m)) {
+            if ($q = strspn($line, '>')) {
                 // remove quote chars
-                $q    = strlen($m[1]);
-                $line = preg_replace('/^>+/', '', $line);
+                $line = substr($line, $q);
                 // remove (optional) space-staffing
-                $line = preg_replace('/^ /', '', $line);
+                if ($line[0] === ' ') $line = substr($line, 1);
 
                 // The same paragraph (We join current line with the previous one) when:
                 // - the same level of quoting
@@ -463,6 +482,9 @@
                     && isset($text[$last]) && $text[$last][strlen($text[$last])-1] == ' '
                     && !preg_match('/^>+ {0,1}$/', $text[$last])
                 ) {
+                    if ($delsp) {
+                        $text[$last] = substr($text[$last], 0, -1);
+                    }
                     $text[$last] .= $line;
                     unset($text[$idx]);
 
@@ -475,18 +497,20 @@
                 }
             }
             else {
-                $q = 0;
                 if ($line == '-- ') {
                     $last = $idx;
                 }
                 else {
                     // remove space-stuffing
-                    $line = preg_replace('/^ /', '', $line);
+                    if ($line[0] === ' ') $line = substr($line, 1);
 
                     if (isset($text[$last]) && $line && !$q_level
                         && $text[$last] != '-- '
                         && $text[$last][strlen($text[$last])-1] == ' '
                     ) {
+                        if ($delsp) {
+                            $text[$last] = substr($text[$last], 0, -1);
+                        }
                         $text[$last] .= $line;
                         unset($text[$idx]);
 
@@ -527,12 +551,13 @@
 
         foreach ($text as $idx => $line) {
             if ($line != '-- ') {
-                if (preg_match('/^(>+)/', $line, $m)) {
+                if ($level = strspn($line, '>')) {
                     // remove quote chars
-                    $level  = strlen($m[1]);
-                    $line   = preg_replace('/^>+/', '', $line);
+                    $line = substr($line, $level);
                     // remove (optional) space-staffing and spaces before the line end
-                    $line   = preg_replace('/(^ | +$)/', '', $line);
+                    $line = rtrim($line, ' ');
+                    if ($line[0] === ' ') $line = substr($line, 1);
+
                     $prefix = str_repeat('>', $level) . ' ';
                     $line   = $prefix . self::wordwrap($line, $length - $level - 2, " \r\n$prefix", false, $charset);
                 }
@@ -778,6 +803,7 @@
             $file_paths[] = '/etc/nginx/mime.types';
             $file_paths[] = '/usr/local/etc/httpd/conf/mime.types';
             $file_paths[] = '/usr/local/etc/apache/conf/mime.types';
+            $file_paths[] = '/usr/local/etc/apache24/mime.types';
         }
 
         foreach ($file_paths as $fp) {
@@ -789,7 +815,7 @@
 
         $mime_types = $mime_extensions = array();
         $regex = "/([\w\+\-\.\/]+)\s+([\w\s]+)/i";
-        foreach((array)$lines as $line) {
+        foreach ((array)$lines as $line) {
              // skip comments or mime types w/o any extensions
             if ($line[0] == '#' || !preg_match($regex, $line, $matches))
                 continue;

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_mime_decode.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_mime_decode.php Changed

@@ -101,7 +101,7 @@
         $return  = new stdClass;
         $headers = $this->parseHeaders($headers);
 
-        while (list($key, $value) = each($headers)) {
+        foreach ($headers as $value) {
             $header_name = strtolower($value['name']);
 
             if (isset($return->headers[$header_name]) && !is_array($return->headers[$header_name])) {
@@ -124,10 +124,8 @@
                     $return->ctype_secondary = $regs[2];
                 }
 
-                if (isset($content_type['other'])) {
-                    while (list($p_name, $p_value) = each($content_type['other'])) {
-                        $return->ctype_parameters[$p_name] = $p_value;
-                    }
+                if (!empty($content_type['other'])) {
+                    $return->ctype_parameters = array_merge((array) $return->ctype_parameters, (array) $content_type['other']);
                 }
 
                 break;
@@ -136,10 +134,8 @@
                 $content_disposition = $this->parseHeaderValue($value['value']);
                 $return->disposition = $content_disposition['value'];
 
-                if (isset($content_disposition['other'])) {
-                    while (list($p_name, $p_value) = each($content_disposition['other'])) {
-                        $return->d_parameters[$p_name] = $p_value;
-                    }
+                if (!empty($content_disposition['other'])) {
+                    $return->d_parameters = array_merge((array) $return->d_parameters, (array) $content_disposition['other']);
                 }
 
                 break;
@@ -196,6 +192,11 @@
                 $obj = new rcube_mime_decode($this->params);
                 $return->parts[] = $obj->decode($body, false);
                 unset($obj);
+
+                if ($this->params['include_bodies']) {
+                    $return->body = $this->params['decode_bodies'] ? rcube_mime::decode($body, $encoding) : $body;
+                }
+
                 break;
 
             default:

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_output.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_output.php Changed

@@ -198,6 +198,60 @@
     }
 
     /**
+     * Send headers related to file downloads
+     *
+     * @param string $filename File name
+     * @param array  $params   Optional parameters:
+     *                         type         - File content type (default: 'application/octet-stream')
+     *                         disposition  - Download type: 'inline' or 'attachment' (default)
+     *                         length       - Content length
+     *                         charset      - File name character set
+     *                         type_charset - Content character set
+     *                         time_limit   - Script execution limit (default: 3600)
+     */
+    public function download_headers($filename, $params = array())
+    {
+        if (empty($params['disposition'])) {
+            $params['disposition'] = 'attachment';
+        }
+
+        if ($params['disposition'] == 'inline' && stripos($params['type'], 'text') === 0) {
+            $params['type'] .= '; charset=' . ($params['type_charset'] ?: $this->charset);
+        }
+
+        header("Content-Type: " . ($params['type'] ?: "application/octet-stream"));
+
+        if ($params['disposition'] == 'attachment' && $this->browser->ie) {
+            header("Content-Type: application/force-download");
+        }
+
+        $disposition = "Content-Disposition: " . $params['disposition'];
+
+        // For non-ascii characters we'll use RFC2231 syntax
+        if (!preg_match('/[^a-zA-Z0-9_.:,?;@+ -]/', $filename)) {
+            $disposition .= sprintf("; filename=\"%s\"", $filename);
+        }
+        else {
+            $disposition .= sprintf("; filename*=%s''%s", $params['charset'] ?: $this->charset, rawurlencode($filename));
+        }
+
+        header($disposition);
+
+        if (isset($params['length'])) {
+            header("Content-Length: " . $params['length']);
+        }
+
+        // don't kill the connection if download takes more than 30 sec.
+        if (!array_key_exists('time_limit', $params)) {
+            $params['time_limit'] = 3600;
+        }
+
+        if (is_numeric($params['time_limit'])) {
+            @set_time_limit($params['time_limit']);
+        }
+    }
+
+    /**
      * Show error page and terminate script execution
      *
      * @param int    $code     Error code
@@ -265,16 +319,36 @@
     /**
      * Convert a variable into a javascript object notation
      *
-     * @param mixed Input value
+     * @param mixed   $input  Input value
+     * @param boolean $pretty Enable JSON formatting
+     * @param boolean $inline Enable inline mode (generates output safe for use inside HTML)
      *
      * @return string Serialized JSON string
      */
-    public static function json_serialize($input)
+    public static function json_serialize($input, $pretty = false, $inline = true)
     {
-        $input = rcube_charset::clean($input);
+        // The input need to be valid UTF-8 to use with json_encode()
+        $input   = rcube_charset::clean($input);
+        $options = JSON_UNESCAPED_SLASHES;
+
+        // JSON_HEX_TAG is needed for inlining JSON inside of the <script> tag
+        // if input contains a html tag it will cause issues (#6207)
+        if ($inline) {
+            $options |= JSON_HEX_TAG;
+        }
+
+        // JSON_UNESCAPED_UNICODE in PHP < 7.1.0 does not escape U+2028 and U+2029
+        // which causes issues (#6187)
+        if (PHP_VERSION_ID >= 70100) {
+            $options |= JSON_UNESCAPED_UNICODE;
+        }
+
+        if ($pretty) {
+            $options |= JSON_PRETTY_PRINT;
+        }
 
         // sometimes even using rcube_charset::clean() the input contains invalid UTF-8 sequences
         // that's why we have @ here
-        return @json_encode($input);
+        return @json_encode($input, $options);
     }
 }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_plugin.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_plugin.php Changed

@@ -199,62 +199,19 @@
      */
     public function add_texts($dir, $add2client = false)
     {
-        $domain = $this->ID;
-        $lang   = $_SESSION['language'];
-        $langs  = array_unique(array('en_US', $lang));
-        $locdir = slashify(realpath(slashify($this->home) . $dir));
-        $texts  = array();
-
-        // Language aliases used to find localization in similar lang, see below
-        $aliases = array(
-            'de_CH' => 'de_DE',
-            'es_AR' => 'es_ES',
-            'fa_AF' => 'fa_IR',
-            'nl_BE' => 'nl_NL',
-            'pt_BR' => 'pt_PT',
-            'zh_CN' => 'zh_TW',
-        );
-
-        // use buffering to handle empty lines/spaces after closing PHP tag
-        ob_start();
-
-        foreach ($langs as $lng) {
-            $fpath = $locdir . $lng . '.inc';
-            if (is_file($fpath) && is_readable($fpath)) {
-                include $fpath;
-                $texts = (array)$labels + (array)$messages + (array)$texts;
-            }
-            else if ($lng != 'en_US') {
-                // Find localization in similar language (#1488401)
-                $alias = null;
-                if (!empty($aliases[$lng])) {
-                    $alias = $aliases[$lng];
-                }
-                else if ($key = array_search($lng, $aliases)) {
-                    $alias = $key;
-                }
-
-                if (!empty($alias)) {
-                    $fpath = $locdir . $alias . '.inc';
-                    if (is_file($fpath) && is_readable($fpath)) {
-                        include $fpath;
-                        $texts = (array)$labels + (array)$messages + (array)$texts;
-                    }
-                }
-            }
-        }
-
-        ob_end_clean();
+        $rcube = rcube::get_instance();
+        $texts = $rcube->read_localization(realpath(slashify($this->home) . $dir));
 
         // prepend domain to text keys and add to the application texts repository
         if (!empty($texts)) {
-            $add = array();
+            $domain = $this->ID;
+            $add    = array();
+
             foreach ($texts as $key => $value) {
                 $add[$domain.'.'.$key] = $value;
             }
 
-            $rcube = rcube::get_instance();
-            $rcube->load_language($lang, $add);
+            $rcube->load_language($_SESSION['language'], $add);
 
             // add labels to client
             if ($add2client && method_exists($rcube->output, 'add_label')) {
@@ -264,6 +221,7 @@
                 else {
                     $js_labels = array_keys($add);
                 }
+
                 $rcube->output->add_label($js_labels);
             }
         }
@@ -358,7 +316,7 @@
      */
     public function include_stylesheet($fn)
     {
-        $this->api->include_stylesheet($this->resource_url($fn));
+        $this->api->include_stylesheet($this->resource_url($fn), $if_exists);
     }
 
     /**

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_plugin_api.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_plugin_api.php Changed

@@ -435,14 +435,16 @@
         array_push($this->exec_stack, $hook);
 
         // Use for loop here, so handlers added in the hook will be executed too
-        for ($i = 0; $i < count($this->handlers[$hook]); $i++) {
-            $ret = call_user_func($this->handlers[$hook][$i], $args);
-            if ($ret && is_array($ret)) {
-                $args = $ret + $args;
-            }
+        if (!empty($this->handlers[$hook])) {
+            for ($i = 0; $i < count($this->handlers[$hook]); $i++) {
+                $ret = call_user_func($this->handlers[$hook][$i], $args);
+                if ($ret && is_array($ret)) {
+                    $args = $ret + $args;
+                }
 
-            if ($args['break']) {
-                break;
+                if ($args['break']) {
+                    break;
+                }
             }
         }
 
@@ -607,6 +609,31 @@
     public function include_stylesheet($fn)
     {
         if (is_object($this->output) && $this->output->type == 'html') {
+            if ($fn[0] != '/' && !preg_match('|^https?://|i', $fn)) {
+                $rcube      = rcube::get_instance();
+                $devel_mode = $rcube->config->get('devel_mode');
+                $assets_dir = $rcube->config->get('assets_dir');
+                $path       = unslashify($assets_dir ?: RCUBE_INSTALL_PATH);
+
+                // Prefer .less files in devel_mode (assume less.js is loaded)
+                if ($devel_mode) {
+                    $less = preg_replace('/\.css$/i', '.less', $fn);
+                    if ($less != $fn && is_file("$path/plugins/$less")) {
+                        $fn = $less;
+                    }
+                }
+                else if (!preg_match('/\.min\.css$/', $fn)) {
+                    $min = preg_replace('/\.css$/i', '.min.css', $fn);
+                    if (is_file("$path/plugins/$min")) {
+                        $fn = $min;
+                    }
+                }
+
+                if (!is_file("$path/plugins/$fn")) {
+                    return;
+                }
+            }
+
             $src = $this->resource_url($fn);
             $this->output->include_css($src);
         }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_result_set.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_result_set.php Changed

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_session.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_session.php Changed

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_smtp.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_smtp.php Changed

@@ -60,9 +60,9 @@
         // let plugins alter smtp connection config
         $CONFIG = $rcube->plugins->exec_hook('smtp_connect', array(
             'smtp_server'    => $host ?: $rcube->config->get('smtp_server'),
-            'smtp_port'      => $port ?: $rcube->config->get('smtp_port', 25),
-            'smtp_user'      => $user !== null ? $user : $rcube->config->get('smtp_user'),
-            'smtp_pass'      => $pass !== null ? $pass : $rcube->config->get('smtp_pass'),
+            'smtp_port'      => $port ?: $rcube->config->get('smtp_port', 587),
+            'smtp_user'      => $user !== null ? $user : $rcube->config->get('smtp_user', '%u'),
+            'smtp_pass'      => $pass !== null ? $pass : $rcube->config->get('smtp_pass', '%p'),
             'smtp_auth_cid'  => $rcube->config->get('smtp_auth_cid'),
             'smtp_auth_pw'   => $rcube->config->get('smtp_auth_pw'),
             'smtp_auth_type' => $rcube->config->get('smtp_auth_type'),
@@ -95,11 +95,14 @@
             $use_tls   = true;
         }
 
+        // Handle per-host socket options
+        rcube_utils::parse_socket_options($CONFIG['smtp_conn_options'], $smtp_host);
+
         if (!empty($CONFIG['smtp_helo_host'])) {
             $helo_host = $CONFIG['smtp_helo_host'];
         }
         else if (!empty($_SERVER['SERVER_NAME'])) {
-            $helo_host = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
+            $helo_host = rcube_utils::server_name();
         }
         else {
             $helo_host = 'localhost';
@@ -183,7 +186,7 @@
      *
      * @param string Sender e-Mail address
      *
-     * @param mixed  Either a comma-seperated list of recipients
+     * @param mixed  Either a comma-separated list of recipients
      *               (RFC822 compliant), or an array of recipients,
      *               each RFC822 valid. This may contain recipients not
      *               specified in the headers, for Bcc:, resending
@@ -223,16 +226,37 @@
             return false;
         }
 
+        // prepare list of recipients
+        $recipients = $this->_parse_rfc822($recipients);
+        if (is_a($recipients, 'PEAR_Error')) {
+            $this->error = array('label' => 'smtprecipientserror');
+            $this->reset();
+            return false;
+        }
+
+        $exts = $this->conn->getServiceExtensions();
+
         // RFC3461: Delivery Status Notification
         if ($opts['dsn']) {
-            $exts = $this->conn->getServiceExtensions();
-
             if (isset($exts['DSN'])) {
                 $from_params      = 'RET=HDRS';
                 $recipient_params = 'NOTIFY=SUCCESS,FAILURE';
             }
         }
 
+        // RFC6531: request SMTPUTF8 if needed
+        if (preg_match('/[^\x00-\x7F]/', $from . implode('', $recipients))) {
+            if (isset($exts['SMTPUTF8'])) {
+                $from_params = ltrim($from_params . ' SMTPUTF8');
+            }
+            else {
+                $this->error = array('label' => 'smtputf8error');
+                $this->response[] = "SMTP server does not support unicode in email addresses";
+                $this->reset();
+                return false;
+            }
+        }
+
         // RFC2298.3: remove envelope sender address
         if (empty($opts['mdn_use_from'])
             && preg_match('/Content-Type: multipart\/report/', $text_headers)
@@ -253,14 +277,6 @@
             return false;
         }
 
-        // prepare list of recipients
-        $recipients = $this->_parse_rfc822($recipients);
-        if (is_a($recipients, 'PEAR_Error')) {
-            $this->error = array('label' => 'smtprecipientserror');
-            $this->reset();
-            return false;
-        }
-
         // set mail recipients
         foreach ($recipients as $recipient) {
             $result = $this->conn->rcptTo($recipient, $recipient_params);
@@ -297,15 +313,37 @@
         // Send the message's headers and the body as SMTP data.
         $result = $this->conn->data($data, $text_headers);
         if (is_a($result, 'PEAR_Error')) {
-            $err = $this->conn->getResponse();
+            $err       = $this->conn->getResponse();
+            $err_label = 'smtperror';
+            $err_vars  = array();
+
             if (!in_array($err[0], array(354, 250, 221))) {
                 $msg = sprintf('[%d] %s', $err[0], $err[1]);
             }
             else {
                 $msg = $result->getMessage();
+
+                if (strpos($msg, 'size exceeds')) {
+                    $err_label = 'smtpsizeerror';
+                    $exts      = $this->conn->getServiceExtensions();
+                    $limit     = $exts['SIZE'];
+
+                    if ($limit) {
+                        $msg .= " (Limit: $limit)";
+                        $rcube = rcube::get_instance();
+                        if (method_exists($rcube, 'show_bytes')) {
+                            $limit = $rcube->show_bytes($limit);
+                        }
+
+                        $err_vars['limit'] = $limit;
+                        $err_label         = 'smtpsizeerror';
+                    }
+                }
             }
 
-            $this->error = array('label' => 'smtperror', 'vars' => array('msg' => $msg));
+            $err_vars['msg'] = $msg;
+
+            $this->error = array('label' => $err_label, 'vars' => $err_vars);
             $this->response[] = "Failed to send data. " . $msg;
             $this->reset();
             return false;
@@ -445,7 +483,7 @@
      * bare addresses (forward paths) that can be passed to sendmail
      * or an smtp server with the rcpt to: command.
      *
-     * @param mixed Either a comma-seperated list of recipients
+     * @param mixed Either a comma-separated list of recipients
      *              (RFC822 compliant), or an array of recipients,
      *              each RFC822 valid.
      *

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_spellchecker.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_spellchecker.php Changed

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_storage.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_storage.php Changed

@@ -42,13 +42,13 @@
      */
     public static $folder_types = array('drafts', 'sent', 'junk', 'trash');
 
-    protected $folder = 'INBOX';
+    protected $folder          = 'INBOX';
     protected $default_charset = 'ISO-8859-1';
+    protected $options         = array('auth_type' => 'check', 'language' => 'en_US');
+    protected $page_size       = 10;
+    protected $list_page       = 1;
+    protected $threading       = false;
     protected $search_set;
-    protected $options = array('auth_type' => 'check');
-    protected $page_size = 10;
-    protected $list_page = 1;
-    protected $threading = false;
 
     /**
      * All (additional) headers used (in any way) by Roundcube
@@ -80,6 +80,8 @@
     const NONEXISTENT   = 7;
     const CONTACTADMIN  = 8;
 
+    const DUAL_USE_FOLDERS = 'X-DUAL-USE-FOLDERS';
+
 
     /**
      * Connect to the server
@@ -177,7 +179,7 @@
 
     /**
      * Set internal folder reference.
-     * All operations will be perfomed on this folder.
+     * All operations will be performed on this folder.
      *
      * @param  string $folder  Folder name
      */
@@ -434,7 +436,7 @@
      * @param  int                $uid    Message UID
      * @param  string             $part   Part number
      * @param  rcube_message_part $o_part Part object created by get_structure()
-     * @param  mixed              $print  True to print part, ressource to write part contents in
+     * @param  mixed              $print  True to print part, resource to write part contents in
      * @param  resource           $fp     File pointer to save the message part
      * @param  boolean            $skip_charset_conv Disables charset conversion
      *
@@ -608,7 +610,7 @@
 
 
     /* --------------------------------
-     *        folder managment
+     *        folder management
      * --------------------------------*/
 
     /**
@@ -660,10 +662,14 @@
      *
      * @param string  $folder    New folder name
      * @param boolean $subscribe True if the newvfolder should be subscribed
+     * @param string  $type      Optional folder type (junk, trash, drafts, sent, archive)
+     * @param boolean $noselect  Make the folder \NoSelect folder by adding hierarchy
+     *                           separator at the end (useful for server that do not support
+     *                           both folders and messages as folder children)
      *
      * @return boolean True on success, False on error
      */
-    abstract function create_folder($folder, $subscribe = false);
+    abstract function create_folder($folder, $subscribe = false, $type = null, $noselect = false);
 
     /**
      * Set a new name to an existing folder
@@ -797,6 +803,26 @@
     abstract function mod_folder($folder, $mode = 'out');
 
     /**
+     * Check if the folder name is valid
+     *
+     * @param string $folder Folder name (UTF-8)
+     * @param string &$char  First forbidden character found
+     *
+     * @return bool True if the name is valid, False otherwise
+     */
+    public function folder_validate($folder, &$char = null)
+    {
+        $delim = $this->get_hierarchy_delimiter();
+
+        if (strpos($folder, $delim) !== false) {
+            $char = $delim;
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
      * Create all folders specified as default
      */
     public function create_default_folders()
@@ -849,7 +875,7 @@
      */
     public function set_special_folders($specials)
     {
-        // should be overriden by storage class if backend supports special folders (SPECIAL-USE)
+        // should be overridden by storage class if backend supports special folders (SPECIAL-USE)
         unset($this->icache['special-folders']);
     }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_text2html.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_text2html.php Changed

@@ -48,6 +48,8 @@
         'space' => "\xC2\xA0",
         // enables format=flowed parser
         'flowed' => false,
+        // enables delsp=yes parser
+        'delsp' => false,
         // enables wrapping for non-flowed text
         'wrap' => true,
         // line-break tag
@@ -150,7 +152,8 @@
 
         if ($this->config['flowed']) {
             $flowed_char = 0x01;
-            $text        = rcube_mime::unfold_flowed($text, chr($flowed_char));
+            $delsp       = $this->config['delsp'];
+            $text        = rcube_mime::unfold_flowed($text, chr($flowed_char), $delsp);
         }
 
         // search for patterns like links and e-mail addresses and replace with tokens
@@ -270,6 +273,10 @@
         if (empty($table)) {
             $table = get_html_translation_table(HTML_SPECIALCHARS);
             unset($table['?']);
+
+            // replace some whitespace characters
+            $table["\r"] = '';
+            $table["\t"] = '    ';
         }
 
         // skip signature separator
@@ -277,12 +284,9 @@
             return '--' . $this->config['space'];
         }
 
-        // replace HTML special characters
+        // replace HTML special and whitespace characters
         $text = strtr($text, $table);
 
-        // replace some whitespace characters
-        $text = str_replace(array("\r", "\t"), array('', '    '), $text);
-
         $nbsp = $this->config['space'];
 
         // replace spaces with non-breaking spaces

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_tnef_decoder.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_tnef_decoder.php Changed

@@ -3,7 +3,7 @@
 /**
  +-----------------------------------------------------------------------+
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2008-2014, The Roundcube Dev Team                       |
+ | Copyright (C) 2008-2017, 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            |
@@ -15,6 +15,7 @@
  +-----------------------------------------------------------------------+
  | Author: Jan Schneider <jan@horde.org>                                 |
  | Author: Michael Slusarz <slusarz@horde.org>                           |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
  +-----------------------------------------------------------------------+
 */
 
@@ -29,101 +30,166 @@
  */
 class rcube_tnef_decoder
 {
-    const SIGNATURE = 0x223e9f78;
-    const LVL_MESSAGE = 0x01;
-    const LVL_ATTACHMENT = 0x02;
-
-    const ASUBJECT = 0x88004;
-    const AMCLASS = 0x78008;
-    const ATTACHDATA = 0x6800f;
-    const AFILENAME = 0x18010;
-    const ARENDDATA = 0x69002;
-    const AMAPIATTRS = 0x69005;
-    const AVERSION = 0x89006;
-
-    const MAPI_NULL = 0x0001;
-    const MAPI_SHORT = 0x0002;
-    const MAPI_INT = 0x0003;
-    const MAPI_FLOAT = 0x0004;
-    const MAPI_DOUBLE = 0x0005;
-    const MAPI_CURRENCY = 0x0006;
-    const MAPI_APPTIME = 0x0007;
-    const MAPI_ERROR = 0x000a;
-    const MAPI_BOOLEAN = 0x000b;
-    const MAPI_OBJECT = 0x000d;
-    const MAPI_INT8BYTE = 0x0014;
-    const MAPI_STRING = 0x001e;
+    const SIGNATURE         = 0x223e9f78;
+    const LVL_MESSAGE       = 0x01;
+    const LVL_ATTACHMENT    = 0x02;
+
+    const AFROM             = 0x08000;
+    const ASUBJECT          = 0x18004;
+    const AMESSAGEID        = 0x18009;
+    const AFILENAME         = 0x18010;
+    const APARENTID         = 0x1800a;
+    const ACONVERSATIONID   = 0x1800b;
+    const ABODY             = 0x2800c;
+    const ADATESENT         = 0x38005;
+    const ADATERECEIVED     = 0x38006;
+    const ADATEMODIFIED     = 0x38020;
+    const APRIORITY         = 0x4800d;
+    const AOWNER            = 0x60000;
+    const ASENTFOR          = 0x60001;
+    const ASTATUS           = 0x68007;
+    const ATTACHDATA        = 0x6800f;
+    const ATTACHMETAFILE    = 0x68011;
+    const ATTACHCREATEDATE  = 0x38012;
+    const ARENDDATA         = 0x69002;
+    const AMAPIPROPS        = 0x69003;
+    const ARECIPIENTTABLE   = 0x69004;
+    const AMAPIATTRS        = 0x69005;
+    const AOEMCODEPAGE      = 0x69007;
+    const AORIGINALMCLASS   = 0x70006;
+    const AMCLASS           = 0x78008;
+    const AVERSION          = 0x89006;
+
+    const MAPI_TYPE_UNSET     = 0x0000;
+    const MAPI_NULL           = 0x0001;
+    const MAPI_SHORT          = 0x0002;
+    const MAPI_INT            = 0x0003;
+    const MAPI_FLOAT          = 0x0004;
+    const MAPI_DOUBLE         = 0x0005;
+    const MAPI_CURRENCY       = 0x0006;
+    const MAPI_APPTIME        = 0x0007;
+    const MAPI_ERROR          = 0x000a;
+    const MAPI_BOOLEAN        = 0x000b;
+    const MAPI_OBJECT         = 0x000d;
+    const MAPI_INT8BYTE       = 0x0014;
+    const MAPI_STRING         = 0x001e;
     const MAPI_UNICODE_STRING = 0x001f;
-    const MAPI_SYSTIME = 0x0040;
-    const MAPI_CLSID = 0x0048;
-    const MAPI_BINARY = 0x0102;
+    const MAPI_SYSTIME        = 0x0040;
+    const MAPI_CLSID          = 0x0048;
+    const MAPI_BINARY         = 0x0102;
+
+    const MAPI_BODY                     = 0x1000;
+    const MAPI_RTF_COMPRESSED           = 0x1009;
+    const MAPI_BODY_HTML                = 0x1013;
+    const MAPI_NATIVE_BODY              = 0x1016;
+
+    const MAPI_DISPLAY_NAME             = 0x3001;
+    const MAPI_ADDRTYPE                 = 0x3002;
+    const MAPI_EMAIL_ADDRESS            = 0x3003;
+    const MAPI_COMMENT                  = 0x3004;
+    const MAPI_DEPTH                    = 0x3005;
+    const MAPI_PROVIDER_DISPLAY         = 0x3006;
+    const MAPI_CREATION_TIME            = 0x3007;
+    const MAPI_LAST_MODIFICATION_TIME   = 0x3008;
+    const MAPI_RESOURCE_FLAGS           = 0x3009;
+    const MAPI_PROVIDER_DLL_NAME        = 0x300A;
+    const MAPI_SEARCH_KEY               = 0x300B;
+    const MAPI_ATTACHMENT_X400_PARAMETERS = 0x3700;
+    const MAPI_ATTACH_DATA              = 0x3701;
+    const MAPI_ATTACH_ENCODING          = 0x3702;
+    const MAPI_ATTACH_EXTENSION         = 0x3703;
+    const MAPI_ATTACH_FILENAME          = 0x3704;
+    const MAPI_ATTACH_METHOD            = 0x3705;
+    const MAPI_ATTACH_LONG_FILENAME     = 0x3707;
+    const MAPI_ATTACH_PATHNAME          = 0x3708;
+    const MAPI_ATTACH_RENDERING         = 0x3709;
+    const MAPI_ATTACH_TAG               = 0x370A;
+    const MAPI_RENDERING_POSITION       = 0x370B;
+    const MAPI_ATTACH_TRANSPORT_NAME    = 0x370C;
+    const MAPI_ATTACH_LONG_PATHNAME     = 0x370D;
+    const MAPI_ATTACH_MIME_TAG          = 0x370E;
+    const MAPI_ATTACH_ADDITIONAL_INFO   = 0x370F;
+    const MAPI_ATTACH_MIME_SEQUENCE     = 0x3710;
+    const MAPI_ATTACH_CONTENT_ID        = 0x3712;
+    const MAPI_ATTACH_CONTENT_LOCATION  = 0x3713;
+    const MAPI_ATTACH_FLAGS             = 0x3714;
+
+    const MAPI_NAMED_TYPE_ID        = 0x0000;
+    const MAPI_NAMED_TYPE_STRING    = 0x0001;
+    const MAPI_NAMED_TYPE_NONE      = 0xff;
+    const MAPI_MV_FLAG              = 0x1000;
+
+    const RTF_UNCOMPRESSED = 0x414c454d;
+    const RTF_COMPRESSED   = 0x75465a4c;
 
-    const MAPI_ATTACH_LONG_FILENAME = 0x3707;
-    const MAPI_ATTACH_MIME_TAG = 0x370E;
-
-    const MAPI_NAMED_TYPE_ID = 0x0000;
-    const MAPI_NAMED_TYPE_STRING = 0x0001;
-    const MAPI_MV_FLAG = 0x1000;
 
     /**
      * Decompress the data.
      *
-     * @param string $data   The data to decompress.
-     * @param array $params  An array of arguments needed to decompress the
-     *                       data.
+     * @param string $data The data to decompress.
      *
-     * @return mixed  The decompressed data.
+     * @return mixed The decompressed data.
      */
-    public function decompress($data, $params = array())
+    public function decompress($data)
     {
-        $out = array();
+        $attachments = array();
+        $message     = array();
 
         if ($this->_geti($data, 32) == self::SIGNATURE) {
             $this->_geti($data, 16);
 
+            // Version
+            $this->_geti($data, 8);     // lvl_message
+            $this->_geti($data, 32);    // idTnefVersion
+            $this->_getx($data, $this->_geti($data, 32));
+            $this->_geti($data, 16);    // checksum
+
             while (strlen($data) > 0) {
                 switch ($this->_geti($data, 8)) {
                 case self::LVL_MESSAGE:
-                    $this->_decodeMessage($data);
+                    $this->_decodeMessage($data, $message);
                     break;
 
                 case self::LVL_ATTACHMENT:
-                    $this->_decodeAttachment($data, $out);
+                    $this->_decodeAttachment($data, $attachments);
                     break;
                 }
             }
         }
 
-        return array_reverse($out);
+        return array(
+            'message'     => $message,
+            'attachments' => array_reverse($attachments),
+        );
     }
 
     /**
-     * TODO
+     * Pop specified number of bytes from the buffer.
      *
-     * @param string &$data  The data string.
-     * @param integer $bits  How many bits to retrieve.
+     * @param string  &$data The data string.
+     * @param integer $bytes How many bytes to retrieve.
      *
-     * @return TODO
+     * @return string Extracted data
      */
-    protected function _getx(&$data, $bits)
+    protected function _getx(&$data, $bytes)
     {
         $value = null;
 
-        if (strlen($data) >= $bits) {
-            $value = substr($data, 0, $bits);
-            $data = substr_replace($data, '', 0, $bits);
+        if (strlen($data) >= $bytes) {
+            $value = substr($data, 0, $bytes);
+            $data  = substr($data, $bytes);
         }
 
         return $value;
     }
 
     /**
-     * TODO
+     * Pop specified number of bits from the buffer
      *
-     * @param string &$data  The data string.
+     * @param string  &$data The data string.
      * @param integer $bits  How many bits to retrieve.
      *
-     * @return TODO
+     * @return int
      */
     protected function _geti(&$data, $bits)
     {
@@ -138,42 +204,44 @@
             if ($bytes >= 4) {
                 $value += (ord($data[2]) << 16) + (ord($data[3]) << 24);
             }
-            $data = substr_replace($data, '', 0, $bytes);
+
+            $data = substr($data, $bytes);
         }
 
         return $value;
     }
 
     /**
-     * TODO
+     * Decode a single attribute
      *
-     * @param string &$data      The data string.
-     * @param string $attribute  TODO
+     * @param string &$data The data string.
      */
-    protected function _decodeAttribute(&$data, $attribute)
+    protected function _decodeAttribute(&$data)
     {
-        /* Data. */
-        $this->_getx($data, $this->_geti($data, 32));
+        // Data.
+        $value = $this->_getx($data, $this->_geti($data, 32));
 
-        /* Checksum. */
+        // Checksum.
         $this->_geti($data, 16);
+
+        return $value;
     }
 
     /**
      * TODO
      *
-     * @param string $data             The data string.
-     * @param array &$attachment_data  TODO
+     * @param string $data   The data string.
+     * @param array  &result TODO
      */
-    protected function _extractMapiAttributes($data, &$attachment_data)
+    protected function _extractMapiAttributes($data, &$result)
     {
-        /* Number of attributes. */
+        // Number of attributes.
         $number = $this->_geti($data, 32);
 
         while ((strlen($data) > 0) && $number--) {
             $have_mval = false;
-            $num_mval = 1;
-            $named_id = $value = null;
+            $num_mval  = 1;
+            $value     = null;
             $attr_type = $this->_geti($data, 16);
             $attr_name = $this->_geti($data, 16);
 
@@ -188,16 +256,19 @@
 
                 switch ($named_type) {
                 case self::MAPI_NAMED_TYPE_ID:
-                    $named_id = $this->_geti($data, 32);
-                    $attr_name = $named_id;
+                    $attr_name = $this->_geti($data, 32);
                     break;
 
                 case self::MAPI_NAMED_TYPE_STRING:
                     $attr_name = 0x9999;
-                    $idlen = $this->_geti($data, 32);
-                    $datalen = $idlen + ((4 - ($idlen % 4)) % 4);
-                    $named_id = substr($this->_getx($data, $datalen), 0, $idlen);
+                    $idlen     = $this->_geti($data, 32);
+                    $name      = $this->_getx($data, $idlen + ((4 - ($idlen % 4)) % 4));
+                    // $name      = $this->convertString(substr($name, 0, $idlen));
                     break;
+
+                case self::MAPI_NAMED_TYPE_NONE:
+                default:
+                    continue 2;
                 }
             }
 
@@ -206,8 +277,13 @@
             }
 
             switch ($attr_type) {
+            case self::MAPI_NULL:
+            case self::MAPI_TYPE_UNSET:
+                break;
+
             case self::MAPI_SHORT:
                 $value = $this->_geti($data, 16);
+                $this->_geti($data, 16);
                 break;
 
             case self::MAPI_INT:
@@ -238,104 +314,439 @@
                 for ($i = 0; $i < $num_vals; $i++) {
                     $length = $this->_geti($data, 32);
 
-                    /* Pad to next 4 byte boundary. */
+                    // Pad to next 4 byte boundary.
                     $datalen = $length + ((4 - ($length % 4)) % 4);
 
-                    if ($attr_type == self::MAPI_STRING) {
-                        --$length;
-                    }
+                    // Read and truncate to length.
+                    $value = $this->_getx($data, $datalen);
+                }
 
-                    /* Read and truncate to length. */
-                    $value = substr($this->_getx($data, $datalen), 0, $length);
+                if ($attr_type == self::MAPI_UNICODE_STRING) {
+                    $value = $this->convertString($value);
                 }
+
                 break;
             }
 
-            /* Store any interesting attributes. */
+            // Store any interesting attributes.
             switch ($attr_name) {
+            case self::MAPI_RTF_COMPRESSED:
+                $result['type']    = 'application';
+                $result['subtype'] = 'rtf';
+                $result['name']    = ($result['name'] ?: 'Untitled') . '.rtf';
+                $result['stream']  = $this->_decodeRTF($value);
+                $result['size']    = strlen($result['stream']);
+                break;
+
+            case self::MAPI_BODY:
+            case self::MAPI_BODY_HTML:
+                $result['type']    = 'text';
+                $result['subtype'] = $attr_name == self::MAPI_BODY ? 'plain' : 'html';
+                $result['name']    = ($result['name'] ?: 'Untitled') . ($attr_name == self::MAPI_BODY ? '.txt' : '.html');
+                $result['stream']  = $value;
+                $result['size']    = strlen($value);
+                break;
+
             case self::MAPI_ATTACH_LONG_FILENAME:
-                $value = str_replace("\0", '', $value);
-                /* Used in preference to AFILENAME value. */
-                $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $value);
+                // Used in preference to AFILENAME value.
+                $result['name'] = trim(preg_replace('/.*[\/](.*)$/', '\1', $value));
                 break;
 
             case self::MAPI_ATTACH_MIME_TAG:
-                $value = str_replace("\0", '', $value);
-                /* Is this ever set, and what is format? */
-                $attachment_data[0]['type']    = preg_replace('/^(.*)\/.*/', '\1', $value);
-                $attachment_data[0]['subtype'] = preg_replace('/.*\/(.*)$/', '\1', $value);
+                // Is this ever set, and what is format?
+                $value = explode('/', $value);
+                $result['type']    = $value[0];
+                $result['subtype'] = $value[1];
+                break;
+
+            case self::MAPI_ATTACH_DATA:
+                $this->_getx($value, 16);
+                $att = new rcube_tnef_decoder;
+                $res = $att->decompress($value);
+                $result = array_merge($result, $res['message']);
                 break;
             }
         }
     }
 
     /**
-     * TODO
+     * Decodes TNEF message attributes
      *
-     * @param string &$data  The data string.
+     * @param string &$data    The data string.
+     * @param array  &$message Message data
      */
-    protected function _decodeMessage(&$data)
+    protected function _decodeMessage(&$data, &$message)
     {
-        $this->_decodeAttribute($data, $this->_geti($data, 32));
+        $attribute = $this->_geti($data, 32);
+        $value     = $this->_decodeAttribute($data);
+
+        switch ($attribute) {
+        case self::AOEMCODEPAGE:
+            // Find codepage of the message
+            $value = unpack('V', $value);
+            $this->codepage = $value[1];
+            break;
+
+        case self::AMCLASS:
+            $value = trim(str_replace('Microsoft Mail v3.0 ', '', $value));
+            // Normal message will be that with prefix 'IPM.Microsoft Mail.
+            break;
+
+        case self::ASUBJECT:
+            $message['name'] = $value;
+            break;
+
+        case self::AMAPIPROPS:
+            $this->_extractMapiAttributes($value, $message);
+            break;
+        }
     }
 
     /**
-     * TODO
+     * Decodes TNEF attachment attributes
      *
-     * @param string &$data            The data string.
-     * @param array &$attachment_data  TODO
+     * @param string &$data       The data string.
+     * @param array  &$attachment Attachments data
      */
-    protected function _decodeAttachment(&$data, &$attachment_data)
+    protected function _decodeAttachment(&$data, &$attachment)
     {
         $attribute = $this->_geti($data, 32);
+        $size      = $this->_geti($data, 32);
+        $value     = $this->_getx($data, $size);
+
+        $this->_geti($data, 16); // checksum
 
         switch ($attribute) {
         case self::ARENDDATA:
-            /* Marks start of new attachment. */
-            $this->_getx($data, $this->_geti($data, 32));
-
-            /* Checksum */
-            $this->_geti($data, 16);
+            // Add a new default data block to hold details of this
+            // attachment. Reverse order is easier to handle later!
+            array_unshift($attachment, array(
+                    'type'    => 'application',
+                    'subtype' => 'octet-stream',
+                    'name'    => 'unknown',
+                    'stream'  => ''
+            ));
 
-            /* Add a new default data block to hold details of this
-               attachment. Reverse order is easier to handle later! */
-            array_unshift($attachment_data, array('type'    => 'application',
-                                                  'subtype' => 'octet-stream',
-                                                  'name'    => 'unknown',
-                                                  'stream'  => ''));
             break;
 
         case self::AFILENAME:
-            $value = $this->_getx($data, $this->_geti($data, 32));
-            $value = str_replace("\0", '', $value);
-            /* Strip path. */
-            $attachment_data[0]['name'] = preg_replace('/.*[\/](.*)$/', '\1', $value);
-
-            /* Checksum */
-            $this->_geti($data, 16);
+            $value = $this->convertString($value, true);
+            // Strip path
+            $attachment[0]['name'] = trim(preg_replace('/.*[\/](.*)$/', '\1', $value));
             break;
 
         case self::ATTACHDATA:
-            /* The attachment itself. */
-            $length = $this->_geti($data, 32);
-            $attachment_data[0]['size'] = $length;
-            $attachment_data[0]['stream'] = $this->_getx($data, $length);
-
-            /* Checksum */
-            $this->_geti($data, 16);
+            // The attachment itself
+            $attachment[0]['size']   = $size;
+            $attachment[0]['stream'] = $value;
             break;
 
         case self::AMAPIATTRS:
-            $length = $this->_geti($data, 32);
-            $value = $this->_getx($data, $length);
-
-            /* Checksum */
-            $this->_geti($data, 16);
-            $this->_extractMapiAttributes($value, $attachment_data);
+            $this->_extractMapiAttributes($value, $attachment[0]);
             break;
+        }
+    }
 
-        default:
-            $this->_decodeAttribute($data, $attribute);
+    /**
+     * Convert string value to system charset according to defined codepage
+     */
+    protected function convertString($str, $use_codepage = false)
+    {
+        if ($use_codepage && $this->codepage
+            && ($charset = rcube_charset::$windows_codepages[$this->codepage])
+        ) {
+            $str = rcube_charset::convert($str, $charset, RCUBE_CHARSET);
         }
+        else if (($pos = strpos($str, "\0")) !== false && $pos != strlen($str)-1) {
+            $str = rcube_charset::convert($str, 'UTF-16LE', RCUBE_CHARSET);
+        }
+
+        return trim($str);
+    }
+
+    /**
+     * Decodes TNEF RTF
+     */
+    protected function _decodeRTF($data)
+    {
+        $c_size = $this->_geti($data, 32);
+        $size   = $this->_geti($data, 32);
+        $magic  = $this->_geti($data, 32);
+        $crc    = $this->_geti($data, 32);
+
+        if ($magic == self::RTF_COMPRESSED) {
+            $data = $this->_decompressRTF($data, $size);
+        }
+
+        return $data;
+    }
+
+    /**
+     * Decompress compressed RTF. Logic taken from Horde.
+     */
+    protected function _decompressRTF($data, $size)
+    {
+        $in = $out = $flags = $flag_count = 0;
+        $uncomp    = '';
+        $preload   = "{\\rtf1\\ansi\\mac\\deff0\\deftab720{\\fonttbl;}{\\f0\\fnil \\froman \\fswiss \\fmodern \\fscript \\fdecor MS Sans SerifSymbolArialTimes New RomanCourier{\\colortbl\\red0\\green0\\blue0\n\r\\par \\pard\\plain\\f0\\fs20\\b\\i\\u\\tab\\tx";
+        $length_preload = strlen($preload);
+
+        for ($cnt = 0; $cnt < $length_preload; $cnt++) {
+            $uncomp .= $preload{$cnt};
+            ++$out;
+        }
+
+        while ($out < ($size + $length_preload)) {
+            if (($flag_count++ % 8) == 0) {
+                $flags = ord($data{$in++});
+            }
+            else {
+                $flags = $flags >> 1;
+            }
+
+            if (($flags & 1) != 0) {
+                $offset = ord($data{$in++});
+                $length = ord($data{$in++});
+                $offset = ($offset << 4) | ($length >> 4);
+                $length = ($length & 0xF) + 2;
+                $offset = ((int)($out / 4096)) * 4096 + $offset;
+
+                if ($offset >= $out) {
+                    $offset -= 4096;
+                }
+
+                $end = $offset + $length;
+
+                while ($offset < $end) {
+                    $uncomp.= $uncomp[$offset++];
+                    ++$out;
+                }
+            }
+            else {
+                $uncomp .= $data{$in++};
+                ++$out;
+            }
+        }
+
+        return substr($uncomp, $length_preload);
+    }
+
+    /**
+     * Parse RTF data and return the best plaintext representation we can.
+     * Adapted from:
+     * http://webcheatsheet.com/php/reading_the_clean_text_from_rtf.php
+     *
+     * @param string $text The RTF (uncompressed) text.
+     *
+     * @return string The plain text.
+     */
+    public static function rtf2text($text)
+    {
+        $document = '';
+        $stack    = array();
+        $j        = -1;
+
+        // Read the data character-by- character…
+        for ($i = 0, $len = strlen($text); $i < $len; $i++) {
+            $c = $text[$i];
+            switch ($c) {
+            case "\\":
+                // Key Word
+                $nextChar = $text[$i + 1];
+                // If it is another backslash or nonbreaking space or hyphen,
+                // then the character is plain text and add it to the output stream.
+                if ($nextChar == "\\" && self::_rtfIsPlain($stack[$j])) {
+                    $document .= "\\";
+                }
+                elseif ($nextChar == '~' && self::_rtfIsPlain($stack[$j])) {
+                    $document .= ' ';
+                }
+                elseif ($nextChar == '_' && self::_rtfIsPlain($stack[$j])) {
+                    $document .= '-';
+                }
+                elseif ($nextChar == '*') {
+                    // Add to the stack.
+                    $stack[$j]['*'] = true;
+                }
+                elseif ($nextChar == "'") {
+                    // If it is a single quote, read next two characters that
+                    // are the hexadecimal notation of a character we should add
+                    // to the output stream.
+                    $hex = substr($text, $i + 2, 2);
+
+                    if (self::_rtfIsPlain($stack[$j])) {
+                        $document .= html_entity_decode('&#' . hexdec($hex) .';');
+                    }
+
+                    //Shift the pointer.
+                    $i += 2;
+                }
+                elseif ($nextChar >= 'a' && $nextChar <= 'z' || $nextChar >= 'A' && $nextChar <= 'Z') {
+                    // Since, we’ve found the alphabetic character, the next
+                    // characters are control words and, possibly, some digit
+                    // parameter.
+                    $word  = '';
+                    $param = null;
+
+                    // Start reading characters after the backslash.
+                    for ($k = $i + 1, $m = 0; $k < strlen($text); $k++, $m++) {
+                        $nextChar = $text[$k];
+                        // If the current character is a letter and there were
+                        // no digits before it, then we’re still reading the
+                        // control word. If there were digits, we should stop
+                        // since we reach the end of the control word.
+                        if ($nextChar >= 'a' && $nextChar <= 'z'
+                            || $nextChar >= 'A' && $nextChar <= 'Z') {
+                            if (!empty($param)) {
+                                break;
+                            }
+                            $word .= $nextChar;
+                        }
+                        elseif ($nextChar >= '0' && $nextChar <= '9') {
+                            // If it is a digit, store the parameter.
+                            $param .= $nextChar;
+                        }
+                        elseif ($nextChar == '-') {
+                            // Since minus sign may occur only before a digit
+                            // parameter, check whether $param is empty.
+                            // Otherwise, we reach the end of the control word.
+                            if (!empty($param)) {
+                                break;
+                            }
+                            $param .= $nextChar;
+                        }
+                        else {
+                            break;
+                        }
+                    }
+
+                    // Shift the pointer on the number of read characters.
+                    $i += $m - 1;
+
+                    // Start analyzing.We are interested mostly in control words
+                    $toText = '';
+
+                    switch (strtolower($word)) {
+                    // If the control word is "u", then its parameter is
+                    // the decimal notation of the Unicode character that
+                    // should be added to the output stream. We need to
+                    // check whether the stack contains \ucN control word.
+                    // If it does, we should remove the N characters from
+                    // the output stream.
+                    case 'u':
+                        $toText .= html_entity_decode('&#x' . dechex($param) .';');
+                        $ucDelta = @$stack[$j]['uc'];
+                        if ($ucDelta > 0) {
+                            $i += $ucDelta;
+                        }
+                        break;
+                    case 'par':
+                    case 'page':
+                    case 'column':
+                    case 'line':
+                    case 'lbr':
+                        $toText .= "\n";
+                        break;
+                    case 'emspace':
+                    case 'enspace':
+                    case 'qmspace':
+                        $toText .= ' ';
+                        break;
+                    case 'tab':
+                        $toText .= "\t";
+                        break;
+                    case 'chdate':
+                        $toText .= date('m.d.Y');
+                        break;
+                    case 'chdpl':
+                        $toText .= date('l, j F Y');
+                        break;
+                    case 'chdpa':
+                        $toText .= date('D, j M Y');
+                        break;
+                    case 'chtime':
+                        $toText .= date('H:i:s');
+                        break;
+                    case 'emdash':
+                        $toText .= html_entity_decode('&mdash;');
+                        break;
+                    case 'endash':
+                        $toText .= html_entity_decode('&ndash;');
+                        break;
+                    case 'bullet':
+                        $toText .= html_entity_decode('&#149;');
+                        break;
+                    case 'lquote':
+                        $toText .= html_entity_decode('&lsquo;');
+                        break;
+                    case 'rquote':
+                        $toText .= html_entity_decode('&rsquo;');
+                        break;
+                    case 'ldblquote':
+                        $toText .= html_entity_decode('&laquo;');
+                        break;
+                    case 'rdblquote':
+                        $toText .= html_entity_decode('&raquo;');
+                        break;
+                    default:
+                        $stack[$j][strtolower($word)] = empty($param) ? true : $param;
+                        break;
+                    }
+
+                    // Add data to the output stream if required.
+                    if (self::_rtfIsPlain($stack[$j])) {
+                        $document .= $toText;
+                    }
+                }
+
+                $i++;
+                break;
+
+            case '{':
+                // New subgroup starts, add new stack element and write the data
+                // from previous stack element to it.
+                if (!empty($stack[$j])) {
+                    array_push($stack, $stack[$j++]);
+                }
+                else {
+                    $j++;
+                }
+                break;
+
+            case '}':
+                array_pop($stack);
+                $j--;
+                break;
+
+            case '\0':
+            case '\r':
+            case '\f':
+            case '\n':
+                // Junk
+                break;
+
+            default:
+                // Add other data to the output stream if required.
+                if (!empty($stack[$j]) && self::_rtfIsPlain($stack[$j])) {
+                    $document .= $c;
+                }
+                break;
+            }
+        }
+
+        return $document;
+    }
+
+    protected static function _rtfIsPlain($s)
+    {
+        $notPlain = array('*', 'fonttbl', 'colortbl', 'datastore', 'themedata', 'stylesheet');
+
+        for ($i = 0; $i < count($notPlain); $i++) {
+            if (!empty($s[$notPlain[$i]])) {
+                return false;
+            }
+        }
+
+        return true;
     }
 }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_user.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_user.php Changed

@@ -91,7 +91,8 @@
     /**
      * Build a user name string (as e-mail address)
      *
-     * @param  string $part Username part (empty or 'local' or 'domain', 'mail')
+     * @param string $part Username part (empty or 'local' or 'domain', 'mail')
+     *
      * @return string Full user name or its part
      */
     function get_username($part = null)
@@ -117,13 +118,12 @@
                 return $domain;
             }
 
-            if (!empty($domain))
+            if (!empty($domain)) {
                 return $local . '@' . $domain;
-            else
-                return $local;
-        }
+            }
 
-        return false;
+            return $local;
+        }
     }
 
     /**
@@ -175,27 +175,33 @@
      */
     function save_prefs($a_user_prefs, $no_session = false)
     {
-        if (!$this->ID)
+        if (!$this->ID) {
             return false;
+        }
 
         $plugin = $this->rc->plugins->exec_hook('preferences_update', array(
-            'userid' => $this->ID, 'prefs' => $a_user_prefs, 'old' => (array)$this->get_prefs()));
+                'userid' => $this->ID,
+                'prefs'  => $a_user_prefs,
+                'old'    => (array)$this->get_prefs()
+        ));
 
         if (!empty($plugin['abort'])) {
-            return;
+            return false;
         }
 
         $a_user_prefs = $plugin['prefs'];
         $old_prefs    = $plugin['old'];
         $config       = $this->rc->config;
+        $defaults     = $config->all();
 
         // merge (partial) prefs array with existing settings
         $this->prefs = $save_prefs = $a_user_prefs + $old_prefs;
         unset($save_prefs['language']);
 
         // don't save prefs with default values if they haven't been changed yet
+        // Warning: we use result of rcube_config::all() here instead of just get() (#5782)
         foreach ($a_user_prefs as $key => $value) {
-            if ($value === null || (!isset($old_prefs[$key]) && ($value == $config->get($key)))) {
+            if ($value === null || (!isset($old_prefs[$key]) && $value === $defaults[$key])) {
                 unset($save_prefs[$key]);
             }
         }
@@ -252,7 +258,7 @@
 
         // generate a random hash and store it in user prefs
         if (empty($prefs['client_hash'])) {
-            $prefs['client_hash'] = md5($this->data['username'] . mt_rand() . $this->data['mail_host']);
+            $prefs['client_hash'] = rcube_utils::random_bytes(16);
             $this->save_prefs(array('client_hash' => $prefs['client_hash']));
         }
 
@@ -262,7 +268,7 @@
     /**
      * Return a list of all user emails (from identities)
      *
-     * @param bool Return only default identity
+     * @param bool $default Return only default identity
      *
      * @return array List of emails (identity_id, name, email)
      */
@@ -289,7 +295,8 @@
     /**
      * Get default identity of this user
      *
-     * @param  int   $id Identity ID. If empty, the default identity is returned
+     * @param int $id Identity ID. If empty, the default identity is returned
+     *
      * @return array Hash array with all cols of the identity record
      */
     function get_identity($id = null)
@@ -342,14 +349,16 @@
     /**
      * Update a specific identity record
      *
-     * @param int    $iid  Identity ID
-     * @param array  $data Hash array with col->value pairs to save
+     * @param int   $iid  Identity ID
+     * @param array $data Hash array with col->value pairs to save
+     *
      * @return boolean True if saved successfully, false if nothing changed
      */
     function update_identity($iid, $data)
     {
-        if (!$this->ID)
+        if (!$this->ID) {
             return false;
+        }
 
         $query_cols = $query_params = array();
 
@@ -373,54 +382,60 @@
         $this->identities = array();
         $this->emails     = null;
 
-        return $this->db->affected_rows();
+        return $this->db->affected_rows() > 0;
     }
 
     /**
      * Create a new identity record linked with this user
      *
      * @param array $data Hash array with col->value pairs to save
-     * @return int  The inserted identity ID or false on error
+     *
+     * @return int The inserted identity ID or false on error
      */
     function insert_identity($data)
     {
-        if (!$this->ID)
+        if (!$this->ID) {
             return false;
+        }
 
         unset($data['user_id']);
 
-        $insert_cols = $insert_values = array();
+        $insert_cols   = array();
+        $insert_values = array();
+
         foreach ((array)$data as $col => $value) {
             $insert_cols[]   = $this->db->quote_identifier($col);
             $insert_values[] = $value;
         }
+
         $insert_cols[]   = $this->db->quote_identifier('user_id');
         $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(), sizeof($insert_values), '?')).")";
+            " VALUES (".$this->db->now().", ".join(', ', array_pad(array(), count($insert_values), '?')).")";
 
-        call_user_func_array(array($this->db, 'query'),
-            array_merge(array($sql), $insert_values));
+        $insert = $this->db->query($sql, $insert_values);
 
         // clear the cache
         $this->identities = array();
         $this->emails     = null;
 
-        return $this->db->insert_id('identities');
+        return $this->db->affected_rows($insert) ? $this->db->insert_id('identities') : false;
     }
 
     /**
      * Mark the given identity as deleted
      *
-     * @param  int     $iid Identity ID
+     * @param int $iid Identity ID
+     *
      * @return boolean True if deleted successfully, false if nothing changed
      */
     function delete_identity($iid)
     {
-        if (!$this->ID)
+        if (!$this->ID) {
             return false;
+        }
 
         $sql_result = $this->db->query(
             "SELECT count(*) AS ident_count FROM ".$this->db->table_name('identities', true).
@@ -430,8 +445,9 @@
         $sql_arr = $this->db->fetch_assoc($sql_result);
 
         // we'll not delete last identity
-        if ($sql_arr['ident_count'] <= 1)
-            return -1;
+        if ($sql_arr['ident_count'] <= 1) {
+            return false;
+        }
 
         $this->db->query(
             "UPDATE ".$this->db->table_name('identities', true).
@@ -445,7 +461,7 @@
         $this->identities = array();
         $this->emails     = null;
 
-        return $this->db->affected_rows();
+        return $this->db->affected_rows() > 0;
     }
 
     /**
@@ -503,10 +519,10 @@
 
             $this->db->query(
                 "UPDATE " . $this->db->table_name('users', true)
-                    . " SET `failed_login` = " . $this->db->fromunixtime($failed_login->format('U'))
+                    . " SET `failed_login` = ?"
                     . ", `failed_login_counter` = " . ($counter ?: "`failed_login_counter` + 1")
                 . " WHERE `user_id` = ?",
-                $this->ID);
+                $failed_login, $this->ID);
         }
     }
 
@@ -545,6 +561,7 @@
      *
      * @param string $user IMAP user name
      * @param string $host IMAP host name
+     *
      * @return rcube_user New user instance
      */
     static function query($user, $host)
@@ -572,8 +589,6 @@
         if ($sql_arr) {
             return new rcube_user($sql_arr['user_id'], $sql_arr);
         }
-
-        return false;
     }
 
     /**
@@ -581,6 +596,7 @@
      *
      * @param string $user IMAP user name
      * @param string $host IMAP host
+     *
      * @return rcube_user New user instance
      */
     static function create($user, $host)
@@ -606,10 +622,10 @@
 
         // plugin aborted this operation
         if ($data['abort']) {
-            return false;
+            return;
         }
 
-        $dbh->query(
+        $insert = $dbh->query(
             "INSERT INTO ".$dbh->table_name('users', true).
             " (`created`, `last_login`, `username`, `mail_host`, `language`)".
             " VALUES (".$dbh->now().", ".$dbh->now().", ?, ?, ?)",
@@ -617,7 +633,7 @@
             $data['host'],
             $data['language']);
 
-        if ($user_id = $dbh->insert_id('users')) {
+        if ($dbh->affected_rows($insert) && ($user_id = $dbh->insert_id('users'))) {
             // create rcube_user instance to make plugin hooks work
             $user_instance = new rcube_user($user_id, array(
                 'user_id'   => $user_id,
@@ -686,20 +702,21 @@
                 'message' => "Failed to create new user"), true, false);
         }
 
-        return $user_id ? $user_instance : false;
+        return $user_id ? $user_instance : null;
     }
 
     /**
      * Resolve username using a virtuser plugins
      *
      * @param string $email E-mail address to resolve
+     *
      * @return string Resolved IMAP username
      */
     static function email2user($email)
     {
         $rcube = rcube::get_instance();
         $plugin = $rcube->plugins->exec_hook('email2user',
-            array('email' => $email, 'user' => NULL));
+            array('email' => $email, 'user' => null));
 
         return $plugin['user'];
     }
@@ -707,25 +724,26 @@
     /**
      * Resolve e-mail address from virtuser plugins
      *
-     * @param string $user User name
-     * @param boolean $first If true returns first found entry
+     * @param string  $user     User name
+     * @param boolean $first    If true returns first found entry
      * @param boolean $extended If true returns email as array (email and name for identity)
+     *
      * @return mixed Resolved e-mail address string or array of strings
      */
     static function user2email($user, $first=true, $extended=false)
     {
         $rcube = rcube::get_instance();
         $plugin = $rcube->plugins->exec_hook('user2email',
-            array('email' => NULL, 'user' => $user,
+            array('email' => null, 'user' => $user,
                 'first' => $first, 'extended' => $extended));
 
-        return empty($plugin['email']) ? NULL : $plugin['email'];
+        return empty($plugin['email']) ? null : $plugin['email'];
     }
 
     /**
      * Return a list of saved searches linked with this user
      *
-     * @param int  $type  Search type
+     * @param int $type Search type
      *
      * @return array List of saved searches indexed by search ID
      */
@@ -757,7 +775,7 @@
     /**
      * Return saved search data.
      *
-     * @param int  $id  Row identifier
+     * @param int $id Row identifier
      *
      * @return array Data
      */
@@ -784,21 +802,20 @@
                 'data' => unserialize($sql_arr['data']),
             );
         }
-
-        return null;
     }
 
     /**
      * Deletes given saved search record
      *
-     * @param  int  $sid  Search ID
+     * @param int $sid Search ID
      *
      * @return boolean True if deleted successfully, false if nothing changed
      */
     function delete_search($sid)
     {
-        if (!$this->ID)
+        if (!$this->ID) {
             return false;
+        }
 
         $this->db->query(
             "DELETE FROM ".$this->db->table_name('searches', true)
@@ -806,7 +823,7 @@
                 ." AND `search_id` = ?",
             (int) $this->ID, $sid);
 
-        return $this->db->affected_rows();
+        return $this->db->affected_rows() > 0;
     }
 
     /**
@@ -814,12 +831,13 @@
      *
      * @param array $data Hash array with col->value pairs to save
      *
-     * @return int  The inserted search ID or false on error
+     * @return int The inserted search ID or false on error
      */
     function insert_search($data)
     {
-        if (!$this->ID)
+        if (!$this->ID) {
             return false;
+        }
 
         $insert_cols[]   = 'user_id';
         $insert_values[] = (int) $this->ID;
@@ -832,11 +850,10 @@
 
         $sql = "INSERT INTO ".$this->db->table_name('searches', true)
             ." (".join(', ', $insert_cols).")"
-            ." VALUES (".join(', ', array_pad(array(), sizeof($insert_values), '?')).")";
+            ." VALUES (".join(', ', array_pad(array(), count($insert_values), '?')).")";
 
-        call_user_func_array(array($this->db, 'query'),
-            array_merge(array($sql), $insert_values));
+        $insert = $this->db->query($sql, $insert_values);
 
-        return $this->db->insert_id('searches');
+        return $this->db->affected_rows($insert) ? $this->db->insert_id('searches') : false;
     }
 }

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_utils.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_utils.php Changed

@@ -27,9 +27,12 @@
 class rcube_utils
 {
     // define constants for input reading
-    const INPUT_GET  = 0x0101;
-    const INPUT_POST = 0x0102;
-    const INPUT_GPC  = 0x0103;
+    const INPUT_GET    = 1;
+    const INPUT_POST   = 2;
+    const INPUT_COOKIE = 4;
+    const INPUT_GP     = 3; // GET + POST
+    const INPUT_GPC    = 7; // GET + POST + COOKIE
+
 
     /**
      * Helper method to set a cookie with the current path and host settings
@@ -60,8 +63,8 @@
      */
     public static function check_email($email, $dns_check=true)
     {
-        // Check for invalid characters
-        if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $email)) {
+        // Check for invalid (control) characters
+        if (preg_match('/\p{Cc}/u', $email)) {
             return false;
         }
 
@@ -70,23 +73,26 @@
             return false;
         }
 
-        $email_array = explode('@', $email);
-
-        // Check that there's one @ symbol
-        if (count($email_array) < 2) {
+        $pos = strrpos($email, '@');
+        if (!$pos) {
             return false;
         }
 
-        $domain_part = array_pop($email_array);
-        $local_part  = implode('@', $email_array);
+        $domain_part = substr($email, $pos + 1);
+        $local_part  = substr($email, 0, $pos);
 
-        // from PEAR::Validate
-        $regexp = '&^(?:
-            ("\s*(?:[^"\f\n\r\t\v\b\s]+\s*)+")|                             #1 quoted name
-            ([-\w!\#\$%\&\'*+~/^`|{}=]+(?:\.[-\w!\#\$%\&\'*+~/^`|{}=]+)*))  #2 OR dot-atom (RFC5322)
-            $&xi';
-
-        if (!preg_match($regexp, $local_part)) {
+        // quoted-string, make sure all backslashes and quotes are
+        // escaped
+        if (substr($local_part,0,1) == '"') {
+            $local_quoted = preg_replace('/\\\\(\\\\|\")/','', substr($local_part, 1, -1));
+            if (preg_match('/\\\\|"/', $local_quoted)) {
+                return false;
+            }
+        }
+        // dot-atom portion, make sure there's no prohibited characters
+        else if (preg_match('/(^\.|\.\.|\.$)/', $local_part)
+            || preg_match('/[\\ ",:;<>@]/', $local_part)
+        ) {
             return false;
         }
 
@@ -98,7 +104,7 @@
             // If not an IP address
             $domain_array = explode('.', $domain_part);
             // Not enough parts to be a valid domain
-            if (sizeof($domain_array) < 2) {
+            if (count($domain_array) < 2) {
                 return false;
             }
 
@@ -254,7 +260,7 @@
      * Performs stripslashes() and charset conversion if necessary
      *
      * @param string  Field name to read
-     * @param int     Source to get value from (GPC)
+     * @param int     Source to get value from (see self::INPUT_*)
      * @param boolean Allow HTML tags in field value
      * @param string  Charset to convert into
      *
@@ -264,26 +270,16 @@
     {
         $value = null;
 
-        if ($source == self::INPUT_GET) {
-            if (isset($_GET[$fname])) {
-                $value = $_GET[$fname];
-            }
+        if (($source & self::INPUT_GET) && isset($_GET[$fname])) {
+            $value = $_GET[$fname];
         }
-        else if ($source == self::INPUT_POST) {
-            if (isset($_POST[$fname])) {
-                $value = $_POST[$fname];
-            }
+
+        if (($source & self::INPUT_POST) && isset($_POST[$fname])) {
+            $value = $_POST[$fname];
         }
-        else if ($source == self::INPUT_GPC) {
-            if (isset($_POST[$fname])) {
-                $value = $_POST[$fname];
-            }
-            else if (isset($_GET[$fname])) {
-                $value = $_GET[$fname];
-            }
-            else if (isset($_COOKIE[$fname])) {
-                $value = $_COOKIE[$fname];
-            }
+
+        if (($source & self::INPUT_COOKIE) && isset($_COOKIE[$fname])) {
+            $value = $_COOKIE[$fname];
         }
 
         return self::parse_input_value($value, $allow_html, $charset);
@@ -314,11 +310,6 @@
             return $value;
         }
 
-        // strip slashes if magic_quotes enabled
-        if (get_magic_quotes_gpc() || get_magic_quotes_runtime()) {
-            $value = stripslashes($value);
-        }
-
         // remove HTML tags if not allowed
         if (!$allow_html) {
             $value = strip_tags($value);
@@ -385,10 +376,11 @@
      * @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
      *
      * @return string Modified CSS source
      */
-    public static function mod_css_styles($source, $container_id, $allow_remote = false)
+    public static function mod_css_styles($source, $container_id, $allow_remote = false, $prefix = '')
     {
         $last_pos     = 0;
         $replacements = new rcube_string_replacer;
@@ -419,10 +411,17 @@
             if ($allow_remote) {
                 $a_styles = preg_split('/;[\r\n]*/', $styles, -1, PREG_SPLIT_NO_EMPTY);
 
-                foreach ($a_styles as $line) {
+                for ($i=0, $len=count($a_styles); $i < $len; $i++) {
+                    $line     = $a_styles[$i];
                     $stripped = preg_replace('/[^a-z\(:;]/i', '', $line);
-                    // ... and only allow strict url() values
-                    if (stripos($stripped, 'url(') && !preg_match($strict_url_regexp, $line)) {
+
+                    // allow data:image uri, join with continuation
+                    if (stripos($stripped, 'url(data:image')) {
+                        $a_styles[$i] .= ';' . $a_styles[$i+1];
+                        unset($a_styles[$i+1]);
+                    }
+                    // allow strict url() values only
+                    else if (stripos($stripped, 'url(') && !preg_match($strict_url_regexp, $line)) {
                         $a_styles = array('/* evil! */');
                         break;
                     }
@@ -437,20 +436,37 @@
             $last_pos = $pos2 - ($length - strlen($repl));
         }
 
-        // remove html comments and add #container to each tag selector.
-        // also replace body definition because we also stripped off the <body> tag
-        $source = preg_replace(
-            array(
-                '/(^\s*<\!--)|(-->\s*$)/m',
-                '/(^\s*|,\s*|\}\s*)([a-z0-9\._#\*][a-z0-9\.\-_]*)/im',
-                '/'.preg_quote($container_id, '/').'\s+body/i',
-            ),
-            array(
-                '',
-                "\\1#$container_id \\2",
-                $container_id,
-            ),
-            $source);
+        // remove html comments
+        $source = preg_replace('/(^\s*<\!--)|(-->\s*$)/m', '', $source);
+
+        // add #container to each tag selector and prefix to id/class identifiers
+        if ($container_id || $prefix) {
+            // (?!##str) below is to not match with ##str_replacement_0##
+            // from rcube_string_replacer used above, this is needed for
+            // cases like @media { body { position: fixed; } } (#5811)
+            $regexp   = '/(^\s*|,\s*|\}\s*|\{\s*)((?!##str)[a-z0-9\._#\*\[][a-z0-9\._:#=~ \[\]"\|\>\+\$\^-]*)/im';
+            $callback = function($matches) use ($container_id, $prefix) {
+                $replace = $matches[2];
+
+                if ($prefix) {
+                    $replace = str_replace(array('.', '#'), array(".$prefix", "#$prefix"), $replace);
+                }
+
+                if ($container_id) {
+                    $replace = "#$container_id " . $replace;
+                }
+
+                return str_replace($matches[2], $replace, $matches[0]);
+            };
+
+            $source = preg_replace_callback($regexp, $callback, $source);
+        }
+
+        // replace body definition because we also stripped off the <body> tag
+        if ($container_id) {
+            $regexp = '/#' . preg_quote($container_id, '/') . '\s+body/i';
+            $source = preg_replace($regexp, "#$container_id", $source);
+        }
 
         // put block contents back in
         $source = $replacements->resolve($source);
@@ -498,9 +514,12 @@
      */
     public static function xss_entity_decode($content)
     {
+        $callback = function($matches) { return chr(hexdec($matches[1])); };
+
         $out = html_entity_decode(html_entity_decode($content));
-        $out = preg_replace_callback('/\\\([0-9a-f]{4})/i',
-            array(self, 'xss_entity_decode_callback'), $out);
+        $out = trim(preg_replace('/(^$)/', '', trim($out)));
+        $out = preg_replace_callback('/\\\([0-9a-f]{2,6})\s*/i', $callback, $out);
+        $out = preg_replace('/\\\([^0-9a-f])/i', '\\1', $out);
         $out = preg_replace('#/\*.*\*/#Ums', '', $out);
         $out = strip_tags($out);
 
@@ -508,18 +527,6 @@
     }
 
     /**
-     * preg_replace_callback callback for xss_entity_decode
-     *
-     * @param array $matches Result from preg_replace_callback
-     *
-     * @return string Decoded entity
-     */
-    public static function xss_entity_decode_callback($matches)
-    {
-        return chr(hexdec($matches[1]));
-    }
-
-    /**
      * Check if we can process not exceeding memory_limit
      *
      * @param integer Required amount of memory
@@ -578,11 +585,11 @@
         }
 
         // %n - host
-        $n = preg_replace('/:\d+$/', '', $_SERVER['SERVER_NAME']);
+        $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('/^[^\.]+\./', '', $_SERVER['HTTP_HOST']);
+        $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
@@ -590,8 +597,7 @@
         // %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) {
-            $user_email = self::get_input_value('_user', self::INPUT_POST);
-            $user_email = self::idn_convert($user_email, true);
+            $user_email = self::idn_to_ascii(self::get_input_value('_user', self::INPUT_POST));
             $matches    = preg_match('/(.*)@([a-z0-9\.\-\[\]\:]+)/i', $user_email, $s);
             if ($matches < 1 || filter_var($s[1]."@".$s[2], FILTER_VALIDATE_EMAIL) === false) {
                 return false;
@@ -602,6 +608,43 @@
     }
 
     /**
+     * Returns the host name after checking it against trusted hostname
+     * patterns, otherwise returns localhost (and logs a warning)
+     *
+     * @param string  $type       The $_SERVER key, e.g. 'HTTP_HOST', Default: 'SERVER_NAME'.
+     * @param boolean $strip_port Strip port from the host name
+     *
+     * @return string Server name
+     */
+    public static function server_name($type = null, $strip_port = true)
+    {
+        $name     = $_SERVER[$type ?: 'SERVER_NAME'];
+        $rcube    = rcube::get_instance();
+        $patterns = (array) $rcube->config->get('trusted_host_patterns');
+
+        if ($strip_port) {
+            $name = preg_replace('/:\d+$/', '', $name);
+        }
+
+        if (empty($patterns) || in_array_nocase($name, $patterns)) {
+            return $name;
+        }
+
+        if (!empty($name)) {
+            foreach ($patterns as $pattern) {
+                if (preg_match("/$pattern/", $name)) {
+                    return $name;
+                }
+            }
+
+            $rcube->raise_error(array('file' => __FILE__, 'line' => __LINE__,
+                'message' => "Specified host is not trusted. Using 'localhost'."), true, false);
+        }
+
+        return 'localhost';
+    }
+
+    /**
      * Returns remote IP address and forwarded addresses if found
      *
      * @return string Remote IP address(es)
@@ -639,7 +682,7 @@
             $proxy_whitelist = rcube::get_instance()->config->get('proxy_whitelist', array());
             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) {
+                    foreach (array_reverse(explode(',', $_SERVER['HTTP_X_FORWARDED_FOR'])) as $forwarded_ip) {
                         if (!in_array($forwarded_ip, $proxy_whitelist)) {
                             return $forwarded_ip;
                         }
@@ -726,15 +769,19 @@
             return (int) $date;
         }
 
+        // It can be very slow when provided string is not a date and very long
+        if (strlen($date) > 128) {
+            $date = substr($date, 0, 128);
+        }
+
         // if date parsing fails, we have a date in non-rfc format.
         // remove token from the end and try again
-        while ((($ts = @strtotime($date . $tzname)) === false) || ($ts < 0)) {
-            $d = explode(' ', $date);
-            array_pop($d);
-            if (!$d) {
+        while (($ts = @strtotime($date . $tzname)) === false || $ts < 0) {
+            if (($pos = strrpos($date, ' ')) === false) {
                 break;
             }
-            $date = implode(' ', $d);
+
+            $date = rtrim(substr($date, 0, $pos));
         }
 
         return (int) $ts;
@@ -760,7 +807,8 @@
         // try to parse string with DateTime first
         if (!empty($date)) {
             try {
-                $dt = $timezone ? new DateTime($date, $timezone) : new DateTime($date);
+                $_date = preg_match('/^[0-9]+$/', $date) ? "@$date" : $date;
+                $dt    = $timezone ? new DateTime($_date, $timezone) : new DateTime($_date);
             }
             catch (Exception $e) {
                 // ignore
@@ -802,11 +850,13 @@
         // Clean malformed data
         $date = preg_replace(
             array(
+                '/$.*$/',                                 // remove RFC comments
                 '/GMT\s*([+-][0-9]+)/',                     // support non-standard "GMTXXXX" literal
-                '/[^a-z0-9\x20\x09:+-\/]/i',                // remove any invalid characters
+                '/[^a-z0-9\x20\x09:\/\.+-]/i',              // remove any invalid characters
                 '/\s*(Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*/i',   // remove weekday names
             ),
             array(
+                '',
                 '\\1',
                 '',
                 '',
@@ -861,35 +911,69 @@
         return $date;
     }
 
-    /*
-     * Idn_to_ascii wrapper.
-     * Intl/Idn modules version of this function doesn't work with e-mail address
+    /**
+     * Wrapper for idn_to_ascii with support for e-mail address.
+     *
+     * Warning: Domain names may be lowercase'd.
+     * Warning: An empty string may be returned on invalid domain.
+     *
+     * @param string $str Decoded e-mail address
+     *
+     * @return string Encoded e-mail address
      */
     public static function idn_to_ascii($str)
     {
         return self::idn_convert($str, true);
     }
 
-    /*
-     * Idn_to_ascii wrapper.
-     * Intl/Idn modules version of this function doesn't work with e-mail address
+    /**
+     * Wrapper for idn_to_utf8 with support for e-mail address
+     *
+     * @param string $str Decoded e-mail address
+     *
+     * @return string Encoded e-mail address
      */
     public static function idn_to_utf8($str)
     {
         return self::idn_convert($str, false);
     }
 
+    /**
+     * Convert a string to ascii or utf8 (using IDNA standard)
+     *
+     * @param string  $input  Decoded e-mail address
+     * @param boolean $is_utf Convert by idn_to_ascii if true and idn_to_utf8 if false
+     *
+     * @return string Encoded e-mail address
+     */
     public static function idn_convert($input, $is_utf = false)
     {
         if ($at = strpos($input, '@')) {
             $user   = substr($input, 0, $at);
-            $domain = substr($input, $at+1);
+            $domain = substr($input, $at + 1);
         }
         else {
+            $user   = '';
             $domain = $input;
         }
 
-        $domain = $is_utf ? idn_to_ascii($domain) : idn_to_utf8($domain);
+        // Note that in PHP 7.2/7.3 calling idn_to_* functions with default arguments
+        // throws a warning, so we have to set the variant explicitely (#6075)
+        $variant = defined('INTL_IDNA_VARIANT_UTS46') ? INTL_IDNA_VARIANT_UTS46 : null;
+        $options = 0;
+
+        // Because php-intl extension lowercases domains and return false
+        // on invalid input (#6224), we skip conversion when not needed
+        // for compatibility with our Net_IDNA2 wrappers in bootstrap.php
+
+        if ($is_utf) {
+            if (preg_match('/[^\x20-\x7E]/', $domain)) {
+                $domain = idn_to_ascii($domain, $options, $variant);
+            }
+        }
+        else if (preg_match('/(^|\.)xn--/i', $domain)) {
+            $domain = idn_to_utf8($domain, $options, $variant);
+        }
 
         if ($domain === false) {
             return '';
@@ -1140,7 +1224,7 @@
             }
 
             $prefix = $schema . '://' . preg_replace('/:\d+$/', '', $_SERVER['HTTP_HOST']);
-            if ($_SERVER['SERVER_PORT'] != $default_port) {
+            if ($_SERVER['SERVER_PORT'] != $default_port && $_SERVER['SERVER_PORT'] != 80) {
                 $prefix .= ':' . $_SERVER['SERVER_PORT'];
             }
 
@@ -1160,28 +1244,33 @@
      */
     public static function random_bytes($length, $raw = false)
     {
+        $hextab  = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        $tabsize = strlen($hextab);
+
         // Use PHP7 true random generator
-        if (function_exists('random_bytes')) {
-            // random_bytes() can throw an Error/TypeError/Exception in some cases
-            try {
-                $random = random_bytes($length);
-            }
-            catch (Throwable $e) {}
+        if ($raw && function_exists('random_bytes')) {
+            return random_bytes($length);
         }
 
-        if (!$random) {
-            $random = openssl_random_pseudo_bytes($length);
-        }
+        if (!$raw && function_exists('random_int')) {
+            $result = '';
+            while ($length-- > 0) {
+                $result .= $hextab[random_int(0, $tabsize - 1)];
+            }
 
-        if ($raw) {
-            return $random;
+            return $result;
         }
 
-        $random = self::bin2ascii($random);
+        $random = openssl_random_pseudo_bytes($length);
 
-        // truncate to the specified size...
-        if ($length < strlen($random)) {
-            $random = substr($random, 0, $length);
+        if ($random === false && $length > 0) {
+            throw new Exception("Failed to get random bytes");
+        }
+
+        if (!$raw) {
+            for ($x = 0; $x < $length; $x++) {
+                $random[$x] = $hextab[ord($random[$x]) % $tabsize];
+            }
         }
 
         return $random;
@@ -1192,40 +1281,16 @@
      *
      * @param string $input Binary input
      *
-     * @return string Readable output
+     * @return string Readable output (Base62)
+     * @deprecated since 1.3.1
      */
     public static function bin2ascii($input)
     {
-        // Above method returns "hexits".
-        // Based on bin_to_readable() function in ext/session/session.c.
-        // Note: removed ",-" characters from hextab
         $hextab = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        $nbits  = 6; // can be 4, 5 or 6
-        $length = strlen($input);
         $result = '';
-        $char   = 0;
-        $i      = 0;
-        $have   = 0;
-        $mask   = (1 << $nbits) - 1;
-
-        while (true) {
-            if ($have < $nbits) {
-                if ($i < $length) {
-                    $char |= ord($input[$i++]) << $have;
-                    $have += 8;
-                }
-                else if (!$have) {
-                    break;
-                }
-                else {
-                    $have = $nbits;
-                }
-            }
 
-            // consume nbits
-            $result .= $hextab[$char & $mask];
-            $char  >>= $nbits;
-            $have   -= $nbits;
+        for ($x = 0; $x < strlen($input); $x++) {
+            $result .= $hextab[ord($input[$x]) % 62];
         }
 
         return $result;
@@ -1258,6 +1323,30 @@
     }
 
     /**
+     * Parses socket options and returns options for specified hostname.
+     *
+     * @param array  &$options Configured socket options
+     * @param string $host     Hostname
+     */
+    public static function parse_socket_options(&$options, $host = null)
+    {
+        if (empty($host) || empty($options)) {
+            return $options;
+        }
+
+        // get rid of schema and port from the hostname
+        $host_url = parse_url($host);
+        if (isset($host_url['host'])) {
+            $host = $host_url['host'];
+        }
+
+        // find per-host options
+        if (array_key_exists($host, $options)) {
+            $options = $options[$host];
+        }
+    }
+
+    /**
      * Get maximum upload size
      *
      * @return int Maximum size in bytes

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_vcard.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_vcard.php Changed

@@ -381,9 +381,9 @@
             }
 
             if (($tag = self::$fieldmap[$field]) && (is_array($value) || strlen($value))) {
-                $index = count($this->raw[$tag]);
-                $this->raw[$tag][$index] = (array)$value;
+                $this->raw[$tag][] = (array) $value;
                 if ($type) {
+                    $index   = count($this->raw[$tag]) - 1;
                     $typemap = array_flip($this->typemap);
                     $this->raw[$tag][$index]['type'] = explode(',', $typemap[$type_uc] ?: $type);
                 }
@@ -405,7 +405,7 @@
      */
     public function set_raw($tag, $value, $append = false)
     {
-        $index = $append ? count($this->raw[$tag]) : 0;
+        $index = $append && isset($this->raw[$tag]) ? count($this->raw[$tag]) : 0;
         $this->raw[$tag][$index] = (array)$value;
     }
 
@@ -626,7 +626,7 @@
                 $field = strtoupper($regs2[1][0]);
                 $enc   = null;
 
-                foreach($regs2[1] as $attrid => $attr) {
+                foreach ($regs2[1] as $attrid => $attr) {
                     $attr = preg_replace('/[\s\t\n\r\0\x0B]/', '', $attr);
                     if ((list($key, $value) = explode('=', $attr)) && $value) {
                         if ($key == 'ENCODING') {
@@ -752,7 +752,7 @@
                             }
                         }
                         else {
-                            foreach((array)$attrvalues as $attrvalue) {
+                            foreach ((array)$attrvalues as $attrvalue) {
                                 $attr .= strtoupper(";$attrname=") . self::vcard_quote($attrvalue, ',');
                             }
                         }
@@ -785,7 +785,7 @@
     public static function vcard_quote($s, $sep = ';')
     {
         if (is_array($s)) {
-            foreach($s as $part) {
+            foreach ($s as $part) {
                 $r[] = self::vcard_quote($part, $sep);
             }
             return(implode($sep, (array)$r));

iRony-0.4.0.tar.gz/lib/Roundcube/rcube_washtml.php -> iRony-0.4.1.tar.gz/lib/Roundcube/rcube_washtml.php Changed

@@ -55,7 +55,7 @@
  * 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 images.
+ *   $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.
@@ -76,7 +76,7 @@
  * - base URL support
  * - invalid HTML comments removal before parsing
  * - "fixing" unitless CSS values for XHTML output
- * - base url resolving
+ * - SVG and MathML support
  */
 
 /**
@@ -111,6 +111,15 @@
         'feflood', 'fefunca', 'fefuncb', 'fefuncg', 'fefuncr', 'fegaussianblur',
         'feimage', 'femerge', 'femergenode', 'femorphology', 'feoffset',
         'fespecularlighting', 'fetile', 'feturbulence',
+        // MathML
+        'math', 'menclose', 'merror', 'mfenced', 'mfrac', 'mglyph', 'mi', 'mlabeledtr',
+        'mmuliscripts', 'mn', 'mo', 'mover', 'mpadded', 'mphantom', 'mroot', 'mrow',
+        'ms', 'mspace', 'msqrt', 'mstyle', 'msub', 'msup', 'msubsup', 'mtable', 'mtd',
+        'mtext', 'mtr', 'munder', 'munderover', 'maligngroup', 'malignmark',
+        'mprescripts', 'semantics', 'annotation', 'annotation-xml', 'none',
+        'infinity', 'matrix', 'matrixrow', 'ci', 'cn', 'sep', 'apply',
+        'plus', 'minus', 'eq', 'power', 'times', 'divide', 'csymbol', 'root',
+        'bvar', 'lowlimit', 'uplimit',
     );
 
     /* Ignore these HTML tags and their content */
@@ -123,9 +132,9 @@
         'bordercolordark', 'face', 'marginwidth', 'marginheight', 'axis', 'border',
         'abbr', 'char', 'charoff', 'clear', 'compact', 'coords', 'vspace', 'hspace',
         'cellborder', 'size', 'lang', 'dir', 'usemap', 'shape', 'media',
-        'background', 'src', 'poster', 'href',
+        'background', 'src', 'poster', 'href', 'headers',
         // attributes of form elements
-        'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value',
+        'type', 'rows', 'cols', 'disabled', 'readonly', 'checked', 'multiple', 'value', 'for',
         // SVG
         'accent-height', 'accumulate', 'additive', 'alignment-baseline', 'alphabetic',
         'ascent', 'attributename', 'attributetype', 'azimuth', 'basefrequency', 'baseprofile',
@@ -153,11 +162,24 @@
         'visibility', 'vert-adv-y', 'version', 'vert-origin-x', 'vert-origin-y', 'word-spacing',
         'wrap', 'writing-mode', 'xchannelselector', 'ychannelselector', 'x', 'x1', 'x2',
         'xmlns', 'y', 'y1', 'y2', 'z', 'zoomandpan',
+        // MathML
+        'accent', 'accentunder', 'bevelled', 'close', 'columnalign', 'columnlines',
+        'columnspan', 'denomalign', 'depth', 'display', 'displaystyle', 'encoding', 'fence',
+        'frame', 'largeop', 'length', 'linethickness', 'lspace', 'lquote',
+        'mathbackground', 'mathcolor', 'mathsize', 'mathvariant', 'maxsize',
+        'minsize', 'movablelimits', 'notation', 'numalign', 'open', 'rowalign',
+        'rowlines', 'rowspacing', 'rowspan', 'rspace', 'rquote', 'scriptlevel',
+        'scriptminsize', 'scriptsizemultiplier', 'selection', 'separator',
+        'separators', 'stretchy', 'subscriptshift', 'supscriptshift', 'symmetric', 'voffset',
+        'fontsize', 'fontweight', 'fontstyle', 'fontfamily', 'groupalign', 'edge', 'side',
     );
 
     /* 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
+        'sep', 'infinity', 'in', 'plus', 'eq', 'power', 'times', 'divide', 'root',
+        'maligngroup', 'none', 'mprescripts',
     );
 
     /* State for linked objects in HTML */
@@ -181,6 +203,9 @@
     /* Allowed HTML attributes */
     private $_html_attribs = array();
 
+    /* A prefix to be added to id/class/for attribute values */
+    private $_css_prefix;
+
     /* Max nesting level */
     private $max_nesting_level;
 
@@ -196,6 +221,7 @@
         $this->_html_attribs    = array_flip((array)$p['html_attribs']) + array_flip(self::$html_attribs);
         $this->_ignore_elements = array_flip((array)$p['ignore_elements']) + array_flip(self::$ignore_elements);
         $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']);
 
@@ -220,8 +246,11 @@
         // Remove unwanted white-space characters so regular expressions below work better
         $style = preg_replace('/[\n\r\s\t]+/', ' ', $style);
 
+        // Decode insecure character sequences
+        $style = rcube_utils::xss_entity_decode($style);
+
         foreach (explode(';', $style) as $declaration) {
-            if (preg_match('/^\s*([a-z\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
+            if (preg_match('/^\s*([a-z\\\-]+)\s*:\s*(.*)\s*$/i', $declaration, $match)) {
                 $cssid = $match[1];
                 $str   = $match[2];
                 $value = '';
@@ -230,7 +259,7 @@
                     if (preg_match('/^url$/i', $val)) {
                         if (preg_match('/^url\(\s*[\'"]?([^\'"$]*)[\'"]?\s*\)/iu', $val, $match)) {
                             if ($url = $this->wash_uri($match[1])) {
-                                $value .= ' url(' . htmlspecialchars($url, ENT_QUOTES) . ')';
+                                $value .= ' url(' . htmlspecialchars($url, ENT_QUOTES, $this->config['charset']) . ')';
                             }
                         }
                     }
@@ -289,22 +318,23 @@
                     }
                 }
 
-                if ($this->is_image_attribute($node->tagName, $key)) {
+                if ($this->is_image_attribute($node->nodeName, $key)) {
                     $out = $this->wash_uri($value, true);
                 }
-                else if ($this->is_link_attribute($node->tagName, $key)) {
+                else if ($this->is_link_attribute($node->nodeName, $key)) {
                     if (!preg_match('!^(javascript|vbscript|data:text)!i', $value)
                         && preg_match('!^([a-z][a-z0-9.+-]+:|//|#).+!i', $value)
                     ) {
                         $out = $value;
                     }
                 }
-                else if ($this->is_funciri_attribute($node->tagName, $key)) {
+                else if ($this->is_funciri_attribute($node->nodeName, $key)) {
                     if (preg_match('/^[a-z:]*url$/i', $val)) {
                         if (preg_match('/^([a-z:]*url)\(\s*[\'"]?([^\'"$]*)[\'"]?\s*\)/iu', $value, $match)) {
                             if ($url = $this->wash_uri($match[2])) {
-                                $result .= ' ' . $attr->nodeName . '="' . $match[1] . '(' . htmlspecialchars($url, ENT_QUOTES) . ')'
-                                     . substr($val, strlen($match[0])) . '"';
+                                $result .= ' ' . $attr->nodeName . '="' . $match[1]
+                                    . '(' . htmlspecialchars($url, ENT_QUOTES, $this->config['charset']) . ')'
+                                    . substr($val, strlen($match[0])) . '"';
                                 continue;
                             }
                         }
@@ -316,19 +346,22 @@
                         $out = $value;
                     }
                 }
+                else if ($this->_css_prefix !== null && in_array($key, array('id', 'class', 'for'))) {
+                    $out = preg_replace('/(\S+)/', $this->_css_prefix . '\1', $value);
+                }
                 else if ($key) {
                    $out = $value;
                 }
 
                 if ($out !== null && $out !== '') {
-                    $result .= ' ' . $attr->nodeName . '="' . htmlspecialchars($out, ENT_QUOTES) . '"';
+                    $result .= ' ' . $attr->nodeName . '="' . htmlspecialchars($out, ENT_QUOTES | ENT_SUBSTITUTE, $this->config['charset']) . '"';
                 }
                 else if ($value) {
-                    $washed[] = htmlspecialchars($attr->nodeName, ENT_QUOTES);
+                    $washed[] = htmlspecialchars($attr->nodeName, ENT_QUOTES, $this->config['charset']);
                 }
             }
             else {
-                $washed[] = htmlspecialchars($attr->nodeName, ENT_QUOTES);
+                $washed[] = htmlspecialchars($attr->nodeName, ENT_QUOTES, $this->config['charset']);
             }
         }
 
@@ -342,7 +375,7 @@
     /**
      * Wash URI value
      */
-    private function wash_uri($uri, $blocked_source = false)
+    private function wash_uri($uri, $blocked_source = false, $is_image = true)
     {
         if (($src = $this->config['cid_map'][$uri])
             || ($src = $this->config['cid_map'][$this->config['base_url'].$uri])
@@ -361,11 +394,11 @@
             }
 
             $this->extlinks = true;
-            if ($blocked_source && $this->config['blocked_src']) {
+            if ($is_image && $blocked_source && $this->config['blocked_src']) {
                 return $this->config['blocked_src'];
             }
         }
-        else if (preg_match('/^data:image.+/i', $uri)) { // RFC2397
+        else if ($is_image && preg_match('/^data:image.+/i', $uri)) { // RFC2397
             return $uri;
         }
     }
@@ -386,7 +419,7 @@
         return $attr == 'background'
             || $attr == 'color-profile' // SVG
             || ($attr == 'poster' && $tag == 'video')
-            || ($attr == 'src' && preg_match('/^(img|source|input|video|audio)$/i', $tag))
+            || ($attr == 'src' && preg_match('/^(img|image|source|input|video|audio)$/i', $tag))
             || ($tag == 'image' && $attr == 'href'); // SVG
     }
 
@@ -432,14 +465,25 @@
         do {
             switch ($node->nodeType) {
             case XML_ELEMENT_NODE: //Check element
-                $tagName = strtolower($node->tagName);
+                $tagName = strtolower($node->nodeName);
+
+                if ($tagName == 'link') {
+                    $uri = $this->wash_uri($node->getAttribute('href'), false, false);
+                    if (!$uri) {
+                        $dump .= '';
+                        break;
+                    }
+
+                    $node->setAttribute('href', (string) $uri);
+                }
+
                 if ($callback = $this->handlers[$tagName]) {
                     $dump .= call_user_func($callback, $tagName,
                         $this->wash_attribs($node), $this->dumpHtml($node, $level), $this);
                 }
                 else if (isset($this->_html_elements[$tagName])) {
                     $content = $this->dumpHtml($node, $level);
-                    $dump .= '<' . $node->tagName;
+                    $dump .= '<' . $node->nodeName;
 
                     if ($tagName == 'svg') {
                         $xpath = new DOMXPath($node->ownerDocument);
@@ -449,6 +493,9 @@
                             }
                         }
                     }
+                    else if ($tagName == 'textarea' && strpos($content, '<') !== false) {
+                        $content = htmlspecialchars($content, ENT_QUOTES | ENT_SUBSTITUTE, $this->config['charset']);
+                    }
 
                     $dump .= $this->wash_attribs($node);
 
@@ -456,14 +503,14 @@
                         $dump .= ' />';
                     }
                     else {
-                        $dump .= '>' . $content . '</' . $node->tagName . '>';
+                        $dump .= '>' . $content . '</' . $node->nodeName . '>';
                     }
                 }
                 else if (isset($this->_ignore_elements[$tagName])) {
-                    $dump .= '';
+                    $dump .= '';
                 }
                 else {
-                    $dump .= '';
+                    $dump .= '';
                     $dump .= $this->dumpHtml($node, $level); // ignore tags not its content
                 }
                 break;
@@ -473,7 +520,7 @@
                 break;
 
             case XML_TEXT_NODE:
-                $dump .= htmlspecialchars($node->nodeValue);
+                $dump .= htmlspecialchars($node->nodeValue, ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE, $this->config['charset']);
                 break;
 
             case XML_HTML_DOCUMENT_NODE:
@@ -492,8 +539,6 @@
      */
     public function wash($html)
     {
-        // Charset seems to be ignored (probably if defined in the HTML document)
-        $node = new DOMDocument('1.0', $this->config['charset']);
         $this->extlinks = false;
 
         $html = $this->cleanup($html);
@@ -512,15 +557,22 @@
         // SVG need to be parsed as XML
         $this->is_xml = stripos($html, '<html') === false && stripos($html, '<svg') !== false;
         $method       = $this->is_xml ? 'loadXML' : 'loadHTML';
-        $options      = 0;
 
-        // Use optimizations if supported
-        if (PHP_VERSION_ID >= 50400) {
-            $options = LIBXML_PARSEHUGE | LIBXML_COMPACT | LIBXML_NONET;
-            @$node->{$method}($html, $options);
+        // DOMDocument does not support HTML5, try Masterminds parser if available
+        if (!$this->is_xml && class_exists('Masterminds\HTML5')) {
+            try {
+                $html5 = new Masterminds\HTML5();
+                $node  = $html5->loadHTML($html);
+            }
+            catch (Exception $e) {
+                // ignore, fallback to DOMDocument
+            }
         }
-        else {
-            @$node->{$method}($html);
+
+        if (empty($node)) {
+            // Charset seems to be ignored (probably if defined in the HTML document)
+            $node = new DOMDocument('1.0', $this->config['charset']);
+            @$node->{$method}($html, LIBXML_PARSEHUGE | LIBXML_COMPACT | LIBXML_NONET);
         }
 
         return $this->dumpHtml($node);

iRony-0.4.1.tar.gz/lib/Roundcube/session Added

iRony-0.4.1.tar.gz/lib/Roundcube/session/db.php Added

@@ -0,0 +1,182 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
+ | Copyright (C) 2011, 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                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ | Author: Cor Bosman <cor@roundcu.be>                                   |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Class to provide database session storage
+ *
+ * @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
+{
+    private $db;
+    private $table_name;
+
+    /**
+     * @param Object $config
+     */
+    public function __construct($config)
+    {
+        parent::__construct($config);
+
+        // get db instance
+        $this->db = rcube::get_instance()->get_dbh();
+
+        // session table name
+        $this->table_name = $this->db->table_name('session', true);
+
+        // register sessions handler
+        $this->register_session_handler();
+
+        // register db gc handler
+        $this->register_gc_handler(array($this, 'gc_db'));
+    }
+
+    /**
+     * @param $save_path
+     * @param $session_name
+     * @return bool
+     */
+    public function open($save_path, $session_name)
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function close()
+    {
+        return true;
+    }
+
+    /**
+     * Handler for session_destroy()
+     *
+     * @param $key
+     * @return bool
+     */
+    public function destroy($key)
+    {
+        if ($key) {
+            $this->db->query("DELETE FROM {$this->table_name} WHERE `sess_id` = ?", $key);
+        }
+
+        return true;
+    }
+
+    /**
+     * Read session data from database
+     *
+     * @param string Session ID
+     *
+     * @return string Session vars
+     */
+    public function read($key)
+    {
+        $sql_result = $this->db->query(
+            "SELECT `vars`, `ip`, `changed`, " . $this->db->now() . " AS ts"
+            . " FROM {$this->table_name} WHERE `sess_id` = ?", $key);
+
+        if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
+            $this->time_diff = time() - strtotime($sql_arr['ts']);
+            $this->changed   = strtotime($sql_arr['changed']);
+            $this->ip        = $sql_arr['ip'];
+            $this->vars      = base64_decode($sql_arr['vars']);
+            $this->key       = $key;
+
+            $this->db->reset();
+
+            return !empty($this->vars) ? (string) $this->vars : '';
+        }
+
+        return '';
+    }
+
+    /**
+     * insert new data into db session store
+     *
+     * @param $key
+     * @param $vars
+     * @return bool
+     */
+    public function write($key, $vars)
+    {
+        if ($this->ignore_write) {
+            return true;
+        }
+
+        $now = $this->db->now();
+
+        $this->db->query("INSERT INTO {$this->table_name}"
+            . " (`sess_id`, `vars`, `ip`, `changed`)"
+            . " VALUES (?, ?, ?, $now)",
+            $key, base64_encode($vars), (string)$this->ip);
+
+        return true;
+    }
+
+    /**
+     * update session data
+     *
+     * @param $key
+     * @param $newvars
+     * @param $oldvars
+     *
+     * @return bool
+     */
+    public function update($key, $newvars, $oldvars)
+    {
+        $now = $this->db->now();
+        $ts  = microtime(true);
+
+        // if new and old data are not the same, update data
+        // else update expire timestamp only when certain conditions are met
+        if ($newvars !== $oldvars) {
+            $this->db->query("UPDATE {$this->table_name} "
+                . "SET `changed` = $now, `vars` = ? WHERE `sess_id` = ?",
+                base64_encode($newvars), $key);
+        }
+        else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
+            $this->db->query("UPDATE {$this->table_name} SET `changed` = $now"
+                . " WHERE `sess_id` = ?", $key);
+        }
+
+        return true;
+    }
+
+    /**
+     * Clean up db sessions.
+     */
+    public function gc_db()
+    {
+        // just clean all old sessions when this GC is called
+        $this->db->query("DELETE FROM " . $this->db->table_name('session')
+            . " WHERE changed < " . $this->db->now(-$this->gc_enabled));
+
+        $this->log("Session GC (DB): remove records < "
+            . date('Y-m-d H:i:s', time() - $this->gc_enabled)
+            . '; rows = ' . intval($this->db->affected_rows()));
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/session/memcache.php Added

@@ -0,0 +1,183 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2014, The Roundcube Dev Team                       |
+ | Copyright (C) 2011, 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                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Author: Aleksander Machniak <alec@alec.pl>                            |
+ | Author: Cor Bosman <cor@roundcu.bet>                                  |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Class to provide memcache session storage
+ *
+ * @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
+{
+    private $memcache;
+    private $debug;
+
+    /**
+     * @param Object $config
+     */
+    public function __construct($config)
+    {
+        parent::__construct($config);
+
+        $this->memcache = rcube::get_instance()->get_memcache();
+        $this->debug    = $config->get('memcache_debug');
+
+        if (!$this->memcache) {
+            rcube::raise_error(array(
+                    'code' => 604, 'type' => 'db',
+                    'line' => __LINE__, 'file' => __FILE__,
+                    'message' => "Failed to connect to memcached. Please check configuration"),
+                true, true);
+        }
+
+        // register sessions handler
+        $this->register_session_handler();
+    }
+
+    /**
+     * @param $save_path
+     * @param $session_name
+     * @return bool
+     */
+    public function open($save_path, $session_name)
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function close()
+    {
+        return true;
+    }
+
+    /**
+     * Handler for session_destroy() with memcache backend
+     *
+     * @param $key
+     * @return bool
+     */
+    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 $key
+     * @return null|string
+     */
+    public function read($key)
+    {
+        if ($value = $this->memcache->get($key)) {
+            $arr = unserialize($value);
+            $this->changed = $arr['changed'];
+            $this->ip      = $arr['ip'];
+            $this->vars    = $arr['vars'];
+            $this->key     = $key;
+        }
+
+        if ($this->debug) {
+            $this->debug('get', $key, $value);
+        }
+
+        return $this->vars ?: '';
+    }
+
+    /**
+     * Write data to memcache storage
+     *
+     * @param $key
+     * @param $vars
+     *
+     * @return bool
+     */
+    public function write($key, $vars)
+    {
+        if ($this->ignore_write) {
+            return true;
+        }
+
+        $data   = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars));
+        $result = $this->memcache->set($key, $data, MEMCACHE_COMPRESSED, $this->lifetime + 60);
+
+        if ($this->debug) {
+            $this->debug('set', $key, $data, $result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Update memcache session data
+     *
+     * @param $key
+     * @param $newvars
+     * @param $oldvars
+     *
+     * @return bool
+     */
+    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->memcache->set($key, $data, MEMCACHE_COMPRESSED, $this->lifetime + 60);
+
+            if ($this->debug) {
+                $this->debug('set', $key, $data, $result);
+            }
+
+            return $result;
+        }
+
+        return true;
+    }
+
+    /**
+     * Write memcache debug info to the log
+     */
+    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.1.tar.gz/lib/Roundcube/session/php.php Changed

iRony-0.4.1.tar.gz/lib/Roundcube/session/redis.php Added

@@ -0,0 +1,168 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ | Copyright (C) 2005-2018, The Roundcube Dev Team                       |
+ |                                                                       |
+ | 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 redis supported session management                          |
+ +-----------------------------------------------------------------------+
+ | Author: Cor Bosman <cor@roundcu.be>                                   |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Class to provide redis session storage
+ *
+ * @package    Framework
+ * @subpackage Core
+ * @author     Cor Bosman <cor@roundcu.be>
+ * @author     Aleksander Machniak <alec@alec.pl>
+ */
+class rcube_session_redis extends rcube_session {
+
+    private $redis;
+    private $debug;
+
+    /**
+     * @param rcube_config $config
+     */
+    public function __construct($config)
+    {
+        parent::__construct($config);
+
+        $this->redis = rcube::get_instance()->get_redis();
+        $this->debug = $config->get('redis_debug');
+
+        // register sessions handler
+        $this->register_session_handler();
+    }
+
+    /**
+     * @param $save_path
+     * @param $session_name
+     * @return bool
+     */
+    public function open($save_path, $session_name)
+    {
+        return true;
+    }
+
+    /**
+     * @return bool
+     */
+    public function close()
+    {
+        return true;
+    }
+
+    /**
+     * remove data from store
+     *
+     * @param $key
+     * @return bool
+     */
+    public function destroy($key)
+    {
+        if ($key) {
+            $result = $this->redis->del($key);
+
+            if ($this->debug) {
+                $this->debug('delete', $key, null, $result);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * read data from redis store
+     *
+     * @param $key
+     * @return string
+     */
+    public function read($key)
+    {
+        if ($value = $this->redis->get($key)) {
+            $arr = unserialize($value);
+            $this->changed = $arr['changed'];
+            $this->ip      = $arr['ip'];
+            $this->vars    = $arr['vars'];
+            $this->key     = $key;
+        }
+
+        if ($this->debug) {
+            $this->debug('get', $key, $value);
+        }
+
+        return $this->vars ?: '';
+    }
+
+    /**
+     * write data to redis store
+     *
+     * @param $key
+     * @param $newvars
+     * @param $oldvars
+     * @return bool
+     */
+    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);
+
+            if ($this->debug) {
+                $this->debug('set', $key, $data, $result);
+            }
+
+            return $result;
+        }
+
+        return true;
+    }
+
+    /**
+     * write data to redis store
+     *
+     * @param $key
+     * @param $vars
+     * @return bool
+     */
+    public function write($key, $vars)
+    {
+        if ($this->ignore_write) {
+            return true;
+        }
+
+        $data   = serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $vars));
+        $result = $this->redis->setex($key, $this->lifetime + 60, $data);
+
+        if ($this->debug) {
+            $this->debug('set', $key, $data, $result);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Write memcache debug info to the log
+     */
+    protected function debug($type, $key, $data = null, $result = null)
+    {
+        $line = strtoupper($type) . ' ' . $key;
+
+        if ($data !== null) {
+            $line .= ' ' . $data;
+        }
+
+        rcube::debug('redis', $line, $result);
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/spellchecker Added

iRony-0.4.1.tar.gz/lib/Roundcube/spellchecker/atd.php Added

@@ -0,0 +1,202 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ |                                                                       |
+ | Copyright (C) 2013, The Roundcube Dev Team                            |
+ |                                                                       |
+ | 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:                                                              |
+ |   Spellchecking backend implementation for afterthedeadline services  |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Spellchecking backend implementation to work with an After the Deadline service
+ * See http://www.afterthedeadline.com/ for more information
+ *
+ * @package    Framework
+ * @subpackage Utils
+ */
+class rcube_spellchecker_atd extends rcube_spellchecker_engine
+{
+    const SERVICE_HOST = 'service.afterthedeadline.com';
+    const SERVICE_PORT = 80;
+
+    private $matches = array();
+    private $content;
+    private $langhosts = array(
+        'fr' => 'fr.',
+        'de' => 'de.',
+        'pt' => 'pt.',
+        'es' => 'es.',
+    );
+
+    /**
+     * Return a list of languages supported by this backend
+     *
+     * @see rcube_spellchecker_engine::languages()
+     */
+    function languages()
+    {
+        $langs = array_values($this->langhosts);
+        $langs[] = 'en';
+        return $langs;
+    }
+
+    /**
+     * Set content and check spelling
+     *
+     * @see rcube_spellchecker_engine::check()
+     */
+    function check($text)
+    {
+        $this->content = $text;
+
+        // spell check uri is configured
+        $rcube = rcube::get_instance();
+        $url = $rcube->config->get('spellcheck_uri');
+        $key = $rcube->config->get('spellcheck_atd_key');
+
+        if ($url) {
+            $a_uri = parse_url($url);
+            $ssl   = ($a_uri['scheme'] == 'https' || $a_uri['scheme'] == 'ssl');
+            $port  = $a_uri['port'] ?: ($ssl ? 443 : 80);
+            $host  = ($ssl ? 'ssl://' : '') . $a_uri['host'];
+            $path  = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $this->lang;
+        }
+        else {
+            $host = self::SERVICE_HOST;
+            $port = self::SERVICE_PORT;
+            $path = '/checkDocument';
+
+            // prefix host for other languages than 'en'
+            $lang = substr($this->lang, 0, 2);
+            if ($this->langhosts[$lang])
+                $host = $this->langhosts[$lang] . $host;
+        }
+
+        $postdata = 'data=' . urlencode($text);
+
+        if (!empty($key))
+            $postdata .= '&key=' . urlencode($key);
+
+        $response = $headers = '';
+        $in_header = true;
+        if ($fp = fsockopen($host, $port, $errno, $errstr, 30)) {
+            $out = "POST $path HTTP/1.0\r\n";
+            $out .= "Host: " . str_replace('ssl://', '', $host) . "\r\n";
+            $out .= "Content-Length: " . strlen($postdata) . "\r\n";
+            $out .= "Content-Type: application/x-www-form-urlencoded\r\n";
+            $out .= "Connection: Close\r\n\r\n";
+            $out .= $postdata;
+            fwrite($fp, $out);
+
+            while (!feof($fp)) {
+                if ($in_header) {
+                    $line = fgets($fp, 512);
+                    $headers .= $line;
+                    if (trim($line) == '')
+                        $in_header = false;
+                }
+                else {
+                    $response .= fgets($fp, 1024);
+                }
+            }
+            fclose($fp);
+        }
+
+        // parse HTTP response headers
+        if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $headers, $m)) {
+            $http_status = $m[1];
+            if ($http_status != '200')
+                $this->error = 'HTTP ' . $m[1] . $m[2];
+        }
+
+        if (!$response) {
+            $this->error = "Empty result from spelling engine";
+        }
+
+        try {
+            $result = new SimpleXMLElement($response);
+        }
+        catch (Exception $e) {
+            $this->error = "Unexpected response from server: " . $response;
+            return array();
+        }
+
+        foreach ($result->error as $error) {
+            if (strval($error->type) == 'spelling') {
+                $word = strval($error->string);
+
+                // skip exceptions
+                if ($this->dictionary->is_exception($word)) {
+                    continue;
+                }
+
+                $prefix = strval($error->precontext);
+                $start = $prefix ? mb_strpos($text, $prefix) : 0;
+                $pos = mb_strpos($text, $word, $start);
+                $len = mb_strlen($word);
+                $num = 0;
+
+                $match = array($word, $pos, $len, null, array());
+                foreach ($error->suggestions->option as $option) {
+                    $match[4][] = strval($option);
+                    if (++$num == self::MAX_SUGGESTIONS)
+                        break;
+                }
+                $matches[] = $match;
+            }
+        }
+
+        $this->matches = $matches;
+        return $matches;
+    }
+
+    /**
+     * Returns suggestions for the specified word
+     *
+     * @see rcube_spellchecker_engine::get_words()
+     */
+    function get_suggestions($word)
+    {
+        $matches = $word ? $this->check($word) : $this->matches;
+
+        if ($matches[0][4]) {
+            return $matches[0][4];
+        }
+
+        return array();
+    }
+
+    /**
+     * Returns misspelled words
+     *
+     * @see rcube_spellchecker_engine::get_suggestions()
+     */
+    function get_words($text = null)
+    {
+        if ($text) {
+            $matches = $this->check($text);
+        }
+        else {
+            $matches = $this->matches;
+            $text    = $this->content;
+        }
+
+        $result = array();
+
+        foreach ($matches as $m) {
+            $result[] = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
+        }
+
+        return $result;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/spellchecker/enchant.php Added

@@ -0,0 +1,181 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ |                                                                       |
+ | Copyright (C) 2011-2013, Kolab Systems AG                             |
+ | Copyright (C) 20011-2013, The Roundcube Dev Team                      |
+ |                                                                       |
+ | 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:                                                              |
+ |   Spellchecking backend implementation to work with Enchant           |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Spellchecking backend implementation to work with Pspell
+ *
+ * @package    Framework
+ * @subpackage Utils
+ */
+class rcube_spellchecker_enchant extends rcube_spellchecker_engine
+{
+    private $enchant_broker;
+    private $enchant_dictionary;
+    private $matches = array();
+
+    /**
+     * Return a list of languages supported by this backend
+     *
+     * @see rcube_spellchecker_engine::languages()
+     */
+    function languages()
+    {
+        $this->init();
+
+        $langs = array();
+        if ($dicts = enchant_broker_list_dicts($this->enchant_broker)) {
+            foreach ($dicts as $dict) {
+                $langs[] = preg_replace('/-.*$/', '', $dict['lang_tag']);
+            }
+        }
+
+        return array_unique($langs);
+    }
+
+    /**
+     * Initializes Enchant dictionary
+     */
+    private function init()
+    {
+        if (!$this->enchant_broker) {
+            if (!extension_loaded('enchant')) {
+                $this->error = "Enchant extension not available";
+                return;
+            }
+
+            $this->enchant_broker = enchant_broker_init();
+        }
+
+        if (!enchant_broker_dict_exists($this->enchant_broker, $this->lang)) {
+            $this->error = "Unable to load dictionary for selected language using Enchant";
+            return;
+        }
+
+        $this->enchant_dictionary = enchant_broker_request_dict($this->enchant_broker, $this->lang);
+    }
+
+    /**
+     * Set content and check spelling
+     *
+     * @see rcube_spellchecker_engine::check()
+     */
+    function check($text)
+    {
+        $this->init();
+
+        if (!$this->enchant_dictionary) {
+            return array();
+        }
+
+        // tokenize
+        $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
+
+        $diff       = 0;
+        $matches    = array();
+
+        foreach ($text as $w) {
+            $word = trim($w[0]);
+            $pos  = $w[1] - $diff;
+            $len  = mb_strlen($word);
+
+            // skip exceptions
+            if ($this->dictionary->is_exception($word)) {
+            }
+            else if (!enchant_dict_check($this->enchant_dictionary, $word)) {
+                $suggestions = enchant_dict_suggest($this->enchant_dictionary, $word);
+
+                if (is_array($suggestions) && count($suggestions) > self::MAX_SUGGESTIONS) {
+                    $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
+                }
+
+                $matches[] = array($word, $pos, $len, null, $suggestions);
+            }
+
+            $diff += (strlen($word) - $len);
+        }
+
+        $this->matches = $matches;
+        return $matches;
+    }
+
+    /**
+     * Returns suggestions for the specified word
+     *
+     * @see rcube_spellchecker_engine::get_words()
+     */
+    function get_suggestions($word)
+    {
+        $this->init();
+
+        if (!$this->enchant_dictionary) {
+            return array();
+        }
+
+        $suggestions = enchant_dict_suggest($this->enchant_dictionary, $word);
+
+        if (is_array($suggestions) && count($suggestions) > self::MAX_SUGGESTIONS)
+            $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
+
+        return is_array($suggestions) ? $suggestions : array();
+    }
+
+    /**
+     * Returns misspelled words
+     *
+     * @see rcube_spellchecker_engine::get_suggestions()
+     */
+    function get_words($text = null)
+    {
+        $result = array();
+
+        if ($text) {
+            // init spellchecker
+            $this->init();
+
+            if (!$this->enchant_dictionary) {
+                return array();
+            }
+
+            // With Enchant we don't need to get suggestions to return misspelled words
+            $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
+
+            foreach ($text as $w) {
+                $word = trim($w[0]);
+
+                // skip exceptions
+                if ($this->dictionary->is_exception($word)) {
+                    continue;
+                }
+
+                if (!enchant_dict_check($this->enchant_dictionary, $word)) {
+                    $result[] = $word;
+                }
+            }
+
+            return $result;
+        }
+
+        foreach ($this->matches as $m) {
+            $result[] = $m[0];
+        }
+
+        return $result;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/spellchecker/engine.php Added

@@ -0,0 +1,89 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ |                                                                       |
+ | Copyright (C) 2011-2013, Kolab Systems AG                             |
+ | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | 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:                                                              |
+ |   Interface class for a spell-checking backend                        |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Interface class for a spell-checking backend
+ *
+ * @package    Framework
+ * @subpackage Utils
+ */
+abstract class rcube_spellchecker_engine
+{
+    const MAX_SUGGESTIONS = 10;
+
+    protected $lang;
+    protected $error;
+    protected $dictionary;
+    protected $separator = '/[\s\r\n\t\/\[\]{}<>\\"]+|[:;?!,\.](?=\W|$)/';
+
+    /**
+     * Default constructor
+     */
+    public function __construct($dict, $lang)
+    {
+        $this->dictionary = $dict;
+        $this->lang = $lang;
+    }
+
+    /**
+     * Return a list of languages supported by this backend
+     *
+     * @return array Indexed list of language codes
+     */
+    abstract function languages();
+
+    /**
+     * Set content and check spelling
+     *
+     * @param string $text    Text content for spellchecking
+     *
+     * @return bool True when no mispelling found, otherwise false
+     */
+    abstract function check($text);
+
+    /**
+     * Returns suggestions for the specified word
+     *
+     * @param string $word The word
+     *
+     * @return array Suggestions list
+     */
+    abstract function get_suggestions($word);
+
+    /**
+     * Returns misspelled words
+     *
+     * @param string $text The content for spellchecking. If empty content
+     *                     used for check() method will be used.
+     *
+     * @return array List of misspelled words
+     */
+    abstract function get_words($text = null);
+
+    /**
+     * Returns error message
+     *
+     * @return string Error message
+     */
+    public function error()
+    {
+        return $this->error;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/spellchecker/googie.php Added

@@ -0,0 +1,177 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ |                                                                       |
+ | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | 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:                                                              |
+ |   Spellchecking backend implementation to work with Googiespell       |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Spellchecking backend implementation to work with a Googiespell service
+ *
+ * @package    Framework
+ * @subpackage Utils
+ */
+class rcube_spellchecker_googie extends rcube_spellchecker_engine
+{
+    const GOOGIE_HOST = 'ssl://spell.roundcube.net';
+    const GOOGIE_PORT = 443;
+
+    private $matches = array();
+    private $content;
+
+    /**
+     * Return a list of languages supported by this backend
+     *
+     * @see rcube_spellchecker_engine::languages()
+     */
+    function languages()
+    {
+        return array('am','ar','ar','bg','br','ca','cs','cy','da',
+            'de_CH','de_DE','el','en_GB','en_US',
+            'eo','es','et','eu','fa','fi','fr_FR','ga','gl','gl',
+            'he','hr','hu','hy','is','it','ku','lt','lv','nl',
+            'pl','pt_BR','pt_PT','ro','ru',
+            'sk','sl','sv','uk');
+    }
+
+    /**
+     * Set content and check spelling
+     *
+     * @see rcube_spellchecker_engine::check()
+     */
+    function check($text)
+    {
+        $this->content = $text;
+
+        if (empty($text)) {
+            return $this->matches = array();
+        }
+
+        // spell check uri is configured
+        $url = rcube::get_instance()->config->get('spellcheck_uri');
+
+        if ($url) {
+            $a_uri = parse_url($url);
+            $ssl   = ($a_uri['scheme'] == 'https' || $a_uri['scheme'] == 'ssl');
+            $port  = $a_uri['port'] ? $a_uri['port'] : ($ssl ? 443 : 80);
+            $host  = ($ssl ? 'ssl://' : '') . $a_uri['host'];
+            $path  = $a_uri['path'] . ($a_uri['query'] ? '?'.$a_uri['query'] : '') . $this->lang;
+        }
+        else {
+            $host = self::GOOGIE_HOST;
+            $port = self::GOOGIE_PORT;
+            $path = '/tbproxy/spell?lang=' . $this->lang;
+        }
+
+        $path .= sprintf('&key=%06d', $_SESSION['user_id']);
+
+        $gtext = '<?xml version="1.0" encoding="utf-8" ?>'
+            .'<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">'
+            .'<text>' . htmlspecialchars($text, ENT_QUOTES, RCUBE_CHARSET) . '</text>'
+            .'</spellrequest>';
+
+        $store = '';
+        if ($fp = fsockopen($host, $port, $errno, $errstr, 30)) {
+            $out = "POST $path HTTP/1.0\r\n";
+            $out .= "Host: " . str_replace('ssl://', '', $host) . "\r\n";
+            $out .= "User-Agent: Roundcube Webmail/" . RCUBE_VERSION . " (Googiespell Wrapper)\r\n";
+            $out .= "Content-Length: " . strlen($gtext) . "\r\n";
+            $out .= "Content-Type: text/xml\r\n";
+            $out .= "Connection: Close\r\n\r\n";
+            $out .= $gtext;
+            fwrite($fp, $out);
+
+            while (!feof($fp))
+                $store .= fgets($fp, 128);
+            fclose($fp);
+        }
+
+        // parse HTTP response
+        if (preg_match('!^HTTP/1.\d (\d+)(.+)!', $store, $m)) {
+            $http_status = $m[1];
+            if ($http_status != '200') {
+                $this->error = 'HTTP ' . $m[1] . rtrim($m[2]);
+            }
+        }
+
+        if (!$store) {
+            $this->error = "Empty result from spelling engine";
+        }
+        else if (preg_match('/<spellresult error="([^"]+)"/', $store, $m) && $m[1]) {
+            $this->error = "Error code $m[1] returned";
+            $this->error .= preg_match('/<errortext>([^<]+)/', $store, $m) ? ": " . html_entity_decode($m[1]) : '';
+        }
+
+        preg_match_all('/<c o="([^"]*)" l="([^"]*)" s="([^"]*)">([^<]*)<\/c>/', $store, $matches, PREG_SET_ORDER);
+
+        // skip exceptions (if appropriate options are enabled)
+        foreach ($matches as $idx => $m) {
+            $word = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
+            // skip  exceptions
+            if ($this->dictionary->is_exception($word)) {
+                unset($matches[$idx]);
+            }
+        }
+
+        $this->matches = $matches;
+        return $matches;
+    }
+
+    /**
+     * Returns suggestions for the specified word
+     *
+     * @see rcube_spellchecker_engine::get_words()
+     */
+    function get_suggestions($word)
+    {
+        $matches = $word ? $this->check($word) : $this->matches;
+
+        if ($matches[0][4]) {
+            $suggestions = explode("\t", $matches[0][4]);
+            if (count($suggestions) > self::MAX_SUGGESTIONS) {
+                $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
+            }
+
+            return $suggestions;
+        }
+
+        return array();
+    }
+
+    /**
+     * Returns misspelled words
+     *
+     * @see rcube_spellchecker_engine::get_suggestions()
+     */
+    function get_words($text = null)
+    {
+        if ($text) {
+            $matches = $this->check($text);
+        }
+        else {
+            $matches = $this->matches;
+            $text    = $this->content;
+        }
+
+        $result = array();
+
+        foreach ($matches as $m) {
+            $result[] = mb_substr($text, $m[1], $m[2], RCUBE_CHARSET);
+        }
+
+        return $result;
+    }
+}

iRony-0.4.1.tar.gz/lib/Roundcube/spellchecker/pspell.php Added

@@ -0,0 +1,187 @@
+<?php
+
+/**
+ +-----------------------------------------------------------------------+
+ | This file is part of the Roundcube Webmail client                     |
+ |                                                                       |
+ | Copyright (C) 2008-2013, The Roundcube Dev Team                       |
+ |                                                                       |
+ | 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:                                                              |
+ |   Spellchecking backend implementation to work with Pspell            |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <machniak@kolabsys.com>                   |
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+*/
+
+/**
+ * Spellchecking backend implementation to work with Pspell
+ *
+ * @package    Framework
+ * @subpackage Utils
+ */
+class rcube_spellchecker_pspell extends rcube_spellchecker_engine
+{
+    private $plink;
+    private $matches = array();
+
+    /**
+     * Return a list of languages supported by this backend
+     *
+     * @see rcube_spellchecker_engine::languages()
+     */
+    function languages()
+    {
+        $defaults = array('en');
+        $langs = array();
+
+        // get aspell dictionaries
+        exec('aspell dump dicts', $dicts);
+        if (!empty($dicts)) {
+            $seen = array();
+            foreach ($dicts as $lang) {
+                $lang = preg_replace('/-.*$/', '', $lang);
+                $langc = strlen($lang) == 2 ? $lang.'_'.strtoupper($lang) : $lang;
+                if (!$seen[$langc]++)
+                    $langs[] = $lang;
+            }
+            $langs = array_unique($langs);
+        }
+        else {
+            $langs = $defaults;
+        }
+
+        return $langs;
+    }
+
+    /**
+     * Initializes PSpell dictionary
+     */
+    private function init()
+    {
+        if (!$this->plink) {
+            if (!extension_loaded('pspell')) {
+                $this->error = "Pspell extension not available";
+                return;
+            }
+
+            $this->plink = pspell_new($this->lang, null, null, RCUBE_CHARSET, PSPELL_FAST);
+        }
+
+        if (!$this->plink) {
+            $this->error = "Unable to load Pspell engine for selected language";
+        }
+    }
+
+    /**
+     * Set content and check spelling
+     *
+     * @see rcube_spellchecker_engine::check()
+     */
+    function check($text)
+    {
+        $this->init();
+
+        if (!$this->plink) {
+            return array();
+        }
+
+        // tokenize
+        $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
+
+        $diff       = 0;
+        $matches    = array();
+
+        foreach ($text as $w) {
+            $word = trim($w[0]);
+            $pos  = $w[1] - $diff;
+            $len  = mb_strlen($word);
+
+            // skip exceptions
+            if ($this->dictionary->is_exception($word)) {
+            }
+            else if (!pspell_check($this->plink, $word)) {
+                $suggestions = pspell_suggest($this->plink, $word);
+
+                if (count($suggestions) > self::MAX_SUGGESTIONS) {
+                    $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
+                }
+
+                $matches[] = array($word, $pos, $len, null, $suggestions);
+            }
+
+            $diff += (strlen($word) - $len);
+        }
+
+        $this->matches = $matches;
+        return $matches;
+    }
+
+    /**
+     * Returns suggestions for the specified word
+     *
+     * @see rcube_spellchecker_engine::get_words()
+     */
+    function get_suggestions($word)
+    {
+        $this->init();
+
+        if (!$this->plink) {
+            return array();
+        }
+
+        $suggestions = pspell_suggest($this->plink, $word);
+
+        if (count($suggestions) > self::MAX_SUGGESTIONS)
+            $suggestions = array_slice($suggestions, 0, self::MAX_SUGGESTIONS);
+
+        return is_array($suggestions) ? $suggestions : array();
+    }
+
+    /**
+     * Returns misspelled words
+     *
+     * @see rcube_spellchecker_engine::get_suggestions()
+     */
+    function get_words($text = null)
+    {
+        $result = array();
+
+        if ($text) {
+            // init spellchecker
+            $this->init();
+
+            if (!$this->plink) {
+                return array();
+            }
+
+            // With PSpell we don't need to get suggestions to return misspelled words
+            $text = preg_split($this->separator, $text, NULL, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_OFFSET_CAPTURE);
+
+            foreach ($text as $w) {
+                $word = trim($w[0]);
+
+                // skip exceptions
+                if ($this->dictionary->is_exception($word)) {
+                    continue;
+                }
+
+                if (!pspell_check($this->plink, $word)) {
+                    $result[] = $word;
+                }
+            }
+
+            return $result;
+        }
+
+        foreach ($this->matches as $m) {
+            $result[] = $m[0];
+        }
+
+        return $result;
+    }
+}

iRony-0.4.0.tar.gz/lib/plugins/calendar/.gitignore -> iRony-0.4.1.tar.gz/lib/plugins/calendar/.gitignore Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/calendar.php -> iRony-0.4.1.tar.gz/lib/plugins/calendar/calendar.php Changed

@@ -97,6 +97,7 @@
   protected function setup()
   {
     $this->require_plugin('libcalendaring');
+    $this->require_plugin('libkolab');
 
     $this->lib             = libcalendaring::get_instance();
     $this->timezone        = $this->lib->timezone;
@@ -152,8 +153,7 @@
       $this->register_action('print', array($this,'print_view'));
       $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
       $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
-      $this->register_action('mailtoevent', array($this, 'mail_message2event'));
-      $this->register_action('inlineui', array($this, 'get_inline_ui'));
+      $this->register_action('dialog-ui', array($this, 'mail_message2event'));
       $this->register_action('check-recent', array($this, 'check_recent'));
       $this->register_action('itip-status', array($this, 'event_itip_status'));
       $this->register_action('itip-remove', array($this, 'event_itip_remove'));
@@ -188,7 +188,7 @@
       }
 
       // add 'Create event' item to message menu
-      if ($this->api->output->type == 'html') {
+      if ($this->api->output->type == 'html' && $_GET['_rel'] != 'event') {
         $this->api->add_content(html::tag('li', null, 
           $this->api->output->button(array(
             'command'  => 'calendar-create-from-mail',
@@ -319,7 +319,11 @@
     $this->rc->output->set_env('timezone', $this->timezone->getName());
     $this->rc->output->set_env('calendar_driver', $this->rc->config->get('calendar_driver'), false);
     $this->rc->output->set_env('calendar_resources', (bool)$this->rc->config->get('calendar_resources_driver'));
-    $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array('id' => 'edit-identities-list', 'aria-label' => $this->gettext('roleorganizer'))));
+    $this->rc->output->set_env('identities-selector', $this->ui->identity_select(array(
+        'id'         => 'edit-identities-list',
+        'aria-label' => $this->gettext('roleorganizer'),
+        'class'      => 'custom-select',
+    )));
 
     $view = rcube_utils::get_input_value('view', rcube_utils::INPUT_GPC);
     if (in_array($view, array('agendaWeek', 'agendaDay', 'month', 'table')))
@@ -446,11 +450,16 @@
         return $p;
       }
 
-      $field_id = 'rcmfd_workstart';
+      $field_id   = 'rcmfd_workstart';
+      $work_start = $this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']);
+      $work_end   = $this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']);
       $p['blocks']['view']['options']['workinghours'] = array(
-        'title' => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
-        'content' => $select_hours->show($this->rc->config->get('calendar_work_start', $this->defaults['calendar_work_start']), array('name' => '_work_start', 'id' => $field_id)) .
-        ' &mdash; ' . $select_hours->show($this->rc->config->get('calendar_work_end', $this->defaults['calendar_work_end']), array('name' => '_work_end', 'id' => $field_id)),
+        'title'   => html::label($field_id, rcube::Q($this->gettext('workinghours'))),
+        'content' => html::div('input-group',
+          $select_hours->show($work_start, array('name' => '_work_start', 'id' => $field_id))
+          . html::span('input-group-append input-group-prepend', html::span('input-group-text',' &mdash; '))
+          . $select_hours->show($work_end, array('name' => '_work_end', 'id' => $field_id))
+        )
       );
     }
 
@@ -468,7 +477,7 @@
       $select_colors->add($this->gettext('coloringmode3'), 3);
 
       $p['blocks']['view']['options']['eventcolors'] = array(
-        'title' => html::label($field_id . 'value', rcube::Q($this->gettext('eventcoloring'))),
+        'title'   => html::label($field_id, rcube::Q($this->gettext('eventcoloring'))),
         'content' => $select_colors->show($this->rc->config->get('calendar_event_coloring', $this->defaults['calendar_event_coloring'])),
       );
     }
@@ -511,7 +520,7 @@
 
       $p['blocks']['view']['options']['alarmtype'] = array(
         'title' => html::label($field_id, rcube::Q($this->gettext('defaultalarmtype'))),
-        'content' => $alarm_type . ' ' . $alarm_offset,
+        'content' => html::div('input-group', $alarm_type . ' ' . $alarm_offset),
       );
     }
 
@@ -529,7 +538,7 @@
           $default_calendar = $id;
       }
       $p['blocks']['view']['options']['defaultcalendar'] = array(
-        'title' => html::label($field_id . 'value', rcube::Q($this->gettext('defaultcalendar'))),
+        'title' => html::label($field_id, rcube::Q($this->gettext('defaultcalendar'))),
         'content' => $select_cal->show($this->rc->config->get('calendar_default_calendar', $default_calendar)),
       );
     }
@@ -570,7 +579,7 @@
 
       $p['blocks']['itip']['options']['after_action'] = array(
         'title'   => html::label($field_id, rcube::Q($this->gettext('afteraction'))),
-        'content' => $select->show($val) . $folders->show($folder),
+        'content' => html::div('input-group', $select->show($val) . $folders->show($folder)),
       );
     }
 
@@ -588,11 +597,17 @@
         foreach ($categories as $name => $color) {
           $key = md5($name);
           $field_class = 'rcmfd_category_' . str_replace(' ', '_', $name);
-          $category_remove = new html_inputfield(array('type' => 'button', 'value' => 'X', 'class' => 'button', 'onclick' => '$(this).parent().remove()', 'title' => $this->gettext('remove_category')));
+          $category_remove = html::span('input-group-append', html::a(array(
+              'class'   => 'button icon delete input-group-text',
+              'onclick' => '$(this).parent().parent().remove()',
+              'title'   => $this->gettext('remove_category'),
+              'href'    => '#rcmfd_new_category',
+            ), html::span('inner', $this->gettext('delete'))
+          ));
           $category_name  = new html_inputfield(array('name' => "_categories[$key]", 'class' => $field_class, 'size' => 30, 'disabled' => $this->driver->categoriesimmutable));
           $category_color = new html_inputfield(array('name' => "_colors[$key]", 'class' => "$field_class colors", 'size' => 6));
           $hidden = $this->driver->categoriesimmutable ? html::tag('input', array('type' => 'hidden', 'name' => "_categories[$key]", 'value' => $name)) : '';
-          $categories_list .= html::div(null, $hidden . $category_name->show($name) . '&nbsp;' . $category_color->show($color) . '&nbsp;' . $category_remove->show());
+          $categories_list .= $hidden . html::div('input-group', $category_name->show($name) . $category_color->show($color) . $category_remove);
         }
 
         $p['blocks']['categories']['options']['category_' . $name] = array(
@@ -601,24 +616,37 @@
 
         $field_id = 'rcmfd_new_category';
         $new_category = new html_inputfield(array('name' => '_new_category', 'id' => $field_id, 'size' => 30));
-        $add_category = new html_inputfield(array('type' => 'button', 'class' => 'button', 'value' => $this->gettext('add_category'),  'onclick' => "rcube_calendar_add_category()"));
+        $add_category = html::span('input-group-append', html::a(array(
+            'type'    => 'button',
+            'class'   => 'button create input-group-text',
+            'title'   => $this->gettext('add_category'),
+            'onclick' => 'rcube_calendar_add_category()',
+            'href'    => '#rcmfd_new_category',
+          ), html::span('inner', $this->gettext('add_category'))
+        ));
         $p['blocks']['categories']['options']['categories'] = array(
-          'content' => $new_category->show('') . '&nbsp;' . $add_category->show(),
+          'content' => html::div('input-group', $new_category->show('') . $add_category),
         );
 
-        $this->rc->output->add_script('function rcube_calendar_add_category(){
+        $this->rc->output->add_label('delete', 'calendar.remove_category');
+        $this->rc->output->add_script('function rcube_calendar_add_category() {
           var name = $("#rcmfd_new_category").val();
           if (name.length) {
-            var input = $("<input>").attr("type", "text").attr("name", "_categories[]").attr("size", 30).val(name);
-            var color = $("<input>").attr("type", "text").attr("name", "_colors[]").attr("size", 6).addClass("colors").val("000000");
-            var button = $("<input>").attr("type", "button").attr("value", "X").addClass("button").click(function(){ $(this).parent().remove() });
-            $("<div>").append(input).append("&nbsp;").append(color).append("&nbsp;").append(button).appendTo("#calendarcategories");
-            color.miniColors({ colorValues:(rcmail.env.mscolors || []) });
+            var button_label = rcmail.gettext("calendar.remove_category");
+            var input = $("<input>").attr({type: "text", name: "_categories[]", size: 30, "class": "form-control"}).val(name);
+            var color = $("<input>").attr({type: "text", name: "_colors[]", size: 6, "class": "colors form-control"}).val("000000");
+            var button = $("<a>").attr({"class": "button icon delete input-group-text", title: button_label, href: "#rcmfd_new_category"})
+              .click(function() { $(this).parent().parent().remove(); })
+              .append($("<span>").addClass("inner").text(rcmail.gettext("delete")));
+
+            $("<div>").addClass("input-group").append(input).append(color).append($("<span class=\'input-group-append\'>").append(button))
+              .appendTo("#calendarcategories");
+            color.minicolors(rcmail.env.minicolors_config || {});
             $("#rcmfd_new_category").val("");
           }
-        }');
+        }', 'foot');
 
-        $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event){
+        $this->rc->output->add_script('$("#rcmfd_new_category").keypress(function(event) {
           if (event.which == 13) {
             rcube_calendar_add_category();
             event.preventDefault();
@@ -656,12 +684,12 @@
       $checkbox = new html_checkbox(array('name' => '_birthday_adressbooks[]') + $input_attrib);
       foreach ($this->rc->get_address_sources(false, true) as $source) {
         $active = in_array($source['id'], (array)$this->rc->config->get('calendar_birthday_adressbooks', array())) ? $source['id'] : '';
-        $sources[] = html::label(null, $checkbox->show($active, array('value' => $source['id'])) . '&nbsp;' . rcube::Q($source['realname'] ?: $source['name']));
+        $sources[] = html::tag('li', null, html::label(null, $checkbox->show($active, array('value' => $source['id'])) . rcube::Q($source['realname'] ?: $source['name'])));
       }
 
       $p['blocks']['birthdays']['options']['birthday_adressbooks'] = array(
         'title'   => rcube::Q($this->gettext('birthdayscalendarsources')),
-        'content' => join(html::br(), $sources),
+        'content' => html::tag('ul', 'proplist', implode("\n", $sources)),
       );
 
       $field_id = 'rcmfd_birthdays_alarm';
@@ -676,10 +704,12 @@
       foreach (array('-M','-H','-D') as $trigger)
         $select_offset->add($this->rc->gettext('trigger' . $trigger, 'libcalendaring'), $trigger);
 
-      $preset = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
+      $preset      = libcalendaring::parse_alarm_value($this->rc->config->get('calendar_birthdays_alarm_offset', '-1D'));
+      $preset_type = $this->rc->config->get('calendar_birthdays_alarm_type', '');
+
       $p['blocks']['birthdays']['options']['birthdays_alarmoffset'] = array(
-        'title' => html::label($field_id . 'value', rcube::Q($this->gettext('showalarms'))),
-        'content' => $select_type->show($this->rc->config->get('calendar_birthdays_alarm_type', '')) . ' ' . $input_value->show($preset[0]) . '&nbsp;' . $select_offset->show($preset[1]),
+        'title'   => html::label($field_id, rcube::Q($this->gettext('showalarms'))),
+        'content' => html::div('input-group', $select_type->show($preset_type) . $input_value->show($preset[0]) . ' ' . $select_offset->show($preset[1])),
       );
     }
 
@@ -839,12 +869,12 @@
         }
         // report more results available
         if ($this->driver->search_more_results)
-          $this->rc->output->show_message('autocompletemore', 'info');
+          $this->rc->output->show_message('autocompletemore', 'notice');
 
         $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
         return;
     }
-    
+
     if ($success)
       $this->rc->output->show_message('successfullysaved', 'confirmation');
     else {
@@ -857,8 +887,8 @@
     if ($success && $reload)
       $this->rc->output->command('plugin.reload_view');
   }
-  
-  
+
+
   /**
    * Dispatcher for event actions initiated by the client
    */
@@ -867,7 +897,7 @@
     $action = rcube_utils::get_input_value('action', rcube_utils::INPUT_GPC);
     $event  = rcube_utils::get_input_value('e', rcube_utils::INPUT_POST, true);
     $success = $reload = $got_msg = false;
-    
+
     // 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;
@@ -887,8 +917,10 @@
       case "new":
         // create UID for new event
         $event['uid'] = $this->generate_uid();
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->new_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->new_event($event)) {
           $event['id'] = $event['uid'];
           $event['_savemode'] = 'all';
           $this->cleanup_event($event);
@@ -898,8 +930,10 @@
         break;
         
       case "edit":
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->edit_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->edit_event($event)) {
           $this->cleanup_event($event);
           $this->event_save_success($event, $old, $action, $success);
         }
@@ -907,19 +941,23 @@
         break;
       
       case "resize":
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->resize_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->resize_event($event)) {
           $this->event_save_success($event, $old, $action, $success);
         }
         $reload = $event['_savemode'] ? 2 : 1;
         break;
       
       case "move":
-        $this->write_preprocess($event, $action);
-        if ($success = $this->driver->move_event($event)) {
+        if (!$this->write_preprocess($event, $action)) {
+          $got_msg = true;
+        }
+        else if ($success = $this->driver->move_event($event)) {
           $this->event_save_success($event, $old, $action, $success);
         }
-        $reload  = $success && $event['_savemode'] ? 2 : 1;
+        $reload = $success && $event['_savemode'] ? 2 : 1;
         break;
       
       case "remove":
@@ -1182,10 +1220,10 @@
     }
 
     // unlock client
-    $this->rc->output->command('plugin.unlock_saving');
+    $this->rc->output->command('plugin.unlock_saving', $success);
 
-    // update event object on the client or trigger a complete refretch if too complicated
-    if ($reload) {
+    // update event object on the client or trigger a complete refresh if too complicated
+    if ($reload && empty($_REQUEST['_framed'])) {
       $args = array('source' => $event['calendar']);
       if ($reload > 1)
         $args['refetch'] = true;
@@ -1732,6 +1770,18 @@
       $settings['identity'] = array('name' => $identity['name'], 'email' => strtolower($identity['email']), 'emails' => ';' . strtolower(join(';', $identity['emails'])));
     }
 
+    // freebusy token authentication URL
+    if (($url = $this->rc->config->get('calendar_freebusy_session_auth_url'))
+      && ($uniqueid = $this->rc->config->get('kolab_uniqueid'))
+    ) {
+      if ($url === true) $url = '/freebusy';
+      $url = rtrim(rcube_utils::resolve_url($url), '/ ');
+      $url .= '/' . urlencode($this->rc->get_user_name());
+      $url .= '/' . urlencode($uniqueid);
+
+      $settings['freebusy_url'] = $url;
+    }
+
     return $settings;
   }
 
@@ -1906,7 +1956,8 @@
    */
   public function attachment_upload()
   {
-    $this->lib->attachment_upload(self::SESSION_KEY, 'cal-');
+    $handler = new kolab_attachments_handler();
+    $handler->attachment_upload(self::SESSION_KEY, 'cal-');
   }
 
   /**
@@ -1914,9 +1965,11 @@
    */
   public function attachment_get()
   {
+    $handler = new kolab_attachments_handler();
+
     // show loading page
     if (!empty($_GET['_preload'])) {
-        return $this->lib->attachment_loading_page();
+        return $handler->attachment_loading_page();
     }
 
     $event_id = rcube_utils::get_input_value('_event', rcube_utils::INPUT_GPC);
@@ -1941,10 +1994,7 @@
 
     // show part page
     if (!empty($_GET['_frame'])) {
-        $this->lib->attachment = $attachment;
-        $this->register_handler('plugin.attachmentframe', array($this->lib, 'attachment_frame'));
-        $this->register_handler('plugin.attachmentcontrols', array($this->lib, 'attachment_header'));
-        $this->rc->output->send('calendar.attachment');
+        $handler->attachment_page($attachment);
     }
     // deliver attachment content
     else if ($attachment) {
@@ -1952,7 +2002,7 @@
             $attachment['body'] = $this->driver->get_attachment_body($id, $event);
         }
 
-        $this->lib->attachment_get($attachment);
+        $handler->attachment_get($attachment);
     }
 
     // if we arrive here, the requested part was not found
@@ -1974,6 +2024,10 @@
    */
   private function write_preprocess(&$event, $action)
   {
+    // Remove double timezone specification (T2313)
+    $event['start'] = preg_replace('/\s*$.*$/', '', $event['start']);
+    $event['end']   = preg_replace('/\s*$.*$/', '', $event['end']);
+
     // convert dates into DateTime objects in user's current timezone
     $event['start']  = new DateTime($event['start'], $this->timezone);
     $event['end']    = new DateTime($event['end'], $this->timezone);
@@ -1981,12 +2035,31 @@
 
     // start/end is all we need for 'move' action (#1480)
     if ($action == 'move') {
-      return;
+      return true;
     }
 
     // convert the submitted recurrence settings
     if (is_array($event['recurrence'])) {
       $event['recurrence'] = $this->lib->from_client_recurrence($event['recurrence'], $event['start']);
+
+      // align start date with the first occurrence
+      if (!empty($event['recurrence']) && !empty($event['syncstart'])
+        && (empty($event['_savemode']) || $event['_savemode'] == 'all')
+      ) {
+        $next = $this->find_first_occurrence($event);
+
+        if (!$next) {
+          $this->rc->output->show_message('calendar.recurrenceerror', 'error');
+          return false;
+        }
+        else if ($event['start'] != $next) {
+          $diff = $event['start']->diff($event['end'], true);
+
+          $event['start'] = $next;
+          $event['end']   = clone $next;
+          $event['end']->add($diff);
+        }
+      }
     }
 
     // convert the submitted alarm values
@@ -2063,6 +2136,8 @@
       $event['url'] = $event['vurl'];
       unset($event['vurl']);
     }
+
+    return true;
   }
 
   /**
@@ -2346,30 +2421,6 @@
   }
 
   /**
-   *
-   */
-  public function get_inline_ui()
-  {
-    foreach (array('save','cancel','savingdata') as $label)
-      $texts['calendar.'.$label] = $this->gettext($label);
-    
-    $texts['calendar.new_event'] = $this->gettext('createfrommail');
-    
-    $this->ui->init_templates();
-    $this->ui->calendar_list();  # set env['calendars']
-    echo $this->api->output->parse('calendar.eventedit', false, false);
-    echo html::tag('script', array('type' => 'text/javascript'),
-      "rcmail.set_env('calendars', " . rcube_output::json_serialize($this->api->output->env['calendars']) . ");\n".
-      "rcmail.set_env('deleteicon', '" . $this->api->output->env['deleteicon'] . "');\n".
-      "rcmail.set_env('cancelicon', '" . $this->api->output->env['cancelicon'] . "');\n".
-      "rcmail.set_env('loadingicon', '" . $this->api->output->env['loadingicon'] . "');\n".
-      "rcmail.gui_object('attachmentlist', '"  . $this->ui->attachmentlist_id . "');\n".
-      "rcmail.add_label(" . rcube_output::json_serialize($texts) . ");\n"
-    );
-    exit;
-  }
-
-  /**
    * Compare two event objects and return differing properties
    *
    * @param array Event A
@@ -2570,7 +2621,7 @@
       && ($response['action'] == 'rsvp' || $response['action'] == 'import')
     ) {
       $calendars = $this->driver->list_calendars($mode);
-      $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true));
+      $calendar_select = new html_select(array('name' => 'calendar', 'id' => 'itip-saveto', 'is_escaped' => true, 'class' => 'custom-select'));
       $calendar_select->add('--', '');
       $numcals = 0;
       foreach ($calendars as $calendar) {
@@ -2595,8 +2646,8 @@
     // render small agenda view for the respective day
     if ($data['method'] == 'REQUEST' && !empty($data['date']) && $response['action'] == 'rsvp') {
       $event_start = rcube_utils::anytodatetime($data['date']);
-      $day_start = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
-      $day_end = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
+      $day_start   = new Datetime(gmdate('Y-m-d 00:00', $data['date']), $this->lib->timezone);
+      $day_end     = new Datetime(gmdate('Y-m-d 23:59', $data['date']), $this->lib->timezone);
 
       // get events on that day from the user's personal calendars
       $calendars = $this->driver->list_calendars(calendar_driver::FILTER_PERSONAL);
@@ -2605,6 +2656,7 @@
 
       $before = $after = array();
       foreach ($events as $event) {
+
         // TODO: skip events with free_busy == 'free' ?
         if ($event['uid'] == $data['uid'] || $event['end'] < $day_start || $event['start'] > $day_end)
           continue;
@@ -2796,7 +2848,6 @@
         }
         else if (in_array($header->ctype, array('multipart/alternative', 'multipart/mixed'))) {
           // TODO: fetch bodystructure and search for ical parts. Maybe too expensive?
-
           if (!empty($header->structure) && is_array($header->structure->parts)) {
             foreach ($header->structure->parts as $part) {
               if (libcalendaring::part_is_vcalendar($part) && !empty($part->ctype_parameters['method'])) {
@@ -2844,7 +2895,7 @@
             ) . '%before%' . $this->mail_agenda_event_row($event, 'current') . '%after%');
         }
 
-        $html .= html::div('calendar-invitebox',
+        $html .= html::div('calendar-invitebox invitebox boxinformation',
           $this->itip->mail_itip_inline_ui(
             $event,
             $ical_objects->method,
@@ -2955,13 +3006,13 @@
          $calendar = $this->get_default_calendar($event['sensitivity'], $calendars);
 
       $metadata = array(
-        'uid' => $event['uid'],
+        'uid'       => $event['uid'],
         '_instance' => $event['_instance'],
-        'changed' => is_object($event['changed']) ? $event['changed']->format('U') : 0,
-        'sequence' => intval($event['sequence']),
-        'fallback' => strtoupper($status),
-        'method' => $event['_method'],
-        'task' => 'calendar',
+        'changed'   => is_object($event['changed']) ? $event['changed']->format('U') : 0,
+        'sequence'  => intval($event['sequence']),
+        'fallback'  => strtoupper($status),
+        'method'    => $event['_method'],
+        'task'      => 'calendar',
       );
 
       // update my attendee status according to submitted method
@@ -2988,9 +3039,9 @@
         if (!$reply_sender) {
           $sender_identity = $this->rc->user->list_emails(true);
           $event['attendees'][] = array(
-            'name' => $sender_identity['name'],
-            'email' => $sender_identity['email'],
-            'role' => 'OPT-PARTICIPANT',
+            'name'   => $sender_identity['name'],
+            'email'  => $sender_identity['email'],
+            'role'   => 'OPT-PARTICIPANT',
             'status' => strtoupper($status),
           );
           $metadata['attendee'] = $sender_identity['email'];
@@ -3016,23 +3067,27 @@
           // only update attendee status
           if ($event['_method'] == 'REPLY') {
             // try to identify the attendee using the email sender address
-            $existing_attendee = -1;
+            $existing_attendee        = -1;
             $existing_attendee_emails = array();
+
             foreach ($existing['attendees'] as $i => $attendee) {
               $existing_attendee_emails[] = $attendee['email'];
               if ($this->itip->compare_email($attendee['email'], $event['_sender'], $event['_sender_utf'])) {
                 $existing_attendee = $i;
               }
             }
-            $event_attendee = null;
+
+            $event_attendee   = null;
             $update_attendees = array();
+
             foreach ($event['attendees'] as $attendee) {
               if ($this->itip->compare_email($attendee['email'], $event['_sender'], $event['_sender_utf'])) {
-                $event_attendee = $attendee;
-                $update_attendees[] = $attendee;
+                $event_attendee       = $attendee;
+                $update_attendees[]   = $attendee;
                 $metadata['fallback'] = $attendee['status'];
                 $metadata['attendee'] = $attendee['email'];
-                $metadata['rsvp'] = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
+                $metadata['rsvp']     = $attendee['rsvp'] || $attendee['role'] != 'NON-PARTICIPANT';
+
                 if ($attendee['status'] != 'DELEGATED') {
                   break;
                 }
@@ -3058,6 +3113,23 @@
               }
             }
 
+            // Accept sender as a new participant (different email in From: and the iTip)
+            // Use ATTENDEE entry from the iTip with replaced email address
+            if (!$event_attendee) {
+              // remove the organizer
+              $itip_attendees = array_filter($event['attendees'], function($item) { return $item['role'] != 'ORGANIZER'; });
+
+              // there must be only one attendee
+              if (is_array($itip_attendees) && count($itip_attendees) == 1) {
+                $event_attendee          = $itip_attendees[key($itip_attendees)];
+                $event_attendee['email'] = $event['_sender'];
+                $update_attendees[]      = $event_attendee;
+                $metadata['fallback']    = $event_attendee['status'];
+                $metadata['attendee']    = $event_attendee['email'];
+                $metadata['rsvp']        = $event_attendee['rsvp'] || $event_attendee['role'] != 'NON-PARTICIPANT';
+              }
+            }
+
             // found matching attendee entry in both existing and new events
             if ($existing_attendee >= 0 && $event_attendee) {
               $existing['attendees'][$existing_attendee] = $event_attendee;
@@ -3068,6 +3140,9 @@
               $existing['attendees'][] = $event_attendee;
               $success = $this->driver->update_attendees($existing, $update_attendees);
             }
+            else if (!$event_attendee) {
+              $error_msg = $this->gettext('errorunknownattendee');
+            }
             else {
               $error_msg = $this->gettext('newerversionexists');
             }
@@ -3299,17 +3374,21 @@
    */
   public function mail_message2event()
   {
-    $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-    $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+    $this->ui->init();
+    $this->ui->addJS();
+    $this->ui->init_templates();
+    $this->ui->calendar_list(array(), true); // set env['calendars']
+
+    $uid   = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+    $mbox  = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
     $event = array();
 
     // establish imap connection
-    $imap = $this->rc->get_storage();
-    $imap->set_folder($mbox);
-    $message = new rcube_message($uid);
+    $imap    = $this->rc->get_storage();
+    $message = new rcube_message($uid, $mbox);
 
     if ($message->headers) {
-      $event['title'] = trim($message->subject);
+      $event['title']       = trim($message->subject);
       $event['description'] = trim($message->first_text_part());
 
       $this->load_driver();
@@ -3351,14 +3430,14 @@
           }
         }
       }
-      
-      $this->rc->output->command('plugin.mail2event_dialog', $event);
+
+      $this->rc->output->set_env('event_prop', $event);
     }
     else {
       $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
     }
-    
-    $this->rc->output->send();
+
+    $this->rc->output->send('calendar.dialog');
   }
 
   /**
@@ -3436,6 +3515,35 @@
   }
 
   /**
+   * Find first occurrence of a recurring event excluding start date
+   *
+   * @param array $event Event data (with 'start' and 'recurrence')
+   *
+   * @return DateTime Date of the first occurrence
+   */
+  public function find_first_occurrence($event)
+  {
+    // Make sure libkolab plugin is loaded in case of Kolab driver
+    $this->load_driver();
+
+    // Use libkolab to compute recurring events (and libkolab plugin)
+    // Horde-based fallback has many bugs
+    if (class_exists('kolabformat') && class_exists('kolabcalendaring') && class_exists('kolab_date_recurrence')) {
+      $object = kolab_format::factory('event', 3.0);
+      $object->set($event);
+
+      $recurrence = new kolab_date_recurrence($object);
+    }
+    else {
+      // fallback to libcalendaring (Horde-based) recurrence implementation
+      require_once(__DIR__ . '/lib/calendar_recurrence.php');
+      $recurrence = new calendar_recurrence($this, $event);
+    }
+
+    return $recurrence->first_occurrence();
+  }
+
+  /**
    * Magic getter for public access to protected members
    */
   public function __get($name)

iRony-0.4.0.tar.gz/lib/plugins/calendar/calendar_base.js -> iRony-0.4.1.tar.gz/lib/plugins/calendar/calendar_base.js Changed

@@ -33,53 +33,40 @@
     // extend base class
     rcube_libcalendaring.call(this, settings);
 
-    // member vars
-    this.ui_loaded = false;
-    this.selected_attachment = null;
-
-    // private vars
-    var me = this;
-
     // create new event from current mail message
     this.create_from_mail = function(uid)
     {
-      if (uid || (uid = rcmail.get_single_uid())) {
-        // load calendar UI (scripts and edit dialog template)
-        if (!this.ui_loaded) {
-          $.when(
-            $.getScript(rcmail.assets_path('plugins/calendar/calendar_ui.js')),
-            $.getScript(rcmail.assets_path('plugins/calendar/lib/js/fullcalendar.js')),
-            $.get(rcmail.url('calendar/inlineui'), function(html) { $(document.body).append(html); }, 'html')
-          ).then(function() {
-            // disable attendees feature (autocompletion and stuff is not initialized)
-            for (var c in rcmail.env.calendars)
-              rcmail.env.calendars[c].attendees = rcmail.env.calendars[c].resources = false;
+      if (!uid && !(uid = rcmail.get_single_uid())) {
+        return;
+      }
 
-            me.ui_loaded = true;
-            me.ui = new rcube_calendar_ui(me.settings);
-            me.create_from_mail(uid);  // start over
+      var url = {_mbox: rcmail.env.mailbox, _uid: uid, _framed: 1},
+        buttons = {},
+        button_classes = ['mainaction save', 'cancel'],
+        title = rcmail.gettext('calendar.createfrommail'),
+        dialog = $('<iframe>').attr({
+            id: 'kolabcalendarinlinegui',
+            name: 'kolabcalendardialog',
+            src: rcmail.url('calendar/dialog-ui', url)
           });
 
-          return;
-        }
-
-        // get message contents for event dialog
-        var lock = rcmail.set_busy(true, 'loading');
-        rcmail.http_post('calendar/mailtoevent', {
-            '_mbox': rcmail.env.mailbox,
-            '_uid': uid
-          }, lock);
-      }
-    };
-
-    // callback function triggered from server with contents for the new event
-    this.mail2event_dialog = function(event)
-    {
-      if (event.title) {
-        this.ui.add_event(event);
-        if (rcmail.message_list)
-          rcmail.message_list.blur();
-      }
+      // dialog buttons
+      buttons[rcmail.gettext('save')] = function() {
+        var frame = rcmail.get_frame_window('kolabcalendarinlinegui');
+        frame.rcmail.command('event-save');
+      };
+
+      buttons[rcmail.gettext('cancel')] = function() {
+        dialog.dialog('destroy');
+      };
+
+      // open jquery UI dialog
+      window.kolab_event_dialog_element = dialog = rcmail.show_popup_dialog(dialog, title, buttons, {
+          button_classes: button_classes,
+          minWidth: 500,
+          width: 600,
+          height: 600
+      });
     };
 
     // handler for attachment-save-calendar commands
@@ -94,7 +81,7 @@
             // _calendar: $('#calendar-attachment-saveto').val(),
           }, rcmail.set_busy(true, 'itip.savingdata'));
       }
-    }
+    };
 }
 
 
@@ -107,12 +94,9 @@
     if (rcmail.env.task == 'mail') {
       rcmail.register_command('calendar-create-from-mail', function() { cal.create_from_mail(); });
       rcmail.register_command('attachment-save-calendar', function() { cal.save_to_calendar(); });
-      rcmail.addEventListener('plugin.mail2event_dialog', function(p) { cal.mail2event_dialog(p); });
-      rcmail.addEventListener('plugin.unlock_saving', function(p) { cal.ui && cal.ui.unlock_saving(); });
 
       if (rcmail.env.action != 'show') {
         rcmail.env.message_commands.push('calendar-create-from-mail');
-        rcmail.add_element($('<a>'));
       }
       else {
         rcmail.enable_command('calendar-create-from-mail', true);

iRony-0.4.0.tar.gz/lib/plugins/calendar/calendar_ui.js -> iRony-0.4.1.tar.gz/lib/plugins/calendar/calendar_ui.js Changed

@@ -32,7 +32,7 @@
 {
     // extend base class
     rcube_calendar.call(this, settings);
-    
+
     /***  member vars  ***/
     this.is_loading = false;
     this.selected_event = null;
@@ -47,8 +47,6 @@
     var DAY_MS = 86400000;
     var HOUR_MS = 3600000;
     var me = this;
-    var gmt_offset = (new Date().getTimezoneOffset() / -60) - (settings.timezone || 0) - (settings.dst || 0);
-    var client_timezone = new Date().getTimezoneOffset();
     var day_clicked = day_clicked_ts = 0;
     var ignore_click = false;
     var event_defaults = { free_busy:'busy', alarms:'' };
@@ -68,18 +66,18 @@
     var freebusy_data = {};
     var current_view = null;
     var count_sources = [];
-    var exec_deferred = bw.ie6 ? 5 : 1;
+    var exec_deferred = 1;
     var sensitivitylabels = { 'public':rcmail.gettext('public','calendar'), 'private':rcmail.gettext('private','calendar'), 'confidential':rcmail.gettext('confidential','calendar') };
     var ui_loading = rcmail.set_busy(true, 'loading');
 
     // general datepicker settings
     var datepicker_settings = {
       // translate from fullcalendar format to datepicker format
-      dateFormat: settings['date_format'].replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
-      firstDay : settings['first_day'],
-      dayNamesMin: settings['days_short'],
-      monthNames: settings['months'],
-      monthNamesShort: settings['months'],
+      dateFormat: settings.date_format.replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
+      firstDay: settings.first_day,
+    //  dayNamesMin: settings.days_short,
+      monthNames: settings.months,
+      monthNamesShort: settings.months,
       changeMonth: false,
       showOtherMonths: true,
       selectOtherMonths: true
@@ -112,7 +110,7 @@
       titleFormat: {
         month: 'MMMM yyyy',
         week: settings.dates_long,
-        day: 'dddd ' + settings['date_long'],
+        day: 'dddd ' + settings.date_long,
         table: settings.dates_long
       },
       listPage: 7,  // advance one week in agenda view
@@ -285,130 +283,33 @@
       else
         return date.getHours() >= settings['work_start'] && date.getHours() < settings['work_end'];
     };
-    
-    // check if the event has 'real' attendees, excluding the current user
-    var has_attendees = function(event)
-    {
-      return (event.attendees && event.attendees.length && (event.attendees.length > 1 || String(event.attendees[0].email).toLowerCase() != settings.identity.email));
-    };
-    
-    // check if the current user is an attendee of this event
-    var is_attendee = function(event, role, email)
-    {
-      var emails = email ? ';'+email.toLowerCase() : settings.identity.emails;
-      for (var i=0; event.attendees && i < event.attendees.length; i++) {
-        if ((!role || event.attendees[i].role == role) && event.attendees[i].email && emails.indexOf(';'+event.attendees[i].email.toLowerCase()) >= 0)
-          return event.attendees[i];
-      }
-      return false;
-    };
-    
-    // check if the current user is the organizer
-    var is_organizer = function(event, email)
-    {
-      return is_attendee(event, 'ORGANIZER', email) || !event.id;
-    };
 
-    /**
-     * Check permissions on the given calendar object
-     */
-    var has_permission = function(cal, perm)
+    var load_attachment = function(data)
     {
-      // multiple chars means "either of"
-      if (String(perm).length > 1) {
-        for (var i=0; i < perm.length; i++) {
-          if (has_permission(cal, perm[i]))
-              return true;
-        }
-      }
-
-      if (cal.rights && String(cal.rights).indexOf(perm) >= 0) {
-        return true;
-      }
-
-      return (perm == 'i' && cal.editable) || (perm == 'v' && cal.editable);
-    }
+      var event = data.record,
+        query = {_id: data.attachment.id, _event: event.recurrence_id || event.id, _cal: event.calendar};
 
-    var load_attachment = function(event, att)
-    {
-      var query = { _id: att.id, _event: event.recurrence_id || event.id, _cal:event.calendar, _frame: 1 };
       if (event.rev)
         query._rev = event.rev;
 
       if (event.calendar == "--invitation--itip")
         $.extend(query, {_uid: event._uid, _part: event._part, _mbox: event._mbox});
 
-      // open attachment in frame if it's of a supported mimetype
-      if (id && att.mimetype && $.inArray(att.mimetype, settings.mimetypes)>=0) {
-        if (rcmail.open_window(rcmail.url('get-attachment', query), true, true)) {
-          return;
-        }
-      }
-
-      query._frame = null;
-      query._download = 1;
-      rcmail.goto_url('get-attachment', query, false);
+      libkolab.load_attachment(query, data.attachment);
     };
 
     // build event attachments list
     var event_show_attachments = function(list, container, event, edit)
     {
-      var i, id, len, img, content, li, elem,
-        ul = document.createElement('UL');
-      ul.className = 'attachmentslist';
-
-      for (i=0, len=list.length; i<len; i++) {
-        elem = list[i];
-        li = document.createElement('LI');
-        li.className = elem.classname;
-
-        if (edit) {
-          rcmail.env.attachments[elem.id] = elem;
-          // delete icon
-          content = $('<a href="#delete" />')
-            .attr('title', rcmail.gettext('delete'))
-            .attr('aria-label', rcmail.gettext('delete') + ' ' + Q(elem.name))
-            .addClass('delete')
-            .click({id: elem.id}, function(e) { remove_attachment(this, e.data.id); return false; });
-
-          if (!rcmail.env.deleteicon)
-            content.html(rcmail.gettext('delete'));
-          else {
-            img = document.createElement('IMG');
-            img.src = rcmail.env.deleteicon;
-            img.alt = rcmail.gettext('delete');
-            content.append(img);
-          }
-
-          content.appendTo(li);
-        }
-
-        // name/link
-        content = $('<a href="#load" />')
-          .html(Q(elem.name))
-          .addClass('file')
-          .click({event: event, att: elem}, function(e) {
-            load_attachment(e.data.event, e.data.att);
-            return false;
-          })
-          .appendTo(li);
-
-        ul.appendChild(li);
-      }
-
-      if (edit && rcmail.gui_objects.attachmentlist) {
-        ul.id = rcmail.gui_objects.attachmentlist.id;
-        rcmail.gui_objects.attachmentlist = ul;
-      }
-
-      container.empty().append(ul);
+      libkolab.list_attachments(list, container, edit, event,
+        function(id) { remove_attachment(id); },
+        function(data) { load_attachment(data); }
+      );
     };
 
-    var remove_attachment = function(elem, id)
+    var remove_attachment = function(id)
     {
-      $(elem.parentNode).hide();
       rcmail.env.deleted_attachments.push(id);
-      delete rcmail.env.attachments[id];
     };
 
     // event details dialog (show only)
@@ -438,59 +339,59 @@
       // allow other plugins to do actions when event form is opened
       rcmail.triggerEvent('calendar-event-init', {o: event});
 
-      $dialog.find('div.event-section, div.event-line').hide();
+      $dialog.find('div.event-section, div.event-line, .form-group').hide();
       $('#event-title').html(Q(event.title)).show();
       
       if (event.location)
         $('#event-location').html('@ ' + text2html(event.location)).show();
       if (event.description)
-        $('#event-description').show().children('.event-text').html(text2html(event.description, 300, 6));
+        $('#event-description').show().find('.event-text').html(text2html(event.description, 300, 6));
       if (event.vurl)
-        $('#event-url').show().children('.event-text').html(render_link(event.vurl));
+        $('#event-url').show().find('.event-text').html(render_link(event.vurl));
       
       // render from-to in a nice human-readable way
       // -> now shown in dialog title
       // $('#event-date').html(Q(me.event_date_text(event))).show();
       
       if (event.recurrence && event.recurrence_text)
-        $('#event-repeat').show().children('.event-text').html(Q(event.recurrence_text));
+        $('#event-repeat').show().find('.event-text').html(Q(event.recurrence_text));
       
       if (event.valarms && event.alarms_text)
-        $('#event-alarm').show().children('.event-text').html(Q(event.alarms_text));
+        $('#event-alarm').show().find('.event-text').html(Q(event.alarms_text).replace(',', ',<br>'));
       
       if (calendar.name)
-        $('#event-calendar').show().children('.event-text').html(Q(calendar.name)).attr('class', 'event-text cal-'+calendar.id).css('color', calendar.textColor || calendar.color || '');
+        $('#event-calendar').show().find('.event-text').html(Q(calendar.name)).addClass('cal-'+calendar.id).css('color', calendar.textColor || calendar.color || '');
       if (event.categories)
-        $('#event-category').show().children('.event-text').html(Q(event.categories)).attr('class', 'event-text cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
+        $('#event-category').show().find('.event-text').html(Q(event.categories)).addClass('cat-'+String(event.categories).toLowerCase().replace(rcmail.identifier_expr, ''));
       if (event.free_busy)
-        $('#event-free-busy').show().children('.event-text').html(Q(rcmail.gettext(event.free_busy, 'calendar')));
+        $('#event-free-busy').show().find('.event-text').text(rcmail.gettext(event.free_busy, 'calendar'));
       if (event.priority > 0) {
         var priolabels = [ '', rcmail.gettext('highest'), rcmail.gettext('high'), '', '', rcmail.gettext('normal'), '', '', rcmail.gettext('low'), rcmail.gettext('lowest') ];
-        $('#event-priority').show().children('.event-text').html(Q(event.priority+' '+priolabels[event.priority]));
+        $('#event-priority').show().find('.event-text').html(Q(event.priority+' '+priolabels[event.priority]));
       }
 
       if (event.status) {
         var status_lc = String(event.status).toLowerCase();
-        $('#event-status').show().children('.event-text').text(rcmail.gettext('status-'+status_lc,'calendar'));
+        $('#event-status').show().find('.event-text').text(rcmail.gettext('status-'+status_lc,'calendar'));
         $('#event-status-badge > span').text(rcmail.gettext('status-'+status_lc,'calendar'));
         $dialog.addClass('status-'+status_lc);
       }
       if (event.sensitivity && event.sensitivity != 'public') {
-        $('#event-sensitivity').show().children('.event-text').text(sensitivitylabels[event.sensitivity]);
+        $('#event-sensitivity').show().find('.event-text').text(sensitivitylabels[event.sensitivity]);
         $('#event-status-badge > span').text(sensitivitylabels[event.sensitivity]);
         $dialog.addClass('sensitivity-'+event.sensitivity);
       }
       if (event.created || event.changed) {
         var created = parseISO8601(event.created),
-          changed = parseISO8601(event.changed)
-        $('#event-created-changed .event-created').html(Q(created ? format_datetime(created) : rcmail.gettext('unknown','calendar')))
-        $('#event-created-changed .event-changed').html(Q(changed ? format_datetime(changed) : rcmail.gettext('unknown','calendar')))
-        $('#event-created-changed').show()
+          changed = parseISO8601(event.changed);
+        $('.event-created', $dialog).text(created ? format_datetime(created) : rcmail.gettext('unknown','calendar'));
+        $('.event-changed', $dialog).text(changed ? format_datetime(changed) : rcmail.gettext('unknown','calendar'));
+        $('#event-created,#event-changed,#event-created-changed').show()
       }
 
       // create attachments list
       if ($.isArray(event.attachments)) {
-        event_show_attachments(event.attachments, $('#event-attachments').children('.event-text'), event);
+        event_show_attachments(event.attachments, $('#event-attachments').find('.event-text'), event);
         if (event.attachments.length > 0) {
           $('#event-attachments').show();
         }
@@ -502,7 +403,7 @@
       // build attachments list
       $('#event-links').hide();
       if ($.isArray(event.links) && event.links.length) {
-          render_message_links(event.links || [], $('#event-links').children('.event-text'), false, 'calendar');
+          render_message_links(event.links || [], $('#event-links').find('.event-text'), false, 'calendar');
           $('#event-links').show();
       }
 
@@ -516,13 +417,13 @@
         });
 
         var data, mystatus = null, rsvp, line, morelink, html = '', overflow = '',
-          organizer = is_organizer(event);
+          organizer = me.is_organizer(event);
 
         for (var j=0; j < event.attendees.length; j++) {
           data = event.attendees[j];
           if (data.email) {
             if (data.role != 'ORGANIZER' && settings.identity.emails.indexOf(';'+data.email) >= 0) {
-              mystatus = data.status.toLowerCase();
+              mystatus = (data.status || 'UNKNOWN').toLowerCase();
               if (data.status == 'NEEDS-ACTION' || data.status == 'TENTATIVE' || data.rsvp)
                 rsvp = mystatus;
             }
@@ -531,9 +432,9 @@
           line = rcube_libcalendaring.attendee_html(data);
 
           if (morelink)
-            overflow += line;
+            overflow += ' ' + line;
           else
-            html += line;
+            html += ' ' + line;
 
           // stop listing attendees
           if (j == 7 && event.attendees.length >= 7) {
@@ -543,7 +444,7 @@
 
         if (html && (event.attendees.length > 1 || !organizer)) {
           $('#event-attendees').show()
-            .children('.event-text')
+            .find('.event-text')
             .html(html)
             .find('a.mailtolink').click(event_attendee_click);
 
@@ -551,31 +452,31 @@
           if (morelink) {
             $('#event-attendees .event-text').append(morelink);
             morelink.click(function(e){
-              rcmail.show_popup_dialog(
+              rcmail.simple_dialog(
                 '<div id="all-event-attendees" class="event-attendees">' + html + overflow + '</div>',
                 rcmail.gettext('tabattendees','calendar'),
                 null,
-                { width:450, modal:false });
+                {width: 450, cancel_button: 'close'});
               $('#all-event-attendees a.mailtolink').click(event_attendee_click);
               return false;
-            })
+            });
           }
         }
 
         if (mystatus && !rsvp) {
-          $('#event-partstat').show().children('.changersvp')
-            .removeClass('accepted tentative declined delegated needs-action')
-            .addClass(mystatus)
-            .children('.event-text')
+          $('#event-partstat').show().find('.changersvp, .event-text')
+            .removeClass('accepted tentative declined delegated needs-action unknown')
+            .addClass(mystatus);
+          $('#event-partstat').find('.event-text')
             .text(rcmail.gettext('status' + mystatus, 'libcalendaring'));
         }
 
-        var show_rsvp = rsvp && !organizer && event.status != 'CANCELLED' && has_permission(calendar, 'v');
+        var show_rsvp = rsvp && !organizer && event.status != 'CANCELLED' && me.has_permission(calendar, 'v');
         $('#event-rsvp')[(show_rsvp ? 'show' : 'hide')]();
-        $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true);
+        $('#event-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel="'+(mystatus || '')+'"]').prop('disabled', true);
 
         if (show_rsvp && event.comment)
-          $('#event-rsvp-comment').show().children('.event-text').html(Q(event.comment));
+          $('#event-rsvp-comment').show().find('.event-text').html(Q(event.comment));
 
         $('#event-rsvp a.reply-comment-toggle').show();
         $('#event-rsvp .itip-reply-comment textarea').hide().val('');
@@ -593,12 +494,13 @@
       if (!temp && calendar.editable && event.editable !== false) {
         buttons.push({
           text: rcmail.gettext('edit', 'calendar'),
+          'class': 'edit mainaction',
           click: function() {
             event_edit_dialog('edit', event);
           }
         });
       }
-      if (!temp && has_permission(calendar, 'td') && event.editable !== false) {
+      if (!temp && me.has_permission(calendar, 'td') && event.editable !== false) {
         buttons.push({
           text: rcmail.gettext('delete', 'calendar'),
           'class': 'delete',
@@ -609,20 +511,19 @@
         });
       }
 
-      if (!buttons.length) {
-        buttons.push({
-          text: rcmail.gettext('close', 'calendar'),
-          click: function(){
-            $dialog.dialog('close');
-          }
-        });
-      }
+      buttons.push({
+        text: rcmail.gettext('close', 'calendar'),
+        'class': 'cancel',
+        click: function() {
+          $dialog.dialog('close');
+        }
+      });
 
       // open jquery UI dialog
       $dialog.dialog({
-        modal: false,
-        resizable: !bw.ie6,
-        closeOnEscape: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
+        modal: true,
+        resizable: true,
+        closeOnEscape: true,
         title: me.event_date_text(event),
         open: function() {
           $dialog.attr('aria-hidden', 'false');
@@ -630,17 +531,19 @@
             $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
           }, 5);
         },
-        close: function() {
+        beforeClose: function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
+        },
+        close: function(e) {
           $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-          rcmail.command('menu-close','eventoptionsmenu');
           $('.libcal-rsvp-replymode').hide();
         },
-        dragStart: function() {
-          rcmail.command('menu-close','eventoptionsmenu');
+        dragStart: function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
           $('.libcal-rsvp-replymode').hide();
         },
-        resizeStart: function() {
-          rcmail.command('menu-close','eventoptionsmenu');
+        resizeStart: function(e) {
+          rcmail.command('menu-close', 'eventoptionsmenu', null, e);
           $('.libcal-rsvp-replymode').hide();
         },
         buttons: buttons,
@@ -661,9 +564,8 @@
       // add link for "more options" drop-down
       if (!temp && !event.temporary && event.calendar != '_resource') {
         $('<a>')
-          .attr('href', '#')
-          .html(rcmail.gettext('eventoptions','calendar'))
-          .addClass('dropdown-link')
+          .attr({href: '#', 'class': 'dropdown-link btn btn-link options', 'data-popup-pos': 'top'})
+          .text(rcmail.gettext('eventoptions','calendar'))
           .click(function(e) {
             return rcmail.command('menu-open','eventoptionsmenu', this, e)
           })
@@ -704,8 +606,11 @@
       event = me.selected_event; // change reference to clone
       freebusy_ui.needsupdate = false;
 
+      if (rcmail.env.action == 'dialog-ui')
+        calendar.attendees = false; // TODO: allow Attendees tab in Save-as-event dialog
+
       // reset dialog first
-      $('#eventtabs').get(0).reset();
+      $('#eventedit form').trigger('reset');
       $('#event-panel-recurrence input, #event-panel-recurrence select, #event-panel-attachments input').prop('disabled', false);
       $('#event-panel-recurrence, #event-panel-attachments').removeClass('disabled');
 
@@ -723,7 +628,7 @@
       var freebusy = $('#edit-free-busy').val(event.free_busy);
       var priority = $('#edit-priority').val(event.priority);
       var sensitivity = $('#edit-sensitivity').val(event.sensitivity);
-      
+      var syncstart = $('#edit-recurrence-syncstart input');
       var duration = Math.round((event.end.getTime() - event.start.getTime()) / 1000);
       var startdate = $('#edit-startdate').val($.fullCalendar.formatDate(event.start, settings['date_format'])).data('duration', duration);
       var starttime = $('#edit-starttime').val($.fullCalendar.formatDate(event.start, settings['time_format'])).show();
@@ -739,7 +644,7 @@
         calendars.val($('option:first', calendars).attr('value'));
 
       invite.checked = settings.itip_notify & 1 > 0;
-      notify.checked = has_attendees(event) && invite.checked;
+      notify.checked = me.has_attendees(event) && invite.checked;
 
       if (event.allDay) {
         starttime.val("12:00").hide();
@@ -753,7 +658,7 @@
       // set calendar selection according to permissions
       calendars.find('option').each(function(i, opt) {
         var cal = me.calendars[opt.value] || {};
-        $(opt).prop('disabled', !(cal.editable || (action == 'new' && has_permission(cal, 'i'))))
+        $(opt).prop('disabled', !(cal.editable || (action == 'new' && me.has_permission(cal, 'i'))))
       });
 
       // set alarm(s)
@@ -785,13 +690,13 @@
         $('#edit-recurring-warning').hide();
 
       // init attendees tab
-      var organizer = !event.attendees || is_organizer(event),
+      var organizer = !event.attendees || me.is_organizer(event),
         allow_invitations = organizer || (calendar.owner && calendar.owner == 'anonymous') || settings.invite_shared;
       event_attendees = [];
       attendees_list = $('#edit-attendees-table > tbody').html('');
       resources_list = $('#edit-resources-table > tbody').html('');
-      $('#edit-attendees-notify')[(action != 'new' && allow_invitations && has_attendees(event) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
-      $('#edit-localchanges-warning')[(action != 'new' && has_attendees(event) && !(allow_invitations || (calendar.owner && is_organizer(event, calendar.owner))) ? 'show' : 'hide')]();
+      $('#edit-attendees-notify')[(action != 'new' && allow_invitations && me.has_attendees(event) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
+      $('#edit-localchanges-warning')[(action != 'new' && me.has_attendees(event) && !(allow_invitations || (calendar.owner && me.is_organizer(event, calendar.owner))) ? 'show' : 'hide')]();
 
       var load_attendees_tab = function()
       {
@@ -842,7 +747,7 @@
       // attachments
       var load_attachments_tab = function()
       {
-        rcmail.enable_command('remove-attachment', calendar.editable && !event.recurrence_id);
+        rcmail.enable_command('remove-attachment', 'upload-file', calendar.editable && !event.recurrence_id);
         rcmail.env.deleted_attachments = [];
         // we're sharing some code for uploads handling with app.js
         rcmail.env.attachments = [];
@@ -858,121 +763,124 @@
       };
       
       // init dialog buttons
-      var buttons = [];
-      
-      // save action
-      buttons.push({
-        text: rcmail.gettext('save', 'calendar'),
-        'class': 'mainaction',
-        click: function() {
-        var start = parse_datetime(allday.checked ? '12:00' : starttime.val(), startdate.val());
-        var end   = parse_datetime(allday.checked ? '13:00' : endtime.val(), enddate.val());
-        
-        // basic input validatetion
-        if (start.getTime() > end.getTime()) {
-          alert(rcmail.gettext('invalideventdates', 'calendar'));
-          return false;
-        }
-        
-        // post data to server
-        var data = {
-          calendar: event.calendar,
-          start: date2servertime(start),
-          end: date2servertime(end),
-          allday: allday.checked?1:0,
-          title: title.val(),
-          description: description.val(),
-          location: location.val(),
-          categories: categories.val(),
-          vurl: vurl.val(),
-          free_busy: freebusy.val(),
-          priority: priority.val(),
-          sensitivity: sensitivity.val(),
-          status: eventstatus.val(),
-          recurrence: me.serialize_recurrence(endtime.val()),
-          valarms: me.serialize_alarms('#edit-alarms'),
-          attendees: event_attendees,
-          links: me.selected_event.links,
-          deleted_attachments: rcmail.env.deleted_attachments,
-          attachments: []
-        };
+      var buttons = [],
+        save_func = function() {
+          var start = parse_datetime(allday.checked ? '12:00' : starttime.val(), startdate.val());
+          var end   = parse_datetime(allday.checked ? '13:00' : endtime.val(), enddate.val());
+
+          // basic input validatetion
+          if (start.getTime() > end.getTime()) {
+            rcmail.alert_dialog(rcmail.gettext('invalideventdates', 'calendar'));
+            return false;
+          }
 
-        // uploaded attachments list
-        for (var i in rcmail.env.attachments)
-          if (i.match(/^rcmfile(.+)/))
-            data.attachments.push(RegExp.$1);
-
-        // read attendee roles
-        $('select.edit-attendee-role').each(function(i, elem){
-          if (data.attendees[i])
-            data.attendees[i].role = $(elem).val();
-        });
+          // post data to server
+          var data = {
+            calendar: event.calendar,
+            start: date2servertime(start),
+            end: date2servertime(end),
+            allday: allday.checked?1:0,
+            title: title.val(),
+            description: description.val(),
+            location: location.val(),
+            categories: categories.val(),
+            vurl: vurl.val(),
+            free_busy: freebusy.val(),
+            priority: priority.val(),
+            sensitivity: sensitivity.val(),
+            status: eventstatus.val(),
+            recurrence: me.serialize_recurrence(endtime.val()),
+            valarms: me.serialize_alarms('#edit-alarms'),
+            attendees: event_attendees,
+            links: me.selected_event.links,
+            deleted_attachments: rcmail.env.deleted_attachments,
+            attachments: []
+          };
+
+          // uploaded attachments list
+          for (var i in rcmail.env.attachments)
+            if (i.match(/^rcmfile(.+)/))
+              data.attachments.push(RegExp.$1);
+
+          // read attendee roles
+          $('select.edit-attendee-role').each(function(i, elem){
+            if (data.attendees[i])
+              data.attendees[i].role = $(elem).val();
+          });
 
-        if (organizer)
-          data._identity = $('#edit-identities-list option:selected').val();
+          if (organizer)
+            data._identity = $('#edit-identities-list option:selected').val();
 
-        // per-attendee notification suppression
-        var need_invitation = false;
-        if (allow_invitations) {
-          $.each(data.attendees, function (i, v) {
-            if (v.role != 'ORGANIZER') {
-              if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked') || v.cutype == 'RESOURCE') {
-                need_invitation = true;
-                delete data.attendees[i]['noreply'];
-              }
-              else if (settings.itip_notify > 0) {
-                data.attendees[i].noreply = 1;
+          // per-attendee notification suppression
+          var need_invitation = false;
+          if (allow_invitations) {
+            $.each(data.attendees, function (i, v) {
+              if (v.role != 'ORGANIZER') {
+                if ($('input.edit-attendee-reply[value="' + v.email + '"]').prop('checked') || v.cutype == 'RESOURCE') {
+                  need_invitation = true;
+                  delete data.attendees[i]['noreply'];
+                }
+                else if (settings.itip_notify > 0) {
+                  data.attendees[i].noreply = 1;
+                }
               }
-            }
-          });
-        }
+            });
+          }
 
-        // tell server to send notifications
-        if ((data.attendees.length || (event.id && event.attendees.length)) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
-          data._notify = settings.itip_notify;
-          data._comment = comment.val();
-        }
+          // tell server to send notifications
+          if ((data.attendees.length || (event.id && event.attendees.length)) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
+            data._notify = settings.itip_notify;
+            data._comment = comment.val();
+          }
 
-        data.calendar = calendars.val();
+          data.calendar = calendars.val();
 
-        if (event.id) {
-          data.id = event.id;
-          if (event.recurrence)
-            data._savemode = $('input.edit-recurring-savemode:checked').val();
-          if (data.calendar && data.calendar != event.calendar)
-            data._fromcalendar = event.calendar;
-        }
+          if (event.id) {
+            data.id = event.id;
+            if (event.recurrence)
+              data._savemode = $('input.edit-recurring-savemode:checked').val();
+            if (data.calendar && data.calendar != event.calendar)
+              data._fromcalendar = event.calendar;
+          }
 
-        update_event(action, data);
-        $dialog.dialog("close");
-      }  // end click:
-      });
+          if (data.recurrence && syncstart.is(':checked'))
+            data.syncstart = 1;
 
-      if (event.id) {
-        buttons.push({
-          text: rcmail.gettext('delete', 'calendar'),
-          'class': 'delete',
-          click: function() {
-            me.delete_event(event);
-            $dialog.dialog('close');
-          }
-        });
-      }
+          update_event(action, data);
+
+          if (rcmail.env.action != 'dialog-ui')
+            $dialog.dialog("close");
+        };
+
+      rcmail.env.event_save_func = save_func;
+
+      // save action
+      buttons.push({
+        text: rcmail.gettext('save', 'calendar'),
+        'class': 'save mainaction',
+        click: save_func
+      });
 
       buttons.push({
         text: rcmail.gettext('cancel', 'calendar'),
+        'class': 'cancel',
         click: function() {
           $dialog.dialog("close");
         }
       });
 
-      // show/hide tabs according to calendar's feature support
+      // show/hide tabs according to calendar's feature support and activate first tab (Larry)
       $('#edit-tab-attendees')[(calendar.attendees?'show':'hide')]();
       $('#edit-tab-resources')[(rcmail.env.calendar_resources?'show':'hide')]();
       $('#edit-tab-attachments')[(calendar.attachments?'show':'hide')]();
+      $('#eventedit:not([data-notabs])').tabs('option', 'active', 0); // Larry
 
-      // activate the first tab
-      $('#eventtabs').tabs('option', 'active', 0);
+      // show/hide tabs according to calendar's feature support and activate first tab (Ellastic)
+      $('li > a[href="#event-panel-attendees"]').parent()[(calendar.attendees?'show':'hide')]();
+      $('li > a[href="#event-panel-resources"]').parent()[(rcmail.env.calendar_resources?'show':'hide')]();
+      $('li > a[href="#event-panel-attachments"]').parent()[(calendar.attachments?'show':'hide')]();
+      if ($('#eventedit').data('notabs'))
+        $('#eventedit li.nav-item:first-child a').tab('show');
 
       // hack: set task to 'calendar' to make all dialog actions work correctly
       var comm_path_before = rcmail.env.comm_path;
@@ -980,33 +888,35 @@
 
       var editform = $("#eventedit");
 
-      // open jquery UI dialog
-      $dialog.dialog({
-        modal: true,
-        resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
-        closeOnEscape: false,
-        title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
-        open: function() {
-          editform.attr('aria-hidden', 'false');
-        },
-        close: function() {
-          editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
-          $dialog.dialog("destroy").remove();
-          rcmail.ksearch_blur();
-          freebusy_data = {};
-          rcmail.env.comm_path = comm_path_before;  // restore comm_path
-          if (op_elem)
-            $(op_elem).focus();
-        },
-        buttons: buttons,
-        minWidth: 500,
-        width: 600
-      }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE6
+      if (rcmail.env.action != 'dialog-ui') {
+        // open jquery UI dialog
+        $dialog.dialog({
+          modal: true,
+          resizable: true,
+          closeOnEscape: false,
+          title: rcmail.gettext((action == 'edit' ? 'edit_event' : 'new_event'), 'calendar'),
+          open: function() {
+            editform.attr('aria-hidden', 'false');
+          },
+          close: function() {
+            editform.hide().attr('aria-hidden', 'true').appendTo(document.body);
+            $dialog.dialog("destroy").remove();
+            rcmail.ksearch_blur();
+            freebusy_data = {};
+            rcmail.env.comm_path = comm_path_before;  // restore comm_path
+            if (op_elem)
+              $(op_elem).focus();
+          },
+          buttons: buttons,
+          minWidth: 500,
+          width: 600
+        }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE6
 
-      // set dialog size according to form content
-      me.dialog_resize($dialog.get(0), editform.height() + (bw.ie ? 20 : 0), 550);
+        // set dialog size according to form content
+        me.dialog_resize($dialog.get(0), editform.height() + (bw.ie ? 20 : 0), 550);
 
-      title.select();
+        rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
+      }
 
       // init other tabs asynchronously
       window.setTimeout(function(){ me.set_recurrence_edit(event); }, exec_deferred);
@@ -1015,7 +925,7 @@
       if (calendar.attachments)
         window.setTimeout(load_attachments_tab, exec_deferred);
 
-      rcmail.triggerEvent('calendar-event-dialog', {dialog: $dialog});
+      title.select();
     };
 
     // show event changelog in a dialog
@@ -1058,7 +968,7 @@
 
       if (data === false || !data.length || !event) {
         // display 'unavailable' message
-        $('<div class="notfound-message event-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','calendar') + '</div>')
+        $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','calendar') + '</div>')
           .insertBefore($dialog.find('.changelog-table').hide());
         return;
       }
@@ -1171,10 +1081,11 @@
             $('.event-date', $dialog).hide();
       });
 
-      var buttons = {};
-      buttons[rcmail.gettext('close', 'calendar')] = function() {
-        $dialog.dialog('close');
-      };
+      var buttons = [{
+        text: rcmail.gettext('close', 'calendar'),
+        'class': 'cancel',
+        click: function() { $dialog.dialog('close'); }
+      }];
 
       // open jquery UI dialog
       $dialog.dialog({
@@ -1307,47 +1218,52 @@
         });
       
       // enable/disable buttons
-      $('#shedule-find-prev').button('option', 'disabled', (fb_start.getTime() < now.getTime()));
+      // FIXME: .button() does nothing in Elastic skin
+      var disabled = fb_start.getTime() < now.getTime();
+      $('#schedule-find-prev').button('option', 'disabled', disabled).prop('disabled', disabled);
       
       // dialog buttons
-      var buttons = {};
-      
-      buttons[rcmail.gettext('select', 'calendar')] = function() {
-        $('#edit-startdate').val(freebusy_ui.startdate.val());
-        $('#edit-starttime').val(freebusy_ui.starttime.val());
-        $('#edit-enddate').val(freebusy_ui.enddate.val());
-        $('#edit-endtime').val(freebusy_ui.endtime.val());
-        
-        // write role changes back to main dialog
-        $('select.edit-attendee-role').each(function(i, elem){
-          if (event_attendees[i] && freebusy_ui.attendees[i]) {
-            event_attendees[i].role = freebusy_ui.attendees[i].role;
-            $(elem).val(event_attendees[i].role);
+      var buttons = [
+        {
+          text: rcmail.gettext('select', 'calendar'),
+          'class': 'save mainaction',
+          click: function() {
+            $('#edit-startdate').val(freebusy_ui.startdate.val());
+            $('#edit-starttime').val(freebusy_ui.starttime.val());
+            $('#edit-enddate').val(freebusy_ui.enddate.val());
+            $('#edit-endtime').val(freebusy_ui.endtime.val());
+
+            // write role changes back to main dialog
+            $('select.edit-attendee-role').each(function(i, elem){
+              if (event_attendees[i] && freebusy_ui.attendees[i]) {
+                event_attendees[i].role = freebusy_ui.attendees[i].role;
+                $(elem).val(event_attendees[i].role);
+              }
+            });
+
+            if (freebusy_ui.needsupdate)
+              update_freebusy_status(me.selected_event);
+            freebusy_ui.needsupdate = false;
+            $dialog.dialog("close");
           }
-        });
-        
-        if (freebusy_ui.needsupdate)
-          update_freebusy_status(me.selected_event);
-        freebusy_ui.needsupdate = false;
-        $dialog.dialog("close");
-      };
-      
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
-      
+        },
+        {
+          text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
+        }
+      ];
+
       $dialog.dialog({
         modal: true,
         resizable: true,
-        closeOnEscape: (!bw.ie6 && !bw.ie7),
+        closeOnEscape: true,
         title: rcmail.gettext('scheduletime', 'calendar'),
         open: function() {
           rcmail.ksearch_blur();
-          $dialog.attr('aria-hidden', 'false').find('#shedule-find-next, #shedule-find-prev').not(':disabled').first().focus();
+          $dialog.attr('aria-hidden', 'false').find('#schedule-find-next, #schedule-find-prev').not(':disabled').first().focus();
         },
         close: function() {
-          if (bw.ie6)
-            $("#edit-attendees-table").css('visibility','visible');
           $dialog.dialog("destroy").attr('aria-hidden', 'true').hide();
           // TODO: focus opener button
         },
@@ -1359,10 +1275,6 @@
         width: 850
       }).show();
       
-      // hide edit dialog on IE6 because of drop-down elements
-      if (bw.ie6)
-        $("#edit-attendees-table").css('visibility','hidden');
-      
       // adjust dialog size to fit grid without scrolling
       var gridw = $('#schedule-freebusy-times').width();
       var overflow = gridw - $('#attendees-freebusy-table td.times').width();
@@ -1425,12 +1337,12 @@
       for (var i=0; i < event_attendees.length; i++) {
         data = event_attendees[i];
         domid = String(data.email).replace(rcmail.identifier_expr, '');
-        times_html += '<tr id="fbrow' + domid + '">' + slots_row + '</tr>';
+        times_html += '<tr id="fbrow' + domid + '" class="fbcontent">' + slots_row + '</tr>';
       }
       
       // add line for all/required attendees
       times_html += '<tr class="spacer"><td colspan="' + (dayslots * freebusy_ui.numdays) + '"></td>';
-      times_html += '<tr id="fbrowall">' + slots_row + '</tr>';
+      times_html += '<tr id="fbrowall" class="fbcontent">' + slots_row + '</tr>';
       
       var table = $('#schedule-freebusy-times');
       table.children('thead').html(dates_row + times_row);
@@ -1492,8 +1404,15 @@
           slotnum = freebusy_ui.interval > 60 ? 1 : (60 / freebusy_ui.interval),
           cells = table.children('thead').find('td'),
           cell_width = cells.first().get(0).offsetWidth,
+          h_margin = table.parents('table').data('h-margin'),
+          v_margin = table.parents('table').data('v-margin'),
           slotend;
 
+        if (h_margin === undefined)
+          h_margin = 4;
+        if (v_margin === undefined)
+          v_margin = 4;
+
         // iterate through slots to determine position and size of the overlay
         for (i=0; i < cells.length; i++) {
           for (n=0; n < slotnum; n++) {
@@ -1515,8 +1434,13 @@
 
         // overlay is visible
         if (width > 0) {
-          overlay.css({ width: (width-4)+'px', height:(table.children('tbody').height() - 4)+'px', left:pos.left+'px', top:pos.top+'px' }).show();
-          
+          overlay.css({
+            width: (width - h_margin) + 'px',
+            height: (table.children('tbody').height() - v_margin) + 'px',
+            left: pos.left + 'px',
+            top: pos.top + 'px'
+          }).show();
+
           // configure draggable
           if (!overlay.data('isdraggable')) {
             overlay.draggable({
@@ -1699,7 +1623,7 @@
 
             // also update total row if all data was loaded
             if (!freebusy_ui.loading && freebusy_data.all[ts] && all_cell) {
-              var all_status = freebusy_data.all[ts][2] ? 'busy' : 'unknown',
+              var w, all_status = freebusy_data.all[ts][2] ? 'busy' : 'unknown',
                 req_status = freebusy_data.required[ts][2] ? 'busy' : 'free';
 
               for (j=1; j < status_classes.length; j++) {
@@ -1712,10 +1636,12 @@
               attr['class'] = req_status + ' all-' + all_status;
 
               // these elements use some specific styling, so we want to minimize their number
-              if (last && last.attr('class') == attr['class'])
-                last.css('width', (percent + parseFloat(last.css('width').replace('%', ''))).toFixed(2) + '%');
+              if (last && last.attr('class').startsWith(attr['class'])) {
+                w = percent + parseFloat(last.css('width').replace('%', ''));
+                last.css('width', w.toFixed(2) + '%').attr('class', attr['class'] + ' w' + w.toFixed(0));
+              }
               else {
-                last = $('<div>').attr(attr);
+                last = $('<div>').attr(attr).addClass('w' + percent.toFixed(0)).append('<span>');
                 all_slots.push(last);
               }
             }
@@ -1831,7 +1757,7 @@
           break;
         }
       }
-      
+
       // update event date/time display
       if (success) {
         update_freebusy_dates(event.start, event.end);
@@ -1844,15 +1770,16 @@
           render_freebusy_grid(Math.min(-1, offset));
         else
           render_freebusy_overlay();
-        
-        var now = new Date();
-        $('#shedule-find-prev').button('option', 'disabled', (event.start.getTime() < now.getTime()));
-        
+
+        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);
+
         // speak new selection
         rcmail.display_message(rcmail.gettext('suggestedslot', 'calendar') + ': ' + me.event_date_text(event, true), 'voice');
       }
       else {
-        alert(rcmail.gettext('noslotfound','calendar'));
+        rcmail.alert_dialog(rcmail.gettext('noslotfound','calendar'));
       }
     };
 
@@ -1899,7 +1826,7 @@
           success = true;
         }
         else {
-          alert(rcmail.gettext('noemailwarning'));
+          rcmail.alert_dialog(rcmail.gettext('noemailwarning'));
         }
       }
       
@@ -1917,13 +1844,15 @@
       $.each(event_attendees, function(i, v){ exists |= (v.email == data.email); });
       if (exists)
         return false;
-      
+
       var calendar = me.selected_event && me.calendars[me.selected_event.calendar] ? me.calendars[me.selected_event.calendar] : me.calendars[me.selected_calendar];
 
       var dispname = Q(data.name || data.email);
       if (data.email)
         dispname = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
-      
+      else
+        dispname = '<span>' + dispname + '</span>';
+
       // role selection
       var organizer = data.role == 'ORGANIZER';
       var opts = {};
@@ -1937,19 +1866,18 @@
         opts['CHAIR'] =  rcmail.gettext('calendar.rolechair');
 
       if (organizer && !readonly)
-          dispname = rcmail.env['identities-selector'];
-      
-      var select = '<select class="edit-attendee-role"' + (organizer || readonly ? ' disabled="true"' : '') + ' aria-label="' + rcmail.gettext('role','calendar') + '">';
+        dispname = rcmail.env['identities-selector'];
+
+      var select = '<select class="edit-attendee-role custom-select"'
+        + (organizer || readonly ? ' disabled="true"' : '')
+        + ' aria-label="' + rcmail.gettext('role','calendar') + '">';
       for (var r in opts)
         select += '<option value="'+ r +'" class="' + r.toLowerCase() + '"' + (data.role == r ? ' selected="selected"' : '') +'>' + Q(opts[r]) + '</option>';
       select += '</select>';
-      
-      // availability
-      var avail = data.email ? 'loading' : 'unknown';
 
       // delete icon
-      var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
-      var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
+      var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : '<span class="inner">' + Q(rcmail.gettext('delete')) + '</span>';
+      var dellink = '<a href="#delete" class="iconlink icon button delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
       var tooltip = '', status = (data.status || '').toLowerCase(),
         status_label = rcmail.gettext('status' + status, 'libcalendaring');
 
@@ -1961,6 +1889,8 @@
         tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
       else if (data['delegated-from'])
         tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
+      else if (!status && organizer)
+        tooltip = rcmail.gettext('statusorganizer', 'libcalendaring');
       else if (status)
         tooltip = status_label;
 
@@ -1970,15 +1900,18 @@
           rcmail.gettext('expandattendeegroup','libcalendaring') + '</a>';
       }
 
+      var avail = data.email ? 'loading' : 'unknown';
+      var table = rcmail.env.calendar_resources && data.cutype == 'RESOURCE' ? resources_list : attendees_list;
       var img_src = rcmail.assets_path('program/resources/blank.gif');
+      var elastic = $(table).parents('.no-img').length > 0;
+      var avail_tag = elastic ? ('<span class="' + avail + '"') : ('<img alt="" src="' + img_src + '" class="availabilityicon '  + avail + '"');
       var html = '<td class="role">' + select + '</td>' +
         '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
-        '<td class="availability"><img src="' + img_src + '" class="availabilityicon ' + avail + '" data-email="' + data.email + '" alt="" /></td>' +
-        '<td class="confirmstate"><span class="' + status + '" title="' + Q(tooltip) + '">' + Q(status ? status_label : '') + '</span></td>' +
+        '<td class="availability">' + avail_tag + ' data-email="' + data.email + '" /></td>' +
+        '<td class="confirmstate"><span class="attendee ' + (status || 'organizer') + '" title="' + Q(tooltip) + '">' + Q(status && !elastic ? status_label : '') + '</span></td>' +
         (data.cutype != 'RESOURCE' ? '<td class="invite">' + (organizer || readonly || !invbox ? '' : invbox) + '</td>' : '') +
         '<td class="options">' + (organizer || readonly ? '' : dellink) + '</td>';
 
-      var table = rcmail.env.calendar_resources && data.cutype == 'RESOURCE' ? resources_list : attendees_list;
       var tr = $('<tr>')
         .addClass(String(data.role).toLowerCase())
         .html(html);
@@ -1999,20 +1932,26 @@
       // select organizer identity
       if (data.identity_id)
         $('#edit-identities-list').val(data.identity_id);
-      
+
       // check free-busy status
       if (avail == 'loading') {
-        check_freebusy_status(tr.find('img.availabilityicon'), data.email, me.selected_event);
+        check_freebusy_status(tr.find('.availability > *:first'), data.email, me.selected_event);
       }
-      
+
+      // Make Elastic checkboxes pretty
+      if (window.UI && UI.pretty_checkbox) {
+        $(tr).find('input[type=checkbox]').each(function() { UI.pretty_checkbox(this); });
+        $(tr).find('select').each(function() { UI.pretty_select(this); });
+      }
+
       event_attendees.push(data);
       return true;
     };
-    
+
     // iterate over all attendees and update their free-busy status display
     var update_freebusy_status = function(event)
     {
-      attendees_list.find('img.availabilityicon').each(function(i,v) {
+      attendees_list.find('.availability > *').each(function(i,v) {
         var email, icon = $(this);
         if (email = icon.attr('data-email'))
           check_freebusy_status(icon, email, event);
@@ -2039,10 +1978,10 @@
         data: { email:email, start:date2servertime(clone_date(event.start, event.allDay?1:0)), end:date2servertime(clone_date(event.end, event.allDay?2:0)), _remote: 1 },
         success: function(status){
           var avail = String(status).toLowerCase();
-          icon.removeClass('loading').addClass(avail).attr('alt', rcmail.gettext('avail' + avail, 'calendar'));
+          icon.removeClass('loading').addClass(avail).attr('title', rcmail.gettext('avail' + avail, 'calendar'));
         },
         error: function(){
-          icon.removeClass('loading').addClass('unknown').attr('alt', rcmail.gettext('availunknown', 'calendar'));
+          icon.removeClass('loading').addClass('unknown').attr('title', rcmail.gettext('availunknown', 'calendar'));
         }
       });
     };
@@ -2061,42 +2000,54 @@
 
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
-  
+
       // dialog buttons
-      var buttons = {};
-  
-      buttons[rcmail.gettext('addresource', 'calendar')] = function() {
-        rcmail.command('add-resource');
-      };
-  
-      buttons[rcmail.gettext('close')] = function() {
-        $dialog.dialog("close");
+      var buttons = [
+        {
+          text: rcmail.gettext('addresource', 'calendar'),
+          'class': 'mainaction save',
+          click: function() { rcmail.command('add-resource'); $dialog.dialog("close"); }
+        },
+        {
+          text: rcmail.gettext('close'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
+        }
+      ];
+
+      var resize = function() {
+        var container = $(rcmail.gui_objects.resourceinfocalendar);
+        container.fullCalendar('option', 'height', container.height() + 1);
       };
 
       // open jquery UI dialog
       $dialog.dialog({
         modal: true,
-        resizable: true,
+        resizable: false, // prevents from Availability tab reflow bugs on resize
         closeOnEscape: true,
         title: rcmail.gettext('findresources', 'calendar'),
+        classes: {'ui-dialog': 'selection-dialog resources-dialog'},
         open: function() {
           rcmail.ksearch_blur();
           $dialog.attr('aria-hidden', 'false');
+
+          // for Elastic
+          if ($('html.layout-small,html.layout-phone').length) {
+            $('#eventresourcesdialog .resource-selection').css('display', 'flex');
+            $('#eventresourcesdialog .resource-content').css('display', 'none');
+          }
+          setTimeout(resize, 50);
         },
         close: function() {
           $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
         },
-        resize: function(e) {
-          var container = $(rcmail.gui_objects.resourceinfocalendar);
-          container.fullCalendar('option', 'height', container.height() + 4);
-        },
+        resize: resize,
         buttons: buttons,
         width: 900,
         height: 500
       }).show();
 
-      // define add-button as main action
-      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().addClass('mainaction').attr('id', 'rcmbtncalresadd');
+      $('.ui-dialog-buttonset .ui-button', $dialog.parent()).first().attr('id', 'rcmbtncalresadd');
 
       me.dialog_resize($dialog.get(0), 540, Math.min(1000, $(window).width() - 50));
 
@@ -2116,6 +2067,14 @@
           if (resources_data[node.id]) {
             resource_showinfo(resources_data[node.id]);
             rcmail.enable_command('add-resource', me.selected_event && $("#eventedit").is(':visible') ? true : false);
+
+            // on elastic mobile display resource info box
+            if ($('html.layout-small,html.layout-phone').length) {
+              $('#eventresourcesdialog .resource-selection').css('display', 'none');
+              $('#eventresourcesdialog .resource-content').css('display', 'flex');
+              $(window).resize();
+              resize();
+            }
           }
           else {
             rcmail.enable_command('add-resource', false);
@@ -2191,9 +2150,9 @@
         for (var k in attribs) {
           if (typeof attribs[k] == 'undefined')
             continue;
-          table.append($('<tr>').addClass(k)
-            .append('<td class="title">' + Q(ucfirst(rcmail.get_label(k, 'calendar'))) + '</td>')
-            .append('<td class="value">' + text2html(render_attrib(attribs[k])) + '</td>')
+          table.append($('<tr>').addClass(k + ' form-group row')
+            .append('<td class="title col-sm-4"><label class="col-form-label">' + Q(ucfirst(rcmail.get_label(k, 'calendar'))) + '</label></td>')
+            .append('<td class="value col-sm-8 form-control-plaintext">' + text2html(render_attrib(attribs[k])) + '</td>')
           );
         }
 
@@ -2449,7 +2408,7 @@
         }
         else {
           me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
-          rcmail.http_post('event', { action:'rsvp', e:submit_data, status:response, attendees:attendees, noreply:noreply });
+          rcmail.http_post('calendar/event', { action:'rsvp', e:submit_data, status:response, attendees:attendees, noreply:noreply });
         }
 
         event_show_dialog(me.selected_event);
@@ -2556,26 +2515,28 @@
 
       if (!data) data = event;
       var decline = false, notify = false, html = '', cal = me.calendars[event.calendar],
-        _has_attendees = has_attendees(event), _is_organizer = is_organizer(event);
+        _has_attendees = me.has_attendees(event),
+        _is_attendee = _has_attendees && me.is_attendee(event),
+        _is_organizer = me.is_organizer(event);
 
       // event has attendees, ask whether to notify them
       if (_has_attendees) {
         var checked = (settings.itip_notify & 1 ? ' checked="checked"' : '');
 
-        if (action == 'remove' && cal.group == 'personal' && is_attendee(event)) {
+        if (action == 'remove' && cal.group != 'shared' && !_is_organizer && _is_attendee) {
           decline = true;
           checked = event.status != 'CANCELLED' ? checked : '';
-          html += '<div class="message">' +
+          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></div>';
         }
-        else {
+        else if (_is_organizer) {
           notify = true;
           if (settings.itip_notify & 2) {
-            html += '<div class="message">' +
+            html += '<div class="message dialog-message ui alert boxwarning">' +
               '<label><input class="confirm-attendees-donotify" type="checkbox"' + checked + ' value="1" name="notify" />&nbsp;' +
-                rcmail.gettext((action == 'remove' ? 'sendcancellation' : 'sendnotifications'), 'calendar') + 
+                rcmail.gettext((action == 'remove' ? 'sendcancellation' : 'sendnotifications'), 'calendar') +
               '</label></div>';
           }
           else {
@@ -2590,17 +2551,16 @@
 
         // disable the 'future' savemode if I'm an attendee
         // reason: no calendaring system supports the thisandfuture range parameter in iTip REPLY
-        if (action == 'remove' && _has_attendees && !_is_organizer && is_attendee(event)) {
+        if (action == 'remove' && !_is_organizer && _is_attendee) {
           future_disabled = ' disabled';
         }
 
-        html += '<div class="message"><span class="ui-icon ui-icon-alert"></span>' +
-          rcmail.gettext(message_label, 'calendar') + '</div>' +
+        html += '<div class="message dialog-message ui alert boxwarning">' + rcmail.gettext(message_label, 'calendar') + '</div>' +
           '<div class="savemode">' +
-            '<a href="#current" class="button">' + rcmail.gettext('currentevent', 'calendar') + '</a>' +
-            '<a href="#future" class="button' + future_disabled + '">' + rcmail.gettext('futurevents', 'calendar') + '</a>' +
-            '<a href="#all" class="button">' + rcmail.gettext('allevents', 'calendar') + '</a>' +
-            (action != 'remove' ? '<a href="#new" class="button">' + rcmail.gettext('saveasnew', 'calendar') + '</a>' : '') +
+            '<a href="#current" class="button btn btn-secondary">' + rcmail.gettext('currentevent', 'calendar') + '</a>' +
+            '<a href="#future" class="button btn btn-secondary' + future_disabled + '">' + rcmail.gettext('futurevents', 'calendar') + '</a>' +
+            '<a href="#all" class="button btn btn-secondary">' + rcmail.gettext('allevents', 'calendar') + '</a>' +
+            (action != 'remove' ? '<a href="#new" class="button btn btn-secondary">' + rcmail.gettext('saveasnew', 'calendar') + '</a>' : '') +
           '</div>';
       }
       
@@ -2637,6 +2597,7 @@
         if (!event.recurrence) {
           buttons.push({
             text: rcmail.gettext((action == 'remove' ? 'delete' : 'save'), 'calendar'),
+            'class': action == 'remove' ? 'delete mainaction' : 'save mainaction',
             click: function() {
               data._notify = notify && $dialog.find('input.confirm-attendees-donotify:checked').length ? 1 : 0;
               data._decline = decline && $dialog.find('input.confirm-attendees-decline:checked').length ? 1 : 0;
@@ -2648,6 +2609,7 @@
 
         buttons.push({
           text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
           click: function() {
             $(this).dialog("close");
           }
@@ -2739,6 +2701,11 @@
           width: 680,
           height: h,
           title: $.fullCalendar.formatDate(date, 'dddd ' + settings['date_long']),
+          buttons: [{
+            text: rcmail.gettext('cancel', 'calendar'),
+            'class': 'cancel',
+            click: function() { $(this).dialog("close"); }
+          }],
           close: function(){
             dialog.dialog("destroy");
             me.fisheye_date = null;
@@ -2898,88 +2865,60 @@
       // show confirm dialog for recurring events, use jquery UI dialog
       return update_event_confirm('remove', event, { id:event.id, calendar:event.calendar, attendees:event.attendees });
     };
-    
+
     // opens a jquery UI dialog with event properties (or empty for creating a new calendar)
     this.calendar_edit_dialog = function(calendar)
     {
-      // close show dialog first
-      var $dialog = $("#calendarform");
-      if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-      
       if (!calendar)
         calendar = { name:'', color:'cc0000', editable:true, showalarms:true };
-      
-      var form, name, color, alarms;
-      
-      $dialog.html(rcmail.get_label('loading'));
-      $.ajax({
-        type: 'GET',
-        dataType: 'html',
-        url: rcmail.url('calendar'),
-        data: { action:(calendar.id ? 'form-edit' : 'form-new'), c:{ id:calendar.id } },
-        success: function(data) {
-          $dialog.html(data);
-          // resize and reposition dialog window
-          form = $('#calendarpropform');
-          me.dialog_resize('#calendarform', form.height(), form.width());
-          name = $('#calendar-name').prop('disabled', !calendar.editable).val(calendar.editname || calendar.name);
-          color = $('#calendar-color').val(calendar.color).miniColors({ value: calendar.color, colorValues:rcmail.env.mscolors });
-          alarms = $('#calendar-showalarms').prop('checked', calendar.showalarms).get(0);
-          name.select();
-        }
-      });
 
-      // dialog buttons
-      var buttons = {};
-      
-      buttons[rcmail.gettext('save', 'calendar')] = function() {
-        // form is not loaded
-        if (!form || !form.length)
-          return;
-          
-        // TODO: do some input validation
-        if (!name.val() || name.val().length < 2) {
-          alert(rcmail.gettext('invalidcalendarproperties', 'calendar'));
-          name.select();
-          return;
-        }
-        
-        // post data to server
-        var data = form.serializeJSON();
-        if (data.color)
-          data.color = data.color.replace(/^#/, '');
-        if (calendar.id)
-          data.id = calendar.id;
-        if (alarms)
-          data.showalarms = alarms.checked ? 1 : 0;
-
-        me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
-        rcmail.http_post('calendar', { action:(calendar.id ? 'edit' : 'new'), c:data });
-        $dialog.dialog("close");
-      };
+      var title = rcmail.gettext((calendar.id ? 'editcalendar' : 'createcalendar'), 'calendar'),
+        params = {action: calendar.id ? 'form-edit' : 'form-new', c: {id: calendar.id}, _framed: 1},
+        $dialog = $('<iframe>').attr('src', rcmail.url('calendar', params)).on('load', function() {
+          var contents = $(this).contents();
+          contents.find('#calendar-name')
+            .prop('disabled', !calendar.editable)
+            .val(calendar.editname || calendar.name)
+            .select();
+          contents.find('#calendar-color')
+            .val(calendar.color);
+          contents.find('#calendar-showalarms')
+            .prop('checked', calendar.showalarms);
+        }),
+        save_func = function() {
+          var data,
+            form = $dialog.contents().find('#calendarpropform'),
+            name = form.find('#calendar-name');
 
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
+          // form is not loaded
+          if (!form || !form.length)
+            return false;
 
-      // open jquery UI dialog
-      $dialog.dialog({
-        modal: true,
-        resizable: true,
-        closeOnEscape: false,
-        title: rcmail.gettext((calendar.id ? 'editcalendar' : 'createcalendar'), 'calendar'),
-        open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-        },
-        close: function() {
-          $dialog.html('').dialog("destroy").hide();
-        },
-        buttons: buttons,
-        minWidth: 400,
-        width: 420
-      }).show();
+          // do some input validation
+          if (!name.val() || name.val().length < 2) {
+            rcmail.alert_dialog(rcmail.gettext('invalidcalendarproperties', 'calendar'), function() {
+              name.select();
+            });
+
+            return false;
+          }
+
+          // post data to server
+          data = form.serializeJSON();
+          if (data.color)
+            data.color = data.color.replace(/^#/, '');
+          if (calendar.id)
+            data.id = calendar.id;
 
+          me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
+          rcmail.http_post('calendar', { action:(calendar.id ? 'edit' : 'new'), c:data });
+          $dialog.dialog("close");
+        };
+
+      rcmail.simple_dialog($dialog, title, save_func, {
+        width: 600,
+        height: 400
+      });
     };
 
     this.calendar_remove = function(calendar)
@@ -2991,10 +2930,12 @@
 
     this.calendar_delete = function(calendar)
     {
-      if (confirm(rcmail.gettext(calendar.children ? 'deletecalendarconfirmrecursive' : 'deletecalendarconfirm', 'calendar'))) {
+      var label = calendar.children ? 'deletecalendarconfirmrecursive' : 'deletecalendarconfirm';
+      rcmail.confirm_dialog(rcmail.gettext(label, 'calendar'), 'delete', function() {
         rcmail.http_post('calendar', { action:'delete', c:{ id:calendar.id } });
         return true;
-      }
+      });
+
       return false;
     };
 
@@ -3040,40 +2981,46 @@
       // close show dialog first
       var $dialog = $("#eventsimport"),
         form = rcmail.gui_objects.importform;
-      
+
       if ($dialog.is(':ui-dialog'))
         $dialog.dialog('close');
-      
+
       if (calendar)
         $('#event-import-calendar').val(calendar.id);
-      
-      var buttons = {};
-      buttons[rcmail.gettext('import', 'calendar')] = function() {
-        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');
 
-            // display error message if no sophisticated response from server arrived (e.g. iframe load error)
-            if (me.import_succeeded === null)
-              rcmail.display_message(rcmail.get_label('importerror', 'calendar'), 'error');
-          });
-
-          // display upload indicator (with extended timeout)
-          var timeout = rcmail.env.request_timeout;
-          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');
+      var buttons = [
+        {
+          text: rcmail.gettext('import', 'calendar'),
+          'class' : 'mainaction import',
+          click: function() {
+            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');
+
+                // display error message if no sophisticated response from server arrived (e.g. iframe load error)
+                if (me.import_succeeded === null)
+                  rcmail.display_message(rcmail.get_label('importerror', 'calendar'), 'error');
+              });
+
+              // display upload indicator (with extended timeout)
+              var timeout = rcmail.env.request_timeout;
+              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');
 
-          // restore settings
-          rcmail.env.request_timeout = timeout;
+              // restore settings
+              rcmail.env.request_timeout = timeout;
+            }
+          }
+        },
+        {
+          text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
         }
-      };
-
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
+      ];
 
       // open jquery UI dialog
       $dialog.dialog({
@@ -3081,9 +3028,6 @@
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('importevents', 'calendar'),
-        open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
@@ -3134,26 +3078,32 @@
           input.select();
       })
 
-      var buttons = {};
-      buttons[rcmail.gettext('export', 'calendar')] = function() {
-        if (form) {
-          var start = 0, range = $('#event-export-range option:selected', this).val(),
-            source = $('#event-export-calendar option:selected').val(),
-            attachmt = $('#event-export-attachments').get(0).checked;
-
-          if (range == 'custom')
-            start = date2unixtime(parse_datetime('00:00', $('#event-export-startdate').val()));
-          else if (range > 0)
-            start = 'today -' + range + ' months';
+      var buttons = [
+        {
+          text: rcmail.gettext('export', 'calendar'),
+          '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(),
+                attachmt = $('#event-export-attachments').get(0).checked;
+
+              if (range == 'custom')
+                start = date2unixtime(parse_datetime('00:00', $('#event-export-startdate').val()));
+              else if (range > 0)
+                start = 'today -' + range + ' months';
 
-          rcmail.goto_url('export_events', { source:source, start:start, attachments:attachmt?1:0 });
+              rcmail.goto_url('export_events', { source:source, start:start, attachments:attachmt?1:0 }, false);
+            }
+            $dialog.dialog("close");
+          }
+        },
+        {
+          text: rcmail.gettext('cancel', 'calendar'),
+          'class': 'cancel',
+          click: function() { $dialog.dialog("close"); }
         }
-        $dialog.dialog("close");
-      };
-
-      buttons[rcmail.gettext('cancel', 'calendar')] = function() {
-        $dialog.dialog("close");
-      };
+      ];
 
       // open jquery UI dialog
       $dialog.dialog({
@@ -3161,9 +3111,6 @@
         resizable: false,
         closeOnEscape: false,
         title: rcmail.gettext('exporttitle', 'calendar'),
-        open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-        },
         close: function() {
           $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
           $dialog.dialog("destroy").hide();
@@ -3177,7 +3124,7 @@
     this.event_download = function(event)
     {
       if (event && event.id) {
-        rcmail.goto_url('export_events', { source:event.calendar, id:event.id, attachments:1 });
+        rcmail.goto_url('export_events', { source:event.calendar, id:event.id, attachments:1 }, false);
       }
     };
 
@@ -3215,34 +3162,35 @@
     // show URL of the given calendar in a dialog box
     this.showurl = function(calendar)
     {
-      var $dialog = $('#calendarurlbox');
-
-      if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-
       if (calendar.feedurl) {
+        var dialog = $('#calendarurlbox').clone(true);
+
         if (calendar.caldavurl) {
-          $('#caldavurl').val(calendar.caldavurl);
-          $('#calendarcaldavurl').show();
+          $('#caldavurl', dialog).val(calendar.caldavurl);
+          $('#calendarcaldavurl', dialog).show();
         }
         else {
-          $('#calendarcaldavurl').hide();
+          $('#calendarcaldavurl', dialog).hide();
         }
 
-        $dialog.dialog({
-          resizable: true,
-          closeOnEscape: true,
-          title: rcmail.gettext('showurl', 'calendar'),
-          close: function() {
-            $dialog.dialog("destroy").hide();
-          },
-          width: 520
-        }).show();
-
-        $('#calfeedurl').val(calendar.feedurl).select();
+        rcmail.simple_dialog(dialog, rcmail.gettext('showurl', 'calendar'), null, {
+          open: function() { $('#calfeedurl', dialog).val(calendar.feedurl).select(); },
+          cancel_button: 'close'
+        });
       }
     };
 
+    // show free-busy URL in a dialog box
+    this.showfburl = function()
+    {
+      var dialog = $('#fburlbox').clone(true);
+
+      rcmail.simple_dialog(dialog, rcmail.gettext('showfburl', 'calendar'), null, {
+        open: function() { $('#fburl', dialog).val(settings.freebusy_url).select(); },
+        cancel_button: 'close'
+      });
+    };
+
     // refresh the calendar view after saving event data
     this.refresh = function(p)
     {
@@ -3494,12 +3442,13 @@
           this._search_message = rcmail.display_message(rcmail.gettext('searchnoresults', 'calendar'), 'notice');
           append = '<div class="message">' + rcmail.gettext('searchnoresults', 'calendar') + '</div>';
         }
-        append += '<div class="fc-bottomlinks formlinks"></div>';
+        append += '<div class="fc-bottomlinks formlinks toolbar"></div>';
         addlinks = true;
       }
       
       if (fc.fullCalendar('getView').name == 'table') {
-        var container = fc.find('.fc-list-content > .fc-listappend');
+        var elastic = $('#calendar').data('elastic-mode');
+        var container = elastic ? $('#searchcontrols') : fc.find('.fc-list-content > .fc-listappend');
         if (append) {
           if (!container.length)
             container = $('<div class="fc-listappend"></div>').appendTo(fc.find('.fc-list-content'));
@@ -3507,23 +3456,41 @@
         }
         else if (container.length)
           container.hide();
-        
+
         // add links to adjust search date range
         if (addlinks) {
           var lc = container.find('.fc-bottomlinks');
-          $('<a>').attr('href', '#').html(rcmail.gettext('searchearlierdates', 'calendar')).appendTo(lc).click(function(){
-            fc.fullCalendar('incrementDate', 0, -1, 0);
-          });
+
+          if (elastic) {
+            $('<a>').attr({href: '#', 'class': 'button icon tools'})
+              .append($('<span class="inner">').text(rcmail.gettext('showtools')))
+              .prependTo('#searchcontrols')
+              .click(function() {
+                $(this).attr('title', rcmail.gettext($('#searchcontrols').toggleClass('open').is('.open') ? 'hidetools' : 'showtools'));
+              });
+          }
+
+          $('<a>').attr({href: '#', 'class': 'button prev'})
+            .append($('<span class="inner">').text(rcmail.gettext(elastic ? 'earlierevents' : 'searchearlierdates', 'calendar')))
+            .appendTo(lc)
+            .click(function() {
+              fc.fullCalendar('incrementDate', 0, -1, 0);
+            });
+
           lc.append(" ");
-          $('<a>').attr('href', '#').html(rcmail.gettext('searchlaterdates', 'calendar')).appendTo(lc).click(function(){
-            var range = fc.fullCalendar('option', 'listRange');
-            if (range < 90) {
-              fc.fullCalendar('option', 'listRange', fc.fullCalendar('option', 'listRange') + 30).fullCalendar('render');
-              update_agenda_toolbar();
-            }
-            else
-              fc.fullCalendar('incrementDate', 0, 1, 0);
-          });
+
+          $('<a>').attr({href: '#', 'class': 'button next'})
+            .append($('<span class="inner">').text(rcmail.gettext(elastic ? 'laterevents' : 'searchlaterdates', 'calendar')))
+            .appendTo(lc)
+            .click(function() {
+              var range = fc.fullCalendar('option', 'listRange');
+              if (range < 90) {
+                fc.fullCalendar('option', 'listRange', fc.fullCalendar('option', 'listRange') + 30).fullCalendar('render');
+                update_agenda_toolbar();
+              }
+              else
+                fc.fullCalendar('incrementDate', 0, 1, 0);
+            });
         }
       }
       
@@ -3531,13 +3498,6 @@
         this.fisheye_view(this.fisheye_date);
     };
 
-    // resize and reposition (center) the dialog window
-    this.dialog_resize = function(id, height, width)
-    {
-      var win = $(window), w = win.width(), h = win.height();
-      $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) });
-    };
-
     // adjust calendar view size
     this.view_resize = function()
     {
@@ -3595,7 +3555,7 @@
 
       // insert to #calendar-select options if writeable
       select = $('#edit-calendar');
-      if (fc && has_permission(cal, 'i') && select.length && !select.find('option[value="'+id+'"]').length) {
+      if (fc && me.has_permission(cal, 'i') && select.length && !select.find('option[value="'+id+'"]').length) {
         $('<option>').attr('value', id).html(cal.name).appendTo(select);
       }
     }
@@ -3651,7 +3611,7 @@
     calendars_list.addEventListener('select', function(node) {
       if (node && node.id && me.calendars[node.id]) {
         me.select_calendar(node.id, true);
-        rcmail.enable_command('calendar-edit', 'calendar-showurl', true);
+        rcmail.enable_command('calendar-edit', 'calendar-showurl', 'calendar-showfburl', true);
         rcmail.enable_command('calendar-delete', me.calendars[node.id].editable);
         rcmail.enable_command('calendar-remove', me.calendars[node.id] && me.calendars[node.id].removable);
       }
@@ -3685,7 +3645,7 @@
       if (data.length)
         rcmail.display_message(rcmail.gettext('nrcalendarsfound','calendar').replace('$nr', data.length), 'voice');
       else
-        rcmail.display_message(rcmail.gettext('nocalendarsfound','calendar'), 'info');
+        rcmail.display_message(rcmail.gettext('nocalendarsfound','calendar'), 'notice');
     });
     calendars_list.addEventListener('click-item', function(event) {
       // handle clicks on quickview icon: temprarily add this source and open in quickview
@@ -3762,6 +3722,16 @@
       me.calendar_edit_dialog(me.calendars[id]);
     });
 
+    // Make Elastic checkboxes pretty
+    if (window.UI && UI.pretty_checkbox) {
+      $(rcmail.gui_objects.calendarslist).find('input[type=checkbox]').each(function() {
+        UI.pretty_checkbox($(this).addClass('flex-checkbox'));
+       });
+       calendars_list.addEventListener('add-item', function(prop) {
+         UI.pretty_checkbox($(prop.li).find('input').addClass('flex-checkbox'));
+       });
+    }
+
     // select default calendar
     if (rcmail.env.source && this.calendars[rcmail.env.source])
       this.selected_calendar = rcmail.env.source;
@@ -3924,6 +3894,13 @@
     var minical;
     var init_calendar_ui = function()
     {
+      var pretty_select = function(elem) {
+        // for Elastic
+        if (window.UI && UI.pretty_select) {
+          $(elem).addClass('custom-select').each(function() { UI.pretty_select(this); });
+        }
+      };
+
       // initialize small calendar widget using jQuery UI datepicker
       minical = $('#datepicker').datepicker($.extend(datepicker_settings, {
         inline: true,
@@ -3934,11 +3911,14 @@
           ignore_click = true;
           var d = minical.datepicker('getDate'); //parse_datetime('0:0', dateText);
           fc.fullCalendar('gotoDate', d).fullCalendar('select', d, d, true);
+          setTimeout(function() { pretty_select($('select', minical)); }, 25);
         },
         onChangeMonthYear: function(year, month, inst) {
           minical.data('year', year).data('month', month);
+          setTimeout(function() { pretty_select($('select', minical)); }, 25);
         },
         beforeShowDay: function(date) {
+          setTimeout(function() { pretty_select($('select', minical)); }, 25);
           var view = fc.fullCalendar('getView');
           var active = view.visStart && date.getTime() >= view.visStart.getTime() && date.getTime() < view.visEnd.getTime();
           return [ true, (active ? 'ui-datepicker-activerange ui-datepicker-active-' + view.name : ''), ''];
@@ -3966,6 +3946,7 @@
               date = new Date(base_date.getTime() - day_off * DAY_MS + wdiff * 7 * DAY_MS);
             fc.fullCalendar('gotoDate', date).fullCalendar('setDate', date).fullCalendar('changeView', 'agendaWeek');
             minical.datepicker('setDate', date);
+            setTimeout(function() { pretty_select($('select', minical)); }, 25);
           }
         });
 
@@ -3978,11 +3959,16 @@
       }
 
       // init event dialog
-      $('#eventtabs').tabs({
-        activate: function(event, ui) {
-          // newPanel.selector for jQuery-UI 1.10, newPanel.attr('id') for jQuery-UI 1.12
-          var tab = String(ui.newPanel.selector || ui.newPanel.attr('id'))
-              .replace(/^#?event-panel-/, '').replace(/s$/, '');
+      var tab_change = function(event, ui) {
+          // newPanel.selector for jQuery-UI 1.10, newPanel.attr('id') for jQuery-UI 1.12, href for Bootstrap tabs
+          var tab = (ui ? String(ui.newPanel.selector || ui.newPanel.attr('id')) : $(event.target).attr('href'))
+            .replace(/^#?event-panel-/, '').replace(/s$/, '');
+          var has_real_attendee = function(attendees) {
+              for (var i=0; i < (attendees ? attendees.length : 0); i++) {
+                if (attendees[i].cutype != 'RESOURCE')
+                  return true;
+              }
+            };
 
           if (tab == 'attendee' || tab == 'resource') {
             if (!rcube_event.is_keyboard(event))
@@ -3991,22 +3977,32 @@
             if (freebusy_ui.needsupdate && me.selected_event)
               update_freebusy_status(me.selected_event);
             // add current user as organizer if non added yet
-            if (tab == 'attendee' && !event_attendees.length) {
+            if (tab == 'attendee' && !has_real_attendee(event_attendees)) {
               add_attendee($.extend({ role:'ORGANIZER' }, settings.identity));
               $('#edit-attendees-form .attendees-invitebox').show();
             }
           }
+
           // reset autocompletion on tab change (#3389)
           rcmail.ksearch_blur();
-        }
-      });
+
+          // display recurrence warning in recurrence tab only
+          if (tab == 'recurrence')
+            $('#edit-recurrence-frequency').change();
+          else
+            $('#edit-recurrence-syncstart').hide();
+      };
+
+      $('#eventedit:not([data-notabs])').tabs({activate: tab_change});             // Larry
+      $('#eventedit a.nav-link').on('show.bs.tab', tab_change); // Elastic
+
       $('#edit-enddate').datepicker(datepicker_settings);
       $('#edit-startdate').datepicker(datepicker_settings).datepicker('option', 'onSelect', shift_enddate).change(function(){ shift_enddate(this.value); });
       $('#edit-enddate').datepicker('option', 'onSelect', event_times_changed).change(event_times_changed);
       $('#edit-allday').click(function(){ $('#edit-starttime, #edit-endtime')[(this.checked?'hide':'show')](); event_times_changed(); });
 
       // configure drop-down menu on time input fields based on jquery UI autocomplete
-      $('#edit-starttime, #edit-endtime, #eventedit input.edit-alarm-time').each(function() {
+      $('#edit-starttime, #edit-endtime').each(function() {
         me.init_time_autocomplete(this, {
           container: '#eventedit',
           change: event_times_changed
@@ -4030,7 +4026,7 @@
       // reload free-busy status when changing the organizer identity
       $('#eventedit').on('change', '#edit-identities-list', function(e) {
         var email = settings.identities[$(this).val()],
-          icon = $(this).closest('tr').find('img.availabilityicon');
+          icon = $(this).closest('tr').find('.availability > *');
 
         if (email && icon.length) {
           icon.attr('data-email', email);
@@ -4051,9 +4047,10 @@
       }
       rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
       rcmail.addEventListener('autocomplete_insert', function(e) {
-        var success = false;
+        var cutype, success = false;
         if (e.field.name == 'participant') {
-          success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:(e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL') });
+          cutype = e.data && e.data.type == 'group' && e.result_type == 'person' ? 'GROUP' : 'INDIVIDUAL';
+          success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:cutype });
         }
         else if (e.field.name == 'resource' && e.data && e.data.email) {
           success = add_attendee($.extend(e.data, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'RESOURCE' }));
@@ -4080,12 +4077,17 @@
           input.val('');
         }
       });
-      
+
       $('#edit-resource-find').click(function(){
         event_resources_dialog();
         return false;
       });
 
+      $('#resource-content a.nav-link').on('click', function() {
+        e.preventDefault();
+        $(this).tab('show');
+      });
+
       // handle change of "send invitations" checkbox
       $('#edit-attendees-invite').change(function() {
         $('#edit-attendees-donotify,input.edit-attendee-reply').prop('checked', this.checked);
@@ -4103,11 +4105,11 @@
         event_freebusy_dialog();
       });
 
-      $('#shedule-freebusy-prev').html(bw.ie6 ? '&lt;&lt;' : '&#9668;').button().click(function(){ render_freebusy_grid(-1); });
-      $('#shedule-freebusy-next').html(bw.ie6 ? '&gt;&gt;' : '&#9658;').button().click(function(){ render_freebusy_grid(1); }).parent().buttonset();
+      $('#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();
 
-      $('#shedule-find-prev').button().click(function(){ freebusy_find_slot(-1); });
-      $('#shedule-find-next').button().click(function(){ freebusy_find_slot(1); });
+      $('#schedule-find-prev').button().click(function(){ freebusy_find_slot(-1); });
+      $('#schedule-find-next').button().click(function(){ freebusy_find_slot(1); });
 
       $('#schedule-freebusy-workinghours').click(function(){
         freebusy_ui.workinhoursonly = this.checked;
@@ -4179,21 +4181,49 @@
     if (!bw.ie)
       $('div.fc-content').addClass('rcube-fc-content');
 
-    // IE supresses 2nd click event when double-clicking
-    if (bw.ie && bw.vendver < 9) {
-      $('div.fc-content').bind('dblclick', function(e){
-        if (!$(this).hasClass('fc-widget-header') && fc.fullCalendar('getView').name != 'table') {
-          var date = fc.fullCalendar('getDate');
-          var enddate = new Date(); enddate.setTime(date.getTime() + DAY_MS - 60000);
-          event_edit_dialog('new', { start:date, end:enddate, allDay:true, calendar:me.selected_calendar });
-        }
+    // Save-as-event dialog content
+    if (rcmail.env.action == 'dialog-ui') {
+      var date = new Date(), event = {allDay: false, calendar: me.selected_calendar};
+
+      date.setHours(date.getHours()+1);
+      date.setMinutes(0);
+
+      var end = new Date(date.getTime());
+      end.setHours(date.getHours()+1);
+
+      event.start = date;
+      event.end = end;
+
+      // exec deferred because it must be after init_calendar_ui
+      window.setTimeout(function() {
+        event_edit_dialog('new', $.extend(event, rcmail.env.event_prop));
+      }, exec_deferred);
+
+      rcmail.register_command('event-save', function() { rcmail.env.event_save_func(); }, true);
+      rcmail.addEventListener('plugin.unlock_saving', function(status) {
+        me.unlock_saving();
+        if (status)
+          window.parent.kolab_event_dialog_element.dialog('destroy');
       });
     }
 } // end rcube_calendar class
 
 
+// Update layout after initialization
+// In devel mode we have to wait until all styles are applied by less
+if (rcmail.env.devel_mode && window.less) {
+  less.pageLoadFinished.then(function() { $(window).resize(); });
+}
+
 /* calendar plugin initialization */
 window.rcmail && rcmail.addEventListener('init', function(evt) {
+  // let's go
+  var cal = new rcube_calendar_ui($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
+
+  if (rcmail.env.action == 'dialog-ui') {
+    return;
+  }
+
   // configure toolbar buttons
   rcmail.register_command('addevent', function(){ cal.add_event(); }, true);
   rcmail.register_command('print', function(){ cal.print_calendars(); }, true);
@@ -4205,6 +4235,7 @@
   rcmail.register_command('calendar-delete', function(){ cal.calendar_delete(cal.calendars[cal.selected_calendar]); }, false);
   rcmail.register_command('events-import', function(){ cal.import_events(cal.calendars[cal.selected_calendar]); }, true);
   rcmail.register_command('calendar-showurl', function(){ cal.showurl(cal.calendars[cal.selected_calendar]); }, false);
+  rcmail.register_command('calendar-showfburl', function(){ cal.showfburl(); }, false);
   rcmail.register_command('event-download', function(){ cal.event_download(cal.selected_event); }, true);
   rcmail.register_command('event-sendbymail', function(p, obj, e){ cal.event_sendbymail(cal.selected_event, e); }, true);
   rcmail.register_command('event-copy', function(){ cal.event_copy(cal.selected_event); }, true);
@@ -4238,9 +4269,6 @@
   rcmail.addEventListener('plugin.itip_message_processed', function(data){ cal.itip_message_processed(data); });
   rcmail.addEventListener('requestrefresh', function(q){ return cal.before_refresh(q); });
 
-  // let's go
-  var cal = new rcube_calendar_ui($.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings));
-
   $(window).resize(function(e) {
     // check target due to bugs in jquery
     // http://bugs.jqueryui.com/ticket/7514
@@ -4256,4 +4284,76 @@
   // show toolbar
   $('#toolbar').show();
 
+  // Elastic mods
+  if ($('#calendar').data('elastic-mode')) {
+    var selector = $('<div class="btn-group btn-group-toggle" role="group">').appendTo('.fc-header-left'),
+        nav = $('<div class="btn-group btn-group-toggle" role="group">').appendTo('.fc-header-right');
+
+    $('.fc-header-left > span').each(function() {
+      var new_btn, cl = 'btn btn-secondary', btn = $(this),
+        activate = function(button) {
+          selector.children('.active').removeClass('active');
+          $(button).addClass('active');
+        };
+
+      if (btn.is('.fc-state-active')) {
+        cl += ' active';
+      }
+
+      new_btn = $('<button>').attr({'class': cl}).text(btn.text())
+        .appendTo(selector)
+        .on('click', function() {
+          activate(this);
+          btn.click();
+        });
+
+      if (window.MutationObserver) {
+        // handle button active state changes
+        new MutationObserver(function() { if (btn.is('.fc-state-active')) activate(new_btn); }).observe(this, {attributes: true});
+      }
+    });
+
+    $.each(['prev', 'today', 'next'], function() {
+      var btn = $('.fc-header-right').find('.fc-button-' + this);
+      $('<button>').attr({'class': 'btn btn-secondary'})
+        .text(btn.text()).appendTo(nav).on('click', function() { btn.click(); });
+    });
+
+    $('#timezone-display').appendTo($('.fc-header-center')).removeClass('hidden');
+    $('#agendaoptions').detach().insertAfter('table.fc-header');
+
+    $('.content-frame-navigation a.button.date').appendTo('.content > .searchbar');
+
+    // Mobile header title
+    if (window.MutationObserver) {
+      var title = $('.fc-header-title'),
+        mobile_header = $('#layout > .content > .header > .header-title'),
+        callback = function() {
+          var text = title.text();
+          mobile_header.html('').append([
+            $('<span class="title">').text(text),
+            $('<span class="tz">').text($('#timezone-display').text())
+          ]);
+        };
+
+      // update the header when something changes on the calendar title
+      new MutationObserver(callback).observe(title[0], {childList: true, subtree: true});
+      // initialize the header
+      callback();
+    }
+
+    window.calendar_datepicker = function() {
+      $('#datepicker').dialog({
+        modal: true,
+        title: rcmail.gettext('calendar.selectdate'),
+        buttons: [{
+          text: rcmail.gettext('close', 'calendar'),
+          'class': 'cancel',
+          click: function() { $(this).dialog('close'); }
+        }],
+        width: 400,
+        height: 520
+      });
+    }
+  }
 });

iRony-0.4.0.tar.gz/lib/plugins/calendar/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/calendar/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/config.inc.php.dist -> iRony-0.4.1.tar.gz/lib/plugins/calendar/config.inc.php.dist Changed

@@ -138,8 +138,9 @@
 $config['calendar_include_freebusy_data'] = 1;
 
 // SMTP server host used to send (anonymous) itip messages.
-// Set to '' in order to use PHP's mail() function for email delivery.
 // To override the SMTP port or connection method, provide a full URL like 'tls://somehost:587'
+// This will add a link to invitation messages to allow users from outside
+// to reply when their mail clients do not support iTip format.
 $config['calendar_itip_smtp_server'] = null;
 
 // SMTP username used to send (anonymous) itip messages
@@ -166,4 +167,9 @@
 // LDAP directory configuration to find avilable resources for events
 // $config['calendar_resources_directory'] = array(/* ldap_public-like address book configuration */);
 
+// Enables displaying of free-busy URL with token-based authentication
+// Set it to the prefix URL, e.g. 'https://hostname/freebusy' or just '/freebusy'.
+// See freebusy_session_auth in configuration of kolab_auth plugin.
+$config['calendar_freebusy_session_auth_url'] = null;
+
 ?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/drivers/calendar_driver.php -> iRony-0.4.1.tar.gz/lib/plugins/calendar/drivers/calendar_driver.php Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_calendar.php -> iRony-0.4.1.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

@@ -130,7 +130,7 @@
   /**
    * Return color to display this calendar
    */
-  public function get_color()
+  public function get_color($default = null)
   {
     // color is defined in folder METADATA
     if ($color = $this->storage->get_color()) {
@@ -143,7 +143,7 @@
     if (!empty($prefs[$this->id]) && !empty($prefs[$this->id]['color']))
       return $prefs[$this->id]['color'];
 
-    return 'cc0000';
+    return $default ?: 'cc0000';
   }
 
   /**
@@ -659,14 +659,7 @@
     }
 
     // use libkolab to compute recurring events
-    if (class_exists('kolabcalendaring')) {
-        $recurrence = new kolab_date_recurrence($object);
-    }
-    else {
-      // fallback to local recurrence implementation
-      require_once($this->cal->home . '/lib/calendar_recurrence.php');
-      $recurrence = new calendar_recurrence($this->cal, $event);
-    }
+    $recurrence = new kolab_date_recurrence($object);
 
     $i = 0;
     while ($next_event = $recurrence->next_instance()) {
@@ -717,7 +710,7 @@
       if (++$i > 100000)
           break;
     }
-    
+
     return $events;
   }
 
@@ -732,9 +725,18 @@
       $record['links'] = $this->get_links($record['uid']);
     }
 
-    if ($this->get_namespace() == 'other') {
+    $ns = $this->get_namespace();
+
+    if ($ns == 'other') {
       $record['className'] = 'fc-event-ns-other';
-      $record = kolab_driver::add_partstat_class($record, array('NEEDS-ACTION','DECLINED'), $this->get_owner());
+    }
+
+    if ($ns == 'other' || !$this->cal->rc->config->get('kolab_invitation_calendars')) {
+      $record = kolab_driver::add_partstat_class($record, array('NEEDS-ACTION', 'DECLINED'), $this->get_owner());
+
+      // Modify invitation status class name, when invitation calendars are disabled
+      // we'll use opacity only for declined/needs-action events
+      $record['className'] = str_replace('-invitation', '', $record['className']);
     }
 
     // add instance identifier to first occurrence (master event)

iRony-0.4.0.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php -> iRony-0.4.1.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_driver.php Changed

@@ -982,6 +982,15 @@
       // force 'current' mode for single occurrences stored as exception
       else if (!$old['recurrence'] && !$old['recurrence_id'] && $old['isexception'])
         $savemode = 'current';
+
+      // Stick to the master timezone for all occurrences (Bifrost#T104637)
+      $master_tz = $master['start']->getTimezone();
+      $event_tz  = $event['start']->getTimezone();
+
+      if ($master_tz->getName() != $event_tz->getName()) {
+        $event['start']->setTimezone($master_tz);
+        $event['end']->setTimezone($master_tz);
+      }
     }
 
     // check if update affects scheduling and update attendee status accordingly
@@ -1141,11 +1150,11 @@
         // 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['allday'] ? 0 : $old['end']->format('U') - $old['start']->format('U');
+        $old_duration   = self::event_duration($old['start'], $old['end'], $old['allday']);
 
         $new_start_date = $event['start']->format('Y-m-d');
         $new_start_time = $event['allday'] ? '' : $event['start']->format('H:i');
-        $new_duration   = $event['allday'] ? 0 : $event['end']->format('U') - $event['start']->format('U');
+        $new_duration   = self::event_duration($event['start'], $event['end'], $event['allday']);
 
         $diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
         $date_shift = $old['start']->diff($event['start']);
@@ -1154,10 +1163,10 @@
         if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
           $event['start'] = $master['start']->add($date_shift);
           $event['end'] = clone $event['start'];
-          $event['end']->add(new DateInterval('PT'.$new_duration.'S'));
+          $event['end']->add(new DateInterval($new_duration));
 
           // remove fixed weekday, will be re-set to the new weekday in kolab_calendar::update_event()
-          if ($old_start_date != $new_start_date) {
+          if ($old_start_date != $new_start_date && $event['recurrence']) {
             if (strlen($event['recurrence']['BYDAY']) == 2)
               unset($event['recurrence']['BYDAY']);
             if ($old['recurrence']['BYMONTH'] == $old['start']->format('n'))
@@ -1231,6 +1240,19 @@
   }
 
   /**
+   * Calculate event duration, returns string in DateInterval format
+   */
+  protected static function event_duration($start, $end, $allday = false)
+  {
+    if ($allday) {
+      $diff = $start->diff($end);
+      return 'P' . $diff->days . 'D';
+    }
+
+    return 'PT' . ($end->format('U') - $start->format('U')) . 'S';
+  }
+
+  /**
    * Determine whether the current change affects scheduling and reset attendee status accordingly
    */
   public function check_scheduling(&$event, $old, $update = true)
@@ -1771,16 +1793,16 @@
    */
   private function get_recurrence_count($event, $dtstart)
   {
-    // use libkolab to compute recurring events
-    if (class_exists('kolabcalendaring') && $event['_formatobj']) {
-        $recurrence = new kolab_date_recurrence($event['_formatobj']);
-    }
-    else {
-      // fallback to local recurrence implementation
-      require_once($this->cal->home . '/lib/calendar_recurrence.php');
-      $recurrence = new calendar_recurrence($this->cal, $event);
+    // load the given event data into a libkolabxml container
+    if (!$event['_formatobj']) {
+      $event_xml = new kolab_format_event();
+      $event_xml->set($event);
+      $event['_formatobj'] = $event_xml;
     }
 
+    // use libkolab to compute recurring events
+    $recurrence = new kolab_date_recurrence($event['_formatobj']);
+
     $count = 0;
     while (($next_event = $recurrence->next_instance()) && $next_event['start'] <= $dtstart && $count < 1000) {
       $count++;
@@ -2312,7 +2334,14 @@
     if (in_array($calendar['id'], array(self::BIRTHDAY_CALENDAR_ID, self::INVITATIONS_CALENDAR_PENDING, self::INVITATIONS_CALENDAR_DECLINED))) {
       if ($calendar['id'] != self::BIRTHDAY_CALENDAR_ID)
         unset($formfields['showalarms']);
-      return parent::calendar_form($action, $calendar, $formfields);
+
+      // General tab
+      $form['props'] = array(
+        'name'   => $this->rc->gettext('properties'),
+        'fields' => $formfields,
+      );
+
+      return kolab_utils::folder_form($form, '', 'calendar');
     }
 
     $this->_read_calendars();
@@ -2345,7 +2374,8 @@
 
     // General tab
     $form['props'] = array(
-      'name' => $this->rc->gettext('properties'),
+      'name'   => $this->rc->gettext('properties'),
+      'fields' => array(),
     );
 
     // Disable folder name input
@@ -2356,12 +2386,7 @@
     }
 
     // calendar name (default field)
-    $form['props']['fieldsets']['location'] = array(
-      'name'  => $this->rc->gettext('location'),
-      'content' => array(
-        'name' => $formfields['name']
-      ),
-    );
+    $form['props']['fields']['location'] = $formfields['name'];
 
     if (!empty($options) && ($options['norename'] || $options['protected'])) {
       // prevent user from moving folder
@@ -2369,7 +2394,7 @@
     }
     else {
       $select = kolab_storage::folder_selector('event', array('name' => 'parent', 'id' => 'calendar-parent'), $folder);
-      $form['props']['fieldsets']['location']['content']['path'] = array(
+      $form['props']['fields']['path'] = array(
         'id' => 'calendar-parent',
         'label' => $this->cal->gettext('parentcalendar'),
         'value' => $select->show(strlen($folder) ? $path_imap : ''),
@@ -2377,138 +2402,10 @@
     }
 
     // calendar color (default field)
-    $form['props']['fieldsets']['settings'] = array(
-      'name'  => $this->rc->gettext('settings'),
-      'content' => array(
-        'color' => $formfields['color'],
-        'showalarms' => $formfields['showalarms'],
-      ),
-    );
-    
-    
-    if ($action != 'form-new') {
-      $form['sharing'] = array(
-          'name'    => rcube::Q($this->cal->gettext('tabsharing')),
-          'content' => html::tag('iframe', array(
-            'src' => $this->cal->rc->url(array('_action' => 'calendar-acl', 'id' => $calendar['id'], 'framed' => 1)),
-            'width' => '100%',
-            'height' => 350,
-            'border' => 0,
-            'style' => 'border:0'),
-        ''),
-      );
-    }
-
-    $this->form_html = '';
-    if (is_array($hidden_fields)) {
-        foreach ($hidden_fields as $field) {
-            $hiddenfield = new html_hiddenfield($field);
-            $this->form_html .= $hiddenfield->show() . "\n";
-        }
-    }
-
-    // Create form output
-    foreach ($form as $tab) {
-      if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
-        $content = '';
-        foreach ($tab['fieldsets'] as $fieldset) {
-          $subcontent = $this->get_form_part($fieldset);
-          if ($subcontent) {
-            $content .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($fieldset['name'])) . $subcontent) ."\n";
-          }
-        }
-      }
-      else {
-        $content = $this->get_form_part($tab);
-      }
-
-      if ($content) {
-        $this->form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) ."\n";
-      }
-    }
-
-    // Parse form template for skin-dependent stuff
-    $this->rc->output->add_handler('calendarform', array($this, 'calendar_form_html'));
-    return $this->rc->output->parse('calendar.kolabform', false, false);
-  }
-
-  /**
-   * Handler for template object
-   */
-  public function calendar_form_html()
-  {
-    return $this->form_html;
-  }
-
-  /**
-   * Helper function used in calendar_form_content(). Creates a part of the form.
-   */
-  private function get_form_part($form)
-  {
-    $content = '';
-
-    if (is_array($form['content']) && !empty($form['content'])) {
-      $table = new html_table(array('cols' => 2));
-      foreach ($form['content'] as $col => $colprop) {
-        $label = !empty($colprop['label']) ? $colprop['label'] : $this->cal->gettext($col);
-
-        $table->add('title', html::label($colprop['id'], rcube::Q($label)));
-        $table->add(null, $colprop['value']);
-      }
-      $content = $table->show();
-    }
-    else {
-      $content = $form['content'];
-    }
-
-    return $content;
-  }
-
-
-  /**
-   * Handler to render ACL form for a calendar folder
-   */
-  public function calendar_acl()
-  {
-    $this->rc->output->add_handler('folderacl', array($this, 'calendar_acl_form'));
-    $this->rc->output->send('calendar.kolabacl');
-  }
-
-  /**
-   * Handler for ACL form template object
-   */
-  public function calendar_acl_form()
-  {
-    $calid = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
-    if ($calid && ($cal = $this->get_calendar($calid))) {
-      $folder = $cal->get_realname(); // UTF7
-      $color  = $cal->get_color();
-    }
-    else {
-      $folder = '';
-      $color  = '';
-    }
-
-    $storage = $this->rc->get_storage();
-    $delim   = $storage->get_hierarchy_delimiter();
-    $form   = array();
-
-    if (strlen($folder)) {
-      $path_imap = explode($delim, $folder);
-      array_pop($path_imap);  // pop off name part
-      $path_imap = implode($path_imap, $delim);
-
-      $options = $storage->folder_info($folder);
-
-      // Allow plugins to modify the form content (e.g. with ACL form)
-      $plugin = $this->rc->plugins->exec_hook('calendar_form_kolab',
-        array('form' => $form, 'options' => $options, 'name' => $folder));
-    }
-
-    if (!$plugin['form']['sharing']['content'])
-        $plugin['form']['sharing']['content'] = html::div('hint', $this->cal->gettext('aclnorights'));
+    $form['props']['fields']['color']  = $formfields['color'];
+    $form['props']['fields']['alarms'] = $formfields['showalarms'];
 
-    return $plugin['form']['sharing']['content'];
+    return kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
   }
 
   /**

iRony-0.4.0.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php -> iRony-0.4.1.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_invitation_calendar.php Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_user_calendar.php -> iRony-0.4.1.tar.gz/lib/plugins/calendar/drivers/kolab/kolab_user_calendar.php Changed

@@ -38,7 +38,8 @@
    */
   public function __construct($user_or_folder, $calendar)
   {
-    $this->cal = $calendar;
+    $this->cal  = $calendar;
+    $this->imap = $calendar->rc->get_storage();
 
     // full user record is provided
     if (is_array($user_or_folder)) {
@@ -84,9 +85,11 @@
   /**
    * Getter for the IMAP folder owner
    *
+   * @param bool Return a fully qualified owner name (unused)
+   *
    * @return string Name of the folder owner
    */
-  public function get_owner()
+  public function get_owner($fully_qualified = false)
   {
     return $this->userdata['mail'];
   }
@@ -122,7 +125,7 @@
   /**
    * Return color to display this calendar
    */
-  public function get_color()
+  public function get_color($default = null)
   {
     // calendar color is stored in local user prefs
     $prefs = $this->cal->rc->config->get('kolab_calendars', array());
@@ -130,7 +133,7 @@
     if (!empty($prefs[$this->id]) && !empty($prefs[$this->id]['color']))
       return $prefs[$this->id]['color'];
 
-    return 'cc0000';
+    return $default ?: 'cc0000';
   }
 
   /**
@@ -195,9 +198,11 @@
    * @param  string  Search query (optional)
    * @param  boolean Include virtual events (optional)
    * @param  array   Additional parameters to query storage
+   * @param  array   Additional query to filter events
+   *
    * @return array A list of event records
    */
-  public function list_events($start, $end, $search = null, $virtual = 1, $query = array())
+  public function list_events($start, $end, $search = null, $virtual = 1, $query = array(), $filter_query = null)
   {
     // convert to DateTime for comparisons
     try {
@@ -258,9 +263,10 @@
    *
    * @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)
+  public function count_events($start, $end = null, $filter_query = null)
   {
     // not implemented
     return 0;

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/importexport.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/importexport.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/invitations.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/invitations.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/manage.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/manage.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/overview.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/settings.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/settings.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/sharing.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/de_DE/LC_MESSAGES/sharing.po Changed

@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Mads <mads@batmads.com>, 2016
+# Max Hellwig <max.hellwig@translating-energy.de>, 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: 2016-07-26 13:49+0000\n"
-"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Max Hellwig <max.hellwig@translating-energy.de>\n"
 "Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +22,7 @@
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
-msgstr "Geteilte Kalender"
+msgstr "Kalender teilen"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:13
 msgid ""
@@ -28,56 +30,56 @@
 ":ref:`overview <calendar-lists>`, we have already learned how calendars "
 "others share with you appear in the calendars list. The following now "
 "explains how to make personal calendars accessible to fellow users."
-msgstr ""
+msgstr "Kalender zu teilen ist ein wichtiger Teil der Zusammenarbeit. In der :ref:`Übersicht <calendar-lists>` haben wir schon gelernt, wie Kalender, die von anderen mit Ihnen teilen, in der Kalenderliste aussehen. Im Folgenden wird jetzt erklärt wie man persönliche Kalender für andere Benutzer zugänglich macht."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:19
 msgid "Share a Calendar with others"
-msgstr "Kalender mit Anderen teilen"
+msgstr "Einen Kalender mit Anderen teilen"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:21
 msgid ""
 "Sharing is controlled through the :ref:`Calendar Settings Dialog <calendar-"
 "edit-properties>`. Double-click a calendar in the list on the left and then "
 "select the *Sharing* tab at the top of the dialog box:"
-msgstr ""
+msgstr "Das Teilen wird über den :ref:`Kalendereinstellungen-Dialog <calendar-edit-properties>` gesteuert. Doppelklicken Sie einen Kalenders in der Liste links und wählen dann den *Teilen*-Reiter im oberen Teil des Dialogfensters aus:"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:27
 msgid ""
 "The table displays who already has permission to see and modify the selected"
 " calendar. In order to share the calendar with a new user do"
-msgstr ""
+msgstr "Die Tabelle zeigt an, wer schon Erlaubnis hat, den ausgewählten Kalender zu sehen und verändern. Um den Kalender mit einem neuen Benutzer zu teilen,"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:30
 msgid "Click the *Add entry* button (+) in the table footer"
-msgstr "Klicken Sie auf die Schaltfläche *Eintrag hinzufügen* (+) im Tabellenfuß"
+msgstr "klicken Sie auf die *Eintrag hinzufügen*-Schaltfläche (+) in der Fußzeile der Tabelle."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:31
 msgid ""
 "Enter the username or choose one from the autocompletion menu that appears "
 "when you start typing. Instead of a specific user, permissons can be granted"
 " for all users or guests."
-msgstr ""
+msgstr "Geben Sie den Benutzername ein oder wählen Sie einen aus dem Autovervollständigungs-Menü aus, das erscheint, wenn Sie zu tippen beginnen. Statt einem bestimmten Benutzer können Erlaubnisse auch allen Benutzern oder Gästen gewährt werden."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:33
 msgid "Select the access rights you want to grant for the user"
-msgstr ""
+msgstr "Wählen Sie die Zugangsberechtigungen, die Sie dem Benutzer gewähren wollen."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:34
 msgid "Click *Save* to add the permission"
-msgstr "Klicken Sie auf *Speichern* zum Hinzufügen der Berechtigung."
+msgstr "Klicken Sie auf *Speichern*, um die Erlaubnis hinzuzufügen."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:36
 msgid ""
 "Double-click an entry to edit the permissions for a particular user or "
 "group."
-msgstr ""
+msgstr "Doppelklicken Sie einen Eintrag, um Erlaubnisse für einen bestimmten Benutzer oder eine bestimmte Gruppe zu bearbeiten."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:38
 msgid ""
 "For removing existing permissions, select the according entry in the list "
 "and then choose *Delete* from the menu behind the gear icon in the footer of"
 " the list."
-msgstr ""
+msgstr "Um bestehende Freigaben zu entfernen, wählen Sie den entsprechenden Eintrag in der Liste aus und wählen dann *Löschen* aus dem Menü hinter dem Zahnradicon in der Fußzeile der Liste aus."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:43
 msgid "Subscribe to Shared Calendars"
@@ -90,11 +92,11 @@
 " see all resources you can access. There's a shortcut to this: click *Manage"
 " folders* in the options menu behind the gear icon located the footer of the"
 " calendars list."
-msgstr ""
+msgstr "Von anderen geteilte Kalender tauchen nicht sofort in der Liste innerhalb der Kalenderansicht auf. Wechseln Sie zu :ref:`Einstellungen > Ordner <settings-folders>`, um alle Hilfsmittel zu sehen, auf die Sie zugreifen können. Es gibt auch einen kürzeren Weg dorthin: Klicken Sie auf *Ordner verwalten* im Optionsmenü hinter dem Zahnradicon in der Fußzeile der Kalenderliste."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:50
 msgid ""
 "In order to make a shared calendar appear in the calendars list, locate it "
 "in the folder manager and check the *Subscribed* mark in the list. Only "
 "subscribed calendars are visible in the calendar view."
-msgstr ""
+msgstr "Um einen geteilten Kalender in der Kalenderliste erscheinen zu lassen, suchen Sie ihn in der Ordnerverwaltung und versehen Sie das *Abonniert*-Kästchen in der Liste mit einem Häkchen. Nur abonnierte Kalender sind in der Kalenderansicht sichtbar."

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/importexport.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/importexport.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/invitations.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/invitations.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/manage.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/manage.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/overview.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/settings.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/settings.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/sharing.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/en_US/LC_MESSAGES/sharing.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_AR/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/importexport.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/importexport.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,13 @@
 
 #: ../../en_US/_plugins/calendar/importexport.rst:9
 msgid "Import/Export"
-msgstr ""
+msgstr "Importar/Exportar"
 
 #: ../../en_US/_plugins/calendar/importexport.rst:11
 msgid ""
 "Event data is usually exchanged using the standard |iCal|_ format which is "
 "supported for import and export."
-msgstr ""
+msgstr "Los datos de eventos se intercambian usualmente utilizando el formato estándar |iCal| _ que es compatible con la importación y la exportación."
 
 #: ../../en_US/_plugins/calendar/importexport.rst:16
 msgid "Importing Events"

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/invitations.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/invitations.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@
 
 #: ../../en_US/_plugins/calendar/invitations.rst:8
 msgid "Handle Event Invitations"
-msgstr ""
+msgstr "Gestionar las invitaciones para el evento"
 
 #: ../../en_US/_plugins/calendar/invitations.rst:10
 msgid ""
@@ -27,7 +28,7 @@
 "other people to an event. This will send out invitation emails to all the "
 "participants with the event data attached. That allows one to directly "
 "accept or decline an event invitation."
-msgstr ""
+msgstr "En el capítulo :ref: `calendar-event-participants` hemos aprendido a invitar a otras personas a un evento. Enviará correos electrónicos con una invitación a todos los participantes con los datos del evento adjuntos. Esto permitirá aceptar directamente o rechazar una invitación de evento."
 
 #: ../../en_US/_plugins/calendar/invitations.rst:17
 msgid "Receive Event Invitations"

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/manage.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/manage.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,13 @@
 
 #: ../../en_US/_plugins/calendar/manage.rst:7
 msgid "Manage Your Schedule"
-msgstr ""
+msgstr "Administrar su programa"
 
 #: ../../en_US/_plugins/calendar/manage.rst:9
 msgid ""
 "All functions to maintain your events are accessible from the main calendar "
 "view."
-msgstr ""
+msgstr "Se puede acceder a todas las funciones para mantener sus eventos desde la vista del calendario principal."
 
 #: ../../en_US/_plugins/calendar/manage.rst:13
 msgid "Add Events to a Calendar"

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/overview.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@
 
 #: ../../en_US/_plugins/calendar/overview.rst:6
 msgid "Overview"
-msgstr ""
+msgstr "Información general"
 
 #: ../../en_US/_plugins/calendar/overview.rst:8
 msgid ""
@@ -27,7 +28,7 @@
 ":ref:`Calendar View <calendar-view>` itself, a small :ref:`Calendar Widget "
 "<calendar-minicalendar>` the :ref:`calendar-lists` as well as the usual "
 "toolbar and search box."
-msgstr ""
+msgstr "La misma pantalla del módulo de calendario presenta las siguientes partes: el :ref: `Calendar View <calendar-view>`, una pequeña :ref: `Calendario: <calendar-minicalendar>` :ref: `calendar-lists` as Así como la barra de herramientas usual y cuadro de búsqueda."
 
 #: ../../en_US/_plugins/calendar/overview.rst:17
 msgid "Calendar View"

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/settings.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/settings.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,13 @@
 
 #: ../../en_US/_plugins/calendar/settings.rst:8
 msgid "Calendar Preferences"
-msgstr ""
+msgstr "Preferencias del calendario"
 
 #: ../../en_US/_plugins/calendar/settings.rst:10
 msgid ""
 "The settings for the calendar module are listed in *Settings > Preferences* "
 "and are grouped by the following sections:"
-msgstr ""
+msgstr "Los ajustes del módulo de calendario se enumeran en *Ajustes> Preferencias* y se agrupan en las siguientes secciones:"
 
 #: ../../en_US/_plugins/calendar/settings.rst:14
 msgid "Main Options"

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/sharing.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/es_ES/LC_MESSAGES/sharing.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@
 
 #: ../../en_US/_plugins/calendar/sharing.rst:11
 msgid "Sharing Calendars"
-msgstr ""
+msgstr "Compartir calendarios"
 
 #: ../../en_US/_plugins/calendar/sharing.rst:13
 msgid ""
@@ -27,7 +28,7 @@
 ":ref:`overview <calendar-lists>`, we have already learned how calendars "
 "others share with you appear in the calendars list. The following now "
 "explains how to make personal calendars accessible to fellow users."
-msgstr ""
+msgstr "Para colaborar, compartir calendarios es una característica importante. En :ref: `overview <calendar-lists>`, ya hemos aprendido cómo aparecen en la lista de calendarios los calendarios que otros comparten con usted. A continuación se explica cómo hacer que otros usuarios puedan acceder a los calendarios personales."
 
 #: ../../en_US/_plugins/calendar/sharing.rst:19
 msgid "Share a Calendar with others"

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/settings.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/fr_FR/LC_MESSAGES/settings.po Changed

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

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

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

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

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

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

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

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/importexport.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/importexport.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/invitations.po -> iRony-0.4.1.tar.gz/lib/plugins/calendar/helpdocs/locale/ru_RU/LC_MESSAGES/invitations.po Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/lib/calendar_ui.php -> iRony-0.4.1.tar.gz/lib/plugins/calendar/lib/calendar_ui.php Changed

@@ -36,7 +36,7 @@
     $this->rc = $cal->rc;
     $this->screen = $this->rc->task == 'calendar' ? ($this->rc->action ? $this->rc->action: 'calendar') : 'other';
   }
-    
+
   /**
    * Calendar UI initialization and requests handlers
    */
@@ -44,19 +44,22 @@
   {
     if ($this->ready)  // already done
       return;
-      
+
     // add taskbar button
     $this->cal->add_button(array(
-      'command' => 'calendar',
-      'class'   => 'button-calendar',
-      'classsel' => 'button-calendar button-selected',
+      'command'    => 'calendar',
+      'class'      => 'button-calendar',
+      'classsel'   => 'button-calendar button-selected',
       'innerclass' => 'button-inner',
-      'label'   => 'calendar.calendar',
+      'label'      => 'calendar.calendar',
+      'type'       => 'link'
       ), 'taskbar');
     
     // load basic client script
-    $this->cal->include_script('calendar_base.js');
-    
+    if ($this->rc->action != 'print') {
+      $this->cal->include_script('calendar_base.js');
+    }
+
     $skin_path = $this->cal->local_skin_path();
     $this->cal->include_stylesheet($skin_path . '/calendar.css');
     
@@ -79,9 +82,6 @@
     $this->cal->register_handler('plugin.sensitivity_select', array($this, 'sensitivity_select'));
     $this->cal->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
     $this->cal->register_handler('plugin.recurrence_form', array($this->cal->lib, 'recurrence_form'));
-    $this->cal->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
-    $this->cal->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
-    $this->cal->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
     $this->cal->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
     $this->cal->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
     $this->cal->register_handler('plugin.resources_form', array($this, 'resources_form'));
@@ -91,13 +91,16 @@
     $this->cal->register_handler('plugin.resource_calendar', array($this, 'resource_calendar'));
     $this->cal->register_handler('plugin.attendees_freebusy_table', array($this, 'attendees_freebusy_table'));
     $this->cal->register_handler('plugin.edit_attendees_notify', array($this, 'edit_attendees_notify'));
+    $this->cal->register_handler('plugin.edit_recurrence_sync', array($this, 'edit_recurrence_sync'));
     $this->cal->register_handler('plugin.edit_recurring_warning', array($this, 'recurring_event_warning'));
     $this->cal->register_handler('plugin.event_rsvp_buttons', array($this, 'event_rsvp_buttons'));
-    $this->cal->register_handler('plugin.angenda_options', array($this, 'angenda_options'));
+    $this->cal->register_handler('plugin.agenda_options', array($this, 'agenda_options'));
     $this->cal->register_handler('plugin.events_import_form', array($this, 'events_import_form'));
     $this->cal->register_handler('plugin.events_export_form', array($this, 'events_export_form'));
     $this->cal->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
     $this->cal->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));  // use generic method from rcube_template
+
+    kolab_attachments_handler::ui();
   }
 
   /**
@@ -117,12 +120,7 @@
     $this->cal->include_script('calendar_ui.js');
     $this->cal->include_script('lib/js/fullcalendar.js');
     $this->rc->output->include_script('treelist.js');
-
-    // include kolab folderlist widget if available
-    if (in_array('libkolab', $this->cal->api->loaded_plugins())) {
-        $this->cal->api->include_script('libkolab/js/folderlist.js');
-        $this->cal->api->include_script('libkolab/js/audittrail.js');
-    }
+    $this->cal->api->include_script('libkolab/libkolab.js');
 
     jqueryui::miniColors();
   }
@@ -164,7 +162,7 @@
     foreach ((array)$calendars as $id => $prop) {
       if (!$prop['color'])
         continue;
-      $css .= $this->calendar_css_classes($id, $prop, $mode);
+      $css .= $this->calendar_css_classes($id, $prop, $mode, $attrib);
     }
     
     return html::tag('style', array('type' => 'text/css'), $css);
@@ -173,11 +171,18 @@
   /**
    *
    */
-  public function calendar_css_classes($id, $prop, $mode)
+  public function calendar_css_classes($id, $prop, $mode, $attrib)
   {
-    $color = $prop['color'];
+    $color = $folder_color = $prop['color'];
+
+    // replace white with skin-defined color
+    if (!empty($attrib['folder-fallback-color']) && preg_match('/^f+$/i', $folder_color)) {
+        $folder_color = $attrib['folder-fallback-color'];
+    }
+
     $class = 'cal-' . asciiwords($id, true);
-    $css .= "li .$class, #eventshow .$class { color: #$color; }\n";
+    $css   = str_replace('$class', $class, $attrib['folder-class']) ?: "li .$class";
+    $css  .= ", #eventshow .$class { color: #$folder_color; }\n";
 
     if ($mode != 1) {
       if ($mode == 3) {
@@ -202,11 +207,11 @@
   /**
    *
    */
-  function calendar_list($attrib = array())
+  function calendar_list($attrib = array(), $js_only = false)
   {
-    $html = '';
-    $jsenv = array();
-    $tree = true;
+    $html      = '';
+    $jsenv     = array();
+    $tree      = true;
     $calendars = $this->cal->driver->list_calendars(0, $tree);
 
     // walk folder tree
@@ -235,9 +240,14 @@
       );
     }
 
-    $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
     $this->rc->output->set_env('calendars', $jsenv);
-    $this->rc->output->add_gui_object('calendarslist', $attrib['id']);
+
+    if ($js_only) {
+      return;
+    }
+
+    $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
+    $this->rc->output->add_gui_object('calendarslist', $attrib['id'] ?: 'unknown');
 
     return html::tag('ul', $attrib, $html, html::$common_attrib);
   }
@@ -309,8 +319,8 @@
     if (!$activeonly || $prop['active']) {
       $label_id = 'cl:' . $id;
       $content = html::div(join(' ', $classes),
-        html::span(array('class' => 'calname', 'id' => $label_id, 'title' => $title), $prop['editname'] ? rcube::Q($prop['editname']) : $prop['listname']) .
-        ($prop['virtual'] ? '' :
+        html::a(array('class' => 'calname', 'id' => $label_id, 'title' => $title, 'href' => '#'), rcube::Q($prop['editname'] ?: $prop['listname']))
+        . ($prop['virtual'] ? '' :
           html::tag('input', array('type' => 'checkbox', 'name' => '_cal[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id), '') .
           html::span('actions', 
             ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->cal->gettext('removelist')), ' ') : '') .
@@ -326,30 +336,35 @@
   }
 
   /**
-   *
+   * Render a HTML for agenda options form
    */
-  function angenda_options($attrib = array())
+  function agenda_options($attrib = array())
   {
     $attrib += array('id' => 'agendaoptions');
     $attrib['style'] .= 'display:none';
-    
-    $select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange'));
+
+    $select_range = new html_select(array('name' => 'listrange', 'id' => 'agenda-listrange', 'class' => 'custom-select'));
     $select_range->add(1 . ' ' . preg_replace('/$.+$/', '', $this->cal->lib->gettext('days')), $days);
     foreach (array(2,5,7,14,30,60,90,180,365) as $days)
       $select_range->add($days . ' ' . preg_replace('/$|$/', '', $this->cal->lib->gettext('days')), $days);
-    
-    $html .= html::label('agenda-listrange', $this->cal->gettext('listrange'));
-    $html .= $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults['calendar_agenda_range']));
-    
-    $select_sections = new html_select(array('name' => 'listsections', 'id' => 'agenda-listsections'));
+
+    $html = html::span('input-group',
+        html::label(array('for' => 'agenda-listrange', 'class' => 'input-group-prepend'),
+            html::span('input-group-text', $this->cal->gettext('listrange')))
+        . $select_range->show($this->rc->config->get('calendar_agenda_range', $this->cal->defaults['calendar_agenda_range']))
+    );
+
+    $select_sections = new html_select(array('name' => 'listsections', 'id' => 'agenda-listsections', 'class' => 'custom-select'));
     $select_sections->add('---', '');
     foreach (array('day' => 'libcalendaring.days', 'week' => 'libcalendaring.weeks', 'month' => 'libcalendaring.months', 'smart' => 'calendar.smartsections') as $val => $label)
       $select_sections->add(preg_replace('/$|$/', '', ucfirst($this->rc->gettext($label))), $val);
-    
-    $html .= html::span('spacer', '&nbsp;');
-    $html .= html::label('agenda-listsections', $this->cal->gettext('listsections'));
-    $html .= $select_sections->show($this->rc->config->get('calendar_agenda_sections', $this->cal->defaults['calendar_agenda_sections']));
-    
+
+    $html .= html::span('input-group',
+        html::label(array('for' => 'agenda-listsections', 'class' => 'input-group-prepend'),
+            html::span('input-group-text', $this->cal->gettext('listsections')))
+        . $select_sections->show($this->rc->config->get('calendar_agenda_sections', $this->cal->defaults['calendar_agenda_sections']))
+    );
+
     return html::div($attrib, $html);
   }
 
@@ -472,28 +487,37 @@
   }
 
   /**
-   *
+   * Render HTML for attendee notification warning
    */
   function edit_attendees_notify($attrib = array())
   {
-    $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1));
+    $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox'));
     return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('sendnotifications')));
   }
 
   /**
+   * Render HTML for recurrence option to align start date with the recurrence rule
+   */
+  function edit_recurrence_sync($attrib = array())
+  {
+    $checkbox = new html_checkbox(array('name' => '_start_sync', 'value' => 1, 'class' => 'pretty-checkbox'));
+    return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->cal->gettext('eventstartsync')));
+  }
+
+  /**
    * Generate the form for recurrence settings
    */
   function recurring_event_warning($attrib = array())
   {
     $attrib['id'] = 'edit-recurring-warning';
-    
+
     $radio = new html_radiobutton(array('name' => '_savemode', 'class' => 'edit-recurring-savemode'));
     $form = html::label(null, $radio->show('', array('value' => 'current')) . $this->cal->gettext('currentevent')) . ' ' .
        html::label(null, $radio->show('', array('value' => 'future')) . $this->cal->gettext('futurevents')) . ' ' .
        html::label(null, $radio->show('all', array('value' => 'all')) . $this->cal->gettext('allevents')) . ' ' .
        html::label(null, $radio->show('', array('value' => 'new')) . $this->cal->gettext('saveasnew'));
-       
-    return html::div($attrib, html::div('message', html::span('ui-icon ui-icon-alert', '') . $this->cal->gettext('changerecurringeventwarning')) . html::div('savemode', $form));
+
+    return html::div($attrib, html::div('message', $this->cal->gettext('changerecurringeventwarning')) . html::div('savemode', $form));
   }
 
   /**
@@ -513,8 +537,11 @@
     }
 
     $input = new html_inputfield(array(
-      'type' => 'file', 'name' => '_data', 'size' => $attrib['uploadfieldsize'],
-      'accept' => $accept));
+        'type'   => 'file',
+        'name'   => '_data',
+        'size'   => $attrib['uploadfieldsize'],
+        'accept' => $accept
+    ));
 
     $select = new html_select(array('name' => '_range', 'id' => 'event-import-range'));
     $select->add(array(
@@ -527,28 +554,32 @@
       ),
       array('1','2','3','6','12',0));
 
-    $html .= html::div('form-section',
-      html::div(null, $input->show()) .
-      html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
+    $html = html::div('form-section form-group row',
+      html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
+      . html::div('col-sm-8', $input->show()
+        . html::div('hint', $this->rc->gettext(array('id' => 'importfile', 'name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
     );
 
-    $html .= html::div('form-section',
-      html::label('event-import-calendar', $this->cal->gettext('calendar')) .
-      $this->calendar_select(array('name' => 'calendar', 'id' => 'event-import-calendar'))
+    $html .= html::div('form-section form-group row',
+      html::label(array('for' => 'event-import-calendar', 'class' => 'col-form-label col-sm-4'), $this->cal->gettext('calendar'))
+      . html::div('col-sm-8', $this->calendar_select(array('name' => 'calendar', 'id' => 'event-import-calendar')))
     );
 
-    $html .= html::div('form-section',
-      html::label('event-import-range', $this->cal->gettext('importrange')) .
-      $select->show(1)
+    $html .= html::div('form-section form-group row',
+      html::label(array('for' => 'event-import-range', 'class' => 'col-form-label col-sm-4'), $this->cal->gettext('importrange'))
+      . html::div('col-sm-8', $select->show(1))
     );
 
     $this->rc->output->add_gui_object('importform', $attrib['id']);
     $this->rc->output->add_label('import');
 
-    return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'import_events')),
-      'method' => "post", 'enctype' => 'multipart/form-data', 'id' => $attrib['id']),
-      $html
-    );
+    return html::tag('p', null, $this->cal->gettext('importtext'))
+      . html::tag('form', array(
+          'action'  => $this->rc->url(array('task' => 'calendar', 'action' => 'import_events')),
+          'method'  => 'post',
+          'enctype' => 'multipart/form-data',
+          'id'      => $attrib['id']
+        ), $html);
   }
 
   /**
@@ -559,12 +590,11 @@
     if (!$attrib['id'])
       $attrib['id'] = 'rcmExportForm';
 
-    $html .= html::div('form-section',
-      html::label('event-export-calendar', $this->cal->gettext('calendar')) .
-      $this->calendar_select(array('name' => 'calendar', 'id' => 'event-export-calendar'))
-    );
+    $html = html::div('form-section form-group row',
+      html::label(array('for' => 'event-export-calendar', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('calendar'))
+        . html::div('col-sm-8', $this->calendar_select(array('name' => 'calendar', 'id' => 'event-export-calendar', 'class' => 'custom-select'))));
 
-    $select = new html_select(array('name' => 'range', 'id' => 'event-export-range'));
+    $select = new html_select(array('name' => 'range', 'id' => 'event-export-range', 'class' => 'custom-select'));
     $select->add(array(
         $this->cal->gettext('all'),
         $this->cal->gettext('onemonthback'),
@@ -578,106 +608,63 @@
 
     $startdate = new html_inputfield(array('name' => 'start', 'size' => 11, 'id' => 'event-export-startdate'));
 
-    $html .= html::div('form-section',
-      html::label('event-export-range', $this->cal->gettext('exportrange')) .
-      $select->show(0) .
-      html::span(array('style'=>'display:none'), $startdate->show())
-    );
+    $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())));
 
-    $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'event-export-attachments', 'value' => 1));
-    $html .= html::div('form-section',
-      html::label('event-export-attachments', $this->cal->gettext('exportattachments')) .
-      $checkbox->show(1)
-    );
+    $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'event-export-attachments', 'value' => 1, 'class' => 'form-check-input pretty-checkbox'));
+    $html .= html::div('form-section form-check row',
+      html::label(array('for' => 'event-export-attachments', 'class' => 'col-sm-4 col-form-label'), $this->cal->gettext('exportattachments'))
+        . html::div('col-sm-8', $checkbox->show(1)));
 
     $this->rc->output->add_gui_object('exportform', $attrib['id']);
 
-    return html::tag('form', array('action' => $this->rc->url(array('task' => 'calendar', 'action' => 'export_events')),
-      'method' => "post", 'id' => $attrib['id']),
+    return html::tag('form', $attrib + array(
+        'action' => $this->rc->url(array('task' => 'calendar', 'action' => 'export_events')),
+        'method' => "post",
+        'id' => $attrib['id']
+      ),
       $html
     );
   }
 
   /**
-   * Generate the form for event attachments upload
-   */
-  function attachments_form($attrib = array())
-  {
-    // add ID if not given
-    if (!$attrib['id'])
-      $attrib['id'] = 'rcmUploadForm';
-
-    // Get max filesize, enable upload progress bar
-    $max_filesize = $this->rc->upload_init();
-
-    $button = new html_inputfield(array('type' => 'button'));
-    $input = new html_inputfield(array(
-      'type' => 'file', 'name' => '_attachments[]',
-      'multiple' => 'multiple', 'size' => $attrib['attachmentfieldsize']));
-
-    return html::div($attrib,
-      html::div(null, $input->show()) .
-      html::div('buttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
-        'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
-      html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
-    );
-  }
-
-  /**
-   * Register UI object for HTML5 drag & drop file upload
-   */
-  function file_drop_area($attrib = array())
-  {
-      if ($attrib['id']) {
-          $this->rc->output->add_gui_object('filedrop', $attrib['id']);
-          $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
-      }
-  }
-
-  /**
-   * Generate HTML element for attachments list
+   * Handler for calendar form template.
+   * The form content could be overriden by the driver
    */
-  function attachments_list($attrib = array())
+  function calendar_editform($action, $calendar = array())
   {
-    if (!$attrib['id'])
-      $attrib['id'] = 'rcmAttachmentList';
+    $this->action   = $action;
+    $this->calendar = $calendar;
 
-    $skin_path = $this->cal->local_skin_path();
-    if ($attrib['deleteicon']) {
-      $_SESSION[calendar::SESSION_KEY . '_deleteicon'] = $skin_path . $attrib['deleteicon'];
-      $this->rc->output->set_env('deleteicon', $skin_path . $attrib['deleteicon']);
-    }
-    if ($attrib['cancelicon'])
-      $this->rc->output->set_env('cancelicon', $skin_path . $attrib['cancelicon']);
-    if ($attrib['loadingicon'])
-      $this->rc->output->set_env('loadingicon', $skin_path . $attrib['loadingicon']);
-
-    $this->rc->output->add_gui_object('attachmentlist', $attrib['id']);
-    $this->attachmentlist_id = $attrib['id'];
+    // load miniColors js/css files
+    jqueryui::miniColors();
 
-    return html::tag('ul', $attrib, '', html::$common_attrib);
+    $this->rc->output->set_env('pagetitle', $this->cal->gettext('calendarprops'));
+    $this->rc->output->add_handler('folderform', array($this, 'calendarform'));
+    $this->rc->output->send('libkolab.folderform');
   }
 
   /**
    * Handler for calendar form template.
    * The form content could be overriden by the driver
    */
-  function calendar_editform($action, $calendar = array())
+  function calendarform($attrib)
   {
     // compose default calendar form fields
-    $input_name = new html_inputfield(array('name' => 'name', 'id' => 'calendar-name', 'size' => 20));
-    $input_color = new html_inputfield(array('name' => 'color', 'id' => 'calendar-color', 'size' => 6));
+    $input_name  = new html_inputfield(array('name' => 'name', 'id' => 'calendar-name', 'size' => 20));
+    $input_color = new html_inputfield(array('name' => 'color', 'id' => 'calendar-color', 'size' => 7, 'class' => 'colors'));
 
     $formfields = array(
       'name' => array(
         'label' => $this->cal->gettext('name'),
         'value' => $input_name->show($calendar['name']),
-        'id' => 'calendar-name',
+        'id'    => 'calendar-name',
       ),
       'color' => array(
         'label' => $this->cal->gettext('color'),
         'value' => $input_color->show($calendar['color']),
-        'id' => 'calendar-color',
+        'id'    => 'calendar-color',
       ),
     );
 
@@ -685,14 +672,14 @@
       $checkbox = new html_checkbox(array('name' => 'showalarms', 'id' => 'calendar-showalarms', 'value' => 1));
       $formfields['showalarms'] = array(
         'label' => $this->cal->gettext('showalarms'),
-        'value' => $checkbox->show($calendar['showalarms']?1:0),
-        'id' => 'calendar-showalarms',
+        'value' => $checkbox->show($this->calendar['showalarms'] ? 1 :0),
+        'id'    => 'calendar-showalarms',
       );
     }
 
     // allow driver to extend or replace the form content
-    return html::tag('form', array('action' => "#", 'method' => "get", 'id' => 'calendarpropform'),
-      $this->cal->driver->calendar_form($action, $calendar, $formfields)
+    return html::tag('form', $attrib + array('action' => "#", 'method' => "get", 'id' => 'calendarpropform'),
+      $this->cal->driver->calendar_form($this->action, $this->calendar, $formfields)
     );
   }
 
@@ -713,7 +700,7 @@
     $table->add_header('confirmstate', $this->cal->gettext('confirmstate'));
     if ($invitations) {
       $table->add_header(array('class' => 'invite', 'title' => $this->cal->gettext('sendinvitations')),
-        $invite->show(1) . html::label('edit-attendees-invite', $this->cal->gettext('sendinvitations')));
+        $invite->show(1) . html::label('edit-attendees-invite', html::span('inner', $this->cal->gettext('sendinvitations'))));
     }
     $table->add_header('options', '');
 
@@ -732,15 +719,15 @@
    */
   function attendees_form($attrib = array())
   {
-    $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
-    $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
+    $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'class' => 'form-control'));
+    $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment', 'class' => 'form-control',
         'rows' => 4, 'cols' => 55, 'title' => $this->cal->gettext('itipcommenttitle')));
 
     return html::div($attrib,
-      html::div(null, $input->show() . " " .
+      html::div('form-searchbar', $input->show() . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->cal->gettext('addattendee'))) . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->cal->gettext('scheduletime').'...'))) .
-      html::p('attendees-commentbox', html::label(null, $this->cal->gettext('itipcomment') . $textarea->show()))
+      html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->cal->gettext('itipcomment')) . $textarea->show())
     );
   }
 
@@ -749,10 +736,10 @@
    */
   function resources_form($attrib = array())
   {
-    $input = new html_inputfield(array('name' => 'resource', 'id' => 'edit-resource-name', 'size' => 30));
+    $input = new html_inputfield(array('name' => 'resource', 'id' => 'edit-resource-name', 'class' => 'form-control'));
 
     return html::div($attrib,
-      html::div(null, $input->show() . " " .
+      html::div('form-searchbar', $input->show() . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-add', 'value' => $this->cal->gettext('addresource'))) . " " .
         html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-resource-find', 'value' => $this->cal->gettext('findresources').'...')))
       );
@@ -818,20 +805,16 @@
    */
   function resources_search_form($attrib)
   {
-    $attrib += array('command' => 'search-resource', 'id' => 'rcmcalresqsearchbox', 'autocomplete' => 'off');
-    $attrib['name'] = '_q';
-
-    $input_q = new html_inputfield($attrib);
-    $out = $input_q->show();
+    $attrib += array(
+        'command'       => 'search-resource',
+        'reset-command' => 'reset-resource-search',
+        'id'            => 'rcmcalresqsearchbox',
+        'autocomplete'  => 'off',
+        'form-name'     => 'rcmcalresoursqsearchform',
+    );
 
     // add form tag around text field
-    $out = $this->rc->output->form_tag(array(
-      'name' => "rcmcalresoursqsearchform",
-      'onsubmit' => rcmail_output::JS_OBJECT_NAME . ".command('" . $attrib['command'] . "'); return false",
-      'style' => "display:inline"),
-      $out);
-
-    return $out;
+    return $this->rc->output->search_form($attrib);
   }
 
   /**

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/bg_BG.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/bg_BG.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/ca_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/ca_ES.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Estat';
 $labels['status-confirmed'] = 'Confirmat';
 $labels['status-cancelled'] = 'Cancel·lat';
+$labels['status-tentative'] = 'Provisional';
 $labels['priority'] = 'Prioritat';
 $labels['sensitivity'] = 'Privadesa';
 $labels['public'] = 'públic';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Desconegut';
 $labels['availtentative'] = 'Provisional';
 $labels['availoutofoffice'] = 'Fora de l\'oficina';
-$labels['delegatedto'] = 'Delegat a:';
-$labels['delegatedfrom'] = 'Delegat de:';
 $labels['scheduletime'] = 'Cerca disponibilitat';
 $labels['sendinvitations'] = 'Envia invitacions';
 $labels['sendnotifications'] = 'Notifica als participants quan hi hagi modificacions';
@@ -164,7 +163,6 @@
 $labels['suggestedslot'] = 'Lloc suggerit';
 $labels['noslotfound'] = 'No s\'ha pogut trobar un espai de temps lliure';
 $labels['invitationsubject'] = 'Heu estat convidats a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuan: \$date\n\nConvidats: \$attendees\n\nSi us plau cerqueu el fitxer iCalendar adjunt dins dels detalls de l'esdeveniment per poder-lo importar a la vostra aplicació de calendari.";
 $labels['invitationattendlinks'] = "En cas que el vostre client de correu electrònic no suporti peticions de tipus iTip, podeu fer servir el següent enllaç per acceptar o declinar aquesta invitació:\n\$url";
 $labels['eventupdatesubject'] = '"$title" ha estat actualitzat';
 $labels['eventupdatesubjectempty'] = 'Un esdeveniment que us afecta ha estat actualitzat';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/cs_CZ.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/cs_CZ.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Stav';
 $labels['status-confirmed'] = 'Potvrzeno';
 $labels['status-cancelled'] = 'Zrušeno';
+$labels['status-tentative'] = 'Nezávazně';
 $labels['priority'] = 'Přednost';
 $labels['sensitivity'] = 'Soukromí';
 $labels['public'] = 'veřejné';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Neznámý';
 $labels['availtentative'] = 'Nezávazně';
 $labels['availoutofoffice'] = 'Mimo kancelář';
-$labels['delegatedto'] = 'Pověřený:';
-$labels['delegatedfrom'] = 'Pověřující:';
 $labels['scheduletime'] = 'Najít dostupnost';
 $labels['sendinvitations'] = 'Poslat pozvánky';
 $labels['sendnotifications'] = 'Uvědomit účastníky o změnách';
@@ -164,7 +163,6 @@
 $labels['suggestedslot'] = 'Navržené místo v rozvrhu';
 $labels['noslotfound'] = 'Nelze najít volné místo v rozvrhu';
 $labels['invitationsubject'] = 'Byl(a) jste pozván(a) na událost "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nKdy: \$date\n\nPozváni: \$attendees\n\nPodrobnosti o události najdete v přiloženém souboru typu iCalendar. Můžete si ho zavést do kalendářového programu.";
 $labels['invitationattendlinks'] = "Pokud váš poštovní klient nepodporuje pozvánky iTip, použijte prosím následující odkaz k potvrzení nebo odmítnutí pozvání:\n\$url";
 $labels['eventupdatesubject'] = 'Událost "$title" byla aktualizována';
 $labels['eventupdatesubjectempty'] = 'Událost, která se vás týká, byla aktualizována';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/da_DK.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/da_DK.inc Changed

@@ -44,7 +44,7 @@
 $labels['edit_event'] = 'Redigér arrangement';
 $labels['edit'] = 'Redigér';
 $labels['save'] = 'Gem';
-$labels['removelist'] = 'Remove from list';
+$labels['removelist'] = 'Fjern fra liste';
 $labels['cancel'] = 'Annullér';
 $labels['select'] = 'Vælg';
 $labels['print'] = 'Udskriv';
@@ -61,7 +61,7 @@
 $labels['url'] = 'URL';
 $labels['date'] = 'Dato';
 $labels['start'] = 'Start';
-$labels['starttime'] = 'Start time';
+$labels['starttime'] = 'Starttidspunkt';
 $labels['end'] = 'Slut';
 $labels['endtime'] = 'Sluttidspunkt';
 $labels['repeat'] = 'Gentag';
@@ -75,6 +75,7 @@
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bekræftet';
 $labels['status-cancelled'] = 'Annulleret';
+$labels['status-tentative'] = 'Forsøgsvis';
 $labels['priority'] = 'Prioritet';
 $labels['sensitivity'] = 'Privatliv';
 $labels['public'] = 'offentlig';
@@ -82,14 +83,14 @@
 $labels['confidential'] = 'fortrolig';
 $labels['links'] = 'Reference';
 $labels['alarms'] = 'Påmindelse';
-$labels['comment'] = 'Comment';
-$labels['created'] = 'Created';
-$labels['changed'] = 'Last Modified';
+$labels['comment'] = 'Kommentar';
+$labels['created'] = 'Oprettet';
+$labels['changed'] = 'Sidst ændret';
 $labels['unknown'] = 'Ukendt';
 $labels['eventoptions'] = 'Tilvalg';
 $labels['generated'] = 'oprettet per';
 $labels['eventhistory'] = 'Historik';
-$labels['removelink'] = 'Remove email reference';
+$labels['removelink'] = 'Fjern email reference';
 $labels['printdescriptions'] = 'Udskriv beskrivelser';
 $labels['parentcalendar'] = 'Indsæt indeni';
 $labels['searchearlierdates'] = '« Søg efter tidligere arrangementer';
@@ -105,9 +106,9 @@
 $labels['showurldescription'] = 'Brug følgende adresse for at tilgå din kalender (skrivebeskyttet) fra andre programmer.  Du kan kopiere og indsætet denne i ethvert kalenderprogram, der understøtter iCal-formatet.';
 $labels['caldavurldescription'] = 'Kopiér denne adresse til en <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-klientprogram (eks. Evolution eller Mozilla Thunderbird) for at synkronisere denne kalender komplet med din computer eller mobilenhed.';
 $labels['findcalendars'] = 'Find kalendere ...';
-$labels['searchterms'] = 'Search terms';
+$labels['searchterms'] = 'Søgetermer';
 $labels['calsearchresults'] = 'Tilgængelige kalendere';
-$labels['calendarsubscribe'] = 'List permanently';
+$labels['calendarsubscribe'] = 'List permanent';
 $labels['nocalendarsfound'] = 'Der blev ikke fundet nogen kalender';
 $labels['nrcalendarsfound'] = '$nr kalendere blev fundet';
 $labels['quickview'] = 'Vis kun denne kalender';
@@ -129,7 +130,7 @@
 $labels['weekofyear'] = 'Uge';
 $labels['pastevents'] = 'Tidligere';
 $labels['futureevents'] = 'Fremtid';
-$labels['showalarms'] = 'Show reminders';
+$labels['showalarms'] = 'Vis påmindelser';
 $labels['defaultalarmtype'] = 'Standardindstilling for påmindelse';
 $labels['defaultalarmoffset'] = 'Standardtidspunkt for påmindelse';
 $labels['attendee'] = 'Deltager';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Ukendt';
 $labels['availtentative'] = 'Forsøgsvis';
 $labels['availoutofoffice'] = 'Ikke på kontoret';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['scheduletime'] = 'Find ledigt tidspunkt';
 $labels['sendinvitations'] = 'Send invitationer';
 $labels['sendnotifications'] = 'Gør deltagere opmærksom på ændringer';
@@ -164,11 +163,11 @@
 $labels['suggestedslot'] = 'Foreslået blok';
 $labels['noslotfound'] = 'Kunne ikke finde en ledig tidsblok';
 $labels['invitationsubject'] = 'Du er blevet inviteret til "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nBemærk venligst vedhæftede iCalendar-fil med alle detaljer om arrangementet, som du kan importere til dit kalenderprogram.";
 $labels['invitationattendlinks'] = "Hvis dit e-postprogram ikke understøtter iTip-forespørgsler, så kan du benytte følgende henvisning til enten at acceptere eller afvise denne invitation:\n\$url";
 $labels['eventupdatesubject'] = '"$title" er blevet opdateret';
 $labels['eventupdatesubjectempty'] = 'Et arrangement der vedrører dig er blevet opdateret';
 $labels['eventupdatemailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nBemærk venligst vedhæftede iCalendar-fil med alle detaljer om arrangementet, som du kan importere til dit kalenderprogram.";
+$labels['eventcancelsubject'] = '"$title" er blevet annulleret';
 $labels['eventcancelmailbody'] = "*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees\n\nDette arrangement er blevet aflyst af \$organizer.\n\nBemærk venligst vedhæftede iCalendard-fil med de opdaterede detaljer om arrangementet.";
 $labels['itipobjectnotfound'] = 'Begivenheden som denne besked henviser til, blev ikke fundet i din kalender.';
 $labels['itipmailbodyaccepted'] = "\$sender har accepteret invitationen til det følgende arrangement:\n\n*\$title*\n\nTidspunkt: \$date\n\nInviterede: \$attendees";

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/de_CH.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bestätigt';
 $labels['status-cancelled'] = 'Gekündigt';
+$labels['status-tentative'] = 'Mit Vorbehalt';
 $labels['priority'] = 'Priorität';
 $labels['sensitivity'] = 'Sichtbarkeit';
 $labels['public'] = 'öffentlich';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Unbekannt';
 $labels['availtentative'] = 'Mit Vorbehalt';
 $labels['availoutofoffice'] = 'Abwesend';
-$labels['delegatedto'] = 'Delegiert an:';
-$labels['delegatedfrom'] = 'Delegiert von:';
 $labels['scheduletime'] = 'Verfügbarkeit anzeigen';
 $labels['sendinvitations'] = 'Einladungen versenden';
 $labels['sendnotifications'] = 'Teilnehmer über die Änderungen informieren';
@@ -164,7 +163,7 @@
 $labels['suggestedslot'] = 'Empfohlener Terminplatz';
 $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\nIm Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
+$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';
@@ -179,6 +178,7 @@
 $labels['itipmailbodydelegated'] = "\$sender hat die Teilnahme an folgendem Event delegiert:\n\n*\$title*\n\nWann: \$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'] = 'Do you also want to delete this declined event from your calendar?';
 $labels['itipcomment'] = 'Kommentar zur Einladungs/Benachrichtigung';
 $labels['itipcommenttitle'] = 'Dieser Kommentar wird an die Einladungs/Benachrichtigung angehängt, die an die Teilnehmer verschickt wird';
 $labels['notanattendee'] = 'Sie sind nicht in der Liste der Teilnehmer aufgeführt';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/de_DE.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/de_DE.inc Changed

@@ -26,7 +26,7 @@
 $labels['afterflagdeleted'] = 'Als gelöscht markieren';
 $labels['aftermoveto'] = 'Verschiebe nach...';
 $labels['itipoptions'] = 'Veranstaltungseinladungen';
-$labels['afteraction'] = 'Nachdem eine Einladungs- oder Update-Nachricht verarbetet wurde';
+$labels['afteraction'] = 'Nachdem eine Einladungs- oder Aktualisierungsnachricht verarbeitet wurde';
 $labels['calendar'] = 'Kalender';
 $labels['calendars'] = 'Kalender';
 $labels['category'] = 'Kategorie';
@@ -58,7 +58,7 @@
 $labels['exportattachments'] = 'Mit Anhängen';
 $labels['customdate'] = 'Benutzerdefiniertes Datum';
 $labels['location'] = 'Ort';
-$labels['url'] = 'URL';
+$labels['url'] = 'Internetadresse';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Beginn';
 $labels['starttime'] = 'Startzeit';
@@ -66,7 +66,7 @@
 $labels['endtime'] = 'Endzeit';
 $labels['repeat'] = 'Wiederholung';
 $labels['selectdate'] = 'Datum auswählen';
-$labels['freebusy'] = 'Zeige mich als';
+$labels['freebusy'] = 'Mich anzeigen als';
 $labels['free'] = 'Frei';
 $labels['busy'] = 'Gebucht';
 $labels['outofoffice'] = 'Abwesend';
@@ -75,6 +75,7 @@
 $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';
@@ -94,7 +95,7 @@
 $labels['parentcalendar'] = 'Erstellen in';
 $labels['searchearlierdates'] = '« Frühere Termine suchen';
 $labels['searchlaterdates'] = 'Spätere Termine suchen »';
-$labels['andnmore'] = '$nr weitere...';
+$labels['andnmore'] = '$nr weitere …';
 $labels['togglerole'] = 'Zum Ändern der Rolle klicken';
 $labels['createfrommail'] = 'Als Termin speichern';
 $labels['importevents'] = 'Termine importieren';
@@ -104,7 +105,7 @@
 $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['findcalendars'] = 'Kalender finden …';
 $labels['searchterms'] = 'Suchbegriffe';
 $labels['calsearchresults'] = 'Verfügbare Kalender';
 $labels['calendarsubscribe'] = 'Permanent anzeigen';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Unbekannt';
 $labels['availtentative'] = 'Mit Vorbehalt';
 $labels['availoutofoffice'] = 'Abwesend';
-$labels['delegatedto'] = 'Delegiert an:';
-$labels['delegatedfrom'] = 'Delegiert von:';
 $labels['scheduletime'] = 'Verfügbarkeit anzeigen';
 $labels['sendinvitations'] = 'Einladungen versenden';
 $labels['sendnotifications'] = 'Teilnehmer über die Änderungen informieren';
@@ -163,13 +162,13 @@
 $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\nIm Anhang finden Sie eine iCalendar-Datei mit allen Details des Termins. Diese können Sie in Ihre Kalenderanwendung importieren.";
+$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['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['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";
@@ -207,7 +206,7 @@
 $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'] = 'Speichere Daten...';
+$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.';
@@ -220,8 +219,8 @@
 $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['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';
@@ -242,12 +241,12 @@
 $labels['allevents'] = 'Alle';
 $labels['saveasnew'] = 'Als neu speichern';
 $labels['birthdays'] = 'Geburtstage';
-$labels['birthdayscalendar'] = 'Geburtstags-Kalender';
-$labels['displaybirthdayscalendar'] = 'Geburtstags-Kalender anzeigen';
+$labels['birthdayscalendar'] = 'Geburtstagskalender';
+$labels['displaybirthdayscalendar'] = 'Geburtstagskalender anzeigen';
 $labels['birthdayscalendarsources'] = 'Für diese Adressbücher';
 $labels['birthdayeventtitle'] = '$names Geburtstag';
 $labels['birthdayage'] = 'Alter $age';
-$labels['objectchangelog'] = 'Änderungshistorie';
+$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';

iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/el.inc Added

@@ -0,0 +1,95 @@
+<?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'] = 'Προεπιλεγμένη προβολή';
+$labels['time_format'] = 'Μορφή ώρας';
+$labels['workinghours'] = 'Ώρες εργασίας';
+$labels['add_category'] = 'Προσθήκη κατηγορίας';
+$labels['remove_category'] = 'Αφαίρεση κατηγορίας';
+$labels['defaultcalendar'] = 'Δημιουργία νέων συμβάντων στο';
+$labels['eventcoloring'] = 'Χρωματισμός συμβάντος';
+$labels['coloringmode0'] = 'Σύμφωνα με το ημερολόγιο';
+$labels['coloringmode1'] = 'Σύμφωνα με την κατηγορία';
+$labels['aftertrash'] = 'Μετακίνηση στα απορρίματα';
+$labels['afterdelete'] = 'Διαγραφή μηνύματος';
+$labels['afterflagdeleted'] = 'Σημείωση ως διεγραμμένου';
+$labels['aftermoveto'] = 'Μεταφορά σε...';
+$labels['itipoptions'] = 'Προσκλήσεις συμβάντος';
+$labels['calendar'] = 'Ημερολόγιο';
+$labels['calendars'] = 'Ημερολόγια';
+$labels['category'] = 'Κατηγορία';
+$labels['categories'] = 'Κατηγορίες';
+$labels['createcalendar'] = 'Δημιουργία νέου ημερολογίου';
+$labels['editcalendar'] = 'Επεξεργασία ιδιοτήτων ημερολογίου';
+$labels['name'] = 'Όνομα';
+$labels['color'] = 'Χρώμα';
+$labels['day'] = 'Ημέρα';
+$labels['week'] = 'Εβδομάδα';
+$labels['month'] = 'Μήνας';
+$labels['new'] = 'Νέο';
+$labels['new_event'] = 'Νέο συμβάν';
+$labels['edit_event'] = 'Επεξεργασία συμβάντος';
+$labels['edit'] = 'Επεξεργασία';
+$labels['save'] = 'Αποθήκευση';
+$labels['removelist'] = 'Αφαίρεση από την λίστα';
+$labels['cancel'] = 'Ακύρωση';
+$labels['select'] = 'Επιλογή';
+$labels['print'] = 'Εκτύπωση';
+$labels['printtitle'] = 'Εκτύπωση ημερολογίων';
+$labels['title'] = 'Περίληψη';
+$labels['description'] = 'Περιγραφή';
+$labels['all-day'] = 'ολοήμερο';
+$labels['export'] = 'Εξαγωγή';
+$labels['exporttitle'] = 'Εξαγωγή σε iCalendar';
+$labels['exportrange'] = 'Συμβάντα από';
+$labels['location'] = 'Τοποθεσία';
+$labels['url'] = 'URL';
+$labels['date'] = 'Ημερομηνία';
+$labels['start'] = 'Έναρξη';
+$labels['starttime'] = 'Ώρα έναρξης';
+$labels['end'] = 'Λήξη';
+$labels['endtime'] = 'Ώρα λήξης';
+$labels['repeat'] = 'Επανάληψη';
+$labels['selectdate'] = 'Επιλογή ημερομηνίας';
+$labels['busy'] = 'Απασχολημένος';
+$labels['outofoffice'] = 'Εκτός γραφείου';
+$labels['status'] = 'Κατάσταση';
+$labels['sensitivity'] = 'Ιδιωτικότητα';
+$labels['comment'] = 'Σχόλιο';
+$labels['created'] = 'Δημιουργήθηκε';
+$labels['changed'] = 'Τελευταία τροποποίηση';
+$labels['eventhistory'] = 'Ιστορικό';
+$labels['createfrommail'] = 'Αποθήκευση συμβάντος ως';
+$labels['importevents'] = 'Εισαγωγή συμβάντων';
+$labels['importrange'] = 'Συμβάντα από';
+$labels['onemonthback'] = '1 μήνα πριν';
+$labels['nmonthsback'] = '$nr μήνες πριν';
+$labels['findcalendars'] = 'Εύρεση ημερολογίων...';
+$labels['searchterms'] = 'Όροι αναζήτησης';
+$labels['calsearchresults'] = 'Διαθέσιμα ημερολόγια';
+$labels['until'] = 'μέχρι';
+$labels['today'] = 'Σήμερα';
+$labels['tomorrow'] = 'Αύριο';
+$labels['thisweek'] = 'Αυτή την εβδομάδα';
+$labels['nextweek'] = 'Την επόμενη εβδομάδα';
+$labels['prevweek'] = 'Την προηγούμενη εβδομάδα';
+$labels['thismonth'] = 'Αυτό τον μήνα';
+$labels['nextmonth'] = 'Τον επόμενο μήνα';
+$labels['weekofyear'] = 'Εβδομάδα';
+$labels['role'] = 'Ρόλος';
+$labels['availability'] = 'Διαθ.';
+$labels['confirmstate'] = 'Κατάσταση';
+$labels['addattendee'] = 'Προσθήκη συμμετεχόντων';
+$labels['roleorganizer'] = 'Οργανωτής';
+$labels['cutypegroup'] = 'Ομάδα';
+$labels['availbusy'] = 'Απασχολημένος';
+$labels['availoutofoffice'] = 'Εκτός γραφείου';
+$labels['tabsummary'] = 'Περίληψη';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
+$labels['objectchangelog'] = 'Αλλαγή ιστορικού';
+?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/en_US.inc Changed

@@ -38,6 +38,7 @@
 $labels['calendars'] = 'Calendars';
 $labels['category'] = 'Category';
 $labels['categories'] = 'Categories';
+$labels['addcalendar'] = 'Add calendar';
 $labels['createcalendar'] = 'Create new calendar';
 $labels['editcalendar'] = 'Edit calendar properties';
 $labels['name'] = 'Name';
@@ -102,6 +103,8 @@
 $labels['parentcalendar'] = 'Insert inside';
 $labels['searchearlierdates'] = '« Search for earlier events';
 $labels['searchlaterdates'] = 'Search for later events »';
+$labels['earlierevents'] = 'Earlier';
+$labels['laterevents'] = 'Later';
 $labels['andnmore'] = '$nr more...';
 $labels['togglerole'] = 'Click to toggle role';
 $labels['createfrommail'] = 'Save as event';
@@ -112,8 +115,11 @@
 $labels['showurl'] = 'Show calendar URL';
 $labels['showurldescription'] = 'Use the following address to access (read only) your calendar from other applications. You can copy and paste this into any calendar software that supports the iCal format.';
 $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['showfburl'] = 'Show free-busy URL';
+$labels['fburldescription'] = 'Use the following address to access Free-Busy information from other applications. You can copy and paste this into any calendar software that supports free-busy information in iCal format. No authentication is required for this URL.';
 $labels['findcalendars'] = 'Find calendars...';
 $labels['searchterms'] = 'Search terms';
+$labels['findevents'] = 'Find events';
 $labels['calsearchresults'] = 'Available Calendars';
 $labels['calendarsubscribe'] = 'List permanently';
 $labels['nocalendarsfound'] = 'No calendars found';
@@ -123,6 +129,7 @@
 $labels['invitationsdeclined'] = 'Declined invitations';
 $labels['changepartstat'] = 'Change participant status';
 $labels['rsvpcomment'] = 'Invitation text';
+$labels['eventstartsync'] = 'Move the event start date to the first occurrence';
 
 // agenda view
 $labels['listrange'] = 'Range to display:';
@@ -176,7 +183,7 @@
 $labels['suggestedslot'] = 'Suggested Slot';
 $labels['noslotfound'] = 'Unable to find a free time slot';
 $labels['invitationsubject'] = 'You\'ve been invited to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application.";
+$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\n\$description\n\nPlease find attached an iCalendar file with all the event details which you can import to your calendar application.";
 $labels['invitationattendlinks'] = "In case your email client doesn't support iTip requests you can use the following link to either accept or decline this invitation:\n\$url";
 $labels['eventupdatesubject'] = '"$title" has been updated';
 $labels['eventupdatesubjectempty'] = 'An event that concerns you has been updated';
@@ -207,6 +214,7 @@
 $labels['openpreview'] = 'Check Calendar';
 $labels['noearlierevents'] = 'No earlier events';
 $labels['nolaterevents'] = 'No later events';
+$labels['legend'] = 'Legend';
 
 // resources
 $labels['resource'] = 'Resource';
@@ -214,6 +222,7 @@
 $labels['findresources'] = 'Find resources';
 $labels['resourcedetails'] = 'Details';
 $labels['resourceavailability'] = 'Availability';
+$labels['resourceprops'] = 'Resource properties';
 $labels['resourceowner'] = 'Owner';
 $labels['resourceadded'] = 'The resource was added to your event';
 
@@ -246,6 +255,7 @@
 $labels['importedsuccessfully'] = 'The event was successfully added to \'$calendar\'';
 $labels['updatedsuccessfully'] = 'The event was successfully updated in \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Successfully updated the participant\'s status';
+$labels['errorunknownattendee'] = 'Failed to find the participant information.';
 $labels['itipsendsuccess'] = 'Invitation sent to participants.';
 $labels['itipresponseerror'] = 'Failed to send the response to this event invitation';
 $labels['itipinvalidrequest'] = 'This invitation is no longer valid';
@@ -255,6 +265,7 @@
 $labels['importnone'] = 'No events found to be imported';
 $labels['importerror'] = 'An error occured while importing';
 $labels['aclnorights'] = 'You do not have administrator rights on this calendar.';
+$labels['importtext'] = 'You can upload events in <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> format (.ics).';
 
 $labels['changeeventconfirm'] = 'Change event';
 $labels['removeeventconfirm'] = 'Delete event';
@@ -265,6 +276,7 @@
 $labels['futurevents'] = 'Future';
 $labels['allevents'] = 'All';
 $labels['saveasnew'] = 'Save as new';
+$labels['recurrenceerror'] = 'Unable to resolve recurrence rule for specified start date.';
 
 // birthdays calendar
 $labels['birthdays'] = 'Birthdays';
@@ -284,7 +296,6 @@
 $labels['objectrestoresuccess'] = 'Revision $rev successfully restored';
 $labels['objectrestoreerror'] = 'Failed to restore the old revision';
 
-
 // (hidden) titles and labels for accessibility annotations
 $labels['arialabelminical'] = 'Calendar date selection';
 $labels['arialabelcalendarview'] = 'Calendar view';
@@ -292,9 +303,11 @@
 $labels['arialabelquicksearchbox'] = 'Event search input';
 $labels['arialabelcalsearchform'] = 'Calendars search form';
 $labels['calendaractions'] = 'Calendar actions';
+$labels['calendarprops'] = 'Calendar properties';
 $labels['arialabeleventattendees'] = 'Event participants list';
 $labels['arialabeleventresources'] = 'Event resources list';
 $labels['arialabelresourcesearchform'] = 'Resources search form';
 $labels['arialabelresourceselection'] = 'Available resources';
+$labels['arialabeleventform'] = 'Event editing form';
 
 ?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/es_AR.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/es_AR.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/es_ES.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Estado';
 $labels['status-confirmed'] = 'Confirmado';
 $labels['status-cancelled'] = 'Cancelado';
+$labels['status-tentative'] = 'Provisional';
 $labels['priority'] = 'Prioridad';
 $labels['sensitivity'] = 'Privacidad';
 $labels['public'] = 'Pública';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Desconocido';
 $labels['availtentative'] = 'Provisional';
 $labels['availoutofoffice'] = 'Fuera de la oficina';
-$labels['delegatedto'] = 'Delegar a: ';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['scheduletime'] = 'Buscar disponibilidad';
 $labels['sendinvitations'] = 'Enviar invitaciones';
 $labels['sendnotifications'] = 'Notificar a los participantes acerca de las modificaciones';
@@ -164,11 +163,11 @@
 $labels['suggestedslot'] = 'Ranura sugerida';
 $labels['noslotfound'] = 'Incapaz de encontrar un intervalo de tiempo libre';
 $labels['invitationsubject'] = 'Usted  sido invitado a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nSe adjunta un archivo iCalendar con todos los detalles del evento que se puede importar a la aplicación de calendario.";
 $labels['invitationattendlinks'] = "En caso de que su cliente de correo electrónico no admite solicitudes iTIP que puede utilizar el siguiente enlace para aceptar o rechazar esta invitación:\n\$url";
 $labels['eventupdatesubject'] = '"$title" Ha sido actualizado';
 $labels['eventupdatesubjectempty'] = 'Un evento que le concierne ha sido actualizado';
 $labels['eventupdatemailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nSe adjunta un archivo iCalendar con los detalles del evento actualizados que se puede importar a la aplicación de calendario.";
+$labels['eventcancelsubject'] = 'Se ha cancelado "$título"';
 $labels['eventcancelmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nEl evento ha sido cancelado por\$organizer.\n\nSe adjunta un archivo iCalendar con los detalles del evento actualizados.";
 $labels['itipobjectnotfound'] = 'El evento referido por este mensaje no se encontró en su calendario.';
 $labels['itipmailbodyaccepted'] = "\$sender ha aceptado la invitación al evento siguiente:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
@@ -183,21 +182,85 @@
 $labels['itipcommenttitle'] = 'Este comentario se adjunta al mensaje de invitación/notificación enviada a los participantes';
 $labels['notanattendee'] = 'Usted no está en la lista como un asistente de este evento';
 $labels['eventcancelled'] = 'El evento ha sido cancelado';
+$labels['saveincalendar'] = 'guardar en';
+$labels['updatemycopy'] = 'actualizar en mi calendario';
+$labels['savetocalendar'] = 'guardar en calendario';
+$labels['openpreview'] = 'Revisar en calendario';
+$labels['noearlierevents'] = 'No hay eventos anteriores';
+$labels['nolaterevents'] = 'No hay eventos posteriores';
 $labels['resource'] = 'Recurso';
+$labels['addresource'] = 'Reservar recursos';
+$labels['findresources'] = 'Encontrar recursos';
 $labels['resourcedetails'] = 'Detalles';
+$labels['resourceavailability'] = 'Disponibilidad';
+$labels['resourceowner'] = 'Propietario';
+$labels['resourceadded'] = 'Se ha añadido un recurso a su evento';
 $labels['tabsummary'] = 'Sumario';
 $labels['tabrecurrence'] = 'Recurrencia ';
+$labels['tabattendees'] = 'Participantes';
 $labels['tabresources'] = 'Recursos';
 $labels['tabattachments'] = 'Adjuntos';
 $labels['tabsharing'] = 'Compartir';
+$labels['deleteobjectconfirm'] = '¿Esta seguro de eliminar  este evento?';
+$labels['deleteventconfirm'] = '¿Esta seguro de eliminar este evento?';
+$labels['deletecalendarconfirm'] = '¿Esta seguro de eliminar este calendario con todos sus eventos?';
+$labels['deletecalendarconfirmrecursive'] = '¿Esta seguro de eliminar este calendario con todos sus eventos y subcalendarios?';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['errorsaving'] = 'Error al guardar cambios';
+$labels['operationfailed'] = 'Error en la operación solicitada';
+$labels['invalideventdates'] = 'Se han introducido fechas erróneas; por favor, revise su entrada';
+$labels['invalidcalendarproperties'] = 'Propiedades de portátiles erróneas; establezca un nombre válido.';
+$labels['searchnoresults'] = 'No se han encontrado eventos en los calendarios seleccionados.';
+$labels['successremoval'] = 'El evento se ha eliminado correctamente.';
+$labels['successrestore'] = 'El evento se ha restaurado correctamente.';
+$labels['errornotifying'] = 'Error al enviar notificaciones a los participantes del evento';
+$labels['errorimportingevent'] = 'Error al importar el evento';
+$labels['importwarningexists'] = 'Ya existe una copia de este evento en su calendario.';
+$labels['newerversionexists'] = 'Ya existe una versión más nueva de este evento. Abortado.';
+$labels['nowritecalendarfound'] = 'No se ha encontrado ningún calendario para guardar el evento.';
+$labels['importedsuccessfully'] = 'El evento se agregó correctamente a \'$calendar\'';
+$labels['updatedsuccessfully'] = 'El evento se actualizó correctamente en \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Se ha actualizado correctamente el estado del participante';
+$labels['itipsendsuccess'] = 'Invitación enviada a los participantes.';
+$labels['itipresponseerror'] = 'Error al enviar la respuesta a esta invitación de evento';
 $labels['itipinvalidrequest'] = 'Esta invitación ya no es válida';
+$labels['sentresponseto'] = 'Respuesta de invitación con éxito enviada a $mailto';
+$labels['localchangeswarning'] = 'Está a punto de realizar cambios que sólo se reflejarán en su calendario y no se enviarán al organizador del evento.';
+$labels['importsuccess'] = 'Se han importado $nr eventos correctamente';
+$labels['importnone'] = 'No se han encontrado eventos para importar';
+$labels['importerror'] = 'Se ha producido un error durante la importación';
+$labels['aclnorights'] = 'No tiene derechos de administrador en este calendario.';
+$labels['changeeventconfirm'] = 'Cambiar evento';
+$labels['removeeventconfirm'] = 'Eliminar evento';
+$labels['changerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea editar solo el evento actual, este y todos los futuros casos, todos los casos o guardarlo como un nuevo evento?';
+$labels['removerecurringeventwarning'] = 'Este es un evento recurrente. ¿Desea eliminar solo el evento actual, este y todos los futuros casos o todos los casos de este evento?';
+$labels['removerecurringallonly'] = 'Este es un evento recurrente. Como participante, sólo puede eliminar el evento al completo con todos los casos..';
+$labels['currentevent'] = 'Actual';
 $labels['futurevents'] = 'Futuro';
 $labels['allevents'] = 'Todo';
+$labels['saveasnew'] = 'Guardar como nuevo';
+$labels['birthdays'] = 'Cumpleaños';
+$labels['birthdayscalendar'] = 'Calendario de cumpleaños';
+$labels['displaybirthdayscalendar'] = 'Mostrar calendarios de cumpleaños';
+$labels['birthdayscalendarsources'] = 'Desde esta libreta de direcciones';
+$labels['birthdayeventtitle'] = 'Cumpleaños de $nombre';
+$labels['birthdayage'] = 'Edad $edad';
 $labels['objectchangelog'] = 'Cambiar historial';
 $labels['objectdiff'] = 'Cambiar de $rev1 a $rev2';
+$labels['objectnotfound'] = 'Error al cargar los datos del evento';
+$labels['objectchangelognotavailable'] = 'El historial de cambios no está disponible para este evento';
 $labels['objectdiffnotavailable'] = 'No hay comparación posible que las revisiones seleccionadas';
+$labels['revisionrestoreconfirm'] = '¿Realmente desea restaurar la revisión $rev de este evento? Esto reemplazará el evento actual con la antigua versión.';
 $labels['objectrestoresuccess'] = 'Revisión $rev restaurado correctamente';
-$labels['objectrestoreerror'] = 'No se pudo restaurar la revisión antigua';
+$labels['objectrestoreerror'] = 'No se pudo restaurar la revisión anterior';
+$labels['arialabelminical'] = 'Seleccionar una fecha en el calendario';
+$labels['arialabelcalendarview'] = 'Vista del calendario';
+$labels['arialabelsearchform'] = 'Formulario de búsqueda de eventos';
+$labels['arialabelquicksearchbox'] = 'Entrada en búsqueda de eventos';
+$labels['arialabelcalsearchform'] = 'Formulario de búsqueda de calendarios';
+$labels['calendaractions'] = 'acciones del calendario';
+$labels['arialabeleventattendees'] = 'Lista de participantes del evento';
+$labels['arialabeleventresources'] = 'Lista de recursos del evento';
+$labels['arialabelresourcesearchform'] = 'Formulario de búsqueda de recursos';
+$labels['arialabelresourceselection'] = 'Recursos disponibles';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/fi_FI.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/fi_FI.inc Changed

@@ -73,6 +73,7 @@
 $labels['status'] = 'Tila';
 $labels['status-confirmed'] = 'Vahvistettu';
 $labels['status-cancelled'] = 'Peruttu';
+$labels['status-tentative'] = 'Alustava';
 $labels['priority'] = 'Tärkeys';
 $labels['sensitivity'] = 'Yksityisyys';
 $labels['public'] = 'julkinen';
@@ -149,8 +150,6 @@
 $labels['availunknown'] = 'Tuntematon';
 $labels['availtentative'] = 'Alustava';
 $labels['availoutofoffice'] = 'Ei toimistolla';
-$labels['delegatedto'] = 'Delegoitu henkilölle:';
-$labels['delegatedfrom'] = 'Delegoitus henkilöltä:';
 $labels['scheduletime'] = 'Etsi saatavuus';
 $labels['sendinvitations'] = 'Lähetä kutsut';
 $labels['sendnotifications'] = 'Ilmoita osallistujille muutoksista';
@@ -162,7 +161,6 @@
 $labels['suggestedslot'] = 'Ehdotettu ajankohta';
 $labels['noslotfound'] = 'Vapaata ajankohtaa ei löytynyt';
 $labels['invitationsubject'] = 'Sinut on kutsuttu tapahtumaan "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nMilloin: \$date\n\nKutsutut: \$attendees\n\nOhessa iCalendar -tiedosto mistä löytyvät kaikki tapahtuman yksityistiedot. Voit tuoda tämän tiedoston kalenteriohjelmaasi.";
 $labels['invitationattendlinks'] = "Mikäli sähköpostiohjelmasi ei tue iTip pyyntöjä, voit aina käyttää ao. osoitetta kutsun hyväksymiseen / hylkäämiseen:\n\$url";
 $labels['eventupdatesubject'] = '"$title" on päivitetty';
 $labels['eventupdatesubjectempty'] = 'Sinua koskeva tapahtuma on päivitetty';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/fr_FR.inc Changed

@@ -14,9 +14,9 @@
 $labels['workinghours'] = 'Heures de travail';
 $labels['add_category'] = 'Ajouter une catégorie';
 $labels['remove_category'] = 'Supprimer une catégorie';
-$labels['defaultcalendar'] = 'Ajouter un nouvel évènement';
-$labels['eventcoloring'] = 'Couleurs des évènements';
-$labels['coloringmode0'] = 'Selon l\'agenda';
+$labels['defaultcalendar'] = 'Ajouter un nouvel événement';
+$labels['eventcoloring'] = 'Couleurs des événements';
+$labels['coloringmode0'] = 'Selon le calendrier';
 $labels['coloringmode1'] = 'Selon la catégorie';
 $labels['coloringmode2'] = 'Calendrier en contour, catégorie en contenu';
 $labels['coloringmode3'] = 'Catégorie en contour, calendrier en contenu';
@@ -25,14 +25,14 @@
 $labels['afterdelete'] = 'Supprimer ce message';
 $labels['afterflagdeleted'] = 'Marquer comme supprimer';
 $labels['aftermoveto'] = 'Déplacer vers...';
-$labels['itipoptions'] = 'Invitations à l\'évenement';
+$labels['itipoptions'] = 'Invitations à l\'événement';
 $labels['afteraction'] = 'Après une invitation ou une modification, le message est traité';
-$labels['calendar'] = 'Agenda';
-$labels['calendars'] = 'Agendas';
+$labels['calendar'] = 'Calendrier';
+$labels['calendars'] = 'Calendriers';
 $labels['category'] = 'Catégorie';
 $labels['categories'] = 'Catégories';
-$labels['createcalendar'] = 'Créer un nouvel agenda';
-$labels['editcalendar'] = 'Modifier les propriétés de l\'agenda';
+$labels['createcalendar'] = 'Créer un nouveau calendrier';
+$labels['editcalendar'] = 'Modifier les propriétés du calendrier';
 $labels['name'] = 'Nom';
 $labels['color'] = 'Couleur';
 $labels['day'] = 'Jour';
@@ -40,41 +40,42 @@
 $labels['month'] = 'Mois';
 $labels['agenda'] = 'Ordre du jour';
 $labels['new'] = 'Nouveau';
-$labels['new_event'] = 'Nouvel évènement';
-$labels['edit_event'] = 'Modifier l\'évènement';
+$labels['new_event'] = 'Nouvel événement';
+$labels['edit_event'] = 'Modifier l\'événement';
 $labels['edit'] = 'Modifier';
 $labels['save'] = 'Enregistrer';
-$labels['removelist'] = 'supprimer de la liste';
+$labels['removelist'] = 'Supprimer de la liste';
 $labels['cancel'] = 'Annuler';
 $labels['select'] = 'Sélectionner';
 $labels['print'] = 'Imprimer';
-$labels['printtitle'] = 'Imprimer les agendas';
+$labels['printtitle'] = 'Imprimer les calendriers';
 $labels['title'] = 'Résumé';
 $labels['description'] = 'Description';
-$labels['all-day'] = 'Toute la journée';
+$labels['all-day'] = 'toute la journée';
 $labels['export'] = 'Exporter';
 $labels['exporttitle'] = 'Exporter vers iCalendar';
-$labels['exportrange'] = 'Évènements depuis';
-$labels['exportattachments'] = 'With attachments';
+$labels['exportrange'] = 'Événements depuis';
+$labels['exportattachments'] = 'Avec pièces jointes';
 $labels['customdate'] = 'Date personnalisée';
 $labels['location'] = 'Lieu';
 $labels['url'] = 'URL';
 $labels['date'] = 'Date';
 $labels['start'] = 'Début';
-$labels['starttime'] = 'Début';
+$labels['starttime'] = 'Heure de début';
 $labels['end'] = 'Fin';
-$labels['endtime'] = 'Fin';
+$labels['endtime'] = 'Heure de fin';
 $labels['repeat'] = 'Répéter';
 $labels['selectdate'] = 'Sélectionner une date';
-$labels['freebusy'] = 'Montrez moi comme';
+$labels['freebusy'] = 'Montrez-moi en tant que';
 $labels['free'] = 'Libre';
 $labels['busy'] = 'Occupé';
 $labels['outofoffice'] = 'Absent';
 $labels['tentative'] = 'Provisoire';
-$labels['mystatus'] = 'Mon status';
+$labels['mystatus'] = 'Mon statut';
 $labels['status'] = 'Statut';
 $labels['status-confirmed'] = 'Confirmé';
-$labels['status-cancelled'] = 'Annulée';
+$labels['status-cancelled'] = 'Annulé';
+$labels['status-tentative'] = 'Provisoire';
 $labels['priority'] = 'Priorité';
 $labels['sensitivity'] = 'Diffusion';
 $labels['public'] = 'publique';
@@ -83,7 +84,7 @@
 $labels['links'] = 'Référence';
 $labels['alarms'] = 'Rappel';
 $labels['comment'] = 'Commentaire';
-$labels['created'] = 'Créée';
+$labels['created'] = 'Créé';
 $labels['changed'] = 'Dernière modification';
 $labels['unknown'] = 'Inconnu';
 $labels['eventoptions'] = 'Options';
@@ -92,39 +93,39 @@
 $labels['removelink'] = 'Enlever référence d\'e-mail';
 $labels['printdescriptions'] = 'Imprimer les descriptions';
 $labels['parentcalendar'] = 'Ajouter à l\'intérieur';
-$labels['searchearlierdates'] = '« Chercher des évènements plus ancien';
-$labels['searchlaterdates'] = 'Chercher des évènement plus récent »';
+$labels['searchearlierdates'] = '« Chercher des événements plus anciens';
+$labels['searchlaterdates'] = 'Chercher des événement plus récents »';
 $labels['andnmore'] = '$nr de plus...';
 $labels['togglerole'] = 'Cliquez pour changer de rôle';
-$labels['createfrommail'] = 'Enregistrer comme un évènement';
-$labels['importevents'] = 'Importer des évènements';
-$labels['importrange'] = 'Évènements depuis';
-$labels['onemonthback'] = '1 mois précédent';
+$labels['createfrommail'] = 'Enregistrer comme un événement';
+$labels['importevents'] = 'Importer des événements';
+$labels['importrange'] = 'Événements depuis';
+$labels['onemonthback'] = '1 mois auparavant';
 $labels['nmonthsback'] = '$nr mois précédents';
-$labels['showurl'] = 'Afficher l\'URL de l\'agenda';
-$labels['showurldescription'] = 'Utilisez l\'adresse suivante pour accéder(lecture seule) à votre agenda depuis une autre application. Vous pouvez copier/coller celle-ci dans n\'importe quel agenda électronique gérant le format iCal.';
-$labels['caldavurldescription'] = 'Copiez cette adresse vers une application client (comme Evolution ou Mozilla Thunderbird) compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> pour synchroniser ce calendrier avec votre ordinateur ou votre smartphone.';
+$labels['showurl'] = 'Afficher l\'URL du calendrier';
+$labels['showurldescription'] = 'Utilisez l\'adresse suivante pour accéder (lecture seule) à votre calendrier depuis d\'autres applications. Vous pouvez copier/coller celle-ci dans n\'importe quel calendrier électronique gérant le format iCal.';
+$labels['caldavurldescription'] = 'Copiez cette adresse vers une application client (comme Evolution ou Mozilla Thunderbird) compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> pour synchroniser pleinement ce calendrier avec votre ordinateur ou votre smartphone.';
 $labels['findcalendars'] = 'Recherche de calendriers...';
 $labels['searchterms'] = 'Critères de recherche';
 $labels['calsearchresults'] = 'Calendriers disponibles';
 $labels['calendarsubscribe'] = 'Lister définitivement';
-$labels['nocalendarsfound'] = 'Aucun calendriers trouvés';
+$labels['nocalendarsfound'] = 'Aucun calendrier trouvé';
 $labels['nrcalendarsfound'] = '$nr calendriers trouvés';
 $labels['quickview'] = 'Voir uniquement ce calendrier';
 $labels['invitationspending'] = 'Invitations en attente';
 $labels['invitationsdeclined'] = 'Invitations refusées';
-$labels['changepartstat'] = 'Changer le statut du participent';
+$labels['changepartstat'] = 'Changer le statut du participant';
 $labels['rsvpcomment'] = 'Texte d\'invitation';
 $labels['listrange'] = 'Intervalle à afficher :';
 $labels['listsections'] = 'Diviser en :';
-$labels['smartsections'] = 'Section intelligente';
+$labels['smartsections'] = 'Sections intelligentes';
 $labels['until'] = 'jusqu\'à';
 $labels['today'] = 'Aujourd\'hui';
 $labels['tomorrow'] = 'Demain';
 $labels['thisweek'] = 'Cette semaine';
 $labels['nextweek'] = 'Semaine prochaine';
 $labels['prevweek'] = 'Semaine précédente';
-$labels['thismonth'] = 'Ce mois';
+$labels['thismonth'] = 'Ce mois-ci';
 $labels['nextmonth'] = 'Mois prochain';
 $labels['weekofyear'] = 'Semaine';
 $labels['pastevents'] = 'Passé';
@@ -139,10 +140,10 @@
 $labels['addattendee'] = 'Ajouter participant';
 $labels['roleorganizer'] = 'Organisateur';
 $labels['rolerequired'] = 'Requis';
-$labels['roleoptional'] = 'Optionel';
-$labels['rolechair'] = 'Chair';
+$labels['roleoptional'] = 'Optionnel';
+$labels['rolechair'] = 'Présidence';
 $labels['rolenonparticipant'] = 'Absent';
-$labels['cutypeindividual'] = 'Individual';
+$labels['cutypeindividual'] = 'Individuel';
 $labels['cutypegroup'] = 'Groupe';
 $labels['cutyperesource'] = 'Ressource';
 $labels['cutyperoom'] = 'Salle';
@@ -151,117 +152,115 @@
 $labels['availunknown'] = 'Inconnu';
 $labels['availtentative'] = 'Provisoire';
 $labels['availoutofoffice'] = 'Absent';
-$labels['delegatedto'] = 'Délégué à :';
-$labels['delegatedfrom'] = 'Délégué de :';
 $labels['scheduletime'] = 'Trouver les disponibilités';
 $labels['sendinvitations'] = 'Envoyer les invitations';
 $labels['sendnotifications'] = 'Informer les participants des modifications';
 $labels['sendcancellation'] = 'Informer les participants de l\'annulation';
 $labels['onlyworkinghours'] = 'Trouver des disponibilités en fonction de mes heures de travail';
-$labels['reqallattendees'] = 'Demandé/tous';
+$labels['reqallattendees'] = 'Demandé/tous les participants';
 $labels['prevslot'] = 'Créneau précédent';
 $labels['nextslot'] = 'Créneau suivant';
 $labels['suggestedslot'] = 'Emplacement suggéré';
 $labels['noslotfound'] = 'Impossible de trouver un créneau disponible';
 $labels['invitationsubject'] = 'Vous avez été invité à "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les détails de l'évènement que vous pourrez importer dans votre agenda électronique.";
-$labels['invitationattendlinks'] = "Dans le cas où votre application de messagerie ne gère pas les demandes \"iTip\". Vous pouvez utiliser ce lien pour accepter ou refuser l'invitation : \n\$url";
+$labels['invitationattendlinks'] = "Dans le cas où votre application de messagerie ne gère pas les demandes \"iTip\", vous pouvez utiliser ce lien pour accepter ou refuser l'invitation : \n\$url";
 $labels['eventupdatesubject'] = '"$title" a été modifié';
-$labels['eventupdatesubjectempty'] = 'Un évènement vous concernant a été modifié';
-$labels['eventupdatemailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec tous les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
-$labels['eventcancelmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nL'évènement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'évènement que vous pourrez importer dans votre agenda électronique.";
-$labels['itipobjectnotfound'] = 'L\'évènement lié à ce message n\'a pas été trouvé dans votre calendrier.';
-$labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'évènement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
-$labels['itipmailbodycancel'] = "\$sender a rejeté votre participation à l’évènement suivant :\n\n*\$title*\n\nLe: \$date";
+$labels['eventupdatesubjectempty'] = 'Un événement vous concernant a été modifié';
+$labels['eventupdatemailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nVous trouverez ci-joint un fichier iCalendar avec toutes les modifications à l'événement que vous pourrez importer dans votre calendrier électronique.";
+$labels['eventcancelsubject'] = '"$title" a été annulé';
+$labels['eventcancelmailbody'] = "*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees\n\nL'événement a été annulé par \$organizer.\n\nVous trouverez en pièce jointe un fichier iCalendar avec les modifications de l'événement que vous pourrez importer dans votre calendrier électronique.";
+$labels['itipobjectnotfound'] = 'L\'événement lié à ce message n\'a pas été trouvé dans votre calendrier.';
+$labels['itipmailbodyaccepted'] = "\$sender a accepté l'invitation à l'événement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender a accepté provisoirement l'invitation à l'événement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender a refusé l'invitation à l'événement suivant :\n\n*\$title*\n\nQuand: \$date\n\nParticipants: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender a rejeté votre participation à l’événement suivant :\n\n*\$title*\n\nLe: \$date";
 $labels['itipmailbodydelegated'] = "\$sender a délégué la participation à l'événement suivant : \n\n*\$title*\n\nQuand: \$date";
 $labels['itipmailbodydelegatedto'] = "\$sender vous a délégué la participation à l'événement suivant : \n\n*\$title*\n\nQuand : \$date";
-$labels['itipdeclineevent'] = 'Voulez-vous refuser l\'invitation à cet évènement?';
-$labels['declinedeleteconfirm'] = 'Voulez-vous aussi supprimer cet évènement annulé, de votre calendrier ?';
+$labels['itipdeclineevent'] = 'Voulez-vous refuser l\'invitation à cet événement?';
+$labels['declinedeleteconfirm'] = 'Voulez-vous aussi supprimer cet événement annulé de votre calendrier ?';
 $labels['itipcomment'] = 'Commentaire d’invitation ou de notification';
 $labels['itipcommenttitle'] = 'Ce commentaire sera inséré dans le message d\'invitation ou de notification envoyé aux participants';
-$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
-$labels['eventcancelled'] = 'L\'évènement a été annulé';
-$labels['saveincalendar'] = 'Enregistrer sous';
+$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet événement';
+$labels['eventcancelled'] = 'L\'événement a été annulé';
+$labels['saveincalendar'] = 'enregistrer sous';
 $labels['updatemycopy'] = 'Mise à jour dans mon calendrier';
 $labels['savetocalendar'] = 'Sauvegarde dans le calendrier';
-$labels['openpreview'] = 'Test calendrier';
-$labels['noearlierevents'] = 'Aucun évènements passé';
-$labels['nolaterevents'] = 'Aucun évènement futur';
+$labels['openpreview'] = 'Consulter le calendrier';
+$labels['noearlierevents'] = 'Aucun événement passé';
+$labels['nolaterevents'] = 'Aucun événement futur';
 $labels['resource'] = 'Ressource';
 $labels['addresource'] = 'Carnet de ressources';
 $labels['findresources'] = 'Recherche des ressources';
 $labels['resourcedetails'] = 'Détails';
 $labels['resourceavailability'] = 'Disponibilité';
 $labels['resourceowner'] = 'Propriétaire';
-$labels['resourceadded'] = 'Cette ressource a été ajouté à l\'évènement';
+$labels['resourceadded'] = 'Cette ressource a été ajoutée à l\'événement';
 $labels['tabsummary'] = 'Résumé';
 $labels['tabrecurrence'] = 'Récurrence';
 $labels['tabattendees'] = 'Participants';
 $labels['tabresources'] = 'Ressources';
 $labels['tabattachments'] = 'Pièces jointes';
 $labels['tabsharing'] = 'Partage';
-$labels['deleteobjectconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
-$labels['deleteventconfirm'] = 'Voulez-vous vraiment supprimer cet évènement?';
-$labels['deletecalendarconfirm'] = 'Voulez-vous vraiment supprimer cet agenda et tous ses évènements?';
-$labels['deletecalendarconfirmrecursive'] = 'Voulez-vous vraiment supprimer ce calendrier avec tous ces évènements et ces sous calendriers ?';
+$labels['deleteobjectconfirm'] = 'Voulez-vous vraiment supprimer cet événement?';
+$labels['deleteventconfirm'] = 'Voulez-vous vraiment supprimer cet événement?';
+$labels['deletecalendarconfirm'] = 'Voulez-vous vraiment supprimer ce calendrier et tous ses événements?';
+$labels['deletecalendarconfirmrecursive'] = 'Voulez-vous vraiment supprimer ce calendrier avec tous ses événements et ses sous-calendriers ?';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['errorsaving'] = 'Échec lors de l\'enregistrement des changements';
 $labels['operationfailed'] = 'L\'opération demandée a échoué';
-$labels['invalideventdates'] = 'Dates invalides! Veuillez vérifier votre saisie.';
-$labels['invalidcalendarproperties'] = 'Propriétés d\'agenda invalides! Veuillez saisir un nom valide.';
-$labels['searchnoresults'] = 'Pas d\'évènement trouvé dans les agendas sélectionnés.';
-$labels['successremoval'] = 'L\'évènement a été supprimé.';
-$labels['successrestore'] = 'L\'évènement a été restauré.';
-$labels['errornotifying'] = 'Échec de l\'envoi de notification aux participants ';
-$labels['errorimportingevent'] = 'Échec de l\'import de l\'évènement';
-$labels['importwarningexists'] = 'Une copie de cet évènement existe déjà dans votre calendrier.';
-$labels['newerversionexists'] = 'Une nouvelle version de cet évènement existe! Abandon.';
-$labels['nowritecalendarfound'] = 'Pas d\'agenda trouvé pour enregistrer l\'évènement';
-$labels['importedsuccessfully'] = 'L\'évènement a été ajouté à l\'agenda \'$calendar\'';
-$labels['updatedsuccessfully'] = 'Cet évènement a été modifié avec succès dans \'$calendar\'';
+$labels['invalideventdates'] = 'Dates invalides ! Veuillez vérifier votre saisie.';
+$labels['invalidcalendarproperties'] = 'Propriétés du calendrier invalides ! Veuillez saisir un nom valide.';
+$labels['searchnoresults'] = 'Pas d\'événement trouvé dans les calendriers sélectionnés.';
+$labels['successremoval'] = 'L\'événement a été supprimé.';
+$labels['successrestore'] = 'L\'événement a été restauré.';
+$labels['errornotifying'] = 'Échec de l\'envoi de notifications aux participants ';
+$labels['errorimportingevent'] = 'Échec de l\'import de l\'événement';
+$labels['importwarningexists'] = 'Une copie de cet événement existe déjà dans votre calendrier.';
+$labels['newerversionexists'] = 'Une nouvelle version de cet événement existe ! Abandon.';
+$labels['nowritecalendarfound'] = 'Pas de calendrier trouvé pour enregistrer l\'événement';
+$labels['importedsuccessfully'] = 'L\'événement a été ajouté à l\'agenda \'$calendar\'';
+$labels['updatedsuccessfully'] = 'Cet événement a été modifié avec succès dans \'$calendar\'';
 $labels['attendeupdateesuccess'] = 'Le statut des participants a été modifié';
-$labels['itipsendsuccess'] = 'Invitation envoyé aux participants.';
-$labels['itipresponseerror'] = 'Échec de l\'envoi d\'une réponse à cette invitation.';
-$labels['itipinvalidrequest'] = 'C\'est invitation n\'est plus valide.';
-$labels['sentresponseto'] = 'La réponse à l\'invitation a été envoyé à $mailto';
-$labels['localchangeswarning'] = 'Vous êtes sur le point d\'effectuer des modifications qui seront effectifs sur votre calendrier mais qui ne seront pas envoyés à l\'organisateur de l’évènement.';
-$labels['importsuccess'] = '$nr évènements importés.';
-$labels['importnone'] = 'Pas d\'évènements à importer';
-$labels['importerror'] = 'Une erreur est arrivée lors de l\'import';
-$labels['aclnorights'] = 'Vous n\'avez pas les droits d\'administration sur cet agenda.';
-$labels['changeeventconfirm'] = 'Modifier l\'évènement';
-$labels['removeeventconfirm'] = 'Supprimer l\'évènement';
-$labels['changerecurringeventwarning'] = 'Ceci est un évènement récurant. Voulez vous éditer seulement cette occurrence, celle-ci et toutes les suivantes, toutes les occurrences ou l\'enregistrer comme un nouvel évènement? ';
-$labels['removerecurringeventwarning'] = 'Ceci est un évènement récurent. Voulez-vous supprimer l\'évènement courant uniquement, l’évènement courant et toutes les occurrences futures, ou toutes les occurrences ?';
-$labels['removerecurringallonly'] = 'Ceci est un évènement récurent. En tant que participant vous pouvez seulement supprimer l\'évènement entier avec toutes les occurrences.';
+$labels['itipsendsuccess'] = 'Invitation envoyée aux participants.';
+$labels['itipresponseerror'] = 'Échec de l\'envoi d\'une réponse à cette invitation';
+$labels['itipinvalidrequest'] = 'C\'est invitation n\'est plus valide';
+$labels['sentresponseto'] = 'La réponse à l\'invitation a été envoyée à $mailto';
+$labels['localchangeswarning'] = 'Vous êtes sur le point d\'effectuer des modifications qui seront effectives dans votre calendrier mais qui ne seront pas envoyées à l\'organisateur de l’événement.';
+$labels['importsuccess'] = '$nr événements importés.';
+$labels['importnone'] = 'Pas d\'événement à importer';
+$labels['importerror'] = 'Une erreur s\'est produite lors de l\'importation';
+$labels['aclnorights'] = 'Vous ne disposez pas des droits d\'administrateur sur ce calendrier.';
+$labels['changeeventconfirm'] = 'Modifier l\'événement';
+$labels['removeeventconfirm'] = 'Supprimer l\'événement';
+$labels['changerecurringeventwarning'] = 'Ceci est un événement récurrent. Voulez-vous éditer seulement cette occurrence, celle-ci et toutes les suivantes, toutes les occurrences ou l\'enregistrer comme un nouvel événement ? ';
+$labels['removerecurringeventwarning'] = 'Ceci est un événement récurrent. Voulez-vous supprimer l\'événement courant uniquement, l’événement courant et toutes les occurrences futures, ou toutes les occurrences ?';
+$labels['removerecurringallonly'] = 'Ceci est un événement récurrent. En tant que participant, vous pouvez seulement supprimer l\'événement entier avec toutes les occurrences.';
 $labels['currentevent'] = 'Cette occurrence';
 $labels['futurevents'] = 'Cette occurrence et toutes les suivantes';
 $labels['allevents'] = 'Toutes les occurrences';
-$labels['saveasnew'] = 'Enregistrer comme un nouvel évènement';
+$labels['saveasnew'] = 'Enregistrer comme un nouvel événement';
 $labels['birthdays'] = 'Anniversaires';
 $labels['birthdayscalendar'] = 'Calendrier des anniversaires';
 $labels['displaybirthdayscalendar'] = 'Afficher le calendrier des anniversaires';
 $labels['birthdayscalendarsources'] = 'Depuis ces carnets d\'adresses';
 $labels['birthdayeventtitle'] = 'Anniversaire de $name';
-$labels['birthdayage'] = 'Age $age';
+$labels['birthdayage'] = 'Âge $age';
 $labels['objectchangelog'] = 'Historique des modifications';
-$labels['objectdiff'] = 'Modifications depuis $rev1 jusqu\'à $rev2';
-$labels['objectnotfound'] = 'Impossible de charger les données de l’évènement';
-$labels['objectchangelognotavailable'] = 'Il n\'y a pas d\'historique des modifications pour cet évènement';
+$labels['objectdiff'] = 'Modifications de $rev1 à $rev2';
+$labels['objectnotfound'] = 'Impossible de charger les données de l’événement';
+$labels['objectchangelognotavailable'] = 'Il n\'y a pas d\'historique des modifications pour cet événement';
 $labels['objectdiffnotavailable'] = 'La comparaison des versions sélectionnées est impossible';
-$labels['revisionrestoreconfirm'] = 'Voulez-vous vraiment restaurer le version $rev de cet évènement ? Cette action va remplacer l\'évènement courant par l\'ancienne version.';
+$labels['revisionrestoreconfirm'] = 'Voulez-vous vraiment restaurer le version $rev de cet événement ? Cette action va remplacer l\'événement actuel par l\'ancienne version.';
 $labels['objectrestoresuccess'] = 'La révision $rev a été restaurée avec succès';
 $labels['objectrestoreerror'] = 'Échec lors de la restauration de la précédente révision';
 $labels['arialabelminical'] = 'Sélection de la date du calendrier';
 $labels['arialabelcalendarview'] = 'Vue du calendrier';
-$labels['arialabelsearchform'] = 'Recherche d\'évènements depuis';
-$labels['arialabelquicksearchbox'] = 'Saisie de le recherche d\'évènements';
+$labels['arialabelsearchform'] = 'Recherche d\'événements depuis';
+$labels['arialabelquicksearchbox'] = 'Saisie de le recherche d\'événements';
 $labels['arialabelcalsearchform'] = 'Recherche de calendriers';
 $labels['calendaractions'] = 'Actions calendrier';
-$labels['arialabeleventattendees'] = 'Liste des participants à l\'évènement';
-$labels['arialabeleventresources'] = 'Liste des ressources de l\'évènement';
-$labels['arialabelresourcesearchform'] = 'Recherche des ressources';
+$labels['arialabeleventattendees'] = 'Liste des participants à l\'événement';
+$labels['arialabeleventresources'] = 'Liste des ressources de l\'événement';
+$labels['arialabelresourcesearchform'] = 'Formulaire de recherche des ressources';
 $labels['arialabelresourceselection'] = 'Ressources disponibles';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/hr_HR.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/hr_HR.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/hu_HU.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/hu_HU.inc Changed

@@ -66,6 +66,7 @@
 $labels['status'] = 'Stát.';
 $labels['status-confirmed'] = 'Confirmed';
 $labels['status-cancelled'] = 'Cancelled';
+$labels['status-tentative'] = 'Feltételes';
 $labels['priority'] = 'Prioritás';
 $labels['sensitivity'] = 'Manánszféra';
 $labels['public'] = 'publikus';
@@ -130,8 +131,6 @@
 $labels['availunknown'] = 'Ismeretlen foglaltság';
 $labels['availtentative'] = 'Feltételes';
 $labels['availoutofoffice'] = 'Házon kívül';
-$labels['delegatedto'] = 'Beosztva ide: ';
-$labels['delegatedfrom'] = 'Beosztva innen: ';
 $labels['scheduletime'] = 'Elérhetőség';
 $labels['sendinvitations'] = 'Meghívók küldése';
 $labels['sendnotifications'] = 'Résztvevők értesítése a változásokról';
@@ -142,7 +141,6 @@
 $labels['nextslot'] = 'Következő idősáv';
 $labels['noslotfound'] = 'Nem sikerült szabad idősávot találni';
 $labels['invitationsubject'] = '$title';
-$labels['invitationmailbody'] = "Meghívó érkezett '\$title' eseményre.\n\nIdőpont: \$date\nSzervező: \$organizer\nRésztvevők: \$attendees\n\n\nMellékletben egy iCalendar naptárbejegyzés, mely tetszőleges naptárprogramba importálható.";
 $labels['invitationattendlinks'] = "Amennyiben a levelezőben nem lát elfogadó/elutasító gombokat (a levelező program nem támogatja az iTip üzeneteket), kattintson ide a meghívó elfogadására, vagy elutasítására:\n\$url";
 $labels['eventupdatesubject'] = '$title - módosítva';
 $labels['eventupdatesubjectempty'] = 'Egy Önt érintő esemény módosítva lett';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/it_IT.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/it_IT.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Stato';
 $labels['status-confirmed'] = 'Confermato';
 $labels['status-cancelled'] = 'Cancellato';
+$labels['status-tentative'] = 'Provvisorio';
 $labels['priority'] = 'Priorità';
 $labels['sensitivity'] = 'Privacy';
 $labels['public'] = 'pubblico';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Sconosciuto';
 $labels['availtentative'] = 'Provvisorio';
 $labels['availoutofoffice'] = 'Fuori sede';
-$labels['delegatedto'] = 'Delegato a:';
-$labels['delegatedfrom'] = 'Delegato da:';
 $labels['scheduletime'] = 'Trova disponibilità';
 $labels['sendinvitations'] = 'Manda inviti';
 $labels['sendnotifications'] = 'Notifica le modifiche ai partecipanti';
@@ -164,7 +163,6 @@
 $labels['suggestedslot'] = 'Spazio suggerito';
 $labels['noslotfound'] = 'Impossibile trovare uno spazio di tempo libero';
 $labels['invitationsubject'] = 'Sei stato invitato a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nQuando: \$date\n\nInvitati: \$attendees\n\nIn allegato un file iCalendar con tutti i dettagli dell'evento, che puoi importare nella tua applicazione calendario.";
 $labels['invitationattendlinks'] = "Se il tuo client di posta elettronica non supporta le richieste iTip, puoi seguire il seguente collegamento per accettare o rifiutare l'invito:\n\$url";
 $labels['eventupdatesubject'] = '"$title" è stato aggiornato';
 $labels['eventupdatesubjectempty'] = 'Un evento che ti riguarda è stato aggiornato';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/ja_JP.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/ja_JP.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = '状態';
 $labels['status-confirmed'] = '確認済';
 $labels['status-cancelled'] = 'キャンセル済';
+$labels['status-tentative'] = '仮';
 $labels['priority'] = '優先度';
 $labels['sensitivity'] = 'プライバシー';
 $labels['public'] = 'パブリック';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = '不明';
 $labels['availtentative'] = '仮';
 $labels['availoutofoffice'] = '外出';
-$labels['delegatedto'] = '委任先:';
-$labels['delegatedfrom'] = '委任元:';
 $labels['scheduletime'] = '利用可検索';
 $labels['sendinvitations'] = '招待を送る';
 $labels['sendnotifications'] = '変更を参加者へ通知する';
@@ -164,7 +163,6 @@
 $labels['suggestedslot'] = '指示されたスロット';
 $labels['noslotfound'] = '空スロットを見つけられません';
 $labels['invitationsubject'] = '"$title" に招待されました';
-$labels['invitationmailbody'] = "*\$title*\n\nいつ: \$date\n\n招待者: \$attendees\n\nあなたのカレンダーアプリケーションにインポートできる全イベントの詳細がインポートできる添付されたiカレンダーファイルを見つけてください。";
 $labels['invitationattendlinks'] = "この場合あなたのメールクライアントはiTip リクエストをサポートしてません、以下のリンクからこの招待を承諾もしくは辞退してください:\n\$url";
 $labels['eventupdatesubject'] = '"$title" はアップデートされました';
 $labels['eventupdatesubjectempty'] = 'あなたに関連するイベントが更新されました';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/ko_KR.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/ko_KR.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/lv.inc Added

@@ -0,0 +1,266 @@
+<?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'] = 'Noklusētais skats';
+$labels['time_format'] = 'Laika formāts';
+$labels['timeslots'] = 'Iedaļu skaits stundā';
+$labels['first_day'] = 'Nedēļas sākuma diena';
+$labels['first_hour'] = 'Pirmā attēlojamā stunda';
+$labels['workinghours'] = 'Darba laiks';
+$labels['add_category'] = 'Pievienot kategoriju';
+$labels['remove_category'] = 'Dzēst kategoriju';
+$labels['defaultcalendar'] = 'Veidot jaunus notikumus kalendārā';
+$labels['eventcoloring'] = 'Iekrāsot notikumus';
+$labels['coloringmode0'] = 'Kalendāra krāsā';
+$labels['coloringmode1'] = 'Kategorijas krāsā';
+$labels['coloringmode2'] = 'Kalendāra krāsa līnijai, kategorijas krāsa pildījumam';
+$labels['coloringmode3'] = 'Kategorijas krāsa līnijai, kalendāra krāsa pildījumam';
+$labels['afternothing'] = 'Nedarīt neko';
+$labels['aftertrash'] = 'Pārvietot uz Papīrgrozu';
+$labels['afterdelete'] = 'Dzēst ziņojumu';
+$labels['afterflagdeleted'] = 'Atzīmēt kā dzēstu';
+$labels['aftermoveto'] = 'Pārvietot uz ...';
+$labels['itipoptions'] = 'Notikuma uzaicinājumi';
+$labels['afteraction'] = 'Pēc tam, kad uzaicinājums vai izmaiņu ziņojums ir apstrādāts';
+$labels['calendar'] = 'Kalendārs';
+$labels['calendars'] = 'Kalendāri';
+$labels['category'] = 'Kategorija';
+$labels['categories'] = 'Kategorijas';
+$labels['createcalendar'] = 'Jauns kalendārs';
+$labels['editcalendar'] = 'Kalendāra īpašības';
+$labels['name'] = 'Nosaukums';
+$labels['color'] = 'Krāsa';
+$labels['day'] = 'Diena';
+$labels['week'] = 'Nedēļa';
+$labels['month'] = 'Mēnesis';
+$labels['agenda'] = 'Dienaskārtība';
+$labels['new'] = 'Jauns';
+$labels['new_event'] = 'Jauns notikums';
+$labels['edit_event'] = 'Mainīt notikumu';
+$labels['edit'] = 'Labot';
+$labels['save'] = 'Saglabāt';
+$labels['removelist'] = 'Dzēst no saraksta';
+$labels['cancel'] = 'Atcelt';
+$labels['select'] = 'Izvēlēties';
+$labels['print'] = 'Drukāt';
+$labels['printtitle'] = 'Drukāt kalendārus';
+$labels['title'] = 'Kopsavilkums';
+$labels['description'] = 'Apraksts';
+$labels['all-day'] = 'visa diena';
+$labels['export'] = 'Eksportēt';
+$labels['exporttitle'] = 'Eksportēt uz iCalendar';
+$labels['exportrange'] = 'Notikumi no';
+$labels['exportattachments'] = 'Ar pielikumiem';
+$labels['customdate'] = 'Lietotāja izvēlēts datums';
+$labels['location'] = 'Vieta';
+$labels['url'] = 'URL';
+$labels['date'] = 'Datums';
+$labels['start'] = 'Sākums';
+$labels['starttime'] = 'Sākums';
+$labels['end'] = 'Beigas';
+$labels['endtime'] = 'Beigas';
+$labels['repeat'] = 'Atkārtot';
+$labels['selectdate'] = 'Izvēlieties datumu';
+$labels['freebusy'] = 'Rādīt mani kā';
+$labels['free'] = 'Brīvs';
+$labels['busy'] = 'Aizņemts';
+$labels['outofoffice'] = 'Ārpus biroja';
+$labels['tentative'] = 'Varbūt';
+$labels['mystatus'] = 'Mans statuss';
+$labels['status'] = 'Statuss';
+$labels['status-confirmed'] = 'Apstiprināts';
+$labels['status-cancelled'] = 'Atcelts';
+$labels['status-tentative'] = 'Varbūt';
+$labels['priority'] = 'Prioritāte';
+$labels['sensitivity'] = 'Privātums';
+$labels['public'] = 'publisks';
+$labels['private'] = 'privāts';
+$labels['confidential'] = 'slepens';
+$labels['links'] = 'Atsauce';
+$labels['alarms'] = 'Atgādinājums';
+$labels['comment'] = 'Komentārs';
+$labels['created'] = 'Izveidots';
+$labels['changed'] = 'Mainīts';
+$labels['unknown'] = 'Nezināms';
+$labels['eventoptions'] = 'iespējas';
+$labels['generated'] = 'izveidots';
+$labels['eventhistory'] = 'Vēsture';
+$labels['removelink'] = 'Noņemt atsauci uz e-pastu';
+$labels['printdescriptions'] = 'Drukāt aprakstus';
+$labels['parentcalendar'] = 'Ievietot';
+$labels['searchearlierdates'] = '« Meklēt agrākus notikumus';
+$labels['searchlaterdates'] = 'Meklēt vēlākus notikumus »';
+$labels['andnmore'] = 'vēl $nr ...';
+$labels['togglerole'] = 'Uzklikšķiniet, lai pārslēgtu lomu';
+$labels['createfrommail'] = 'Saglabāt kā notikumu';
+$labels['importevents'] = 'Importēt notikumus';
+$labels['importrange'] = 'Notikumi no';
+$labels['onemonthback'] = 'Pirms mēneša';
+$labels['nmonthsback'] = 'Pirms $nr mēnešiem';
+$labels['showurl'] = 'Parādīt kalendāra URL';
+$labels['showurldescription'] = 'Izmantojiet sekojošo adresi, lai piekļūtu (tikai lasīšanas režīmā) jūsu kalendāram no citas aplikācijas. Jūs varat to nokopēt un ielīmēt jebkurā aplikācijā, kas atbalsta iCal formātu.';
+$labels['caldavurldescription'] = 'Nokopējiet šo adresi <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> uz klienta aplikāciju (piem. Evolution vai Mozilla Thunderbird) lai pilnībā sinhronizētu izvēlēto kalendāru ar jūsu datoru vai mobilo ierīci.';
+$labels['findcalendars'] = 'Meklēt kalendārus...';
+$labels['searchterms'] = 'Meklēšanas nosacījumi';
+$labels['calsearchresults'] = 'Pieejamie kalendāri';
+$labels['calendarsubscribe'] = 'Rādīt sarakstā vienmēr';
+$labels['nocalendarsfound'] = 'Neviens kalendārs nav atrasts';
+$labels['nrcalendarsfound'] = 'Atrasti $nr kalendāri';
+$labels['quickview'] = 'Skatīt tikai šo kalendāru';
+$labels['invitationspending'] = 'Neapstrādātie uzaicinājumi';
+$labels['invitationsdeclined'] = 'Noraidītie uzaicinājumi';
+$labels['changepartstat'] = 'Mainīt dalībnieka statusu';
+$labels['rsvpcomment'] = 'Uzaicinājuma teksts';
+$labels['listrange'] = 'Attēlot diapazonu:';
+$labels['listsections'] = 'Sadalīt:';
+$labels['smartsections'] = 'Viedās sekcijas';
+$labels['until'] = 'līdz';
+$labels['today'] = 'Šodien';
+$labels['tomorrow'] = 'Rīt';
+$labels['thisweek'] = 'Šonedēļ';
+$labels['nextweek'] = 'Jaunnedēļ';
+$labels['prevweek'] = 'Pagājušā nedēļā';
+$labels['thismonth'] = 'Šomēnes';
+$labels['nextmonth'] = 'Nākošmēnes';
+$labels['weekofyear'] = 'Nedēļa';
+$labels['pastevents'] = 'Pagātne';
+$labels['futureevents'] = 'Nākotne';
+$labels['showalarms'] = 'Rādīt atgādinājumus';
+$labels['defaultalarmtype'] = 'Noklusētais atgādinājumu uzstādījums';
+$labels['defaultalarmoffset'] = 'Noklusētais atgādinājuma laiks';
+$labels['attendee'] = 'Dalībnieks';
+$labels['role'] = 'Loma';
+$labels['availability'] = 'Pieej.';
+$labels['confirmstate'] = 'Statuss';
+$labels['addattendee'] = 'Pievienot dalībnieku';
+$labels['roleorganizer'] = 'Organizētājs';
+$labels['rolerequired'] = 'Obligāti';
+$labels['roleoptional'] = 'Pēc izvēles';
+$labels['rolechair'] = 'Vadītājs';
+$labels['rolenonparticipant'] = 'Nepiedalās';
+$labels['cutypeindividual'] = 'Persona';
+$labels['cutypegroup'] = 'Grupa';
+$labels['cutyperesource'] = 'Resurss';
+$labels['cutyperoom'] = 'Telpa';
+$labels['availfree'] = 'Brīvs';
+$labels['availbusy'] = 'Aizņemts';
+$labels['availunknown'] = 'Nezināms';
+$labels['availtentative'] = 'Varbūt';
+$labels['availoutofoffice'] = 'Ārpus biroja';
+$labels['scheduletime'] = 'Atrast brīvu laiku';
+$labels['sendinvitations'] = 'Nosūtīt uzaicinājumus';
+$labels['sendnotifications'] = 'Apziņot dalībniekus par izmaiņām';
+$labels['sendcancellation'] = 'Apziņot dalībniekus par pasākuma atcelšanu';
+$labels['onlyworkinghours'] = 'Atrast brīvu laiku manā darba laikā';
+$labels['reqallattendees'] = 'Obligātie/visi dalībnieki';
+$labels['prevslot'] = 'Iepriekšējā iedaļa';
+$labels['nextslot'] = 'Nākamā iedaļa';
+$labels['suggestedslot'] = 'Ieteicamā iedaļa';
+$labels['noslotfound'] = 'Nav brīvas laika iedaļas';
+$labels['invitationsubject'] = 'Jūs esat uzaicināts uz "$title"';
+$labels['invitationattendlinks'] = "Gadījumā ja jūsu e-pasta praogramma neatbalsta iTip pieprasījumus, tad jūs varat izmantot šo saiti, lai pieņemtu vai noraidītu šo uzaicinājumu:\n\$url";
+$labels['eventupdatesubject'] = '"$title" ir mainīts';
+$labels['eventupdatesubjectempty'] = 'Pasākums, kas attiecas uz jums ir mainīts';
+$labels['eventupdatemailbody'] = "*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees\n\nPielikumā pievienots iCalendar fails ar atjaunotu notikuma informāciju, kuru jūs varat importēt savā kalendāra aplikācijā.";
+$labels['eventcancelsubject'] = '"$title" ir atcelts';
+$labels['eventcancelmailbody'] = "*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees\n\nPasākumu ir atcēlis tā organizators \$organizer.\n\nLūdzu skatiet pievienoto iCalendar failu ar atjaunotu notikuma informāciju.";
+$labels['itipobjectnotfound'] = 'Notikums uz ko attiecas šis ziņojums nav atrodams jūsu kalendāra.';
+$labels['itipmailbodyaccepted'] = "\$sender ir pieņēmis uzaicinājumu uz:\n\n*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the invitation to the following event:\n\n*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender ir noraidījis uzaicinājumu dalībai:\n\n*\$title*\n\nKad: \$date\n\nUzaicinātie: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender ir noraidījis jūsu dalību sekojošā pasākumā:\n\n*\$title*\n\nKad: \$date";
+$labels['itipmailbodydelegated'] = "\$sender ir deleģējis dalību sekojošā pasākumā:\n\n*\$title*\n\nKad: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender ir deleģējis jums dalību sekojošā pasākumā:\n\n*\$title*\n\nKad: \$date";
+$labels['itipdeclineevent'] = 'Vai vēlaties noraidīt šo uzaicinājumu?';
+$labels['declinedeleteconfirm'] = 'Vai jūs vēlaties arī dzēst šo noraidīto notikumu no jūsu kalendāra?';
+$labels['itipcomment'] = 'Uzaicinājumam/paziņojuma komentārs';
+$labels['itipcommenttitle'] = 'Šis komentārs tiks pievienots uzaicinājumam/paziņojuma ziņojumam dalībniekiem';
+$labels['notanattendee'] = 'Jūs neesat šī notikuma dalībnieku sarakstā';
+$labels['eventcancelled'] = 'Notikums atcelts';
+$labels['saveincalendar'] = 'saglabāt';
+$labels['updatemycopy'] = 'Atjaunot manā kalendārā';
+$labels['savetocalendar'] = 'Saglabāt kalendārā';
+$labels['openpreview'] = 'Pārbaudīt kalendāru';
+$labels['noearlierevents'] = 'Nav notikumu pirms';
+$labels['nolaterevents'] = 'Nav notikumu pēc';
+$labels['resource'] = 'Resurss';
+$labels['addresource'] = 'Pieteikt resursus';
+$labels['findresources'] = 'Meklēt resursus';
+$labels['resourcedetails'] = 'Detaļas';
+$labels['resourceavailability'] = 'Pieejamība';
+$labels['resourceowner'] = 'Īpašnieks';
+$labels['resourceadded'] = 'Resursi pievienoti jūsu notikumam';
+$labels['tabsummary'] = 'Kopsavilkums';
+$labels['tabrecurrence'] = 'Atkārtojums';
+$labels['tabattendees'] = 'Dalībnieki';
+$labels['tabresources'] = 'Resursi';
+$labels['tabattachments'] = 'Pielikumi';
+$labels['tabsharing'] = 'Dalīšanās';
+$labels['deleteobjectconfirm'] = 'Vai tiešām jūs vēlaties dzēst šo notikumu?';
+$labels['deleteventconfirm'] = 'Vai tiešām jūs vēlaties dzēst šo notikumu?';
+$labels['deletecalendarconfirm'] = 'Vai tiešām jūs vēlaties dzēst šo kalendāru ar visiem notikumiem?';
+$labels['deletecalendarconfirmrecursive'] = 'Vai tiešām jūs vēlaties dzēst šo kalendāru ar visiem notikumiem un pakārtotajiem kalendāriem?';
+$labels['savingdata'] = 'Saglabājam...';
+$labels['errorsaving'] = 'Kļūda saglabājot izmaiņas.';
+$labels['operationfailed'] = 'Kļūda pieprasītās darbības laikā.';
+$labels['invalideventdates'] = 'Ievadīti nederīgi datumi! Lūdzu pārbaudiet ievadīto.';
+$labels['invalidcalendarproperties'] = 'Nederīgas kalendāra īpašības! Lūdzu norādiet derīgu nosaukumu.';
+$labels['searchnoresults'] = 'Nav atrasts neviens notikums izvēlētajos kalendāros';
+$labels['successremoval'] = 'Notikums veiksmīgi dzēsts';
+$labels['successrestore'] = 'Notikums veiksmīgi atjaunots';
+$labels['errornotifying'] = 'Kļūda izsūtot paziņojumus dalībniekiem';
+$labels['errorimportingevent'] = 'Kļūda importējot notikumu';
+$labels['importwarningexists'] = 'Šī notikuma kopija jau eksistē jūsu kalendārā';
+$labels['newerversionexists'] = 'Jaunāka notikuma versija jau eksistē jūsu kalendārā! Darbība atcelta.';
+$labels['nowritecalendarfound'] = 'Nav atrasts kalendārs, kur pievienot notikumu';
+$labels['importedsuccessfully'] = 'Šis notikums veiksmīgi pievienots kalendāram \'$calendar\'';
+$labels['updatedsuccessfully'] = 'Šis notikums veiksmīgi atjaunots kalendārā \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Dalībnieku statusi veiksmīgi atjaunoti';
+$labels['itipsendsuccess'] = 'Uzaicinājumi dalībniekiem izsūtīti';
+$labels['itipresponseerror'] = 'Kļūda nosūtot atbildi uz šo uzaicinājumu';
+$labels['itipinvalidrequest'] = 'Šis uzaicinājums vairs nav spēkā';
+$labels['sentresponseto'] = 'Atbilde uz uzaicinājumu veiksmīgi nosūtīta $mailto';
+$labels['localchangeswarning'] = 'Jūsu veiktās izmaiņas attēlosies tikai jūsu kalendārā un netiks nosūtītas pasākuma organizatoram.';
+$labels['importsuccess'] = 'Veiksmīgi importēti $nr notikumi';
+$labels['importnone'] = 'Nav atrasti notikumi ko importēt';
+$labels['importerror'] = 'Kļūda importa laikā';
+$labels['aclnorights'] = 'Jums nav šī kalendāra administratora tiesību';
+$labels['changeeventconfirm'] = 'Mainīt notikumu';
+$labels['removeeventconfirm'] = 'Dzēst notikumu';
+$labels['changerecurringeventwarning'] = 'Šis ir periodisks notikums. Vai vēlaties labot tikai šo notikumu, šo un visus šos nākotnes notikumus, visus šos notikumus, vai arī saglabāt šo kā jaunu notikumu?';
+$labels['removerecurringeventwarning'] = 'Šis ir periodisks notikums. Vai vēlaties dzēst tikai šo notikumu, šo un visus šos nākotnes notikumus vai arī visus šos notikumus?';
+$labels['removerecurringallonly'] = 'Šis ir periodisks notikums. Kā dalībnieks jūs varat tikai dzēst šo notikumu pilnībā.';
+$labels['currentevent'] = 'Pašreizējais';
+$labels['futurevents'] = 'Nākotne';
+$labels['allevents'] = 'Visi';
+$labels['saveasnew'] = 'Saglabāt kā jaunu';
+$labels['birthdays'] = 'Dzimšanas dienas';
+$labels['birthdayscalendar'] = 'Dzimšanas dienu kalendārs';
+$labels['displaybirthdayscalendar'] = 'Rādīt dzimšanas dienu kalendāru';
+$labels['birthdayscalendarsources'] = 'No  šīm adrešu grāmatām';
+$labels['birthdayeventtitle'] = '$name dzimšanas diena';
+$labels['birthdayage'] = 'Vecums $age';
+$labels['objectchangelog'] = 'Mainīt vēsturi';
+$labels['objectdiff'] = 'Izmaiņas no $rev1 uz $rev2';
+$labels['objectnotfound'] = 'Kļūda ielādējot notikuma datus';
+$labels['objectchangelognotavailable'] = 'Šī notikuma vēsturi mainīt nevar';
+$labels['objectdiffnotavailable'] = 'Izvēlētās versijas nav salīdzināmas';
+$labels['revisionrestoreconfirm'] = 'Vai tiešām vēlaties atjaunot šī notikuma $rev. versiju? Šī darbība aizstās pašreizējo notikumu ar veco versiju.';
+$labels['objectrestoresuccess'] = 'Versija $rev veiksmīgi atjaunota';
+$labels['objectrestoreerror'] = 'Kļūda atjaunojot veco versiju';
+$labels['arialabelminical'] = 'Kalendāra datuma izvēle';
+$labels['arialabelcalendarview'] = 'Kalendāra skats';
+$labels['arialabelsearchform'] = 'Notikumu meklēšanas forma';
+$labels['arialabelquicksearchbox'] = 'Notikumu meklēšanas ievadlauks';
+$labels['arialabelcalsearchform'] = 'Kalendāru meklēšanas forma';
+$labels['calendaractions'] = 'Darbības ar kalendāru';
+$labels['arialabeleventattendees'] = 'Dalībnieku saraksts';
+$labels['arialabeleventresources'] = 'Resursu saraksts';
+$labels['arialabelresourcesearchform'] = 'Resursu meklēšanas forma';
+$labels['arialabelresourceselection'] = 'Pieejamie resursi';
+?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/nl_NL.inc Changed

@@ -6,30 +6,33 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/calendar/
  */
-$labels['default_view'] = 'Standaard agenda';
-$labels['time_format'] = 'Tijdsformaat';
-$labels['timeslots'] = 'Tijdsdelen per uur';
+$labels['default_view'] = 'Standaardweergave';
+$labels['time_format'] = 'Tijdnotatie';
+$labels['timeslots'] = 'Tijdvakken per uur';
 $labels['first_day'] = 'Eerste weekdag';
 $labels['first_hour'] = 'Eerste uur om weer te geven';
 $labels['workinghours'] = 'Werkuren';
 $labels['add_category'] = 'Categorie toevoegen';
 $labels['remove_category'] = 'Categorie verwijderen';
-$labels['defaultcalendar'] = 'Maak nieuwe afspraken in';
-$labels['eventcoloring'] = 'Kleuren van afspraken';
-$labels['coloringmode0'] = 'Volgens kalender';
+$labels['defaultcalendar'] = 'Nieuwe activiteiten maken in';
+$labels['eventcoloring'] = 'Kleuren voor activiteiten';
+$labels['coloringmode0'] = 'Volgens agenda';
 $labels['coloringmode1'] = 'Volgens categorie';
-$labels['coloringmode2'] = 'Kalender voor omtrek, categorie voor inhoud';
-$labels['coloringmode3'] = 'Categorie voor omtrek, kalender voor inhoud';
-$labels['aftertrash'] = 'Verplaats naar prullenbak';
-$labels['afterdelete'] = 'Verwijder bericht';
-$labels['afterflagdeleted'] = 'Markeer als verwijderd';
-$labels['aftermoveto'] = 'Verplaats naar...';
-$labels['calendar'] = 'Kalender';
-$labels['calendars'] = 'Kalenders';
+$labels['coloringmode2'] = 'Agenda voor overzicht, categorie voor inhoud';
+$labels['coloringmode3'] = 'Categorie voor overzicht, agenda voor inhoud';
+$labels['afternothing'] = 'Niets doen';
+$labels['aftertrash'] = 'Verplaatsen naar Prullenbak';
+$labels['afterdelete'] = 'Bericht verwijderen';
+$labels['afterflagdeleted'] = 'Markeren als verwijderd';
+$labels['aftermoveto'] = 'Verplaatsen naar...';
+$labels['itipoptions'] = 'Uitnodigingen voor activiteiten';
+$labels['afteraction'] = 'Nadat een uitnodiging of updatebericht is verwerkt';
+$labels['calendar'] = 'Agenda';
+$labels['calendars'] = 'Agenda\'s';
 $labels['category'] = 'Categorie';
 $labels['categories'] = 'Categorieën';
-$labels['createcalendar'] = 'Maak een nieuwe kalender';
-$labels['editcalendar'] = 'Wijzig kalender eigenschappen';
+$labels['createcalendar'] = 'Nieuwe agenda maken';
+$labels['editcalendar'] = 'Agenda-eigenschappen bewerken';
 $labels['name'] = 'Naam';
 $labels['color'] = 'Kleur';
 $labels['day'] = 'Dag';
@@ -37,187 +40,227 @@
 $labels['month'] = 'Maand';
 $labels['agenda'] = 'Agenda';
 $labels['new'] = 'Nieuw';
-$labels['new_event'] = 'Nieuwe afspraak';
-$labels['edit_event'] = 'Wijzig afspraak';
-$labels['edit'] = 'Wijzig';
-$labels['save'] = 'Bewaar';
-$labels['cancel'] = 'Terug';
-$labels['select'] = 'Selecteer';
+$labels['new_event'] = 'Nieuwe activiteit';
+$labels['edit_event'] = 'Activiteit bewerken';
+$labels['edit'] = 'Bewerken';
+$labels['save'] = 'Opslaan';
+$labels['removelist'] = 'Verwijderen uit lijst';
+$labels['cancel'] = 'Annuleren';
+$labels['select'] = 'Selecteren';
 $labels['print'] = 'Afdrukken';
-$labels['printtitle'] = 'Kalenders afdrukken';
+$labels['printtitle'] = 'Agenda\'s afdrukken';
 $labels['title'] = 'Samenvatting';
-$labels['description'] = 'Omschrijving';
+$labels['description'] = 'Beschrijving';
 $labels['all-day'] = 'hele dag';
-$labels['export'] = 'Exporteer naar ICS';
-$labels['exporttitle'] = 'Als iCalender exporteren';
-$labels['exportrange'] = 'Afspraken uit';
-$labels['exportattachments'] = 'Exporteer bijlages';
-$labels['customdate'] = 'Aangepaste datumweergave';
+$labels['export'] = 'Exporteren';
+$labels['exporttitle'] = 'Exporteren naar iCalendar';
+$labels['exportrange'] = 'Activiteiten uit';
+$labels['exportattachments'] = 'Met bijlagen';
+$labels['customdate'] = 'Aangepaste datum';
 $labels['location'] = 'Locatie';
 $labels['url'] = 'URL';
 $labels['date'] = 'Datum';
 $labels['start'] = 'Begin';
-$labels['starttime'] = 'Start time';
-$labels['end'] = 'Eind';
+$labels['starttime'] = 'Begintijd';
+$labels['end'] = 'Einde';
 $labels['endtime'] = 'Eindtijd';
-$labels['repeat'] = 'Herhaal';
-$labels['selectdate'] = 'Kies datum';
+$labels['repeat'] = 'Herhalen';
+$labels['selectdate'] = 'Datum kiezen';
 $labels['freebusy'] = 'Toon mij als';
-$labels['free'] = 'Vrij';
+$labels['free'] = 'Beschikbaar';
 $labels['busy'] = 'Bezet';
-$labels['outofoffice'] = 'Niet Aanwezig';
+$labels['outofoffice'] = 'Niet aanwezig';
 $labels['tentative'] = 'Misschien';
+$labels['mystatus'] = 'Mijn status';
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Bevestigd';
-$labels['status-cancelled'] = 'Afgelast';
+$labels['status-cancelled'] = 'Geannuleerd';
+$labels['status-tentative'] = 'Misschien';
 $labels['priority'] = 'Prioriteit';
-$labels['sensitivity'] = 'Zichtbaarheid';
-$labels['public'] = 'publiek';
-$labels['private'] = 'prive';
+$labels['sensitivity'] = 'Privacy';
+$labels['public'] = 'openbaar';
+$labels['private'] = 'privé';
 $labels['confidential'] = 'vertrouwelijk';
+$labels['links'] = 'Referentie';
 $labels['alarms'] = 'Herinnering';
 $labels['comment'] = 'Opmerking';
+$labels['created'] = 'Gemaakt op';
+$labels['changed'] = 'Laatst gewijzigd op';
 $labels['unknown'] = 'Onbekend';
 $labels['eventoptions'] = 'Opties';
 $labels['generated'] = 'gegenereerd op';
 $labels['eventhistory'] = 'Geschiedenis';
-$labels['printdescriptions'] = 'Print beschrijvingen';
-$labels['parentcalendar'] = 'Voeg toe in';
-$labels['searchearlierdates'] = '« Zoek voor eerdere afspraken';
-$labels['searchlaterdates'] = 'Zoek voor latere afspraken »';
-$labels['andnmore'] = '$nr meer...';
+$labels['removelink'] = 'E-mailreferentie verwijderen';
+$labels['printdescriptions'] = 'Beschrijvingen afdrukken';
+$labels['parentcalendar'] = 'Invoegen in';
+$labels['searchearlierdates'] = '« Zoek eerdere activiteiten';
+$labels['searchlaterdates'] = 'Zoek latere activiteiten »';
+$labels['andnmore'] = 'Nog $nr...';
 $labels['togglerole'] = 'Klik om van rol te wisselen';
-$labels['createfrommail'] = 'Bewaar als afspraak';
-$labels['importevents'] = 'Afspraken importeren';
-$labels['importrange'] = 'Afspraken vanaf';
-$labels['onemonthback'] = '1 maand terug';
-$labels['nmonthsback'] = '$nr maanden terug';
-$labels['showurl'] = 'Toon kalender URL';
-$labels['showurldescription'] = 'Gebruik het volgende adres om uw kalendar te gebruiken (alleen lezen) in andere programma\'s. U kunt dit knippen en plakken in elk kalender programma dat het iCal formaat ondersteunt.';
-$labels['caldavurldescription'] = 'Kopieer dit adres in een <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> programma (bijv. Evolution of Mozilla Thunderbird) om deze specifieke kalender volledig te synchronizeren met je computer of mobiel apparaat.';
-$labels['findcalendars'] = 'Vind agenda\'s...';
-$labels['searchterms'] = 'Search terms';
+$labels['createfrommail'] = 'Opslaan als activiteit';
+$labels['importevents'] = 'Activiteiten importeren';
+$labels['importrange'] = 'Activiteiten van';
+$labels['onemonthback'] = 'afgelopen maand';
+$labels['nmonthsback'] = 'afgelopen $nr maanden';
+$labels['showurl'] = 'URL van agenda tonen';
+$labels['showurldescription'] = 'Gebruik het volgende adres om uw agenda in andere programma\'s te gebruiken (alleen-lezen). U kunt dit knippen en plakken in elk agendaprogramma dat de iCal-indeling ondersteunt.';
+$labels['caldavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-client (bijv. Evolution of Mozilla Thunderbird) om deze specifieke agenda volledig te synchroniseren met uw computer of mobiele apparaat.';
+$labels['findcalendars'] = 'Agenda\'s zoeken...';
+$labels['searchterms'] = 'Zoektermen';
 $labels['calsearchresults'] = 'Beschikbare agenda\'s';
-$labels['calendarsubscribe'] = 'Permanent weergeven';
-$labels['invitationsdeclined'] = 'Afgewezen uitnodigingen';
-$labels['listrange'] = 'Bereik om te tonen:';
-$labels['listsections'] = 'Verdeel in:';
+$labels['calendarsubscribe'] = 'Definitief weergeven';
+$labels['nocalendarsfound'] = 'Geen agenda\'s gevonden';
+$labels['nrcalendarsfound'] = '$nr agenda\'s gevonden';
+$labels['quickview'] = 'Alleen deze agenda bekijken';
+$labels['invitationspending'] = 'Uitnodigingen in behandeling';
+$labels['invitationsdeclined'] = 'Afgeslagen uitnodigingen';
+$labels['changepartstat'] = 'Status van deelnemer wijzigen';
+$labels['rsvpcomment'] = 'Tekst van uitnodiging';
+$labels['listrange'] = 'Weer te geven bereik:';
+$labels['listsections'] = 'Verdelen in:';
 $labels['smartsections'] = 'Slimme secties';
 $labels['until'] = 'tot';
 $labels['today'] = 'Vandaag';
 $labels['tomorrow'] = 'Morgen';
 $labels['thisweek'] = 'Deze week';
 $labels['nextweek'] = 'Volgende week';
+$labels['prevweek'] = 'Vorige week';
 $labels['thismonth'] = 'Deze maand';
 $labels['nextmonth'] = 'Volgende maand';
 $labels['weekofyear'] = 'Week';
 $labels['pastevents'] = 'Verleden';
 $labels['futureevents'] = 'Toekomst';
-$labels['showalarms'] = 'Toon herinneringen';
-$labels['defaultalarmtype'] = 'Instelling standaard herinnering';
-$labels['defaultalarmoffset'] = 'Standaard herinneringstijd';
+$labels['showalarms'] = 'Herinneringen tonen';
+$labels['defaultalarmtype'] = 'Standaardinstelling herinnering';
+$labels['defaultalarmoffset'] = 'Standaardtijd herinnering';
 $labels['attendee'] = 'Deelnemer';
 $labels['role'] = 'Rol';
-$labels['availability'] = 'Beschikb.';
+$labels['availability'] = 'Beschikbaar';
 $labels['confirmstate'] = 'Status';
 $labels['addattendee'] = 'Deelnemer toevoegen';
-$labels['roleorganizer'] = 'Organisatie';
+$labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Verplicht';
 $labels['roleoptional'] = 'Optioneel';
 $labels['rolechair'] = 'Voorzitter';
 $labels['rolenonparticipant'] = 'Afwezig';
-$labels['cutypeindividual'] = 'Individueel';
+$labels['cutypeindividual'] = 'Persoon';
 $labels['cutypegroup'] = 'Groep';
-$labels['cutyperesource'] = 'Middel';
-$labels['cutyperoom'] = 'Kamer';
-$labels['availfree'] = 'Vrij';
+$labels['cutyperesource'] = 'Resource';
+$labels['cutyperoom'] = 'Ruimte';
+$labels['availfree'] = 'Beschikbaar';
 $labels['availbusy'] = 'Bezet';
 $labels['availunknown'] = 'Onbekend';
 $labels['availtentative'] = 'Misschien';
-$labels['availoutofoffice'] = 'Niet Aanwezig';
-$labels['delegatedto'] = 'Gedelegeerd aan';
-$labels['delegatedfrom'] = 'Gedelegeerd door';
-$labels['scheduletime'] = 'Vind beschikbaarheid';
-$labels['sendinvitations'] = 'Verzend uitnodigingen';
-$labels['sendnotifications'] = 'Verzend notificaties';
-$labels['sendcancellation'] = 'Verzend annulering';
-$labels['onlyworkinghours'] = 'Vind beschikbaarheid binnen mijn werkuren';
-$labels['reqallattendees'] = 'Verplicht/alle deelnemers';
-$labels['prevslot'] = 'vorig voorstel';
-$labels['nextslot'] = 'volgend voorstel';
-$labels['noslotfound'] = 'Geen voorstel gevonden';
+$labels['availoutofoffice'] = 'Niet aanwezig';
+$labels['scheduletime'] = 'Beschikbaarheid zoeken';
+$labels['sendinvitations'] = 'Uitnodigingen versturen';
+$labels['sendnotifications'] = 'Wijzigingen melden aan deelnemers';
+$labels['sendcancellation'] = 'Annulering van activiteiten melden aan deelnemers';
+$labels['onlyworkinghours'] = 'Beschikbaarheid binnen mijn werkuren zoeken';
+$labels['reqallattendees'] = 'Verplichte/alle deelnemers';
+$labels['prevslot'] = 'Vorig tijdstip';
+$labels['nextslot'] = 'Volgend tijdstip';
+$labels['suggestedslot'] = 'Voorgesteld tijdstip';
+$labels['noslotfound'] = 'Geen beschikbaar tijdstip gevonden';
 $labels['invitationsubject'] = 'U bent uitgenodigd voor "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nBijgevoegd vindt u een iCalendar bestand met alle details omtrent de afspraak die u kunt importeren in uw kalender programma.";
-$labels['invitationattendlinks'] = "In het geval dat uw email programma geen iTip verzoeken aankan, kunt u de volgende link gebruiken om deze uitnodiging te accepteren or af te wijzen :\n\$url";
-$labels['eventupdatesubject'] = '"$title" is gewijzigd';
-$labels['eventupdatesubjectempty'] = 'Een afspraak is gewijzigd';
-$labels['eventupdatemailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nBijgevoegd vindt u een iCalendar bestand met de gewijzigde details omtrent de afspraak die u kunt importeren in uw kalender programma.";
-$labels['eventcancelmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nDeze afspraak is geannuleerd door \$organizer.\n\nBijgevoegd vindt u een iCalendar bestand met de gewijzigde details omtrent de afspraak";
-$labels['itipobjectnotfound'] = 'De afspraak waaraan door dit bericht wordt gereferreerd is niet gevonden in uw kalender.';
-$labels['itipmailbodyaccepted'] = "\$sender heeft de uitnodiging geaccepteerd voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender heeft onder voorbehoud de uitnodiging geaccepteerd voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender heeft de uitnodiging afgewezen voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
-$labels['itipmailbodycancel'] = "\$sender heeft je deelname afgewezen voor de volgende afspraak:\n\n*\$title*\n\nWanneer: \$date";
-$labels['itipdeclineevent'] = 'Wil u de uitnodiging voor deze afspraak afwijzen?';
-$labels['declinedeleteconfirm'] = 'Wilt u tevens deze afgewezen uitnodiging verwijderen uit je kalender?';
-$labels['itipcomment'] = 'Invitation/notification comment';
-$labels['notanattendee'] = 'U staat niet op de lijst van genodigden voor deze afspraak';
-$labels['eventcancelled'] = 'Dit evenement is afgelast';
-$labels['saveincalendar'] = 'bewaar in';
-$labels['updatemycopy'] = 'Wijzig in mijn kalender';
-$labels['savetocalendar'] = 'Opslaan in kalender';
-$labels['resource'] = 'Hulpmiddel';
-$labels['addresource'] = 'Voeg hulpmiddel toe';
-$labels['findresources'] = 'Vind hulpmiddelen';
+$labels['invitationattendlinks'] = "In het geval dat uw e-mailprogramma geen iTip-verzoeken ondersteunt, kunt u de volgende koppeling gebruiken om deze uitnodiging te accepteren or af te slaan:\n\$url";
+$labels['eventupdatesubject'] = '"$title" is bijgewerkt';
+$labels['eventupdatesubjectempty'] = 'Een activiteit die u aangaat is bijgewerkt';
+$labels['eventupdatemailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de activiteit die u in uw agendaprogramma kunt importeren.";
+$labels['eventcancelsubject'] = '"$title" is geannuleerd';
+$labels['eventcancelmailbody'] = "*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees\n\nDe activiteit is geannuleerd door \$organizer.\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de activiteit.";
+$labels['itipobjectnotfound'] = 'De activiteit die in dit bericht wordt vermeld staat niet in uw agenda.';
+$labels['itipmailbodyaccepted'] = "\$sender heeft de uitnodiging voor de volgende activiteit geaccepteerd:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender heeft de uitnodiging voor de volgende activiteit onder voorbehoud geaccepteerd:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender heeft de uitnodiging voor de volgende activiteit afgeslagen:\n\n*\$title*\n\nWanneer: \$date\n\nGenodigden: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender heeft uw deelname aan de volgende activiteit afgewezen:\n\n*\$title*\n\nWanneer: \$date";
+$labels['itipmailbodydelegated'] = "\$sender heeft de deelname aan de volgende activiteit gedelegeerd:\n\n*\$title*\n\nWanneer: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender heeft de deelname aan de volgende activiteit gedelegeerd aan u:\n\n*\$title*\n\nWanneer: \$date";
+$labels['itipdeclineevent'] = 'Wil u de uitnodiging voor deze activiteit afslaan?';
+$labels['declinedeleteconfirm'] = 'Wilt u deze afgewezen activiteit ook verwijderen uit uw agenda?';
+$labels['itipcomment'] = 'Opmerking bij uitnodiging/melding';
+$labels['itipcommenttitle'] = 'Deze opmerking wordt toegevoegd aan de uitnodiging/melding die naar de deelnemers wordt verstuurd';
+$labels['notanattendee'] = 'U staat niet op de lijst met deelnemers aan deze activiteit';
+$labels['eventcancelled'] = 'De activiteit is geannuleerd';
+$labels['saveincalendar'] = 'opslaan in';
+$labels['updatemycopy'] = 'Bijwerken in mijn agenda';
+$labels['savetocalendar'] = 'Opslaan in agenda';
+$labels['openpreview'] = 'Agenda controleren';
+$labels['noearlierevents'] = 'Geen eerdere activiteiten';
+$labels['nolaterevents'] = 'Geen latere activiteiten';
+$labels['resource'] = 'Resource';
+$labels['addresource'] = 'Resource boeken';
+$labels['findresources'] = 'Resources zoeken';
 $labels['resourcedetails'] = 'Details';
 $labels['resourceavailability'] = 'Beschikbaarheid';
 $labels['resourceowner'] = 'Eigenaar';
-$labels['resourceadded'] = 'Hulpmiddel is toegevoegd aan uw afspraak';
+$labels['resourceadded'] = 'De resource is toegevoegd aan uw activiteit';
 $labels['tabsummary'] = 'Samenvatting';
 $labels['tabrecurrence'] = 'Herhaling';
 $labels['tabattendees'] = 'Deelnemers';
-$labels['tabresources'] = 'Middelen';
-$labels['tabattachments'] = 'Toebehoren';
+$labels['tabresources'] = 'Resources';
+$labels['tabattachments'] = 'Bijlagen';
 $labels['tabsharing'] = 'Delen';
-$labels['deleteobjectconfirm'] = 'Weet je zeker dat je deze afspraak wilt verwijderen?';
-$labels['deleteventconfirm'] = 'Weet u zeker dat u deze afspraak wilt verwijderen?';
-$labels['deletecalendarconfirm'] = 'Weet u zeker dat u deze kalender samen met alle afspraken wilt verwijderen?';
-$labels['deletecalendarconfirmrecursive'] = 'Weet u zeker dat je deze kalender samen met alle afspraken en er onder hangende kalenders wilt verwijderen?';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['errorsaving'] = 'Opslaan mislukt.';
-$labels['operationfailed'] = 'De gevraagde opdracht is mislukt.';
-$labels['invalideventdates'] = 'Ongeldige datums ingevoerd! Controleer aub uw invoer.';
-$labels['invalidcalendarproperties'] = 'Ongeldige kalender eigenschappen! Gebruik aub een geldige naam.';
-$labels['searchnoresults'] = 'Geen afspraken gevonden in de geselecteerde kalenders.';
-$labels['successremoval'] = 'De afspraak is succesvol verwijdert.';
-$labels['successrestore'] = 'De afspraak is succesvol herstelt';
-$labels['errornotifying'] = 'Uitnodigingen versturen naar de genodigden van de afspraak is mislukt';
-$labels['errorimportingevent'] = 'Afspraak importeren is mislukt';
-$labels['importwarningexists'] = 'Een kopie van deze afspraak bevindt zich al in uw kalender.';
-$labels['newerversionexists'] = 'Een nieuwere versie van deze afspraak bestaat! Bewerking afgebroken.';
-$labels['nowritecalendarfound'] = 'Geen kalender gevonden om de afspraak in op te slaan';
-$labels['importedsuccessfully'] = 'De afspraak is succesvol toegevoegd aan \'$calendar\'';
-$labels['updatedsuccessfully'] = 'Het bijwerken van de gebeurtenis in \'$calendar\' is geslaagd';
-$labels['attendeupdateesuccess'] = 'Status van genodigde succesvol gewijzigd';
-$labels['itipsendsuccess'] = 'Uitnodiging verstuurd aan de genodigden.';
-$labels['itipresponseerror'] = 'Antwoord op deze uitnodiging versturen is mislukt';
-$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet langer geldig';
-$labels['sentresponseto'] = 'Antwoord op deze uitnodiging was succesvol verstuurd aan $mailto';
-$labels['localchangeswarning'] = 'U bent bezig wijzigingen te maken die alleen zichtbaar zijn in u eigen kalender en die niet doorgestuurd zullen worden aan de organisator van de afspraak.';
-$labels['importsuccess'] = 'Succesvol $nr afspraken geïmporteerd';
-$labels['importnone'] = 'Geen afspraken gevonden om te importeren';
+$labels['deleteobjectconfirm'] = 'Weet u zeker dat u deze activiteit wilt verwijderen?';
+$labels['deleteventconfirm'] = 'Weet u zeker dat u deze activiteit wilt verwijderen?';
+$labels['deletecalendarconfirm'] = 'Weet u zeker dat u deze agenda en alle activiteiten erin wilt verwijderen?';
+$labels['deletecalendarconfirmrecursive'] = 'Weet u zeker dat u deze agenda en alle activiteiten erin alsook de subagenda\'s wilt verwijderen?';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['errorsaving'] = 'Opslaan van wijzigingen is mislukt.';
+$labels['operationfailed'] = 'De gevraagde bewerking is mislukt.';
+$labels['invalideventdates'] = 'Ongeldige datums ingevoerd! Controleer de invoer.';
+$labels['invalidcalendarproperties'] = 'Ongeldige agenda-eigenschappen! Stel een geldige naam in.';
+$labels['searchnoresults'] = 'Geen activiteiten gevonden in de geselecteerde agenda\'s.';
+$labels['successremoval'] = 'De activiteit is met succes verwijderd.';
+$labels['successrestore'] = 'De activiteit is met succes hersteld.';
+$labels['errornotifying'] = 'Versturen van meldingen naar deelnemers van activiteit is mislukt';
+$labels['errorimportingevent'] = 'Importeren van activiteit is mislukt';
+$labels['importwarningexists'] = 'Een exemplaar van deze activiteit staat al in uw agenda.';
+$labels['newerversionexists'] = 'Er bestaat al een nieuwere versie van deze activiteit! Bewerking afgebroken.';
+$labels['nowritecalendarfound'] = 'Geen agenda gevonden om de activiteit op te slaan';
+$labels['importedsuccessfully'] = 'De activiteit is met succes toegevoegd aan \'$calendar\'';
+$labels['updatedsuccessfully'] = 'De activiteit is met succes bijgewerkt in \'$calendar\'';
+$labels['attendeupdateesuccess'] = 'Status van deelnemer is met succes bijgewerkt';
+$labels['itipsendsuccess'] = 'Uitnodiging is naar deelnemers verstuurd.';
+$labels['itipresponseerror'] = 'Versturen van antwoord op uitnodiging voor activiteit is mislukt';
+$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet meer geldig';
+$labels['sentresponseto'] = 'Antwoord op uitnodiging is met succes verstuurd naar $mailto';
+$labels['localchangeswarning'] = 'U gaat wijzigingen maken die alleen zichtbaar zullen zijn in uw eigen agenda en die niet naar de organisator van de activiteit zullen worden verstuurd.';
+$labels['importsuccess'] = '$nr activiteiten met succes geïmporteerd';
+$labels['importnone'] = 'Geen activiteiten gevonden om te importeren';
 $labels['importerror'] = 'Er is een fout tijdens het importeren opgetreden';
-$labels['aclnorights'] = 'U heeft geen administratieve rechten op deze kalender.';
-$labels['changeeventconfirm'] = 'Wijzig afspraak';
-$labels['changerecurringeventwarning'] = 'Dit is een terugkerende afspraak. Wilt u alleen de huidige afspraak wijzigen, deze en alle toekomstige afspraken, alle afspraken of opslaan als een nieuwe afspraak?';
+$labels['aclnorights'] = 'U hebt geen administratorrechten voor deze agenda.';
+$labels['changeeventconfirm'] = 'Activiteit wijzigen';
+$labels['removeeventconfirm'] = 'Activiteit verwijderen';
+$labels['changerecurringeventwarning'] = 'Dit is een herhaalde activiteit. Wilt u alleen de huidige activiteit, deze en alle toekomstige herhalingen of alle herhalingen bewerken of wilt u deze opslaan als een nieuwe activiteit?';
+$labels['removerecurringeventwarning'] = 'Dit is een herhaalde activiteit. Wilt u alleen de huidige activiteit, deze en alle toekomstige herhalingen of alle herhalingen van deze activiteit verwijderen?';
+$labels['removerecurringallonly'] = 'Dit is een herhaalde activiteit. Als deelnemer kunt u alleen de volledige activiteit met alle herhalingen verwijderen.';
 $labels['currentevent'] = 'Huidige';
 $labels['futurevents'] = 'Toekomstige';
 $labels['allevents'] = 'Alle';
-$labels['saveasnew'] = 'Bewaar als nieuw';
+$labels['saveasnew'] = 'Opslaan als nieuw';
 $labels['birthdays'] = 'Verjaardagen';
 $labels['birthdayscalendar'] = 'Verjaardagskalender';
-$labels['displaybirthdayscalendar'] = 'Toon verjaardagskalender';
+$labels['displaybirthdayscalendar'] = 'Verjaardagskalender weergeven';
 $labels['birthdayscalendarsources'] = 'Uit deze adresboeken';
 $labels['birthdayeventtitle'] = 'verjaardag van $name';
-$labels['birthdayage'] = 'Leeftijd $age';
+$labels['birthdayage'] = '$age jaar';
+$labels['objectchangelog'] = 'Geschiedenis wijzigen';
+$labels['objectdiff'] = 'Wijzigingen van $rev1 tot $rev2';
+$labels['objectnotfound'] = 'Laden van activiteitsgegevens is mislukt';
+$labels['objectchangelognotavailable'] = 'Voor deze activiteit kunt u de geschiedenis niet wijzigen';
+$labels['objectdiffnotavailable'] = 'Geen vergelijking mogelijk voor de geselecteerde revisies';
+$labels['revisionrestoreconfirm'] = 'Weet u zeker dat u revisie $rev van deze activiteit wilt herstellen? Met deze actie vervangt u de huidige activiteit door de oude versie.';
+$labels['objectrestoresuccess'] = 'Revisie $rev met succes hersteld';
+$labels['objectrestoreerror'] = 'Herstellen van oude revisie is mislukt';
+$labels['arialabelminical'] = 'Datum in agenda selecteren';
+$labels['arialabelcalendarview'] = 'Agendaweergave';
+$labels['arialabelsearchform'] = 'Zoekformulier voor activiteiten';
+$labels['arialabelquicksearchbox'] = 'Zoekopdracht voor activiteiten';
+$labels['arialabelcalsearchform'] = 'Zoekformulier voor agenda\'s';
+$labels['calendaractions'] = 'Acties voor agenda';
+$labels['arialabeleventattendees'] = 'Lijst met deelnemers van activiteit';
+$labels['arialabeleventresources'] = 'Lijst met resources voor activiteit';
+$labels['arialabelresourcesearchform'] = 'Zoekformulier voor resources';
+$labels['arialabelresourceselection'] = 'Beschikbare resources';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/pl_PL.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/pl_PL.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Potwierdzony';
 $labels['status-cancelled'] = 'Anulowany';
+$labels['status-tentative'] = 'Niepewny';
 $labels['priority'] = 'Priorytet';
 $labels['sensitivity'] = 'Poufność';
 $labels['public'] = 'publiczny';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Nieznany';
 $labels['availtentative'] = 'Niepewny';
 $labels['availoutofoffice'] = 'Poza biurem';
-$labels['delegatedto'] = 'Oddelegowany do:';
-$labels['delegatedfrom'] = 'Oddelegowany z:';
 $labels['scheduletime'] = 'Sprawdź dostępność';
 $labels['sendinvitations'] = 'Wyślij zaproszenia';
 $labels['sendnotifications'] = 'Powiadom uczestników o zmianach';
@@ -164,7 +163,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\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 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';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/pt_BR.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/pt_BR.inc Changed

@@ -37,6 +37,7 @@
 $labels['edit_event'] = 'Editar evento';
 $labels['edit'] = 'Editar';
 $labels['save'] = 'Gravar';
+$labels['removelist'] = 'Remover da lista';
 $labels['cancel'] = 'Cancelar';
 $labels['select'] = 'Selecionar';
 $labels['print'] = 'Imprimir';
@@ -53,6 +54,7 @@
 $labels['url'] = 'URL';
 $labels['date'] = 'Data';
 $labels['start'] = 'Início';
+$labels['starttime'] = 'Hora de início';
 $labels['end'] = 'Término';
 $labels['repeat'] = 'Repetir';
 $labels['selectdate'] = 'Escolha a data';
@@ -64,6 +66,7 @@
 $labels['status'] = 'Situação';
 $labels['status-confirmed'] = 'Confirmado';
 $labels['status-cancelled'] = 'Cancalado';
+$labels['status-tentative'] = 'Tentativa';
 $labels['priority'] = 'Prioridade';
 $labels['sensitivity'] = 'Privacidade';
 $labels['public'] = 'público';
@@ -73,9 +76,12 @@
 $labels['alarms'] = 'Lembrete';
 $labels['comment'] = 'Comentário';
 $labels['created'] = 'Created';
+$labels['changed'] = 'Última modificação';
 $labels['unknown'] = 'Desconhecido';
 $labels['eventoptions'] = 'Opções';
 $labels['generated'] = 'gerado em';
+$labels['eventhistory'] = 'História';
+$labels['removelink'] = 'Remover referência do email';
 $labels['printdescriptions'] = 'Descrições de impressão';
 $labels['parentcalendar'] = 'Inserir dentro';
 $labels['searchearlierdates'] = '« Procurar por eventos anteriores';
@@ -107,6 +113,7 @@
 $labels['weekofyear'] = 'Semana';
 $labels['pastevents'] = 'Passado';
 $labels['futureevents'] = 'Futuro';
+$labels['showalarms'] = 'Mostrar lembrentes';
 $labels['defaultalarmtype'] = 'Configuração de lembrete padrão';
 $labels['defaultalarmoffset'] = 'Horário padrão de lembrete';
 $labels['attendee'] = 'Participante';
@@ -117,6 +124,7 @@
 $labels['roleorganizer'] = 'Organizador';
 $labels['rolerequired'] = 'Obrigatório';
 $labels['roleoptional'] = 'Opcional';
+$labels['rolechair'] = 'Cadeira';
 $labels['cutypegroup'] = 'Grupo';
 $labels['cutyperesource'] = 'Recurso';
 $labels['availfree'] = 'Disponível';
@@ -124,8 +132,6 @@
 $labels['availunknown'] = 'Desconhecido';
 $labels['availtentative'] = 'Tentativa';
 $labels['availoutofoffice'] = 'Fora de escritório';
-$labels['delegatedto'] = 'Delegado para:';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['scheduletime'] = 'Procurar disponibilidade';
 $labels['sendinvitations'] = 'Enviar convites';
 $labels['sendnotifications'] = 'Avisar os participantes sobre as modificações';
@@ -136,7 +142,6 @@
 $labels['nextslot'] = 'Próximo espaço';
 $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';
@@ -209,4 +214,5 @@
 $labels['birthdayscalendarsources'] = 'From these address books';
 $labels['birthdayeventtitle'] = '$name\'s Birthday';
 $labels['birthdayage'] = 'Age $age';
+$labels['objectchangelog'] = 'Mudar Histórico';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/pt_PT.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/pt_PT.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/ru_RU.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/ru_RU.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Статус';
 $labels['status-confirmed'] = 'Подтвеждённый';
 $labels['status-cancelled'] = 'Отмененные';
+$labels['status-tentative'] = 'Неопределённо';
 $labels['priority'] = 'Приоритет';
 $labels['sensitivity'] = 'Секретность';
 $labels['public'] = 'общедоступная';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Неизвестно';
 $labels['availtentative'] = 'Предварительно';
 $labels['availoutofoffice'] = 'Вне офиса';
-$labels['delegatedto'] = 'Поручено:';
-$labels['delegatedfrom'] = 'Поручено от:';
 $labels['scheduletime'] = 'Найти доступность';
 $labels['sendinvitations'] = 'Отправить приглашения';
 $labels['sendnotifications'] = 'Уведомить участников об изменениях';
@@ -164,7 +163,6 @@
 $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'] = 'Событие, которое касается Вас, было обновлено';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/sk_SK.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/sk_SK.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/sl_SI.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/sl_SI.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Status';
 $labels['status-confirmed'] = 'Potrjeno';
 $labels['status-cancelled'] = 'Preklicano';
+$labels['status-tentative'] = 'Pogojno';
 $labels['priority'] = 'Prednost';
 $labels['sensitivity'] = 'Zasebnost';
 $labels['public'] = 'javno';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Neznano';
 $labels['availtentative'] = 'Pogojno';
 $labels['availoutofoffice'] = 'Izven pisarne';
-$labels['delegatedto'] = 'Preneseno na:';
-$labels['delegatedfrom'] = 'Preneseno od:';
 $labels['scheduletime'] = 'Najdi razpoložljivost';
 $labels['sendinvitations'] = 'Pošlji vabila';
 $labels['sendnotifications'] = 'Sporoči udeležencem spremembe';
@@ -164,7 +163,6 @@
 $labels['suggestedslot'] = 'Predlagano mesto';
 $labels['noslotfound'] = 'Ne najdem prostega mesta';
 $labels['invitationsubject'] = 'Vabljeni ste v "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nWhen: \$date\n\nInvitees: \$attendees\n\nProsim preglejte pripeto iCalendar datoteko z vsemi informacijami o dogodku. Datoteko lahko uvozite v vašo koledar aplikacijo.";
 $labels['invitationattendlinks'] = "V kolikor vaš email klient ne podpira iTip zahtevkov lahko uporabite naslednjo povezavo za sprejem ali zavrnitev vabila:\n\$url";
 $labels['eventupdatesubject'] = '"$title" je bil posodobljen';
 $labels['eventupdatesubjectempty'] = 'Dogodek, ki vas zadeva je bil posodobljen';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/sv_SE.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/sv_SE.inc Changed

@@ -75,6 +75,7 @@
 $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';
@@ -151,8 +152,6 @@
 $labels['availunknown'] = 'Okänd';
 $labels['availtentative'] = 'Preliminärt';
 $labels['availoutofoffice'] = 'Frånvarande';
-$labels['delegatedto'] = 'Delegerad till:';
-$labels['delegatedfrom'] = 'Delegerad från:';
 $labels['scheduletime'] = 'Hitta tillgänglighet';
 $labels['sendinvitations'] = 'Skicka inbjudningar';
 $labels['sendnotifications'] = 'Meddela deltagare om ändringar';
@@ -164,7 +163,6 @@
 $labels['suggestedslot'] = 'Föreslagen lucka';
 $labels['noslotfound'] = 'Det gick inte att hitta en ledig tidslucka';
 $labels['invitationsubject'] = 'Du har blivit inbjuden till "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nNär: \$date\n\nInbjudna: \$attendees\n\nHärmed bifogas en iCalendar-fil med alla detaljer om händelsen som du kan importera till din kalenderapplikation.";
 $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';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/th_TH.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/th_TH.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/uk_UA.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/uk_UA.inc Changed

@@ -75,6 +75,7 @@
 $labels['status'] = 'Статус';
 $labels['status-confirmed'] = 'Підтверджений';
 $labels['status-cancelled'] = 'Відмінений';
+$labels['status-tentative'] = 'Невизначений';
 $labels['priority'] = 'Пріоритет';
 $labels['sensitivity'] = 'Конфіденційність';
 $labels['public'] = 'публічна';
@@ -147,8 +148,6 @@
 $labels['availunknown'] = 'Невідомо';
 $labels['availtentative'] = 'Невизначений';
 $labels['availoutofoffice'] = 'Поза офісом';
-$labels['delegatedto'] = 'Доручено:';
-$labels['delegatedfrom'] = 'Доручено від:';
 $labels['scheduletime'] = 'Знайти доступних';
 $labels['sendinvitations'] = 'Запросити';
 $labels['sendnotifications'] = 'Повідомити учасників про зміни';
@@ -159,7 +158,6 @@
 $labels['suggestedslot'] = 'Пропонований час';
 $labels['noslotfound'] = 'Неможливо знайти вільний час';
 $labels['invitationsubject'] = 'Ви запрошені на ';
-$labels['invitationmailbody'] = "*\$title*\n\nКоли: \$date\n\nЗапрошені: \$attendees\n\nУ вкладенні Ви знайдете файл iCalendar з усіма деталями події, який Ви можете імпортувати у Вашу програму-щоденник.";
 $labels['invitationattendlinks'] = "У разі, якщо Ваш поштовий клієнт не підтримує запити iTip, Ви можете використати дане нижче посилання, щоб прийняти або відхилити це запрошення:\n\$url";
 $labels['eventupdatesubject'] = '"$title" була оновлена';
 $labels['eventupdatesubjectempty'] = 'Подія, яка стосується Вас, була оновленна ';

iRony-0.4.0.tar.gz/lib/plugins/calendar/localization/zh_CN.inc -> iRony-0.4.1.tar.gz/lib/plugins/calendar/localization/zh_CN.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/print.js -> iRony-0.4.1.tar.gz/lib/plugins/calendar/print.js Changed

@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2018, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -34,11 +34,11 @@
   {
     return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
   };
-  
+
   var rc_loading;
   var showdesc = true;
   var settings = $.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings);
-  
+
   // create list of event sources AKA calendars
   var src, event_sources = [];
   var add_url = (rcmail.env.search ? '&q='+escape(rcmail.env.search) : '');
@@ -52,9 +52,11 @@
       id: id
     }, rcmail.env.calendars[id]);
 
+    source.color = '#' + source.color.replace(/^#/, '');
+
     event_sources.push(source);
   }
-  
+
   var viewdate = new Date();
   if (rcmail.env.date)
     viewdate.setTime(rcmail.env.date * 1000);
@@ -166,11 +168,38 @@
          }, 20);
     }
   });
-  
+
   // activate settings form
   $('#propdescription').change(function(){
     showdesc = this.checked;
     fc.fullCalendar('render');
   });
 
+  var selector = $('#calendar').data('view-selector');
+  if (selector) {
+    selector = $('#' + selector);
+
+    $('.fc-header-right > span').each(function() {
+      var cl = 'btn btn-secondary', btn = $(this);
+
+      if (btn.is('.fc-state-active')) {
+        cl += ' active';
+      }
+
+      $('<button>').attr({'class': cl})
+        .text(btn.text())
+        .appendTo(selector)
+          .on('click', function() {
+            selector.children('.active').removeClass('active');
+            $(this).addClass('active');
+            btn.click();
+        });
+    });
+  };
+
+  // Update layout after initialization
+  // In devel mode we have to wait until all styles are applied by less
+  if (rcmail.env.devel_mode && window.less) {
+    less.pageLoadFinished.then(function() { $(window).resize(); });
+  }
 });

iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/elastic/templates/calendar.html Added

@@ -0,0 +1,384 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="calendar.calendar" /></h1>
+
+
+<div class="sidebar 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>
+		<roundcube:button name="calendaractionsmenu" id="calendaroptionsmenulink" type="link"
+			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"
+		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" />
+	</div>
+	<h2 id="aria-label-minical" class="voice"><roundcube:label name="calendar.arialabelminical" /></h2>
+	<div id="datepicker" class="calendar-datepicker" role="presentation"></div>
+</div>
+
+
+<div class="content 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 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">
+			<roundcube:button command="addevent" type="link"
+				class="button create disabled" classAct="button create"
+				label="create" title="calendar.new_event" innerClass="inner" />
+			<roundcube:button command="print" type="link" data-hidden="small"
+				class="button print disabled" classAct="button print"
+				label="calendar.print" title="calendar.printtitle" innerClass="inner" />
+			<span class="spacer"></span>
+			<roundcube:button command="events-import" type="link"
+				class="button import disabled" classAct="button import"
+				label="import" title="calendar.importevents" innerClass="inner" />
+			<roundcube:button command="export" type="link"
+				class="button export disabled" classAct="button export"
+				label="calendar.export" title="calendar.exporttitle" innerClass="inner" />
+			<roundcube:container name="toolbar" id="calendartoolbar" />
+		</div>
+	</div>
+	<roundcube:object name="plugin.searchform" id="searchform" wrapper="searchbar toolbar"
+		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">
+		<a href="#" class="button prev" onclick="$('.fc-button-prev').click()"><span class="inner"><roundcube:label name="previous" /></span></a>
+		<a href="#" class="button today" onclick="$('.fc-button-today').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>
+		<a href="#" class="button next" onclick="$('.fc-button-next').click()"><span class="inner"><roundcube:label name="next" /></span></a>
+	</div>
+</div>
+
+<div id="timezone-display" class="hidden"><roundcube:var name="env:timezone" /></div>
+
+<div id="eventshow" class="popupmenu formcontent propform text-only">
+	<h1 id="event-title" class="event-title form-group">Event Title</h1>
+	<div id="event-status-badge"><span></span></div>
+	<div class="event-location form-group" id="event-location">Location</div>
+	<div class="event-date form-group" id="event-date">From-To</div>
+	<div class="event-description form-group" id="event-description">
+		<div class="event-text"></div>
+	</div>
+	<div class="event-attendees form-group" id="event-attendees">
+		<div class="event-text"></div>
+	</div>
+	<div id="event-url" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.url" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-repeat" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.repeat" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-alarm" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.alarms" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-partstat" class="form-group row event-partstat">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.mystatus" /></label>
+		<span class="col-sm-8 form-control-plaintext">
+			<span class="event-text rsvp-status"></span>
+			<a class="changersvp button edit" href="#" title="<roundcube:label name='calendar.changepartstat' />"><span class="inner"><roundcube:label name='calendar.changepartstat' /></span></a>
+		</span>
+	</div>
+	<div id="event-calendar" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.calendar" /></label>
+		<span class="col-sm-8 form-control-plaintext event-text">Default</span>
+	</div>
+	<div id="event-category" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.category" /></label>
+		<span class="col-sm-8 form-control-plaintext event-text"></span>
+	</div>
+	<div id="event-status" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.status" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-free-busy" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.freebusy" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-priority" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.priority" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-rsvp-comment" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.rsvpcomment" /></label>
+		<span class="event-text col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-links" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.links" /></label>
+		<span class="event-text col-sm-8"></span>
+	</div>
+	<div id="event-attachments" class="form-group row">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="attachments" /></label>
+		<span class="event-text col-sm-8"></span>
+	</div>
+	<div id="event-created" class="form-group row faded">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.created" /></label>
+		<span class="event-text event-created col-sm-8 form-control-plaintext"></span>
+	</div>
+	<div id="event-changed" class="form-group row faded">
+		<label class="col-sm-4 col-form-label"><roundcube:label name="calendar.changed" /></label>
+		<span class="event-text event-changed col-sm-8 form-control-plaintext"></span>
+	</div>
+	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="calendar-invitebox invitebox boxinformation" style="display:none" />
+</div>
+
+<roundcube:include file="/templates/eventedit.html" />
+
+<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">
+		<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.edit" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="calendar-delete" label="delete" class="delete disabled" classAct="delete active" />
+		<roundcube:if condition="env:calendar_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="calendar-remove" label="calendar.removelist" class="remove disabled" classAct="remove active" />
+		<roundcube:endif />
+		<roundcube:button type="link-menuitem" command="calendar-showurl" label="calendar.showurl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:if condition="!empty(env:calendar_settings['freebusy_url'])" />
+			<roundcube:button type="link-menuitem" command="calendar-showfburl" label="calendar.showfburl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:endif />
+		<roundcube:if condition="env:calendar_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
+		<roundcube:endif />
+	</ul>
+</div>
+
+<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">
+		<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" />
+		<roundcube:if condition="env:calendar_driver == 'kolab' && config:kolab_bonnie_api" />
+			<roundcube:button type="link-menuitem" command="event-history" label="calendar.eventhistory" class="history disabled" classAct="history active" />
+		<roundcube:endif />
+	</ul>
+</div>
+
+<div id="eventresourcesdialog" class="popupmenu">
+	<h3 class="voice" id="aria-label-resourceselection"><roundcube:label name="calendar.arialabelresourceselection" /></h3>
+	<div class="resource-selection selection-list" role="navigation" aria-labelledby="aria-label-resourceselection">
+		<div class="header">
+			<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"
+			label="resourcesearchform" label-domain="calendar" />
+		<div class="scroller">
+			<roundcube:object name="plugin.resources_list" id="resources-list" class="listing treelist" />
+		</div>
+	</div>
+	<div class="resource-content selection-content">
+		<div class="header" data-hidden="normal,big">
+			<a class="button icon back" href="#back" onclick="$('#eventresourcesdialog .resource-content').hide(); $('#eventresourcesdialog .resource-selection').show()">
+				<span class="inner"><roundcube:label name="back" /></span>
+			</a>
+			<span class="header-title"><roundcube:label name="calendar.resourceprops" /></span>
+		</div>
+		<ul class="nav nav-tabs" role="tablist">
+			<li class="nav-item">
+				<a class="nav-link active" href="#resource-availability" data-toggle="tab" role="tab">
+					<roundcube:label name="calendar.resourceavailability" />
+				</a>
+			</li>
+			<li class="nav-item">
+				<a class="nav-link" href="#resource-info" data-toggle="tab" role="tab">
+					<roundcube:label name="calendar.resourcedetails" />
+				</a>
+			</li>
+		</ul>
+		<div class="tab-content">
+			<div id="resource-availability" class="tab-pane active" role="tabpanel" aria-labelledby="aria-label-resourceavailability">
+				<h3 class="voice" id="aria-label-resourceavailability"><roundcube:label name="calendar.resourceavailability" /></h3>
+				<roundcube:object name="plugin.resource_calendar" id="resource-freebusy-calendar" class="raw-tables" />
+				<div class="slot-nav">
+					<roundcube:button name="resource-cal-prev" id="resource-calendar-prev" type="link"
+						class="icon prevpage" title="calendar.prevslot" label="calendar.prevweek" />
+					<roundcube:button name="resource-cal-next" id="resource-calendar-next" type="link"
+						class="icon nextpage" title="calendar.nextslot" label="calendar.nextweek" />
+				</div>
+			</div>
+			<div id="resource-info" class="tab-pane" role="tabpanel" aria-labelledby="aria-label-resourcedetails">
+				<h3 class="voice" id="aria-label-resourcedetails"><roundcube:label name="calendar.resourcedetails" /></h3>
+				<roundcube:object name="plugin.resource_info" id="resource-details" class="propform text-only"
+					aria-live="polite" aria-relevant="text" aria-atomic="true" />
+			</div>
+		</div>
+	</div>
+</div>
+
+<div id="eventfreebusy" class="popupmenu calendar-scheduler formcontent">
+	<roundcube:object name="plugin.attendees_freebusy_table" id="attendees-freebusy-table"
+		class="schedule-table" data-h-margin="-1" data-v-margin="1" />
+	<div class="nav">
+		<div class="schedule-buttons">
+			<button id="schedule-find-prev" class="btn btn-secondary prev-slot"><roundcube:label name="calendar.prevslot" /></button>
+			<button id="schedule-find-next" class="btn btn-secondary next-slot"><roundcube:label name="calendar.nextslot" /></button>
+		</div>
+		<div class="schedule-options">
+			<label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" class="pretty-checkbox" /><roundcube:label name="calendar.onlyworkinghours" /></label>
+		</div>
+		<div class="schedule-nav">
+			<button id="schedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button>
+			<button id="schedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
+		</div>
+	</div>
+	<div class="schedule-range">
+		<div class="form-group row">
+			<label for="schedule-startdate" class="col-form-label col-sm-2"><roundcube:label name="calendar.start" /></label>
+			<span class="col-sm-10 datetime">
+				<input type="text" name="startdate" size="11" id="schedule-startdate" class="form-control" disabled="true" /> &nbsp;
+				<input type="text" name="starttime" size="6" id="schedule-starttime" class="form-control" disabled="true" />
+			</span>
+		</div>
+		<div class="form-group row">
+			<label for="schedule-enddate" class="col-form-label col-sm-2"><roundcube:label name="calendar.end" /></label>
+			<span class="col-sm-10 datetime">
+				<input type="text" name="enddate" size="11" id="schedule-enddate" class="form-control" disabled="true" /> &nbsp;
+				<input type="text" name="endtime" size="6" id="schedule-endtime" class="form-control" disabled="true" />
+			</span>
+		</div>
+		<div class="schedule-legend form-group row">
+			<label class="col-form-label col-sm-2"><roundcube:label name="calendar.legend" /></label>
+			<span class="col-sm-10 form-control-plaintext">
+				<roundcube:include file="/templates/freebusylegend.html" />
+				<span class="attendee organizer"><roundcube:label name="calendar.roleorganizer" /></span>
+				<span class="attendee req-participant"><roundcube:label name="calendar.rolerequired" /></span>
+				<span class="attendee opt-participant"><roundcube:label name="calendar.roleoptional" /></span>
+				<span class="attendee non-participant"><roundcube:label name="calendar.rolenonparticipant" /></span>
+				<span class="attendee chair"><roundcube:label name="calendar.rolechair" /></span>
+			</span>
+		</div>
+	</div>
+</div>
+
+<div id="eventsimport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.events_import_form" id="events-import-form" />
+</div>
+
+<div id="eventsexport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.events_export_form" id="events-export-form" />
+</div>
+
+<div id="calendarurlbox" class="popupmenu">
+	<p><roundcube:label name="calendar.showurldescription" /></p>
+	<textarea id="calfeedurl" rows="2" readonly="readonly"></textarea>
+	<div id="calendarcaldavurl" style="display:none; margin-top:1rem">
+		<p><roundcube:label name="calendar.caldavurldescription" html="yes" /></p>
+		<textarea id="caldavurl" rows="2" readonly="readonly"></textarea>
+	</div>
+</div>
+
+<div id="fburlbox" class="popupmenu">
+	<p><roundcube:label name="calendar.fburldescription" /></p>
+	<textarea id="fburl" rows="2" readonly="readonly"></textarea>
+</div>
+
+<roundcube:if condition="config:kolab_bonnie_api" />
+
+<div id="eventhistory" class="popupmenu" aria-hidden="true">
+	<roundcube:object name="plugin.object_changelog_table" id="event-changelog-table" class="changelog-table" />
+	<div class="compare-button"><input type="button" class="button" value="<roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="eventdiff" class="popupmenu formcontent text-only">
+	<h1 class="event-title">Event Title</h1>
+	<h1 class="event-title-new event-text-new"></h1>
+	<div class="form-group row event-date"></div>
+	<div class="form-group row event-location">
+		<h5 class="label"><roundcube:label name="calendar.location" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-description">
+		<h5 class="label"><roundcube:label name="calendar.description" /></h5>
+		<div class="event-text-diff" style="white-space:pre-wrap"></div>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-url">
+		<h5 class="label"><roundcube:label name="calendar.url" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-recurrence">
+		<h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="form-group row event-alarms">
+		<h5 class="label"><roundcube:label name="calendar.alarms" /><span class="index"></span></h5>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+	<div class="event-line event-start">
+		<label><roundcube:label name="calendar.start" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-end">
+		<label><roundcube:label name="calendar.end" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-attendees">
+		<label><roundcube:label name="calendar.tabattendees" /><span class="index"></span></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-calendar">
+		<label><roundcube:label name="calendar.calendar" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-categories">
+		<label><roundcube:label name="calendar.category" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-status">
+		<label><roundcube:label name="calendar.status" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-free_busy">
+		<label><roundcube:label name="calendar.freebusy" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-priority">
+		<label><roundcube:label name="calendar.priority" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="event-line event-sensitivity">
+		<label><roundcube:label name="calendar.sensitivity" /></label>
+		<span class="event-text-old"></span> &#8674;
+		<span class="event-text-new"></span>
+	</div>
+	<div class="form-group row event-attachments">
+		<label><roundcube:label name="attachments" /><span class="index"></span></label>
+		<div class="event-text-old"></div>
+		<div class="event-text-new"></div>
+	</div>
+</div>
+
+<roundcube:endif />
+
+<roundcube:object name="plugin.calendar_css" folder-class="div.$class a.calname:before" folder-fallback-color="#161b1d" />
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/elastic/templates/eventedit.html Added

@@ -0,0 +1,158 @@
+<div id="eventedit" class="<roundcube:exp expression="env:framed ? '' : 'popupmenu '">formcontent" aria-hidden="true" data-notabs="true">
+	<form class="tabbed" action="#" method="post" enctype="multipart/form-data">
+		
+		<fieldset id="event-panel-summary">
+			<legend><roundcube:label name="calendar.tabsummary" /></legend>
+			<div class="form-group">
+				<label for="edit-title"><roundcube:label name="calendar.title" /></label>
+				<input type="text" class="form-control" name="title" id="edit-title" size="40" required="true" />
+			</div>
+			<div class="form-group">
+				<label for="edit-location"><roundcube:label name="calendar.location" /></label>
+				<input type="text" class="form-control" name="location" id="edit-location" size="40" />
+			</div>
+			<div class="form-group">
+				<label for="edit-description"><roundcube:label name="calendar.description" /></label>
+				<textarea name="description" id="edit-description" class="form-control" rows="5" cols="40"></textarea>
+			</div>
+			<div class="form-group row">
+				<label for="edit-startdate" class="col-sm-2 col-form-label"><roundcube:label name="calendar.start" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="startdate" size="11" id="edit-startdate" class="form-control" required="true" /> &nbsp;
+					<input type="text" name="starttime" size="6" id="edit-starttime" class="form-control" aria-label="<roundcube:label name='calendar.starttime' />" />
+					<label><input type="checkbox" name="allday" id="edit-allday" value="1" class="pretty-checkbox" /><roundcube:label name="calendar.all-day" /></label>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-enddate" class="col-sm-2 col-form-label"><roundcube:label name="calendar.end" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="enddate" size="11" id="edit-enddate" class="form-control" required="true" /> &nbsp;
+					<input type="text" name="endtime" size="6" id="edit-endtime" class="form-control" aria-label="<roundcube:label name='calendar.endtime' />" />
+				</div>
+			</div>
+			<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">
+						<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>
+					</div>
+				</div>
+			</div>
+			<div class="form-group row" id="calendar-select">
+				<label for="edit-calendar" class="col-sm-2 col-form-label"><roundcube:label name="calendar.calendar" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.calendar_select" id="edit-calendar" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-categories" class="col-sm-2 col-form-label"><roundcube:label name="calendar.category" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.category_select" id="edit-categories" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-event-status" class="col-sm-2 col-form-label"><roundcube:label name="calendar.status" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.status_select" id="edit-event-status" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-free-busy" class="col-sm-2 col-form-label"><roundcube:label name="calendar.freebusy" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.freebusy_select" id="edit-free-busy" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-priority" class="col-sm-2 col-form-label"><roundcube:label name="calendar.priority" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.priority_select" id="edit-priority" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-sensitivity" class="col-sm-2 col-form-label"><roundcube:label name="calendar.sensitivity" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.sensitivity_select" id="edit-sensitivity" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="edit-url" class="col-sm-2 col-form-label"><roundcube:label name="calendar.url" /></label>
+				<div class="col-sm-10">
+					<input type="text" class="form-control" name="vurl" id="edit-url" size="40" />
+				</div>
+			</div>
+			<div class="form-group row" id="edit-event-links">
+				<label class="col-sm-2 col-form-label"><roundcube:label name="calendar.links" /></label>
+				<div class="col-sm-10">
+					<div class="event-text"></div>
+				</div>
+			</div>
+		</fieldset>
+		
+		<fieldset id="event-panel-recurrence">
+			<legend><roundcube:label name="calendar.tabrecurrence" /></legend>
+			<div class="form-group row border-after">
+				<roundcube:object name="plugin.recurrence_form" part="frequency" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-daily">
+				<roundcube:object name="plugin.recurrence_form" part="daily" class="form-group row" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-weekly">
+				<roundcube:object name="plugin.recurrence_form" part="weekly" class="form-group row" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-monthly">
+				<roundcube:object name="plugin.recurrence_form" part="monthly" class="form-group row" />
+			</div>
+			<div class="recurrence-form border-after" id="recurrence-form-yearly">
+				<roundcube:object name="plugin.recurrence_form" part="yearly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-until">
+				<roundcube:object name="plugin.recurrence_form" part="until" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-rdate">
+				<roundcube:object name="plugin.recurrence_form" part="rdate" class="form-group row" />
+			</div>
+		</fieldset>
+		
+		<fieldset id="event-panel-attendees" data-navlink-class="nav-icon attendees">
+			<legend><roundcube:label name="calendar.tabattendees" /></legend>
+			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="calendar.arialabeleventattendees" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="edit-attendees-table no-img table table-sm"
+				coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
+			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
+			<roundcube:include file="/templates/freebusylegend.html" />
+		</fieldset>
+		
+		<fieldset id="event-panel-resources" data-navlink-class="nav-icon resources">
+			<legend><roundcube:label name="calendar.tabresources" /></legend>
+			<h3 id="aria-label-resourcestable" class="voice"><roundcube:label name="calendar.arialabeleventresources" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-resources-table" class="edit-attendees-table no-img table table-sm"
+				coltitle="resource" aria-labelledby="aria-label-resourcestable" />
+			<roundcube:object name="plugin.resources_form" id="edit-resources-form" />
+			<roundcube:include file="/templates/freebusylegend.html" />
+		</fieldset>
+		
+		<fieldset id="event-panel-attachments" data-navlink-class="nav-icon attachments">
+			<legend><roundcube:label name="calendar.tabattachments" /></legend>
+			<div id="edit-attachments-droparea" class="file-upload">
+				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
+				<div id="edit-attachments-form" class="upload-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+					<roundcube:object name="plugin.attachments_form" mode="hint" />
+					<button class="btn btn-secondary attach" href="#" onclick="rcmail.upload_input('event-attachment-form'); return false"><roundcube:label name="addattachment" /></button>
+				</div>
+				<div id="edit-attachments">
+					<roundcube:object name="plugin.attachments_list" id="attachmentlist" class="attachmentslist" />
+				</div>
+			</div>
+			<roundcube:object name="plugin.filedroparea" id="event-panel-attachments" />
+		</fieldset>
+	</form>
+	<roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_recurring_warning" class="dialog-message edit-recurring-warning" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="event-attachment-form" mode="smart" />
+	<div id="edit-localchanges-warning" class="dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
+</div>

iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/elastic/templates/freebusylegend.html Added

iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/elastic/templates/itipattend.html Added

iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/elastic/templates/print.html Added

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/calendar.css -> iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/larry/calendar.css Changed

@@ -69,31 +69,18 @@
 #datepicker .ui-datepicker-activerange a {
 	color: #185d7a;
 	background: #d9f1fb;
-	background: -moz-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d9f1fb), color-stop(100%,#c5e3ee));
-	background: -o-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	background: -ms-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	background: linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d9f1fb', endColorstr='#c5e3ee', GradientType=0);
 }
 
 #datepicker .ui-datepicker-days-cell-over a.ui-state-default {
 	color: #fff;
 	border-color: #2fa0c0;
 	background: rgba(73,180,210,0.6);
-	text-shadow: 0px 1px 1px #666;
 	filter: none;
 }
 
 #datepicker .ui-datepicker-activerange a.ui-state-active {
 	color: #fff;
 	background: #00acd4;
-	background: -moz-linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00acd4), color-stop(100%,#008fc7));
-	background: -o-linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	background: -ms-linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	background: linear-gradient(top, #00acd4 0%, #008fc7 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00acd4', endColorstr='#008fc7', GradientType=0);
 }
 
 #datepicker td.ui-datepicker-week-col {
@@ -209,7 +196,7 @@
 	height: 22px;
 }
 
-#calendars .treelist li span.calname {
+#calendars .treelist li a.calname {
 	display: block;
 	padding: 0px 18px 2px 2px;
 	position: absolute;
@@ -234,18 +221,18 @@
 	background-image: none;
 }
 
-#calendars .treelist li div.virtual > span.calname {
+#calendars .treelist li div.virtual > a.calname {
 	color: #aaa;
 	top: 4px;
 	left: 20px;
 }
 
-#calendars .treelist li.x-birthdays span.calname,
-#calendars .treelist li.x-invitations span.calname {
+#calendars .treelist li.x-birthdays a.calname,
+#calendars .treelist li.x-invitations a.calname {
 	font-style: italic;
 }
 
-#calendars .treelist.flat li span.calname {
+#calendars .treelist.flat li a.calname {
 	left: 24px;
 	right: 42px;
 }
@@ -253,17 +240,14 @@
 #calendars .treelist li span.handle {
 	display: inline-block;
 	position: absolute;
-	top: 8px;
+	top: 7px;
 	right: 6px;
 	padding: 0;
-	width: 10px;
-	height: 10px;
-	border-radius: 7px;
+	width: 11px;
+	height: 11px;
+	border-radius: 8px;
 	font-size: 0.8em;
-	border: 1px solid rgba(0, 0, 0, 0.5);
-	-webkit-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
+	border: 1px solid rgba(0, 0, 0, 0.4);
 }
 
 #calendars .treelist div span.actions {
@@ -281,15 +265,9 @@
 #calendars .treelist div:hover span.actions {
 	top: 1px;
 	right: 21px;
-	border: 1px solid #c6c6c6;
+	border: 1px solid #ababab;
 	border-radius: 4px;
-	background: #f7f7f7;
-	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
-	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+	background: #f1f1f1;
 }
 
 #calendars .treelist li a.subscribed {
@@ -398,27 +376,27 @@
 	background-color: #c7e3ef;
 }
 
-#calendars .treelist li.selected > span.calname {
+#calendars .treelist li.selected > a.calname {
 	font-weight: bold;
 }
 
-#calendars .treelist div.readonly span.calname {
+#calendars .treelist div.readonly a.calname {
 	background-position: right -20px;
 }
 
-#calendars .treelist li.user > div > span.calname {
+#calendars .treelist li.user > div > a.calname {
 	background-position: right -38px;
 }
 /*
-#calendars .treelist div.user.readonly span.calname {
+#calendars .treelist div.user.readonly a.calname {
 	background-position: right -56px;
 }
 
-#calendars .treelist div.shared span.calname {
+#calendars .treelist div.shared a.calname {
 	background-position: right -74px;
 }
 
-#calendars .treelist div.shared.readonly span.calname {
+#calendars .treelist div.shared.readonly a.calname {
 	background-position: right -92px;
 }
 */
@@ -431,13 +409,6 @@
 	min-width: 1.3em;
 	padding: 2px 4px;
 	background: #005d76;
-	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
-	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: linear-gradient(to bottom, #005d76 0%, #004558 100%);
-	-webkit-box-shadow: inset 0 1px 1px 0 #002635;
-	box-shadow: inset 0 1px 1px 0 #002635;
 	border-radius: 10px;
 	color: #fff;
 	text-align: center;
@@ -462,6 +433,7 @@
 	background-color: #c7e3ef;
 }
 
+#fburl,
 #calfeedurl,
 #caldavurl {
 	width: 98%;
@@ -545,6 +517,10 @@
 	display: none;
 }
 
+#calendarform {
+	overflow: visible;
+}
+
 #user {
 	position: absolute;
 	top: 10px;
@@ -627,13 +603,12 @@
 	color: #333;
 	font-weight: bold;
 	padding: 4px 4px 3px 30px;
-	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	line-height: 20px;
 }
 
-#edit-attachments ul li a.file {
+#edit-attachments ul li a.filename {
 	padding: 0;
 }
 
@@ -735,11 +710,6 @@
 	font-size: 11px;
 	font-weight: bold;
 	background: #d6eaf3;
-	background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
-	background: -webkit-gradient(linear, left top, right top, color-stop(0,#e3f2f6), color-stop(8%,#d6eaf3), color-stop(100%,#d6eaf3));
-	background: -o-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
-	background: -ms-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px ,#d6eaf3 100%);
-	background: linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
 	border: 0;
 	border-bottom: 1px solid #ccc;
 	height: 18px;
@@ -772,52 +742,6 @@
 	margin: 0 -0.2em;
 }
 
-#event-status-badge {
-	width: 100px;
-	height: 100px;
-	position: absolute;
-	top: 0;
-	right: 0;
-	overflow: hidden;
-}
-
-#event-status-badge span {
-	display: none;
-	text-transform: uppercase;
-	width: 150px;
-	height: 20px;
-	line-height: 20px;
-	position: absolute;
-	left: -20px;
-	top: 35px;
-	padding-left: 10px;
-	text-align: center;
-	font-weight: bold;
-	font-size: 12px;
-	color: #fff;
-	box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc;
-	-webkit-transform: rotate(45deg);
-	-moz-transform: rotate(45deg);
-	-ms-transform: rotate(45deg);
-	-o-transform: rotate(45deg);
-	transform: rotate(45deg);
-}
-
-.eventdialog.status-cancelled #event-status-badge span {
-	background: url(images/badge.png) 26px -24px no-repeat #cc0000;
-	display: block;
-}
-
-.eventdialog.sensitivity-private #event-status-badge span {
-	background: url(images/badge.png) 40px -52px no-repeat #0066ff;
-	display: block;
-}
-
-.eventdialog.sensitivity-confidential #event-status-badge span {
-	background: url(images/badge.png) 20px 2px no-repeat #cc0000;
-	display: block;
-}
-
 .calendarmain .status-cancelled #event-title,
 .calendarmain .sensitivity-private #event-title,
 .calendarmain .sensitivity-confidential #event-title {
@@ -825,8 +749,10 @@
 }
 
 .calendarmain .eventdialog div.event-line {
-	margin-top: 0.1em;
-	margin-bottom: 0.3em;
+	margin-bottom: 0.4em;
+	white-space: nowrap;
+	overflow-x: hidden;
+	text-overflow: ellipsis;
 }
 
 .calendarmain .eventdialog div.event-line a.iconbutton {
@@ -838,6 +764,15 @@
 	margin-left: 2em;
 }
 
+#event-description .event-text,
+#event-attendees .event-text {
+	padding-top: 0.4em;
+}
+
+.eventdialog .spacer {
+	font-size: 4px;
+}
+
 .eventdialog .event-text-old,
 .eventdialog .event-text-new,
 .eventdialog .event-text-diff {
@@ -952,6 +887,18 @@
 	visibility: visible;
 }
 
+body.eventdialog {
+	margin: 0;
+	overflow-y: auto;
+}
+
+body.eventdialog #eventedit {
+	display: block;
+	top: 0;
+	padding: 1em;
+	border-bottom: 0;
+}
+
 #eventedit {
 	position: relative;
 	top: -1.5em;
@@ -984,6 +931,10 @@
 	border-bottom: 2px solid #fafafa;
 }
 
+div.event-section > .col-form-label {
+	float: left;
+}
+
 .calendarmain .eventdialog label,
 #eventedit label,
 .form-section label {
@@ -992,16 +943,6 @@
 	padding-right: 0.5em;
 }
 
-.calendarmain .eventdialog #event-url .event-text {
-	overflow: hidden;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-#event-links .attachmentslist {
-	display: inline-block;
-}
-
 #event-links label,
 #edit-event-links label {
 	float: left;
@@ -1054,7 +995,7 @@
 	padding: 0 0.5em 0.5em 0.5em;
 }
 
-.event-dialog-message,
+.dialog-message,
 .event-update-confirm .message {
 	margin-top: 0.5em;
 	padding: 0.8em;
@@ -1062,7 +1003,7 @@
 	background-color: #fef893;
 }
 
-.event-dialog-message .message,
+.dialog-message .message,
 .event-update-confirm .message {
 	margin-bottom: 0.5em;
 }
@@ -1075,13 +1016,13 @@
 	padding-left: 30px;
 }
 
-.event-dialog-message span.ui-icon,
+.dialog-message span.ui-icon,
 .event-update-confirm span.ui-icon {
 	float: left;
 	margin: 0 7px 20px 0;
 }
 
-.event-dialog-message label,
+.dialog-message label,
 .event-update-confirm label {
 	min-width: 3em;
 	padding-right: 1em;
@@ -1450,6 +1391,7 @@
 
 #schedule-freebusy-times tr.times td {
 	cursor: pointer;
+	white-space: nowrap;
 }
 
 #schedule-freebusy-times #fbrowall td {
@@ -1568,12 +1510,7 @@
 	border-top-color: #ddd;
 	border-bottom-color: #bbb;
 	border-radius: 0 0 4px 4px;
-	background: #ebebeb;
-	background: -moz-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ebebeb), color-stop(100%,#c6c6c6));
-	background: -o-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-	background: -ms-linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
-	background: linear-gradient(top, #ebebeb 0%, #c6c6c6 100%);
+	background: #eaeaea;
 }
 
 #agendaoptions label {
@@ -1581,20 +1518,6 @@
 	padding-right: 0.5em;
 }
 
-#calendar-kolabform {
-	position: relative;
-	margin: 0 -8px;
-	min-width: 660px;
-	min-height: 400px;
-}
-
-#calendar-kolabform table td.title {
-	font-weight: bold;
-	white-space: nowrap;
-	color: #666;
-	padding-right: 10px;
-}
-
 #resource-selection {
 	position: absolute;
 	top: 0;
@@ -1717,10 +1640,6 @@
 	overflow: hidden;
 	border: 0;
 	border-radius: 4px;
-	box-shadow: 0 0 2px #999;
-	-o-box-shadow: 0 0 2px #999;
-	-webkit-box-shadow: 0 0 2px #999;
-	-moz-box-shadow: 0 0 2px #999;
 }
 
 .calendarmain .fc-content {
@@ -1752,39 +1671,23 @@
 .calendarmain .fc-button.fc-state-default,
 .calendarmain .fc-button.fc-state-hover {
 	background-color: #f5f5f5;
-	background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
-	background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
-	background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
-	background-position: 0 0;
 }
 
 .calendarmain #calendar .fc-button,
 .calendarmain #calendar .fc-button.fc-state-default,
 .calendarmain #calendar .fc-button.fc-state-hover {
-	margin: 0 0 0 0;
-	height: 20px;
-	line-height: 20px;
-	color: #505050;
-	text-shadow: 0px 1px 1px #fff;
-	border: 1px solid #e6e6e6;
-	background: #d8d8d8;
-	background: -moz-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#d8d8d8), color-stop(100%,#bababa));
-	background: -o-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	background: -ms-linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	background: linear-gradient(top, #d8d8d8 0%, #bababa 100%);
-	box-shadow: 0 1px 1px 0 #999;
-	-o-box-shadow: 0 1px 1px 0 #999;
-	-webkit-box-shadow: 0 1px 1px 0 #999;
-	-moz-box-shadow: 0 1px 1px 0 #999;
+	margin: -2px 0 0 0;
+	height: 24px;
+	line-height: 24px;
+	color: #333;
+	border: 1px solid #ababab;
+	background: #f1f1f1;
 	text-decoration: none;
+	text-shadow: none;
 }
 
 .calendarmain #calendar .fc-button.fc-state-disabled {
-	color: #999;
-	background: #d8d8d8;
+	color: #666;
 }
 
 .calendarmain .fc-button.fc-state-active,
@@ -1792,12 +1695,8 @@
 .calendarmain #calendar .fc-button.fc-state-active,
 .calendarmain #calendar .fc-button.fc-state-down {
 	color: #333;
-	background: #bababa;
-	background: -moz-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#bababa), color-stop(100%,#d8d8d8));
-	background: -o-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
-	background: -ms-linear-gradient(top, #bababa 0%, #d8d8d8 100%);
-	background: linear-gradient(top, #bababa 0%, #d8d8d8 100%);
+	background: #f1f1f1;
+	box-shadow: none;
 }
 
 .calendarmain #calendar .fc-header .fc-button {
@@ -2003,6 +1902,12 @@
 	font-weight: bold;
 }
 
+.fc-needs-action,
+.fc-declined,
+.cal-event-status-cancelled {
+	opacity: 0.6;
+}
+
 .cal-event-status-cancelled .fc-event-title {
 	text-decoration: line-through;
 }
@@ -2054,6 +1959,15 @@
 	background-color: rgba(233,198,14, 0.12);
 }
 
+.fc-widget-header,
+.fc-widget-content {
+	border-color: #bbd3da !important;
+}
+
+.fc-widget-header .fc-agenda-divider-inner {
+	background: #cad2d9 !important;
+}
+
 .fc-widget-header {
 	background-color: #d6eaf3;
 	color: #004458;
@@ -2098,15 +2012,15 @@
 }
 
 .calendarmain .fc-view-table tr.fc-event td {
-	border-color: #ddd;
-	padding: 4px 7px;
+	border-color: #bbd3da;
+	padding: 6px 8px;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
 
 .calendarmain .fc-view-table tr.fc-event td.fc-event-handle {
-	padding: 5px 0 2px 7px;
+	padding: 6px 0 2px 7px;
 	width: 12px;
 }
 
@@ -2129,9 +2043,6 @@
 	font-size: 10px;
 	border-radius: 8px;
 	border: 1px solid rgba(0, 0, 0, 0.4);
-	-webkit-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	-moz-box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
-	box-shadow: inset 0px 0 1px 1px rgba(0, 0, 0, 0.3);
 }
 
 .calendarmain .fc-view-table col.fc-event-location {
@@ -2157,6 +2068,7 @@
 .fc-listappend .formlinks a {
 	font-size: 12px;
 	padding: 0 0.3em;
+	max-width: initial;
 }
 
 .fc-event-temp {
@@ -2290,6 +2202,7 @@
 	background-position: 2px -180px;
 }
 
+#event-partstat .changersvp.unknown,
 #event-partstat .changersvp.needs-action,
 div.calendar-invitebox .rsvp-status.needs-action {
 	background-position: 2px 0;

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/images/calendars.png -> iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/larry/images/calendars.png Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/images/sendinvitation.png -> iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/larry/images/sendinvitation.png Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/images/toolbar.png -> iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/larry/images/toolbar.png Changed

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/templates/calendar.html -> iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/larry/templates/calendar.html Changed

@@ -35,7 +35,7 @@
 					<label for="calendarlistsearch" class="voice"><roundcube:label name="calendar.searchterms" /></label>
 					<input type="text" name="q" id="calendarlistsearch" placeholder="<roundcube:label name='calendar.findcalendars' />" />
 					<a class="iconbutton searchicon"></a>
-					<roundcube:button command="reset-listsearch" id="calendarlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+					<roundcube:button type="link" command="reset-listsearch" id="calendarlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 				</div>
 			</div>
 			<div class="scroller withfooter">
@@ -52,12 +52,12 @@
 		<label for="quicksearchbox" class="voice"><roundcube:label name="calendar.arialabelquicksearchbox" /></label>
 		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
 		<a id="searchmenulink" class="iconbutton searchoptions" tabindex="-1"> </a>
-		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+		<roundcube:button type="link" command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 	</div>
 
 	<h2 id="aria-label-calendarview" class="voice"><roundcube:label name="calendar.arialabelcalendarview" /></h2>
 	<div id="calendar" role="main" aria-labelledby="aria-label-calendarview">
-		<roundcube:object name="plugin.angenda_options" class="boxfooter" id="agendaoptions" />
+		<roundcube:object name="plugin.agenda_options" class="boxfooter" id="agendaoptions" />
 	</div>
 </div>
 
@@ -68,14 +68,17 @@
 <div id="calendaroptionsmenu" class="popupmenu" aria-hidden="true">
 	<h3 id="aria-label-calendaroptions" class="voice"><roundcube:label name="calendar.calendaractions" /></h3>
 	<ul id="calendaroptionsmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-calendaroptions">
-		<li role="menuitem"><roundcube:button command="calendar-edit" label="calendar.edit" classAct="active" /></li>
-		<li role="menuitem"><roundcube:button command="calendar-delete" label="delete" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="calendar-edit" label="calendar.edit" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="calendar-delete" label="delete" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
-		<li role="menuitem"><roundcube:button command="calendar-remove" label="calendar.removelist" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="calendar-remove" label="calendar.removelist" classAct="active" /></li>
+		<roundcube:endif />
+		<li role="menuitem"><roundcube:button type="link" command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
+		<roundcube:if condition="!empty(env:calendar_settings['freebusy_url'])" />
+		<li role="menuitem"><roundcube:button type="link" command="calendar-showfburl" label="calendar.showfburl" classAct="active" /></li>
 		<roundcube:endif />
-		<li role="menuitem"><roundcube:button command="calendar-showurl" label="calendar.showurl" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab'" />
-		<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
 		<roundcube:endif />
 	</ul>
 </div>
@@ -86,24 +89,23 @@
 	<div class="event-section" id="event-location">Location</div>
 	<div class="event-section" id="event-date">From-To</div>
 	<div class="event-section" id="event-description">
-		<h5 class="label"><roundcube:label name="calendar.description" /></h5>
 		<div class="event-text"></div>
 	</div>
-	<div class="event-section" id="event-url">
-		<h5 class="label"><roundcube:label name="calendar.url" /></h5>
+	<div class="event-section event-attendees" id="event-attendees">
 		<div class="event-text"></div>
 	</div>
-	<div class="event-section" id="event-repeat">
-		<h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
-		<div class="event-text"></div>
+	<div class="spacer">&nbsp;</div>
+	<div class="event-line" id="event-url">
+		<label><roundcube:label name="calendar.url" /></label>
+		<span class="event-text"></span>
 	</div>
-	<div class="event-section" id="event-alarm">
-		<h5 class="label"><roundcube:label name="calendar.alarms" /></h5>
-		<div class="event-text"></div>
+	<div class="event-line" id="event-repeat">
+		<label><roundcube:label name="calendar.repeat" /></label>
+		<span class="event-text"></span>
 	</div>
-	<div class="event-section event-attendees" id="event-attendees">
-		<h5 class="label"><roundcube:label name="calendar.tabattendees" /></h5>
-		<div class="event-text"></div>
+	<div class="event-line" id="event-alarm">
+		<label><roundcube:label name="calendar.alarms" /></label>
+		<span class="event-text"></span>
 	</div>
 	<div class="event-line" id="event-partstat">
 		<label><roundcube:label name="calendar.mystatus" /></label>
@@ -132,19 +134,12 @@
 		<label><roundcube:label name="calendar.priority" /></label>
 		<span class="event-text"></span>
 	</div>
+	
 	<div class="event-line" id="event-created-changed">
 		<label><roundcube:label name="calendar.created" /></label>
 		<span class="event-text event-created"></span>
@@ -155,18 +150,25 @@
 		<label><roundcube:label name="calendar.rsvpcomment" /></label>
 		<span class="event-text"></span>
 	</div>
+	<div class="event-section" id="event-links">
+		<label><roundcube:label name="calendar.links" /></label>
+		<span class="event-text"></span>
+	</div>
+	<div class="event-section" id="event-attachments">
+		<div class="event-text"></div>
+	</div>
 
-	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="event-dialog-message" style="display:none" />
+	<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="dialog-message" style="display:none" />
 </div>
 
 <div id="eventoptionsmenu" class="popupmenu" aria-hidden="true">
 	<h3 id="aria-label-eventoptions" class="voice"><roundcube:label name="calendar.eventoptions" /></h3>
 	<ul id="eventoptionsmenu-menu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-eventoptions">
-		<li role="menuitem"><roundcube:button command="event-download" label="download" classAct="active" /></li>
-		<li role="menuitem"><roundcube:button command="event-sendbymail" label="send" classAct="active" /></li>
-		<li role="menuitem"><roundcube:button command="event-copy" label="copy" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-download" label="download" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-sendbymail" label="send" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-copy" label="copy" classAct="active" /></li>
 		<roundcube:if condition="env:calendar_driver == 'kolab' && config:kolab_bonnie_api" />
-		<li role="menuitem"><roundcube:button command="event-history" type="link" label="calendar.eventhistory" classAct="active" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="event-history" label="calendar.eventhistory" classAct="active" /></li>
 		<roundcube:endif />
 	</ul>
 </div>
@@ -265,7 +267,7 @@
 					<label for="resourcesearchbox" class="voice"><roundcube:label name="calendar.searchterms" /></label>
 					<roundcube:object name="plugin.resources_searchform" id="resourcesearchbox" />
 					<a id="resourcesearchmenulink" class="iconbutton searchoptions"> </a>
-					<roundcube:button command="reset-resource-search" id="resourcesearchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+					<roundcube:button type="link" command="reset-resource-search" id="resourcesearchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 				</div>
 			</div>
 			<div class="scroller">
@@ -299,7 +301,7 @@
 	<div class="schedule-options">
 		&nbsp;
 		<div class="schedule-buttons">
-			<button id="shedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button><button id="shedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
+			<button id="schedule-freebusy-prev" title="<roundcube:label name='previouspage' />">&#9668;</button><button id="schedule-freebusy-next" title="<roundcube:label name='nextpage' />">&#9658;</button>
 		</div>
 	</div>
 
@@ -317,8 +319,8 @@
 	</div>
 	<div style="float:left">
 		<div class="schedule-find-buttons">
-			<button id="shedule-find-prev">&#9668; <roundcube:label name="calendar.prevslot" /></button>
-			<button id="shedule-find-next"><roundcube:label name="calendar.nextslot" /> &#9658;</button>
+			<button id="schedule-find-prev">&#9668; <roundcube:label name="calendar.prevslot" /></button>
+			<button id="schedule-find-next"><roundcube:label name="calendar.nextslot" /> &#9658;</button>
 		</div>
 		<div class="schedule-options">
 			<label><input type="checkbox" id="schedule-freebusy-workinghours" value="1" /><roundcube:label name="calendar.onlyworkinghours" /></label>
@@ -362,6 +364,11 @@
 	</div>
 </div>
 
+<div id="fburlbox" class="uidialog">
+	<p><roundcube:label name="calendar.fburldescription" /></p>
+	<textarea id="fburl" rows="2" readonly="readonly"></textarea>
+</div>
+
 <roundcube:object name="plugin.calendar_css" />
 
 <script type="text/javascript">

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/templates/eventedit.html -> iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/larry/templates/eventedit.html Changed

@@ -1,4 +1,4 @@
-<div id="eventedit" class="uidialog uidialog-tabbed" aria-hidden="true">
+<div id="eventedit" class="<roundcube:exp expression="env:framed ? '' : 'uidialog '">uidialog-tabbed" aria-hidden="true">
 	<form id="eventtabs" action="#" method="post" enctype="multipart/form-data">
 		<ul>
 			<li><a href="#event-panel-summary"><roundcube:label name="calendar.tabsummary" /></a></li><li id="edit-tab-recurrence"><a href="#event-panel-recurrence"><roundcube:label name="calendar.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#event-panel-attendees"><roundcube:label name="calendar.tabattendees" /></a></li><li id="edit-tab-resources"><a href="#event-panel-resources"><roundcube:label name="calendar.tabresources" /></a></li><li id="edit-tab-attachments"><a href="#event-panel-attachments"><roundcube:label name="calendar.tabattachments" /></a></li>
@@ -119,15 +119,18 @@
 			<div id="edit-attachments">
 				<roundcube:object name="plugin.attachments_list" id="attachmentlist" class="attachmentslist" />
 			</div>
-			<div id="edit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+			<div id="edit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform" style="text-align:center">
 				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
-				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />
+				<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" mode="hint" />
+				<a class="button" tabindex="1" href="#" onclick="rcmail.upload_input('edit-attachment-form')"><roundcube:label name="addattachment" /></a>
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="event-panel-attachments" />
 		</div>
 	</form>
 
-	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="event-dialog-message" style="display:none" />
-	<roundcube:object name="plugin.edit_recurring_warning" class="event-dialog-message edit-recurring-warning" style="display:none" />
-	<div id="edit-localchanges-warning" class="event-dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
+	<roundcube:object name="plugin.edit_recurrence_sync" id="edit-recurrence-syncstart" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_recurring_warning" class="dialog-message edit-recurring-warning" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="edit-attachment-form" mode="smart" />
+	<div id="edit-localchanges-warning" class="dialog-message" style="display:none"><roundcube:label name="calendar.localchangeswarning" /></div>
 </div>
\ No newline at end of file

iRony-0.4.0.tar.gz/lib/plugins/calendar/skins/larry/templates/print.html -> iRony-0.4.1.tar.gz/lib/plugins/calendar/skins/larry/templates/print.html Changed

iRony-0.4.0.tar.gz/lib/plugins/html_converter/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/html_converter/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_2fa/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_2fa/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_2fa/config.inc.php.dist -> iRony-0.4.1.tar.gz/lib/plugins/kolab_2fa/config.inc.php.dist Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_2fa/kolab2fa.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_2fa/kolab2fa.js Changed

@@ -29,7 +29,11 @@
     var highsec_call_stack = [];
     var highsec_dialog;
     var factor_dialog;
-    
+
+    if (!rcmail.env.kolab_2fa_factors) {
+        rcmail.env.kolab_2fa_factors = {};
+    }
+
     /**
      * Equivalend of PHP time()
      */
@@ -47,10 +51,13 @@
         var rows = 0;
         $.each(rcmail.env.kolab_2fa_factors, function(id, props) {
             if (props.active) {
-                var tr = $('<tr>').addClass(props.method).appendTo(table);
+                var tr = $('<tr>').addClass(props.method).appendTo(table),
+                    button = $('<a class="button icon delete">').attr({href: '#', rel: id})
+                        .append($('<span class="inner">').text(rcmail.get_label('remove','kolab_2fa')));
+
                 $('<td>').addClass('name').text(props.label || props.name).appendTo(tr);
                 $('<td>').addClass('created').text(props.created || '??').appendTo(tr);
-                $('<td>').addClass('actions').html('<a class="button delete" rel="'+id+'">' + rcmail.get_label('remove','kolab_2fa') + '</a>').appendTo(tr);
+                $('<td>').addClass('actions buttons-cell').append(button).appendTo(tr);
                 rows++;
             }
         });
@@ -76,13 +83,14 @@
                 [
                     {
                         text: rcmail.gettext('save', 'kolab_2fa'),
-                        'class': 'mainaction',
+                        'class': 'mainaction save',
                         click: function(e) {
                             save_data(method);
                         }
                     },
                     {
                         text: rcmail.gettext('cancel'),
+                        'class': 'cancel',
                         click: function() {
                             factor_dialog.dialog('close');
                         }
@@ -102,7 +110,6 @@
                     }
                 }
             )
-            .addClass('propform')
             .data('method', method)
             .data('timestamp', time());
 
@@ -220,10 +227,11 @@
                                     highsec_dialog.find('input[name="_code"]').select();
                                 }
                             },
-                            'class': 'mainaction'
+                            'class': 'mainaction save'
                         },
                         {
                             text: rcmail.gettext('cancel'),
+                            'class': 'cancel',
                             click: function() {
                                 highsec_dialog.dialog('close');
                             }

iRony-0.4.0.tar.gz/lib/plugins/kolab_2fa/kolab_2fa.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_2fa/kolab_2fa.php Changed

@@ -3,8 +3,6 @@
 /**
  * Kolab 2-Factor-Authentication plugin
  *
- * ...
- *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
  *
  * Copyright (C) 2015, Kolab Systems AG <contact@kolabsys.com>
@@ -252,8 +250,14 @@
             }
 
             $field_id = "rcmlogin2fa$method";
-            $input_code = new html_inputfield(array('name' => "_${nonce}_${method}", 'class' => 'kolab2facode', 'id' => $field_id, 'required' => $required, 'autocomplete' => 'off')
-                + $attrib);
+            $input_code = new html_inputfield(array(
+                    'name'         => "_${nonce}_${method}",
+                    'class'        => 'kolab2facode',
+                    'id'           => $field_id,
+                    'required'     => $required,
+                    'autocomplete' => 'off',
+                    'data-icon'    => 'key' // for Elastic
+                ) + $attrib);
             $table->add('title', html::label($field_id, html::quote($this->gettext($method))));
             $table->add('input', $input_code->show(''));
         }
@@ -266,9 +270,12 @@
 
         // add submit button
         if (rcube_utils::get_boolean($attrib['submit'])) {
-            $submit = new html_inputfield(array('type' => 'submit', 'id' => 'rcmloginsubmit',
-                'class' => 'button mainaction', 'value' => $this->gettext('continue')));
-            $out .= html::p('formbuttons', $submit->show());
+            $out .= html::p('formbuttons', html::tag('button', array(
+                    'type'  => 'submit',
+                    'id'    => 'rcmloginsubmit',
+                    'class' => 'button mainaction save',
+                ), $this->gettext('continue'))
+            );
         }
 
         // surround html output with a form tag
@@ -377,7 +384,7 @@
         // register as settings action
         $args['actions'][] = array(
             'action' => 'plugin.kolab-2fa',
-            'class'  => '2factorauth',
+            'class'  => 'twofactorauth',
             'label'  => 'settingslist',
             'title'  => 'settingstitle',
             'domain' => 'kolab_2fa',
@@ -415,7 +422,9 @@
     {
         $rcmail = rcmail::get_instance();
 
-        $select = new html_select(array('id' => 'kolab2fa-add'));
+        $attrib['id'] = 'kolab2fa-add';
+
+        $select = new html_select($attrib);
         $select->add($this->gettext('addfactor') . '...', '');
         foreach ((array)$rcmail->config->get('kolab_2fa_drivers', array()) as $method) {
             $select->add($this->gettext($method), $method);
@@ -459,7 +468,7 @@
         }
 
         $me = $this;
-        $this->api->output->set_env('kolab_2fa_factors', array_combine(
+        $factors = array_combine(
             $factors,
             array_map(function($id) use ($me, &$env_methods) {
                 $props = array('id' => $id);
@@ -473,9 +482,10 @@
 
                 return $props;
             }, $factors)
-        ));
+        );
 
         $this->api->output->set_env('kolab_2fa_methods', $env_methods);
+        $this->api->output->set_env('kolab_2fa_factors', !empty($factors) ? $factors : null);
 
         return html::div(array('id' => 'kolab2fapropform'), $out);
     }
@@ -514,7 +524,7 @@
                 }
 
                 $explain_label = $field . 'explain' . $method;
-                $explain_html = $rcmail->text_exists($explain_label, 'kolab_2fa') ? html::p('explain', $this->gettext($explain_label)) : '';
+                $explain_html = $rcmail->text_exists($explain_label, 'kolab_2fa') ? html::div('explain form-text', $this->gettext($explain_label)) : '';
 
                 $field_id = 'rcmk2fa' . $method . $field;
                 $table->add('title', html::label($field_id, $this->gettext($field)));
@@ -525,12 +535,8 @@
             if (method_exists($driver, 'get_provisioning_uri')) {
                 $table->add('title', $this->gettext('qrcode'));
                 $table->add(null,
-                    html::p('explain',
-                        $this->gettext("qrcodeexplain$method")
-                    ) .
-                    html::p(null,
-                        html::tag('img', array('src' => 'data:image/gif;base64,R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7', 'class' => 'qrcode', 'rel' => $method))
-                    )
+                    html::div('explain form-text', $this->gettext("qrcodeexplain$method"))
+                    . html::tag('img', array('src' => 'data:image/gif;base64,R0lGODlhDwAPAIAAAMDAwAAAACH5BAEAAAAALAAAAAAPAA8AQAINhI+py+0Po5y02otnAQA7', 'class' => 'qrcode', 'rel' => $method))
                 );
 
                 // add row for testing the factor
@@ -538,7 +544,7 @@
                 $table->add('title', html::label($field_id, $this->gettext('verifycode')));
                 $table->add(null,
                     html::tag('input', array('type' => 'text', 'name' => '_verify_code', 'id' => $field_id, 'class' => 'k2fa-verify', 'size' => 20, 'required' => true)) .
-                    html::p('explain', $this->gettext("verifycodeexplain$method"))
+                    html::div('explain form-text', $this->gettext("verifycodeexplain$method"))
                 );
 
             }
@@ -548,8 +554,9 @@
             $out .= html::tag('form', array(
                     'method' => 'post',
                     'action' => '#',
-                    'id' => 'kolab2fa-prop-' . $method,
-                    'style' => 'display:none',
+                    'id'     => 'kolab2fa-prop-' . $method,
+                    'style'  => 'display:none',
+                    'class'  => 'propform',
                 ),
                 html::tag('fieldset', array(),
                     html::tag('legend', array(), $this->gettext($method)) .
@@ -561,9 +568,9 @@
 
         return $out;
     }
-    
+
     /**
-     * Render th
+     * Render the high-security-dialog content
      */
     public function settings_highsecuritydialog($attrib = array())
     {
@@ -571,10 +578,11 @@
 
         $field_id = 'rcmk2facode';
         $input = new html_inputfield(array('name' => '_code', 'id' => $field_id, 'class' => 'verifycode', 'size' => 20));
+        $label = html::label(array('for' => $field_id, 'class' => 'col-form-label col-sm-4'), '$name');
 
         return html::div($attrib,
-            html::p('explain', $this->gettext('highsecuritydialog')) .
-            html::div('propform', html::label($field_id, '$name') . $input->show(''))
+            html::div('explain form-text', $this->gettext('highsecuritydialog'))
+            . html::div('propform row form-group', $label . html::div('col-sm-8', $input->show('')))
         );
     }
 
@@ -640,7 +648,10 @@
 
         if ($success) {
             $this->api->output->show_message($data === false ? $this->gettext('factorremovesuccess') : $this->gettext('factorsavesuccess'), 'confirmation');
-            $this->api->output->command('plugin.save_success', array('method' => $method, 'active' => $data !== false) + $save_data);
+            $this->api->output->command('plugin.save_success', array(
+                    'method' => $method,
+                    'active' => $data !== false,
+                    'id'     => $driver->id) + $save_data);
         }
         else if ($errors) {
             $this->api->output->show_message($this->gettext('factorsaveerror'), 'error');
@@ -707,6 +718,7 @@
                     }
                 }
             }
+
             $success = $driver->verify(rcube_utils::get_input_value('_code', rcube_utils::INPUT_POST), $timestamp);
             $method = $driver->method;
         }
@@ -722,6 +734,7 @@
             'message' => str_replace('$method', $this->gettext($method),
                 $this->gettext($success ? 'codeverificationpassed' : 'codeverificationfailed'))
         ));
+
         $this->api->output->send();
     }

iRony-0.4.1.tar.gz/lib/plugins/kolab_2fa/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_2fa/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_2fa/skins/elastic/templates/config.html Added

@@ -0,0 +1,25 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_2fa.settingstitle" /></h1>
+
+<div class="content 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 back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		<span class="header-title"><roundcube:label name="kolab_2fa.settingstitle" /></span>
+		<div class="toolbar"></div>
+	</div>
+	<div class="scroller frame-content">
+		<p class="addfactor">
+			<roundcube:object name="plugin.factoradder" class="form-control" />
+		</p>
+		<roundcube:object name="plugin.settingslist" class="authentication-factors" />
+	</div>
+</div>
+
+<roundcube:object name="plugin.settingsform" class="propform" />
+<roundcube:object name="plugin.highsecuritydialog" class="kolab2fa-highsecuritydialog hidden" />
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.js Changed

@@ -35,7 +35,15 @@
   if (rcmail.gui_objects.devicelist) {
     var devicelist = new rcube_list_widget(rcmail.gui_objects.devicelist,
       { multiselect:true, draggable:false, keyboard:true });
-    devicelist.addEventListener('select', select_device).init().focus();
+
+    devicelist.addEventListener('select', select_device)
+      .init()
+      .focus();
+
+    rcmail.devicelist = devicelist;
+    setTimeout(function() {
+      rcmail.triggerEvent('listupdate', {list: devicelist, rowcount: devicelist.rowcount});
+    }, 100);
 
     // load frame if there are no devices
     if (!rcmail.env.devicecount)
@@ -56,7 +64,7 @@
     });
 
     var fn = function(elem) {
-      var classname = elem.className,
+      var classname = elem.className.split(' ')[0],
         list = $(elem).closest('table').find('input.' + classname),
         check = list.not(':checked').length > 0;
 
@@ -72,7 +80,9 @@
   {
     active_device = list.get_single_selection();
 
-    if (active_device)
+    rcmail.enable_command('plugin.delete-device', list.get_selection().length > 0);
+
+    if (active_device && !list.multi_selecting)
       device_select(active_device);
     else if (rcmail.env.contentframe)
       rcmail.show_contentframe(false);
@@ -139,16 +149,25 @@
     if (p.success && p.id && p['delete']) {
       active_device = null;
       device_select();
-      devicelist.remove_row(p.id);
+
+      if (p.id == 'ALL')
+        devicelist.clear();
+      else
+        devicelist.remove_row(p.id);
+
+      rcmail.triggerEvent('listupdate', {list: devicelist, rowcount: devicelist.rowcount});
       rcmail.enable_command('plugin.delete-device', false);
     }
   };
+
   // handler for delete commands
   function delete_device_config()
   {
-    if (active_device && confirm(rcmail.gettext('devicedeleteconfirm', 'kolab_activesync'))) {
+    var selection = devicelist.get_selection();
+
+    if (selection.length && confirm(rcmail.gettext('devicedeleteconfirm', 'kolab_activesync'))) {
       http_lock = rcmail.set_busy(true, 'kolab_activesync.savingdata');
-      rcmail.http_post('plugin.activesync-json', { cmd:'delete', id:active_device }, http_lock);
+      rcmail.http_post('plugin.activesync-json', { cmd:'delete', id:selection }, http_lock);
     }
   };

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/kolab_activesync.php Changed

@@ -109,7 +109,7 @@
 
         if ($content = $this->ui->folder_options_table($mbox_imap, $devices, $type)) {
             $args['form']['activesync'] = array(
-                'name'    => rcube::Q($this->gettext('tabtitle')),
+                'name'    => $this->gettext('tabtitle'),
                 'content' => $content,
             );
         }
@@ -159,12 +159,17 @@
             break;
 
         case 'delete':
-            $success = $this->device_delete($imei);
+            foreach ((array) $imei as $id) {
+                $success = $this->device_delete($id);
+            }
 
             if ($success) {
                 $this->rc->output->show_message($this->gettext('successfullydeleted'), 'confirmation');
                 $this->rc->output->command('plugin.activesync_save_complete', array(
-                    'success' => true, 'id' => $imei, 'delete' => true));
+                        'success' => true,
+                        'delete'  => true,
+                        'id'      => count($imei) > 1 ? 'ALL' : $imei[0],
+                ));
             }
             else
                 $this->rc->output->show_message($this->gettext('savingerror'), 'error');

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/kolab_activesync_ui.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/kolab_activesync_ui.php Changed

@@ -52,7 +52,8 @@
         foreach ($devices as $id => $device) {
             $name = $device['ALIAS'] ? $device['ALIAS'] : $id;
             $table->add_row(array('id' => 'rcmrow' . $id));
-            $table->add(null, html::span('devicealias', rcube::Q($name)) . html::span('devicetype', rcube::Q($device['TYPE'])));
+            $table->add(null, html::span('devicealias', rcube::Q($name))
+                . ' ' . html::span('devicetype secondary', rcube::Q($device['TYPE'])));
         }
 
         $this->rc->output->add_gui_object('devicelist', $attrib['id']);
@@ -79,7 +80,7 @@
         if (!empty($info)) {
             foreach ($info as $key => $value) {
                 if ($value) {
-                    $table->add('title', rcube::Q($this->plugin->gettext($key)));
+                    $table->add('title', html::label(null, rcube::Q($this->plugin->gettext($key))));
                     $table->add(null, rcube::Q($value));
                 }
             }
@@ -95,12 +96,14 @@
 
     public function folder_subscriptions($attrib = array())
     {
-        if (!$attrib['id'])
+        if (!$attrib['id']) {
             $attrib['id'] = 'foldersubscriptions';
+        }
 
         // group folders by type (show only known types)
         $folder_groups = array('mail' => array(), 'contact' => array(), 'event' => array(), 'task' => array(), 'note' => array());
         $folder_types  = kolab_storage::folders_typedata();
+        $use_fieldsets = rcube_utils::get_boolean($attrib['use-fieldsets']);
         $imei          = $this->device['_id'];
         $subscribed    = array();
 
@@ -132,10 +135,17 @@
             if (empty($group)) {
                 continue;
             }
+
             $attrib['type'] = $type;
-            $html .= html::div('subscriptionblock',
-                html::tag('h3', $type, $this->plugin->gettext($type)) .
-                $this->folder_subscriptions_block($group, $attrib, $subscribed));
+            $table = $this->folder_subscriptions_block($group, $attrib, $subscribed);
+            $label = $this->plugin->gettext($type);
+
+            if ($use_fieldsets) {
+                $html .= html::tag('fieldset', 'subscriptionblock', html::tag('legend', $type, $label) . $table);
+            }
+            else {
+                $html .= html::div('subscriptionblock', html::tag('h3', $type, $label) . $table);
+            }
         }
 
         $this->rc->output->add_gui_object('subscriptionslist', $attrib['id']);
@@ -148,14 +158,26 @@
         $alarms = ($attrib['type'] == 'event' || $attrib['type'] == 'task');
 
         $table = new html_table(array('cellspacing' => 0));
-        $table->add_header(array('class' => 'subscription', 'title' => $this->plugin->gettext('synchronize'), 'tabindex' => 0),
+        $table->add_header(array(
+                'class'    => 'subscription checkbox-cell',
+                'title'    => $this->plugin->gettext('synchronize'),
+                'tabindex' => 0
+            ),
             $attrib['syncicon'] ? html::img(array('src' => $this->skin_path . $attrib['syncicon'])) :
-                $this->plugin->gettext('synchronize'));
+                $this->plugin->gettext('synchronize')
+        );
+
         if ($alarms) {
-            $table->add_header(array('class' => 'alarm', 'title' => $this->plugin->gettext('withalarms'), 'tabindex' => 0),
+            $table->add_header(array(
+                    'class'    => 'alarm checkbox-cell',
+                    'title'    => $this->plugin->gettext('withalarms'),
+                    'tabindex' => 0
+                ),
                 $attrib['alarmicon'] ? html::img(array('src' => $this->skin_path . $attrib['alarmicon'])) :
-                    $this->plugin->gettext('withalarms'));
+                    $this->plugin->gettext('withalarms')
+            );
         }
+
         $table->add_header('foldername', $this->plugin->gettext('folder'));
 
         $checkbox_sync  = new html_checkbox(array('name' => 'subscribed[]', 'class' => 'subscription'));
@@ -163,7 +185,7 @@
 
         $names = array();
         foreach ($a_folders as $folder) {
-            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_name($folder));
+            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_prettyname($folder));
 
             // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
             for ($i = count($names)-1; $i >= 0; $i--) {
@@ -186,12 +208,12 @@
             }
 
             $table->add_row();
-            $table->add('subscription', $checkbox_sync->show(
+            $table->add('subscription checkbox-cell', $checkbox_sync->show(
                 !empty($subscribed[$folder]) ? $folder : null,
                 array('value' => $folder, 'id' => $folder_id)));
 
             if ($alarms) {
-                $table->add('alarm', $checkbox_alarm->show(
+                $table->add('alarm checkbox-cell', $checkbox_alarm->show(
                     intval($subscribed[$folder]) > 1 ? $folder : null,
                     array('value' => $folder, 'id' => $folder_id.'_alarm')));
             }
@@ -236,13 +258,13 @@
 
             $table->add_row();
             $table->add(array('class' => 'device', 'title' => $title), $name);
-            $table->add('subscription', $checkbox->show(!empty($folder_data[$id]['S']) ? 1 : 0));
+            $table->add('subscription checkbox-cell', $checkbox->show(!empty($folder_data[$id]['S']) ? 1 : 0));
 
             if ($alarms) {
                 $checkbox_alarm = new html_checkbox(array('name' => "_alarms[$id]", 'value' => 1,
                     'onchange' => 'return activesync_object.update_sync_data(this)'));
 
-                $table->add('alarm', $checkbox_alarm->show($folder_data[$id]['S'] > 1 ? 1 : 0));
+                $table->add('alarm checkbox-cell', $checkbox_alarm->show($folder_data[$id]['S'] > 1 ? 1 : 0));
             }
         }

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/localization/cs_CZ.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/cs_CZ.inc Changed

@@ -1,12 +1,12 @@
 <?php
 $labels['tabtitle'] = 'Activesync';
-$labels['activesynctitle'] = 'Správa Avtivesync zařízení';
+$labels['activesynctitle'] = 'Správa zařízení Avtivesync';
 $labels['devices'] = 'Zařízení';
 $labels['devicealias'] = 'Název zařízení';
 $labels['synchronize'] = 'Synchronizovat';
 $labels['withalarms'] = 'Připomenutí';
 $labels['syncsettings'] = 'Nastavení synchronizace';
-$labels['deviceconfig'] = 'Konfigurace zařízení';
+$labels['deviceconfig'] = 'Nastavení zařízení';
 $labels['folderstosync'] = 'Složky k synchronizaci';
 $labels['mail'] = 'E-mail';
 $labels['contact'] = 'Adresáře';
@@ -15,19 +15,19 @@
 $labels['note'] = 'Poznámky';
 $labels['configuration'] = 'Nastavení';
 $labels['deletedevice'] = 'Smazat zařízení';
-$labels['nodevices'] = 'V současné době nemáte registrována žádná zařízení.<br/><br/>Zařízení musíte nejprve připojit k serveru dle <a href="$url" target="_blank">těchto pokynů</a>. Po úspěšném připojení zde bude dostupná konfigurace připojených zařízení.';
-$labels['savingdata'] = 'Ukládám data...';
-$labels['savingerror'] = 'Nepodařilo se uložit konfiguraci';
-$labels['notsupported'] = 'Váš server nepodporuje metadata/annotations';
-$labels['devicedeleteconfirm'] = 'Opravdu chcete smazat konfiguraci pro toto zařízení?';
-$labels['successfullydeleted'] = 'Konfigurace zařízení byla úspěšně odebrána';
-$labels['devicenotfound'] = 'Nelze přečíst konfigurace zařízení';
+$labels['nodevices'] = 'V současné době nemáte registrována žádná zařízení.<br/><br/>Zařízení musíte nejprve připojit k serveru dle <a href="$url" target="_blank">těchto pokynů</a>. Po úspěšném připojení zde bude dostupné nastavení připojených zařízení.';
+$labels['savingdata'] = 'Ukládají se data...';
+$labels['savingerror'] = 'Nepodařilo se uložit nastavení';
+$labels['notsupported'] = 'Váš server nepodporuje popisná data/poznámky';
+$labels['devicedeleteconfirm'] = 'Opravdu chcete smazat nastavení pro toto zařízení?';
+$labels['successfullydeleted'] = 'Nastavení zařízení bylo úspěšně odebráno';
+$labels['devicenotfound'] = 'Nelze přečíst nastavení zařízení';
 $labels['devicetype'] = 'Typ zařízení';
 $labels['acsversion'] = 'Verze protokolu';
-$labels['useragent'] = 'User-Agent';
+$labels['useragent'] = 'Uživatelský agent';
 $labels['friendlyname'] = 'Zobrazovaný název';
 $labels['os'] = 'Operační systém';
-$labels['oslanguage'] = 'Jazyk OS';
+$labels['oslanguage'] = 'Jazyk operačního systému';
 $labels['phonenumber'] = 'Telefonní číslo';
 $labels['arialabeldeviceframe'] = 'Nastavení synchronizace zařízení';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/de_CH.inc Changed

@@ -1,10 +1,12 @@
 <?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'] = 'Order zum Synchronisieren';
 $labels['mail'] = 'E-Mail';
 $labels['contact'] = 'Kontakte';
@@ -13,15 +15,12 @@
 $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';
 $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['activesynctitle'] = 'Verwalte ActiveSync-Geräte';
-$labels['deviceconfig'] = 'Gerätekonfiguration';
-$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['savingerror'] = 'Fehler beim Speichern der Konfiguration';
 $labels['devicenotfound'] = 'Es kann nicht auf die Gerätekonfiguration zugegriffen werden.';
 $labels['devicetype'] = 'Gerätetyp';
 $labels['acsversion'] = 'Protokollversion';

iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/el.inc Added

@@ -0,0 +1,30 @@
+<?php
+$labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Διαχείριση συσκευών Activesync';
+$labels['devices'] = 'Συσκευές';
+$labels['devicealias'] = 'Όνομα συσκευής';
+$labels['synchronize'] = 'Συγχρονισμός';
+$labels['withalarms'] = 'Με ξυπνητήρια';
+$labels['syncsettings'] = 'Ρυθμίσεις συγχρονισμού';
+$labels['deviceconfig'] = 'Ρυθμίσεις συσκευής';
+$labels['folderstosync'] = 'Φάκελοι προς συγχρονισμό';
+$labels['mail'] = 'Ηλεκτρονική αλληλογραφία';
+$labels['contact'] = 'Βιβλίο διευθύνσεων';
+$labels['event'] = 'Ημερολόγια';
+$labels['task'] = 'Εργασίες';
+$labels['note'] = 'Σημειώσεις';
+$labels['configuration'] = 'Ρυθμίσεις';
+$labels['deletedevice'] = 'Διαγραφή συσκευής';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
+$labels['savingerror'] = 'Αποτυχία αποθήκευσης ρυθμίσεων';
+$labels['devicedeleteconfirm'] = 'Θέλετε να διαγράψετε τις ρυθμίσεις για αυτή τη συσκευή;';
+$labels['successfullydeleted'] = 'Αφαιρέθηκε επιτυχώς οι ρυθμίσεις για την συσκευή';
+$labels['devicenotfound'] = 'Αδυναμία ανάγνωσης ρυθμίσεων συσκευής';
+$labels['devicetype'] = 'Τύπος συσκευής';
+$labels['acsversion'] = 'Έκδοση πρωτοκόλλου';
+$labels['friendlyname'] = 'Φιλικό όνομα';
+$labels['os'] = 'Λειτουργικό σύστημα';
+$labels['oslanguage'] = 'Γλώσσα λειτουργικού συστήματος';
+$labels['phonenumber'] = 'Αριθμός τηλεφώνου';
+$labels['arialabeldeviceframe'] = 'Ρυθμίσεις συγχρονισμού συσκευής από';
+?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/en_US.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/es_ES.inc Changed

@@ -1,9 +1,33 @@
 <?php
+$labels['tabtitle'] = 'Activesync';
+$labels['activesynctitle'] = 'Administrar dispositivos ActiveSync';
+$labels['devices'] = 'Dispositivos';
+$labels['devicealias'] = 'Nombre del dispositivo';
+$labels['synchronize'] = 'Sincronizar';
+$labels['withalarms'] = 'Con alarmas';
+$labels['syncsettings'] = 'Ajustes de sincronización';
+$labels['deviceconfig'] = 'Configuración del dispositivo';
+$labels['folderstosync'] = 'Carpetas para sincronizar';
 $labels['mail'] = 'Correo electrónico';
 $labels['contact'] = 'Libreta de direcciones';
 $labels['event'] = 'Calendarios';
 $labels['task'] = 'Tareas';
 $labels['note'] = 'Notas';
 $labels['configuration'] = 'Configuración';
+$labels['deletedevice'] = 'Borrar dispositivo';
+$labels['nodevices'] = 'Actualmente no hay dispositivos registrados. <br/> <br/> Para registrar un dispositivo, primero conéctelo al servidor usando las instrucciones de <a href="$url" target="_blank"> esta página < / A>. A continuación, el dispositivo debe estar disponible para la configuración aquí.';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['savingerror'] = 'Error al guardar la configuración';
+$labels['notsupported'] = 'Su servidor no admite metadatos/anotaciones';
+$labels['devicedeleteconfirm'] = '¿Esta seguro de eliminar la configuración de este dispositivo?';
+$labels['successfullydeleted'] = 'La configuración del dispositivo se ha eliminado con éxito';
+$labels['devicenotfound'] = 'No puede leerse la configuración del dispositivo';
+$labels['devicetype'] = 'Tipo de dispositivo';
+$labels['acsversion'] = 'Versión del protocolo';
+$labels['useragent'] = 'Agente de usuario';
+$labels['friendlyname'] = 'Nombre amigable';
+$labels['os'] = 'Sistema operativo';
+$labels['oslanguage'] = 'Idioma del SI';
+$labels['phonenumber'] = 'Número de teléfono';
+$labels['arialabeldeviceframe'] = 'Formulario de configuración de sincronización de dispositivos';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/fr_FR.inc Changed

@@ -2,23 +2,23 @@
 $labels['tabtitle'] = 'Activesync';
 $labels['activesynctitle'] = 'Gestion des périphériques Activesync';
 $labels['devices'] = 'Périphériques';
-$labels['devicealias'] = 'Nom du Périphérique';
+$labels['devicealias'] = 'Nom du périphérique';
 $labels['synchronize'] = 'Synchroniser';
 $labels['withalarms'] = 'Avec alarmes';
 $labels['syncsettings'] = 'Paramètres de synchronisation';
-$labels['deviceconfig'] = 'Configuration du péripherique';
+$labels['deviceconfig'] = 'Configuration du périphérique';
 $labels['folderstosync'] = 'Dossiers à synchroniser';
 $labels['mail'] = 'Adresse de messagerie';
 $labels['contact'] = 'Carnet d\'adresses';
-$labels['event'] = 'Agendas';
+$labels['event'] = 'Calendriers';
 $labels['task'] = 'Tâches';
 $labels['note'] = 'Notes';
 $labels['configuration'] = 'Configuration';
 $labels['deletedevice'] = 'Supprimer ce périphérique';
-$labels['nodevices'] = 'Il n\'y a actuellement pas de périphérique enregistré.<br/><br/>Afin d\'enregistrer un périphérique, commencez par le connecter au serveur d\'abord. Pour cela, utilisez les instructions de <a href="http://wiki.kolab.org/Setup_ActiveSync">cette page</a>. Ensuite le périphérique devrait devenir disponible ici pour configuration.';
+$labels['nodevices'] = 'Il n\'y a actuellement pas de périphérique enregistré.<br/><br/>Afin d\'enregistrer un périphérique, commencez par le connecter au serveur. Pour ce faire, utilisez les instructions de <a href="http://wiki.kolab.org/Setup_ActiveSync">cette page</a>. Ensuite, le périphérique devrait devenir disponible pour configuration ici.';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['savingerror'] = 'Échec de l\'enregistrement de la configuration';
-$labels['notsupported'] = 'Votre serveur ne supporte pas les métadonnées ou les annotations';
+$labels['notsupported'] = 'Votre serveur ne supporte pas les métadonnées ni les annotations';
 $labels['devicedeleteconfirm'] = 'Voulez-vous vraiment supprimer la configuration de ce périphérique?';
 $labels['successfullydeleted'] = 'La configuration de ce périphérique a été supprimée';
 $labels['devicenotfound'] = 'Impossible de lire la configuration du périphérique';

iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/lv.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/nl_NL.inc Changed

@@ -1,31 +1,33 @@
 <?php
 $labels['tabtitle'] = 'Activesync';
-$labels['activesynctitle'] = 'Beheer Activesync-apparaten';
+$labels['activesynctitle'] = 'Activesync-apparaten beheren';
 $labels['devices'] = 'Apparaten';
-$labels['devicealias'] = 'Apparaat naam';
-$labels['synchronize'] = 'Synchronizeren';
-$labels['withalarms'] = 'Met alarmen';
-$labels['syncsettings'] = 'Synchronizatie instellingen';
-$labels['deviceconfig'] = 'Apparaat configuratie';
-$labels['folderstosync'] = 'Mappen voor synchronisatie';
-$labels['mail'] = 'Email';
+$labels['devicealias'] = 'Apparaatnaam';
+$labels['synchronize'] = 'Synchroniseren';
+$labels['withalarms'] = 'Met herinneringen';
+$labels['syncsettings'] = 'Synchronisatie-instellingen';
+$labels['deviceconfig'] = 'Configuratie van apparaat';
+$labels['folderstosync'] = 'Te synchroniseren mappen';
+$labels['mail'] = 'E-mail';
 $labels['contact'] = 'Adresboeken';
-$labels['event'] = 'Kalenders';
+$labels['event'] = 'Agenda\'s';
 $labels['task'] = 'Taken';
 $labels['note'] = 'Notities';
 $labels['configuration'] = 'Configuratie';
-$labels['deletedevice'] = 'Verwijder apparaat';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['savingerror'] = 'Fout in opslaan van configuratie';
-$labels['notsupported'] = 'Uw server ondersteunt geen metadata/annotaties';
-$labels['devicedeleteconfirm'] = 'Wilt u de configuratie voor dit apparaat echt verwijderen?';
-$labels['successfullydeleted'] = 'Het apparaat is succesvol verwijderd';
-$labels['devicenotfound'] = 'Lezen van apparaat configuratie mislukt';
-$labels['devicetype'] = 'Apparaat type';
-$labels['acsversion'] = 'Protocol versie';
-$labels['useragent'] = 'User agent';
-$labels['friendlyname'] = 'Weergave naam';
+$labels['deletedevice'] = 'Apparaat verwijderen';
+$labels['nodevices'] = 'Momenteel zijn er geen apparaten geregistreerd.<br/><br/>Als u een apparaat wilt registreren, volgt u de instructies op <a href="$url" target="_blank">deze pagina</a> om het eerst met de server te verbinden. Daarna kunt u het apparaat hier configureren.';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['savingerror'] = 'Opslaan van configuratie is mislukt';
+$labels['notsupported'] = 'Uw server ondersteunt geen metagegevens/annotaties';
+$labels['devicedeleteconfirm'] = 'Weet u zeker dat u de configuratie voor dit apparaat wilt verwijderen?';
+$labels['successfullydeleted'] = 'De configuratie van het apparaat is met succes verwijderd';
+$labels['devicenotfound'] = 'Configuratie van apparaat kan niet worden gelezen';
+$labels['devicetype'] = 'Apparaattype';
+$labels['acsversion'] = 'Protocolversie';
+$labels['useragent'] = 'Gebruikersagent';
+$labels['friendlyname'] = 'Beschrijvende naam';
 $labels['os'] = 'Besturingssysteem';
-$labels['oslanguage'] = 'Taal besturingssysteem';
+$labels['oslanguage'] = 'Taal van besturingssysteem';
 $labels['phonenumber'] = 'Telefoonnummer';
+$labels['arialabeldeviceframe'] = 'Formulier met instellingen voor synchronisatie van apparaat';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_activesync/localization/pt_PT.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/localization/pt_PT.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/skins/elastic/templates/config.html Added

@@ -0,0 +1,38 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_activesync.tabtitle" /></h1>
+
+
+<div class="list 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>
+		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="plugin.devicelist" id="devices-table" class="listing"
+			data-label-msg="listempty" role="listbox" data-list="devicelist" />
+	</div>
+</div>
+
+
+<div class="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">
+			<roundcube:button command="plugin.delete-device" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="delete" title="kolab_activesync.deletedevice" innerclass="inner" />
+		</div>
+	</div>
+	<div class="iframe-wrapper">
+		<roundcube:frame contentframe="activesync-frame" id="activesync-frame" src="/watermark.html" title="arialabeldeviceframe" />
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/skins/elastic/templates/configedit.html Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_activesync/skins/elastic/templates/configempty.html Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/de_DE/LC_MESSAGES/addressbook.po -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/de_DE/LC_MESSAGES/addressbook.po Changed

@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Mads <mads@batmads.com>, 2016
+# Max Hellwig <max.hellwig@translating-energy.de>, 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: 2016-07-26 13:49+0000\n"
-"Last-Translator: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>\n"
+"PO-Revision-Date: 2017-09-23 20:32+0000\n"
+"Last-Translator: Mads <mads@batmads.com>\n"
 "Language-Team: German (http://www.transifex.com/kolab/kolab-documentation/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +28,7 @@
 msgid ""
 "Just like calendars or regular email folders, personal address books can "
 "also be shared with other users in your workgroup."
-msgstr ""
+msgstr "Persönliche Adressbücher können genauso wie Kalender oder normale E-Mail-Ordner mit anderen Nutzern Ihrer Arbeitsgruppe geteilt werden. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
 msgid "Share Contacts with others"
@@ -37,7 +39,7 @@
 "Settings for sharing is controlled through the address book properties "
 "accessible through the *More actions* menu behind the gear icon the footer "
 "in the :ref:`addressbook-groups` list."
-msgstr ""
+msgstr "Die Einstellungen zum Teilen werden über die Eigenschaften des Adressbuchs gemacht, die durch das *Weitere Tätigkeiten*-Menü hinter dem Zahnradicon in der Fußzeile der :ref: `Adressbuchgruppen <addressbook-groups>`-Liste zu erreichen sind. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:25
 msgid "Select the address book you want to share."
@@ -45,22 +47,22 @@
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:26
 msgid "Choose *Edit address book* from the actions menu."
-msgstr ""
+msgstr "Wählen Sie *Adressbuch bearbeiten* aus dem Tätigkeitenmenü. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:27
 msgid "Switch to the *Sharing* tab in the properties form on the right."
-msgstr ""
+msgstr "Wechseln Sie auf den *Teilen*-Reiter in der Eigenschaftenmaske rechts. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:29
 msgid ""
 "The table displays who already has permission to see and modify the selected"
 " address book. Here you can manage permissions the same way as :ref:`Sharing"
 " a Folder <settings-folder-sharing>`."
-msgstr ""
+msgstr "Die Tabelle zeigt an, wer schon die Erlaubnis hat, das ausgewählte Adressbuch zu sehen und verändern. Freigaben können hier auf die selbe Weise, wie :ref: `Ordner teilen <settings-folder-sharing>` verwaltet werden. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:34
 msgid "Subscribe to Shared Address Books"
-msgstr ""
+msgstr "Geteilte Adressbücher abonnieren"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:36
 msgid ""
@@ -69,11 +71,11 @@
 "<settings-folders>` to see all resources you can access. There's a shortcut "
 "to this: click *Manage folders* in the actions menu behind the gear icon "
 "located the footer of the directory list."
-msgstr ""
+msgstr "Adressbücher, die von anderen geteilt wurden, werden nicht sofort in der Verzeichnisliste des Webclients angezeigt. Wechseln Sie zu :ref: `Einstellungen > Ordner <settings-folders>`, um alle Hilfsmittel, auf die Sie Zugriff haben, zu sehen. Es gibt einen schnelleren Weg dorthin: Klicken Sie auf *Ordner verwalten* im Tätigkeitenmenü hinter dem Zahnradicon in der Fußzeile der Verzeichnisliste. "
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:41
 msgid ""
 "In order to make a shared address book appear in the address book view, "
 "locate it in the folder manager and check the *Subscribed* mark in the list."
 " Only subscribed directories are visible in the address book view."
-msgstr ""
+msgstr "Um ein geteiltes Adressbuch in der Adressbuchansicht anzuzeigen, wählen Sie es in der Ordnerverwaltung aus und setzen Sie bei *Abonniert* ein Häkchen in der Liste. Nur abonnierte Verzeichnisse sind in der Adressbuchansicht sichtbar. "

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/en_US/LC_MESSAGES/addressbook.po -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/en_US/LC_MESSAGES/addressbook.po Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/es_ES/LC_MESSAGES/addressbook.po -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/helpdocs/locale/es_ES/LC_MESSAGES/addressbook.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,13 @@
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:9
 msgid "Sharing Address Books"
-msgstr ""
+msgstr "Compartir libreta de direcciones"
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:11
 msgid ""
 "Just like calendars or regular email folders, personal address books can "
 "also be shared with other users in your workgroup."
-msgstr ""
+msgstr "Al igual que los calendarios o las carpetas de correo electrónico normales, las libretas de direcciones personales también pueden compartirse con otros usuarios de su grupo de trabajo."
 
 #: ../../en_US/_plugins/kolab_addressbook/addressbook.rst:16
 msgid "Share Contacts with others"

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

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.js Changed

@@ -29,55 +29,12 @@
 if (window.rcmail) {
     rcmail.addEventListener('init', function() {
         rcmail.set_book_actions();
-        if (rcmail.gui_objects.editform && rcmail.env.action.match(/^plugin\.book/)) {
-            rcmail.enable_command('book-save', true);
-        }
 
         // contextmenu
         kolab_addressbook_contextmenu();
 
         // append search form for address books
         if (rcmail.gui_objects.folderlist) {
-            var container = $(rcmail.gui_objects.folderlist);
-            $('<div class="listsearchbox" style="display:none">' +
-                '<div class="searchbox" role="search" aria-labelledby="aria-labelfoldersearchform" aria-controls="' + rcmail.gui_objects.folderlist.id + '">' +
-                    '<h3 id="aria-label-labelfoldersearchform" class="voice">' + rcmail.gettext('foldersearchform', 'kolab_addressbook') + '" /></h3>' +
-                    '<label for="addressbooksearch" class="voice">' + rcmail.gettext('searchterms', 'kolab_addressbook') + '</label>' +
-                    '<input type="text" name="q" id="addressbooksearch" placeholder="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" />' +
-                    '<a class="iconbutton searchicon"></a>' +
-                    '<a href="#reset" onclick="return rcmail.command(\'reset-listsearch\',null,this,event)" id="directorylistsearch-reset" class="iconbutton reset" title="' + rcmail.gettext('resetsearch') + '">' +
-                        rcmail.gettext('resetsearch') + '</a>' +
-                '</div>' +
-            '</div>')
-            .insertBefore(container.parent());
-
-            $('<a href="#search" class="iconbutton search" title="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" tabindex="0">' +
-                rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '</a>')
-                .appendTo('#directorylistbox h2.boxtitle')
-                .click(function(e){
-                    var title = $('#directorylistbox .boxtitle'),
-                        box = $('#directorylistbox .listsearchbox'),
-                        dir = box.is(':visible') ? -1 : 1;
-
-                    box.slideToggle({
-                        duration: 160,
-                        progress: function(animation, progress) {
-                            if (dir < 0) progress = 1 - progress;
-                            $('#directorylistbox .scroller').css('top', (title.outerHeight() + 34 * progress) + 'px');
-                        },
-                        complete: function() {
-                            box.toggleClass('expanded');
-                            if (box.is(':visible')) {
-                                box.find('input[type=text]').focus();
-                            }
-                            else {
-                                $('#directorylistsearch-reset').click();
-                            }
-                        }
-                    });
-                });
-
-
             // remove event handlers set by the regular treelist widget
             rcmail.treelist.container.off('click mousedown focusin focusout');
 
@@ -123,13 +80,14 @@
                     if (data.length)
                         rcmail.display_message(rcmail.gettext('nraddressbooksfound','kolab_addressbook').replace('$nr', data.length), 'voice');
                     else
-                        rcmail.display_message(rcmail.gettext('noaddressbooksfound','kolab_addressbook'), 'info');
+                        rcmail.display_message(rcmail.gettext('noaddressbooksfound','kolab_addressbook'), 'notice');
                 });
         }
 
         // append button to show contact audit trail
         if (rcmail.env.action == 'show' && rcmail.env.kolab_audit_trail && rcmail.env.cid) {
-            $('<a href="#history" class="btn-contact-history active" role="button" tabindex="0">' + rcmail.get_label('kolab_addressbook.showhistory') + '</a>')
+            $('<a>').attr({href: '#history', 'class': 'btn btn-secondary history contact-history', role: 'button', tabindex: 0})
+                .append($('<span class="inner">').text(rcmail.get_label('kolab_addressbook.showhistory')))
                 .click(function(e) {
                     var rc = rcmail.is_framed() && parent.rcmail.contact_history_dialog ? parent.rcmail : rcmail;
                     rc.contact_history_dialog();
@@ -181,12 +139,48 @@
 
 rcube_webmail.prototype.book_create = function()
 {
-    this.book_show_contentframe('create');
+    this.book_dialog('create');
 };
 
 rcube_webmail.prototype.book_edit = function()
 {
-    this.book_show_contentframe('edit');
+    this.book_dialog('edit');
+};
+
+// displays page with book edit/create form
+rcube_webmail.prototype.book_dialog = function(action)
+{
+    var title = rcmail.gettext('kolab_addressbook.book' + action),
+        params = {_act: action, _source: this.book_realname(), _framed: 1},
+        dialog = $('<iframe>').attr('src', rcmail.url('plugin.book', params)),
+        save_func = function() {
+            var data,
+                form = dialog.contents().find('form'),
+                input = form.find("input[name='_name']");
+
+            // form is not loaded
+            if (!form || !form.length)
+                return false;
+
+            if (input.length && input.val() == '') {
+                rcmail.alert_dialog(rcmail.get_label('kolab_addressbook.nobooknamewarning'), function() {
+                    input.focus();
+                });
+
+                return;
+            }
+
+            // post data to server
+            data = form.serializeJSON();
+
+            rcmail.http_post('plugin.book-save', data, rcmail.set_busy(true, 'kolab_addressbook.booksaving'));
+            return true;
+        };
+
+    rcmail.simple_dialog(dialog, title, save_func, {
+        width: 600,
+        height: 400
+    });
 };
 
 rcube_webmail.prototype.book_remove = function(id)
@@ -200,9 +194,11 @@
 
 rcube_webmail.prototype.book_delete = function()
 {
-    if (this.env.source != '' && confirm(this.get_label('kolab_addressbook.bookdeleteconfirm'))) {
-        var lock = this.set_busy(true, 'kolab_addressbook.bookdeleting');
-        this.http_request('plugin.book', '_act=delete&_source='+urlencode(this.book_realname()), lock);
+    if (this.env.source != '') {
+        this.confirm_dialog(this.get_label('kolab_addressbook.bookdeleteconfirm'), 'delete', function() {
+            var lock = rcmail.set_busy(true, 'kolab_addressbook.bookdeleting');
+            rcmail.http_request('plugin.book', '_act=delete&_source='+urlencode(rcmail.book_realname()), lock);
+        });
     }
 };
 
@@ -218,69 +214,14 @@
     }
 
     if (url) {
-        $('div.showurldialog:ui-dialog').dialog('close');
-
         var txt = rcmail.gettext('carddavurldescription', 'kolab_addressbook'),
-            $dialog = $('<div>').addClass('showurldialog').append('<p>' + txt + '</p>'),
-            textbox = $('<textarea>').addClass('urlbox').css('width', '100%').attr('rows', 2).appendTo($dialog);
-
-        $dialog.dialog({
-            resizable: true,
-            closeOnEscape: true,
-            title: rcmail.gettext('bookshowurl', 'kolab_addressbook'),
-            close: function() {
-                $dialog.dialog("destroy").remove();
-            },
-            width: 520
-        }).show();
-
-        textbox.val(url).select();
-    }
-};
-
-// displays page with book edit/create form
-rcube_webmail.prototype.book_show_contentframe = function(action, framed)
-{
-    var add_url = '', target = window;
+            dialog = $('<div>').addClass('showurldialog').append('<p>' + txt + '</p>'),
+            textbox = $('<textarea>').addClass('urlbox').css('width', '100%').attr('rows', 3).appendTo(dialog);
 
-    // unselect contact
-    this.contact_list.clear_selection();
-    this.enable_command('edit', 'delete', 'compose', false);
-
-    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
-        add_url = '&_framed=1';
-        target = window.frames[this.env.contentframe];
-        this.show_contentframe(true);
-    }
-    else if (framed)
-        return false;
-
-    if (action) {
-        this.lock_frame();
-        this.location_href(this.env.comm_path+'&_action=plugin.book&_act='+action
-            +'&_source='+urlencode(this.book_realname())
-            +add_url, target);
-    }
-
-    return true;
-};
-
-// submits book create/update form
-rcube_webmail.prototype.book_save = function()
-{
-    var form = this.gui_objects.editform,
-        input = $("input[name='_name']", form)
+        this.simple_dialog(dialog, rcmail.gettext('bookshowurl', 'kolab_addressbook'), null, {width: 520});
 
-    if (input.length && input.val() == '') {
-        alert(this.get_label('kolab_addressbook.nobooknamewarning'));
-        input.focus();
-        return;
+        textbox.val(url).select();
     }
-
-    input = this.display_message(this.get_label('kolab_addressbook.booksaving'), 'loading');
-    $('<input type="hidden" name="_unlock" />').val(input).appendTo(form);
-
-    form.submit();
 };
 
 // action executed after book delete
@@ -332,8 +273,6 @@
             })
         );
 
-    this.show_contentframe(false);
-
     // set row attributes
     if (data.readonly)
         classes.push('readonly');
@@ -597,9 +536,29 @@
         rcmail.addEventListener('contextmenu_init', function(menu) {
             if (menu.menu_name == 'abooklist') {
                 menu.addEventListener('activate', function(p) {
-                    // deactivate kolab addressbook actions
-                    if (p.command.match(/^book-/)) {
-                        return p.command == 'book-create';
+                    var source = !rcmail.env.group ? rcmail.env.source : null,
+                        sources = rcmail.env.address_sources,
+                        props = source && sources[source] && sources[source].kolab ?
+                            sources[source] : { readonly: true, removable: false, rights: '' };
+
+                    if (p.command == 'book-create') {
+                        return true;
+                    }
+
+                    if (p.command == 'book-edit') {
+                        return props.rights.indexOf('a') >= 0;
+                    }
+
+                    if (p.command == 'book-delete') {
+                        return props.rights.indexOf('a') >= 0 || props.rights.indexOf('x') >= 0;
+                    }
+
+                    if (p.command == 'book-remove') {
+                        return props.removable;
+                    }
+
+                    if (p.command == 'book-showurl') {
+                        return !!(props.carddavurl);
                     }
                 });
             }
@@ -620,78 +579,4 @@
             }
         });
     }
-
-    rcmail.env.kolab_addressbook_contextmenu = true;
-
-    // add menu on kolab addressbooks
-    var menu = rcm_callbackmenu_init({
-            menu_name: 'kolab_abooklist',
-            mouseover_timeout: -1, // no submenus here
-            menu_source: ['#directorylist-footer', '#groupoptionsmenu']
-        }, {
-            'activate': function(p) {
-                var source = !rcmail.env.group ? rcmail.env.source : null,
-                    sources = rcmail.env.address_sources,
-                    props = source && sources[source] && sources[source].kolab ?
-                        sources[source] : { readonly: true, removable: false, rights: '' };
-
-                if (p.command == 'book-create') {
-                    return true;
-                }
-
-                if (p.command == 'book-edit') {
-                    return props.rights.indexOf('a') >= 0;
-                }
-
-                if (p.command == 'book-delete') {
-                    return props.rights.indexOf('a') >= 0 || props.rights.indexOf('x') >= 0;
-                }
-
-                if (p.command == 'group-create') {
-                    return !props.readonly;
-                }
-
-                if (p.command == 'book-remove') {
-                    return props.removable;
-                }
-
-                if (p.command == 'book-showurl') {
-                    return !!(props.carddavurl);
-                }
-
-                if (p.command == 'group-rename' || p.command == 'group-delete') {
-                    return !!(rcmail.env.group && sources[rcmail.env.source] && !sources[rcmail.env.source].readonly);
-                }
-
-                return false;
-            },
-            'beforeactivate': function(p) {
-                // remove dummy items
-                $('li.submenu', p.ref.container).remove();
-
-                rcmail.env.kolab_old_source = rcmail.env.source;
-                rcmail.env.kolab_old_group = rcmail.env.group;
-
-                var elem = $(p.source), onclick = elem.attr('onclick');
-                if (onclick && onclick.match(rcmail.context_menu_command_pattern)) {
-                    rcmail.env.source = RegExp.$2;
-                    rcmail.env.group = null;
-                }
-                else if (elem.parent().hasClass('contactgroup')) {
-                    var grp = String(elem.attr('rel')).split(':');
-                    rcmail.env.source = grp[0];
-                    rcmail.env.group = grp[1];
-                }
-            },
-            'aftercommand': function(p) {
-                rcmail.env.source = rcmail.env.kolab_old_source;
-                rcmail.env.group = rcmail.env.kolab_old_group;
-            }
-        }
-    );
-
-    $('#directorylist').off('contextmenu').on('contextmenu', 'div > a, li.contactgroup > a', function(e) {
-        $(this).blur();
-        rcm_show_menu(e, this, $(this).attr('rel'), menu);
-    });
 };

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/kolab_addressbook.php Changed

@@ -339,13 +339,16 @@
      */
     public function config_get($args)
     {
-        if ($args['name'] != 'autocomplete_addressbooks') {
+        if ($args['name'] != 'autocomplete_addressbooks' || $this->recurrent) {
             return $args;
         }
 
         $abook_prio = $this->addressbook_prio();
-        // here we cannot use rc->config->get()
-        $sources    = $GLOBALS['CONFIG']['autocomplete_addressbooks'];
+
+        // Get the original setting, use temp flag to prevent from an infinite recursion
+        $this->recurrent = true;
+        $sources = $this->rc->config->get('autocomplete_addressbooks');
+        $this->recurrent = false;
 
         // Disable all global address books
         // Assumes that all non-kolab_addressbook sources are global
@@ -931,15 +934,16 @@
 
             $this->rc->output->show_message('kolab_addressbook.book'.$type.'d', 'confirmation');
             $this->rc->output->command('book_update', $props, kolab_storage::folder_id($prop['oldname'], true));
-            $this->rc->output->send('iframe');
         }
+        else {
+            if (!$error) {
+                $error = $plugin['message'] ? $plugin['message'] : 'kolab_addressbook.book'.$type.'error';
+            }
 
-        if (!$error)
-            $error = $plugin['message'] ? $plugin['message'] : 'kolab_addressbook.book'.$type.'error';
+            $this->rc->output->show_message($error, 'error');
+        }
 
-        $this->rc->output->show_message($error, 'error');
-        // display the form again
-        $this->ui->book_edit();
+        $this->rc->output->send('iframe');
     }
 
     /**
@@ -1024,7 +1028,7 @@
 
         // report more results available
         if ($search_more_results) {
-            $this->rc->output->show_message('autocompletemore', 'info');
+            $this->rc->output->show_message('autocompletemore', 'notice');
         }
 
         $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/lib/kolab_addressbook_ui.php Changed

@@ -56,9 +56,11 @@
 
             // include kolab folderlist widget if available
             if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
-                $this->plugin->api->include_script('libkolab/js/folderlist.js');
+                $this->plugin->api->include_script('libkolab/libkolab.js');
             }
 
+            $this->rc->output->add_footer($this->rc->output->parse('kolab_addressbook.search_addon', false, false));
+
             // Add actions on address books
             $options = array('book-create', 'book-edit', 'book-delete', 'book-remove');
             $idx     = 0;
@@ -85,8 +87,10 @@
                     $this->plugin->api->output->button(array(
                         'label'    => 'kolab_addressbook.'.str_replace('-', '', $command),
                         'domain'   => $this->ID,
-                        'classact' => 'active',
-                        'command'  => $command
+                        'class'    => str_replace('-', ' ', $command) . ' disabled',
+                        'classact' => str_replace('-', ' ', $command) . ' active',
+                        'command'  => $command,
+                        'type'     => 'link'
                 )));
                 $this->plugin->api->add_content($content, 'groupoptions');
                 $idx++;
@@ -97,7 +101,8 @@
                 $this->plugin->api->output->button(array(
                     'label'    => 'managefolders',
                     'type'     => 'link',
-                    'classact' => 'active',
+                    'class'    => 'folders disabled',
+                    'classact' => 'folders active',
                     'command'  => 'folders',
                     'task'     => 'settings',
             )));
@@ -116,12 +121,16 @@
                 'kolab_addressbook.nraddressbooksfound',
                 'kolab_addressbook.noaddressbooksfound',
                 'kolab_addressbook.foldersubscribe',
-                'resetsearch');
-
+                'kolab_addressbook.bookedit',
+                'kolab_addressbook.bookcreate',
+                'kolab_addressbook.nobooknamewarning',
+                'kolab_addressbook.booksaving',
+                'resetsearch'
+            );
 
             if ($this->plugin->bonnie_api) {
                 $this->rc->output->set_env('kolab_audit_trail', true);
-                $this->plugin->api->include_script('libkolab/js/audittrail.js');
+                $this->plugin->api->include_script('libkolab/libkolab.js');
 
                 $this->rc->output->add_label(
                     'kolab_addressbook.showhistory',
@@ -138,27 +147,21 @@
         }
         // include stylesheet for audit trail
         else if ($this->rc->action == 'show' && $this->plugin->bonnie_api) {
-            $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css');
+            $this->plugin->include_stylesheet($this->plugin->local_skin_path().'/kolab_addressbook.css', true);
             $this->rc->output->add_label('kolab_addressbook.showhistory');
         }
-        // book create/edit form
-        else {
-            $this->rc->output->add_label('kolab_addressbook.nobooknamewarning',
-                'kolab_addressbook.booksaving');
-        }
     }
 
-
     /**
      * Handler for address book create/edit action
      */
     public function book_edit()
     {
-        $this->rc->output->add_handler('bookdetails', array($this, 'book_form'));
-        $this->rc->output->send('kolab_addressbook.bookedit');
+        $this->rc->output->set_env('pagetitle', $this->plugin->gettext('bookproperties'));
+        $this->rc->output->add_handler('folderform', array($this, 'book_form'));
+        $this->rc->output->send('libkolab.folderform');
     }
 
-
     /**
      * Handler for 'bookdetails' object returning form content for book create/edit
      *
@@ -177,17 +180,7 @@
         $storage = $this->rc->get_storage();
         $delim   = $storage->get_hierarchy_delimiter();
 
-        if ($this->rc->action == 'plugin.book-save') {
-            // save error
-            $name      = trim(rcube_utils::get_input_value('_name', rcube_utils::INPUT_GPC, true)); // UTF8
-            $old       = trim(rcube_utils::get_input_value('_oldname', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
-            $path_imap = trim(rcube_utils::get_input_value('_parent', rcube_utils::INPUT_GPC, true)); // UTF7-IMAP
-
-            $hidden_fields[] = array('name' => '_oldname', 'value' => $old);
-
-            $folder = $old;
-        }
-        else if ($action == 'edit') {
+        if ($action == 'edit') {
             $path_imap = explode($delim, $folder);
             $name      = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
             $path_imap = implode($path_imap, $delim);
@@ -205,11 +198,12 @@
             $options = $storage->folder_info($folder);
         }
 
-        $form   = array();
+        $form = array();
 
         // General tab
-        $form['props'] = array(
-            'name' => $this->rc->gettext('properties'),
+        $form['properties'] = array(
+            'name'   => $this->rc->gettext('properties'),
+            'fields' => array(),
         );
 
         if (!empty($options) && ($options['norename'] || $options['protected'])) {
@@ -220,14 +214,10 @@
             $foldername = $foldername->show($name);
         }
 
-        $form['props']['fieldsets']['location'] = array(
-            'name'  => $this->rc->gettext('location'),
-            'content' => array(
-                'name' => array(
-                    'label' => $this->plugin->gettext('bookname'),
-                    'value' => $foldername,
-                ),
-            ),
+        $form['properties']['fields']['name'] = array(
+            'label' => $this->plugin->gettext('bookname'),
+            'value' => $foldername,
+            'id'    => '_name',
         );
 
         if (!empty($options) && ($options['norename'] || $options['protected'])) {
@@ -235,51 +225,19 @@
             $hidden_fields[] = array('name' => '_parent', 'value' => $path_imap);
         }
         else {
-            $select = kolab_storage::folder_selector('contact', array('name' => '_parent'), $folder);
+            $prop   = array('name' => '_parent', 'id' => '_parent');
+            $select = kolab_storage::folder_selector('contact', $prop, $folder);
 
-            $form['props']['fieldsets']['location']['content']['path'] = array(
+            $form['properties']['fields']['parent'] = array(
                 'label' => $this->plugin->gettext('parentbook'),
                 'value' => $select->show(strlen($folder) ? $path_imap : ''),
+                'id'    => '_parent',
             );
         }
 
-        // Allow plugins to modify address book form content (e.g. with ACL form)
-        $plugin = $this->rc->plugins->exec_hook('addressbook_form',
-            array('form' => $form, 'options' => $options, 'name' => $folder));
-
-        $form = $plugin['form'];
-
-        // Set form tags and hidden fields
-        list($form_start, $form_end) = $this->get_form_tags($attrib, 'plugin.book-save', null, $hidden_fields);
-
-        unset($attrib['form']);
-
-        // return the complete edit form as table
-        $out = "$form_start\n";
-
-        // Create form output
-        foreach ($form as $tab) {
-            if (!empty($tab['fieldsets']) && is_array($tab['fieldsets'])) {
-                $content = '';
-                foreach ($tab['fieldsets'] as $fieldset) {
-                    $subcontent = $this->get_form_part($fieldset);
-                    if ($subcontent) {
-                        $content .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($fieldset['name'])) . $subcontent) ."\n";
-                    }
-                }
-            }
-            else {
-                $content = $this->get_form_part($tab);
-            }
-
-            if ($content) {
-                $out .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) ."\n";
-            }
-        }
-
-        $out .= "\n$form_end";
+        $form_html = kolab_utils::folder_form($form, $folder, 'calendar', $hidden_fields);
 
-        return $out;
+        return html::tag('form', $attrib + array('action' => 'plugin.book-save', 'method' => 'post', 'id' => 'bookpropform'), $form_html);
     }
 
     /**
@@ -295,58 +253,4 @@
 
         return $p;
     }
-
-
-    private function get_form_part($form)
-    {
-        $content = '';
-
-        if (is_array($form['content']) && !empty($form['content'])) {
-            $table = new html_table(array('cols' => 2, 'class' => 'propform'));
-            foreach ($form['content'] as $col => $colprop) {
-                $colprop['id'] = '_'.$col;
-                $label = !empty($colprop['label']) ? $colprop['label'] : $this->rc->gettext($col);
-
-                $table->add('title', sprintf('<label for="%s">%s</label>', $colprop['id'], rcube::Q($label)));
-                $table->add(null, $colprop['value']);
-            }
-            $content = $table->show();
-        }
-        else {
-            $content = $form['content'];
-        }
-
-        return $content;
-    }
-
-
-    private function get_form_tags($attrib, $action, $id = null, $hidden = null)
-    {
-        $form_start = $form_end = '';
-
-        $request_key = $action . (isset($id) ? '.'.$id : '');
-        $form_start = $this->rc->output->request_form(array(
-            'name'    => 'form',
-            'method'  => 'post',
-            'task'    => $this->rc->task,
-            'action'  => $action,
-            'request' => $request_key,
-            'noclose' => true,
-        ) + $attrib);
-
-        if (is_array($hidden)) {
-            foreach ($hidden as $field) {
-                $hiddenfield = new html_hiddenfield($field);
-                $form_start .= $hiddenfield->show();
-            }
-        }
-
-        $form_end = !strlen($attrib['form']) ? '</form>' : '';
-
-        $EDIT_FORM = !empty($attrib['form']) ? $attrib['form'] : 'form';
-        $this->rc->output->add_gui_object('editform', $EDIT_FORM);
-
-        return array($form_start, $form_end);
-    }
-
 }

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php Changed

@@ -290,10 +290,12 @@
     /**
      * List all active contact groups of this source
      *
-     * @param string  Optional search string to match group name
+     * @param string Optional search string to match group name
+     * @param int    Search mode. Sum of self::SEARCH_*
+     *
      * @return array  Indexed list of contact groups, each a hash array
      */
-    function list_groups($search = null)
+    function list_groups($search = null, $mode = 0)
     {
         $this->_fetch_groups();
         $groups = array();
@@ -353,7 +355,7 @@
 
             // get members by UID
             if (!empty($uids)) {
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), !$fetch_all);
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), $fetch_all ? false : count($uids));
                 $this->sortindex = array_merge($this->sortindex, $local_sortindex);
             }
         }
@@ -361,7 +363,7 @@
             $ids = $this->filter['ids'];
             if (count($ids)) {
                 $uids = array_map(array($this, 'id2uid'), $this->filter['ids']);
-                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), true);
+                $this->_fetch_contacts($query = array(array('uid', '=', $uids)), count($ids));
             }
         }
         else {
@@ -792,14 +794,16 @@
 
     /**
      * Remove all records from the database
+     *
+     * @param bool $with_groups Remove also groups
      */
-    public function delete_all()
+    public function delete_all($with_groups = false)
     {
         if ($this->storagefolder->delete_all()) {
-            $this->contacts = array();
+            $this->contacts  = array();
             $this->sortindex = array();
-            $this->dataset = null;
-            $this->result = null;
+            $this->dataset   = null;
+            $this->result    = null;
         }
     }
 
@@ -881,9 +885,11 @@
      *
      * @param string Group identifier
      * @param string New name to set for this group
+     * @param string New group identifier (if changed, otherwise don't set)
+     *
      * @return boolean New name on success, false if no data was changed
      */
-    function rename_group($gid, $newname)
+    function rename_group($gid, $newname, &$newid)
     {
         $this->_fetch_groups();
         $list = $this->distlists[$gid];
@@ -1029,10 +1035,11 @@
      * If input not valid, the message to display can be fetched using get_error()
      *
      * @param array Associative array with contact data to save
+     * @param bool  Attempt to fix/complete data automatically
      *
      * @return boolean True if input is valid, False if not.
      */
-    public function validate(&$save_data)
+    public function validate(&$save_data, $autofix = false)
     {
         // validate e-mail addresses
         $valid = parent::validate($save_data);
@@ -1059,10 +1066,13 @@
     {
         if (!isset($this->dataset) || !empty($query)) {
             if ($limit) {
-                $this->storagefolder->set_order_and_limit($this->_sort_columns(), $this->page_size, ($this->list_page-1) * $this->page_size);
+                $size = is_int($limit) && $limit < $this->page_size ? $limit : $this->page_size;
+                $this->storagefolder->set_order_and_limit($this->_sort_columns(), $size, ($this->list_page-1) * $this->page_size);
             }
+
             $this->sortindex = array();
-            $this->dataset = $this->storagefolder->select($query);
+            $this->dataset   = $this->storagefolder->select($query);
+
             foreach ($this->dataset as $idx => $record) {
                 $contact = $this->_to_rcube_contact($record);
                 $this->sortindex[$idx] = $this->_sort_string($contact);

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/localization/cs_CZ.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/cs_CZ.inc Changed

@@ -47,12 +47,12 @@
 $labels['showhistory'] = 'Ukázat historii';
 $labels['objectchangelog'] = 'Historie změn';
 $labels['objectdiff'] = 'Změny od $rev1 do $rev2';
-$labels['revisionrestoreconfirm'] = 'Opravdu chcete obnovit pozměnění $rev tohoto kontaktu? To nahradí současný kontakt s starou verzí.';
-$labels['objectnotfound'] = 'Nepodařilo se načíst data kontaktu';
-$labels['objectchangelognotavailable'] = 'Historie změn není k dispozici pro tento kontakt';
+$labels['revisionrestoreconfirm'] = 'Opravdu chcete obnovit pozměnění $rev tohoto kontaktu? To nahradí současný kontakt se starou verzí.';
+$labels['objectnotfound'] = 'Nepodařilo se nahrát data kontaktu';
+$labels['objectchangelognotavailable'] = 'Historie změn není dostupná pro tento kontakt';
 $labels['objectdiffnotavailable'] = 'Pro vybrané verze není žádné srovnání možné';
-$labels['objectrestoresuccess'] = 'Pozměnění $rev úspěšně obnoveno';
-$labels['objectrestoreerror'] = 'Nepodařilo se obnovit staré pozměnění';
+$labels['objectrestoresuccess'] = 'Změna $rev úspěšně obnovena';
+$labels['objectrestoreerror'] = 'Nepodařilo se obnovit starou změnu';
 $messages['bookdeleteconfirm']  = 'Opravdu chcete smazat označený adresář a veškeré obsažené kontakty?';
 $messages['bookdeleting'] = 'Maže se adresář...';
 $messages['booksaving'] = 'Adresář se ukládá...';

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/localization/da_DK.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/da_DK.inc Changed

@@ -38,15 +38,18 @@
 $labels['personalonly'] = 'Kun personlige adresse';
 $labels['globalonly'] = 'Kun globale adressebøger';
 $labels['findaddressbooks'] = 'Find adressebøger';
-$labels['searchterms'] = 'Search terms';
+$labels['searchterms'] = 'Søgetermer';
 $labels['listsearchresults'] = 'Yderligere adressebøger';
 $labels['foldersearchform'] = 'Søgeformular for adressebog';
-$labels['foldersubscribe'] = 'List permanently';
+$labels['foldersubscribe'] = 'Vis permanent';
 $labels['nraddressbooksfound'] = 'Der blev fundet $nr adressebøger ';
 $labels['noaddressbooksfound'] = 'Fandt ingen adressebøger';
 $labels['showhistory'] = 'Vis historik';
 $labels['objectchangelog'] = 'Ændringshistorik';
 $labels['objectdiff'] = 'Ændringer fra $rev1 til $rev2';
+$labels['revisionrestoreconfirm'] = 'Er du sikker på at du vil genskabe revision $rev af denne kontakt? Det vil overskirve den nuværende kontakt med en tidligere version.';
+$labels['objectnotfound'] = 'Kunne ikke læse kontakt data';
+$labels['objectchangelognotavailable'] = 'Ændringshistorik er ikke tilgængelig for denne kontakt.';
 $labels['objectdiffnotavailable'] = 'Det er ikke muligt at sammenligne de valgte revisioner';
 $labels['objectrestoresuccess'] = 'Revision $rev blev genskabt';
 $labels['objectrestoreerror'] = 'Mislykkedes med at genskabe den gamle revision';

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/de_CH.inc Changed

@@ -30,19 +30,13 @@
 $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['showhistory'] = 'Verlauf anzeigen';
-$labels['objectchangelog'] = 'Änderungsverlauf';
-$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
-$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
-$labels['objectrestoresuccess'] = 'Version $rev erfolgreich wiederhergestellt';
-$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Version';
-$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['findaddressbooks'] = 'Adressbücher finden';
 $labels['searchterms'] = 'Suchbegriffe';
 $labels['listsearchresults'] = 'Zusätzliche Adressbücher';
@@ -50,9 +44,15 @@
 $labels['foldersubscribe'] = 'Permanent anzeigen';
 $labels['nraddressbooksfound'] = '$nr Adressbücher gefunden';
 $labels['noaddressbooksfound'] = 'Keine Adressbücher gefunden';
+$labels['showhistory'] = 'Verlauf anzeigen';
+$labels['objectchangelog'] = 'Änderungsverlauf';
+$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'] = 'Version $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Version';
 $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...';

iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/el.inc Added

@@ -0,0 +1,47 @@
+<?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'] = 'Αρχικά';
+$labels['profession'] = 'Επάγγελμα';
+$labels['officelocation'] = 'Τοποθεσία γραφείου';
+$labels['children'] = 'Παιδί';
+$labels['pgppublickey'] = 'Δημόσιο κλειδί PGP';
+$labels['pkcs7publickey'] = 'Δημόσιο κλειδί S/MIME';
+$labels['typebusiness'] = 'Εργασία';
+$labels['typebusinessfax'] = 'Fax εργασίας';
+$labels['typecompany'] = 'Εταιρία';
+$labels['typeprimary'] = 'Πρωτεύον';
+$labels['typetelex'] = 'Telex';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['settings'] = 'Ρυθμίσεις';
+$labels['bookcreate'] = 'Δημιουργία βιβλίου διευθύνσεων';
+$labels['bookedit'] = 'Επεξεργασία βιβλίου διευθύνσεων';
+$labels['bookdelete'] = 'Διαγραφή βιβλίου διευθύνσεων';
+$labels['bookremove'] = 'Αφαίρεση από την λίστα';
+$labels['bookproperties'] = 'Ιδιότητες βιβλίου διευθύνσεων';
+$labels['bookname'] = 'Όνομα βιβλίου';
+$labels['bookshowurl'] = 'Εμφάνιση URL για CardDAV';
+$labels['carddavurldescription'] = 'Αντιγράψτε αυτή τη διεύθυνση στον πελάτη <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> για πλήρη συγχρονισμό του συγκεκριμένου βιβλίου με τον υπολογιστή σας ή το κινητό σας.';
+$labels['findaddressbooks'] = 'Εύρεση βιβλίων διευθύνσεων';
+$labels['searchterms'] = 'Όροι αναζήτησης';
+$labels['listsearchresults'] = 'Επιπλέον βιβλία διευθύνσεων';
+$labels['showhistory'] = 'Προβολή ιστορικού';
+$labels['objectchangelog'] = 'Αλλαγή ιστορικού';
+$labels['objectnotfound'] = 'Αποτυχία φόρτωσης δεδομένων επαφής';
+$messages['bookdeleting'] = 'Γίνεται διαγραφή βιβλίου διευθύνσεων...';
+$messages['booksaving'] = 'Γίνεται αποθήκευση βιβλίου διευθύνσεων';
+$messages['bookdeleted'] = 'Επιτυχημένη διαγραφή βιβλίου διευθύνσεων.';
+$messages['bookupdated'] = 'Επιτυχημένη ενημέρωση βιβλίου διευθύνσεων.';
+$messages['bookcreated'] = 'Επιτυχημένη δημιουργία βιβλίου διευθύνσεων.';
+$messages['bookdeleteerror'] = 'Παρουσιάστηκε σφάλμα κατά την διαγραφή του βιβλίου διευθύνσεων.';
+$messages['bookupdateerror'] = 'Παρουσιάστηκε σφάλμα κατά την ενημέρωση του βιβλίου διευθύνσεων.';
+$messages['bookcreateerror'] = 'Παρουσιάστηκε σφάλμα κατά την δημιουργία του βιβλίου διευθύνσεων.';
+$messages['nobooknamewarning'] = 'Παρακαλούμε, εισάγετε όνομα του βιβλίου διευθύνσεων.';
+$messages['noemailnamewarning'] = 'Παρακαλούμε, εισάγετε διεύθυνση ηλεκτρονικου ταχυδρομείου ή όνομα επαφής.';
+?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/es_ES.inc Changed

@@ -7,14 +7,61 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_addressbook/
  */
 $labels['initials'] = 'Iniciales';
+$labels['profession'] = 'Profesión';
+$labels['officelocation'] = 'Ubicación de la oficina';
+$labels['children'] = 'Niños';
+$labels['pgppublickey'] = 'Llave pública PGP';
+$labels['pkcs7publickey'] = 'Llave pública S/MIME';
+$labels['freebusyurl'] = 'URL Fee-busy';
+$labels['typebusiness'] = 'Negocio';
+$labels['typebusinessfax'] = 'Fax del negocio';
 $labels['typecompany'] = 'Compania';
+$labels['typeprimary'] = 'Principal';
+$labels['typetelex'] = 'Telex';
+$labels['typeradio'] = 'Radio';
+$labels['typeisdn'] = 'ISDN';
+$labels['typettytdd'] = 'TTY/TDD';
+$labels['typecallback'] = 'Devolución de llamada';
 $labels['settings'] = 'Servicios';
+$labels['bookcreate'] = 'Crear libreta de direcciones';
+$labels['bookedit'] = 'Editar libreta de direcciones';
+$labels['bookdelete'] = 'Borrar libreta de direcciones';
 $labels['bookremove'] = 'Remove from list';
+$labels['bookproperties'] = 'Propiedades de la libreta de direcciones';
+$labels['bookname'] = 'Nombre de la libreta';
+$labels['parentbook'] = 'Libreta superior';
+$labels['bookshowurl'] = 'Mostrar URL CardDAV';
+$labels['carddavurldescription'] = 'Copie esta dirección <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank"> CardDAV </a> en una aplicación de cliente para sincronizar totalmente esta libreta de direcciones específica con su ordenador o dispositivo móvil .';
+$labels['addressbookprio'] = 'Selección/comportamiento de la libreta de direcciones';
+$labels['personalfirst'] = 'Libreta de direcciones personal primero';
+$labels['globalfirst'] = 'Libreta de direcciones global primero';
+$labels['personalonly'] = 'Libreta de direcciones personal solo';
+$labels['globalonly'] = 'Libreta de direcciones global solo';
+$labels['findaddressbooks'] = 'Encontrar libreta de direcciones';
 $labels['searchterms'] = 'Search terms';
+$labels['listsearchresults'] = 'Libreta de direcciones adicional';
+$labels['foldersearchform'] = 'Formulario de búsqueda de la libreta de direcciones';
 $labels['foldersubscribe'] = 'List permanently';
+$labels['nraddressbooksfound'] = '$nr libreta de direcciones encontradas';
+$labels['noaddressbooksfound'] = 'No se han encontrado libreta de direcciones';
+$labels['showhistory'] = 'Mostrar historial';
 $labels['objectchangelog'] = 'Cambiar historial';
 $labels['objectdiff'] = 'Cambiar de $rev1 a $rev2';
+$labels['revisionrestoreconfirm'] = '¿Realmente desea restaurar la revisión $rev de este contacto? Esto reemplazará el contacto actual con la antigua versión.';
+$labels['objectnotfound'] = 'No pudo cargarse los datos de contacto';
+$labels['objectchangelognotavailable'] = 'El historial de cambios no está disponible para este contacto';
 $labels['objectdiffnotavailable'] = 'No hay comparación posible que las revisiones seleccionadas';
 $labels['objectrestoresuccess'] = 'Revisión $rev restaurado correctamente';
 $labels['objectrestoreerror'] = 'No se pudo restaurar la revisión antigua';
+$messages['bookdeleteconfirm']  = '¿Está seguro de eliminar esta libreta de direcciones y todas sus contactos?';
+$messages['bookdeleting'] = 'Borrando libreta de direcciones...';
+$messages['booksaving'] = 'Guardando libreta de direcciones...';
+$messages['bookdeleted'] = 'Se ha eliminado la libreta de direcciones con éxito.';
+$messages['bookupdated'] = 'Se ha cargado la libreta de direcciones con éxito.';
+$messages['bookcreated'] = 'Se ha creado la libreta de direcciones con éxito.';
+$messages['bookdeleteerror'] = 'Se ha producido un error durante la eliminación de la libreta de direcciones.';
+$messages['bookupdateerror'] = 'Se ha producido un error durante la actualización de la libreta de direcciones.';
+$messages['bookcreateerror'] = 'Se ha producido un error durante la creación de la libreta de direcciones.';
+$messages['nobooknamewarning'] = 'Introducir un nombre para la libreta de direcciones';
+$messages['noemailnamewarning'] = 'Introduzca una dirección de correo electrónico o nombre de contacto';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/fr_FR.inc Changed

@@ -9,12 +9,12 @@
 $labels['initials'] = 'Initiales';
 $labels['profession'] = 'Profession';
 $labels['officelocation'] = 'Emplacement du bureau';
-$labels['children'] = 'Enfant';
+$labels['children'] = 'Enfants';
 $labels['pgppublickey'] = 'Clé publique PGP';
 $labels['pkcs7publickey'] = 'Clé publique S/MIME';
-$labels['freebusyurl'] = 'URL Disponible/Occupé';
+$labels['freebusyurl'] = 'URL disponible/occupé';
 $labels['typebusiness'] = 'Travail';
-$labels['typebusinessfax'] = 'Fax Travail';
+$labels['typebusinessfax'] = 'Fax travail';
 $labels['typecompany'] = 'Société';
 $labels['typeprimary'] = 'Principal';
 $labels['typetelex'] = 'Télex';
@@ -23,42 +23,45 @@
 $labels['typettytdd'] = 'TTY/TDD';
 $labels['typecallback'] = 'Rappel';
 $labels['settings'] = 'Paramètres';
-$labels['bookcreate'] = 'Créer un carnet d\'adresse';
-$labels['bookedit'] = 'Modifier un carnet d\'adresse';
-$labels['bookdelete'] = 'Supprimer un carnet d\'adresse';
-$labels['bookremove'] = 'supprimer de la liste';
-$labels['bookproperties'] = 'Propriétés du carnet d\'adresse';
+$labels['bookcreate'] = 'Créer un carnet d\'adresses';
+$labels['bookedit'] = 'Modifier un carnet d\'adresses';
+$labels['bookdelete'] = 'Supprimer un carnet d\'adresses';
+$labels['bookremove'] = 'Supprimer de la liste';
+$labels['bookproperties'] = 'Propriétés du carnet d\'adresses';
 $labels['bookname'] = 'Nom du carnet';
 $labels['parentbook'] = 'Carnet parent';
 $labels['bookshowurl'] = 'Afficher l\'URL CardDAV';
-$labels['carddavurldescription'] = 'Copiez cette adresse vers une application client compatible <a href="http://fr.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> pour synchroniser ce carnet d\'adresse avec votre ordinateur ou votre smartphone.';
+$labels['carddavurldescription'] = 'Copiez cette adresse dans une application client compatible <a href="http://fr.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> pour synchroniser ce carnet d\'adresses avec votre ordinateur ou votre smartphone.';
 $labels['addressbookprio'] = 'Sélection du(des) carnet(s) d\'adresses/comportement';
-$labels['personalfirst'] = 'Carnet(s) d\'adresse personnel en premier';
-$labels['globalfirst'] = 'Carnet(s) d\'adresse global(aux) en premier';
-$labels['personalonly'] = 'Carnet(s) d\'adresse personnel seulement';
+$labels['personalfirst'] = 'Carnet(s) d\'adresses personnel(s) en premier';
+$labels['globalfirst'] = 'Carnet(s) d\'adresses global(aux) en premier';
+$labels['personalonly'] = 'Carnet(s) d\'adresses personnel(s) seulement';
 $labels['globalonly'] = 'Carnet(s) d\'adresse global(aux) seulement';
-$labels['findaddressbooks'] = 'trouver carnets d\'adresse';
+$labels['findaddressbooks'] = 'Trouver carnets d\'adresses';
 $labels['searchterms'] = 'Critères de recherche';
 $labels['listsearchresults'] = 'Carnets d\'adresses supplémentaires';
-$labels['foldersearchform'] = 'Critères de recherche de carnet d\'adresse';
+$labels['foldersearchform'] = 'Formulaire de recherche carnet d\'adresses';
 $labels['foldersubscribe'] = 'Lister définitivement';
-$labels['nraddressbooksfound'] = '$nr carnet d\'adresses trouvés';
-$labels['noaddressbooksfound'] = 'Aucun carnet d\'adresses trouvés';
-$labels['showhistory'] = 'Montrer historique';
+$labels['nraddressbooksfound'] = '$nr carnets d\'adresses trouvés';
+$labels['noaddressbooksfound'] = 'Aucun carnet d\'adresses trouvé';
+$labels['showhistory'] = 'Montrer l\'historique';
 $labels['objectchangelog'] = 'Historique des modifications';
-$labels['objectdiff'] = 'Modifications depuis $rev1 jusqu\'à $rev2';
+$labels['objectdiff'] = 'Modifications de $rev1 à $rev2';
+$labels['revisionrestoreconfirm'] = 'Souhaitez-vous restaurer la révision $rev  de ce contrat ? Cela remplacera le contrat actuel par l\'ancienne version.';
+$labels['objectnotfound'] = 'Échec de chargement des données de contact';
+$labels['objectchangelognotavailable'] = 'L\'historique des changements n\'est pas disponible pour ce contrat';
 $labels['objectdiffnotavailable'] = 'La comparaison des versions sélectionnées est impossible';
 $labels['objectrestoresuccess'] = 'La révision $rev a été restaurée avec succès';
 $labels['objectrestoreerror'] = 'Échec lors de la restauration de la précédente révision';
-$messages['bookdeleteconfirm']  = 'Voulez-vous vraiment supprimer le carnet d\'adresse sélectionné et tous ses contacts?';
-$messages['bookdeleting'] = 'Suppression du carnet d\'adresse...';
-$messages['booksaving'] = 'Enregistrement du carnet d\'adresse...';
-$messages['bookdeleted'] = 'Carnet d\'adresse supprimé.';
-$messages['bookupdated'] = 'Carnet d\'adresse modifié.';
-$messages['bookcreated'] = 'Carnet d\'adresse créé.';
-$messages['bookdeleteerror'] = 'Une erreur est survenue lors de la suppression du carnet d\'adresse.';
-$messages['bookupdateerror'] = 'Une erreur est survenue lors de la modification du carnet d\'adresse.';
-$messages['bookcreateerror'] = 'Une erreur est survenue lors de la création du carnet d\'adresse.';
-$messages['nobooknamewarning'] = 'Merci de saisir un nom pour le carnet d\'adresse';
+$messages['bookdeleteconfirm']  = 'Voulez-vous vraiment supprimer le carnet d\'adresses sélectionné et tous ses contacts ?';
+$messages['bookdeleting'] = 'Suppression du carnet d\'adresses...';
+$messages['booksaving'] = 'Enregistrement du carnet d\'adresses...';
+$messages['bookdeleted'] = 'Carnet d\'adresses supprimé.';
+$messages['bookupdated'] = 'Carnet d\'adresses modifié.';
+$messages['bookcreated'] = 'Carnet d\'adresses créé.';
+$messages['bookdeleteerror'] = 'Une erreur est survenue lors de la suppression du carnet d\'adresses.';
+$messages['bookupdateerror'] = 'Une erreur est survenue lors de la modification du carnet d\'adresses.';
+$messages['bookcreateerror'] = 'Une erreur est survenue lors de la création du carnet d\'adresses.';
+$messages['nobooknamewarning'] = 'Merci de saisir un nom pour le carnet d\'adresses';
 $messages['noemailnamewarning'] = 'Merci de saisir une adresse de courriel ou un nom de contact.';
 ?>

iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/lv.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/nl_NL.inc Changed

@@ -10,44 +10,58 @@
 $labels['profession'] = 'Beroep';
 $labels['officelocation'] = 'Kantoorlocatie';
 $labels['children'] = 'Kinderen';
-$labels['pgppublickey'] = 'PGP publieke sleutel';
-$labels['pkcs7publickey'] = 'S/MIME publieke sleutel';
-$labels['freebusyurl'] = 'Vrij/Bezet URL';
+$labels['pgppublickey'] = 'Openbare PGP-sleutel';
+$labels['pkcs7publickey'] = 'Openbare S/MIME-sleutel';
+$labels['freebusyurl'] = 'URL Beschikbaar/Bezet';
 $labels['typebusiness'] = 'Zakelijk';
-$labels['typebusinessfax'] = 'Zakelijk (Fax)';
-$labels['typecompany'] = 'Bedrijfsnaam';
+$labels['typebusinessfax'] = 'Fax op werk';
+$labels['typecompany'] = 'Bedrijf';
 $labels['typeprimary'] = 'Primair';
 $labels['typetelex'] = 'Telex';
 $labels['typeradio'] = 'Radio';
 $labels['typeisdn'] = 'ISDN';
 $labels['typettytdd'] = 'TTY/TDD';
-$labels['typecallback'] = 'Callback';
+$labels['typecallback'] = 'Terugbellen';
 $labels['settings'] = 'Instellingen';
-$labels['bookcreate'] = 'Maak adresboek aan';
-$labels['bookedit'] = 'Wijzig adresboek';
+$labels['bookcreate'] = 'Adresboek maken';
+$labels['bookedit'] = 'Adresboek bewerken';
 $labels['bookdelete'] = 'Adresboek verwijderen';
-$labels['bookremove'] = 'Remove from list';
-$labels['bookproperties'] = 'Eigenschappen voor adresboek';
-$labels['bookname'] = 'Adresboek naam';
-$labels['parentbook'] = 'Toevoegen aan bestaand adresboek';
-$labels['bookshowurl'] = 'Toon CardDAV URL';
-$labels['carddavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a> programma om het volledige adresboek te synchroniseren met uw computer of mobiel apparaat.';
-$labels['addressbookprio'] = 'Gedrag voor adresboek(en)-selectie';
-$labels['personalfirst'] = 'Eerst persoonlijke adresboek(en)';
-$labels['globalfirst'] = 'Eerst globale adresboek(en)';
-$labels['personalonly'] = 'Alleen persoonlijke adresboek(en)';
-$labels['globalonly'] = 'Alleen globale adresboek(en)';
-$labels['searchterms'] = 'Search terms';
-$labels['foldersubscribe'] = 'Permanent weergeven';
-$messages['bookdeleteconfirm']  = 'Weet u zeker dat u het geselecteerde adresboek inclusief inhoud wilt verwijderen?';
-$messages['bookdeleting'] = 'Adresboek aan het verwijderen...';
-$messages['booksaving'] = 'Adresboek aan het opslaan...';
-$messages['bookdeleted'] = 'Adresboek succesvol verwijderd.';
-$messages['bookupdated'] = 'Adresboek succesvol gewijzigd.';
-$messages['bookcreated'] = 'Adresboek succesvol aangemaakt.';
-$messages['bookdeleteerror'] = 'Er heeft zich een fout voorgedaan bij het verwijderen van het adresboek.';
-$messages['bookupdateerror'] = 'Er heeft zich een fout voorgedaan bij het wijzigen van het adresboek.';
-$messages['bookcreateerror'] = 'Er heeft zich een fout voorgedaan bij het aanmaken van het adresboek.';
-$messages['nobooknamewarning'] = 'Voer een naam voor het adresboek in, a.u.b.';
-$messages['noemailnamewarning'] = 'Voor een e-mail adres of contactnaam in, a.u.b.';
+$labels['bookremove'] = 'Verwijderen uit lijst';
+$labels['bookproperties'] = 'Adresboekeigenschappen';
+$labels['bookname'] = 'Adresboeknaam';
+$labels['parentbook'] = 'Primair adresboek';
+$labels['bookshowurl'] = 'CardDAV-URL tonen';
+$labels['carddavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CardDAV" target="_blank">CardDAV</a>-client om dit specifieke adresboek volledig te synchroniseren met uw computer of mobiele apparaat.';
+$labels['addressbookprio'] = 'Selectie/gedrag van adresboek(en)';
+$labels['personalfirst'] = 'Eerst persoonlijke adresboeken';
+$labels['globalfirst'] = 'Eerst algemene adresboeken';
+$labels['personalonly'] = 'Alleen persoonlijke adresboeken';
+$labels['globalonly'] = 'Alleen algemene adresboeken';
+$labels['findaddressbooks'] = 'Adresboeken zoeken';
+$labels['searchterms'] = 'Zoektermen';
+$labels['listsearchresults'] = 'Extra adresboeken';
+$labels['foldersearchform'] = 'Zoekformulier voor adresboeken';
+$labels['foldersubscribe'] = 'Definitief weergeven';
+$labels['nraddressbooksfound'] = '$nr adresboeken gevonden';
+$labels['noaddressbooksfound'] = 'Geen adresboeken gevonden';
+$labels['showhistory'] = 'Geschiedenis tonen';
+$labels['objectchangelog'] = 'Geschiedenis wijzigen';
+$labels['objectdiff'] = 'Wijzigingen van $rev1 tot $rev2';
+$labels['revisionrestoreconfirm'] = 'Weet u zeker dat u revisie $rev van deze contactpersoon wilt herstellen? Met deze actie vervangt u de huidige contactpersoon door de oude versie.';
+$labels['objectnotfound'] = 'Laden van contactpersoonsgegevens is mislukt';
+$labels['objectchangelognotavailable'] = 'Voor deze contactpersoon kunt u de geschiedenis niet wijzigen';
+$labels['objectdiffnotavailable'] = 'Geen vergelijking mogelijk voor de geselecteerde revisies';
+$labels['objectrestoresuccess'] = 'Revisie $rev met succes hersteld';
+$labels['objectrestoreerror'] = 'Herstellen van oude revisie is mislukt';
+$messages['bookdeleteconfirm']  = 'Weet u zeker dat u het geselecteerde adresboek en alle contactpersonen erin wilt verwijderen?';
+$messages['bookdeleting'] = 'Adresboek verwijderen...';
+$messages['booksaving'] = 'Adresboek opslaan...';
+$messages['bookdeleted'] = 'Adresboek is met succes verwijderd.';
+$messages['bookupdated'] = 'Adresboek is met succes bijgewerkt.';
+$messages['bookcreated'] = 'Adresboek is met succes gemaakt.';
+$messages['bookdeleteerror'] = 'Er is een fout opgetreden tijdens de verwijdering van het adresboek.';
+$messages['bookupdateerror'] = 'Er is een fout opgetreden tijdens het bijwerken van het adresboek.';
+$messages['bookcreateerror'] = 'Er is een fout opgetreden tijdens het maken van het adresboek.';
+$messages['nobooknamewarning'] = 'Voer een naam voor het adresboek in.';
+$messages['noemailnamewarning'] = 'Voor een e-mailadres of een naam van een contactpersoon in.';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/localization/pt_BR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/localization/pt_BR.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/skins/elastic/templates/audittrail.html Added

@@ -0,0 +1,143 @@
+<div id="contacthistory" class="popupmenu" aria-hidden="true">
+    <roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
+    <div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="contactdiff" class="popupmenu" aria-hidden="true">
+	<h2 class="contact-names">Contact Name</h2>
+	<h2 class="contact-names-new diff-text-new"></h2>
+
+	<div class="form-section contact-name">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-nickname">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-organization">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-department">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-jobtitle">
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-photo">
+		<img class="diff-img-old" /> &#8674;
+		<img class="diff-img-new" />
+	</div>
+
+	<div class="form-section contact-email">
+		<label><roundcube:label name="email" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-phone">
+		<label><roundcube:label name="phone" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-address">
+		<label><roundcube:label name="address" /><span class="index"></span></label>
+		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+
+	<div class="form-section contact-website">
+		<label><roundcube:label name="website" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-im">
+		<label><roundcube:label name="instantmessenger" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-gender">
+		<label><roundcube:label name="gender" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-birthday">
+		<label><roundcube:label name="birthday" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-anniversary">
+		<label><roundcube:label name="anniversary" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-profession">
+		<label><roundcube:label name="profession" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-manager">
+		<label><roundcube:label name="manager" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-assistant">
+		<label><roundcube:label name="assistant" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-spouse">
+		<label><roundcube:label name="spouse" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-children">
+		<label><roundcube:label name="children" /><span class="index"></span></label>
+		<span class="diff-text-old"></span> &#8674;
+		<span class="diff-text-new"></span>
+	</div>
+
+	<div class="form-section contact-notes">
+		<label><roundcube:label name="notes" /></label>
+		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+
+	<div class="form-section contact-freebusyurl">
+		<label><roundcube:label name="kolab_addressbook.freebusyurl" /></label>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+
+	<div class="form-section contact-pgppublickey">
+		<label><roundcube:label name="kolab_addressbook.pgppublickey" /></label>
+		<div class="diff-text-old" style="white-space:pre-wrap"></div>
+		<div class="diff-text-new" style="white-space:pre-wrap"></div>
+	</div>
+
+	<div class="form-section contact-pkcs7publickey">
+		<label><roundcube:label name="kolab_addressbook.pkcs7publickey" /></label>
+		<div class="diff-text-old" style="white-space:pre-wrap"></div>
+		<div class="diff-text-new" style="white-space:pre-wrap"></div>
+	</div>
+</div>

iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/skins/elastic/templates/search_addon.html Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css -> iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/skins/larry/kolab_addressbook.css Changed

iRony-0.4.1.tar.gz/lib/plugins/kolab_addressbook/skins/larry/templates/search_addon.html Added

@@ -0,0 +1,43 @@
+<script>
+    // append search form for address books
+    if (rcmail.gui_objects.folderlist) {
+        var container = $('#' + rcmail.gui_objects.folderlist);
+        $('<div class="listsearchbox" style="display:none">' +
+            '<div class="searchbox" role="search" aria-labelledby="aria-labelfoldersearchform" aria-controls="' + rcmail.gui_objects.folderlist + '">' +
+                '<h3 id="aria-label-labelfoldersearchform" class="voice">' + rcmail.gettext('foldersearchform', 'kolab_addressbook') + '" /></h3>' +
+                '<label for="addressbooksearch" class="voice">' + rcmail.gettext('searchterms', 'kolab_addressbook') + '</label>' +
+                '<input type="text" name="q" id="addressbooksearch" placeholder="' + rcmail.gettext('findaddressbooks', 'kolab_addressbook') + '" />' +
+                '<a class="iconbutton searchicon"></a>' +
+                '<a href="#reset" onclick="return rcmail.command(\'reset-listsearch\',null,this,event)" id="directorylistsearch-reset" class="iconbutton reset" title="' + rcmail.gettext('resetsearch') + '">' +
+                    rcmail.gettext('resetsearch') + '</a>' +
+            '</div>' +
+        '</div>')
+        .insertBefore(container.parent());
+
+        $('<a>').attr({href: "#search", "class": "iconbutton search", title: rcmail.gettext('findaddressbooks', 'kolab_addressbook'), tabindex: 0})
+            .text(rcmail.gettext('findaddressbooks', 'kolab_addressbook'))
+            .appendTo('#directorylistbox h2.boxtitle')
+            .click(function(e) {
+                var title = $('#directorylistbox .boxtitle'),
+                    box = $('#directorylistbox .listsearchbox'),
+                    dir = box.is(':visible') ? -1 : 1;
+
+                box.slideToggle({
+                    duration: 160,
+                    progress: function(animation, progress) {
+                        if (dir < 0) progress = 1 - progress;
+                        $('#directorylistbox .scroller').css('top', (title.outerHeight() + 34 * progress) + 'px');
+                    },
+                    complete: function() {
+                        box.toggleClass('expanded');
+                        if (box.is(':visible')) {
+                            box.find('input[type=text]').focus();
+                        }
+                        else {
+                            $('#directorylistsearch-reset').click();
+                        }
+                    }
+                });
+            });
+    }
+</script>

iRony-0.4.0.tar.gz/lib/plugins/kolab_auth/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_auth/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_auth/config.inc.php.dist -> iRony-0.4.1.tar.gz/lib/plugins/kolab_auth/config.inc.php.dist Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_auth/kolab_auth.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_auth/kolab_auth.php Changed

@@ -42,6 +42,7 @@
 
         $this->add_hook('authenticate', array($this, 'authenticate'));
         $this->add_hook('startup', array($this, 'startup'));
+        $this->add_hook('ready', array($this, 'ready'));
         $this->add_hook('user_create', array($this, 'user_create'));
 
         // Hook for password change
@@ -83,6 +84,69 @@
     }
 
     /**
+     * Ready hook handler
+     */
+    public function ready($args)
+    {
+        $rcmail = rcube::get_instance();
+
+        // Store user unique identifier for freebusy_session_auth feature
+        if (!($uniqueid = $rcmail->config->get('kolab_uniqueid'))) {
+            $uniqueid = $_SESSION['kolab_auth_uniqueid'];
+
+            if (!$uniqueid) {
+                // Find user record in LDAP
+                if (($ldap = self::ldap()) && $ldap->ready) {
+                    if ($record = $ldap->get_user_record($rcmail->get_user_name(), $_SESSION['kolab_host'])) {
+                        $uniqueid = $record['uniqueid'];
+                    }
+                }
+            }
+
+            if ($uniqueid) {
+                $uniqueid = md5($uniqueid);
+                $rcmail->user->save_prefs(array('kolab_uniqueid' => $uniqueid));
+            }
+        }
+
+        // Set/update freebusy_session_auth entry
+        if ($uniqueid && empty($_SESSION['kolab_auth_admin'])
+            && ($ttl = $rcmail->config->get('freebusy_session_auth'))
+        ) {
+            if ($ttl === true) {
+                $ttl = $rcmail->config->get('session_lifetime', 0) * 60;
+
+                if (!$ttl) {
+                    $ttl = 10 * 60;
+                }
+            }
+
+            $rcmail->config->set('freebusy_auth_cache', 'db');
+            $rcmail->config->set('freebusy_auth_cache_ttl', $ttl);
+
+            if ($cache = $rcmail->get_cache_shared('freebusy_auth', false)) {
+                $key      = md5($uniqueid . ':' . rcube_utils::remote_addr() . ':' . $rcmail->get_user_name());
+                $value    = $cache->get($key);
+                $deadline = new DateTime('now', new DateTimeZone('UTC'));
+
+                // We don't want to do the cache update on every request
+                // do it once in a 1/10 of the ttl
+                if ($value) {
+                    $value = new DateTime($value);
+                    $value->sub(new DateInterval('PT' . intval($ttl * 9/10) . 'S'));
+                    if ($value > $deadline) {
+                        return;
+                    }
+                }
+
+                $deadline->add(new DateInterval('PT' . $ttl . 'S'));
+
+                $cache->set($key, $deadline->format(DateTime::ISO8601));
+            }
+        }
+    }
+
+    /**
      * Startup hook handler
      */
     public function startup($args)
@@ -157,7 +221,7 @@
      * Modifies list of plugins and settings according to
      * specified LDAP roles
      */
-    public function load_user_role_plugins_and_settings()
+    public function load_user_role_plugins_and_settings($startup = false)
     {
         if (empty($_SESSION['user_roledns'])) {
             return;
@@ -262,7 +326,16 @@
 
             if (!empty($role_plugins[$role_dn])) {
                 foreach ((array)$role_plugins[$role_dn] as $plugin) {
-                    $this->api->load_plugin($plugin);
+                    $loaded = $this->api->load_plugin($plugin);
+
+                    // Some plugins e.g. kolab_2fa use 'startup' hook to
+                    // register other hooks, but when called on 'authenticate' hook
+                    // we're already after 'startup', so we'll call it directly
+                    if ($loaded && $startup && $plugin == 'kolab_2fa'
+                        && ($plugin = $this->api->get_plugin($plugin))
+                    ) {
+                        $plugin->startup(array('task' => $rcmail->task, 'action' => $rcmail->action));
+                    }
                 }
             }
         }
@@ -298,8 +371,8 @@
             if (is_writable($user_log_dir)) {
                 $args['dir'] = $user_log_dir;
             }
-            else if ($args['name'] != 'errors') {
-                $args['abort'] = true;  // don't log if unauthenticed
+            else if (!in_array($args['name'], array('errors', 'userlogins', 'sendmail'))) {
+                $args['abort'] = true;  // don't log if unauthenticed or no per-user log dir
             }
         }
 
@@ -554,6 +627,12 @@
         // we don't like to use LDAP (connection + bind + search)
         $_SESSION['kolab_auth_vars'] = $ldap->get_parse_vars();
 
+        // Store user unique identifier for freebusy_session_auth feature
+        $_SESSION['kolab_auth_uniqueid'] = is_array($record['uniqueid']) ? $record['uniqueid'][0] : $record['uniqueid'];
+
+        // Store also host as we need it for get_user_reacod() in 'ready' hook handler
+        $_SESSION['kolab_host'] = $host;
+
         // Set user login
         if ($login_attr) {
             $this->data['user_login'] = is_array($record[$login_attr]) ? $record[$login_attr][0] : $record[$login_attr];
@@ -593,7 +672,7 @@
         }
 
         // load per-user settings/plugins
-        $this->load_user_role_plugins_and_settings();
+        $this->load_user_role_plugins_and_settings(true);
 
         return $args;
     }
@@ -731,6 +810,8 @@
             return null;
         }
 
+        $addressbook['fieldmap']['uniqueid'] = 'nsuniqueid';
+
         require_once __DIR__ . '/kolab_auth_ldap.php';
 
         self::$ldap = new kolab_auth_ldap($addressbook);
@@ -778,6 +859,15 @@
         $config = rcube::get_instance()->config;
 
         if ($config->get('log_logins')) {
+            // don't fill the log with complete input, which could
+            // have been prepared by a hacker
+            if (strlen($username) > 256) {
+                $username = substr($username, 0, 256) . '...';
+            }
+            if (strlen($login_as) > 256) {
+                $login_as = substr($login_as, 0, 256) . '...';
+            }
+
             if ($login_as) {
                 $username = sprintf('%s (as user %s)', $username, $login_as);
             }
@@ -786,7 +876,7 @@
                 "Failed login for %s from %s in session %s %s",
                 $username,
                 rcube_utils::remote_ip(),
-                session_id(),
+                session_id() ?: 'no-session',
                 $message ? "($message)" : ''
             );

iRony-0.4.1.tar.gz/lib/plugins/kolab_auth/localization/el.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_auth/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_auth/localization/fr_FR.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_auth/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_auth/localization/nl_NL.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_config/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_config/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.js Changed

@@ -93,7 +93,7 @@
       });
 
       var fn = function(elem) {
-        var classname = elem.className,
+        var classname = elem.className.split(' ')[0],
           list = $(elem).closest('table').find('input.' + classname),
           check = list.not(':checked').length > 0;
 
@@ -164,29 +164,24 @@
   if (!this.env.active_delegate)
     return;
 
-  var $dialog = $("#delegate-delete-dialog").addClass('uidialog'),
-    buttons = {};
-
-  buttons[this.gettext('no', 'kolab_delegation')] = function() {
-    $dialog.dialog('close');
-  };
-  buttons[this.gettext('yes', 'kolab_delegation')] = function() {
-    $dialog.dialog('close');
-    var lock = rcmail.set_busy(true, 'kolab_delegation.savingdata');
-    rcmail.http_post('plugin.delegation-delete', {id: rcmail.env.active_delegate,
-      acl: $("#delegate-delete-dialog input:checked").length}, lock);
-  }
+  var content = $("#delegate-delete-dialog").addClass('uidialog').clone(),
+    title = this.gettext('deleteconfirm', 'kolab_delegation'),
+    save_func = function() {
+      var lock = rcmail.set_busy(true, 'kolab_delegation.savingdata'),
+        props = {id: rcmail.env.active_delegate, acl: $("#delegate-delete-dialog input:checked").length};
+      rcmail.http_post('plugin.delegation-delete', props, lock);
+      return true;
+    },
+    opts = {
+      resizable: false,
+      closeOnEscape: true,
+      width: 400,
+      button: 'kolab_delegation.yes',
+      cancel_button: 'kolab_delegation.no'
+    };
 
   // open jquery UI dialog
-  $dialog.dialog({
-    modal: true,
-    resizable: false,
-    closeOnEscape: true,
-    title: this.gettext('deleteconfirm', 'kolab_delegation'),
-    close: function() { $dialog.dialog('destroy').hide(); },
-    buttons: buttons,
-    width: 400
-  }).show();
+  this.simple_dialog(content, title, save_func, opts);
 };
 
   // submit delegate form to the server

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/kolab_delegation.php Changed

@@ -59,6 +59,9 @@
         // delegation support in kolab_auth plugin
         $this->add_hook('kolab_auth_emails', array($this, 'kolab_auth_emails'));
 
+        // delegation support in Enigma plugin
+        $this->add_hook('enigma_user_identities', array($this, 'user_identities'));
+
         if ($this->rc->task == 'settings') {
             // delegation management interface
             $this->register_action('plugin.delegation',              array($this, 'controller_ui'));
@@ -315,6 +318,28 @@
     }
 
     /**
+     * Delegation support in Enigma plugin
+     */
+    public function user_identities($args)
+    {
+        // Remove delegators' identities from the key generation form
+
+        if (!empty($_SESSION['delegators'])) {
+            $args['identities'] = array_filter($args['identities'], function($ident) {
+                foreach ($_SESSION['delegators'] as $emails) {
+                    if (in_array($ident['email'], $emails)) {
+                        return false;
+                    }
+                }
+
+                return true;
+            });
+        }
+
+        return $args;
+    }
+
+    /**
      * Delegation UI handler
      */
     public function controller_ui()
@@ -487,6 +512,7 @@
         }
 
         $folder_data   = $engine->list_folders($delegate['uid']);
+        $use_fieldsets = rcube_utils::get_boolean($attrib['use-fieldsets']);
         $rights        = array();
         $folder_groups = array();
 
@@ -500,10 +526,17 @@
             if (empty($group)) {
                 continue;
             }
+
             $attrib['type'] = $type;
-            $html .= html::div('foldersblock',
-                html::tag('h3', $type, $this->gettext($type)) .
-                    $this->delegate_folders_block($group, $attrib, $rights));
+            $table = $this->delegate_folders_block($group, $attrib, $rights);
+            $label = $this->gettext($type);
+
+            if ($use_fieldsets) {
+                $html .= html::tag('fieldset', 'foldersblock', html::tag('legend', $type, $label) . $table);
+            }
+            else {
+                $html .= html::div('foldersblock', html::tag('h3', $type, $label) . $table);
+            }
         }
 
         $this->rc->output->add_gui_object('folderslist', $attrib['id']);
@@ -521,8 +554,8 @@
         $write_ico = $attrib['writeicon'] ? html::img(array('src' => $path . $attrib['writeicon'], 'title' => $this->gettext('write'))) : '';
 
         $table = new html_table(array('cellspacing' => 0));
-        $table->add_header(array('class' => 'read', 'title' => $this->gettext('read'), 'tabindex' => 0), $read_ico);
-        $table->add_header(array('class' => 'write', 'title' => $this->gettext('write'), 'tabindex' => 0), $write_ico);
+        $table->add_header(array('class' => 'read checkbox-cell', 'title' => $this->gettext('read'), 'tabindex' => 0), $read_ico);
+        $table->add_header(array('class' => 'write checkbox-cell', 'title' => $this->gettext('write'), 'tabindex' => 0), $write_ico);
         $table->add_header('foldername', $this->rc->gettext('folder'));
 
         $checkbox_read  = new html_checkbox(array('name' => 'read[]', 'class' => 'read'));
@@ -530,7 +563,7 @@
 
         $names = array();
         foreach ($a_folders as $folder) {
-            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_name($folder));
+            $foldername = $origname = preg_replace('/^INBOX &raquo;\s+/', '', kolab_storage::object_prettyname($folder));
 
             // find folder prefix to truncate (the same code as in kolab_addressbook plugin)
             for ($i = count($names)-1; $i >= 0; $i--) {
@@ -553,10 +586,10 @@
             }
 
             $table->add_row();
-            $table->add('read', $checkbox_read->show(
+            $table->add('read checkbox-cell', $checkbox_read->show(
                 $rights[$folder] >= kolab_delegation_engine::ACL_READ ? $folder : null,
                 array('value' => $folder)));
-            $table->add('write', $checkbox_write->show(
+            $table->add('write checkbox-cell', $checkbox_write->show(
                 $rights[$folder] >= kolab_delegation_engine::ACL_WRITE ? $folder : null,
                 array('value' => $folder, 'id' => $folder_id)));

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/de_CH.inc Changed

@@ -7,6 +7,7 @@
  * 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';
@@ -16,6 +17,8 @@
 $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...';
@@ -28,9 +31,6 @@
 $labels['updateerror'] = 'Vertreter konnte nicht aktualisiert werden.';
 $labels['createsuccess'] = 'Der Vertreter wurde erfolgreich hinzugefügt.';
 $labels['createerror'] = 'Vertreter konnte nicht hinzugefügt werden.';
-$labels['delegationtitle'] = 'Verwalte Vertreter';
-$labels['read'] = 'Schreibgeschützt';
-$labels['write'] = 'Schreiben';
 $labels['arialabeldelegatedelete'] = 'Vertreter Löschen Dialog';
 $labels['arialabeldelegateform'] = 'Verterter Eigenschaften Maske';
 ?>

iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/el.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/en_US.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/es_ES.inc Changed

@@ -6,7 +6,10 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
+$labels['tabtitle'] = 'Delegación';
+$labels['delegationtitle'] = 'Gestionar delegados';
 $labels['delegates'] = 'Delegados';
+$labels['delegate'] = 'Delegado';
 $labels['mail'] = 'Correo electrónico';
 $labels['contact'] = 'Libreta de direcciones';
 $labels['event'] = 'Calendarios';
@@ -15,5 +18,19 @@
 $labels['yes'] = 'Sí';
 $labels['no'] = 'No';
 $labels['read'] = 'Solo-lectura';
+$labels['write'] = 'Escribir';
+$labels['adddelegate'] = 'Añadir delegado';
+$labels['deletedelegate'] = 'Borrar delegado';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['delegatedeleteconfirm'] = '¿Esta seguro de eliminar este delegado?';
+$labels['delegateremoveacl'] = 'retirar los derechos de acceso de todas las carpetas asignadas a este usuario';
+$labels['deleteconfirm'] = 'Confirmación';
+$labels['deletesuccess'] = 'El delegado se ha eliminado con éxito';
+$labels['deleteerror'] = 'No es posible eliminar al delegado.';
+$labels['updatesuccess'] = 'El delegado se ha actualizado con éxito.';
+$labels['updateerror'] = 'No es posible actualizar al delegado.';
+$labels['createsuccess'] = 'El delegado se ha añadido con éxito.';
+$labels['createerror'] = 'No es posible añadir al delegado.';
+$labels['arialabeldelegatedelete'] = 'Diálogo de eliminación del delegado';
+$labels['arialabeldelegateform'] = 'Formulario de propiedades del delegado';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/fr_FR.inc Changed

@@ -7,30 +7,30 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
 $labels['tabtitle'] = 'Délégation';
-$labels['delegationtitle'] = 'Gérer mainteneurs';
+$labels['delegationtitle'] = 'Gérer les délégations';
 $labels['delegates'] = 'Délégation';
 $labels['delegate'] = 'Déléguer';
 $labels['mail'] = 'Adresse de messagerie';
-$labels['contact'] = 'Carnet d\'adresse';
+$labels['contact'] = 'Carnet d\'adresses';
 $labels['event'] = 'Calendriers';
 $labels['task'] = 'Tâches';
 $labels['note'] = 'Notes';
 $labels['yes'] = 'Oui';
 $labels['no'] = 'Non';
-$labels['read'] = 'Lecture Seule';
+$labels['read'] = 'Lecture seule';
 $labels['write'] = 'Écriture';
 $labels['adddelegate'] = 'Ajouter une délégation';
 $labels['deletedelegate'] = 'Supprimer une délégation';
 $labels['savingdata'] = 'Enregistrer...';
-$labels['delegatedeleteconfirm'] = 'Voulez-vous vraiment supprimer cette délégation?';
+$labels['delegatedeleteconfirm'] = 'Voulez-vous vraiment supprimer cette délégation ?';
 $labels['delegateremoveacl'] = 'Supprimer les droits d\'accès aux dossiers affectés à cet utilisateur';
 $labels['deleteconfirm'] = 'Confirmation';
-$labels['deletesuccess'] = 'La délégation a été supprimée';
-$labels['deleteerror'] = 'La délégation n\'a pas pu être supprimée';
-$labels['updatesuccess'] = 'La délégation a été mise à jour';
-$labels['updateerror'] = 'La délégation n\'a pas pu être mise à jour';
-$labels['createsuccess'] = 'La délégation a été ajoutée';
-$labels['createerror'] = 'La délégation n\'a pas pu être ajoutée';
-$labels['arialabeldelegatedelete'] = 'Dialog de suppression du mainteneur';
-$labels['arialabeldelegateform'] = 'Formulaire de propriétés du mainteneur';
+$labels['deletesuccess'] = 'La délégation a été supprimée.';
+$labels['deleteerror'] = 'La délégation n\'a pas pu être supprimée.';
+$labels['updatesuccess'] = 'La délégation a été mise à jour.';
+$labels['updateerror'] = 'La délégation n\'a pas pu être mise à jour.';
+$labels['createsuccess'] = 'La délégation a été ajoutée.';
+$labels['createerror'] = 'La délégation n\'a pas pu être ajoutée.';
+$labels['arialabeldelegatedelete'] = 'Fenêtre de suppression de la délégation';
+$labels['arialabeldelegateform'] = 'Formulaire de propriétés de la délégation';
 ?>

iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/lv.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/nl_NL.inc Changed

@@ -7,12 +7,12 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_delegation/
  */
 $labels['tabtitle'] = 'Delegatie';
-$labels['delegationtitle'] = 'Manage delegates';
+$labels['delegationtitle'] = 'Gedelegeerden beheren';
 $labels['delegates'] = 'Gedelegeerden';
 $labels['delegate'] = 'Gedelegeerde';
-$labels['mail'] = 'Email';
+$labels['mail'] = 'E-mail';
 $labels['contact'] = 'Adresboeken';
-$labels['event'] = 'Kalenders';
+$labels['event'] = 'Agenda\'s';
 $labels['task'] = 'Taken';
 $labels['note'] = 'Notities';
 $labels['yes'] = 'Ja';
@@ -21,16 +21,16 @@
 $labels['write'] = 'Schrijven';
 $labels['adddelegate'] = 'Gedelegeerde toevoegen';
 $labels['deletedelegate'] = 'Gedelegeerde verwijderen';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['delegatedeleteconfirm'] = 'Wilt u deze gedelegeerde echt verwijderen?';
-$labels['delegateremoveacl'] = 'verwijder toegangsrechten op mappen toegewezen aan deze gebruiker';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['delegatedeleteconfirm'] = 'Weet u zeker dat u deze gedelegeerde wilt verwijderen?';
+$labels['delegateremoveacl'] = 'toegangsrechten voor mappen toegewezen aan deze gebruiker verwijderen';
 $labels['deleteconfirm'] = 'Bevestiging';
-$labels['deletesuccess'] = 'De gedelegeerde is succesvol verwijderd.';
+$labels['deletesuccess'] = 'De gedelegeerde is met succes verwijderd.';
 $labels['deleteerror'] = 'De gedelegeerde kon niet worden verwijderd.';
-$labels['updatesuccess'] = 'De gedelegeerde is succesvol gewijzigd.';
-$labels['updateerror'] = 'De gedelegeerde kon niet worden gewijzigd.';
-$labels['createsuccess'] = 'De gedelegeerde is succesvol toegevoegd.';
+$labels['updatesuccess'] = 'De gedelegeerde is met succes bijgewerkt.';
+$labels['updateerror'] = 'De gedelegeerde kon niet worden bijgewerkt.';
+$labels['createsuccess'] = 'De gedelegeerde is met succes toegevoegd.';
 $labels['createerror'] = 'De gedelegeerde kon niet worden toegevoegd.';
-$labels['arialabeldelegatedelete'] = 'Delegate deletion dialog';
-$labels['arialabeldelegateform'] = 'Delegate properties form';
+$labels['arialabeldelegatedelete'] = 'Dialoogvenster voor verwijdering van gedelegeerde';
+$labels['arialabeldelegateform'] = 'Formulier voor eigenschappen van gedelegeerde';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_delegation/localization/pt_PT.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/localization/pt_PT.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/skins/elastic/templates/editform.html Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_delegation/skins/elastic/templates/settings.html Added

@@ -0,0 +1,50 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+<roundcube:include file="includes/settings-menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_delegation.tabtitle" /></h1>
+
+
+<div class="list 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>
+		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+	</div>
+	<div class="scroller">
+		<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">
+	<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">
+			<roundcube:button command="delegate-add" type="link"
+				label="create" title="kolab_delegation.adddelegate"
+				class="button create disabled" classAct="button create" innerClass="inner" />
+			<roundcube:button command="delegate-delete" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="delete" title="kolab_delegation.deletedelegate" innerclass="inner" />
+		</div>
+	</div>
+	<div class="iframe-wrapper">
+		<roundcube:frame contentframe="delegation-frame" id="delegation-frame" src="/watermark.html" title="arialabeldelegateform" />
+	</div>
+</div>
+
+<div id="delegate-delete-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-delegatedeletedialog" aria-hidden="true">
+	<h3 id="aria-label-delegatedeletedialog" class="voice"><roundcube:label name="kolab_delegation.arialabeldelegatedelete" /></h3>
+	<p><roundcube:label name="kolab_delegation.delegatedeleteconfirm" /></p>
+	<span><input type="checkbox" value="1" checked="checked" /><roundcube:label name="kolab_delegation.delegateremoveacl" /></span>
+</div>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/config.inc.php.dist -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/config.inc.php.dist Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/kolab_files.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/kolab_files.js Changed

@@ -42,7 +42,7 @@
         var link = $('<a href="#" class="button filesaveall">')
           .text(rcmail.gettext('kolab_files.saveall'))
           .click(function() { kolab_directory_selector_dialog(); })
-          .insertAfter(attachment_list);
+          .insertAfter($('.header-content > .header-links').length ? $('.header-links > a:last') : attachment_list);
       }
 
       rcmail.addEventListener('menu-open', kolab_files_attach_menu_open);
@@ -56,7 +56,7 @@
     if (!rcmail.env.action || rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
       // add "attach from cloud" button for event/task dialog in mail
       rcmail.addEventListener('plugin.mail2event_dialog', function() {
-        if (!$('#calendar-attachment-form input.fromcloud').length)
+        if (!$('#calendar-attachment-form a.fromcloud').length)
           kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
       });
     }
@@ -64,12 +64,12 @@
   else if (rcmail.task == 'calendar') {
     // add "attach from cloud" button for event dialog
     if (!rcmail.env.action)
-      kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons'));
+      kolab_files_from_cloud_widget($('#calendar-attachment-form > div.buttons, #edit-attachments-form'));
   }
   else if (rcmail.task == 'tasks') {
     // add "attach from cloud" button for task dialog
     if (!rcmail.env.action)
-      kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons'));
+      kolab_files_from_cloud_widget($('#taskedit-attachment-form > div.buttons, #taskedit-attachments-form'));
   }
   else if (rcmail.task == 'files') {
     if (rcmail.gui_objects.fileslist) {
@@ -87,8 +87,7 @@
         .addEventListener('dragstart', function(e) { kolab_files_drag_start(e); })
         .addEventListener('dragmove', function(e) { kolab_files_drag_move(e); })
         .addEventListener('dragend', function(e) { kolab_files_drag_end(e); })
-        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'files'); })
-        .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'files'); });
 
       rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true);
 
@@ -107,8 +106,7 @@
       rcmail.sessionslist.addEventListener('dblclick', function(o) { kolab_files_sessions_list_dblclick(o); })
         .addEventListener('select', function(o) { kolab_files_sessions_list_select(o); })
         .addEventListener('keypress', function(o) { kolab_files_sessions_list_keypress(o); })
-        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'sessions'); })
-        .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+        .addEventListener('column_replace', function(e) { kolab_files_set_coltypes(e, 'sessions'); });
 
       rcmail.sessionslist.init();
       kolab_files_list_coltypes('sessions');
@@ -153,7 +151,7 @@
     sort_col: 'name',
     sort_reverse: false,
     search_threads: rcmail.env.search_threads,
-    resources_dir: rcmail.assets_path('program/resources'),
+    resources_dir: rcmail.env.files_url.replace(/\/api\/?$/, '/resources'),
     caps: rcmail.env.files_caps,
     supported_mimetypes: rcmail.env.file_mimetypes
   });
@@ -193,8 +191,8 @@
       file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
     }
     else {
-      file_api.env.folder = rcmail.env.folder;
-      file_api.env.collection = rcmail.env.collection;
+      file_api.env.init_folder = rcmail.env.folder;
+      file_api.env.init_collection = rcmail.env.collection;
       file_api.folder_list();
       file_api.browser_capabilities_check();
     }
@@ -233,14 +231,14 @@
 {
   // consider the token from parent window more reliable (fresher) than in framed window
   // it's because keep-alive is not requested in frames
-  return window.parent && parent.rcmail && parent.rcmail.env.files_token ? parent.rcmail.env.files_token : rcmail.env.files_token;
+  return rcmail.is_framed() && parent.rcmail.env.files_token ? parent.rcmail.env.files_token : rcmail.env.files_token;
 };
 
 function kolab_files_from_cloud_widget(elem)
 {
-  var input = $('<input class="button fromcloud" type="button">')
+  $('<a class="button btn btn-secondary fromcloud">')
       .attr('tabindex', $('input', elem).attr('tabindex') || 0)
-      .val(rcmail.gettext('kolab_files.fromcloud'))
+      .text(rcmail.gettext('kolab_files.fromcloud'))
       .click(function() { kolab_files_selector_dialog(); })
       .appendTo(elem);
 
@@ -251,8 +249,7 @@
       column_movable: false,
       dblclick_time: rcmail.dblclick_time
     });
-    rcmail.fileslist.addEventListener('select', function(o) { kolab_files_list_select(o); })
-      .addEventListener('listupdate', function(e) { rcmail.triggerEvent('listupdate', e); });
+    rcmail.fileslist.addEventListener('select', function(o) { kolab_files_list_select(o); });
 
     rcmail.enable_command('files-sort', 'files-search', 'files-search-reset', true);
 
@@ -339,13 +336,22 @@
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.' + label),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
+    classes: {'ui-dialog': 'selection-dialog files-dialog'},
     minWidth: 250,
     minHeight: 300,
     height: 400,
     width: 300
   }, fn);
 
+  // add link for "more options" drop-down
+  if (!dialog.find('foldercreatelink').length)
+    $('<a>')
+      .attr({href: '#', 'class': 'btn btn-link options add-folder'})
+      .text(rcmail.gettext('kolab_files.addfolder'))
+      .click(function(e) { rcmail.command('folder-create', '', this, e); })
+      .prependTo(dialog.parent().parent().find('.ui-dialog-buttonset'));
+
   // "enable" folder creation when dialog is displayed in parent window
   if (rcmail.is_framed()) {
     parent.rcmail.enable_command('folder-create', true);
@@ -393,7 +399,8 @@
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.selectfiles'),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
+    classes: {'ui-dialog': 'selection-dialog files-dialog'},
     minWidth: 500,
     minHeight: 300,
     width: 700,
@@ -454,7 +461,8 @@
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.foldercreate'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['mainaction save', 'cancel'],
+    height: 200
   });
 
   // Fix submitting form with Enter
@@ -499,7 +507,8 @@
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.folderedit'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['mainaction save', 'cancel'],
+    height: 200
   });
 
   // Fix submitting form with Enter
@@ -544,24 +553,29 @@
     kolab_dialog_close(this);
   };
 
-  // close folderoption menu
-  rcmail.hide_menu('folderoptions');
-
   // initialize drivers list
   if (!rcmail.drivers_list_initialized) {
     rcmail.drivers_list_initialized = true;
 
     $('td.source', dialog).each(function() {
-      $(this).click(function() {
+      var td = $(this),
+        id = td.attr('id').replace('source-', ''),
+        meta = rcmail.env.external_sources[id];
+
+      $.each(meta.form_values || [], function(i, v) {
+        td.find('#source-' + id + '-' + i).val(v);
+      });
+
+      td.click(function() {
         $('td.selected', dialog).removeClass('selected');
         dialog.find('.driverform').hide();
         $(this).addClass('selected').find('.driverform').show();
         $('input[type="radio"]', this).prop('checked', true);
-     });
-   });
+      });
+    });
   }
 
-  args.button_classes = ['mainaction'];
+  args.button_classes = ['mainaction save', 'cancel'];
 
   // show dialog window
   kolab_dialog_show(dialog, args, function() {
@@ -656,7 +670,7 @@
   kolab_dialog_show(dialog, {
     title: title,
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
     minHeight: height - 100,
     height: height
   });
@@ -693,9 +707,9 @@
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.renamefile'),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: ['mainaction save', 'cancel'],
     minHeight: 100,
-    height: 200
+    height: 100
   });
 };
 
@@ -703,6 +717,7 @@
 function kolab_files_file_create_dialog(file)
 {
   var buttons = {}, action = file ? 'copy' : 'create',
+    button_classes = ['mainaction save edit'],
     dialog = $('#files-file-create-dialog'),
     type_select = $('select[name="type"]', dialog),
     select = $('select[name="parent"]', dialog).html(''),
@@ -738,6 +753,7 @@
   };
 
   if (action == 'create') {
+    button_classes.push('save');
     buttons[rcmail.gettext('kolab_files.create')] = function() {
       create_func(this);
     };
@@ -748,6 +764,7 @@
     type_select.parent('tr').hide();
   }
 
+  button_classes.push('cancel');
   buttons[rcmail.gettext('kolab_files.cancel')] = function() {
     kolab_dialog_close(this);
   };
@@ -759,7 +776,7 @@
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.' + action + 'file'),
     buttons: buttons,
-    button_classes: ['mainaction'],
+    button_classes: button_classes,
     minHeight: 150,
     height: 250
   });
@@ -771,13 +788,12 @@
 // file session dialog
 function kolab_files_session_dialog(session)
 {
-  var buttons = {},
+  var buttons = {}, button_classes = [],
     dialog = $('#files-session-dialog'),
     filename = file_api.file_name(session.file),
     owner = session.owner_name || session.owner,
     title = rcmail.gettext('kolab_files.sessiondialog'),
     content = rcmail.gettext('kolab_files.sessiondialogcontent'),
-    button_classes = ['mainaction'],
     join_session = function(id) {
       var viewer = file_api.file_type_supported('application/vnd.oasis.opendocument.text', rcmail.env.files_caps);
         params = {action: 'edit', session: id};
@@ -797,9 +813,10 @@
       kolab_dialog_close(this);
       file_api.document_delete(session.id);
     };
-    button_classes.push('delete');
+    button_classes = ['mainaction edit', 'delete'];
   }
   else if (session.is_invited) {
+    button_classes = ['mainaction edit'];
     // @TODO: check if not-accepted and provide "Decline invitation" button
     // @TODO: Add "Accept button", add comment field to the dialog
     buttons[rcmail.gettext('kolab_files.join')] = function() {
@@ -808,6 +825,7 @@
     };
   }
   else {
+    button_classes = ['mainaction session request'];
     buttons[rcmail.gettext('kolab_files.request')] = function() {
       kolab_dialog_close(this);
       // @TODO: Add comment field to the dialog
@@ -815,6 +833,7 @@
     };
   }
 
+  button_classes.push('cancel');
   buttons[rcmail.gettext('kolab_files.cancel')] = function() {
     kolab_dialog_close(this);
   };
@@ -882,9 +901,9 @@
 };
 
 // Hides dialog
-function kolab_dialog_close(dialog)
+function kolab_dialog_close(dialog, destroy)
 {
-  (rcmail.is_framed() ? window.parent : window).$(dialog).dialog('close');
+  (rcmail.is_framed() ? window.parent : window).$(dialog).dialog(destroy ? 'destroy' : 'close');
 };
 
 // smart upload button
@@ -1131,11 +1150,13 @@
 
       if (menu && modkey == SHIFT_KEY && rcmail.commands['files-copy']) {
         var pos = rcube_event.get_mouse_pos(e);
-        $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
+        rcmail.show_menu(menu.id, true, e);
+        $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'});
         return;
       }
 
       rcmail.command('files-move', rcmail.env.drag_target);
+      rcmail.env.drag_target = null;
     }
   }
 };
@@ -1193,6 +1214,10 @@
   rcmail.enable_command('files-print', (rcmail.file_editor && rcmail.file_editor.printable)
     || (info && /^image\//i.test(info.type)));
 
+  // Enable image tools
+  rcmail.enable_command('image-scale', 'image-rotate', info && !!/^image\//.test(info.type));
+  rcmail.gui_objects.messagepartframe = frame;
+
   // detect Print button and check if it can be accessed
   try {
     if ($('#fileframe').contents().find('#print').length)
@@ -1303,17 +1328,12 @@
 // executed on editing session termination
 function document_editor_close()
 {
-  $('<div>').addClass('popupdialog').attr('role', 'alertdialog')
-    .html($('<span>').text(rcmail.gettext('kolab_files.sessionterminated')))
-    .dialog({
-      resizable: false,
-      closeOnEscape: true,
-      dialogClass: 'error',
-      title: rcmail.gettext('kolab_files.sessionterminatedtitle'),
-      close: function() { window.close(); },
-      width: 420,
-      minHeight: 90
-    }).show();
+  var dialog = $('<div>').addClass('popupdialog').attr('role', 'alertdialog')
+    .html($('<span>').text(rcmail.gettext('kolab_files.sessionterminated')));
+
+  rcmail.alert_dialog(dialog, function() { window.close(); }, {
+      title: rcmail.gettext('kolab_files.sessionterminatedtitle')
+  });
 
   return false; // skip Chwala's error message
 };
@@ -1344,10 +1364,10 @@
 rcube_webmail.prototype.document_close = function()
 {
   // check document "unsaved changes" state and display a warning
-  if (this.commands['document-save'] && !confirm(this.gettext('kolab_files.unsavedchanges')))
-    return;
-
-  file_api.document_delete(this.env.file_data.session.id);
+  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'});
 };
 
 // document editors management dialog
@@ -1380,7 +1400,7 @@
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.manageeditors'),
     buttons: buttons,
-    button_classes: ['mainaction']
+    button_classes: ['cancel']
   });
 
   if (!rcmail.env.editors_dialog) {
@@ -1439,7 +1459,7 @@
       counter++;
     }
     else {
-      alert(rcmail.gettext('noemailwarning'));
+      rcmail.alert_dialog(rcmail.gettext('noemailwarning'));
     }
   }
 
@@ -1515,7 +1535,7 @@
 
 function kolab_files_invitation_dialog(invitation)
 {
-  var text, records = [], content = [], buttons = {},
+  var text, records = [], content = [], buttons = {}, button_classes = [],
     dialog = $('#document-invitation-dialog'),
     data_map = {status: 'status', 'changed': 'when', filename: 'file', comment: 'comment'},
     record_fn = function(type, label, value) {
@@ -1539,6 +1559,7 @@
   if (!invitation.is_session_owner) {
     if (invitation.status == 'invited') {
       text = document_editor.invitation_msg(invitation);
+      button_classes = ['session join', 'session accept', 'session decline delete'];
 
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
@@ -1560,6 +1581,7 @@
     else if (invitation.status == 'accepted-owner') {
       text = document_editor.invitation_msg(invitation);
 
+      button_classes = ['mainaction session join'];
       buttons[rcmail.gettext('kolab_files.join')] = function() {
         join_session();
         kolab_dialog_close(this);
@@ -1577,6 +1599,7 @@
     else if (invitation.status == 'requested') {
       text = document_editor.invitation_msg(invitation);
 
+      button_classes = ['session accept', 'session decline delete'];
       buttons[rcmail.gettext('kolab_files.accept')] = function() {
         document_editor.invitation_accept(invitation);
         kolab_dialog_close(this);
@@ -1603,6 +1626,7 @@
     content.push($('<table class="propform">').html(records));
   }
 
+  button_classes.push('cancel');
   buttons[rcmail.gettext('kolab_files.close')] = function() {
     kolab_dialog_close(this);
   };
@@ -1612,7 +1636,8 @@
   // show dialog window
   kolab_dialog_show(dialog, {
     title: rcmail.gettext('kolab_files.invitationtitle').replace('$file', invitation.filename),
-    buttons: buttons
+    buttons: buttons,
+    button_classes: button_classes
   });
 };
 
@@ -1668,33 +1693,75 @@
   file_api.file_search_reset();
 };
 
-rcube_webmail.prototype.files_folder_delete = function()
+rcube_webmail.prototype.files_folder_delete = function(prop, elem, event)
 {
-  if (confirm(this.get_label('kolab_files.folderdeleteconfirm')))
+  this.hide_menu('folderoptions', event);
+  this.confirm_dialog(this.get_label('kolab_files.folderdeleteconfirm'), 'delete', function() {
     file_api.folder_delete(file_api.env.folder);
+  });
 };
 
 rcube_webmail.prototype.files_delete = function()
 {
-  if (!confirm(this.get_label('kolab_files.filedeleteconfirm')))
-    return;
-
-  var files = this.env.file ? [this.env.file] : kolab_files_selected();
-  file_api.file_delete(files);
+  this.confirm_dialog(this.get_label('kolab_files.filedeleteconfirm'), 'delete', function() {
+    var files = rcmail.env.file ? [rcmail.env.file] : kolab_files_selected();
+    file_api.file_delete(files);
+  });
 };
 
-rcube_webmail.prototype.files_move = function(folder)
+rcube_webmail.prototype.files_move = function(folder, obj, event, files)
 {
-  var files = kolab_files_selected();
+  if (!files)
+    files = kolab_files_selected();
+
+  if (!folder) {
+    var ref = this;
+    return this.files_folder_selector(event, function(folder) {
+      ref.files_move(folder, null, event, files);
+    });
+  }
+
   file_api.file_move(files, folder);
 };
 
-rcube_webmail.prototype.files_copy = function(folder)
+rcube_webmail.prototype.files_copy = function(folder, obj, event, files)
 {
-  var files = kolab_files_selected();
+  if (!files)
+    files = kolab_files_selected();
+
+  if (!folder) {
+    var ref = this;
+    return this.files_folder_selector(event, function(folder) {
+      ref.files_copy(folder, null, event, files);
+    });
+  }
+
   file_api.file_copy(files, folder);
 };
 
+  // create folder selector popup
+rcube_webmail.prototype.files_folder_selector = function(event, callback)
+{
+  this.entity_selector('folder-selector', callback, file_api.env.folders, function(folder, a, folder_fullname) {
+    var n = folder.depth || 0,
+        id = folder.id,
+        row = $('<li>');
+
+      if (folder.virtual || folder.readonly)
+        a.addClass('virtual').attr({'aria-disabled': 'true', tabindex: '-1'});
+      else
+        a.addClass('active').data('id', folder_fullname);
+
+      a.css('padding-left', n ? (n * 16) + 'px' : 0);
+
+      // add folder name element
+      a.append($('<span>').text(folder.name));
+
+      return row.append(a);
+    }, event);
+  };
+
+
 rcube_webmail.prototype.files_upload = function(form)
 {
   if (form)
@@ -1872,13 +1939,15 @@
   kolab_files_folder_create_dialog();
 };
 
-rcube_webmail.prototype.folder_rename = function()
+rcube_webmail.prototype.folder_rename = function(prop, elem, event)
 {
+  this.hide_menu('folderoptions', event);
   kolab_files_folder_edit_dialog();
 };
 
-rcube_webmail.prototype.folder_mount = function()
+rcube_webmail.prototype.folder_mount = function(prop, elem, event)
 {
+  this.hide_menu('folderoptions', event);
   kolab_files_folder_mount_dialog();
 };
 
@@ -1973,7 +2042,7 @@
     if (!this.response(response))
       return;
 
-    var first, body, rows = [],
+    var folder, first, body, rows = [],
       list_selector = rcmail.env.folder_list_selector || '#files-folder-list',
       search_selector = rcmail.env.folder_search_selector || '#foldersearch',
       elem = $(list_selector),
@@ -1982,8 +2051,8 @@
       collections = ['audio', 'video', 'image', 'document'];
 
     // try parent window if the list element does not exist
-    // i.e. called from dialog in parent window
-    if (!elem.length && window.parent && parent.rcmail) {
+    // i.e. called from a dialog in parent window
+    if (!elem.length && rcmail.is_framed() && (rcmail.env.task != 'files' || (rcmail.env.action != 'open' && rcmail.env.action != 'edit'))) {
       body = window.parent.document.body;
       elem = $(list_selector, body);
       searchbox = $(search_selector, body);
@@ -1992,10 +2061,15 @@
     if (elem.data('no-collections') == true)
       collections = [];
 
-    elem.html('');
-
     this.env.folders = this.folder_list_parse(response.result && response.result.list ? response.result.list : response.result);
 
+    rcmail.enable_command('files-create', true);
+
+    if (!elem.length)
+      return;
+
+    elem.html('');
+
     $.each(this.env.folders, function(i, f) {
       var row;
       if (row = file_api.folder_list_row(i, f)) {
@@ -2060,24 +2134,37 @@
         file_api.folder_select(node.id);
       });
 
-    // select first folder?
+    // select first/current folder
     if (response.result.auth_errors && response.result.auth_errors.length)
       this.env.folder = this.env.collection = null;
     else if (this.env.folder)
-      rcmail.folder_list.select(this.env.folder);
+      rcmail.folder_list.select(folder);
     else if (this.env.collection)
       rcmail.folder_list.select('folder-collection-' + this.env.collection);
+    else if (folder = this.env.init_folder) {
+      this.env.init_folder = null;
+      rcmail.folder_list.select(folder);
+    }
+    else if (folder = this.env.init_collection) {
+      this.env.init_collection = null;
+      rcmail.folder_list.select('folder-collection-' + folder);
+    }
     else if (first)
       rcmail.folder_list.select(first);
 
-    rcmail.enable_command('files-create', true);
-
     // add tree icons
 //    this.folder_list_tree(this.env.folders);
 
     // handle authentication errors on external sources
-    if (elem.length)
-      this.folder_list_auth_errors(response.result);
+    this.folder_list_auth_errors(response.result);
+
+    // Elastic: Set notree class on the folder list
+    var callback = function() {
+        list[list.find('.treetoggle').length > 0 ? 'removeClass' : 'addClass']('notree');
+    };
+    if (window.MutationObserver)
+      (new MutationObserver(callback)).observe(list.get(0), {childList: true, subtree: true});
+    callback();
   };
 
   this.folder_select = function(folder)
@@ -2085,6 +2172,8 @@
     if (rcmail.busy)
       return;
 
+    rcmail.triggerEvent('files-folder-select', {folder: folder});
+
     var is_collection = folder.match(/^folder-collection-(.*)$/),
       collection = RegExp.$1 || null;
 
@@ -2092,7 +2181,7 @@
       rcmail.update_state(is_collection ? {collection: collection} : {folder: folder});
 
     if (collection == 'sessions') {
-      rcmail.enable_command('files-list', 'files-folder-delete', 'folder-rename', 'files-upload', false);
+      rcmail.enable_command('files-list', 'files-folder-delete', 'folder-rename', 'files-upload', 'files-open', 'files-edit', false);
       this.sessions_list();
       return;
     }
@@ -2150,23 +2239,20 @@
   {
     var toggle, sublist, collapsed, parent, parent_name, classes = ['mailbox'],
       row = $('<li>'),
-      id = 'rcmli' + rcmail.html_identifier_encode(i);
-
-    row.attr('id', id).append($('<a class="name">').text(folder.name));
+      id = 'rcmli' + rcmail.html_identifier_encode(i),
+      content = $('<div>').append($('<a class="name">').text(folder.name));
 
     if (folder.virtual)
       classes.push('virtual');
     else {
       if (folder.subscribed !== undefined)
-        row.append(this.folder_list_subscription_button(folder.subscribed));
+        content.append(this.folder_list_subscription_button(folder.subscribed));
 
       if (folder.readonly)
         classes.push('readonly');
     }
 
-    row.addClass(classes.join(' '));
-
-    folder.ref = row;
+    folder.ref = row.attr({id: id, 'class': classes.join(' ')}).append(content);
 
     if (folder.depth) {
       // find parent folder
@@ -2209,7 +2295,7 @@
   // subscription button handler
   this.folder_list_subscription_button_click = function(elem)
   {
-    var folder = $(elem).parent('li').prop('id').replace(/^rcmli/, ''),
+    var folder = $(elem).parents('li:first').prop('id').replace(/^rcmli/, ''),
       selected = $(elem).hasClass('subscribed');
 
     folder = folder.replace(/--xsR$/, ''); // this might be a search result
@@ -2221,7 +2307,7 @@
   // sets subscription button status
   this.folder_list_subscription_state = function(elem, status)
   {
-    $(elem).children('a.subscription')
+    $(elem).find('a.subscription:first')
       .prop('aria-checked', status)[status ? 'addClass' : 'removeClass']('subscribed');
   };
 
@@ -2347,7 +2433,7 @@
           id: i,
           classes: classes,
           text: folder.name,
-          html: html,
+          html: $('<div>').append(html),
           collapsed: false,
           virtual: folder.virtual
         }, path.length ? path.join(separator) : null);
@@ -2410,7 +2496,7 @@
           if (!folder.virtual)
             html.push(this.folder_list_subscription_button(true));
 
-          node.html = html;
+          node.html = $('<div>').append(html);
           delete node.children;
 
           rcmail.folder_list.insert(node, i > 0 ? path.slice(0, i).join(separator) : null);
@@ -2689,6 +2775,7 @@
     // empty the list
     this.env.file_list = [];
     rcmail.fileslist.clear(true);
+    rcmail.triggerEvent('listupdate', {list: rcmail.fileslist, rowcount: 0});
 
     // request
     if (params.collection || params.all_folders)
@@ -2720,6 +2807,7 @@
 
     this.env.file_list = list;
     rcmail.fileslist.resize();
+    rcmail.triggerEvent('listupdate', {list: rcmail.fileslist, rowcount: rcmail.fileslist.rowcount});
 
     // update document sessions info of this folder
     if (list && list.length)
@@ -2911,12 +2999,6 @@
       if (c == 'name')
         col = '<td class="name filename ' + this.file_type_class(data.type) + '">'
           + '<span>' + escapeHTML(file_api.file_name(data.file)) + '</span></td>';
-/*
-      else if (c == 'mtime')
-        col = '<td class="mtime">' + data.mtime + '</td>';
-      else if (c == 'size')
-        col = '<td class="size">' + this.file_size(data.size) + '</td>';
-*/
       else if (c == 'owner')
         col = '<td class="owner">' + escapeHTML(data.owner_name || data.owner) + '</td>';
       else if (c == 'options')
@@ -3008,7 +3090,7 @@
     params.token = this.env.token;
     params.file = file;
 
-    rcmail.redirect(this.env.url + this.url('file_get', params));
+    rcmail.redirect(this.env.url + this.url('file_get', params), false);
   };
 
   // file(s) delete request
@@ -3035,16 +3117,22 @@
       // check if opener window contains files list, if not we can just close current window
       if (rco && rco.fileslist && (opener.file_api.env.folder == dir || !opener.file_api.env.folder))
         self = opener.file_api;
-      else
-        window.close();
+      // also try parent for framed UI (Elastic)
+      else if (rcmail.is_framed() && parent.rcmail.fileslist && (parent.file_api.env.folder == dir || !parent.file_api.env.folder))
+        self = parent.file_api;
     }
 
     // @TODO: consider list modification "in-place" instead of full reload
     self.file_list();
     self.quota();
 
-    if (rcmail.env.file)
-      window.close();
+    if (rcmail.env.file) {
+      if (rcmail.is_framed()) {
+        parent.$('.ui-dialog:visible > .ui-dialog-buttonpane button.cancel').click();
+      }
+      else
+        window.close();
+    }
   };
 
   // file(s) move request
@@ -3128,8 +3216,8 @@
   // or overwrite destination file(s)
   this.file_move_ask_user = function(list, move)
   {
-    var file = list[0], buttons = {},
-      text = rcmail.gettext('kolab_files.filemoveconfirm').replace('$file', file.dst)
+    var file = list[0], buttons = {}, button_classes = ['mainaction save file overwrite'],
+      text = rcmail.gettext('kolab_files.filemoveconfirm').replace('$file', file.dst),
       dialog = $('<div></div>');
 
     buttons[rcmail.gettext('kolab_files.fileoverwrite')] = function() {
@@ -3139,24 +3227,28 @@
       f[file.src] = file.dst;
       file_api.file_move_ask_list = list;
       file_api.file_move_ask_mode = move;
-      dialog.dialog('destroy').remove();
+      kolab_dialog_close(this, true);
+
       file_api.req = file_api.set_busy(true, move ? 'kolab_files.filemoving' : 'kolab_files.filecopying');
       file_api.request(action, {file: f, overwrite: 1}, 'file_move_ask_user_response');
     };
 
-    if (list.length > 1)
+    if (list.length > 1) {
+      button_classes.push('save file overwrite all');
       buttons[rcmail.gettext('kolab_files.fileoverwriteall')] = function() {
         var f = {}, action = move ? 'file_move' : 'file_copy';
 
         $.each(list, function() { f[this.src] = this.dst; });
-        dialog.dialog('destroy').remove();
+        kolab_dialog_close(this, true);
+
         file_api.req = file_api.set_busy(true, move ? 'kolab_files.filemoving' : 'kolab_files.filecopying');
         file_api.request(action, {file: f, overwrite: 1}, action + '_response');
       };
+    }
 
     var skip_func = function() {
       list.shift();
-      dialog.dialog('destroy').remove();
+      kolab_dialog_close(this, true);
 
       if (list.length)
         file_api.file_move_ask_user(list, move);
@@ -3164,19 +3256,25 @@
         file_api.file_list();
     };
 
+    button_classes.push('cancel file skip');
     buttons[rcmail.gettext('kolab_files.fileskip')] = skip_func;
 
-    if (list.length > 1)
+    if (list.length > 1) {
+      button_classes.push('cancel file skip all');
       buttons[rcmail.gettext('kolab_files.fileskipall')] = function() {
-      dialog.dialog('destroy').remove();
+      kolab_dialog_close(this, true);
         if (move)
           file_api.file_list();
       };
+    }
 
     // open jquery UI dialog
     kolab_dialog_show(dialog.html(text), {
+      title: rcmail.gettext('confirmationtitle'),
       close: skip_func,
       buttons: buttons,
+      button_classes: button_classes,
+      height: 50,
       minWidth: 400,
       width: 400
     });
@@ -3301,7 +3399,7 @@
         size += files[i].size || files[i].fileSize;
 
       if (size > maxsize) {
-        alert(rcmail.get_label('kolab_files.uploadsizeerror').replace('$size', kolab_files_file_size(maxsize)));
+        rcmail.alert_dialog(rcmail.get_label('kolab_files.uploadsizeerror').replace('$size', kolab_files_file_size(maxsize)));
         return false;
       }
     }
@@ -3516,7 +3614,8 @@
       _task: 'files',
       _action: params && params.action ? params.action : 'open',
       _file: file,
-      _viewer: viewer || 0
+      _viewer: viewer || 0,
+      _frame: 1
     };
 
     if (params && params.session)
@@ -3588,7 +3687,7 @@
     var win = window, list = rcmail.sessionslist;
 
     if (!list) {
-      win = window.opener;
+      win = window.opener || window.parent;
       if (win && win.rcmail && win.file_api)
         list = win.rcmail.sessionslist;
     }
@@ -3596,8 +3695,13 @@
     // remove session from the list (if sessions list exist)
     if (list)
       list.remove_row(this.deleted_session);
-    if (win.file_api && win.file_api.env.sessions_list)
+    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();
+    }
   };
 
   // Invite document session participants
@@ -3707,6 +3811,7 @@
     };
 
     args.title = this.t('kolab_files.folderauthtitle').replace('$title', label);
+    args.button_classes = ['mainaction save', 'cancel'];
 
     // show dialog window
     kolab_dialog_show(dialog, args, function() {
@@ -3732,7 +3837,7 @@
       parent = $('#' + id);
 
     // try parent window if the folder element does not exist
-    if (!parent.length && window.parent && window.parent.rcmail) {
+    if (!parent.length && rcmail.is_framed()) {
       parent = $('#' + id, window.parent.document.body);
     }

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/kolab_files.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/kolab_files.php Changed

@@ -57,6 +57,8 @@
 
         // Load UI from startup hook
         $this->add_hook('startup', array($this, 'startup'));
+
+        $this->add_hook('preferences_save', array($this, 'preferences_save'));
     }
 
     /**
@@ -72,15 +74,16 @@
 
             $this->load_config();
 
-            $url = $this->rc->config->get('kolab_files_url');
+            $client_url = $this->rc->config->get('kolab_files_url');
+            $server_url = $this->rc->config->get('kolab_files_server_url');
 
-            if (!$url) {
+            if (!$client_url) {
                 return $this->engine = false;
             }
 
             require_once $this->home . '/lib/kolab_files_engine.php';
 
-            $this->engine = new kolab_files_engine($this, $url);
+            $this->engine = new kolab_files_engine($this, $client_url, $server_url);
         }
 
         return $this->engine;
@@ -145,4 +148,25 @@
 
         new kolab_files_autocomplete($this);
     }
+
+    /**
+     * Update chwala config on user preferences change
+     */
+    public function preferences_save($props)
+    {
+        if ($props['section'] == 'general') {
+            $dont_override = (array) $this->rc->config->get('dont_override');
+            $prefs         = array();
+
+            foreach (array('timezone', 'date_long') as $idx) {
+                if (isset($props['prefs'][$idx]) && !in_array($idx, $dont_override)) {
+                    $prefs[$idx] = $props['prefs'][$idx];
+                }
+            }
+
+            if (!empty($prefs) && ($engine = $this->engine())) {
+                $engine->configure(false, $prefs);
+            }
+        }
+    }
 }

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/lib/kolab_files_engine.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/lib/kolab_files_engine.php Changed

@@ -26,6 +26,8 @@
 {
     private $plugin;
     private $rc;
+    private $url;
+    private $url_srv;
     private $timeout = 600;
     private $files_sort_cols    = array('name', 'mtime', 'size');
     private $sessions_sort_cols = array('name');
@@ -36,9 +38,10 @@
     /**
      * Class constructor
      */
-    public function __construct($plugin, $url)
+    public function __construct($plugin, $client_url, $server_url = null)
     {
-        $this->url     = rcube_utils::resolve_url($url);
+        $this->url     = rtrim(rcube_utils::resolve_url($client_url), '/ ');
+        $this->url_srv = $server_url ? rtrim(rcube_utils::resolve_url($server_url), '/ ') : $this->url;
         $this->plugin  = $plugin;
         $this->rc      = $plugin->rc;
         $this->timeout = $this->rc->config->get('session_lifetime') * 60;
@@ -124,6 +127,7 @@
                 'classsel'   => 'button-files button-selected',
                 'innerclass' => 'button-inner',
                 'label'      => 'kolab_files.files',
+                'type'       => 'link'
                 ), 'taskbar');
         }
 
@@ -232,7 +236,7 @@
             $out = $this->rc->output->form_tag($attrib, $out);
         }
 
-        $this->plugin->add_label('foldercreating', 'foldercreatenotice', 'create', 'foldercreate', 'cancel');
+        $this->plugin->add_label('foldercreating', 'foldercreatenotice', 'create', 'foldercreate', 'cancel', 'addfolder');
         $this->rc->output->add_gui_object('folder-create-form', $attrib['id']);
 
         return $out;
@@ -252,9 +256,9 @@
         $select_parent = new html_select(array('id' => 'folder-edit-parent', 'name' => 'parent'));
         $table         = new html_table(array('cols' => 2, 'class' => 'propform'));
 
-        $table->add('title', html::label('folder-name', rcube::Q($this->plugin->gettext('foldername'))));
+        $table->add('title', html::label('folder-edit-name', rcube::Q($this->plugin->gettext('foldername'))));
         $table->add(null, $input_name->show());
-        $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
+        $table->add('title', html::label('folder-edit-parent', rcube::Q($this->plugin->gettext('folderinside'))));
         $table->add(null, $select_parent->show());
 
         $out = $table->show();
@@ -314,7 +318,7 @@
                 . html::img(array('src' => $source['image'], 'alt' => $key, 'title' => $source['name']))
                 . html::div(null, html::span('name', rcube::Q($source['name']))
                     . html::br()
-                    . html::span('description', rcube::Q($source['description']))
+                    . html::span('description hint', rcube::Q($source['description']))
                     . $form->show()
                 );
 
@@ -344,12 +348,13 @@
         $checkbox = new html_checkbox(array(
             'name'  => 'store_passwords',
             'value' => '1',
+            'class' => 'pretty-checkbox',
             'id'    => 'auth-pass-checkbox' . $attrib['suffix'],
         ));
 
         return html::div('auth-options', $checkbox->show(). '&nbsp;'
             . html::label('auth-pass-checkbox' . $attrib['suffix'], $this->plugin->gettext('storepasswords'))
-            . html::span('description', $this->plugin->gettext('storepasswordsdesc'))
+            . html::p('description hint', $this->plugin->gettext('storepasswordsdesc'))
         );
     }
 
@@ -382,28 +387,29 @@
      */
     public function document_editors_dialog($attrib)
     {
-        $table = new html_table(array('cols' => 3, 'border' => 0, 'cellpadding' => 0, 'class' => 'records-table'));
+        $table = new html_table($attrib + array('cols' => 3, 'border' => 0, 'cellpadding' => 0));
 
         $table->add_header('username', $this->plugin->gettext('participant'));
         $table->add_header('status', $this->plugin->gettext('status'));
         $table->add_header('options', null);
 
-        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30));
+        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'invitation-editor-name', 'size' => 30, 'class' => 'form-control'));
         $textarea = new html_textarea(array('name' => 'comment', 'id' => 'invitation-comment',
-            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('invitationtexttitle')));
-        $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add', 'value' => $this->plugin->gettext('addparticipant')));
+            'rows' => 4, 'cols' => 55, 'class' => 'form-control', 'title' => $this->plugin->gettext('invitationtexttitle')));
+        $button   = new html_inputfield(array('type' => 'button', 'class' => 'button', 'id' => 'invitation-editor-add',
+            'value' => $this->plugin->gettext('addparticipant')));
 
-        $this->plugin->add_label('manageeditors', 'statusorganizer');
+        $this->plugin->add_label('manageeditors', 'statusorganizer', 'addparticipant');
 
         // initialize attendees autocompletion
         $this->rc->autocomplete_init();
 
-        return '<div>' . $table->show() . html::div(null,
-            html::div(null, $input->show() . " " . $button->show())
+        return html::div(null, $table->show() . html::div(null,
+            html::div('form-searchbar', $input->show() . " " . $button->show())
             . html::p('attendees-commentbox', html::label(null,
                 $this->plugin->gettext('invitationtextlabel') . $textarea->show())
             )
-        ) . '</div>';
+        ));
     }
 
     /**
@@ -461,7 +467,7 @@
         $table->add(null, $input_name->show());
         $table->add('title', html::label('file-create-type', rcube::Q($this->plugin->gettext('type'))));
         $table->add(null, $select_type->show());
-        $table->add('title', html::label('folder-parent', rcube::Q($this->plugin->gettext('folderinside'))));
+        $table->add('title', html::label('file-create-parent', rcube::Q($this->plugin->gettext('folderinside'))));
         $table->add(null, $select_parent->show());
 
         $out = $table->show();
@@ -484,32 +490,16 @@
      */
     public function file_search_form($attrib)
     {
-        $attrib['name'] = '_q';
-
-        if (empty($attrib['id'])) {
-            $attrib['id'] = 'filesearchbox';
-        }
-        if ($attrib['type'] == 'search' && !$this->rc->output->browser->khtml) {
-            unset($attrib['type'], $attrib['results']);
-        }
-
-        $input_q = new html_inputfield($attrib);
-        $out = $input_q->show();
-
-        // add some labels to client
-        $this->rc->output->add_label('searching');
-        $this->rc->output->add_gui_object('filesearchbox', $attrib['id']);
+        $attrib += array(
+            'name'          => '_q',
+            'gui-object'    => 'filesearchbox',
+            'form-name'     => 'filesearchform',
+            'command'       => 'files-search',
+            'reset-command' => 'files-search-reset',
+        );
 
         // add form tag around text field
-        if (empty($attrib['form'])) {
-            $out = $this->rc->output->form_tag(array(
-                    'action'   => '?_task=files',
-                    'name'     => "filesearchform",
-                    'onsubmit' => rcmail_output::JS_OBJECT_NAME . ".command('files-search'); return false",
-                ), $out);
-        }
-
-        return $out;
+        return $this->rc->output->search_form($attrib);
     }
 
     /**
@@ -713,20 +703,20 @@
         $table = new html_table(array('cols' => 2, 'class' => $attrib['class']));
 
         // file name
-        $table->add('label', $this->plugin->gettext('name').':');
+        $table->add('title', $this->plugin->gettext('name').':');
         $table->add('data filename', $this->file_data['name']);
 
         // file type
         // @TODO: human-readable type name
-        $table->add('label', $this->plugin->gettext('type').':');
+        $table->add('title', $this->plugin->gettext('type').':');
         $table->add('data filetype', $this->file_data['type']);
 
         // file size
-        $table->add('label', $this->plugin->gettext('size').':');
+        $table->add('title', $this->plugin->gettext('size').':');
         $table->add('data filesize', $this->rc->show_bytes($this->file_data['size']));
 
         // file modification time
-        $table->add('label', $this->plugin->gettext('mtime').':');
+        $table->add('title', $this->plugin->gettext('mtime').':');
         $table->add('data filemtime', $this->file_data['mtime']);
 
         // @TODO: for images: width, height, color depth, etc.
@@ -771,7 +761,7 @@
 
         // editor requires additional arguments via POST
         if (!empty($this->file_data['viewer']['post'])) {
-            $attrib['src'] = $this->rc->output->asset_url('program/resources/blank.gif');
+            $attrib['src'] = 'program/resources/blank.gif';
 
             $form_content = new html_hiddenfield();
             $form_attrib  = array(
@@ -838,7 +828,7 @@
     /**
      * Get API token for current user session, authenticate if needed
      */
-    public function get_api_token()
+    public function get_api_token($configure = true)
     {
         $token = $_SESSION['kolab_files_token'];
         $time  = $_SESSION['kolab_files_time'];
@@ -888,6 +878,11 @@
             else {
                 throw new Exception(sprintf("Authenticate error (Status: %d)", $status));
             }
+
+            // Configure session
+            if ($configure && $token) {
+                $this->configure($token);
+            }
         }
         catch (Exception $e) {
             rcube::raise_error($e, true, false);
@@ -901,7 +896,7 @@
      */
     protected function get_request($get = null, $token = null)
     {
-        $url = $this->url . '/api/';
+        $url = $this->url_srv . '/api/';
 
         if (!$this->request) {
             $config = array(
@@ -948,12 +943,42 @@
     }
 
     /**
+     * Configure chwala session
+     */
+    public function configure($token = null, $prefs = array())
+    {
+        if (!$token) {
+            $token = $this->get_api_token(false);
+        }
+
+        try {
+            // Configure session
+            $query = array(
+                'method'      => 'configure',
+                'timezone'    => $prefs['timezone'] ?: $this->rc->config->get('timezone'),
+                'date_format' => $prefs['date_long'] ?: $this->rc->config->get('date_long', 'Y-m-d H:i'),
+            );
+
+            $request  = $this->get_request($query, $token);
+            $response = $request->send();
+            $status   = $response->getStatus();
+
+            if ($status != 200) {
+                throw new Exception(sprintf("Failed to configure chwala session (Status: %d)", $status));
+            }
+        }
+        catch (Exception $e) {
+            rcube::raise_error($e, true, false);
+        }
+    }
+
+    /**
      * Handler for main files interface (Files task)
      */
     protected function action_index()
     {
         $this->plugin->add_label(
-            'uploading', 'attaching', 'searching', 'uploadsizeerror',
+            'uploading', 'attaching', 'uploadsizeerror',
             'filedeleting', 'filedeletenotice', 'filedeleteconfirm',
             'filemoving', 'filemovenotice', 'filemoveconfirm', 'filecopying', 'filecopynotice',
             'fileskip', 'fileskipall', 'fileoverwrite', 'fileoverwriteall'
@@ -1256,37 +1281,7 @@
             $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
 
             if ($attachment['status'] && !$attachment['abort']) {
-                $id = $attachment['id'];
-
-                // store new attachment in session
-                unset($attachment['data'], $attachment['status'], $attachment['abort']);
-                $COMPOSE['attachments'][$id] = $attachment;
-
-                if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
-                    $button = html::img(array(
-                        'src' => $icon,
-                        'alt' => $this->rc->gettext('delete')
-                    ));
-                }
-                else {
-                    $button = rcube::Q($this->rc->gettext('delete'));
-                }
-
-                $content = html::a(array(
-                    'href' => "#delete",
-                    'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
-                    'title' => $this->rc->gettext('delete'),
-                    'class' => 'delete',
-                ), $button);
-
-                $content .= rcube::Q($attachment['name']);
-
-                $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
-                    'html'      => $content,
-                    'name'      => $attachment['name'],
-                    'mimetype'  => $attachment['mimetype'],
-                    'classname' => rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
-                    'complete'  => true), $uploadid);
+                $this->compose_attach_success($attachment, $COMPOSE, $COMPOSE_ID, $uploadid);
             }
             else if ($attachment['error']) {
                 $errors[] = $attachment['error'];
@@ -1316,11 +1311,13 @@
 
             switch ($this->rc->task) {
             case 'tasks':
-                libcalendaring::get_instance()->attachment_upload(tasklist::SESSION_KEY);
+                $handler = new kolab_attachments_handler();
+                $handler->attachment_upload(tasklist::SESSION_KEY);
                 break;
 
             case 'calendar':
-                libcalendaring::get_instance()->attachment_upload(calendar::SESSION_KEY, 'cal-');
+                $handler = new kolab_attachments_handler();
+                $handler->attachment_upload(calendar::SESSION_KEY, 'cal-');
                 break;
             }
         }
@@ -1330,6 +1327,66 @@
         $this->rc->output->send();
     }
 
+    protected function compose_attach_success($attachment, $COMPOSE, $COMPOSE_ID, $uploadid)
+    {
+        $id = $attachment['id'];
+
+        // store new attachment in session
+        unset($attachment['data'], $attachment['status'], $attachment['abort']);
+        $this->rc->session->append('compose_data_' . $COMPOSE_ID . '.attachments', $id, $attachment);
+
+        if (($icon = $COMPOSE['deleteicon']) && is_file($icon)) {
+            $button = html::img(array(
+                'src' => $icon,
+                'alt' => $this->rc->gettext('delete')
+            ));
+        }
+        else if ($COMPOSE['textbuttons']) {
+            $button = rcube::Q($this->rc->gettext('delete'));
+        }
+        else {
+            $button = '';
+        }
+
+        if (version_compare(version_parse(RCMAIL_VERSION), '1.3.0', '>=')) {
+            $link_content = sprintf('%s <span class="attachment-size"> (%s)</span>',
+                rcube::Q($attachment['name']), $this->rc->show_bytes($attachment['size']));
+
+            $content_link = html::a(array(
+                    'href'    => "#load",
+                    'class'   => 'filename',
+                    'onclick' => sprintf("return %s.command('load-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
+                ), $link_content);
+
+            $delete_link = html::a(array(
+                    'href'    => "#delete",
+                    'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
+                    'title'   => $this->rc->gettext('delete'),
+                    'class'   => 'delete',
+                    'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
+                ), $button);
+
+            $content = $COMPOSE['icon_pos'] == 'left' ? $delete_link.$content_link : $content_link.$delete_link;
+        }
+        else {
+            $content = html::a(array(
+                    'href'    => "#delete",
+                    'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%s', this)", rcmail_output::JS_OBJECT_NAME, $id),
+                    'title'   => $this->rc->gettext('delete'),
+                    'class'   => 'delete',
+            ), $button);
+
+            $content .= rcube::Q($attachment['name']);
+        }
+
+        $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
+            'html'      => $content,
+            'name'      => $attachment['name'],
+            'mimetype'  => $attachment['mimetype'],
+            'classname' => rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
+            'complete'  => true), $uploadid);
+    }
+
     /**
      * Handler for file open/edit action
      */
@@ -1373,7 +1430,7 @@
 
         $this->file_data['filename'] = $file;
 
-        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice');
+        $this->plugin->add_label('filedeleteconfirm', 'filedeleting', 'filedeletenotice', 'terminate');
 
         // register template objects for dialogs (and main interface)
         $this->rc->output->add_handlers(array(
@@ -1396,6 +1453,8 @@
         $this->rc->output->set_env('extwin', true);
         $this->rc->output->set_env('file', $file);
         $this->rc->output->set_env('file_data', $this->file_data);
+        $this->rc->output->set_env('mimetype', $this->file_data['type']);
+        $this->rc->output->set_env('filename', pathinfo($file, PATHINFO_BASENAME));
         $this->rc->output->set_env('editor_type', $editor_type);
         $this->rc->output->set_env('photo_placeholder', $placeholder);
         $this->rc->output->set_pagetitle(rcube::Q($file));
@@ -1432,28 +1491,29 @@
                 if (array_key_exists($type, $this->mimetypes)) {
                     $mimetypes = $this->mimetypes[$type];
                 }
+                // fallback to static definition if old Chwala is used
+                else if ($type == 'edit') {
+                    $mimetypes = array(
+                        'text/plain' => 'txt',
+                        'text/html'  => 'html',
+                    );
+                    if (!empty($_SESSION['kolab_files_caps']['MANTICORE'])) {
+                        $mimetypes = array_merge(array('application/vnd.oasis.opendocument.text' => 'odt'), $mimetypes);
+                    }
+
+                    foreach (array_keys($mimetypes) as $type) {
+                        list ($app, $label) = explode('/', $type);
+                        $label = preg_replace('/[^a-z]/', '', $label);
+                        $mimetypes[$type] = array(
+                            'ext'   => $mimetypes[$type],
+                            'label' => $this->plugin->gettext('type.' . $label),
+                        );
+                    }
+                }
                 else {
                     $mimetypes = $this->mimetypes;
                 }
             }
-
-            // fallback to static definition if old Chwala is used
-            if ($type == 'edit' && empty($mimetypes)) {
-                $mimetypes = array(
-                    'application/vnd.oasis.opendocument.text' => 'odt',
-                    'text/plain' => 'txt',
-                    'text/html'  => 'html',
-                );
-
-                foreach (array_keys($mimetypes) as $type) {
-                    list ($app, $label) = explode('/', $type);
-                    $label = preg_replace('/[^a-z]/', '', $label);
-                    $mimetypes[$type] = array(
-                        'ext'   => $mimetypes[$type],
-                        'label' => $this->plugin->gettext('type.' . $label),
-                    );
-                }
-            }
         }
         catch (Exception $e) {
             rcube::raise_error(array(

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/cs_CZ.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/cs_CZ.inc Changed

@@ -41,9 +41,9 @@
 $labels['printfile'] = 'Tisk souboru';
 $labels['renamefile'] = 'Přejmenovat soubor';
 $labels['createfile'] = 'Vytvořit soubor';
-$labels['createandedit'] = 'Vytvořit a Změnit';
+$labels['createandedit'] = 'Vytvořit a upravit';
 $labels['copyfile'] = 'Kopírovat soubor';
-$labels['copyandedit'] = 'Kopírovat a Změnit';
+$labels['copyandedit'] = 'Kopírovat a upravit';
 $labels['documenttitle'] = 'Název:';
 $labels['close'] = 'Zavřít';
 $labels['collection_audio'] = 'Zvuk';
@@ -68,7 +68,7 @@
 $labels['saveallerror'] = 'Ukládání $n souborů selhalo.';
 $labels['attacherror'] = 'Nepodařilo se připojit soubor(y) ze serveru';
 $labels['fileupdating'] = 'Aktualizuje se soubor...';
-$labels['filecreating'] = 'Vytvářím soubor...';
+$labels['filecreating'] = 'Vytváří se soubor...';
 $labels['filemoving'] = 'Přesouvají se soubor(y)...';
 $labels['filecopying'] = 'Kopíruje se soubor(y)...';
 $labels['filedeleting'] = 'Maže se soubor(y)...';
@@ -86,7 +86,7 @@
 $labels['fileoverwriteall'] = 'Přepsat vše';
 $labels['filemoveconfirm'] = 'Tato akce přepíše cílový soubor: <b>$file</b>.';
 $labels['editfiledialog'] = 'Potvrdit změnu';
-$labels['editfilesessions'] = 'Probíhají sezení na vybraném souboru. Prosím, vyberte akci, kterou chcete vzít.';
+$labels['editfilesessions'] = 'Probíhají sezení na vybraném souboru. Prosím, vyberte činnost, kterou chcete vzít.';
 $labels['newsession'] = 'Vytvořit nové sezení';
 $labels['newsessionro'] = 'Vtvořit nové sezení (zkopírovat soubor do umístění pro čtení i zápis)';
 $labels['ownedsession'] = 'Pokračujte ve stávajícím sezení';
@@ -99,8 +99,8 @@
 $labels['sessionterminatedtitle'] = 'Sezení ukončeno';
 $labels['sessionterminated'] = 'Sezení bylo ukončeno. Okno se zavře.';
 $labels['terminate'] = 'Ukončit';
-$labels['sessionterminating'] = 'Ukončování sezení...';
-$labels['unsavedchanges'] = 'Jsou zde neuložené změny v dokumentu, které budou ztraceny. Chcete přesto ukončit sezení?';
+$labels['sessionterminating'] = 'Ukončuje se sezení...';
+$labels['unsavedchanges'] = 'V dokumentu jsou neuložené změny, které budou ztraceny. Chcete přesto sezení ukončit?';
 $labels['manageeditors'] = 'Pozvat k dokumentu';
 $labels['participant'] = 'Účastník';
 $labels['status'] = 'Stav';
@@ -112,16 +112,32 @@
 $labels['statusinvited'] = 'Pozván';
 $labels['statusaccepted'] = 'Přijato';
 $labels['statusdeclined'] = 'Odmítnuto';
+$labels['statusrequested'] = 'Požadováno';
+$labels['documentinviting'] = 'Zve se účastník(ci)...';
+$labels['documentcancelling'] = 'Odebírá se účastník(ci)...';
 $labels['removeparticipant'] = 'Odstranit';
-$labels['more'] = 'Více.';
-$labels['accept'] = 'Potvrdit';
-$labels['join'] = 'Připojit k sezení';
+$labels['invitednotice'] = 'Byl(a) jste pozván(a) k upravovacímu sezení $owner.';
+$labels['acceptedownernotice'] = '$owner přijal vaši žádost o připojení se k upravovacímu sezení.';
+$labels['declinedownernotice'] = '$owner odmítl vaši žádost o připojení se k upravovacímu sezení.';
+$labels['acceptednotice'] = '$user přijal vaši pozvánku k upravovacímu sezení.';
+$labels['declinednotice'] = '$user odmítl vaši pozvánku k upravovacímu sezení.';
+$labels['requestednotice'] = '$user požádal o připojení se k upravovacímu sezení.';
+$labels['sessiondialog'] = 'Upravovací sezení dokumentu';
+$labels['sessiondialogcontent'] = 'Probíhá upravovací sezení $file vytvořeného $owner.';
+$labels['more'] = 'Více';
+$labels['accept'] = 'Přijmout';
+$labels['join'] = 'Připojit se k sezení';
 $labels['decline'] = 'Odmítnout';
 $labels['owner'] = 'Vlastník';
 $labels['when'] = 'Kdy';
 $labels['file'] = 'Soubor';
 $labels['comment'] = 'Poznámka';
 $labels['open'] = 'Otevřít';
+$labels['request'] = 'Požádat o pozvánku';
+$labels['invitationtitle'] = 'Pozvání k $file';
+$labels['ivitationaccepting'] = 'Přijímá se pozvání...';
+$labels['ivitationdeclining'] = 'Odmítá se pozvání...';
+$labels['ivitationrequesting'] = 'Žádá se o pozvání...';
 $labels['storepasswords'] = 'Zapamatovat heslo';
 $labels['storepasswordsdesc'] = 'Uložená hesla budou šifrována. Zapněte tuto volbu pokud nechcete být dotazováni na heslo při každém přihlášení nebo pokud toto úložiště má být dostupné přes WebDAV.';
 $labels['arialabelsearchform'] = 'Hledání souborů';
@@ -129,6 +145,7 @@
 $labels['arialabellistoptions'] = 'Volby seznamu souborů';
 $labels['arialabelfolderoptions'] = 'Činnosti složky';
 $labels['arialabelfileeditform'] = 'Úprava souboru';
+$labels['arialabelfilecreateform'] = 'Formulář na vytvoření souboru';
 $labels['arialabelfilelist'] = 'Seznam souborů';
 $labels['arialabelfoldercreateform'] = 'Vytvoření složky';
 $labels['arialabelfoldereditform'] = 'Úprava složky';
@@ -141,6 +158,6 @@
 $labels['arialabelfileprops'] = 'Vlastnosti souboru';
 $labels['arialabelfilecontent'] = 'Obsah souboru';
 $labels['arialabelfileeditdialog'] = 'Dialog úpravy souborů';
-$labels['type.plain'] = 'Prostý Textový Dokument';
-$labels['type.vndoasisopendocumenttext'] = 'Textový Dokument (ODF)';
-$labels['type.html'] = 'HTML Dokument';
+$labels['type.plain'] = 'Prostý textový dokument';
+$labels['type.vndoasisopendocumenttext'] = 'Textový dokument (ODF)';
+$labels['type.html'] = 'Dokument HTML';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/da_DK.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/da_DK.inc Changed

@@ -39,11 +39,18 @@
 $labels['save'] = 'Gem';
 $labels['savefile'] = 'Gem fil';
 $labels['printfile'] = 'Udskriv fil';
+$labels['renamefile'] = 'Omdøb fil';
+$labels['createfile'] = 'Opret fil';
+$labels['createandedit'] = 'Opret og rediger';
+$labels['copyfile'] = 'Kopiér fil';
+$labels['copyandedit'] = 'Kopiér og rediger';
+$labels['documenttitle'] = 'Titel:';
 $labels['close'] = 'Luk';
 $labels['collection_audio'] = 'Lyd';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Billeder';
 $labels['collection_document'] = 'Dokumenter';
+$labels['sessions'] = 'Sessioner';
 $labels['uploading'] = 'Overfører fil(er)..';
 $labels['attaching'] = 'Vedhæfter fil(er)..';
 $labels['authenticating'] = 'Godkender ...';
@@ -61,6 +68,7 @@
 $labels['saveallerror'] = 'Lagringen af $n fil(er) mislykkedes.';
 $labels['attacherror'] = 'Mislykkedes med at vedhæfte fil(er) fra skyen';
 $labels['fileupdating'] = 'Opdaterer fil...';
+$labels['filecreating'] = 'Opretter fil...';
 $labels['filemoving'] = 'Flytter fil(er)...';
 $labels['filecopying'] = 'Kopierer fil(er)...';
 $labels['filedeleting'] = 'Sletter fil(er)...';
@@ -76,18 +84,36 @@
 $labels['fileoverwrite'] = 'Overskriv';
 $labels['fileoverwriteall'] = 'Overskriv alle';
 $labels['filemoveconfirm'] = 'Denne handling vil overskrive destinationsfilen: <b>$file</b>.';
+$labels['newsession'] = 'Opret ny session';
+$labels['editfilerotitle'] = 'Skrivebeskyttet fil';
 $labels['select'] = 'Vælg';
 $labels['participant'] = 'Deltager';
 $labels['status'] = 'Status';
 $labels['addparticipant'] = 'Tilføj deltager';
+$labels['delparticipant'] = 'Fjern deltager';
 $labels['invitationtextlabel'] = 'Invitation/notification comment';
 $labels['statusorganizer'] = 'Organisator';
+$labels['statusinvited'] = 'Inviteret';
+$labels['statusaccepted'] = 'Accepteret';
+$labels['statusdeclined'] = 'Afvist';
+$labels['statusrequested'] = 'Anmodet';
+$labels['documentinviting'] = 'Inviter deltager(ere)...';
+$labels['documentcancelling'] = 'Fjerner deltager(ere)...';
 $labels['removeparticipant'] = 'Fjern';
+$labels['more'] = 'Mere';
 $labels['accept'] = 'Acceptér';
+$labels['join'] = 'Deltag i sessionen';
 $labels['decline'] = 'Afvis';
 $labels['owner'] = 'Ejer';
+$labels['when'] = 'Hvornår';
+$labels['file'] = 'Fil';
 $labels['comment'] = 'Comment';
 $labels['open'] = 'Åbn';
+$labels['request'] = 'Anmod om invitation';
+$labels['invitationtitle'] = 'Invitation for $file';
+$labels['ivitationaccepting'] = 'Accepter invitation...';
+$labels['ivitationdeclining'] = 'Afvis invitation...';
+$labels['ivitationrequesting'] = 'Ammod invitation';
 $labels['storepasswords'] = 'husk adgangskode';
 $labels['storepasswordsdesc'] = 'Gemte adgangskoder vil blive krypteret. Slå dette til, hvis du ikke ønsker at blive spurgt om adgangskoden ved hvert login, eller hvis du ønsker at denne lagerplads skal være tilgængelig gennem WebDAV.';
 $labels['arialabelsearchform'] = 'Formular for filsøgning';
@@ -95,6 +121,8 @@
 $labels['arialabellistoptions'] = 'Tilvalg for visning af filer';
 $labels['arialabelfolderoptions'] = 'Mappehandlinger';
 $labels['arialabelfileeditform'] = 'Formular for filredigering';
+$labels['arialabelfilecreateform'] = 'Fil oprettelsesformular';
+$labels['arialabelfilelist'] = 'List filer';
 $labels['arialabelfoldercreateform'] = 'Formular for mappeoprettelse';
 $labels['arialabelfoldereditform'] = 'Formular for mapperedigering';
 $labels['arialabelfoldermountform'] = 'Formular for ekstern lagerplads';
@@ -105,3 +133,5 @@
 $labels['arialabelfilesavedialog'] = 'Vindue for lagring af fil(er)';
 $labels['arialabelfileprops'] = 'Filegenskaber';
 $labels['arialabelfilecontent'] = 'Filindhold';
+$labels['type.vndoasisopendocumenttext'] = 'Text Dokument (ODF)';
+$labels['type.html'] = 'HTML Dokument';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/de_CH.inc Changed

@@ -7,44 +7,13 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Dateien';
-$labels['create'] = 'Erstellen';
-$labels['save'] = 'Speichern';
-$labels['cancel'] = 'Abbrechen';
-$labels['folderinside'] = 'Erstellen in';
-$labels['name'] = 'Name';
-$labels['mtime'] = 'Geändert';
-$labels['type'] = 'Typ';
-$labels['get'] = 'Herunterladen';
-$labels['rename'] = 'Umbenennen';
-$labels['edit'] = 'Bearbeiten';
-$labels['save'] = 'Speichern';
-$labels['close'] = 'Schließen';
-$labels['collection_audio'] = 'Audio';
-$labels['collection_video'] = 'Video';
-$labels['collection_image'] = 'Bilder';
-$labels['collection_document'] = 'Dokumente';
-$labels['listpermanent'] = 'Permanent anzeigen';
-$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['select'] = 'Auswählen';
-$labels['participant'] = 'Teilnehmer';
-$labels['status'] = 'Status';
-$labels['addparticipant'] = 'Hinzufügen';
-$labels['invitationtextlabel'] = 'Kommentar zur Einladungs/Benachrichtigung';
-$labels['statusorganizer'] = 'Organisator';
-$labels['removeparticipant'] = 'Löschen';
-$labels['accept'] = 'Akzeptieren';
-$labels['decline'] = 'Ablehnen';
-$labels['owner'] = 'Eigentümer';
-$labels['comment'] = 'Kommentar';
-$labels['open'] = 'Öffnen';
 $labels['filepreview'] = 'Datei Vorschau';
 $labels['saveall'] = 'Alles in die Cloud speichern...';
 $labels['saveto'] = 'In die 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';
@@ -52,14 +21,22 @@
 $labels['folderedit'] = 'Verzeichnis ändern';
 $labels['foldermount'] = 'Speicher hinzufügen';
 $labels['folderdelete'] = 'Ordner löschen';
+$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';
@@ -68,6 +45,11 @@
 $labels['copyfile'] = 'Datei kopieren';
 $labels['copyandedit'] = 'Kopieren und Bearbeiten';
 $labels['documenttitle'] = 'Titel:';
+$labels['close'] = 'Schließen';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Video';
+$labels['collection_image'] = 'Bilder';
+$labels['collection_document'] = 'Dokumente';
 $labels['sessions'] = 'Sitzungen';
 $labels['uploading'] = 'Lade Datei(en) hoch...';
 $labels['attaching'] = 'Hänge Datei(en) an...';
@@ -95,24 +77,42 @@
 $labels['filemovenotice'] = 'Datei(en) erfolgreich verschoben.';
 $labels['filecopynotice'] = 'Datei(en) erfolgreich kopiert.';
 $labels['uploadsizeerror'] = 'Maimale Dateigröße ($size) überschritten!';
+$labels['listpermanent'] = 'Permanent anzeigen';
 $labels['additionalfolders'] = 'Zusätzliche Ordner';
 $labels['allfolders'] = 'suche in allen Ordnern';
+$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['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/Benachrichtigung';
+$labels['statusorganizer'] = 'Organisator';
 $labels['statusinvited'] = 'Eingeladen';
 $labels['statusaccepted'] = 'Akzeptiert';
 $labels['statusdeclined'] = 'Abgelehnt';
 $labels['documentinviting'] = 'Teilnehmer wird/werden eingeladen...';
 $labels['documentcancelling'] = 'Teilnehmer wird/werden entfernt...';
+$labels['removeparticipant'] = 'Löschen';
 $labels['sessiondialog'] = 'Dokumentbearbeitungssitzung';
+$labels['accept'] = 'Akzeptieren';
+$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['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.';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/de_DE.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/de_DE.inc Changed

@@ -7,18 +7,18 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Dateien';
-$labels['filepreview'] = 'Datei Vorschau';
-$labels['saveall'] = 'Alles in die Cloud speichern...';
-$labels['saveto'] = 'In die Cloud speichern...';
+$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['fromcloud'] = 'Aus der Cloud …';
+$labels['selectfiles'] = 'Datei(en) zum Anhängen auswählen …';
 $labels['attachsel'] = 'Ausgewählte anhängen';
 $labels['foldercreate'] = 'Ordner erstellen';
-$labels['folderedit'] = 'Verzeichnis ändern';
+$labels['folderedit'] = 'Ordner ändern';
 $labels['foldermount'] = 'Speicher hinzufügen';
 $labels['folderdelete'] = 'Ordner löschen';
 $labels['folderinside'] = 'Erstellen in';
@@ -51,35 +51,35 @@
 $labels['collection_image'] = 'Bilder';
 $labels['collection_document'] = 'Dokumente';
 $labels['sessions'] = 'Sitzungen';
-$labels['uploading'] = 'Lade Datei(en) hoch...';
-$labels['attaching'] = 'Hänge Datei(en) an...';
-$labels['authenticating'] = 'Authentifiziere...';
-$labels['foldercreating'] = 'Erstelle Ordner...';
-$labels['folderupdating'] = 'Aktualisiere Verzeichnis...';
-$labels['foldermounting'] = 'Hinzufügen externen Speichers...';
-$labels['folderdeleting'] = 'Lösche Ordner...';
+$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'] = 'Verzeichnis erfolgreich aktualisiert.';
+$labels['folderupdatenotice'] = 'Ordner erfolgreich aktualisiert.';
 $labels['foldercreatenotice'] = 'Ordner erfolgreich erstellt.';
 $labels['foldermountnotice'] = 'Speicher erfolgreich hinzugefügt.';
-$labels['folderauthtitle'] = 'Einloggen zu $title';
+$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'] = 'Aktualisiere Datei...';
-$labels['filecreating'] = 'Datei wird erstellt...';
-$labels['filemoving'] = 'Verschiebe Datei(en)...';
-$labels['filecopying'] = 'Kopiere Datei(en)...';
-$labels['filedeleting'] = 'Lösche Datei(en)...';
+$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'] = 'Maimale Dateigröße ($size) überschritten!';
-$labels['listpermanent'] = 'Permanent anzeigen';
+$labels['uploadsizeerror'] = 'Maximale Dateigröße ($size) überschritten!';
+$labels['listpermanent'] = 'Dauerhaft anzeigen';
 $labels['additionalfolders'] = 'Zusätzliche Ordner';
-$labels['allfolders'] = 'suche in allen Ordnern';
+$labels['allfolders'] = 'in allen Ordnern suchen';
 $labels['fileskip'] = 'Überspringen';
 $labels['fileskipall'] = 'Alle überspringen';
 $labels['fileoverwrite'] = 'Überschreiben';
@@ -87,12 +87,14 @@
 $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['sessionterminating'] = 'Sitzung wird beendet …';
 $labels['participant'] = 'Teilnehmer';
 $labels['status'] = 'Status';
 $labels['addparticipant'] = 'Hinzufügen';
@@ -100,13 +102,15 @@
 $labels['invitationtextlabel'] = 'Kommentar zur Einladungs-/Benachrichtigungsnachricht';
 $labels['statusorganizer'] = 'Organisator';
 $labels['statusinvited'] = 'Eingeladen';
-$labels['statusaccepted'] = 'Akzeptiert';
+$labels['statusaccepted'] = 'Angenommen';
 $labels['statusdeclined'] = 'Abgelehnt';
-$labels['documentinviting'] = 'Teilnehmer wird/werden eingeladen...';
-$labels['documentcancelling'] = 'Teilnehmer wird/werden entfernt...';
+$labels['documentinviting'] = 'Teilnehmer wird/werden eingeladen …';
+$labels['documentcancelling'] = 'Teilnehmer wird/werden entfernt …';
 $labels['removeparticipant'] = 'Entfernen';
 $labels['sessiondialog'] = 'Dokumentbearbeitungssitzung';
-$labels['accept'] = 'Akzeptieren';
+$labels['more'] = 'Mehr.';
+$labels['accept'] = 'Annehmen';
+$labels['join'] = 'Der Sitzung beitreten';
 $labels['decline'] = 'Ablehnen';
 $labels['owner'] = 'Eigentümer';
 $labels['when'] = 'Wenn';
@@ -114,25 +118,28 @@
 $labels['comment'] = 'Kommentar';
 $labels['open'] = 'Öffnen';
 $labels['invitationtitle'] = 'Einladung für $file';
+$labels['ivitationaccepting'] = 'Eine Einladung wird angenommen …';
+$labels['ivitationdeclining'] = 'Eine Einladung wird abgelehnt …';
+$labels['ivitationrequesting'] = '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'] = 'Ordner Aktionen';
-$labels['arialabelfileeditform'] = 'Datei Bearbeiten Maske';
-$labels['arialabelfilecreateform'] = 'Datei Erstellen Maske';
+$labels['arialabelfolderoptions'] = 'Ordneraktionen';
+$labels['arialabelfileeditform'] = 'Dateibearbeitenformular';
+$labels['arialabelfilecreateform'] = 'Dateierstellenformular';
 $labels['arialabelfilelist'] = 'Dateiliste';
-$labels['arialabelfoldercreateform'] = 'Ordner Erstellen Maske';
-$labels['arialabelfoldereditform'] = 'Formular Verzeichnis ändern';
-$labels['arialabelfoldermountform'] = 'Formular Externer Speicher';
-$labels['arialabelfolderauthform'] = 'Formular Authentifizierung Externer Speicher';
-$labels['arialabelfolderlist'] = 'Ordner / Sammlungs Auswahl';
-$labels['arialabelfileselectdialog'] = 'Datei Auswahl Dialog';
-$labels['arialabelattachmentoptions'] = 'Anhänge speichern Optionen';
-$labels['arialabelfilesavedialog'] = 'Datei(en) speichern Dialog';
+$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'] = 'Datei Inhalt';
+$labels['arialabelfilecontent'] = 'Dateiinhalt';
 $labels['arialabelfileeditdialog'] = 'Dateibearbeitungsdialog';
 $labels['type.plain'] = 'Klartextdokument';
 $labels['type.vndoasisopendocumenttext'] = 'Textdokument (ODF)';

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/el.inc Added

@@ -0,0 +1,75 @@
+<?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'] = 'Αρχεία';
+$labels['filepreview'] = 'Προεπισκόπηση αρχείου';
+$labels['saveall'] = 'Αποθήκευση όλων στο cloud...';
+$labels['saveto'] = 'Αποθήκευση στο cloud...';
+$labels['saveas'] = 'Αποθήκευση ως:';
+$labels['create'] = 'Δημιουργία';
+$labels['save'] = 'Αποθήκευση';
+$labels['cancel'] = 'Άκυρο';
+$labels['fromcloud'] = 'Από το cloud...';
+$labels['attachsel'] = 'Επισύναψη επιλεγμένου';
+$labels['foldercreate'] = 'Δημιουργία φακέλου';
+$labels['folderedit'] = 'Επεξεργασία φακέλου';
+$labels['foldermount'] = 'Προσθήκη αποθηκευτικού χώρου';
+$labels['folderdelete'] = 'Διαγραφή φακέλου';
+$labels['foldername'] = 'Όνομα φακέλου';
+$labels['name'] = 'Όνομα';
+$labels['type'] = 'Τύπος';
+$labels['upload'] = 'Μεταφόρτωση';
+$labels['uploadfile'] = 'Μεταφόρτωση αρχείου(ων)';
+$labels['get'] = 'Λήψη';
+$labels['getfile'] = 'Λήψη αρχείου';
+$labels['view'] = 'Προβολή';
+$labels['viewfile'] = 'Προβολή αρχείου';
+$labels['rename'] = 'Μετονομασία';
+$labels['deletefile'] = 'Διαγραφή αρχείου(ων)';
+$labels['edit'] = 'Επεξεργασία';
+$labels['editfile'] = 'Επεξεργασία αρχείου';
+$labels['save'] = 'Αποθήκευση';
+$labels['savefile'] = 'Αποθήκευση αρχείου';
+$labels['printfile'] = 'Εκτύπωση αρχείου';
+$labels['renamefile'] = 'Μετονομασία αρχείου';
+$labels['createfile'] = 'Δημιουργία αρχείου';
+$labels['createandedit'] = 'Δημιουργία και επεξεργασία';
+$labels['copyfile'] = 'Αντιγραφή αρχείου';
+$labels['copyandedit'] = 'Αντιγραφή και επεξεργασία';
+$labels['documenttitle'] = 'Τίτλος:';
+$labels['close'] = 'Κλείσιμο';
+$labels['collection_audio'] = 'Ήχος';
+$labels['collection_video'] = 'Βίντεο';
+$labels['collection_image'] = 'Εικόνες';
+$labels['collection_document'] = 'Έγγραφα';
+$labels['foldercreating'] = 'Γίνεται δημιουργία φακέλου...';
+$labels['folderupdating'] = 'Γίνεται ενημέρωση φακέλου...';
+$labels['foldermounting'] = 'Προσθήκη εξωτερικού αποθηκευτικού χώρου...';
+$labels['folderdeleting'] = 'Γίνεται διαγραφή φακέλου...';
+$labels['fileupdating'] = 'Γίνεται ενημέρωση αρχείου...';
+$labels['filecreating'] = 'Γίνεται δημιουργία αρχείου...';
+$labels['filemoving'] = 'Μετακίνηση αρχείου(ων)...';
+$labels['filecopying'] = 'Αντιγραφή αρχείου(ων)...';
+$labels['filedeleting'] = 'Διαγραφή αρχείου(ων)...';
+$labels['filedeleteconfirm'] = 'Θέλετε να διαγράψετε τα επιλεγμένα αρχεία;';
+$labels['fileoverwrite'] = 'Αντικατάσταση';
+$labels['fileoverwriteall'] = 'Αντικατάσταση όλων';
+$labels['select'] = 'Επιλογή';
+$labels['status'] = 'Κατάσταση';
+$labels['addparticipant'] = 'Προσθήκη συμμετεχόντων';
+$labels['statusorganizer'] = 'Οργανωτής';
+$labels['removeparticipant'] = 'Αφαίρεση';
+$labels['file'] = 'Αρχείο';
+$labels['comment'] = 'Σχόλιο';
+$labels['open'] = 'Άνοιγμα';
+$labels['request'] = 'Αίτηση πρόσκλησης';
+$labels['arialabelfilelist'] = 'Λίστα αρχείων';
+$labels['arialabelfileprops'] = 'Ιδιότητες αρχείου';
+$labels['arialabelfilecontent'] = 'Περιεχόμενο αρχείου';
+$labels['type.vndoasisopendocumenttext'] = 'Αρχείο κειμένου (ODF)';
+$labels['type.html'] = 'Έγγραφο HTML';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/en_US.inc Changed

@@ -20,9 +20,13 @@
 $labels['selectfiles'] = 'Select file(s) to attach...';
 $labels['attachsel'] = 'Attach selected';
 $labels['foldercreate'] = 'Create folder';
+$labels['addfolder'] = 'Add folder';
 $labels['folderedit'] = 'Edit folder';
 $labels['foldermount'] = 'Add storage';
 $labels['folderdelete'] = 'Delete folder';
+$labels['folderoptions'] = 'Folder options';
+$labels['findfolders'] = 'Find folders';
+$labels['findfiles'] = 'Find files';
 
 $labels['folderinside'] = 'Insert inside';
 $labels['foldername'] = 'Folder name';
@@ -169,9 +173,14 @@
 $labels['arialabelfileprops'] = 'File properties';
 $labels['arialabelfilecontent'] = 'File content';
 $labels['arialabelfileeditdialog'] = 'File editing dialog';
-$labels['arialabeldoceditorsdialog'] = 'Document session management dialog';
-$labels['arialabelexportoptions'] = 'Document export options';
+$labels['arialabelsessionslist'] = 'List of document editing sessions';
+$labels['arialabelsessionslistoptions'] = 'Sessions list options';
+$labels['arialabelfilerenameform'] = 'File rename form';
+$labels['arialabelfilesessiondialog'] = 'Document editing session';
 $labels['arialabelcollaborators'] = 'List of document editors';
+$labels['arialabelexportoptions'] = 'Export options';
+$labels['arialabeldoceditorsdialog'] = 'Document editors (invitations)';
+$labels['arialabelmorefileactions'] = 'More file actions';
 
 $labels['type.plain'] = 'Plain Text Document';
 $labels['type.vndoasisopendocumenttext'] = 'Text Document (ODF)';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/es_ES.inc Changed

@@ -6,19 +6,158 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
+$labels['files'] = 'Archivos';
+$labels['filepreview'] = 'Vista previa del archivo';
+$labels['saveall'] = 'guardar todos en la nube...';
+$labels['saveto'] = 'guardar en la nube...';
+$labels['saveas'] = 'Guardar como:';
+$labels['create'] = 'Crear';
 $labels['save'] = 'Guardar';
 $labels['cancel'] = 'Cancelar';
+$labels['fromcloud'] = 'Desde la nube...';
+$labels['selectfiles'] = 'Seleccione los archivos que desea adjuntar...';
+$labels['attachsel'] = 'Adjuntos seleccionados';
+$labels['foldercreate'] = 'Crear carpeta';
+$labels['folderedit'] = 'Editar carpeta';
+$labels['foldermount'] = 'Añadir almacenamiento';
+$labels['folderdelete'] = 'Borrar carpeta';
 $labels['folderinside'] = 'Inserte en el interior';
+$labels['foldername'] = 'Nombre de la carpeta';
 $labels['name'] = 'Nombre';
+$labels['mtime'] = 'Modificado';
 $labels['type'] = 'Tipo';
+$labels['upload'] = 'Cargar';
+$labels['uploadfile'] = 'Cargar archivo(s)';
+$labels['get'] = 'Descargar';
+$labels['getfile'] = 'Descargar archivo';
+$labels['view'] = 'Vista';
+$labels['viewfile'] = 'Ver archivo';
+$labels['rename'] = 'Renombrar';
+$labels['deletefile'] = 'Eliminar archivo(s)';
 $labels['edit'] = 'Editar';
+$labels['editfile'] = 'Editar archivo';
 $labels['save'] = 'Guardar';
+$labels['savefile'] = 'Guardar archivo';
+$labels['printfile'] = 'Imprimir archivo';
+$labels['renamefile'] = 'Renombrar un archivo';
+$labels['createfile'] = 'Crear un archivo';
+$labels['createandedit'] = 'Crear y editar';
+$labels['copyfile'] = 'Copiar un archivo';
+$labels['copyandedit'] = 'Copiar y editar';
+$labels['documenttitle'] = 'Título:';
+$labels['close'] = 'Cerrar';
+$labels['collection_audio'] = 'Audio';
+$labels['collection_video'] = 'Vídeo';
+$labels['collection_image'] = 'Imágenes';
+$labels['collection_document'] = 'Documentos';
+$labels['sessions'] = 'Sesiones';
+$labels['uploading'] = 'Cargando archivo(s)...';
+$labels['attaching'] = 'Adjuntando archivo(s)...';
+$labels['authenticating'] = 'Validando...';
+$labels['foldercreating'] = 'Creando carpeta...';
+$labels['folderupdating'] = 'Actualizando carpeta...';
+$labels['foldermounting'] = 'Añadiendo almacenamiento externo...';
+$labels['folderdeleting'] = 'Borrando carpeta...';
+$labels['folderdeleteconfirm'] = '¿Está seguro de que quiere borrar la carpeta seleccionada?';
+$labels['folderdeletenotice'] = 'La carpeta se ha borrado con éxito.';
+$labels['folderupdatenotice'] = 'La carpeta se ha actualizado con éxito.';
+$labels['foldercreatenotice'] = 'La carpeta se ha creado con éxito.';
+$labels['foldermountnotice'] = 'El almacenamiento se ha añadido con éxito.';
+$labels['folderauthtitle'] = 'Iniciar sesión en $title';
+$labels['saveallnotice'] = 'Los archivos $n se han guardado correctamente.';
+$labels['saveallerror'] = 'Los archivos $n no se han guardado correctamente.';
+$labels['attacherror'] = 'Error al adjuntar los archivos de la nube';
+$labels['fileupdating'] = 'Actualizando el archivo...';
+$labels['filecreating'] = 'Creando el archivo...';
+$labels['filemoving'] = 'Moviendo los archivos...';
+$labels['filecopying'] = 'Copiando los archivos...';
+$labels['filedeleting'] = 'Borrando los archivos...';
+$labels['filedeleteconfirm'] = '¿Está seguro de que quiere borrar los archivos seleccionados?';
+$labels['filedeletenotice'] = 'Los archivos se han borrado correctamente.';
+$labels['filemovenotice'] = 'Los archivos se han movido correctamente.';
+$labels['filecopynotice'] = 'Los archivos se han copiado correctamente.';
+$labels['uploadsizeerror'] = 'Se ha excedido el tamaño ($size) máximo del archivo';
 $labels['listpermanent'] = 'Lista Permanente';
+$labels['additionalfolders'] = 'Carpetas adicionales';
+$labels['allfolders'] = 'buscar en todas las carpetas';
+$labels['fileskip'] = 'Saltar';
+$labels['fileskipall'] = 'Saltar todas';
+$labels['fileoverwrite'] = 'Sobrescribir';
+$labels['fileoverwriteall'] = 'Sobrescribir todas';
+$labels['filemoveconfirm'] = 'Esta acción va a sobrescribir el archivo de destino: <b>$file</b>.';
+$labels['editfiledialog'] = 'Confirmar acción de edición';
+$labels['editfilesessions'] = 'Hay sesiones en curso en el archivo seleccionado. Por favor, seleccione la acción que desea emprender.';
+$labels['newsession'] = 'Crear una sesión nueva';
+$labels['newsessionro'] = 'Crear una nueva sesión (copiar el archivo en la ubicación de lectura-escritura)';
+$labels['ownedsession'] = 'Continuar la sesión existente';
+$labels['invitedsession'] = 'Unirse a la sesión de $user';
+$labels['joinsession'] = 'Solicitar una invitación de $user';
+$labels['editfilero'] = 'Este archivo es de sólo lectura. ¿Desea crear y editar una copia del archivo?';
+$labels['editfilerotitle'] = 'Archivo de sólo lectura';
 $labels['select'] = 'Seleccionar';
+$labels['terminatesession'] = 'Finalizar sesión';
+$labels['sessionterminatedtitle'] = 'Sesión finalizada';
+$labels['sessionterminated'] = 'La sesión ha finalizado. Se cerrará la ventana.';
+$labels['terminate'] = 'Finalizar';
+$labels['sessionterminating'] = 'Finalizar la sesión...';
+$labels['unsavedchanges'] = 'Hay cambios no guardados en el documento que se perderán. ¿Quieres finalizar la sesión de todos modos?';
+$labels['manageeditors'] = 'Invitar al documento';
 $labels['participant'] = 'Participante';
 $labels['status'] = 'Estado';
 $labels['addparticipant'] = 'Añada participante';
+$labels['delparticipant'] = 'Eliminar participante';
+$labels['invitationtexttitle'] = 'Este comentario se adjuntará al mensaje de invitación/notificación enviado al participante';
 $labels['invitationtextlabel'] = 'Añadir comentarios a la Invitación/notificación';
 $labels['statusorganizer'] = 'Organizador';
+$labels['statusinvited'] = 'Invitado';
+$labels['statusaccepted'] = 'Aceptada';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusrequested'] = 'Solicitado';
+$labels['documentinviting'] = 'Invitando participante(s)...';
+$labels['documentcancelling'] = 'Eliminando participante(s)';
 $labels['removeparticipant'] = 'Eliminar';
+$labels['invitednotice'] = 'Ha sido invitado para la sesión de edición por $owner.';
+$labels['acceptedownernotice'] = '$owner aceptó su solicitud para unirse a la sesión de edición.';
+$labels['declinedownernotice'] = '$owner rechazó su solicitud para unirse a la sesión de edición.';
+$labels['acceptednotice'] = '$user aceptó su solicitud para la sesión de edición.';
+$labels['declinednotice'] = '$user rechazó su solicitud para la sesión de edición.';
+$labels['requestednotice'] = '$user solicitó unirse a la sesión de edición.';
+$labels['sessiondialog'] = 'Sesión de edición del documento';
+$labels['sessiondialogcontent'] = 'Hay una sesión de edición en curso en $file creada por $owner.';
+$labels['more'] = 'Mas.';
+$labels['accept'] = 'Aceptar';
+$labels['join'] = 'Unirse a la sesión';
+$labels['decline'] = 'Declinar';
+$labels['owner'] = 'Propietario';
+$labels['when'] = 'Cuándo';
+$labels['file'] = 'archivo';
 $labels['comment'] = 'Comentario';
+$labels['open'] = 'Abrir';
+$labels['request'] = 'Solicitar una invitación';
+$labels['invitationtitle'] = 'Invitación para $file';
+$labels['ivitationaccepting'] = 'Aceptar una invitación...';
+$labels['ivitationdeclining'] = 'Declinar una invitación...';
+$labels['ivitationrequesting'] = 'Solicitar una invitación...';
+$labels['storepasswords'] = 'recordar contraseña';
+$labels['storepasswordsdesc'] = 'Las contraseñas almacenadas se cifrarán. Actívelas si no desea que se le solicite la contraseña en cada inicio de sesión o si desea que este almacenamiento esté disponible a través de WebDAV.';
+$labels['arialabelsearchform'] = 'Formulario de búsqueda de archivos';
+$labels['arialabelquicksearchbox'] = 'Buscar entrada';
+$labels['arialabellistoptions'] = 'Opciones de la lista de archivos';
+$labels['arialabelfolderoptions'] = 'Acciones de carpeta';
+$labels['arialabelfileeditform'] = 'Formulario de edición del archivo';
+$labels['arialabelfilecreateform'] = 'Formulario de creación del archivo';
+$labels['arialabelfilelist'] = 'Lista de archivos';
+$labels['arialabelfoldercreateform'] = 'Formulario de creación del archivo';
+$labels['arialabelfoldereditform'] = 'Formulario de edición de la carpeta';
+$labels['arialabelfoldermountform'] = 'Formulario de almacenamiento externo';
+$labels['arialabelfolderauthform'] = 'Formulario de validación de almacenamiento externo';
+$labels['arialabelfolderlist'] = 'Selección de colección o carpeta';
+$labels['arialabelfileselectdialog'] = 'Diálogo de selección de archivo';
+$labels['arialabelattachmentoptions'] = 'Opciones de guardar documentos adjuntos';
+$labels['arialabelfilesavedialog'] = 'Diálogo de guardar archivo(s)';
+$labels['arialabelfileprops'] = 'Propiedades del archivo';
+$labels['arialabelfilecontent'] = 'Contenido del archivo';
+$labels['arialabelfileeditdialog'] = 'Diálogo de edición de archivo';
+$labels['type.plain'] = 'Documento de texto sin formato';
+$labels['type.vndoasisopendocumenttext'] = 'Documento de texto (ODF)';
+$labels['type.html'] = 'Documento HTML';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/fr_FR.inc Changed

@@ -7,15 +7,15 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Fichiers';
-$labels['filepreview'] = 'Fichier d\'aperçu';
-$labels['saveall'] = 'Enregistrer tout dans le nuage...';
+$labels['filepreview'] = 'Aperçu du fichier';
+$labels['saveall'] = 'Tout enregistrer dans le nuage...';
 $labels['saveto'] = 'Enregistrer dans le nuage...';
-$labels['saveas'] = 'Enregistrer sous:';
+$labels['saveas'] = 'Enregistrer sous :';
 $labels['create'] = 'Créer';
 $labels['save'] = 'Enregistrer';
 $labels['cancel'] = 'Annuler';
 $labels['fromcloud'] = 'Depuis le nuage...';
-$labels['selectfiles'] = 'Sélectionnez le(s) fichier(s) à attacher..';
+$labels['selectfiles'] = 'Sélectionnez le(s) fichier(s) à attacher...';
 $labels['attachsel'] = 'Attachement sélectionné';
 $labels['foldercreate'] = 'Nouveau répertoire';
 $labels['folderedit'] = 'Modifier le répertoire';
@@ -39,17 +39,24 @@
 $labels['save'] = 'Enregistrer';
 $labels['savefile'] = 'Sauvegarder le fichier';
 $labels['printfile'] = 'Imprimer le fichier';
-$labels['close'] = 'fermer';
+$labels['renamefile'] = 'Renommer un fichier';
+$labels['createfile'] = 'Créer un fichier';
+$labels['createandedit'] = 'Créer et modifier';
+$labels['copyfile'] = 'Copier un fichier';
+$labels['copyandedit'] = 'Copier et modifier';
+$labels['documenttitle'] = 'Titre :';
+$labels['close'] = 'Fermer';
 $labels['collection_audio'] = 'Son';
 $labels['collection_video'] = 'Vidéo';
 $labels['collection_image'] = 'Images';
 $labels['collection_document'] = 'Documents';
-$labels['uploading'] = 'Téléversement de(s) fichier(s)...';
-$labels['attaching'] = 'Attachement de fichier(s)...';
-$labels['authenticating'] = 'Authentification ...';
+$labels['sessions'] = 'Sessions';
+$labels['uploading'] = 'Téléversement du(des) fichier(s)...';
+$labels['attaching'] = 'Ajout du(des) fichier(s)...';
+$labels['authenticating'] = 'Authentification...';
 $labels['foldercreating'] = 'Création d\'un répertoire...';
 $labels['folderupdating'] = 'Mise à jour d\'un répertoire...';
-$labels['foldermounting'] = 'Ajouter stockage externe ...';
+$labels['foldermounting'] = 'Ajout de stockage externe...';
 $labels['folderdeleting'] = 'Suppression d\'un répertoire...';
 $labels['folderdeleteconfirm'] = 'Êtes-vous sûr de de vouloir supprimer le répertoire sélectionné ?';
 $labels['folderdeletenotice'] = 'Le répertoire a été supprimé.';
@@ -57,51 +64,100 @@
 $labels['foldercreatenotice'] = 'Le répertoire a été créé.';
 $labels['foldermountnotice'] = 'Stockage ajouté avec succès.';
 $labels['folderauthtitle'] = 'Connexion à $title';
-$labels['saveallnotice'] = '$n fichier(s) ont été sauvegardé(s)';
+$labels['saveallnotice'] = '$n fichier(s) a(ont) été sauvegardé(s)';
 $labels['saveallerror'] = 'La sauvegarde de $n fichier(s) a échoué.';
-$labels['attacherror'] = 'L\'attachement de fichier(s) depuis le nuage a échoué';
+$labels['attacherror'] = 'L\'ajout du(des) fichier(s) depuis le nuage a échoué';
 $labels['fileupdating'] = 'Modification du fichier...';
-$labels['filemoving'] = 'Déplacement de fichier(s)...';
-$labels['filecopying'] = 'Copie de fichier(s)...';
-$labels['filedeleting'] = 'Suppression de fichier(s)...';
+$labels['filecreating'] = 'Création du fichier...';
+$labels['filemoving'] = 'Déplacement du(des) fichier(s)...';
+$labels['filecopying'] = 'Copie du(des) fichier(s)...';
+$labels['filedeleting'] = 'Suppression du(des) fichier(s)...';
 $labels['filedeleteconfirm'] = 'Êtes-vous sûr de de vouloir supprimer les fichiers sélectionnés ?';
-$labels['filedeletenotice'] = 'Le(s) fichier(s) ont été supprimé(s).';
-$labels['filemovenotice'] = 'Le(s) fichier(s) ont été déplacé(s).';
-$labels['filecopynotice'] = 'Le(s) fichier(s) ont été copié(s).';
-$labels['uploadsizeerror'] = 'La taille du fichier maximale ($size) est dépassée!';
+$labels['filedeletenotice'] = 'Le(s) fichier(s) a(ont) été supprimé(s).';
+$labels['filemovenotice'] = 'Le(s) fichier(s) a(ont) été déplacé(s).';
+$labels['filecopynotice'] = 'Le(s) fichier(s) a(ont) été copié(s).';
+$labels['uploadsizeerror'] = 'La taille maximale du fichier ($size) est dépassée !';
 $labels['listpermanent'] = 'Lister définitivement';
+$labels['additionalfolders'] = 'Dossiers supplémentaires';
 $labels['allfolders'] = 'Recherche dans tous les répertoires';
 $labels['fileskip'] = 'Ignorer';
 $labels['fileskipall'] = 'Ignorer tout';
 $labels['fileoverwrite'] = 'Écraser';
 $labels['fileoverwriteall'] = 'Écraser tout';
 $labels['filemoveconfirm'] = 'Cette action va écraser le fichier de destination : <b>$file</b>.';
+$labels['editfiledialog'] = 'Confirmer la modification';
+$labels['editfilesessions'] = 'Des sessions sont en cours pour le fichier choisi. Veuillez choisir l\'action souhaitée.';
+$labels['newsession'] = 'Créer une nouvelle session';
+$labels['newsessionro'] = 'Créer une nouvelle session (copier le fichier à l\'emplacement d\'écriture/de lecture)';
+$labels['ownedsession'] = 'Poursuivre votre session existante';
+$labels['invitedsession'] = 'Rejoindre la session de $user';
+$labels['joinsession'] = 'Demander une invitation à $user';
+$labels['editfilero'] = 'Ce fichier est disponible en lecture seule. Souhaitez-vous créer et modifier une copie du fichier ?';
+$labels['editfilerotitle'] = 'Fichier en lecture seule';
 $labels['select'] = 'Sélectionner';
+$labels['terminatesession'] = 'Fermer la session';
+$labels['sessionterminatedtitle'] = 'Session terminée';
+$labels['sessionterminated'] = 'La session est terminée. La fenêtre va être fermée.';
+$labels['terminate'] = 'Terminer';
+$labels['sessionterminating'] = 'La session va prendre fin...';
+$labels['unsavedchanges'] = 'Les modifications non sauvegardées dans ce document seront perdues. Souhaitez-vous tout de même mettre fin à la session  ?';
+$labels['manageeditors'] = 'Inviter dans le document';
 $labels['participant'] = 'Participant';
-$labels['status'] = 'État';
-$labels['addparticipant'] = 'Ajouter participant';
+$labels['status'] = 'Statut';
+$labels['addparticipant'] = 'Ajouter un participant';
+$labels['delparticipant'] = 'Retirer le participant';
+$labels['invitationtexttitle'] = 'Ce commentaire sera joint au message d\'invitation/notification envoyé au participant';
 $labels['invitationtextlabel'] = 'Commentaire d’invitation ou de notification';
 $labels['statusorganizer'] = 'Organisateur';
+$labels['statusinvited'] = 'Invité';
+$labels['statusaccepted'] = 'Accepté';
+$labels['statusdeclined'] = 'Refusé';
+$labels['statusrequested'] = 'Demandé';
+$labels['documentinviting'] = 'Invitation du ou des participant(s) en cours';
+$labels['documentcancelling'] = 'Retrait du ou des participant(s)...';
 $labels['removeparticipant'] = 'Supprimer';
+$labels['invitednotice'] = 'Vous avez été invité par $owner à rejoindre la session de modification.';
+$labels['acceptedownernotice'] = '$owner a accepté votre demande à rejoindre la session de modification.';
+$labels['declinedownernotice'] = '$owner a décliné votre demande à rejoindre la session de modification.';
+$labels['acceptednotice'] = '$user a accepté votre invitation à rejoindre la session de modification.';
+$labels['declinednotice'] = '$user a décliné votre invitation à rejoindre la session de modification.';
+$labels['requestednotice'] = '$user a demandé à rejoindre la session de modification';
+$labels['sessiondialog'] = 'Session de modification du document';
+$labels['sessiondialogcontent'] = 'Un session de modification est en cours pour $file créé par $owner';
+$labels['more'] = 'Plus.';
 $labels['accept'] = 'Accepter';
+$labels['join'] = 'Rejoindre la session';
 $labels['decline'] = 'Refuser';
 $labels['owner'] = 'Propriétaire';
+$labels['when'] = 'Quand';
+$labels['file'] = 'Fichier';
 $labels['comment'] = 'Commentaire';
 $labels['open'] = 'Ouvrir';
-$labels['storepasswords'] = 'rappelez-vous du mot de passe';
-$labels['storepasswordsdesc'] = 'Les mots de passe stockés seront chiffrés. Permettez ceci si vous ne voulez pas que le mot de passe vous soit demandé lors de chaque connexion ou si vous voulez que ce stockage soit disponible via WebDAV.';
-$labels['arialabelsearchform'] = 'Zone de recherche des fichiers';
+$labels['request'] = 'Demander une invitation';
+$labels['invitationtitle'] = 'Invitation pour $file';
+$labels['ivitationaccepting'] = 'Invitation acceptée...';
+$labels['ivitationdeclining'] = 'Invitation déclinée...';
+$labels['ivitationrequesting'] = 'Demande d\'invitation...';
+$labels['storepasswords'] = 'se souvenir du mot de passe';
+$labels['storepasswordsdesc'] = 'Les mots de passe stockés seront chiffrés. Autorisez ceci si vous ne voulez pas que le mot de passe vous soit demandé à chaque connexion ou si vous voulez que ce stockage soit disponible via WebDAV.';
+$labels['arialabelsearchform'] = 'Formulaire de recherche des fichiers';
 $labels['arialabelquicksearchbox'] = 'Champ de recherche';
 $labels['arialabellistoptions'] = 'Liste d\'options des fichiers';
 $labels['arialabelfolderoptions'] = 'Actions de dossier';
-$labels['arialabelfileeditform'] = 'Zone d\'édition de fichier';
-$labels['arialabelfoldercreateform'] = 'Zone de création de dossier';
-$labels['arialabelfoldereditform'] = 'Zone d\'édition de dossier';
-$labels['arialabelfoldermountform'] = 'Stockage externe depuis';
+$labels['arialabelfileeditform'] = 'Formulaire d\'édition de fichiers';
+$labels['arialabelfilecreateform'] = 'Formulaire de création de fichiers';
+$labels['arialabelfilelist'] = 'Liste des fichiers';
+$labels['arialabelfoldercreateform'] = 'Formulaire de création de dossiers';
+$labels['arialabelfoldereditform'] = 'Formulaire d\'édition de dossiers';
+$labels['arialabelfoldermountform'] = 'Formulaire de stockage externe';
 $labels['arialabelfolderauthform'] = 'Formulaire d\'authentification de stockage externe';
-$labels['arialabelfolderlist'] = 'Sélection de dossier';
-$labels['arialabelfileselectdialog'] = ' Fenêtre de dialogue de sélection de fichier.';
+$labels['arialabelfolderlist'] = 'Sélection de dossier/de collection';
+$labels['arialabelfileselectdialog'] = ' Fenêtre de sélection de fichier.';
 $labels['arialabelattachmentoptions'] = 'Options d\'enregistrement des pièces jointes';
-$labels['arialabelfilesavedialog'] = 'Boite de dialogue d\'enregistrement de fichier(s)';
+$labels['arialabelfilesavedialog'] = 'Boîte de dialogue d\'enregistrement du(des) fichier(s)';
 $labels['arialabelfileprops'] = 'Propriétés du fichier';
-$labels['arialabelfilecontent'] = 'Contenu de fichier';
+$labels['arialabelfilecontent'] = 'Contenu du fichier';
+$labels['arialabelfileeditdialog'] = 'Fenêtre de modification de fichier';
+$labels['type.plain'] = 'Document texte simple';
+$labels['type.vndoasisopendocumenttext'] = 'Document texte (ODF)';
+$labels['type.html'] = 'Fichier HTML';

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/lv.inc Added

@@ -0,0 +1,29 @@
+<?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'] = 'Faili';
+$labels['save'] = 'Saglabāt';
+$labels['cancel'] = 'Atcelt';
+$labels['folderinside'] = 'Ievietot';
+$labels['name'] = 'Nosaukums';
+$labels['edit'] = 'Labot';
+$labels['save'] = 'Saglabāt';
+$labels['close'] = 'Aizvērt';
+$labels['listpermanent'] = 'Rādīt sarakstā vienmēr';
+$labels['select'] = 'Izvēlēties';
+$labels['participant'] = 'Dalībnieks';
+$labels['status'] = 'Statuss';
+$labels['addparticipant'] = 'Pievienot dalībnieku';
+$labels['invitationtextlabel'] = 'Uzaicinājumam/paziņojuma komentārs';
+$labels['statusorganizer'] = 'Organizētājs';
+$labels['statusaccepted'] = 'Pieņemts';
+$labels['statusdeclined'] = 'Noraidīts';
+$labels['accept'] = 'Pieņemt';
+$labels['decline'] = 'Noraidīt';
+$labels['owner'] = 'Īpašnieks';
+$labels['comment'] = 'Komentārs';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/nl_NL.inc Changed

@@ -7,76 +7,157 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_files/
  */
 $labels['files'] = 'Bestanden';
-$labels['saveall'] = 'Sla alles op in de cloud...';
-$labels['saveto'] = 'Sla op in de cloud...';
+$labels['filepreview'] = 'Bestandsvoorbeeld';
+$labels['saveall'] = 'Alles opslaan in de cloud...';
+$labels['saveto'] = 'Opslaan in de cloud...';
 $labels['saveas'] = 'Opslaan als:';
-$labels['create'] = 'Creëer';
+$labels['create'] = 'Maken';
 $labels['save'] = 'Opslaan';
 $labels['cancel'] = 'Annuleren';
 $labels['fromcloud'] = 'Uit de cloud...';
 $labels['selectfiles'] = 'Selecteer bestand(en) om toe te voegen...';
-$labels['attachsel'] = 'Voeg het geselekteerde toe';
-$labels['foldercreate'] = 'Creëer map';
-$labels['folderdelete'] = 'Verwijder map';
-$labels['folderinside'] = 'Insert inside';
-$labels['foldername'] = 'Map naam';
+$labels['attachsel'] = 'Selectie toevoegen';
+$labels['foldercreate'] = 'Map maken';
+$labels['folderedit'] = 'Map bewerken';
+$labels['foldermount'] = 'Opslag toevoegen';
+$labels['folderdelete'] = 'Map verwijderen';
+$labels['folderinside'] = 'Invoegen in';
+$labels['foldername'] = 'Mapnaam';
 $labels['name'] = 'Naam';
 $labels['mtime'] = 'Gewijzigd';
 $labels['type'] = 'Type';
-$labels['upload'] = 'Upload';
-$labels['uploadfile'] = 'Upload bestand(en)';
+$labels['upload'] = 'Uploaden';
+$labels['uploadfile'] = 'Bestand(en) uploaden';
 $labels['get'] = 'Downloaden';
-$labels['getfile'] = 'Download bestand';
-$labels['view'] = 'Bekijken';
-$labels['viewfile'] = 'Bekijk bestand';
+$labels['getfile'] = 'Bestand downloaden';
+$labels['view'] = 'Weergeven';
+$labels['viewfile'] = 'Bestand weergeven';
 $labels['rename'] = 'Naam wijzigen';
-$labels['deletefile'] = 'Verwijder bestand(en)';
-$labels['edit'] = 'Wijzigen';
-$labels['editfile'] = 'Wijzig bestand';
+$labels['deletefile'] = 'Bestand(en) verwijderen';
+$labels['edit'] = 'Bewerken';
+$labels['editfile'] = 'Bestand bewerken';
 $labels['save'] = 'Opslaan';
-$labels['savefile'] = 'Sla bestand op';
-$labels['printfile'] = 'Druk bestand af';
+$labels['savefile'] = 'Bestand opslaan';
+$labels['printfile'] = 'Bestand afdrukken';
+$labels['renamefile'] = 'Naam van bestand wijzigen';
+$labels['createfile'] = 'Bestand maken';
+$labels['createandedit'] = 'Maken en bewerken';
+$labels['copyfile'] = 'Bestand kopiëren';
+$labels['copyandedit'] = 'Kopiëren en bewerken';
+$labels['documenttitle'] = 'Naam:';
 $labels['close'] = 'Sluiten';
-$labels['collection_audio'] = 'Geluid';
+$labels['collection_audio'] = 'Audio';
 $labels['collection_video'] = 'Video';
 $labels['collection_image'] = 'Afbeeldingen';
 $labels['collection_document'] = 'Documenten';
-$labels['uploading'] = 'Uploaden van bestand(en)...';
+$labels['sessions'] = 'Sessies';
+$labels['uploading'] = 'Bestand(en) uploaden...';
 $labels['attaching'] = 'Bestand(en) toevoegen...';
-$labels['foldercreating'] = 'Creëren van map...';
-$labels['folderdeleting'] = 'Verwijderen van map...';
+$labels['authenticating'] = 'Verifiëren...';
+$labels['foldercreating'] = 'Map maken...';
+$labels['folderupdating'] = 'Map bijwerken...';
+$labels['foldermounting'] = 'Externe opslag toevoegen...';
+$labels['folderdeleting'] = 'Map verwijderen...';
 $labels['folderdeleteconfirm'] = 'Weet u zeker dat u de geselecteerde map wilt verwijderen?';
-$labels['folderdeletenotice'] = 'Map succesvol verwijderd.';
-$labels['foldercreatenotice'] = 'Map succesvol aangemaakt.';
-$labels['saveallnotice'] = 'Succesvol $n bestand(en) opgeslagen.';
-$labels['saveallerror'] = 'Opslaan van $n bestand(en) mislukt.';
-$labels['attacherror'] = 'Toevoegen van bestand(en) uit de cloud mislukt';
-$labels['fileupdating'] = 'Wijzigen van bestand...';
-$labels['filemoving'] = 'Verplaatsen van bestand(en)...';
-$labels['filecopying'] = 'Kopiëren van bestand(en)...';
-$labels['filedeleting'] = 'Verwijderen van bestand(en)...';
+$labels['folderdeletenotice'] = 'Map is met succes verwijderd.';
+$labels['folderupdatenotice'] = 'Map is met succes bijgewerkt.';
+$labels['foldercreatenotice'] = 'Map is met succes gemaakt.';
+$labels['foldermountnotice'] = 'Opslag is met succes toegevoegd.';
+$labels['folderauthtitle'] = 'Aanmelding bij $title';
+$labels['saveallnotice'] = '$n bestand(en) met succes opgeslagen.';
+$labels['saveallerror'] = 'Opslaan van $n bestand(en) is mislukt.';
+$labels['attacherror'] = 'Toevoegen van bestand(en) uit de cloud is mislukt';
+$labels['fileupdating'] = 'Bestand bijwerken...';
+$labels['filecreating'] = 'Bestand maken...';
+$labels['filemoving'] = 'Bestand(en) verplaatsen...';
+$labels['filecopying'] = 'Bestand(en) kopiëren...';
+$labels['filedeleting'] = 'Bestand(en) verwijderen...';
 $labels['filedeleteconfirm'] = 'Weet u zeker dat u de geselecteerde bestanden wilt verwijderen?';
-$labels['filedeletenotice'] = 'Bestand(en) succesvol verwijderd.';
-$labels['filemovenotice'] = 'Bestand(en) succesvol verplaatst.';
-$labels['filecopynotice'] = 'Bestand(en) succesvol gekopieerd.';
+$labels['filedeletenotice'] = 'Bestand(en) met succes verwijderd.';
+$labels['filemovenotice'] = 'Bestand(en) met succes verplaatst.';
+$labels['filecopynotice'] = 'Bestand(en) met succes gekopieerd.';
 $labels['uploadsizeerror'] = 'Maximale bestandsgrootte ($size)  overschreden!';
-$labels['listpermanent'] = 'Permanent weergeven';
-$labels['allfolders'] = 'Zoek in alle mappen';
+$labels['listpermanent'] = 'Definitief weergeven';
+$labels['additionalfolders'] = 'Extra mappen';
+$labels['allfolders'] = 'zoeken in alle mappen';
 $labels['fileskip'] = 'Overslaan';
-$labels['fileskipall'] = 'Sla allen over';
+$labels['fileskipall'] = 'Alles overslaan';
 $labels['fileoverwrite'] = 'Overschrijven';
-$labels['fileoverwriteall'] = 'Overschrijf alle';
-$labels['filemoveconfirm'] = 'Deze actie overschrijft het volgende doelbestand: <b>$file</b>.';
-$labels['select'] = 'Selecteer';
+$labels['fileoverwriteall'] = 'Alles overschrijven';
+$labels['filemoveconfirm'] = 'Met deze actie overschrijft u het doelbestand: <b>$file</b>.';
+$labels['editfiledialog'] = 'Bewerking bevestigen';
+$labels['editfilesessions'] = 'Het geselecteerde bestand wordt in actieve sessies gebruikt. Selecteer de gewenste actie.';
+$labels['newsession'] = 'Nieuwe sessie maken';
+$labels['newsessionro'] = 'Nieuwe sessie maken (bestand kopiëren naar locatie met lees-/schrijfrechten)';
+$labels['ownedsession'] = 'Huidige sessie voortzetten';
+$labels['invitedsession'] = 'Deelnemen aan sessie van $user';
+$labels['joinsession'] = 'Uitnodiging aan $user vragen';
+$labels['editfilero'] = 'Dit bestand kan alleen worden gelezen. Wilt u een kopie van het bestand maken en bewerken?';
+$labels['editfilerotitle'] = 'Alleen-lezenbestand';
+$labels['select'] = 'Selecteren';
+$labels['terminatesession'] = 'Sessie beëindigen';
+$labels['sessionterminatedtitle'] = 'Sessie beëindigd';
+$labels['sessionterminated'] = 'De sessie is beëindigd. Het venster wordt gesloten.';
+$labels['terminate'] = 'Beëindigen';
+$labels['sessionterminating'] = 'Sessie wordt beëindigd...';
+$labels['unsavedchanges'] = 'Het document bevat wijzigingen die niet zijn opgeslagen en verloren zullen gaan. Wilt u de sessie toch beëindigen?';
+$labels['manageeditors'] = 'Uitnodigen voor document';
 $labels['participant'] = 'Deelnemer';
 $labels['status'] = 'Status';
 $labels['addparticipant'] = 'Deelnemer toevoegen';
-$labels['invitationtextlabel'] = 'Invitation/notification comment';
-$labels['statusorganizer'] = 'Organisatie';
-$labels['removeparticipant'] = 'Verwijder';
-$labels['accept'] = 'Accepteer';
-$labels['decline'] = 'Afwijzen';
+$labels['delparticipant'] = 'Deelnemer verwijderen';
+$labels['invitationtexttitle'] = 'Deze opmerking wordt toegevoegd aan de uitnodiging/melding die naar de deelnemer wordt verstuurd';
+$labels['invitationtextlabel'] = 'Opmerking bij uitnodiging/melding';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusinvited'] = 'Uitgenodigd';
+$labels['statusaccepted'] = 'Geaccepteerd';
+$labels['statusdeclined'] = 'Geweigerd';
+$labels['statusrequested'] = 'Gevraagd';
+$labels['documentinviting'] = 'Deelnemer(s) uitnodigen...';
+$labels['documentcancelling'] = 'Deelnemer(s) verwijderen...';
+$labels['removeparticipant'] = 'Verwijderen';
+$labels['invitednotice'] = 'U bent uitgenodigd voor de bewerkingssessie door $owner.';
+$labels['acceptedownernotice'] = '$owner heeft uw verzoek om aan de bewerkingssessie deel te nemen geaccepteerd.';
+$labels['declinedownernotice'] = '$owner heeft uw verzoek om aan de bewerkingssessie deel te nemen geweigerd.';
+$labels['acceptednotice'] = '$user heeft uw uitnodiging voor de bewerkingssessie geaccepteerd.';
+$labels['declinednotice'] = '$user heeft uw uitnodiging voor de bewerkingssessie geweigerd.';
+$labels['requestednotice'] = '$user heeft gevraagd om deel te nemen aan de bewerkingssessie.';
+$labels['sessiondialog'] = 'Bewerkingssessie voor document';
+$labels['sessiondialogcontent'] = 'Er is een actieve bewerkingssessie $file die door $owner is gestart.';
+$labels['more'] = 'Meer.';
+$labels['accept'] = 'Accepteren';
+$labels['join'] = 'Deelnemen aan sessie';
+$labels['decline'] = 'Afslaan';
 $labels['owner'] = 'Eigenaar';
+$labels['when'] = 'Wanneer';
+$labels['file'] = 'Bestand';
 $labels['comment'] = 'Opmerking';
 $labels['open'] = 'Openen';
+$labels['request'] = 'Uitnodiging vragen';
+$labels['invitationtitle'] = 'Uitnodiging voor $file';
+$labels['ivitationaccepting'] = 'Uitnodiging wordt geaccepteerd...';
+$labels['ivitationdeclining'] = 'Uitnodiging wordt afgeslagen...';
+$labels['ivitationrequesting'] = 'Uitnodiging wordt gevraagd...';
+$labels['storepasswords'] = 'wachtwoord onthouden';
+$labels['storepasswordsdesc'] = 'Opgeslagen wachtwoorden worden gecodeerd. Schakel deze optie in als u niet bij elke aanmelding het wachtwoord wilt invoeren of als u deze opslag beschikbaar wilt maken via WebDAV.';
+$labels['arialabelsearchform'] = 'Zoekformulier voor bestanden';
+$labels['arialabelquicksearchbox'] = 'Zoekopdracht';
+$labels['arialabellistoptions'] = 'Opties voor lijst met bestanden';
+$labels['arialabelfolderoptions'] = 'Mapacties';
+$labels['arialabelfileeditform'] = 'Formulier voor bewerking van bestanden';
+$labels['arialabelfilecreateform'] = 'Formulier voor aanmaak van bestanden';
+$labels['arialabelfilelist'] = 'Lijst met bestanden';
+$labels['arialabelfoldercreateform'] = 'Formulier voor aanmaak van mappen';
+$labels['arialabelfoldereditform'] = 'Formulier voor bewerking van mappen';
+$labels['arialabelfoldermountform'] = 'Formulier voor externe opslag';
+$labels['arialabelfolderauthform'] = 'Formulier voor verificatie van externe opslag';
+$labels['arialabelfolderlist'] = 'Map/verzameling selecteren';
+$labels['arialabelfileselectdialog'] = 'Dialoogvenster voor selectie van bestand';
+$labels['arialabelattachmentoptions'] = 'Opties voor opslag van bijlage';
+$labels['arialabelfilesavedialog'] = 'Dialoogvenster voor opslag van bestand(en)';
 $labels['arialabelfileprops'] = 'Eigenschappen van bestand';
+$labels['arialabelfilecontent'] = 'Bestandsinhoud';
+$labels['arialabelfileeditdialog'] = 'Dialoogvenster voor bewerking van bestand';
+$labels['type.plain'] = 'Document zonder opmaak';
+$labels['type.vndoasisopendocumenttext'] = 'Tekstdocument (ODF)';
+$labels['type.html'] = 'HTML-document';

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/localization/ru_RU.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/localization/ru_RU.inc Changed

@@ -85,6 +85,7 @@
 $labels['fileoverwrite'] = 'Перезаписать';
 $labels['fileoverwriteall'] = 'Перезаписать все';
 $labels['filemoveconfirm'] = 'Это действие перезапишет файл: <b>$file</b>.';
+$labels['editfiledialog'] = 'Подтвердить выполненные действия';
 $labels['newsession'] = 'Создать новую сессию';
 $labels['newsessionro'] = 'Создать новую сессию (скопировать файл в область для для редактирования)';
 $labels['ownedsession'] = 'Продолжить существующую сессию';
@@ -104,10 +105,17 @@
 $labels['status'] = 'Статус';
 $labels['addparticipant'] = 'Добавить участника';
 $labels['delparticipant'] = 'Удалить участника';
+$labels['invitationtexttitle'] = 'Комментарий будет прикреплен к приглашению/сообщению, отправленному участнику';
 $labels['invitationtextlabel'] = 'Комментарий к приглашению/извещению';
 $labels['statusorganizer'] = 'Организатор';
+$labels['statusinvited'] = 'Приглашенный';
+$labels['statusaccepted'] = 'Принято';
+$labels['statusdeclined'] = 'Отклонено';
+$labels['statusrequested'] = 'Запрошенный';
 $labels['removeparticipant'] = 'Убрать';
+$labels['invitednotice'] = 'Вы были приглашены $owner для совместного редактирования.';
 $labels['sessiondialog'] = 'Сессия редактирования документа';
+$labels['more'] = 'Больше.';
 $labels['accept'] = 'Принять';
 $labels['join'] = 'Присоединиться к сессии';
 $labels['decline'] = 'Отклонить';

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/compose_plugin.html Added

@@ -0,0 +1,43 @@
+<div id="files-compose-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-fileselect">
+	<h3 id="aria-label-fileselect" class="voice"><roundcube:label name="kolab_files.arialabelfileselectdialog" /></h3>
+	<div id="folderlistbox" class="selection-list" role="navigation" aria-labelledby="aria-label-folderlist">
+		<h4 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h4>
+		<div class="header">
+			<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"
+			ariatag="h5" label="foldersearchform" buttontitle="kolab_files.findfolders" />
+		<div id="files-folder-list" class="scroller"></div>
+	</div>
+	<div id="filelistcontainer" class="selection-content content">
+		<div class="header">
+			<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"
+			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">
+			<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
+			<div class="formcontent">
+				<ul class="proplist">
+					<li><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /><roundcube:label name="kolab_files.allfolders" /></label></li>
+				</ul>
+			</div>
+			<div class="formbuttons">
+				<button class="btn btn-primary icon search" href="#" onclick="return rcmail.command('files-search')"><roundcube:label name="search" /></button>
+			</div>
+		</div>
+		<h4 id="aria-label-filelist" class="voice"><roundcube:label name="kolab_files.arialabelfilelist" /></h4>
+		<div class="scroller">
+			<roundcube:object name="filelist" id="filelist" class="records-table filelist listing sortheader fixedheader"
+				aria-labelledby="aria-label-filelist" data-list="fileslist" data-label-msg="listempty" />
+		</div>
+	</div>
+</div>
+
+<div id="files-folder-auth-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-folderauthform">
+	<h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
+	<roundcube:object name="folder-auth-options">
+</div>

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/docedit.html Added

@@ -0,0 +1,72 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:var name="env:filename" /></h1>
+
+<div class="content 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"
+				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"
+					label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
+				<a href="#export" class="button 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"
+					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"
+				label="kolab_files.save" title="kolab_files.savefile" innerClass="inner" data-hidden="small" />
+		</div>
+		<roundcube:if condition="env:editor_type != 'wopi'" />
+			<div id="doc-title" data-hidden="small">
+				<label for="document-title"><roundcube:label name="kolab_files.documenttitle" />&nbsp;<input id="document-title" type="text" class="form-control" /></label>
+			</div>
+		<roundcube:endif />
+		<div id="collaborators" role="toolbar" aria-labelledby="aria-label-collaborators" data-hidden="small">
+			<h3 id="aria-label-collaborators" class="voice"><roundcube:label name="kolab_files.arialabelcollaborators" /></h3>
+			<roundcube:button command="document-editors" type="link"
+				class="button add disabled" classAct="button add"
+				label="kolab_files.manageeditors" title="kolab_files.manageeditors" innerClass="inner" />
+			<div id="members" class="session-members"></div>
+		</div>
+	</div>
+	<h2 id="aria-label-filecontent" class="voice"><roundcube:label name="kolab_files.arialabelfilecontent" /></h2>
+	<div class="iframe-wrapper">
+		<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"
+			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" />
+	</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>
+</div>
+
+<div id="document-editors-dialog" class="popupmenu editors-dialog" data-editable="true" role="dialog" aria-labelledby="aria-label-doceditorsdialog">
+	<h3 id="aria-label-doceditorsdialog" class="voice"><roundcube:label name="kolab_files.arialabeldoceditorsdialog" /></h3>
+	<roundcube:object name="document-editors-dialog" class="records-table table no-img" />
+</div>
+
+<script src="plugins/kolab_files/skins/elastic/ui.js" type="text/javascript"></script>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/filepreview.html Added

@@ -0,0 +1,89 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:var name="env:filename" /></h1>
+
+<div class="sidebar 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>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="fileinfobox" id="fileinfo" class="listing props-table" />
+	</div>
+</div>
+
+<div class="content 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"
+				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
+			<roundcube:button command="files-edit" type="link"
+				class="button edit disabled" classAct="button 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"
+				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"
+				label="delete" title="kolab_files.deletefile" innerClass="inner" />
+			<roundcube:button command="files-print" type="link"
+				class="button print disabled" classAct="button 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"
+					label="zoomin" title="increaseimage" innerclass="inner" />
+				<roundcube:button command="image-scale" type="link" prop="-" data-hidden="small"
+					class="button zoomout disabled" classAct="button zoomout"
+					label="zoomout" title="decreaseimage" innerclass="inner" />
+				<roundcube:button command="image-rotate" type="link"
+					class="button rotate disabled" classAct="button rotate" data-hidden="small"
+					label="rotate" title="rotateimage" innerclass="inner" />
+			<roundcube:endif />
+		</div>
+	</div>
+	<h2 id="aria-label-filecontent" class="voice"><roundcube:label name="kolab_files.arialabelfilecontent" /></h2>
+	<div class="iframe-wrapper file-type-<roundcube:exp expression="strtolower(preg_replace('|/.*$|', '', env:mimetype))" />">
+		<roundcube:object name="filepreviewframe" id="fileframe" role="main" aria-labelledby="aria-label-filecontent" />
+	</div>
+<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">
+			<roundcube:button command="image-scale" type="link" prop="+"
+				class="button zoomin disabled" classAct="button zoomin"
+				label="zoomin" title="increaseimage" innerclass="inner" />
+			<roundcube:button command="image-scale" type="link" prop="-"
+				class="button zoomout disabled" classAct="button zoomout"
+				label="zoomout" title="decreaseimage" innerclass="inner" />
+			<roundcube:button command="image-rotate" type="link"
+				class="button rotate disabled" classAct="button 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')))"
+			data-label-show="<roundcube:label name="showtools" />" data-label-hide="<roundcube:label name="hidetools" />" title="<roundcube:label name="showtools" />">
+			<span class="inner"><roundcube:label name="showtools" /></span>
+		</a>
+	</div>
+<roundcube:endif />
+</div>
+
+<div id="files-file-create-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-filecreateform" aria-hidden="true">
+	<h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+	<roundcube:object name="file-create-form" />
+</div>
+
+<div id="files-file-edit-dialog" class="popupmenu" role="dialog" aria-labelledby="aria-label-fileeditdialog" aria-hidden="true">
+	<h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+	<roundcube:object name="file-edit-dialog">
+</div>
+
+<script src="plugins/kolab_files/skins/elastic/ui.js" type="text/javascript"></script>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/files.html Added

@@ -0,0 +1,216 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_files.files" /></h1>
+
+
+<div class="sidebar 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>
+		<roundcube:button name="folderoptions" id="folderoptionslink" type="link"
+			title="moreactions" label="actions"
+			class="button icon sidebar-menu" innerClass="inner" data-popup="folderoptions-menu" />
+	</div>
+	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+		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 id="quotadisplay" class="quota-widget">
+			<span class="voice"><roundcube:label name="quota"></span>
+			<roundcube:object name="filequotadisplay" class="count" display="text" />
+		</div>
+	</div>
+<roundcube:endif />
+</div>
+
+
+<div class="content 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 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">
+			<roundcube:button id="fileslistmenu-link" name="fileslistmenu-link"
+				type="link" onclick="kolab_files_listoptions('files')"
+				label="options" class="button settings" 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" />
+			<span class="spacer"></span>
+			<roundcube:button command="files-upload" type="link" onclick="$('#filesuploadform').click()"
+				class="button upload disabled" classAct="button 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"
+				label="kolab_files.get" title="kolab_files.getfile" innerClass="inner" />
+			<roundcube:button command="files-open" type="link"
+				class="button open disabled" classAct="button 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"
+				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"
+				label="kolab_files.create" title="kolab_files.createfile" innerClass="inner "/>
+			<roundcube:button command="files-delete" type="link"
+				class="button delete disabled" classAct="button delete"
+				label="delete" title="kolab_files.deletefile" innerClass="inner" />
+			<roundcube:button name="filemenulink" id="filemenulink" type="link"
+				class="button more" label="more" title="moreactions"
+				data-popup="file-menu" innerclass="inner" />
+		</div>
+	</div>
+	<roundcube:object name="file-search-form" id="searchform" wrapper="searchbar toolbar"
+		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">
+		<h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod" /></h3>
+		<div class="formcontent">
+			<ul class="proplist">
+				<li><label><input type="checkbox" name="all_folders" value="1" id="search_all_folders" /><roundcube:label name="kolab_files.allfolders" /></label></li>
+			</ul>
+		</div>
+		<div class="formbuttons">
+			<button class="btn btn-primary icon search" href="#" onclick="return rcmail.command('files-search')"><roundcube:label name="search" /></button>
+		</div>
+	</div>
+	<div id="filelistcontainer" class="content" role="main" aria-labelledby="aria-label-filelist" data-elastic-mode="true">
+		<h2 id="aria-label-filelist" class="voice"><roundcube:label name="kolab_files.arialabelfilelist" /></h2>
+		<div id="filelistbox" class="droptarget">
+			<roundcube:object name="filelist" id="filelist" class="records-table listing filelist sortheader fixedheader"
+				aria-labelledby="aria-label-filelist" data-list="fileslist"
+				data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="files-create" />
+		</div>
+		<h2 id="aria-label-sessionslist" class="voice"><roundcube:label name="kolab_files.arialabelsessionslist" /></h2>
+		<div id="sessionslistbox" class="boxlistcontent" style="display:none">
+		<roundcube:object name="sessionslist" id="sessionslist" class="records-table listing filelist sortheader fixedheader"
+			optionsmenuIcon="true" aria-labelledby="aria-label-sessionslist" data-label-msg="listempty" />
+		</div>
+	</div>
+</div>
+
+<form id="filesuploadform" class="smart-upload"></form>
+
+<div id="files-folder-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldercreateform">
+	<h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
+	<roundcube:object name="folder-create-form" />
+</div>
+<div id="files-folder-edit-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldereditform">
+	<h3 id="aria-label-foldereditform" class="voice"><roundcube:label name="kolab_files.arialabelfoldereditform" /></h3>
+	<roundcube:object name="folder-edit-form" />
+</div>
+<div id="files-folder-mount-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldermountform">
+	<h3 id="aria-label-foldermountform" class="voice"><roundcube:label name="kolab_files.arialabelfoldermountform" /></h3>
+	<roundcube:object name="folder-mount-form" />
+</div>
+<div id="files-file-rename-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filerenameform">
+	<h3 id="aria-label-filerenameform" class="voice"><roundcube:label name="kolab_files.arialabelfilerenameform" /></h3>
+	<roundcube:object name="file-rename-form" />
+</div>
+<div id="files-file-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filecreateform">
+	<h3 id="aria-label-filecreateform" class="voice"><roundcube:label name="kolab_files.arialabelfilecreateform" /></h3>
+	<roundcube:object name="file-create-form" />
+</div>
+<div id="files-folder-auth-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-folderauthform">
+	<h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
+	<roundcube:object name="folder-auth-options" />
+</div>
+<div id="files-file-edit-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-fileeditdialog">
+	<h3 id="aria-label-fileeditdialog" class="voice"><roundcube:label name="kolab_files.arialabelfileeditdialog" /></h3>
+	<roundcube:object name="file-edit-dialog" />
+</div>
+<div id="files-session-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-filesessiondialog">
+	<h3 id="aria-label-filesessiondialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesessiondialog" /></h3>
+	<roundcube:object name="file-session-dialog" />
+</div>
+
+<div id="folderoptions-menu" 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">
+		<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="rename" class="rename" classAct="rename active" />
+		<roundcube:button type="link-menuitem" command="files-folder-delete" label="delete" class="delete" classAct="delete 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:endif />
+		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders" classAct="folders active" />
+	</ul>
+</div>
+
+<roundcube:add_label name="kolab_files.arialabellistoptions" />
+<div id="fileslistoptions" class="propform popupmenu" role="dialog" aria-labelledby="aria-label-fileslistoptions">
+	<h3 id="aria-label-fileslistoptions" class="voice"><roundcube:label name="kolab_files.arialabellistoptions" /></h3>
+	<roundcube:if condition="!in_array('kolab_files_sort_col', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select name="sort_col" class="form-control">
+				<option value="name"><roundcube:label name="kolab_files.name" /></option>
+				<option value="mtime"><roundcube:label name="kolab_files.mtime" /></option>
+				<option value="size"><roundcube:label name="size" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+	<roundcube:if condition="!in_array('kolab_files_sort_order', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select class="form-control">
+				<option value="ASC"><roundcube:label name="asc" /></option>
+				<option value="DESC"><roundcube:label name="desc" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+</div>
+
+<roundcube:add_label name="kolab_files.arialabelsessionslistoptions" />
+<div id="sessionslistoptions" class="propform popupmenu" role="dialog" aria-labelledby="aria-label-sessionslistoptions">
+	<h3 id="aria-label-sessionslistoptions" class="voice"><roundcube:label name="kolab_files.arialabelsessionslistoptions" /></h3>
+	<roundcube:if condition="!in_array('kolab_files_sessions_sort_col', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select name="sort_col" class="form-control">
+				<option value="name"><roundcube:label name="kolab_files.name" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+	<roundcube:if condition="!in_array('kolab_files_sessions_sort_order', (array)config:dont_override)" />
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select class="form-control">
+				<option value="ASC"><roundcube:label name="asc" /></option>
+				<option value="DESC"><roundcube:label name="desc" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:endif />
+</div>
+
+<div id="dragfilemenu" class="popupmenu">
+	<ul class="toolbarmenu 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>
+</div>
+
+<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>
+</div>
+
+<script src="plugins/kolab_files/skins/elastic/ui.js" type="text/javascript"></script>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic/templates/message_plugin.html Added

@@ -0,0 +1,27 @@
+<div id="files-dialog" class="popupmenu selection-list" data-editable="true" role="dialog" aria-labelledby="aria-label-filesavedialog">
+	<h3 id="aria-label-filesavedialog" class="voice"><roundcube:label name="kolab_files.arialabelfilesavedialog" /></h3>
+	<div class="header">
+		<span class="header-title" data-hidden="small"><roundcube:label name="folders" /></span>
+		<span class="header-title" data-hidden="big"><roundcube:label name="kolab_files.saveto" /></span>
+	</div>
+	<roundcube:object name="libkolab.folder_search_form" id="foldersearch" wrapper="searchbar toolbar"
+		ariatag="h2" label="foldersearchform" buttontitle="kolab_files.findfolders" />
+	<h3 id="aria-label-folderlist" class="voice"><roundcube:label name="kolab_files.arialabelfolderlist" /></h3>
+	<div id="files-folder-list" class="scroller" aria-labelledby="aria-label-folderlist" data-no-collections="true"></div>
+	<div id="file-save-as" class="form-addon form-group row">
+		<label for="file-save-as-input" class="col-form-label col-sm-4"><roundcube:label name="kolab_files.saveas" /></label>
+		<div class="col-sm-8">
+			<input id="file-save-as-input" type="text" value="" class="form-control">
+		</div>
+	</div>
+</div>
+
+<div id="files-folder-create-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-foldercreateform">
+	<h3 id="aria-label-foldercreateform" class="voice"><roundcube:label name="kolab_files.arialabelfoldercreateform" /></h3>
+	<roundcube:object name="folder-create-form" />
+</div>
+
+<div id="files-folder-auth-dialog" class="popupmenu formcontent" role="dialog" aria-labelledby="aria-label-folderauthform">
+	<h3 id="aria-label-folderauthform" class="voice"><roundcube:label name="kolab_files.arialabelfolderauthform" /></h3>
+	<roundcube:object name="folder-auth-options">
+</div>

iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/elastic/ui.js Added

@@ -0,0 +1,147 @@
+function kolab_files_enable_command(p)
+{
+    if (p.command == 'files-save') {
+        var toolbar = $('#toolbar-menu');
+        $('a.button.edit', toolbar).parent().hide();
+        $('a.button.save', toolbar).show().parent().show();
+
+        if (window.editor_edit_button)
+            window.editor_edit_button.addClass('hidden');
+        if (window.editor_save_button)
+            window.editor_save_button.removeClass('hidden');
+    }
+    else if (p.command == 'files-edit' && p.status) {
+        if (window.editor_edit_button)
+            window.editor_edit_button.removeClass('hidden');
+    }
+};
+
+function kolab_files_listoptions(type)
+{
+    var content = $('#' + type + 'listoptions'),
+        width = content.width() + 25,
+        dialog = content.clone(),
+        title = rcmail.gettext('kolab_files.arialabel' + (type == 'sessions' ? 'sessions' : '') + 'listoptions'),
+        close_func = function() { rcmail[type + 'list'].focus(); },
+        save_func = function(e) {
+            if (rcube_event.is_keyboard(e.originalEvent)) {
+                $('#' + type + 'listmenu-link').focus();
+            }
+
+            var col = $('select[name="sort_col"]', dialog).val(),
+                ord = $('select[name="sort_ord"]', dialog).val();
+
+            kolab_files_set_list_options([], col, ord, type);
+            close_func();
+            return true;
+        };
+
+    // set form values
+    $('select[name="sort_col"]', dialog).val(rcmail.env[type + '_sort_col'] || 'name');
+    $('select[name="sort_ord"]', dialog).val(rcmail.env[type + '_sort_order'] == 'DESC' ? 'DESC' : 'ASC');
+
+    dialog = rcmail.simple_dialog(dialog, title, save_func, {
+        cancel_func: close_func,
+        closeOnEscape: true,
+        minWidth: 400,
+        width: width
+    });
+};
+
+function kolab_files_members_list(link)
+{
+    var dialog = $('<div id="members-dialog" class="session-members"><ul></ul></div>'),
+        title = $(link).text(),
+        add_button = $('#collaborators a.button.add'),
+        save_func = function(e) {
+            add_button.click();
+            return true;
+        };
+
+    if (add_button.is('.disabled')) {
+        save_func = null;
+    }
+
+    $('#members img').each(function() {
+        var cloned = $(this).clone();
+        $('<li>').append(cloned).append($('<span>').text(this.title))
+            .appendTo(dialog.find('ul'));
+    });
+
+    dialog = rcmail.simple_dialog(dialog, title, save_func, {
+        closeOnEscape: true,
+        width: 400,
+        button: 'kolab_files.addparticipant',
+        button_class: 'participant add',
+        cancel_button: 'close'
+    });
+};
+
+
+if (rcmail.env.action == 'open') {
+    rcmail.addEventListener('enable-command', kolab_files_enable_command);
+
+    // center and scale the image in preview frame
+    if (rcmail.env.mimetype.startsWith('image/')) {
+        $('#fileframe').on('load', function() {
+            var css = 'img { max-width:100%; max-height:100%; } ' // scale
+                + 'body { display:flex; align-items:center; justify-content:center; height:100%; margin:0; }'; // align
+
+            $(this).contents().find('head').append('<style type="text/css">'+ css + '</style>');
+        });
+    }
+
+    // Elastic mobile preview uses an iframe in a dialog
+    if (rcmail.is_framed()) {
+        var edit_button = $('#filetoolbar a.button.edit'),
+            save_button = $('#filetoolbar a.button.save');
+
+        parent.$('.ui-dialog:visible .ui-dialog-buttonpane .ui-dialog-buttonset').prepend(
+            window.editor_save_button = $('<button>')
+                .addClass('save btn btn-secondary' + (save_button.is('.disabled') ? ' hidden' : ''))
+                .text(save_button.text())
+                .on('click', function() { save_button.click(); })
+        );
+
+        parent.$('.ui-dialog:visible .ui-dialog-buttonpane .ui-dialog-buttonset').prepend(
+            window.editor_edit_button = $('<button>')
+                .addClass('edit btn btn-secondary' + (edit_button.is('.disabled') ? ' hidden' : ''))
+                .text(edit_button.text())
+                .on('click', function() { edit_button.click(); })
+        );
+    }
+}
+else if (rcmail.env.action == 'edit') {
+    rcmail.gui_object('exportmenu', 'export-menu');
+}
+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']();
+        $('#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());
+    });
+}
+
+$(document).ready(function() {
+    if (rcmail.env.action == 'open') {
+        $('#toolbar-menu a.button.save').parent().hide();
+    }
+    else if (rcmail.env.action == 'edit') {
+        if (rcmail.is_framed()) {
+            parent.$('.ui-dialog:visible .ui-dialog-buttonpane').addClass('hidden');
+        }
+    }
+
+    if ($('#dragfilemenu').length) {
+        rcmail.gui_object('file_dragmenu', 'dragfilemenu');
+    }
+
+    if ($('#filesearchmenu').length) {
+        rcmail.gui_object('file_searchmenu', 'filesearchmenu');
+    }
+});
+
+kolab_files_upload_input('#filesuploadform');

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/skins/larry/style.css -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/larry/style.css Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/skins/larry/templates/compose_plugin.html -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/larry/templates/compose_plugin.html Changed

@@ -3,9 +3,9 @@
     <div id="quicksearchbar" class="searchbox" role="search" aria-labelledby="aria-label-searchform">
         <h3 id="aria-label-searchform" class="voice"><roundcube:label name="kolab_files.arialabelsearchform" /></h3>
         <label for="quicksearchbox" class="voice"><roundcube:label name="arialabelquicksearchbox" /></label>
-        <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="return UI.toggle_popup('filesearchmenu', event)" title="searchmod"  label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
+        <roundcube:button type="link" name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="return UI.toggle_popup('filesearchmenu', event)" title="searchmod"  label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
         <roundcube:object name="file-search-form" id="filesearchbox" />
-        <roundcube:button command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+        <roundcube:button type="link" command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
     </div>
 
     <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
@@ -20,7 +20,7 @@
                 <label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
                 <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
                 <a class="iconbutton searchicon"></a>
-                <roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+                <roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
             </div>
         </div>
         <div id="files-folder-list" class="scroller"></div>

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/skins/larry/templates/docedit.html -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/larry/templates/docedit.html Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/skins/larry/templates/files.html -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/larry/templates/files.html Changed

@@ -29,9 +29,9 @@
 <div id="quicksearchbar" class="quicksearchbox" role="search" aria-labelledby="aria-label-searchform">
     <h2 id="aria-label-searchform" class="voice"><roundcube:label name="kolab_files.arialabelsearchform" /></h2>
     <label for="quicksearchbox" class="voice"><roundcube:label name="arialabelquicksearchbox" /></label>
-    <roundcube:button name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="UI.toggle_popup('filesearchmenu', event); return false" title="searchmod" label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
+    <roundcube:button type="link" name="filesearchmenulink" id="filesearchmenulink" class="iconbutton searchoptions" onclick="UI.toggle_popup('filesearchmenu', event); return false" title="searchmod" label="options" aria-haspopup="true" aria-expanded="false" aria-owns="filesearchmenu-menu" />
     <roundcube:object name="file-search-form" id="quicksearchbox" />
-    <roundcube:button command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+    <roundcube:button type="link" command="files-search-reset" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 </div>
 
 <div id="folderlistbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-folderlist">
@@ -46,7 +46,7 @@
             <label for="foldersearch" class="voice"><roundcube:label name="arialabelsearchterms" /></label>
             <input type="text" name="q" id="foldersearch" placeholder="<roundcube:label name='findfolders' />" />
             <a class="iconbutton searchicon"></a>
-            <roundcube:button command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+            <roundcube:button type="link" command="reset-foldersearch" id="folderlistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
         </div>
     </div>
     <div id="files-folder-list" class="scroller withfooter"></div>
@@ -75,12 +75,12 @@
 <div id="folderoptions" class="popupmenu" data-editable="true" aria-hidden="true">
     <h3 id="aria-label-folderoptions" class="voice"><roundcube:label name="kolab_files.folderoptions" /></h3>
     <ul id="folderoptionsmenu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-folderoptions">
-        <li role="menuitem"><roundcube:button command="folder-rename" label="rename" classAct="active" /></li>
-        <li role="menuitem"><roundcube:button command="files-folder-delete" label="delete" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="folder-rename" label="rename" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="files-folder-delete" label="delete" classAct="active" /></li>
         <roundcube:if condition="!empty(env:external_sources)" />
-        <li role="menuitem"><roundcube:button command="folder-mount" label="kolab_files.foldermount" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="folder-mount" label="kolab_files.foldermount" classAct="active" /></li>
         <roundcube:endif />
-        <li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
         <roundcube:container name="filesfolderoptions" id="folderoptionsmenu" />
     </ul>
 </div>
@@ -203,8 +203,8 @@
 
 <div id="dragfilemenu" class="popupmenu" aria-hidden="true">
     <ul class="toolbarmenu" role="menu">
-        <li role="menuitem"><roundcube:button command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" /></li>
-        <li role="menuitem"><roundcube:button command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="files-move" onclick="return kolab_files_drag_menu_action('files-move')" label="move" classAct="active" /></li>
+        <li role="menuitem"><roundcube:button type="link" command="files-copy" onclick="return kolab_files_drag_menu_action('files-copy')" label="copy" classAct="active" /></li>
     </ul>
 </div>

iRony-0.4.0.tar.gz/lib/plugins/kolab_files/skins/larry/templates/message_plugin.html -> iRony-0.4.1.tar.gz/lib/plugins/kolab_files/skins/larry/templates/message_plugin.html Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_folders/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_folders/kolab_folders.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/kolab_folders.js Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_folders/kolab_folders.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/kolab_folders.php Changed

@@ -3,10 +3,9 @@
 /**
  * Type-aware folder management/listing for Kolab
  *
- * @version @package_version@
  * @author Aleksander Machniak <machniak@kolabsys.com>
  *
- * Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2011-2017, 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
@@ -42,6 +41,7 @@
 
     private $rc;
     private static $instance;
+    private $expire_annotation = '/shared/vendor/cmu/cyrus-imapd/expire';
 
 
     /**
@@ -206,6 +206,8 @@
                 'value' => sprintf('%s (%s)', $this->gettext('foldertypemail'), $this->gettext('inbox')),
             );
 
+            $this->add_expire_input($args['form'], 'INBOX');
+
             return $args;
         }
 
@@ -260,7 +262,9 @@
         $this->include_script('kolab_folders.js');
 
         // build type SELECT fields
-        $type_select = new html_select(array('name' => '_ctype', 'id' => '_ctype'));
+        $type_select = new html_select(array('name' => '_ctype', 'id' => '_folderctype',
+            'onchange' => "\$('[name=\"_expire\"]').attr('disabled', \$(this).val() != 'mail')"
+        ));
         $sub_select  = new html_select(array('name' => '_subtype', 'id' => '_subtype'));
         $sub_select->add('', '');
 
@@ -282,15 +286,19 @@
             }
         }
 
-        $args['form']['props']['fieldsets']['settings']['content']['foldertype'] = array(
+        $args['form']['props']['fieldsets']['settings']['content']['folderctype'] = array(
             'label' => $this->gettext('folderctype'),
-            'value' => $type_select->show(isset($new_ctype) ? $new_ctype : $ctype)
-                . $sub_select->show(isset($new_subtype) ? $new_subtype : $subtype),
+            'value' => html::div('input-group',
+                $type_select->show(isset($new_ctype) ? $new_ctype : $ctype)
+                . $sub_select->show(isset($new_subtype) ? $new_subtype : $subtype)
+            ),
         );
 
         $this->rc->output->set_env('kolab_folder_subtypes', $sub_types);
         $this->rc->output->set_env('kolab_folder_subtype', isset($new_subtype) ? $new_subtype : $subtype);
 
+        $this->add_expire_input($args['form'], $args['name'], $ctype);
+
         return $args;
     }
 
@@ -373,7 +381,15 @@
             }
         }
 
-        $args['record']['class'] = self::folder_class_name($ctype);
+        // Set messages expiration in days
+        if ($result && isset($_POST['_expire'])) {
+            $expire = trim(rcube_utils::get_input_value('_expire', rcube_utils::INPUT_POST));
+            $expire = intval($expire) && preg_match('/^mail/', $ctype) ? intval($expire) : null;
+
+            $storage->set_metadata($mbox, array($this->expire_annotation => $expire));
+        }
+
+        $args['record']['class']     = self::folder_class_name($ctype);
         $args['record']['subscribe'] = $subscribe;
         $args['result'] = $result;
 
@@ -699,4 +715,70 @@
     {
         return self::$instance->get_default_folder($type);
     }
+
+    /**
+     * Get /shared/vendor/cmu/cyrus-imapd/expire value
+     *
+     * @param string $folder IMAP folder name
+     *
+     * @return int|false The annotation value or False if not supported
+     */
+    private function get_expire_annotation($folder)
+    {
+        $storage = $this->rc->get_storage();
+
+        if ($storage->get_vendor() != 'cyrus') {
+            return false;
+        }
+
+        if (!strlen($folder)) {
+            return 0;
+        }
+
+        $value = $storage->get_metadata($folder, $this->expire_annotation);
+
+        if (is_array($value)) {
+            return $value[$folder] ? intval($value[$folder][$this->expire_annotation]) : 0;
+        }
+
+        return false;
+    }
+
+    /**
+     * Add expiration time input to the form if supported
+     */
+    private function add_expire_input(&$form, $folder, $type = null)
+    {
+        if (($expire = $this->get_expire_annotation($folder)) !== false) {
+            $post    = trim(rcube_utils::get_input_value('_expire', rcube_utils::INPUT_POST));
+            $is_mail = empty($type) || preg_match('/^mail/i', $type);
+            $label   = $this->gettext('xdays');
+            $input   = new html_inputfield(array(
+                    'id'       => '_kolabexpire',
+                    'name'     => '_expire',
+                    'size'     => 3,
+                    'disabled' => !$is_mail
+            ));
+
+            if ($post && $is_mail) {
+                $expire = (int) $post;
+            }
+
+            if (strpos($label, '$') === 0) {
+                $label = str_replace('$x', '', $label);
+                $html  = $input->show($expire ?: '')
+                    . html::span('input-group-append', html::span('input-group-text', rcube::Q($label)));
+            }
+            else {
+                $label = str_replace('$x', '', $label);
+                $html  = html::span('input-group-prepend', html::span('input-group-text', rcube::Q($label)))
+                    . $input->show($expire ?: '');
+            }
+
+            $form['props']['fieldsets']['settings']['content']['kolabexpire'] = array(
+                'label' => $this->gettext('folderexpire'),
+                'value' => html::div('input-group', $html),
+            );
+        }
+    }
 }

iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/localization/el.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_folders/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/localization/en_US.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_folders/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/localization/fr_FR.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/localization/lv.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_folders/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/localization/nl_NL.inc Changed

@@ -12,17 +12,18 @@
 $labels['foldertypejournal'] = 'Dagboek';
 $labels['foldertypetask'] = 'Taken';
 $labels['foldertypenote'] = 'Notities';
-$labels['foldertypecontact'] = 'Adresboek';
+$labels['foldertypecontact'] = 'Contactpersonen';
 $labels['foldertypeconfiguration'] = 'Configuratie';
 $labels['foldertypefile'] = 'Bestanden';
-$labels['foldertypefreebusy'] = 'Vrij/Bezet';
+$labels['foldertypefreebusy'] = 'Beschikbaar/Bezet';
 $labels['default'] = 'Standaard';
-$labels['inbox'] = 'Inbox';
+$labels['inbox'] = 'Postvak IN';
 $labels['drafts'] = 'Concepten';
-$labels['sentitems'] = 'Verzonden';
-$labels['outbox'] = 'Te versturen';
+$labels['sentitems'] = 'Verstuurd';
+$labels['outbox'] = 'Postvak UIT';
 $labels['wastebasket'] = 'Prullenbak';
 $labels['junkemail'] = 'Ongewenst';
 $labels['confidential'] = 'Vertrouwelijk';
-$messages['defaultfolderexists'] = 'Er is reeds een standaard map voor dit type inhoud';
+$labels['private'] = 'Privé';
+$messages['defaultfolderexists'] = 'Er is al een standaardmap van het opgegeven type';
 ?>

iRony-0.4.0.tar.gz/lib/plugins/kolab_folders/localization/pt_PT.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_folders/localization/pt_PT.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/kolab_notes.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/kolab_notes.php Changed

@@ -46,11 +46,6 @@
 
         $this->rc = rcube::get_instance();
 
-        $this->register_task('notes');
-
-        // load plugin configuration
-        $this->load_config();
-
         // proceed initialization in startup hook
         $this->add_hook('startup', array($this, 'startup'));
     }
@@ -65,6 +60,11 @@
             return;
         }
 
+        $this->register_task('notes');
+
+        // load plugin configuration
+        $this->load_config();
+
         // load localizations
         $this->add_texts('localization/', $args['task'] == 'notes' && (!$args['action'] || $args['action'] == 'dialog-ui'));
         $this->rc->load_language($_SESSION['language'], array('notes.notes' => $this->gettext('navtitle')));  // add label for task title
@@ -79,6 +79,11 @@
             $this->register_action('action', array($this, 'note_action'));
             $this->register_action('list',  array($this, 'list_action'));
             $this->register_action('dialog-ui', array($this, 'dialog_view'));
+            $this->register_action('print', array($this, 'print_note'));
+
+            if (!$this->rc->output->ajax_call && in_array($args['action'], array('dialog-ui', 'list'))) {
+                $this->load_ui();
+            }
         }
         else if ($args['task'] == 'mail') {
             $this->add_hook('storage_init', array($this, 'storage_init'));
@@ -107,7 +112,7 @@
             }
         }
 
-        if (!$this->rc->output->ajax_call && (!$this->rc->output->env['framed'] || in_array($args['action'], array('folder-acl','dialog-ui')))) {
+        if (!$this->rc->output->ajax_call && !$this->rc->output->env['framed']) {
             $this->load_ui();
         }
 
@@ -132,9 +137,11 @@
      */
     private function load_ui()
     {
-        require_once($this->home . '/kolab_notes_ui.php');
-        $this->ui = new kolab_notes_ui($this);
-        $this->ui->init();
+        if (!$this->ui) {
+            require_once($this->home . '/kolab_notes_ui.php');
+            $this->ui = new kolab_notes_ui($this);
+            $this->ui->init();
+        }
     }
 
     /**
@@ -512,7 +519,7 @@
 
         // encode for client use
         if (is_array($data)) {
-            $this->_client_encode($data, true);
+            $this->_client_encode($data);
         }
 
         $this->rc->output->command('plugin.render_note', $data);
@@ -825,6 +832,52 @@
     }
 
     /**
+     * Render the template for printing with placeholders
+     */
+    public function print_note()
+    {
+        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+        $list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GET);
+
+        $this->note = $this->get_note(array('uid' => $uid, 'list' => $list));
+
+        // encode for client use
+        if (is_array($this->note)) {
+            $this->_client_encode($this->note);
+        }
+
+        $this->rc->output->set_pagetitle($this->note['title']);
+        $this->rc->output->add_handlers(array(
+                'noteheader' => array($this, 'print_note_header'),
+                'notebody'   => array($this, 'print_note_body'),
+        ));
+
+        $this->include_script('notes.js');
+
+        $this->rc->output->send('kolab_notes.print');
+    }
+
+    public function print_note_header()
+    {
+        $tags = array_map(array('rcube', 'Q'), (array) $this->note['tags']);
+        $tags = implode(' ', $tags);
+
+        return html::tag('h1', array('id' => 'notetitle'), rcube::Q($this->note['title']))
+            . html::div(array('id' => 'notetags', 'class' => 'tagline'), $tags)
+            . html::div('dates',
+                html::label(null, rcube::Q($this->gettext('created')))
+                . html::span(array('id' => 'notecreated'), rcube::Q($this->note['created']))
+                . html::label(null, rcube::Q($this->gettext('changed')))
+                . html::span(array('id' => 'notechanged'), rcube::Q($this->note['changed']))
+            );
+    }
+
+    public function print_note_body()
+    {
+        return isset($this->note['html']) ? $this->note['html'] : rcube::Q($this->note['description']);
+    }
+
+    /**
      * Provide a list of revisions for the given object
      *
      * @param array  $note Hash array with note properties
@@ -1027,7 +1080,7 @@
             case 'form-new':
             case 'form-edit':
                 $this->_read_lists();
-                echo $this->ui->list_editform($action, $this->lists[$list['id']], $this->folders[$list['id']]);
+                $this->ui->list_editform($action, $this->lists[$list['id']], $this->folders[$list['id']]);
                 exit;
 
             case 'new':
@@ -1061,11 +1114,11 @@
                     $list['_reload'] = $list['parent'] != $oldparent;
 
                     // compose the new display name
-                    $delim = $this->rc->get_storage()->get_hierarchy_delimiter();
-                    $path_imap = explode($delim, $newfolder);
+                    $delim            = $this->rc->get_storage()->get_hierarchy_delimiter();
+                    $path_imap        = explode($delim, $newfolder);
                     $list['name']     = kolab_storage::object_name($newfolder);
                     $list['editname'] = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
-                    $list['listname'] = str_repeat('&nbsp;&nbsp;&nbsp;', count($path_imap)) . '&raquo; ' . $list['editname'];
+                    $list['listname'] = $list['editname'];
                 }
                 break;
 
@@ -1098,7 +1151,7 @@
                 }
                 // report more results available
                 if ($this->driver->search_more_results) {
-                    $this->rc->output->show_message('autocompletemore', 'info');
+                    $this->rc->output->show_message('autocompletemore', 'notice');
                 }
 
                 $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
@@ -1200,7 +1253,7 @@
         // prepend note links to message body
         if ($html) {
             $this->load_ui();
-            $args['content'] = html::div('kolabmessagenotes', $html) . $args['content'];
+            $args['content'] = html::div('kolabmessagenotes boxinformation', $html) . $args['content'];
         }
 
         return $args;
@@ -1425,4 +1478,3 @@
     }
 
 }
-

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/kolab_notes_ui.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/kolab_notes_ui.php Changed

@@ -22,18 +22,16 @@
 
         // add taskbar button
         $this->plugin->add_button(array(
-            'command' => 'notes',
-            'class'   => 'button-notes',
-            'classsel' => 'button-notes button-selected',
+            'command'    => 'notes',
+            'class'      => 'button-notes',
+            'classsel'   => 'button-notes button-selected',
             'innerclass' => 'button-inner',
-            'label'   => 'kolab_notes.navtitle',
+            'label'      => 'kolab_notes.navtitle',
+            'type'       => 'link'
         ), 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/notes.css');
 
-        $this->plugin->register_action('print', array($this, 'print_template'));
-        $this->plugin->register_action('folder-acl', array($this, 'folder_acl'));
-
         $this->ready = true;
   }
 
@@ -42,7 +40,6 @@
     */
     public function init_templates()
     {
-        $this->plugin->register_handler('plugin.tagslist', array($this, 'tagslist'));
         $this->plugin->register_handler('plugin.notebooks', array($this, 'folders'));
         #$this->plugin->register_handler('plugin.folders_select', array($this, 'folders_select'));
         $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
@@ -56,19 +53,11 @@
         $this->rc->output->include_script('list.js');
         $this->rc->output->include_script('treelist.js');
         $this->plugin->include_script('notes.js');
-
-        jqueryui::tagedit();
-
-        // include kolab folderlist widget if available
-        if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
-            $this->plugin->api->include_script('libkolab/js/folderlist.js');
-            $this->plugin->api->include_script('libkolab/js/audittrail.js');
-        }
+        $this->plugin->api->include_script('libkolab/libkolab.js');
 
         // load config options and user prefs relevant for the UI
         $settings = array(
             'sort_col' => $this->rc->config->get('kolab_notes_sort_col', 'changed'),
-            'print_template' => $this->rc->url('print'),
         );
 
         if ($list = rcube_utils::get_input_value('_list', rcube_utils::INPUT_GPC)) {
@@ -78,33 +67,10 @@
             $settings['selected_uid'] = $uid;
         }
 
-        $lang_codes = array($_SESSION['language']);
-        $assets_dir = $this->rc->config->get('assets_dir') ?: INSTALL_PATH;
-
-        if ($pos = strpos($_SESSION['language'], '_')) {
-            $lang_codes[] = substr($_SESSION['language'], 0, $pos);
-        }
-
-        foreach ($lang_codes as $code) {
-            if (file_exists("$assets_dir/program/js/tinymce/langs/$code.js")) {
-                $lang = $code;
-                break;
-            }
-        }
-
-        if (empty($lang)) {
-            $lang = 'en';
-        }
-
-        $settings['editor'] = array(
-            'lang'       => $lang,
-            'spellcheck' => intval($this->rc->config->get('enable_spellcheck')),
-            'spelldict'  => intval($this->rc->config->get('spellcheck_dictionary'))
-        );
+        $this->rc->html_editor();
 
         $this->rc->output->set_env('kolab_notes_settings', $settings);
-
-        $this->rc->output->add_label('save','cancel','delete','close');
+        $this->rc->output->add_label('save','cancel','delete','close','listoptionstitle');
     }
 
     public function folders($attrib)
@@ -239,24 +205,24 @@
     {
         $attrib += array('id' => 'rcmkolabnoteslist');
         $this->rc->output->add_gui_object('noteslist', $attrib['id']);
-        return html::tag('ul', $attrib, '', html::$common_attrib);
-    }
-
-    public function tagslist($attrib)
-    {
-        $attrib += array('id' => 'rcmkolabnotestagslist');
-        $this->rc->output->add_gui_object('notestagslist', $attrib['id']);
-        return html::tag('ul', $attrib, '', html::$common_attrib);
+        return html::tag('table', $attrib, '<tbody></tbody>', html::$common_attrib);
     }
 
     public function editform($attrib)
     {
         $attrib += array('action' => '#', 'id' => 'rcmkolabnoteseditform');
 
+        $textarea = new html_textarea(array(
+                'name'     => 'content',
+                'id'       => 'notecontent',
+                'cols'     => 60,
+                'rows'     => 20,
+                'tabindex' => 0,
+                'class'    => 'mce_editor form-control',
+        ));
+
         $this->rc->output->add_gui_object('noteseditform', $attrib['id']);
-        $this->rc->output->include_script('tinymce/tinymce.min.js');
 
-        $textarea = new html_textarea(array('name' => 'content', 'id' => 'notecontent', 'cols' => 60, 'rows' => 20, 'tabindex' => 0));
         return html::tag('form', $attrib, $textarea->show(), array_merge(html::$common_attrib, array('action')));
     }
 
@@ -272,16 +238,32 @@
         $attrib += array('id' => 'rcmkolabnotestitle');
         $this->rc->output->add_gui_object('noteviewtitle', $attrib['id']);
 
-        $summary = new html_inputfield(array('name' => 'summary', 'class' => 'notetitle inline-edit', 'size' => 60, 'tabindex' => 0));
-
-        $html = $summary->show();
-        $html .= html::div(array('class' => 'tagline tagedit', 'style' => 'display:none'), '&nbsp;');
-        $html .= html::div(array('class' => 'dates', 'style' => 'display:none'),
-            html::label(array(), $this->plugin->gettext('created')) .
-            html::span('notecreated', '') .
-            html::label(array(), $this->plugin->gettext('changed')) .
-            html::span('notechanged', '')
-        );
+        $summary = new html_inputfield(array(
+                'name'     => 'summary',
+                'class'    => 'notetitle inline-edit form-control',
+                'size'     => 60,
+                'id'       => 'notetitleinput',
+                'tabindex' => 0
+        ));
+
+        $html = html::div('form-group row',
+                html::label(array('class' => 'col-sm-2 col-form-label', 'for' => 'notetitleinput'), $this->plugin->gettext('kolab_notes.title'))
+                    . html::span('col-sm-10', $summary->show())
+            )
+            . html::div('form-group row',
+                html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('kolab_notes.tags'))
+                    . html::div(array('class' => 'tagline tagedit col-sm-10'), '&nbsp;')
+            )
+            . html::div(array('class' => 'dates text-only', 'style' => 'display:none'),
+                html::div('form-group row',
+                    html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('created'))
+                    . html::span('col-sm-10', html::span('notecreated form-control-plaintext', ''))
+                )
+                . html::div('form-group row',
+                    html::label(array('class' => 'col-sm-2 col-form-label'), $this->plugin->gettext('changed'))
+                    . html::span('col-sm-10', html::span('notechanged form-control-plaintext', ''))
+                )
+            );
 
         return html::div($attrib, $html);
     }
@@ -294,17 +276,25 @@
     }
 
     /**
-     * Render edit for notes lists (folders)
+     * Render create/edit form for notes lists (folders)
      */
     public function list_editform($action, $list, $folder)
     {
-        if (is_object($folder)) {
-            $folder_name = $folder->name; // UTF7
-        }
-        else {
-            $folder_name = '';
-        }
+        $this->action = $action;
+        $this->list   = $list;
+        $this->folder = is_object($folder) ? $folder->name : ''; // UTF7;
+
+        $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabelnotebookform'));
+        $this->rc->output->add_handler('folderform', array($this, 'notebookform'));
+        $this->rc->output->send('libkolab.folderform');
+    }
 
+    /**
+     * Render create/edit form for notes lists (folders)
+     */
+    public function notebookform($attrib)
+    {
+        $folder_name     = $this->folder;
         $hidden_fields[] = array('name' => 'oldname', 'value' => $folder_name);
 
         $storage = $this->rc->get_storage();
@@ -320,12 +310,12 @@
         }
         else {
             $path_imap = '';
-            $options = array();
+            $options   = array();
         }
 
         // General tab
         $form['properties'] = array(
-            'name' => $this->rc->gettext('properties'),
+            'name'   => $this->rc->gettext('properties'),
             'fields' => array(),
         );
 
@@ -333,8 +323,8 @@
         $input_name = new html_inputfield(array('name' => 'name', 'id' => 'noteslist-name', 'size' => 20));
         $form['properties']['fields']['name'] = array(
             'label' => $this->plugin->gettext('listname'),
-            'value' => $input_name->show($list['editname'], array('disabled' => ($options['norename'] || $options['protected']))),
-            'id' => 'noteslist-name',
+            'value' => $input_name->show($this->list['editname'], array('disabled' => ($options['norename'] || $options['protected']))),
+            'id'    => 'noteslist-name',
         );
 
         // prevent user from moving folder
@@ -346,95 +336,12 @@
             $form['properties']['fields']['path'] = array(
                 'label' => $this->plugin->gettext('parentfolder'),
                 'value' => $select->show(strlen($folder_name) ? $path_imap : ''),
-                'id' => 'parent-folder',
+                'id'    => 'parent-folder',
             );
         }
 
-        // add folder ACL tab
-        if ($action != 'form-new') {
-            $form['sharing'] = array(
-                'name'    => rcube::Q($this->plugin->gettext('tabsharing')),
-                'content' => html::tag('iframe', array(
-                    'src' => $this->rc->url(array('_action' => 'folder-acl', '_folder' => $folder_name, 'framed' => 1)),
-                    'width' => '100%',
-                    'height' => 280,
-                    'border' => 0,
-                    'style' => 'border:0'),
-                '')
-            );
-        }
-
-        $form_html = '';
-        if (is_array($hidden_fields)) {
-            foreach ($hidden_fields as $field) {
-                $hiddenfield = new html_hiddenfield($field);
-                $form_html .= $hiddenfield->show() . "\n";
-            }
-        }
-
-        // create form output
-        foreach ($form as $tab) {
-            if (is_array($tab['fields']) && empty($tab['content'])) {
-                $table = new html_table(array('cols' => 2));
-                foreach ($tab['fields'] as $col => $colprop) {
-                    $label = !empty($colprop['label']) ? $colprop['label'] : $this->plugin->gettext($col);
-
-                    $table->add('title', html::label($colprop['id'], rcube::Q($label)));
-                    $table->add(null, $colprop['value']);
-                }
-                $content = $table->show();
-            }
-            else {
-                $content = $tab['content'];
-            }
-
-            if (!empty($content)) {
-                $form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) . "\n";
-            }
-        }
-
-        return html::tag('form', array('action' => "#", 'method' => "post", 'id' => "noteslistpropform"), $form_html);
-    }
-
-    /**
-     * Handler to render ACL form for a notes folder
-     */
-    public function folder_acl()
-    {
-        $this->plugin->require_plugin('acl');
-        $this->rc->output->add_handler('folderacl', array($this, 'folder_acl_form'));
-        $this->rc->output->send('kolab_notes.kolabacl');
-    }
+        $form_html = kolab_utils::folder_form($form, $folder_name, 'kolab_notes', $hidden_fields);
 
-    /**
-     * Handler for ACL form template object
-     */
-    public function folder_acl_form()
-    {
-        $folder = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_GPC);
-
-        if (strlen($folder)) {
-            $storage = $this->rc->get_storage();
-            $options = $storage->folder_info($folder);
-
-            // get sharing UI from acl plugin
-            $acl = $this->rc->plugins->exec_hook('folder_form',
-                array('form' => array(), 'options' => $options, 'name' => $folder));
-        }
-
-        return $acl['form']['sharing']['content'] ?: html::div('hint', $this->plugin->gettext('aclnorights'));
-    }
-
-    /**
-     * Render the template for printing with placeholders
-     */
-    public function print_template()
-    {
-        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
-        $this->rc->output->reset(true);
-        echo $this->rc->output->parse('kolab_notes.print', false, false);
-        exit;
+        return html::tag('form', $attrib + array('action' => '#', 'method' => 'post', 'id' => 'noteslistpropform'), $form_html);
     }
-
 }
-

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/de_CH.inc Changed

@@ -8,16 +8,8 @@
  */
 $labels['navtitle'] = 'Notizen';
 $labels['tags'] = 'Tags';
-$labels['notes'] = 'Notizen';
-$labels['created'] = 'Erstellt';
-$labels['changed'] = 'Geändert';
-$labels['title'] = 'Titel';
-$labels['listname'] = 'Name';
-$labels['tabsharing'] = 'Freigabe';
-$labels['abort'] = 'Abbrechen';
-$labels['removelink'] = 'E-Mail-Referenz entfernen';
-$labels['savingdata'] = 'Speichere...';
 $labels['lists'] = 'Notizbücher';
+$labels['notes'] = 'Notizen';
 $labels['create'] = 'Neue Notiz';
 $labels['createnote'] = 'Neue Notiz erstellen';
 $labels['send'] = 'Senden';
@@ -25,12 +17,18 @@
 $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['editlist'] = 'Notizbuch bearbeiten';
+$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';
@@ -41,6 +39,8 @@
 $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'] = 'Speichere...';
 $labels['recordnotfound'] = 'Eintrag nicht gefunden';
 $labels['norecordsfound'] = 'Keine Notizen gefunden';
 $labels['nochanges'] = 'Keine Änderungen werden gespeichert';

iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/el.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/en_US.inc Changed

@@ -37,14 +37,14 @@
 $labels['editnote'] = 'Edit Note';
 $labels['savein'] = 'Save in';
 $labels['foldersubscribe'] = 'List permanently';
-$labels['findnotebooks'] = 'Find notebooks...';
+$labels['findnotebooks'] = 'Find notebooks';
+$labels['findnotes'] = 'Find notes';
 $labels['listsearchresults'] = 'Additional notebooks';
 $labels['nrnotebooksfound'] = '$nr notebooks found';
 $labels['nonotebooksfound'] = 'No notebooks found';
 $labels['removelist'] = 'Remove from list';
 $labels['removelink'] = 'Remove email reference';
-$labels['listactions'] = 'List options...';
-$labels['searchterms'] = 'Search terms';
+$labels['listactions'] = 'Notebooks list actions';
 
 $labels['savingdata'] = 'Saving data...';
 $labels['recordnotfound'] = 'Record not found';
@@ -65,16 +65,5 @@
 $labels['arialabelnotesoptionsmenu'] = 'Notebook actions menu';
 $labels['arialabelnotebookform'] = 'Notebook properties';
 $labels['arialabelmessagereferences'] = 'Linked email messages';
-$labels['arialabelfolderearchform'] = 'Notebooks search form';
+$labels['arialabelfoldersearchform'] = 'Notebooks search form';
 $labels['arialabelnoteform'] = 'Note edit form';
-
-// history dialog
-$labels['showhistory'] = 'Show History';
-$labels['objectchangelog'] = 'Change History';
-$labels['objectdiff'] = 'Changes from $rev1 to $rev2';
-$labels['objectnotfound'] = 'Failed to load note data';
-$labels['objectchangelognotavailable'] = 'Change history is not available for this note';
-$labels['objectdiffnotavailable'] = 'No comparison possible for the selected revisions';
-$labels['revisionrestoreconfirm'] = 'Do you really want to restore revision $rev of this note? This will replace the current note with the old version.';
-$labels['objectrestoresuccess'] = 'Revision $rev successfully restored';
-$labels['objectrestoreerror'] = 'Failed to restore the old revision';

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/es_ES.inc Changed

@@ -7,13 +7,56 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
  */
 $labels['navtitle'] = 'Notas';
+$labels['tags'] = 'Etiquetas';
+$labels['lists'] = 'Libro de notas';
 $labels['notes'] = 'Notas';
+$labels['create'] = 'Nota nueva';
+$labels['createnote'] = 'Crear una nota nueva';
+$labels['send'] = 'Enviar';
+$labels['sendnote'] = 'Enviar nota por correo electrónico';
+$labels['newnote'] = 'Nota nueva';
+$labels['notags'] = 'Sin etiquetas';
+$labels['removetag'] = 'Eliminar etiqueta';
 $labels['created'] = 'Creado';
 $labels['changed'] = 'Última modificación';
 $labels['title'] = 'Título';
+$labels['now'] = 'Ahora';
+$labels['sortby'] = 'Ordenar por';
+$labels['newnotebook'] = 'Crear una libreta de notas nueva';
+$labels['addnotebook'] = 'Añadir libro de notas';
+$labels['editlist'] = 'Editar libro de notas';
 $labels['listname'] = 'Nombre';
 $labels['tabsharing'] = 'Compartir';
+$labels['discard'] = 'Descartar';
+$labels['abort'] = 'Abortar';
+$labels['unsavedchanges'] = 'Cambios sin guardar';
+$labels['appendnote'] = 'Añadir una nota';
+$labels['editnote'] = 'Editar nota';
+$labels['savein'] = 'Guardar en';
 $labels['foldersubscribe'] = 'Lista Permanente';
+$labels['findnotebooks'] = 'Encontrar libretas de notas...';
+$labels['listsearchresults'] = 'Libretas de direcciones adicionales';
+$labels['nrnotebooksfound'] = '$nr libreta de notas encontradas';
+$labels['nonotebooksfound'] = 'No se han encontrado libretas de notas';
 $labels['removelist'] = 'Borrar de la lista';
 $labels['removelink'] = 'Eliminar la referencia de correo electrónico';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['recordnotfound'] = 'Registro no encontrado';
+$labels['norecordsfound'] = 'notas no encontradas';
+$labels['nochanges'] = 'No se han guardado los cambios';
+$labels['entertitle'] = 'Introduzca un título para esta nota';
+$labels['deletenotesconfirm'] = '¿Está seguro de querer borrar las notas seleccionadas?';
+$labels['deletenotebookconfirm'] = '¿Está seguro de eliminar esta libreta de notas con todas sus notas? Esta acción no puede deshacerse?';
+$labels['discardunsavedchanges'] = 'Aún no se ha guardado la nota actual. ¿Descartar cambios?';
+$labels['invalidlistproperties'] = 'Las propiedades de la libreta de notas no son válidas. Establezca un nombre válido.';
+$labels['entertitle'] = 'Introduzca un título para esta nota';
+$labels['aclnorights'] = 'Usted no tiene derechos de administrador en esta libreta de notas.';
+$labels['arialabelnoteslist'] = 'Lista de notas';
+$labels['arialabelnotesearchform'] = 'Formulario de búsqueda de notas';
+$labels['arialabelnotesquicksearchbox'] = 'Entrada de búsqueda de notas';
+$labels['arialabelnotessortmenu'] = 'Opciones de clasificación de la lista de notas';
+$labels['arialabelnotesoptionsmenu'] = 'Menú de acciones de la lista de notas';
+$labels['arialabelnotebookform'] = 'Propiedades de la lista de notas';
+$labels['arialabelmessagereferences'] = 'Mensajes de correo electrónico vinculados';
+$labels['arialabelfolderearchform'] = 'Formulario de búsqueda de la libreta de notas';
+$labels['arialabelnoteform'] = 'Formulario de edición de la nota';

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/fr_FR.inc Changed

@@ -17,7 +17,7 @@
 $labels['newnote'] = 'Nouvelle note';
 $labels['notags'] = 'Pas d\'étiquette';
 $labels['removetag'] = 'Supprimer l\'étiquette';
-$labels['created'] = 'Créée';
+$labels['created'] = 'Créé';
 $labels['changed'] = 'Dernière modification';
 $labels['title'] = 'Titre';
 $labels['now'] = 'Maintenant';
@@ -38,25 +38,25 @@
 $labels['listsearchresults'] = 'Carnets supplémentaires';
 $labels['nrnotebooksfound'] = '$nr carnets touvés';
 $labels['nonotebooksfound'] = 'Pas de carnet trouvé';
-$labels['removelist'] = 'supprimer de la liste';
+$labels['removelist'] = 'Supprimer de la liste';
 $labels['removelink'] = 'Supprimer référence d\'e-mail';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['recordnotfound'] = 'Enregistrement non trouvé';
-$labels['norecordsfound'] = 'Pas de notes trouvées';
+$labels['norecordsfound'] = 'Pas de note trouvée';
 $labels['nochanges'] = 'Aucun changement à sauvegarder';
 $labels['entertitle'] = 'Saisissez un titre pour cette note !';
 $labels['deletenotesconfirm'] = 'Voulez-vous vraiment supprimer les notes selectionnées ?';
-$labels['deletenotebookconfirm'] = 'Voulez vous vraiment supprimer ce carnet ainsi que toutes ces notes ? Cette action est irréversible.';
+$labels['deletenotebookconfirm'] = 'Voulez vous vraiment supprimer ce carnet et toutes ses notes ? Cette action est irréversible.';
 $labels['discardunsavedchanges'] = 'Cette note n\'a pas été sauvegardée. Voulez-vous abandonner les changements ?';
 $labels['invalidlistproperties'] = 'Propriétés du carnet invalide. Saisissez un nom valide.';
 $labels['entertitle'] = 'Saisissez un titre pour cette note !';
 $labels['aclnorights'] = 'Vous ne disposez pas des droits pour administrer ce carnet.';
 $labels['arialabelnoteslist'] = 'Liste des notes';
-$labels['arialabelnotesearchform'] = 'Recherche de notes avancé';
+$labels['arialabelnotesearchform'] = 'Formulaire de recherche de notes';
 $labels['arialabelnotesquicksearchbox'] = 'Champ de recherche des notes';
 $labels['arialabelnotessortmenu'] = 'Options de tri de la liste de notes';
 $labels['arialabelnotesoptionsmenu'] = 'Menu des actions pour un carnet';
 $labels['arialabelnotebookform'] = 'Propriétés du carnet';
-$labels['arialabelmessagereferences'] = 'Mails liés';
+$labels['arialabelmessagereferences'] = 'Courriels liés';
 $labels['arialabelfolderearchform'] = 'Masque de recherche des carnets';
 $labels['arialabelnoteform'] = 'Zone d\'édition de note';

iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/lv.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/nl_NL.inc Changed

@@ -7,8 +7,56 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_notes/
  */
 $labels['navtitle'] = 'Notities';
+$labels['tags'] = 'Tags';
+$labels['lists'] = 'Notitieblokken';
 $labels['notes'] = 'Notities';
+$labels['create'] = 'Nieuwe notitie';
+$labels['createnote'] = 'Nieuwe notitie maken';
+$labels['send'] = 'Versturen';
+$labels['sendnote'] = 'Notitie versturen per e-mail';
+$labels['newnote'] = 'Nieuwe notitie';
+$labels['notags'] = 'Geen tags';
+$labels['removetag'] = 'Tag verwijderen';
+$labels['created'] = 'Gemaakt op';
+$labels['changed'] = 'Laatst gewijzigd op';
+$labels['title'] = 'Naam';
+$labels['now'] = 'Nu';
+$labels['sortby'] = 'Sorteren op';
+$labels['newnotebook'] = 'Nieuw notitieblok maken';
+$labels['addnotebook'] = 'Notitieblok toevoegen';
+$labels['editlist'] = 'Notitieblok bewerken';
 $labels['listname'] = 'Naam';
 $labels['tabsharing'] = 'Delen';
-$labels['foldersubscribe'] = 'Permanent weergeven';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
+$labels['discard'] = 'Verwijderen';
+$labels['abort'] = 'Afbreken';
+$labels['unsavedchanges'] = 'Niet-opgeslagen wijzigingen!';
+$labels['appendnote'] = 'Notitie toevoegen';
+$labels['editnote'] = 'Notitie bewerken';
+$labels['savein'] = 'Opslaan in';
+$labels['foldersubscribe'] = 'Definitief weergeven';
+$labels['findnotebooks'] = 'Notitieblokken zoeken...';
+$labels['listsearchresults'] = 'Extra notitieblokken';
+$labels['nrnotebooksfound'] = '$nr notitieblokken gevonden';
+$labels['nonotebooksfound'] = 'Geen notitieblokken gevonden';
+$labels['removelist'] = 'Verwijderen uit lijst';
+$labels['removelink'] = 'E-mailreferentie verwijderen';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['recordnotfound'] = 'Record niet gevonden';
+$labels['norecordsfound'] = 'Geen notities gevonden';
+$labels['nochanges'] = 'Geen wijzigingen om op te slaan';
+$labels['entertitle'] = 'Voer een naam voor deze notitie in!';
+$labels['deletenotesconfirm'] = 'Weet u zeker dat u de geselecteerde notities wilt verwijderen?';
+$labels['deletenotebookconfirm'] = 'Weet u zeker dat u dit notitieblok met alle notities erin wilt verwijderen? Deze actie kunt u niet ongedaan maken.';
+$labels['discardunsavedchanges'] = 'De huidige notitie is nog niet opgeslagen. Wilt u de wijzigingen verwijderen?';
+$labels['invalidlistproperties'] = 'Ongeldige eigenschappen van notitieblok! Stel een geldige naam in.';
+$labels['entertitle'] = 'Voer een naam voor deze notitie in!';
+$labels['aclnorights'] = 'U hebt geen administratorrechten voor dit notitieblok.';
+$labels['arialabelnoteslist'] = 'Lijst met notities';
+$labels['arialabelnotesearchform'] = 'Zoekformulier voor notities';
+$labels['arialabelnotesquicksearchbox'] = 'Zoekopdracht voor notities';
+$labels['arialabelnotessortmenu'] = 'Sorteeropties voor lijst met notities';
+$labels['arialabelnotesoptionsmenu'] = 'Actiemenu voor notitieblok';
+$labels['arialabelnotebookform'] = 'Eigenschappen van notitieblok';
+$labels['arialabelmessagereferences'] = 'Gekoppelde e-mailberichten';
+$labels['arialabelfolderearchform'] = 'Zoekformulier voor notitieblokken';
+$labels['arialabelnoteform'] = 'Formulier voor bewerking van notities';

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/localization/pt_BR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/pt_BR.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/localization/pt_PT.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/localization/pt_PT.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/notes.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/notes.js Changed

@@ -2,11 +2,12 @@
  * Client scripts for the Kolab Notes plugin
  *
  * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
  *
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2014-2015, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014-2017, 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
@@ -35,11 +36,9 @@
     var notebookslist;
     var noteslist;
     var notesdata = {};
-    var tagsfilter = [];
-    var tags = [];
+    var taglist;
     var search_request;
     var search_query;
-    var tag_draghelper;
     var render_no_focus;
     var me = this;
 
@@ -47,6 +46,8 @@
     this.selected_list = null;
     this.selected_note = null;
     this.notebooks = rcmail.env.kolab_notebooks || {};
+    this.list_set_sort = list_set_sort;
+    this.settings = settings;
 
     /**
      * initialize the notes UI
@@ -55,7 +56,7 @@
     {
         // register button commands
         rcmail.register_command('createnote', function(){
-            warn_unsaved_changes(function(){ edit_note(null, 'new'); })
+            warn_unsaved_changes(function(){ edit_note(null, 'new'); });
         }, false);
         rcmail.register_command('list-create', function(){ list_edit_dialog(null); }, true);
         rcmail.register_command('list-edit', function(){ list_edit_dialog(me.selected_list); }, false);
@@ -76,7 +77,7 @@
         rcmail.addEventListener('plugin.update_note', update_note);
         rcmail.addEventListener('plugin.update_list', list_update);
         rcmail.addEventListener('plugin.destroy_list', list_destroy);
-        rcmail.addEventListener('plugin.unlock_saving', function(){
+        rcmail.addEventListener('plugin.unlock_saving', function() {
             if (saving_lock) {
                 rcmail.set_busy(false, null, saving_lock);
             }
@@ -105,7 +106,7 @@
           id_prefix: 'rcmliknb',
           save_state: true,
           selectable: true,
-          keyboard: false,
+          keyboard: true,
           searchbox: '#notebooksearch',
           search_action: 'notes/list',
           search_sources: [ 'folders', 'users' ],
@@ -124,6 +125,7 @@
                     rcmail.enable_command('list-delete', has_permission(me.notebooks[id], 'xa'));
                     rcmail.enable_command('list-remove', !me.notebooks[id]['default']);
                     fetch_notes(id);  // sets me.selected_list
+                    rcmail.triggerEvent('show-list', {title: me.notebooks[id].listname}); // Elastic
                 },
                 function(){
                     // restore previous selection
@@ -162,9 +164,16 @@
             if (data.length)
                 rcmail.display_message(rcmail.gettext('nrnotebooksfound','kolab_notes').replace('$nr', data.length), 'voice');
             else
-                rcmail.display_message(rcmail.gettext('nonotebooksfound','kolab_notes'), 'info');
+                rcmail.display_message(rcmail.gettext('nonotebooksfound','kolab_notes'), 'notice');
         });
 
+        // Make Elastic checkboxes pretty
+        if (window.UI && UI.pretty_checkbox) {
+            notebookslist.addEventListener('add-item', function(prop) {
+                UI.pretty_checkbox($(prop.li).find('input').addClass('flex-checkbox'));
+            });
+        }
+
         $(rcmail.gui_objects.notebooks).on('click', 'div.folder > a.listname', function(e) {
             var id = String($(this).closest('li').attr('id')).replace(/^rcmliknb/, '');
             notebookslist.select(id);
@@ -194,18 +203,18 @@
 
         // initialize notes list widget
         if (rcmail.gui_objects.noteslist) {
-            noteslist = new rcube_list_widget(rcmail.gui_objects.noteslist,
+            rcmail.noteslist = noteslist = new rcube_list_widget(rcmail.gui_objects.noteslist,
                 { multiselect:true, draggable:true, keyboard:true });
             noteslist.addEventListener('select', function(list) {
                 render_no_focus = rcube_event._last_keyboard_event && $(list.list).has(rcube_event._last_keyboard_event.target);
                 var selection_changed = list.selection.length != 1 || !me.selected_note || list.selection[0] != me.selected_note.id;
                 selection_changed && warn_unsaved_changes(function(){
                     var note;
-                    if (noteslist.selection.length == 1 && (note = notesdata[noteslist.selection[0]])) {
+                    if (!list.multi_selecting && noteslist.selection.length == 1 && (note = notesdata[noteslist.selection[0]])) {
                         edit_note(note.uid, 'edit');
                     }
                     else {
-                        reset_view();
+                        reset_view(true);
                     }
                 },
                 function(){
@@ -262,62 +271,38 @@
             $('#notessortmenu a.by-' + settings.sort_col).addClass('selected');
         }
 
-        // click-handler on tags list
-        $(rcmail.gui_objects.notestagslist).on('click', 'li', function(e){
-            var item = e.target.nodeName == 'LI' ? $(e.target) : $(e.target).closest('li'),
-                tag = item.data('value');
-
-            if (!tag)
-                return false;
+        init_editor();
 
-            // reset selection on regular clicks
-            var index = $.inArray(tag, tagsfilter);
-            var shift = e.shiftKey || e.ctrlKey || e.metaKey;
+        if (settings.selected_list) {
+            notebookslist.select(settings.selected_list)
+        }
 
-            if (!shift) {
-                if (tagsfilter.length > 1)
-                    index = -1;
+        rcmail.addEventListener('kolab-tags-search', filter_notes)
+            .addEventListener('kolab-tags-drop-data', function(e) { return notesdata[e.id]; })
+            .addEventListener('kolab-tags-drop', function(e) {
+                if ($(e.list).is('#kolabnoteslist')) {
+                    return;
+                }
 
-                $('li', rcmail.gui_objects.notestagslist).removeClass('selected').attr('aria-checked', 'false');
-                tagsfilter = [];
-            }
+                var rec = notesdata[e.id];
 
-            // add tag to filter
-            if (index < 0) {
-                item.addClass('selected').attr('aria-checked', 'true');
-                tagsfilter.push(tag);
-            }
-            else if (shift) {
-                item.removeClass('selected').attr('aria-checked', 'false');
-                var a = tagsfilter.slice(0,index);
-                tagsfilter = a.concat(tagsfilter.slice(index+1));
-            }
+                if (rec && rec.id && e.tag) {
+                    savedata = me.selected_note && rec.uid == me.selected_note.uid ? get_save_data() : $.extend({}, rec);
 
-            filter_notes();
+                    if (savedata.id)   delete savedata.id;
+                    if (savedata.html) delete savedata.html;
 
-            // clear text selection in IE after shift+click
-            if (shift && document.selection)
-              document.selection.empty();
+                    if (!savedata.tags)
+                        savedata.tags = [];
+                    savedata.tags.push(e.tag);
 
-            e.preventDefault();
-            return false;
-        })
-        .on('keypress', 'li', function(e) {
-            if (e.keyCode == 13) {
-                $(this).trigger('click', { pointerType:'keyboard' });
-            }
-        })
-        .mousedown(function(e){
-            // disable content selection with the mouse
-            e.preventDefault();
-            return false;
-        });
-
-        init_editor();
+                    rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
+                    saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+                    rcmail.http_post('action', { _data: savedata, _do: 'edit' }, true);
+                }
+            });
 
-        if (settings.selected_list) {
-            notebookslist.select(settings.selected_list)
-        }
+        rcmail.triggerEvent('kolab-notes-init');
     }
     this.init = init;
 
@@ -340,23 +325,17 @@
             if (rcmail.gui_objects.noteseditform) {
                 rcmail.lock_form(rcmail.gui_objects.noteseditform, false);
             }
+            if (rcmail.is_framed()) {
+                parent.$(parent.kolab_note_dialog_element).dialog('destroy');
+            }
         });
 
-        var id;
-        for (id in me.notebooks) {
-            if (me.notebooks[id].editable) {
-                me.selected_list = id;
-                break;
+        var id, callback = function() {
+            if (settings.selected_uid) {
+                me.selected_list = settings.selected_list;
+                edit_note(settings.selected_uid);
             }
-        }
-
-        init_editor();
-        if (settings.selected_uid) {
-            me.selected_list = settings.selected_list;
-            edit_note(settings.selected_uid);
-        }
-        else {
-            setTimeout(function(){
+            else {
                 me.selected_note = $.extend({
                     list: me.selected_list,
                     uid: null,
@@ -367,59 +346,35 @@
                     changed: rcmail.gettext('now', 'kolab_notes')
                 }, rcmail.env.kolab_notes_template || {});
                 render_note(me.selected_note);
-            }, 100);
+            }
+        };
+
+        for (id in me.notebooks) {
+            if (me.notebooks[id].editable) {
+                me.selected_list = id;
+                break;
+            }
         }
+
+        init_editor(callback);
     }
     this.init_dialog = init_dialog;
 
     /**
-     * initialize tinyMCE editor
+     * Initialize TinyMCE editor
      */
-    function init_editor()
+    function init_editor(callback)
     {
-        var editor_conf = {
-            selector: '#notecontent',
-            theme: 'modern',
-            language: settings.editor.lang,
-            content_css: rcmail.assets_path('program/js/tinymce/roundcube/content.css?v2'),
-            plugins: 'autolink charmap code link paste tabfocus searchreplace table textcolor',
-            toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify '
-                + '| bullist numlist outdent indent blockquote | forecolor backcolor fontselect fontsizeselect '
-                + '| link unlink table charmap | code searchreplace undo redo',
-            menubar: false,
-            statusbar: false,
-            toolbar_items_size: 'small',
-            extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
-            relative_urls: false,
-            remove_script_host: false,
-            convert_urls: false,
-            image_description: false,
-            paste_webkit_style: "color font-size font-family",
-            paste_data_images: true,
-            //spellchecker_rpc_url: '../../../../../?_task=utils&_action=spell_html&_remote=1',
-            //spellchecker_language: rcmail.env.spell_lang,
-            accessibility_focus: false,
-            tabfocus_elements: [':prev','btn-save-note'],
-            setup: function(ed) {
-                // make links open on shift-click
-                ed.on('click', function(e) {
-                    var link = $(e.target).closest('a');
-                    if (link.length && e.shiftKey) {
-                        if (!bw.mz) window.open(link.get(0).href, '_blank');
-                        return false;
-                    }
-                });
-            }
-        };
-
-        // support external configuration settings e.g. from skin
-        if (window.rcmail_editor_settings)
-            $.extend(editor_conf, window.rcmail_editor_settings);
+        if (callback) {
+            rcmail.addEventListener('editor-load', callback);
+        }
 
-        tinyMCE.init(editor_conf);
+        // initialize HTML editor
+        var config = $.extend(rcmail.env.editor_config, {disabled_plugins: ['image', 'media']});
+        rcmail.editor_init(config, 'notecontent');
 
         // register click handler for message links
-        $(rcmail.gui_objects.notesattachmentslist).on('click', 'li a.messagelink', function(){
+        $(rcmail.gui_objects.notesattachmentslist).on('click', 'li a.messagelink', function() {
             rcmail.open_window(this.href);
             return false;
         });
@@ -434,14 +389,6 @@
     }
 
     /**
-     * Trim whitespace off the given string
-     */
-    function trim(str)
-    {
-        return String(str).replace(/\s+$/, '').replace(/^\s+/, '');
-    }
-
-    /**
      * Check permissions on the given list object
      */
     function has_permission(list, perm)
@@ -482,7 +429,6 @@
                 changed: rcmail.gettext('now', 'kolab_notes')
             }
             render_note(me.selected_note);
-            rcmail.enable_command('print', true);
         }
         else {
             ui_loading = rcmail.set_busy(true, 'loading');
@@ -495,84 +441,47 @@
      */
     function list_edit_dialog(id)
     {
-        if (!rcmail.gui_containers.notebookeditform) {
-            return false;
-        }
-
-        // close show dialog first
-        var $dialog = rcmail.gui_containers.notebookeditform;
-        if ($dialog.is(':ui-dialog')) {
-            $dialog.dialog('close');
-        }
-
-        var list = me.notebooks[id] || { name:'', editable:true, rights: 'riwta' };
-        var form, name;
+        var list = me.notebooks[id] || { name:'', editable:true, rights: 'riwta' },
+            title = rcmail.gettext((list.id ? 'editlist' : 'newnotebook'), 'kolab_notes'),
+            params = {_do: (list.id ? 'form-edit' : 'form-new'), _list: {id: list.id}, _framed: 1},
+            $dialog = $('<iframe>').attr('src', rcmail.url('list', params)).on('load', function() {
+                $(this).contents().find('#noteslist-name')
+                    .prop('disabled', !has_permission(list, 'a'))
+                    .val(list.editname || list.name)
+                    .select();
+            }),
+            save_func = function() {
+                var data,
+                    form = $dialog.contents().find('#noteslistpropform'),
+                    name = form.find('#noteslist-name');
+
+                // form is not loaded
+                if (!form || !form.length)
+                    return false;
+
+                // do some input validation
+                if (!name.val() || name.val().length < 2) {
+                    rcmail.alert_dialog(rcmail.gettext('invalidlistproperties', 'kolab_notes'), function() {
+                        name.select();
+                    });
+
+                    return false;
+                }
 
-        $dialog.html(rcmail.get_label('loading'));
-        $.ajax({
-            type: 'GET',
-            dataType: 'html',
-            url: rcmail.url('list'),
-            data: { _do: (list.id ? 'form-edit' : 'form-new'), _list: { id: list.id } },
-            success: function(data) {
-                $dialog.html(data);
-                rcmail.triggerEvent('kolab_notes_editform_load', list);
+                // post data to server
+                data = form.serializeJSON();
+                if (list.id)
+                    data.id = list.id;
 
-                // resize and reposition dialog window
-                form = $('#noteslistpropform');
-                var win = $(window), w = win.width(), h = win.height();
-                $dialog.dialog('option', { height: Math.min(h-20, form.height()+130), width: Math.min(w-20, form.width()+50) });
+                saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+                rcmail.http_post('list', { _do: (list.id ? 'edit' : 'new'), _list: data });
+                return true;
+            };
 
-                name = $('#noteslist-name').prop('disabled', !has_permission(list, 'a')).val(list.editname || list.name);
-                name.select();
-            }
+        rcmail.simple_dialog($dialog, title, save_func, {
+            width: 600,
+            height: 400
         });
-
-        // dialog buttons
-        var buttons = {};
-        buttons[rcmail.gettext('save')] = function() {
-            // form is not loaded
-            if (!form || !form.length)
-              return;
-
-            // do some input validation
-            if (!name.val() || name.val().length < 2) {
-              alert(rcmail.gettext('invalidlistproperties', 'kolab_notes'));
-              name.select();
-              return;
-            }
-
-            // post data to server
-            var data = form.serializeJSON();
-            if (list.id)
-              data.id = list.id;
-
-            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('list', { _do: (list.id ? 'edit' : 'new'), _list: data });
-            $dialog.dialog('close');
-        };
-
-        buttons[rcmail.gettext('cancel')] = function() {
-            $dialog.dialog('close');
-        };
-
-        // open jquery UI dialog
-        $dialog.dialog({
-            modal: true,
-            resizable: true,
-            closeOnEscape: false,
-            title: rcmail.gettext((list.id ? 'editlist' : 'newnotebook'), 'kolab_notes'),
-            open: function() {
-                $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-            },
-            close: function() {
-                $dialog.html('').dialog('destroy').hide();
-            },
-            buttons: buttons,
-            minWidth: 480,
-            width: 640
-        }).show();
-
     }
 
     /**
@@ -617,9 +526,11 @@
     function list_delete(id)
     {
         var list = me.notebooks[id];
-        if (list && confirm(rcmail.gettext('deletenotebookconfirm', 'kolab_notes'))) {
-            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('list', { _do: 'delete', _list: { id: list.id } });
+        if (list) {
+            rcmail.confirm_dialog(rcmail.gettext('kolab_notes.deletenotebookconfirm'), 'delete', function() {
+                saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
+                rcmail.http_post('list', { _do: 'delete', _list: { id: list.id } });
+            });
         }
     }
 
@@ -745,24 +656,25 @@
         reset_view();
         noteslist.clear(true);
         notesdata = {};
-        tagsfilter = [];
         update_state();
     }
 
-    function filter_notes()
+    /**
+     * Filter notes by tag
+     */
+    function filter_notes(tags)
     {
-        // tagsfilter
-        var note, tr, match;
-        for (var id in noteslist.rows) {
+        var id, note, tr, match;
+        for (id in noteslist.rows) {
             tr = noteslist.rows[id].obj;
             note = notesdata[id];
             match = note.tags && note.tags.length;
-            for (var i=0; match && note && i < tagsfilter.length; i++) {
-                if ($.inArray(tagsfilter[i], note.tags) < 0)
+            for (var i=0; match && note && i < tags.length; i++) {
+                if ($.inArray(tags[i], note.tags) < 0)
                     match = false;
             }
 
-            if (match || !tagsfilter.length) {
+            if (match || !tags.length) {
                 $(tr).show();
             }
             else {
@@ -774,9 +686,7 @@
                     me.selected_note = null;
                     noteslist.clear_selection();
                 }, function(){
-                    tagsfilter = [];
-                    filter_notes();
-                    update_tagcloud();
+                    filter_notes(tags);
                 });
             }
         }
@@ -811,14 +721,12 @@
             notesdata[rec.id] = rec;
         }
 
-        render_tagslist(data.tags || [], !data.search)
+        update_taglist();
         rcmail.set_busy(false, 'loading', ui_loading);
 
-        // select the single result
-        if (data.data.length == 1) {
-            noteslist.select(data.data[0].id);
-        }
-        else if (settings.selected_uid) {
+        rcmail.triggerEvent('listupdate', {list: noteslist, rowcount:noteslist.rowcount});
+
+        if (settings.selected_uid) {
             noteslist.select(rcmail.html_identifier_encode(settings.selected_uid));
             delete settings.selected_uid;
         }
@@ -826,7 +734,7 @@
             noteslist.select(me.selected_note.id);
         }
         else if (!data.data.length) {
-            rcmail.display_message(rcmail.gettext('norecordsfound','kolab_notes'), 'info');
+            rcmail.display_message(rcmail.gettext('norecordsfound','kolab_notes'), 'notice');
         }
     }
 
@@ -846,47 +754,34 @@
             container = rcmail.gui_containers['notedetailview'];
         }
 
+        // for Elastic
+        rcmail.triggerEvent('show-content', {
+            mode: data.uid ? 'edit' : 'add',
+            title: rcmail.gettext(data.uid ? 'editnote' : 'newnote', 'kolab_notes'),
+            obj: $('#notedetailsbox').parent(),
+            scrollElement: $('#notedetailsbox')
+        });
+
         var list = me.notebooks[data.list] || me.notebooks[me.selected_list] || { rights: 'lrs', editable: false };
             content = $('#notecontent').val(data.description),
             readonly = data.readonly || !(list.editable || !data.uid && has_permission(list,'i')),
             attachmentslist = gui_object('notesattachmentslist', container).html(''),
-            titlecontainer = container || rcmail.gui_objects.noteviewtitle;
+            titlecontainer = rcmail.gui_objects.noteviewtitle || container,
+            is_html = false;
+
+        // tag-edit line
+        if (window.kolab_tags_input) {
+            $('.tagline', titlecontainer).parent('.form-group').show();
+            taglist = kolab_tags_input($('.tagline', titlecontainer), data.tags, readonly);
+        }
 
         $('.notetitle', titlecontainer).val(data.title).prop('disabled', readonly).show();
-        $('.dates .notecreated', titlecontainer).html(Q(data.created || ''));
-        $('.dates .notechanged', titlecontainer).html(Q(data.changed || ''));
+        $('.dates .notecreated', titlecontainer).text(data.created || '');
+        $('.dates .notechanged', titlecontainer).text(data.changed || '');
         if (data.created || data.changed) {
             $('.dates', titlecontainer).show();
         }
 
-        // tag-edit line
-        var tagline = $('.tagline', titlecontainer).empty()[readonly?'addClass':'removeClass']('disabled').show();
-        $.each(typeof data.tags == 'object' && data.tags.length ? data.tags : [''], function(i,val) {
-            $('<input>')
-                .attr('name', 'tags[]')
-                .attr('tabindex', '0')
-                .addClass('tag')
-                .val(val)
-                .appendTo(tagline);
-        });
-
-        if (!data.tags || !data.tags.length) {
-            $('<span>').addClass('placeholder')
-              .html(rcmail.gettext('notags', 'kolab_notes'))
-              .appendTo(tagline)
-              .click(function(e) { $(this).parent().find('.tagedit-list').trigger('click'); });
-        }
-
-        $('.tagline input.tag', titlecontainer).tagedit({
-            animSpeed: 100,
-            allowEdit: false,
-            allowAdd: !readonly,
-            allowDelete: !readonly,
-            checkNewEntriesCaseSensitive: false,
-            autocompleteOptions: { source: tags, minLength: 0, noCheck: true },
-            texts: { removeLinkTitle: rcmail.gettext('removetag', 'kolab_notes') }
-        });
-
         if (data.links) {
             $.each(data.links, function(i, link) {
                 var li = $('<li>').addClass('link')
@@ -899,11 +794,12 @@
                     .appendTo(attachmentslist);
 
                 if (!readonly && !data._from_mail) {
-                    $('<a>')
-                        .attr('href', '#delete')
-                        .attr('title', rcmail.gettext('removelink', 'kolab_notes'))
-                        .addClass('delete')
-                        .html(rcmail.gettext('delete'))
+                    $('<a>').attr({
+                            href: '#delete',
+                            title: rcmail.gettext('removelink', 'kolab_notes'),
+                            label: rcmail.gettext('delete'),
+                            'class': 'delete'
+                        })
                         .click({ uri:link.uri }, function(e) {
                             remove_link(this, e.data.uri);
                             return false;
@@ -913,11 +809,6 @@
             });
         }
 
-        if (!readonly) {
-            $('.tagedit-list', titlecontainer)
-                .on('click', function(){ $('.tagline .placeholder').hide(); });
-        }
-
         if (!data.list)
             data.list = list.id;
 
@@ -937,36 +828,14 @@
             html = text2html(html);
         }
 
-        var node, editor = tinyMCE.get('notecontent'), is_html = false;
-        retry = retry || 0;
-
-        // sometimes the editor instance is not ready yet (FF only)...
-        if (!readonly && !editor && $('#notecontent').length && retry < 5) {
-          // ... give it some more time
-          setTimeout(function() {
-              gui_object('noteseditform', container).show();
-              render_note(data, container, temp, retry+1);
-          }, 200);
-          return;
-        }
-
-        if (!readonly && editor) {
+        if (!readonly) {
             gui_object('notesdetailview', container).hide();
             gui_object('noteseditform', container).show();
-            editor.setContent(''); // #4781
-            editor.setContent(html);
-            node = editor.getContentAreaContainer().childNodes[0];
-            if (node) node.tabIndex = content.get(0).tabIndex;
-
-            if (me.selected_note.uid) {
-                if (!render_no_focus)
-                    editor.getBody().focus();
-            }
-            else
-                $('.notetitle', titlecontainer).focus().select();
+
+            rcmail.editor.set_content(html);
 
             // read possibly re-formatted content back from editor for later comparison
-            me.selected_note.description = editor.getContent({ format:'html' }).replace(/^\s*(<p><\/p>\n*)?/, '');
+            me.selected_note.description = rcmail.editor.get_content().replace(/^\s*(<p><\/p>\n*)?/, '');
             is_html = true;
         }
         else {
@@ -974,8 +843,6 @@
             gui_object('notesdetailview', container).html(html).show();
         }
 
-        render_no_focus = false;
-
         // notify subscribers
         rcmail.triggerEvent('kolab_notes_render', { data:data, readonly:readonly, html:is_html });
         if (rcmail.is_framed())
@@ -983,6 +850,13 @@
 
         // Trigger resize (needed for proper editor resizing)
         $(window).resize();
+
+        // Elastic
+        $(container).parents('.watermark').addClass('formcontainer');
+        $('#notedetailsbox').parent().trigger('loaded');
+
+        if (!readonly)
+            $('.notetitle', titlecontainer).focus().select();
     }
 
     /**
@@ -1032,7 +906,7 @@
         $dialog = libkolab_audittrail.object_history_dialog({
             module: 'kolab_notes',
             container: '#notehistory',
-            title: rcmail.gettext('objectchangelog','kolab_notes') + ' - ' + rec.title,
+            title: rcmail.gettext('libkolab.objectchangelog') + ' - ' + rec.title,
 
             // callback function for list actions
             listfunc: function(action, rev) {
@@ -1065,10 +939,10 @@
             rec = $dialog.data('rec');
 
         if (data === false || !data.length || !rec) {
-          // display 'unavailable' message
-          $('<div class="notfound-message note-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','kolab_notes') + '</div>')
-              .insertBefore($dialog.find('.changelog-table').hide());
-          return;
+            // display 'unavailable' message
+            $('<div class="notfound-message note-dialog-message warning">').text(rcmail.gettext('libkolab.objectchangelognotavailable'))
+                .insertBefore($dialog.find('.changelog-table').hide());
+            return;
         }
 
         data.module = 'kolab_notes';
@@ -1124,8 +998,9 @@
      */
     function show_diff(data)
     {
-        var rec = me.selected_note,
-            $dialog = $('#notediff');
+        var change_old, change_new,
+            rec = me.selected_note,
+            $dialog = $('#notediff').clone();
 
         $dialog.find('div.form-section, h2.note-title-new').hide().data('set', false);
 
@@ -1153,52 +1028,37 @@
                 row.children('.diff-text-old, .diff-text-new').hide();
             }
             else {
-                if (!html) {
-                    // escape HTML characters
-                    change.old_ = Q(change.old_ || change['old'] || '--')
-                    change.new_ = Q(change.new_ || change['new'] || '--')
-                }
-                row.children('.diff-text-old').html(change.old_ || change['old'] || '--').show();
-                row.children('.diff-text-new').html(change.new_ || change['new'] || '--').show();
+                change_old = change.old_ || change['old'] || '--';
+                change_new = change.new_ || change['new'] || '--';
+
+                row.children('.diff-text-old')[html ? 'html' : 'text'](change_old).show();
+                row.children('.diff-text-new')[html ? 'html' : 'text'](change_new).show();
             }
 
             row.show().data('set', true);
         });
 
         // open jquery UI dialog
-        $dialog.dialog({
-            modal: false,
-            resizable: true,
-            closeOnEscape: true,
-            title: rcmail.gettext('objectdiff','kolab_notes').replace('$rev1', data.rev1).replace('$rev2', data.rev2) + ' - ' + rec.title,
-            open: function() {
-                $dialog.attr('aria-hidden', 'false');
-            },
-            close: function() {
-                $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
-            },
-            buttons: [
-                {
-                    text: rcmail.gettext('close'),
-                    click: function() { $dialog.dialog('close'); },
-                    autofocus: true
-                }
-            ],
-            minWidth: 400,
-            width: 480
-        }).show();
+        rcmail.simple_dialog($dialog,
+            rcmail.gettext('libkolab.objectdiff').replace('$rev1', data.rev1).replace('$rev2', data.rev2) + ' - ' + rec.title,
+            null, {
+                cancel_label: 'close',
+                minWidth: 400,
+                width: 480
+            }
+        );
 
         // set dialog size according to content
         libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height(), rcmail.gui_containers.notedetailview.width() - 40);
     }
 
-    // close the event history dialog
+    // close the note history dialog
     function close_history_dialog()
     {
         $('#notehistory, #notediff').each(function(i, elem) {
-        var $dialog = $(elem);
-        if ($dialog.is(':ui-dialog'))
-            $dialog.dialog('close');
+            var $dialog = $(elem);
+            if ($dialog.is(':ui-dialog'))
+                $dialog.dialog('close');
         });
     };
 
@@ -1220,28 +1080,11 @@
      */
     function print_note()
     {
-        var printwin, data, list;
-        if (me.selected_note && (printwin = rcmail.open_window(settings.print_template))) {
-            list = me.notebooks[me.selected_note.list] || me.notebooks[me.selected_list] || {};
-            data = get_save_data();
-
-            // for read-only notes, get_save_data() won't return the content
-            if (me.selected_note.readonly || !list.editable) {
-                data.description = me.selected_note.html || me.selected_note.description;
-                if (!me.selected_note.html || !data.description.match(/<(html|body)/)) {
-                    data.description = text2html(data.description);
-                }
-            }
+        var list = me.notebooks[me.selected_list],
+            uid = me.selected_note ? me.selected_note.uid : 0;
 
-            $(printwin).on('load', function() {
-                printwin.document.title = data.title;
-                $('#notetitle', printwin.document).html(Q(data.title));
-                $('#notebody',  printwin.document).html(data.description);
-                $('#notetags',  printwin.document).html('<span class="tag">' + data.tags.join('</span><span class="tag">') + '</span>');
-                $('#notecreated', printwin.document).html(Q(me.selected_note.created));
-                $('#notechanged', printwin.document).html(Q(me.selected_note.changed));
-                printwin.print();
-            });
+        if (list && uid) {
+            rcmail.open_window(rcmail.url('print', {_uid: uid, _list: list.id}), true, true);
         }
     }
 
@@ -1251,12 +1094,12 @@
     function send_note()
     {
         var uids = [];
-        for (var rec, i=0; i < noteslist.selection.length; i++) {
-            if (rec = notesdata[noteslist.selection[i]]) {
+        $.each(noteslist.selection, function() {
+            if (rec = notesdata[this]) {
                 uids.push(rec.uid);
                 // TODO: check if rec.uid == me.selected_note.uid and unsaved changes
             }
-        }
+        });
 
         if (uids.length) {
             rcmail.goto_url('mail/compose', { _with_notes: uids.join(','), _notes_list: me.selected_list }, true);
@@ -1264,88 +1107,26 @@
     }
 
     /**
-     *
+     * Display the given counts to each tag
      */
-    function render_tagslist(newtags, replace)
+    function update_taglist(tags)
     {
-        if (replace) {
-            tags = newtags;
-        }
-        else {
-            var append = [];
-            for (var i=0; i < newtags.length; i++) {
-                if ($.inArray(newtags[i], tags) < 0)
-                    append.push(newtags[i]);
-            }
-            if (!append.length) {
-                update_tagcloud();
-                return;  // nothing to be added
+        // compute counts first by iterating over all notes
+        var counts = {};
+        $.each(notesdata, function(id, rec) {
+            for (var t, j=0; rec && rec.tags && j < rec.tags.length; j++) {
+                t = rec.tags[j];
+                if (typeof counts[t] == 'undefined')
+                    counts[t] = 0;
+                counts[t]++;
             }
-            tags = tags.concat(append);
-        }
-
-        // sort tags first
-        tags.sort(function(a,b){
-            return a.toLowerCase() > b.toLowerCase() ? 1 : -1;
-        })
-
-        var widget = $(rcmail.gui_objects.notestagslist).html('');
-
-        // append tags to tag cloud
-        $.each(tags, function(i, tag){
-            li = $('<li role="checkbox" aria-checked="false" tabindex="0"></li>')
-                .attr('rel', tag)
-                .data('value', tag)
-                .html(Q(tag) + '<span class="count"></span>')
-                .appendTo(widget)
-                .draggable({
-                    addClasses: false,
-                    revert: 'invalid',
-                    revertDuration: 300,
-                    helper: tag_draggable_helper,
-                    start: tag_draggable_start,
-                    appendTo: 'body',
-                    cursor: 'pointer'
-                });
         });
 
-        update_tagcloud();
-    }
+        rcmail.triggerEvent('kolab-tags-counts', {counter: counts});
 
-    /**
-     * Display the given counts to each tag and set those inactive which don't
-     * have any matching records in the current view.
-     */
-    function update_tagcloud(counts)
-    {
-        // compute counts first by iterating over all visible task items
-        if (typeof counts == 'undefined') {
-            counts = {};
-            $.each(notesdata, function(id, rec){
-                for (var t, j=0; rec && rec.tags && j < rec.tags.length; j++) {
-                    t = rec.tags[j];
-                    if (typeof counts[t] == 'undefined')
-                        counts[t] = 0;
-                    counts[t]++;
-                }
-            });
+        if (tags && tags.length) {
+            rcmail.triggerEvent('kolab-tags-refresh', {tags: tags});
         }
-
-        $(rcmail.gui_objects.notestagslist).children('li').each(function(i,li){
-            var elem = $(li), tag = elem.attr('rel'),
-                count = counts[tag] || 0;
-
-            elem.children('.count').html(count+'');
-            if (count == 0) elem.addClass('inactive');
-            else            elem.removeClass('inactive');
-
-            if (tagsfilter && tagsfilter.length && $.inArray(tag, tagsfilter)) {
-                elem.addClass('selected').attr('aria-checked', 'true');
-            }
-            else {
-                elem.removeClass('selected').attr('aria-checked', 'false');
-            }
-        });
     }
 
     /**
@@ -1360,10 +1141,10 @@
 
         if (is_new || me.selected_note && data.id == me.selected_note.id) {
             render_note(data);
-            render_tagslist(data.tags || []);
+            update_taglist(data.tags || []);
         }
         else if (data.tags) {
-            render_tagslist(data.tags);
+            update_taglist(data.tags);
         }
 
         // add list item on top
@@ -1380,8 +1161,8 @@
         }
         // update list item
         else if (row = noteslist.rows[data.id]) {
-            $('.title', row.obj).html(Q(data.title));
-            $('.date', row.obj).html(Q(data.changed || ''));
+            $('.title', row.obj).text(data.title);
+            $('.date', row.obj).text(data.changed || '');
             // TODO: move to top
         }
     }
@@ -1389,16 +1170,21 @@
     /**
      * 
      */
-    function reset_view()
+    function reset_view(list)
     {
         close_history_dialog();
         me.selected_note = null;
         $('.notetitle', rcmail.gui_objects.noteviewtitle).val('').hide();
-        $('.tagline, .dates', rcmail.gui_objects.noteviewtitle).hide();
-        $(rcmail.gui_objects.noteseditform).hide();
+        $('.dates', rcmail.gui_objects.noteviewtitle).hide();
+        $('.tagline', rcmail.gui_objects.noteviewtitle).parent('.form-group').hide();
+        $(rcmail.gui_objects.noteseditform).hide().parents('.watermark').removeClass('formcontainer');
         $(rcmail.gui_objects.notesdetailview).hide();
         $(rcmail.gui_objects.notesattachmentslist).html('');
         rcmail.enable_command('save', false);
+
+        if (!list) {
+            rcmail.triggerEvent('show-list', {force: true});
+        }
     }
 
     /**
@@ -1424,18 +1210,20 @@
 
         // do some input validation
         if (savedata.title == '') {
-            alert(rcmail.gettext('entertitle', 'kolab_notes'));
-            $('.notetitle', rcmail.gui_objects.noteviewtitle).focus();
+            rcmail.alert_dialog(rcmail.gettext('entertitle', 'kolab_notes'), function() {;
+                $('.notetitle', rcmail.gui_objects.noteviewtitle).focus();
+            });
+
             return false;
         }
 
         if (check_change_state(savedata)) {
             rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
             saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('action', { _data: savedata, _do: savedata.uid?'edit':'new' }, true);
+            rcmail.http_post('action', {_data: savedata, _do: savedata.uid ? 'edit' : 'new'}, true);
         }
         else {
-            rcmail.display_message(rcmail.get_label('nochanges', 'kolab_notes'), 'info');
+            rcmail.display_message(rcmail.get_label('nochanges', 'kolab_notes'), 'notice');
         }
     }
 
@@ -1444,32 +1232,20 @@
      */
     function get_save_data()
     {
-        var editor = tinyMCE.get('notecontent'),
-            listselect = $('option:selected', rcmail.gui_objects.notebooks);
-        var savedata = {
-            title: trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
-            description: editor ? editor.getContent({ format:'html' }).replace(/^\s*(<p><\/p>\n*)?/, '') : $('#notecontent').val(),
-            list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
-            uid: me.selected_note.uid,
-            tags: []
-        };
+        var listselect = $('option:selected', rcmail.gui_objects.notebooks),
+            savedata = {
+                title: $.trim($('.notetitle', rcmail.gui_objects.noteviewtitle).val()),
+                description: rcmail.editor.get_content().replace(/^\s*(<p><\/p>\n*)?/, ''),
+                list: listselect.length ? listselect.val() : me.selected_note.list || me.selected_list,
+                uid: me.selected_note.uid,
+                tags: taglist ? kolab_tags_input_value(taglist) : []
+            };
 
         // copy links
         if ($.isArray(me.selected_note.links)) {
             savedata.links = me.selected_note.links;
         }
 
-        // collect tags
-        $('.tagedit-list input[type="hidden"]', rcmail.gui_objects.noteviewtitle).each(function(i, elem){
-            if (elem.value)
-                savedata.tags.push(elem.value);
-        });
-        // including the "pending" one in the text box
-        var newtag = $('#tagedit-input').val();
-        if (newtag != '') {
-            savedata.tags.push(newtag);
-        }
-
         return savedata;
     }
 
@@ -1505,26 +1281,28 @@
             var dialog, buttons = [];
 
             buttons.push({
-                text: rcmail.gettext('discard', 'kolab_notes'),
+                text: rcmail.gettext('save'),
+                'class': 'mainaction save',
                 click: function() {
+                    save_note(beforesave);
                     dialog.dialog('close');
+                    rcmail.busy = false;  // don't block next action
                     ok();
                 }
             });
 
             buttons.push({
-                text: rcmail.gettext('save'),
-                'class': 'mainaction',
+                text: rcmail.gettext('discard', 'kolab_notes'),
+                'class': 'discard',
                 click: function() {
-                    save_note(beforesave);
                     dialog.dialog('close');
-                    rcmail.busy = false;  // don't block next action
                     ok();
                 }
             });
 
             buttons.push({
                 text: rcmail.gettext('abort', 'kolab_notes'),
+                'class': 'cancel',
                 click: function() {
                     dialog.dialog('close');
                     nok();
@@ -1574,9 +1352,9 @@
             return false;
         }
 
-        if (confirm(rcmail.gettext('deletenotesconfirm','kolab_notes'))) {
-            var rec, id, uids = [];
-            for (var i=0; i < noteslist.selection.length; i++) {
+        rcmail.confirm_dialog(rcmail.gettext('kolab_notes.deletenotesconfirm'), 'delete', function() {
+            var i, rec, id, uids = [];
+            for (i=0; i < noteslist.selection.length; i++) {
                 id = noteslist.selection[i];
                 rec = notesdata[id];
                 if (rec) {
@@ -1590,9 +1368,9 @@
             rcmail.http_post('action', { _data: { uid: uids.join(','), list: me.selected_list }, _do: 'delete' }, true);
 
             reset_view();
-            update_tagcloud();
+            update_taglist();
             noteslist.clear_selection();
-        }
+        });
     }
 
     /**
@@ -1632,81 +1410,6 @@
             window.history.replaceState({}, document.title, rcmail.url('', query));
         }
     }
-
-
-    /*  Helper functions for drag & drop functionality of tags  */
-    
-    function tag_draggable_helper()
-    {
-        if (!tag_draghelper)
-            tag_draghelper = $('<div class="tag-draghelper"></div>');
-        else
-            tag_draghelper.html('');
-
-        $(this).clone().addClass('tag').appendTo(tag_draghelper);
-        return tag_draghelper;
-    }
-
-    function tag_draggable_start(event, ui)
-    {
-        // register notes list to receive drop events
-        $('li', rcmail.gui_objects.noteslist).droppable({
-            hoverClass: 'droptarget',
-            accept: tag_droppable_accept,
-            drop: tag_draggable_dropped,
-            addClasses: false
-        });
-
-        // allow to drop tags onto edit form title
-        $(rcmail.gui_objects.noteviewtitle).droppable({
-            drop: function(event, ui){
-                $('#tagedit-input').val(ui.draggable.data('value')).trigger('transformToTag');
-                $('.tagline .placeholder', rcmail.gui_objects.noteviewtitle).hide();
-            },
-            addClasses: false
-        })
-    }
-
-    function tag_droppable_accept(draggable)
-    {
-        if (rcmail.busy)
-            return false;
-
-        var tag = draggable.data('value'),
-            drop_id = $(this).attr('id').replace(/^rcmrow/, ''),
-            drop_rec = notesdata[drop_id];
-
-        // target already has this tag assigned
-        if (!drop_rec || (drop_rec.tags && $.inArray(tag, drop_rec.tags) >= 0)) {
-            return false;
-        }
-
-        return true;
-    }
-
-    function tag_draggable_dropped(event, ui)
-    {
-        var drop_id = $(this).attr('id').replace(/^rcmrow/, ''),
-            tag = ui.draggable.data('value'),
-            rec = notesdata[drop_id],
-            savedata;
-
-        if (rec && rec.id) {
-            savedata = me.selected_note && rec.uid == me.selected_note.uid ? get_save_data() : $.extend({}, rec);
-
-            if (savedata.id)   delete savedata.id;
-            if (savedata.html) delete savedata.html;
-
-            if (!savedata.tags)
-                savedata.tags = [];
-            savedata.tags.push(tag);
-
-            rcmail.lock_form(rcmail.gui_objects.noteseditform, true);
-            saving_lock = rcmail.set_busy(true, 'kolab_notes.savingdata');
-            rcmail.http_post('action', { _data: savedata, _do: 'edit' }, true);
-        }
-    }
-
 }
 
 
@@ -1731,13 +1434,56 @@
 })();
 
 
-/* notes plugin UI initialization */
+// List options menu for Elastic
+function kolab_notes_options_menu()
+{
+    var content = $('#options-menu'),
+        width = content.width() + 25,
+        dialog = content.clone();
+
+    // set form values
+    $('select[name="sort_col"]', dialog).val(kolabnotes.settings.sort_col || '');
+    $('select[name="sort_ord"]', dialog).val(kolabnotes.settings.sort_order || 'ASC');
+
+    // Fix id/for attributes
+    $('select', dialog).each(function() { this.id = this.id + '-clone'; });
+    $('label', dialog).each(function() { $(this).attr('for', $(this).attr('for') + '-clone'); });
+
+    var save_func = function(e) {
+        if (rcube_event.is_keyboard(e.originalEvent)) {
+            $('#listmenulink').focus();
+        }
+
+        var col = $('select[name="sort_col"]', dialog).val(),
+            ord = $('select[name="sort_ord"]', dialog).val();
+
+        kolabnotes.list_set_sort(col, ord);
+        return true;
+    };
+
+    dialog = rcmail.simple_dialog(dialog, rcmail.gettext('listoptionstitle'), save_func, {
+        closeOnEscape: true,
+        open: function(e) {
+            setTimeout(function() { dialog.find('select').first().focus(); }, 100);
+        },
+        minWidth: 400,
+        width: width
+    });
+};
+
+
+/* Notes plugin UI initialization */
 var kolabnotes;
 window.rcmail && rcmail.addEventListener('init', function(evt) {
+    if (rcmail.task == 'notes' && rcmail.env.action == 'print') {
+        rcmail.print_dialog();
+        return;
+    }
+
     kolabnotes = new rcube_kolab_notes_ui(rcmail.env.kolab_notes_settings);
+
     if (rcmail.env.action == 'dialog-ui')
         kolabnotes.init_dialog();
     else
         kolabnotes.init();
 });
-

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/notes_mail.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/notes_mail.js Changed

@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2014, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2014-2017, 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
@@ -25,99 +25,73 @@
  * for the JavaScript code in this file.
  */
 
-
 window.rcmail && rcmail.addEventListener('init', function(evt) {
     /**
      * Open the notes edit GUI in a jquery UI dialog
      */
     function kolab_note_dialog(url)
     {
-        var frame, name, mywin = window, edit = url && url._id,
-            $dialog = $('#kolabnotesinlinegui');
-
-        function dialog_render(p)
-        {
-            $dialog.parent().find('.ui-dialog-buttonset .ui-button')
-                .prop('disabled', p.readonly)
-                .last().prop('disabled', false);
-        }
+        if (!url) url = {};
+        url._framed = 1;
 
-        // create dialog if not exists
-        if (!$dialog.length) {
-            $dialog = $('<iframe>')
-                .attr('id', 'kolabnotesinlinegui')
-                .attr('name', 'kolabnotesdialog')
-                .attr('src', 'about:blank')
-                .css('min-width', '100%')
-                .on('load', function(e) {
-                    frame = rcmail.get_frame_window('kolabnotesinlinegui');
-                    name = $('.notetitle', frame.rcmail.gui_objects.noteviewtitle);
-                    frame.rcmail.addEventListener('responseafteraction', refresh_mailview);
-                });
+        var $dialog, frame, buttons = {},
+            button_classes = ['mainaction save'],
+            edit = url._id,
+            title = edit ? rcmail.gettext('kolab_notes.editnote') : rcmail.gettext('kolab_notes.appendnote'),
+            dialog_render = function(p) {
+                $dialog.parent().find('.ui-dialog-buttonset .ui-button')
+                    .prop('disabled', p.readonly)
+                    .last().prop('disabled', false);
+            };
 
-            // subscribe event in parent window which is also triggered from iframe
-            // (probably before the 'load' event from above)
-            rcmail.addEventListener('kolab_notes_render', dialog_render);
-        }
-        // close show dialog first
-        else if ($dialog.is(':ui-dialog')) {
-            $dialog.dialog('close');
-        }
+        $dialog = $('<iframe>').attr({
+                id: 'kolabnotesinlinegui',
+                name: 'kolabnotesdialog',
+                src: rcmail.url('notes/dialog-ui', url)
+            }).on('load', function(e) {
+                frame = rcmail.get_frame_window('kolabnotesinlinegui');
+                frame.rcmail.addEventListener('responseafteraction', refresh_mailview);
+            });
 
-        if (!url) url = {};
-        url._framed = 1;
-        $dialog.attr('src', rcmail.url('notes/dialog-ui', url));
+        // subscribe event in parent window which is also triggered from iframe
+        // (probably before the 'load' event from above)
+        rcmail.addEventListener('kolab_notes_render', dialog_render);
 
         // dialog buttons
-        var buttons = {};
         buttons[rcmail.gettext('save')] = function() {
             // frame is not loaded
             if (!frame)
                 return;
 
-            // do some input validation
-            if (!name.val() || name.val().length < 2) {
-                alert(rcmail.gettext('entertitle', 'kolab_notes'));
-                name.select();
-                return;
-            }
-
             frame.rcmail.command('save');
         };
 
         if (edit) {
+            button_classes.push('delete');
             buttons[rcmail.gettext('delete')] = function() {
                 if (confirm(rcmail.gettext('deletenotesconfirm','kolab_notes'))) {
                     rcmail.addEventListener('responseafteraction', refresh_mailview);
                     rcmail.http_post('notes/action', { _data: { uid: url._id, list: url._list }, _do: 'delete' }, true);
-                    $dialog.dialog('close');
+                    $dialog.dialog('destroy');
                 }
             };
         }
 
+        button_classes.push('cancel');
         buttons[rcmail.gettext(edit ? 'close' : 'cancel')] = function() {
-            $dialog.dialog('close');
+            $dialog.dialog('destroy');
         };
 
         // open jquery UI dialog
-        var win = $(window);
-        $dialog.dialog({
-            modal: true,
-            resizable: true,
-            closeOnEscape: true,
-            title: edit ? rcmail.gettext('editnote','kolab_notes') : rcmail.gettext('appendnote','kolab_notes'),
-            open: function() {
-                $dialog.parent().find('.ui-dialog-buttonset .ui-button').prop('disabled', true).first().addClass('mainaction');
-            },
+        window.kolab_note_dialog_element = $dialog = rcmail.show_popup_dialog($dialog, title, buttons, {
+            button_classes: button_classes,
             close: function() {
-                $dialog.dialog('destroy');
                 rcmail.removeEventListener('kolab_notes_render', dialog_render);
             },
-            buttons: buttons,
-            minWidth: 480,
-            width: 680,
-            height: Math.min(640, win.height() - 100)
-        }).show();
+            minWidth: 500,
+            width: 600,
+            height: 500
+        });
     }
 
     /**
@@ -125,19 +99,19 @@
      */
     function refresh_mailview(e)
     {
-        var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : mywin;
+        var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : window;
         if (win && e.response) {
             win.location.reload();
             if (e.response.action == 'action')
-                $('#kolabnotesinlinegui').dialog('close');
+                $('#kolabnotesinlinegui').dialog('destroy');
         }
     }
 
     // register commands
     rcmail.register_command('edit-kolab-note', kolab_note_dialog, true);
     rcmail.register_command('append-kolab-note', function() {
-        var uid;
-        if ((uid = rcmail.get_single_uid())) {
+        var uid = rcmail.get_single_uid();
+        if (uid) {
             kolab_note_dialog({ _msg: uid + '-' + rcmail.env.mailbox });
         }
     });

iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates/dialogview.html Added

@@ -0,0 +1,29 @@
+<roundcube:include file="includes/layout.html" />
+
+<div id="notedetailsbox" class="formcontent">
+	<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
+	<div class="notebookselect row form-group" style="display:none">
+		<label for="kolab-notebook" class="col-sm-2 col-form-label"><roundcube:label name="kolab_notes.savein" /></label>
+		<div class="col-sm-10">
+			<roundcube:object name="plugin.notebooks" id="kolab-notebook" type="select" class="form-control" />
+		</div>
+	</div>
+	<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
+	<roundcube:object name="plugin.detailview" id="notedetails" class="notedetails" />
+	<div id="notereferences">
+		<roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" />
+	</div>
+</div>
+
+<script type="text/javascript">
+
+// UI startup
+$(document).ready(function(e) {
+    rcmail.addEventListener('kolab_notes_render', function(p) {
+        $('#notesdialogheader .notebookselect')[p.readonly ? 'hide' : 'show']();
+    });
+});
+
+</script>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates/notes.html Added

@@ -0,0 +1,149 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="kolab_notes.navtitle" /></h1>
+
+
+<div class="sidebar 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>
+		<roundcube:button name="notebookactionsmenu" id="notesoptionsmenulink" type="link"
+			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"
+		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" />
+	</div>
+</div>
+
+
+<div class="list 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 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"
+				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"
+		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>
+		<roundcube:object name="plugin.listing" id="kolabnoteslist"
+			class="listing" summary="kolab_notes.arialabelnoteslist"
+			role="listbox" data-list="noteslist"
+			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="createnote" />
+	</div>
+</div>
+
+
+<div class="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"
+				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"
+				label="print" title="print" innerClass="inner" />
+			<roundcube:button command="delete" type="link"
+				class="button delete disabled" classAct="button delete"
+				title="delete" label="delete" innerClass="inner" />
+			<roundcube:button command="sendnote" type="link"
+				class="button send disabled" classAct="button send"
+				label="kolab_notes.send" title="kolab_notes.sendnote" innerClass="inner" />
+			<roundcube:container name="toolbar" id="notestoolbar" />
+		</div>
+	</div>
+	
+	<h2 id="aria-label-noteform" class="voice"><roundcube:label name="kolab_notes.arialabelnoteform" /></h2>
+	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-noteform">
+		<div id="notedetailsbox" class="formcontent">
+			<roundcube:object name="plugin.notetitle" id="notedetailstitle" class="notetitle" />
+			<roundcube:object name="plugin.editform" id="noteform" class="noteform" />
+			<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" />
+			</div>
+			<roundcube:container name="notedetailview" id="notedetailsbox" />
+		</div>
+		<div class="formbuttons">
+			<roundcube:button command="save" class="btn btn-primary submit" label="save" id="btn-save-note" />
+			<roundcube:if condition="config:kolab_bonnie_api" />
+				<roundcube:button command="history" type="link" label="libkolab.showhistory"
+					class="btn btn-secondary history note-history disabled" classAct="btn btn-secondary history note-history" />
+			<roundcube:endif />
+		</div>
+	</div>
+</div>
+
+
+<roundcube:if condition="config:kolab_bonnie_api" />
+<div id="notehistory" class="popupmenu" aria-hidden="true">
+	<roundcube:object name="plugin.object_changelog_table" class="records-table changelog-table" />
+	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="notediff" class="popupmenu" aria-hidden="true">
+	<h2 class="note-title">Note Title</h2>
+	<h2 class="note-title-new diff-text-new"></h2>
+	<div class="form-section note-tags">
+		<span class="diff-text-old"></span> &#8674; <span class="diff-text-new"></span>
+	</div>
+	<div class="form-section note-description">
+		<div class="diff-text-diff" style="white-space:pre-wrap"></div>
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+	<div class="form-section notereferences">
+		<div class="diff-text-old"></div>
+		<div class="diff-text-new"></div>
+	</div>
+</div>
+<roundcube:endif />
+
+<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">
+		<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="edit" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
+		<roundcube:button type="link-menuitem" command="list-remove" label="kolab_notes.removelist" class="remove disabled" classAct="remove active" />
+		<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
+	</ul>
+</div>
+
+<div id="options-menu" class="popupmenu propform" role="menu" aria-labelledby="aria-label-optionsmenu">
+	<h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotessortmenu" /></h3>
+	<div class="form-group row">
+		<label for="listoptions-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select id="listoptions-sortcol" name="sort_col" class="form-control">
+				<option value="changed"><roundcube:label name="kolab_notes.changed" /></option>
+				<option value="title"><roundcube:label name="kolab_notes.title" /></option>
+			</select>
+		</div>
+	</div>
+	<div class="form-group row">
+		<label for="listoptions-sortord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select id="listoptions-sortord" name="sort_ord" class="form-control" disabled>
+				<option value="ASC"><roundcube:label name="asc" /></option>
+				<option value="DESC"><roundcube:label name="desc" /></option>
+			</select>
+		</div>
+	</div>
+</div>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/elastic/templates/print.html Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/skins/larry/notes.css -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/larry/notes.css Changed

@@ -68,17 +68,9 @@
 	left: 252px;
 }
 
-.notesview #tagsbox {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 240px;
-}
-
 .notesview #notebooksbox {
 	position: absolute;
-	top: 252px;
+	top: 0;
 	left: 0;
 	width: 100%;
 	bottom: 0px;
@@ -106,6 +98,7 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	outline: none;
+	border: 0;
 }
 
 .notesview #kolabnoteslist .date {
@@ -271,11 +264,6 @@
 	border-bottom: 0;
 }
 
-.notesview .ui-dialog-content .tagline {
-	display: none !important;
-}
-
-.notesview .notetitle .disabled .tagedit-list,
 .notesview .notetitle input.inline-edit:disabled {
 	outline: none;
 	padding-left: 0;
@@ -305,7 +293,6 @@
 }
 
 .notesview .notetitle .dates,
-.notesview .notetitle .tagline,
 .notesdialog .notebookselect label {
 	color: #999;
 	font-weight: normal;
@@ -317,53 +304,20 @@
 	margin-top: 4px;
 }
 
-.notesview .notetitle .tagline {
-	position: relative;
-	cursor: text;
-	margin: 4px 0 0 0;
-}
-
-.notesview .notetitle .tagline.disabled {
-	margin-top: 0;
-}
-
-.notesview .notetitle .tagline .placeholder {
-	position: absolute;
-	top: 6px;
-	left: 6px;
-	z-index: 2;
-}
-
-.notesview .notetitle .tagline.disabled .placeholder {
-	left: 0;
-}
-
-.notesview .notetitle .tagedit-list {
-	position: relative;
-	z-index: 1;
-	min-height: 32px;
-/*	padding: 2px; */
-	-webkit-box-sizing: border-box;
-	   -moz-box-sizing: border-box;
-	    -ms-box-sizing: border-box;
-	        box-sizing: border-box;
-}
-
-/* Firefox 3.6 */
-_:not(), _:-moz-handler-blocked, .notesview .notetitle .tagedit-list {
-	min-height: 26px;
+.notetitle .col-form-label {
+	display: none;
 }
 
-.notesview .notetitle .disabled .tagedit-list {
-	min-height: 26px;
+.notetitle .dates div.row {
+	display: inline;
 }
 
-.notesview .notetitle #tagedit-input {
-	background: none;
+.notetitle .dates .col-form-label {
+	display: inline;
 }
 
-.notesview .tag-draghelper {
-	z-index: 1000;
+.notebookselect {
+	clear: both;
 }
 
 .notesview .notetitle .notecreated,

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/skins/larry/templates/notes.html -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/larry/templates/notes.html Changed

@@ -24,19 +24,12 @@
         <label for="quicksearchbox" class="voice"><roundcube:label name="kolab_notes.arialabelnotesquicksearchbox" /></label>
         <a id="searchmenulink" class="iconbutton searchoptions" > </a>
         <roundcube:object name="plugin.searchform" id="quicksearchbox" />
-        <roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
+        <roundcube:button type="link" command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
     </div>
 
     <div id="mainscreencontent">
 
     <div id="sidebar">
-        <div id="tagsbox" class="uibox listbox">
-            <h2 class="boxtitle" id="aria-label-tagsbox"><roundcube:label name="kolab_notes.tags" id="taglist" /></h2>
-            <div class="scroller">
-                <roundcube:object name="plugin.tagslist" id="tagslist" class="tagcloud" role="region" aria-labelledby="aria-label-tagsbox" aria-controls="kolabnoteslist" />
-            </div>
-        </div>
-
         <div id="notebooksbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-notebooks">
             <h2 class="boxtitle" id="aria-label-notebooks"><roundcube:label name="kolab_notes.lists" />
                 <a href="#notebooks" class="iconbutton search" title="<roundcube:label name='kolab_notes.findnotebooks' />" tabindex="0"><roundcube:label name="kolab_notes.findnotebooks" /></a>
@@ -47,7 +40,7 @@
                     <label for="notebooksearch" class="voice"><roundcube:label name="kolab_notes.searchterms" /></label>
                     <input type="text" name="q" id="notebooksearch" placeholder="<roundcube:label name='kolab_notes.findnotebooks' />" />
                     <a class="iconbutton searchicon"></a>
-                    <roundcube:button command="reset-listsearch" id="notebooksearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+                    <roundcube:button type="link" command="reset-listsearch" id="notebooksearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
                 </div>
             </div>
             <div class="scroller withfooter">
@@ -61,10 +54,10 @@
         <div id="notesoptionsmenu" class="popupmenu" aria-hidden="true">
             <h3 id="aria-label-optionsmenu" class="voice"><roundcube:label name="kolab_notes.arialabelnotesoptionsmenu" /></h3>
             <ul class="toolbarmenu" id="notesoptionsmenu-menu" role="menu" aria-labelledby="aria-label-optionsmenu">
-                <li role="menuitem"><roundcube:button command="list-edit" label="edit" classAct="active" /></li>
-                <li role="menuitem"><roundcube:button command="list-delete" label="delete" classAct="active" /></li>
-                <li role="menuitem"><roundcube:button command="list-remove" label="kolab_notes.removelist" classAct="active" /></li>
-                <li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="list-edit" label="edit" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="list-delete" label="delete" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="list-remove" label="kolab_notes.removelist" classAct="active" /></li>
+                <li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
             </ul>
         </div>
     </div>
@@ -97,7 +90,7 @@
                 <roundcube:button command="save" type="input" class="button mainaction" label="save" id="btn-save-note" />
                 <div class="footerright">
                 <roundcube:if condition="config:kolab_bonnie_api" />
-                    <roundcube:button command="history" type="link" label="kolab_notes.showhistory" class="btn-note-history" classAct="btn-note-history active" />
+                    <roundcube:button command="history" type="link" label="libkolab.showhistory" class="btn-note-history" classAct="btn-note-history active" />
                 <roundcube:endif />
                 </div>
             </div>
@@ -146,12 +139,6 @@
     </ul>
 </div>
 
-<div id="notebookeditform" class="uidialog" aria-labelledby="aria-label-editform" aria-hidden="true" role="dialog">
-    <h3 id="aria-label-editform" class="voice"><roundcube:label name="kolab_notes.arialabelnotebookform" /></h3>
-    <roundcube:container name="notebookeditform" id="notebookeditform" />
-    <roundcube:label name="loading" />
-</div>
-
 <script type="text/javascript">
 
 // UI startup
@@ -166,8 +153,6 @@
         orientation:'v', relative:true, start:240, min:180, size:12, render:layout_view }).init();
     new rcube_splitter({ id:'noteslistsplitter2', p1:'#noteslistbox', p2:'#notedetailsbox',
         orientation:'v', relative:true, start:242, min:180, size:12, render:layout_view }).init();
-    new rcube_splitter({ id:'notesviewsplitterv', p1:'#tagsbox', p2:'#notebooksbox',
-        orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
 
     function layout_view()
     {
@@ -223,7 +208,6 @@
 
         return false;
     });
-    
 });
 
 </script>

iRony-0.4.0.tar.gz/lib/plugins/kolab_notes/skins/larry/templates/print.html -> iRony-0.4.1.tar.gz/lib/plugins/kolab_notes/skins/larry/templates/print.html Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_shortcuts/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_shortcuts/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/kolab_tags.js -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/kolab_tags.js Changed

@@ -26,7 +26,7 @@
  */
 
 window.rcmail && rcmail.addEventListener('init', function() {
-    if (rcmail.task == 'mail') {
+    if (/^(mail|notes|tasks)$/.test(rcmail.task)) {
         var msg_view = rcmail.env.action == 'show' || rcmail.env.action == 'preview';
 
         if (!msg_view && rcmail.env.action) {
@@ -35,7 +35,13 @@
 
         // load tags cloud
         if (rcmail.gui_objects.taglist) {
-            load_tags();
+            // Tags for kolab_notes plugin have to be initialized via an event
+            if (rcmail.task == 'notes' && !window.kolabnotes) {
+                rcmail.addEventListener('kolab-notes-init', load_tags);
+            }
+            else {
+                load_tags();
+            }
         }
 
         // display tags in message subject (message window)
@@ -60,6 +66,32 @@
         rcmail.register_command('tag-remove', function(props, obj, event) { tag_remove(props, obj, event); });
         rcmail.register_command('tag-remove-all', function() { tag_remove('*'); });
 
+        // Disable tag functionality in contextmenu in Roundcube < 1.4
+        if (!rcmail.env.rcversion) {
+            rcmail.addEventListener('menu-open', function(e) {
+                if (e.name == 'rcm_markmessagemenu') {
+                    $.each(['add', 'remove', 'remove-all'], function() {
+                        $('a.cmd_tag-' + this).parent().hide();
+                    });
+                }
+            });
+        }
+        // Set activation state for contextmenu entries related with tags management
+        else {
+            rcmail.addEventListener('contextmenu_init', function(menu) {
+                if (menu.menu_name == 'folderlist') {
+                    menu.addEventListener('activate', function(p) {
+                        if (p.command == 'manage-tags') {
+                            return true;
+                        }
+                        if (p.command == 'reset-tags') {
+                            return !!(tagsfilter.length && main_list_widget());
+                        }
+                    });
+                }
+            });
+        }
+
         // ajax response handler
         rcmail.addEventListener('plugin.kolab_tags', update_tags);
 
@@ -73,16 +105,34 @@
                     $('a.menuselector span', $(this).parent()).text(title);
                 });
         }
+
+        // Allow other plugins to update tags list
+        rcmail.addEventListener('kolab-tags-counts', update_counts)
+            .addEventListener('kolab-tags-refresh', refresh_tags);
     }
 });
 
-var tagsfilter = [], tag_selector_element, tag_form_data, tag_form_save_func,
+var tag_selector_element, tag_form_data, tag_form_save_func,
+    tagsfilter = [], 
+    tagscounts = [],
     reset_css = {color: '', backgroundColor: ''};
 
+function main_list_widget()
+{
+    if (rcmail.task == 'mail' && rcmail.message_list)
+        return rcmail.message_list;
+
+    if (rcmail.task == 'notes' && rcmail.noteslist)
+        return rcmail.noteslist;
+
+    if (rcmail.task == 'tasks' && rcmail.gui_objects.resultlist)
+        return rcmail.gui_objects.resultlist;
+}
+
 // fills tag cloud with tags list
 function load_tags()
 {
-    var ul = $('#taglist'), clickable = rcmail.message_list;
+    var ul = $('#taglist'), clickable = !!main_list_widget();
 
     $.each(rcmail.env.tags, function(i, tag) {
         var li = add_tag_element(ul, tag, clickable);
@@ -98,18 +148,20 @@
         }
     });
 
+    rcmail.triggerEvent('kolab-tags-update', {});
     rcmail.enable_command('reset-tags', tagsfilter.length && clickable);
 }
 
 function add_tag_element(list, tag, clickable)
 {
-    // @todo: .append('<span class="count"></span>')
-    var element = $('<li>').text(tag.name).data('tag', tag.uid).appendTo(list);
+    var element = $('<li>').attr('class', tag_class_name(tag))
+        .text(tag.name).data('tag', tag.uid)
+        .append('<span class="count">')
+        .appendTo(list);
 
     if (clickable) {
         element.click(function(e) {
-            var item = $(this),
-                tagid = item.data('tag');
+            var tagid = element.data('tag');
 
             if (!tagid)
                 return false;
@@ -129,12 +181,12 @@
 
             // add tag to the filter
             if (index < 0) {
-                item.addClass('selected');
-                tag_set_color(item, t);
+                element.addClass('selected');
+                tag_set_color(element, t);
                 tagsfilter.push(tagid);
             }
             else if (shift) {
-                item.removeClass('selected').css(reset_css);
+                element.removeClass('selected').css(reset_css);
                 tagsfilter.splice(index, 1);
             }
 
@@ -146,30 +198,58 @@
 
             e.preventDefault();
             return false;
-        })
+        });
+
+        if (!$('html.touch').length) {
+            element.draggable({
+                addClasses: false,
+                cursor: 'default',
+                cursorAt: {left: -10},
+                revert: 'invalid',
+                revertDuration: 300,
+                helper: tag_draggable_helper,
+                start: tag_draggable_start,
+                appendTo: 'body'
+            });
+        }
     }
 
     return element;
 }
 
+function update_counts(p)
+{
+    $('#taglist > li').each(function(i,li) {
+        var elem = $(li), tagid = elem.data('tag'),
+            tag = tag_find(tagid);
+            count = tag && p.counter ? p.counter[tag.name] : '';
+
+            elem.children('.count').text(count ? count : '');
+    });
+
+    tagscounts = p.counter;
+}
+
 function manage_tags()
 {
     // display it as popup
     rcmail.tags_popup = rcmail.show_popup_dialog(
-        '<div id="tagsform"><select size="8" multiple="multiple"></select><div class="buttons"></div></div>',
+        '<div id="tagsform"><select size="6" multiple="multiple"></select><div class="buttons"></div></div>',
         rcmail.gettext('kolab_tags.tags'),
         [{
             text: rcmail.gettext('save'),
-            'class': 'mainaction',
+            'class': 'mainaction save',
             click: function() { if (tag_form_save()) $(this).dialog('close'); }
         },
         {
             text: rcmail.gettext('cancel'),
+            'class': 'cancel',
             click: function() { $(this).dialog('close'); }
         }],
         {
             width: 400,
             modal: true,
+            classes: {'ui-dialog-content': 'formcontent'},
             closeOnEscape: true,
             close: function(e, ui) {
                 $(this).remove();
@@ -183,12 +263,15 @@
     var form = $('#tagsform'),
         select = $('select', form),
         buttons = [
-            $('<input type="button" />').val(rcmail.gettext('kolab_tags.add'))
+            $('<button class="btn btn-secondary create">')
+                .text(rcmail.gettext('kolab_tags.add'))
                 .click(function() { tag_form_dialog(); }),
-            $('<input type="button" />').val(rcmail.gettext('kolab_tags.edit'))
+            $('<button class="btn btn-secondary edit">')
+                .text(rcmail.gettext('kolab_tags.edit'))
                 .attr('disabled', true)
                 .click(function() { tag_form_dialog((select.val())[0]); }),
-            $('<input type="button" />').val(rcmail.gettext('kolab_tags.delete'))
+            $('<button class="btn btn-danger delete">')
+                .text(rcmail.gettext('kolab_tags.delete'))
                 .attr('disabled', true)
                 .click(function() {
                     $.each(select.val() || [], function(i, v) {
@@ -210,6 +293,7 @@
 
     $.each(rcmail.env.tags, function(i, v) {
         $('<option>').val(v.uid).text(v.name)
+            .attr('class', tag_class_name(v))
             .on('dblclick', function() { tag_form_dialog(v.uid); })
             .appendTo(select);
     });
@@ -220,11 +304,15 @@
 function tag_form_dialog(id)
 {
     var tag, form = $('#tagsform'),
-        content = $('<div id="tageditform"></div>'),
-        name_input = $('<input type="text" size="25" id="tag-form-name" />'),
-        color_input = $('<input type="text" size="6" class="colors" id="tag-form-color" />'),
-        name_label = $('<label for="tag-form-name">').text(rcmail.gettext('kolab_tags.tagname')),
-        color_label = $('<label for="tag-form-color">').text(rcmail.gettext('kolab_tags.tagcolor'));
+        content = $('<div id="tageditform">'),
+        row1 = $('<div class="form-group row">'),
+        row2 = $('<div class="form-group row">'),
+        name_input = $('<input type="text" size="25" id="tag-form-name" class="form-control">'),
+        color_input = $('<input type="text" size="6" id="tag-form-color" class="colors form-control">'),
+        name_label = $('<label for="tag-form-name" class="col-form-label col-sm-2">')
+            .text(rcmail.gettext('kolab_tags.tagname')),
+        color_label = $('<label for="tag-form-color" class="col-form-label col-sm-2">')
+            .text(rcmail.gettext('kolab_tags.tagcolor'));
 
     tag_form_save_func = function() {
         var i, tag, name = $.trim(name_input.val()), color = $.trim(color_input.val());
@@ -302,9 +390,11 @@
     // display form
     form.children().hide();
     form.append(content);
-    content.append([name_label, name_input, '<br>', color_label, color_input]).show();
+    content.append(row1.append(name_label).append($('<div class="col-sm-10">').append(name_input)))
+        .append(row2.append(color_label).append($('<div class="col-sm-10">').append(color_input)))
+        .show();
     name_input.focus();
-    color_input.miniColors({colorValues: rcmail.env.mscolors});
+    color_input.minicolors(rcmail.env.minicolors_config || {});
 }
 
 // save tags form (create/update/delete tags)
@@ -349,6 +439,29 @@
     // reset tag selector popup
     tag_selector_reset();
 
+    if (response.refresh) {
+        var list = $('#taglist');
+
+        tagsfilter = $.map(list.children('.selected'), function(li) {
+            return $(li).data('tag');
+        });
+
+        list.html('');
+        load_tags();
+        update_counts({counter: tagscounts});
+
+        if (tagsfilter.length) {
+            list.children('li').each(function() {
+                if ($.inArray($(this).data('tag'), tagsfilter) > -1) {
+                    $(this).addClass('selected');
+                }
+            });
+            apply_tags_filter();
+        }
+
+        return;
+    }
+
     // remove deleted tags
     remove_tags(response['delete'], response.mark);
 
@@ -366,9 +479,9 @@
         var i, old, tag = this, id = tag.uid,
             filter = function() { return $(this).data('tag') == id; },
             tagbox = $('#taglist li').filter(filter),
-            elements = $('span.tagbox').filter(filter),
+            elements = $('.tagbox').filter(filter),
             win = rcmail.get_frame_window(rcmail.env.contentframe),
-            framed = win && win.jQuery ? win.jQuery('span.tagbox').filter(function() { return win.jQuery(this).data('tag') == id; }) : [];
+            framed = win && win.jQuery ? win.jQuery('.tagbox').filter(function() { return win.jQuery(this).data('tag') == id; }) : [];
             selected = $.inArray(String(id), tagsfilter);
 
         for (i in rcmail.env.tags)
@@ -396,6 +509,7 @@
         rcmail.env.tags[i] = tag;
     });
 
+    rcmail.triggerEvent('kolab-tags-update', {});
     rcmail.enable_command('reset-tags', tagsfilter.length && list);
 
     // update Mark menu in case some messages are already selected
@@ -414,7 +528,8 @@
     }
 
     var taglist = $('#taglist li'),
-        tagboxes = $((selection && rcmail.message_list ? 'tr.selected ' : '') + 'span.tagbox'),
+        list = main_list_widget(),
+        tagboxes = $('span.tagbox'),
         win = rcmail.get_frame_window(rcmail.env.contentframe),
         frame_tagboxes = win && win.jQuery ? win.jQuery('span.tagbox') : [],
         update_filter = false;
@@ -452,11 +567,28 @@
         }
     });
 
-    if (update_filter && rcmail.message_list) {
+    if (update_filter && list) {
         apply_tags_filter();
     }
 }
 
+// kolab-tags-refresh event handler, allowing plugins to refresh
+// the tags list e.g. when a new tag is created
+function refresh_tags(e)
+{
+    // find a new tag
+    $.each(e.tags || [], function() {
+        for (var i in rcmail.env.tags) {
+            if (rcmail.env.tags[i].name == this) {
+                return;
+            }
+        }
+
+        rcmail.http_post('plugin.kolab_tags', {_act: 'refresh'}, rcmail.display_message(rcmail.get_label('loading'), 'loading'));
+        return false;
+    });
+}
+
 // unselect all selected tags in the tag cloud
 function reset_tags()
 {
@@ -470,7 +602,7 @@
 function tag_add(props, obj, event)
 {
     if (!props) {
-        return tag_selector(event, function(props) { rcmail.command('tag-add', props); });
+        return tag_selector(event, function(props) { tag_add(props); });
     }
 
     var tag, postdata = rcmail.selection_post_data();
@@ -536,7 +668,7 @@
 function tag_remove(props, obj, event)
 {
     if (!props) {
-        return tag_selector(event, function(props) { rcmail.command('tag-remove', props); }, true);
+        return tag_selector(event, function(props) { tag_remove(props); }, true);
     }
 
     if (props.name) {
@@ -557,13 +689,58 @@
     postdata._act = 'remove';
 
     rc.http_post('plugin.kolab_tags', postdata, true);
+
+    // 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));
+}
+
+// update messages list and message frame after removing tag assignments
+function tag_remove_callback(tag)
+{
+    if (!tag)
+        return;
+
+    var frame_window = rcmail.get_frame_window(rcmail.env.contentframe),
+        list = rcmail.message_list;
+
+    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) {
+                        $(this).remove();
+                    }
+                });
+            }
+        });
+
+        message_list_select(list);
+    }
+
+    // TODO: remove tag(s) from the preview frame
 }
 
+
 // executes messages search according to selected messages
 function apply_tags_filter()
 {
-    rcmail.enable_command('reset-tags', tagsfilter.length && rcmail.message_list);
-    rcmail.qsearch();
+    rcmail.enable_command('reset-tags', tagsfilter.length && main_list_widget());
+
+    if (rcmail.task == 'mail')
+        rcmail.qsearch();
+    else {
+        // Convert tag id to tag label
+        var tags = [];
+        $.each(rcmail.env.tags, function() {
+            if ($.inArray(this.uid, tagsfilter) > -1) {
+                tags.push(this.name);
+            }
+        });
+
+        rcmail.triggerEvent('kolab-tags-search', tags);
+    }
 }
 
 // adds _tags argument to http search request
@@ -587,13 +764,22 @@
 
 function message_list_select(list)
 {
-    var has_tags_to_remove = (rcmail.env.tags.length
-        && (rcmail.select_all_mode || $('tr.selected span.tagbox', list.list).length));
-
-    rcmail.enable_command('tag-remove', 'tag-remove-all', has_tags_to_remove);
-    rcmail.enable_command('tag-add', list.selection.length);
+    var selection = list.get_selection(),
+        has_tags = selection.length && rcmail.env.tags.length;
+
+    if (has_tags && !rcmail.select_all_mode) {
+        has_tags = false;
+        $.each(selection, function() {
+            var row = list.rows[this];
+            if (row && row.obj && $('span.tagbox', row.obj).length) {
+                has_tags = true;
+                return false;
+            }
+        });
+    }
 
-    tag_selector_reset();
+    rcmail.enable_command('tag-remove', 'tag-remove-all', has_tags);
+    rcmail.enable_command('tag-add', selection.length);
 }
 
 // add tags to message subject on message list
@@ -634,7 +820,7 @@
 // add tags to message subject in message preview
 function message_tags(tags, merge)
 {
-    var boxes = [], subject_tag = $('#messageheader .subject');
+    var boxes = [], subject_tag = $('#messageheader .subject,#message-header h2.subject'); // Larry and Elastic
 
     $.each(tags || [], function (i, tag) {
         if (merge) {
@@ -686,6 +872,10 @@
 function tag_set_color(obj, tag)
 {
     if (obj && tag.color) {
+        if (rcmail.triggerEvent('kolab-tag-color', {obj: obj, tag: tag}) === false) {
+            return;
+        }
+
         var style = 'background-color: ' + tag.color + ' !important';
 
         // choose black text color when background is bright, white otherwise
@@ -715,7 +905,6 @@
             span = document.createElement('span');
 
         link.href = '#';
-        link.className = 'active';
         container = $('<div id="tag-selector" class="popupmenu"></div>')
             .keydown(function(e) {
                 var focused = $('*:focus', container).parent();
@@ -735,17 +924,11 @@
 
         // loop over tags list
         $.each(rcmail.env.tags, function(i, tag) {
-            var a = link.cloneNode(false), row = li.cloneNode(false);
-
-            a.onclick = function(e) {
-                container.data('callback')(tag.uid);
-                return rcmail.hide_menu('tag-selector', e);
-            };
+            var a = link.cloneNode(false), row = li.cloneNode(false), tmp = span.cloneNode(false);
 
             // add tag name element
-            tmp = span.cloneNode(false);
             $(tmp).text(tag.name);
-            $(a).data('uid', tag.uid);
+            $(a).data('uid', tag.uid).attr('class', 'tag active ' + tag_class_name(tag));
             a.appendChild(tmp);
 
             row.appendChild(a);
@@ -756,7 +939,11 @@
 
         // temporarily show element to calculate its size
         container.css({left: '-1000px', top: '-1000px'})
-            .appendTo(document.body).show();
+            .appendTo(document.body).show()
+            .on('click', 'a.tag', function(e) {
+                container.data('callback')($(this).data('uid'));
+                return rcmail.hide_menu('tag-selector', e);
+            });
 
         // set max-height if the list is long
         if (rows.length > max_items)
@@ -799,7 +986,7 @@
 
         // we also hide the search input, if there's not many tags left
         if ($('a:visible', container).length < max_items) {
-            $('input', container).parent().hide();
+            $('input', container).parents('li').hide();
         }
     }
 }
@@ -809,40 +996,264 @@
 {
     $(tag_selector_element).remove();
     tag_selector_element = null;
+
+    // Elastic requires to destroy the menu, otherwise we end up with
+    // content element duplicates that are not connected with the menu
+    if (window.UI && window.UI.menu_destroy) {
+        window.UI.menu_destroy('tag-selector');
+    }
 }
 
 function tag_selector_search_element(container)
 {
     var title = rcmail.gettext('kolab_tags.tagsearchnew'),
-        placeholder = rcmail.gettext('kolab_tags.newtag');
-
-    var input = $('<input>').attr({'type': 'text', title: title, placeholder: placeholder})
-        .keyup(function(e) {
-            if (this.value) {
-                // execute action on Enter
-                if (e.which == 13) {
-                    container.data('callback')({name: this.value});
-                    rcmail.hide_menu('tag-selector', e);
-                    if ($('#markmessagemenu').is(':visible')) {
-                        rcmail.hide_menu('markmessagemenu', e);
+        placeholder = rcmail.gettext('kolab_tags.newtag'),
+        form = $('<span class="input-group"><span class="input-group-prepend"><i class="input-group-text icon search"></i></span></span>'),
+        input = $('<input>').attr({'type': 'text', title: title, placeholder: placeholder, 'class': 'form-control'})
+            .keyup(function(e) {
+                if (this.value) {
+                    // execute action on Enter
+                    if (e.which == 13) {
+                        container.data('callback')({name: this.value});
+                        rcmail.hide_menu('tag-selector', e);
+                        if ($('#markmessagemenu').is(':visible')) {
+                            rcmail.hide_menu('markmessagemenu', e);
+                        }
+                    }
+                    // search tags
+                    else {
+                        var search = this.value.toUpperCase();
+                        $('li:not(.search)', container).each(function() {
+                            var tag_name = $(this).text().toUpperCase();
+                            $(this)[tag_name.indexOf(search) >= 0 ? 'show' : 'hide']();
+                        });
                     }
                 }
-                // search tags
                 else {
-                    var search = this.value.toUpperCase();
-                    $('li:not(.search)', container).each(function() {
-                        var tag_name = $(this).text().toUpperCase();
-                        $(this)[tag_name.indexOf(search) >= 0 ? 'show' : 'hide']();
-                    });
+                    // reset search
+                    $('li', container).show();
                 }
+            });
+
+    return $('<li class="search">').append(form.append(input))
+        // prevents from closing the menu on click in the input/row
+        .on('mouseup click', function(e) { e.stopPropagation(); return false; });
+}
+
+function tag_class_name(tag)
+{
+    return 'kolab-tag-' + tag.uid.replace(/[^a-z0-9]/ig, '');
+}
+
+function kolab_tags_input(element, tags, readonly)
+{
+    var list,
+        tagline = $(element)[readonly ? 'addClass' : 'removeClass']('disabled').empty().show(),
+        source_callback = function(request, response) {
+            request = request.term.toUpperCase();
+            response($.map(rcmail.env.tags || [], function(v) {
+                if (request.length && v.name.toUpperCase().indexOf(request) > -1)
+                    return v.name;
+            }));
+        };
+
+    $.each(tags && tags.length ? tags : [''], function(i,val) {
+        $('<input>').attr({name: 'tags[]', tabindex: '0', 'class': 'tag'})
+            .val(val)
+            .appendTo(tagline);
+    });
+
+    if (!tags || !tags.length) {
+        $('<span>').addClass('placeholder')
+            .text(rcmail.gettext('kolab_tags.notags'))
+            .appendTo(tagline)
+            .click(function(e) { list.trigger('click'); });
+    }
+
+    $('input.tag', element).tagedit({
+        animSpeed: 100,
+        allowEdit: false,
+        allowAdd: !readonly,
+        allowDelete: !readonly,
+        checkNewEntriesCaseSensitive: false,
+        autocompleteOptions: { source: source_callback, minLength: 0, noCheck: true },
+        texts: { removeLinkTitle: rcmail.gettext('kolab_tags.untag') }
+    });
+
+    list = element.find('.tagedit-list');
+
+    list.addClass('form-control'); // Elastic
+
+    if (!readonly) {
+        list.on('click', function() { $('.placeholder', element).hide(); });
+    }
+
+    // Track changes on the list to style tag elements
+    if (window.MutationObserver) {
+        var observer = new MutationObserver(kolab_tags_input_update);
+        observer.observe(list[0], {childList: true});
+    }
+    else {
+        list.on('click keyup', kolab_tags_input_update);
+    }
+
+    kolab_tags_input_update({target: list});
+
+    return list;
+}
+
+function kolab_tags_input_update(e)
+{
+    var tags = {},
+        target = e.length && e[0].target ? e[0].target : e.target;
+
+    // first generate tags list indexed by name
+    $.each(rcmail.env.tags, function(i, tag) {
+        tags[tag.name] = tag;
+    });
+
+    $(target).find('li.tagedit-listelement-old:not([class*="tagbox"])').each(function() {
+        var text = $('span', this).text();
+
+        $(this).addClass('tagbox');
+
+        if (tags[text]) {
+            $(this).data('tag', tags[text].uid);
+            tag_set_color(this, tags[text]);
+        }
+    });
+}
+
+function kolab_tags_input_value(element)
+{
+    var tags = [];
+
+    $(element || '.tagedit-list').find('input').each(function(i, elem) {
+        if (elem.value)
+            tags.push(elem.value);
+    });
+
+    return tags;
+}
+
+function tag_draggable_helper()
+{
+    var draghelper = $('.tag-draghelper'),
+        tagid = $(this).data('tag'),
+        node = $(this).clone(),
+        tagbox = $('<span class="tagbox">');
+
+    if (!draghelper.length) {
+        draghelper = $('<div class="tag-draghelper"></div>');
+    }
+
+    $('span.count', node).remove();
+    tagbox.text(node.text()).appendTo(draghelper.html(''));
+    tag_set_color(tagbox, tag_find(tagid));
+
+    return draghelper[0];
+}
+
+function tag_draggable_start(event, ui)
+{
+    if (rcmail.gui_objects.noteslist) {
+        // register notes list to receive drop events
+        $('tr', rcmail.gui_objects.noteslist).droppable({
+            addClasses: false,
+            hoverClass: 'droptarget',
+            accept: tag_droppable_accept,
+            drop: tag_draggable_dropped
+        });
+
+        // allow to drop tags onto note edit form
+        $('body.task-notes .content.formcontainer,#notedetailstitle.boxtitle').droppable({
+            addClasses: false,
+            accept: function() { return $(this).is('.formcontainer,.boxtitle'); },
+            drop: function(event, ui) {
+                var tag = tag_find(ui.draggable.data('tag'));
+                $('#tagedit-input').val(tag.name).trigger('transformToTag');
+                $('.tagline .placeholder', rcmail.gui_objects.noteviewtitle).hide();
             }
-            else {
-                // reset search
-                $('li', container).show();
-            }
+        }).addClass('tag-droppable');
+    }
+    else if (rcmail.task == 'tasks' && rcmail.gui_objects.resultlist) {
+
+        $('div.taskhead', rcmail.gui_objects.resultlist).droppable({
+            addClasses: false,
+            hoverClass: 'droptarget',
+            accept: tag_droppable_accept,
+            drop: tag_draggable_dropped
         });
 
-    return $('<li class="search">').append(input)
-        // prevents from closing the menu on click in the input/row
-        .mouseup(function(e) { return false; });
+
+        // allow to drop tags onto task edit form
+        $('body.task-tasks .content.formcontainer').droppable({
+            addClasses: false,
+            accept: function() { return $(this).is('.formcontainer') && $('#taskedit').is(':visible'); },
+            drop: function(event, ui) {
+                var tag = tag_find(ui.draggable.data('tag'));
+                $('#tagedit-input').val(tag.name).trigger('transformToTag');
+            }
+        }).addClass('tag-droppable');
+    }
+}
+
+function tag_draggable_dropped(event, ui)
+{
+    var drop_id = tag_draggable_target_id(this),
+        tag = tag_find(ui.draggable.data('tag')),
+        list = $(this).parent();
+
+    rcmail.triggerEvent('kolab-tags-drop', {id: drop_id, tag: tag.name, list: list});
 }
+
+function tag_droppable_accept(draggable)
+{
+    if (rcmail.busy) {
+        return false;
+    }
+
+    var drop_id = tag_draggable_target_id(this),
+        tag = tag_find(draggable.data('tag')),
+        data = rcmail.triggerEvent('kolab-tags-drop-data', {id: drop_id});
+
+    // target already has this tag assigned
+    if (!data || !tag || (data.tags && $.inArray(tag.name, data.tags) >= 0)) {
+        return false;
+    }
+
+    return true;
+}
+
+function tag_draggable_target_id(elem)
+{
+    var id = $(elem).attr('id');
+
+    if (id) {
+        id = id.replace(/^rcmrow/, ''); // Notes
+    }
+    else {
+        id = $(elem).parent().attr('rel'); // Tasks
+    }
+
+    return id;
+}
+
+// Convert list of tag names into "blocks" and add to the specified element
+function kolab_tags_text_block(tags, element, del_btn)
+{
+    if (tags && tags.length) {
+        var items = [];
+
+        tags.sort();
+
+        $.each(tags, function(i,val) {
+            var tag = tag_find(val, 'name');
+            if (tag) {
+                items.push(tag_box_element(tag, del_btn));
+            }
+        });
+
+        $(element).append(items);
+    }
+};

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/kolab_tags.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/kolab_tags.php Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/lib/kolab_tags_engine.php -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/lib/kolab_tags_engine.php Changed

@@ -46,12 +46,7 @@
      */
     public function ui()
     {
-        // set templates of Files UI and widgets
-        if ($this->rc->task != 'mail') {
-            return;
-        }
-
-        if ($this->rc->action && !in_array($this->rc->action, array('show', 'preview'))) {
+        if ($this->rc->action && !in_array($this->rc->action, array('show', 'preview', 'dialog-ui'))) {
             return;
         }
 
@@ -62,7 +57,7 @@
         $this->rc->output->add_label('cancel', 'save');
         $this->plugin->add_label('tags', 'add', 'edit', 'delete', 'saving',
             'nameempty', 'nameexists', 'colorinvalid', 'untag', 'tagname',
-            'tagcolor', 'tagsearchnew', 'newtag');
+            'tagcolor', 'tagsearchnew', 'newtag', 'notags');
 
         $this->rc->output->add_handlers(array(
             'plugin.taglist' => array($this, 'taglist'),
@@ -71,11 +66,12 @@
         $ui = $this->rc->output->parse('kolab_tags.ui', false, false);
         $this->rc->output->add_footer($ui);
 
-        // load miniColors
+        // load miniColors and tagedit
         jqueryui::miniColors();
+        jqueryui::tagedit();
 
         // Modify search filter (and set selected tags)
-        if ($this->rc->action == 'show' || !$this->rc->action) {
+        if ($this->rc->task == 'mail' && ($this->rc->action == 'show' || !$this->rc->action)) {
             $this->search_filter_mods();
         }
     }
@@ -284,6 +280,18 @@
     }
 
     /**
+     * Refresh tags list
+     */
+    public function action_refresh()
+    {
+        $taglist = $this->backend->list_tags();
+        $taglist = array_map(array($this, 'parse_tag'), $taglist);
+
+        $this->rc->output->set_env('tags', $taglist);
+        $this->rc->output->command('plugin.kolab_tags', array('refresh' => 1));
+    }
+
+    /**
      * Template object building tags list/cloud
      */
     public function taglist($attrib)

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/localization/de_CH.inc Changed

@@ -7,12 +7,6 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Tags';
-$labels['add'] = 'Hinzufügen';
-$labels['edit'] = 'Bearbeiten';
-$labels['delete'] = 'Löschen';
-$labels['tagname'] = 'Name';
-$labels['tagcolor'] = 'Farbe';
-$labels['saving'] = 'Speichere...';
 $labels['unset'] = 'Alle abwählen';
 $labels['manage'] = 'Schlagworte verwalten...';
 $labels['tagactions'] = 'Schlagwort Aktion...';
@@ -20,9 +14,15 @@
 $labels['tagremove'] = 'Entferne Schlagwort..';
 $labels['untag'] = 'Entferne Schlagwort';
 $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.';

iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/localization/el.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/localization/en_US.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/localization/es_ES.inc Changed

@@ -6,9 +6,28 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
+$labels['tags'] = 'Etiquetas';
+$labels['unset'] = 'Desmarcar todos';
+$labels['manage'] = 'Gestionar tareas...';
+$labels['tagactions'] = 'Etiquetar acciones...';
+$labels['tagadd'] = 'Etiquetar como...';
+$labels['tagremove'] = 'Eliminar etiqueta...';
+$labels['untag'] = 'Eliminar etiqueta';
+$labels['tagremoveall'] = 'Eliminar todas las etiquetas';
 $labels['add'] = 'Añadir';
 $labels['edit'] = 'Editar';
 $labels['delete'] = 'Borrar';
 $labels['tagname'] = 'Nombre';
 $labels['tagcolor'] = 'Color';
+$labels['nameempty'] = 'El nombre de la etiqueta no puede estar vacío';
+$labels['nameexists'] = 'Marcado con un nombre específicado que ya existe';
+$labels['colorinvalid'] = 'Especificación del color inválida';
 $labels['saving'] = 'Guardando datos...';
+$labels['updatesuccess'] = 'Se han actualizado las etiquetas con éxito.';
+$labels['updateerror'] = 'Error al actualizar la información de las etiquetas';
+$labels['taggingsuccess'] = 'Se han asignado las etiquetas con éxito.';
+$labels['taggingerror'] = 'Error al asignar los datos.';
+$labels['untaggingsuccess'] = 'Se han eliminado las etiquetas con éxito.';
+$labels['untaggingerror'] = 'No se pudieron eliminar las asignaciones de etiquetas';
+$labels['newtag'] = 'Etiqueta nueva';
+$labels['tagsearchnew'] = 'Introduzca un texto para buscar o crear una etiqueta nueva';

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/localization/fr_FR.inc Changed

@@ -7,11 +7,11 @@
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
 $labels['tags'] = 'Étiquettes';
-$labels['unset'] = 'Tout déselectionner';
+$labels['unset'] = 'Tout désélectionner';
 $labels['manage'] = 'Gestion des étiquettes...';
 $labels['tagactions'] = 'Actions étiquette...';
-$labels['tagadd'] = 'Étiquette comme...';
-$labels['tagremove'] = 'Étiqueter comme...';
+$labels['tagadd'] = 'Étiqueter en tant que...';
+$labels['tagremove'] = 'Supprimer l\'étiquette...';
 $labels['untag'] = 'Supprimer l\'étiquette';
 $labels['tagremoveall'] = 'Supprimer toutes les étiquettes';
 $labels['add'] = 'Ajouter';
@@ -29,3 +29,5 @@
 $labels['taggingerror'] = 'Impossible d\'affecter les étiquettes.';
 $labels['untaggingsuccess'] = 'Étiquette(s) supprimée(s) avec succès.';
 $labels['untaggingerror'] = 'Impossible de supprimer les affectations.';
+$labels['newtag'] = 'Nouvelle balise';
+$labels['tagsearchnew'] = 'Entrez votre texte afin de chercher ou créez une nouvelle balise';

iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/localization/lv.inc Added

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/localization/nl_NL.inc Changed

@@ -6,10 +6,28 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/kolab_tags/
  */
-$labels['tags'] = 'Labels';
+$labels['tags'] = 'Tags';
+$labels['unset'] = 'Alle selecties opheffen';
+$labels['manage'] = 'Tags beheren...';
+$labels['tagactions'] = 'Tagacties...';
+$labels['tagadd'] = 'Taggen als...';
+$labels['tagremove'] = 'Tag verwijderen...';
+$labels['untag'] = 'Tag verwijderen';
+$labels['tagremoveall'] = 'Alle tags verwijderen';
 $labels['add'] = 'Toevoegen';
-$labels['edit'] = 'Wijzig';
+$labels['edit'] = 'Bewerken';
 $labels['delete'] = 'Verwijderen';
 $labels['tagname'] = 'Naam';
 $labels['tagcolor'] = 'Kleur';
-$labels['saving'] = 'Data wordt opgeslagen...';
+$labels['nameempty'] = 'Tagnaam mag niet leeg zijn!';
+$labels['nameexists'] = 'Tag met opgegeven naam bestaat al!';
+$labels['colorinvalid'] = 'Ongeldige kleurspecificatie!';
+$labels['saving'] = 'Gegevens opslaan...';
+$labels['updatesuccess'] = 'Tags zijn met succes bijgewerkt.';
+$labels['updateerror'] = 'Bijwerken van taginformatie is mislukt.';
+$labels['taggingsuccess'] = 'Tags zijn met succes toegewezen.';
+$labels['taggingerror'] = 'Toewijzen van tags is mislukt.';
+$labels['untaggingsuccess'] = 'Tag(s) met succes verwijderd.';
+$labels['untaggingerror'] = 'Verwijderen van toegewezen tags is mislukt.';
+$labels['newtag'] = 'Nieuwe tag';
+$labels['tagsearchnew'] = 'Voer tekst in die u wilt zoeken of maak een nieuwe tag';

iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/skins/elastic/templates/ui.html Added

@@ -0,0 +1,67 @@
+<div id="tagcloud" style="display:none">
+	<h2 class="voice"><roundcube:label name="kolab_tags.tags" id="taglist" /></h2>
+	<div class="scroller withfooter">
+		<roundcube:object name="plugin.taglist" id="taglist" class="listing" />
+	</div>
+</div>
+
+<div id="tagsmenu" class="popupmenu" aria-hidden="true">
+	<ul class="toolbarmenu 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" />
+		<roundcube:container name="tagoptions" id="tagoptionsmenu" />
+	</ul>
+</div>
+
+<div id="tagmessagemenu" class="popupmenu" aria-hidden="true">
+	<ul class="toolbarmenu 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" />
+		<roundcube:button type="link-menuitem" command="tag-remove-all" label="kolab_tags.tagremoveall" classAct="tag remove all active" class="tag remove all disabled" />
+	</ul>
+</div>
+
+<script>
+
+$(document).ready(function(e) {
+    // put tags cloud under folders list
+    var tagcloud = $('#tagcloud').detach();
+    $('#folderlist-content,#notebooks-content,#tasklists-content').children('ul:first').after(tagcloud.show());
+
+    // add tag message menu positions to Mark menu
+    var menu = $('#tagmessagemenu li').detach();
+    $('#markmessage-menu ul').append(menu);
+
+    // add tags management menu positions to folder actions menu
+    menu = $('#tagsmenu li').detach();
+    $('#mailboxoptions-menu,#notebookactions-menu,#tasklistactions-menu').find('ul').append(menu);
+
+    // Apply tags colors in Elastic-way
+    rcmail.addEventListener('kolab-tags-update', function() {
+        var style = '';
+
+        $.each(rcmail.env.tags || {}, function() {
+            if (this.color) {
+                var uid = this.uid.replace(/[^a-z0-9]/ig, '');
+                style += '.kolab-tag-' + uid + '::before {color: ' + this.color + ' !important}\n';
+            }
+        });
+
+        $('#kolab-tags-style').remove();
+
+        if (style) {
+            $('<style>').attr('id', 'kolab-tags-style').text(style).appendTo('head');
+        }
+    });
+
+    // Ignore tags coloring on lists, handled above, use default method for tagboxes only
+    rcmail.addEventListener('kolab-tag-color', function(prop) {
+        if ($(prop.obj).is('li:not(.tagedit-listelement)')) {
+            return false;
+        }
+    });
+});
+
+</script>

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/skins/larry/style.css -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/skins/larry/style.css Changed

@@ -70,6 +70,7 @@
 }
 
 .tag-draghelper .tag .count,
+#taglist li .count:empty,
 #taglist li.inactive .count {
 	display: none;
 }
@@ -87,9 +88,10 @@
 	margin-left: 10px;
 }
 
-#tagsform div.buttons input {
+#tagsform div.buttons button {
 	display: block;
 	width: 80px;
+	margin-bottom: 5px;
 }
 
 #tagsform select {
@@ -97,6 +99,10 @@
 	float: left;
 }
 
+#tageditform div.col-sm-10 {
+	display: inline-block;
+}
+
 #tageditform input {
 	margin-bottom: 5px;
 }
@@ -133,3 +139,86 @@
 #tag-selector li.search input {
 	width: 120px;
 }
+
+.tagline {
+	color: #999;
+	font-weight: normal;
+	font-size: 0.9em;
+	position: relative;
+	cursor: text;
+	margin: 4px 0 0 0;
+	min-height: 31px;
+}
+
+.tagline.disabled {
+	margin-top: 0;
+}
+
+.tagline .tagedit-list {
+	min-height: 31px;
+}
+
+.tagline.disabled .tagedit-list {
+	outline: none;
+	padding-left: 0;
+	border: 0;
+	min-height: 31px;
+	background: rgba(255,255,255,0.01);
+	-webkit-box-shadow: none;
+	   -moz-box-shadow: none;
+	     -o-box-shadow: none;
+	        box-shadow: none;
+}
+
+.tagline .placeholder {
+	position: absolute;
+	top: 6px;
+	left: 6px;
+	z-index: 2;
+}
+
+.tagline.disabled .placeholder {
+	left: 0;
+}
+
+.tagedit-list {
+	position: relative;
+	z-index: 1;
+	min-height: 32px;
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	    -ms-box-sizing: border-box;
+	        box-sizing: border-box;
+}
+
+.tagedit-list #tagedit-input {
+	background: none;
+}
+
+.tag-draghelper {
+	z-index: 1000;
+}
+
+.tagedit span.tag-element,
+.tagedit-list li.tagedit-listelement-old {
+	background: #ddeef5 !important;
+	border: 0 !important;
+	padding: 2px 20px 0 6px !important;
+	line-height: 1.5 !important;
+	position: relative !important;
+}
+
+.tagedit-list li.tagedit-listelement-old a.tagedit-close,
+.tagedit-list li.tagedit-listelement-old a.tagedit-break,
+.tagedit-list li.tagedit-listelement-old a.tagedit-delete,
+.tagedit-list li.tagedit-listelement-old a.tagedit-save {
+	position: absolute !important;
+	top: 1px !important;
+	right: 0;
+	background: transparent !important;
+	text-indent: initial !important;
+}
+
+.tag-droppable.ui-droppable-hover {
+	background-color: #e8e798;
+}
\ No newline at end of file

iRony-0.4.0.tar.gz/lib/plugins/kolab_tags/skins/larry/templates/ui.html -> iRony-0.4.1.tar.gz/lib/plugins/kolab_tags/skins/larry/templates/ui.html Changed

@@ -20,22 +20,40 @@
 <div id="tagmessagemenu" class="popupmenu" aria-hidden="true">
 	<ul class="toolbarmenu iconized">
 		<li class="separator"><label><roundcube:label name="kolab_tags.tags" /></label></li>
-		<li role="menuitem"><roundcube:button command="tag-add" label="kolab_tags.tagadd" classAct="icon active" class="icon" innerclass="icon tagadd folder-selector-link" /></li>
-		<li role="menuitem"><roundcube:button command="tag-remove" label="kolab_tags.tagremove" classAct="icon active" class="icon" innerclass="icon tagremove folder-selector-link" /></li>
-		<li role="menuitem"><roundcube:button command="tag-remove-all" label="kolab_tags.tagremoveall" classAct="icon active" class="icon" innerclass="icon tagremoveall" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="tag-add" label="kolab_tags.tagadd" classAct="icon active" class="icon" innerclass="icon tagadd folder-selector-link" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="tag-remove" label="kolab_tags.tagremove" classAct="icon active" class="icon" innerclass="icon tagremove folder-selector-link" /></li>
+		<li role="menuitem"><roundcube:button type="link" command="tag-remove-all" label="kolab_tags.tagremoveall" classAct="icon active" class="icon" innerclass="icon tagremoveall" /></li>
 	</ul>
 </div>
 
-
 <script type="text/javascript">
 
 $(document).ready(function(e) {
     // put tags cloud under folders list
-    var tagcloud = $('#tagcloud').detach();
-    $('#mailview-left').append(tagcloud.show());
-
-    new rcube_splitter({ id:'mailtagsplitter', p1:'#mailboxcontainer', p2:'#tagcloud',
-        orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
+    var containers, tagcloud = $('#tagcloud').detach();
+
+    if (rcmail.env.task == 'mail')
+        containers = {
+            sidebar: '#mailview-left',
+            list: '#mailboxcontainer'
+        };
+    else if (rcmail.env.task == 'notes')
+        containers = {
+            sidebar: '#sidebar',
+            list: '#notebooksbox'
+        };
+    else if (rcmail.env.task == 'tasks')
+        containers = {
+            sidebar: '#sidebar',
+            list: '#tasklistsbox'
+        };
+
+    if (containers) {
+        $(containers.sidebar).append(tagcloud.show());
+
+        new rcube_splitter({ id: rcmail.task + 'tagsplitter', p1:containers.list, p2:'#tagcloud',
+            orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
+    }
 
     // add tag message menu positions to Mark menu
     var menu = $('#tagmessagemenu li').detach();

iRony-0.4.0.tar.gz/lib/plugins/ldap_authentication/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/ldap_authentication/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_itip.php -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_itip.php Changed

@@ -44,7 +44,6 @@
             array('identity' => $this->rc->user->list_emails(true)));
         $this->sender = $hook['identity'];
 
-        $this->plugin->add_hook('message_before_send', array($this, 'before_send_hook'));
         $this->plugin->add_hook('smtp_connect', array($this, 'smtp_connect_hook'));
     }
 
@@ -95,8 +94,9 @@
      */
     public function send_itip_message($event, $method, $recipient, $subject, $bodytext, $message = null, $rsvp = true)
     {
-        if (!$this->sender['name'])
+        if (!$this->sender['name']) {
             $this->sender['name'] = $this->sender['email'];
+        }
 
         if (!$message) {
             libcalendaring::identify_recurrence_instance($event);
@@ -111,7 +111,7 @@
             'name' => $subject,
             'vars' => array(
                 'title' => $event['title'],
-                'name' => $this->sender['name']
+                'name' => $this->sender['name'],
             )
         ));
 
@@ -134,20 +134,27 @@
         $mailbody = $this->gettext(array(
             'name' => $bodytext,
             'vars' => array(
-                'title' => $event['title'],
-                'date' => $this->lib->event_date_text($event, true) . $recurrence_info,
-                'attendees' => join(",\n ", $attendees_list),
-                'sender' => $this->sender['name'],
-                'organizer' => $this->sender['name'],
+                'title'       => $event['title'],
+                'date'        => $this->lib->event_date_text($event, true) . $recurrence_info,
+                'attendees'   => join(",\n ", $attendees_list),
+                'sender'      => $this->sender['name'],
+                'organizer'   => $this->sender['name'],
+                'description' => $event['description'],
             )
         ));
 
+        // remove redundant empty lines (e.g. when an event description is empty)
+        $mailbody = preg_replace('/\n{3,}/', "\n\n", $mailbody);
+
         // if (!empty($event['comment'])) {
         //     $mailbody .= "\n\n" . $this->gettext('itipsendercomment') . $event['comment'];
         // }
 
         // append links for direct invitation replies
-        if ($method == 'REQUEST' && $rsvp && ($token = $this->store_invitation($event, $recipient['email']))) {
+        if ($method == 'REQUEST' && $rsvp
+            && $this->rc->config->get('calendar_itip_smtp_server')
+            && ($token = $this->store_invitation($event, $recipient['email']))
+        ) {
             $mailbody .= "\n\n" . $this->gettext(array(
                 'name' => 'invitationattendlinks',
                 'vars' => array('url' => $this->plugin->get_url(array('action' => 'attend', 't' => $token))),
@@ -173,20 +180,6 @@
     }
 
     /**
-     * Plugin hook triggered by rcube::deliver_message() before delivering a message.
-     * Here we can set the 'smtp_server' config option to '' in order to use
-     * PHP's mail() function for unauthenticated email sending.
-     */
-    public function before_send_hook($p)
-    {
-        if ($this->itip_send && !$this->rc->user->ID && $this->rc->config->get('calendar_itip_smtp_server', null) === '') {
-            $this->rc->config->set('smtp_server', '');
-        }
-
-        return $p;
-    }
-
-    /**
      * Plugin hook to alter SMTP authentication.
      * This is used if iTip messages are to be sent from an unauthenticated session
      */
@@ -199,7 +192,7 @@
             }
         }
 
-      return $p;
+        return $p;
     }
 
     /**
@@ -372,122 +365,211 @@
      */
     public function get_itip_status($event, $existing = null)
     {
-      $action = $event['rsvp'] ? 'rsvp' : '';
-      $status = $event['fallback'];
-      $latest = $resheduled = false;
-      $html   = '';
+        $action = $event['rsvp'] ? 'rsvp' : '';
+        $status = $event['fallback'];
+        $latest = $rescheduled = false;
+        $html   = '';
 
-      if (is_numeric($event['changed']))
-        $event['changed'] = new DateTime('@'.$event['changed']);
+        if (is_numeric($event['changed'])) {
+            $event['changed'] = new DateTime('@'.$event['changed']);
+        }
 
-      // check if the given itip object matches the last state
-      if ($existing) {
-        $latest = (isset($event['sequence']) && intval($existing['sequence']) == intval($event['sequence'])) ||
+        // check if the given itip object matches the last state
+        if ($existing) {
+            $latest = (isset($event['sequence']) && intval($existing['sequence']) == intval($event['sequence'])) ||
                   (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] >= $event['changed']);
-      }
+        }
 
-      // determine action for REQUEST
-      if ($event['method'] == 'REQUEST') {
-        $html = html::div('rsvp-status', $this->gettext('acceptinvitation'));
+        // determine action for REQUEST
+        if ($event['method'] == 'REQUEST') {
+            $html = html::div('rsvp-status', $this->gettext('acceptinvitation'));
 
-        if ($existing) {
-          $rsvp = $event['rsvp'];
-          $emails = $this->lib->get_user_emails();
-          foreach ($existing['attendees'] as $attendee) {
-            if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
-              $status = strtoupper($attendee['status']);
-              break;
+            if ($existing) {
+                $rsvp   = $event['rsvp'];
+                $emails = $this->lib->get_user_emails();
+
+                foreach ($existing['attendees'] as $attendee) {
+                    if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+                        $status = strtoupper($attendee['status']);
+                        break;
+                    }
+                }
+
+                // Detect re-sheduling
+                if (!$latest) {
+                    // FIXME: This is probably to simplistic, or maybe we should just check
+                    //        attendee's RSVP flag in the new event?
+                    $rescheduled = $existing['start'] != $event['start'] || $existing['end'] > $event['end'];
+                }
+            }
+            else {
+                $rsvp = $event['rsvp'] && $this->rc->config->get('calendar_allow_itip_uninvited', true);
             }
-          }
 
-          // Detect re-sheduling
-          if (!$latest) {
-            // FIXME: This is probably to simplistic, or maybe we should just check
-            //        attendee's RSVP flag in the new event?
-            $resheduled = $existing['start'] != $event['start'] || $existing['end'] > $event['end'];
-          }
-        }
-        else {
-          $rsvp = $event['rsvp'] && $this->rc->config->get('calendar_allow_itip_uninvited', true);
-        }
+            $status_lc = strtolower($status);
 
-        $status_lc = strtolower($status);
+            if ($status_lc == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
+                $html = html::div('rsvp-status', $this->gettext('notanattendee'));
+                $action = 'import';
+            }
+            else if (in_array($status_lc, $this->rsvp_status)) {
+                $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
 
-        if ($status_lc == 'unknown' && !$this->rc->config->get('calendar_allow_itip_uninvited', true)) {
-          $html = html::div('rsvp-status', $this->gettext('notanattendee'));
-          $action = 'import';
-        }
-        else if (in_array($status_lc, $this->rsvp_status)) {
-          $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
+                if ($existing && ($existing['sequence'] > $event['sequence']
+                    || (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] > $event['changed']))
+                ) {
+                    $action = '';  // nothing to do here, outdated invitation
+                    if ($status_lc == 'needs-action') {
+                        $status_text = $this->gettext('outdatedinvitation');
+                    }
+                }
+                else if (!$existing && !$rsvp) {
+                    $action = 'import';
+                }
+                else if ($rescheduled) {
+                    $action = 'rsvp';
+                }
+                else if ($status_lc != 'needs-action') {
+                    // check if there are any changes
+                    if ($latest) {
+                        $diff   = $this->get_itip_diff($event, $existing);
+                        $latest = empty($diff);
+                    }
 
-          if ($existing && ($existing['sequence'] > $event['sequence'] || (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] > $event['changed']))) {
-            $action = '';  // nothing to do here, outdated invitation
-            if ($status_lc == 'needs-action')
-              $status_text = $this->gettext('outdatedinvitation');
-          }
-          else if (!$existing && !$rsvp) {
-            $action = 'import';
-          }
-          else if ($resheduled) {
-            $action = 'rsvp';
-          }
-          else if ($status_lc != 'needs-action') {
-            $action = !$latest ? 'update' : '';
-          }
+                    $action = !$latest ? 'update' : '';
+                }
 
-          $html = html::div('rsvp-status ' . $status_lc, $status_text);
-        }
-      }
-      // determine action for REPLY
-      else if ($event['method'] == 'REPLY') {
-        // check whether the sender already is an attendee
-        if ($existing) {
-          $action = $this->rc->config->get('calendar_allow_itip_uninvited', true) ? 'accept' : '';
-          $listed = false;
-          foreach ($existing['attendees'] as $attendee) {
-            if ($attendee['role'] != 'ORGANIZER' && strcasecmp($attendee['email'], $event['attendee']) == 0) {
-              $status_lc = strtolower($status);
-              if (in_array($status_lc, $this->rsvp_status)) {
-                $html = html::div('rsvp-status ' . $status_lc, $this->gettext(array(
-                    'name' => 'attendee' . $status_lc,
-                    'vars' => array(
-                        'delegatedto' => rcube::Q($event['delegated-to'] ?: ($attendee['delegated-to'] ?: '?')),
-                    )
-                )));
-              }
-              $action = $attendee['status'] == $status || !$latest ? '' : 'update';
-              $listed = true;
-              break;
+                $html = html::div('rsvp-status ' . $status_lc, $status_text);
             }
-          }
+        }
+        // determine action for REPLY
+        else if ($event['method'] == 'REPLY') {
+            // check whether the sender already is an attendee
+            if ($existing) {
+                // Relax checking if that is a reply to the latest version of the event
+                // We accept versions with older SEQUENCE but no significant changes (Bifrost#T78144)
+                if (!$latest) {
+                    $num = $got = 0;
+                    foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+                        if (isset($existing[$key])) {
+                            if ($key == 'allday') {
+                                $event[$key] = $event[$key] == 'true';
+                            }
+                            $value = $existing[$key] instanceof DateTime ? $existing[$key]->format('c') : $existing[$key];
+                            $num++;
+                            $got += intval($value == $event[$key]);
+                        }
+                    }
 
-          if (!$listed) {
-            $html = html::div('rsvp-status', $this->gettext('itipnewattendee'));
-          }
+                    $latest = $num === $got;
+                }
+
+                $action = $this->rc->config->get('calendar_allow_itip_uninvited', true) ? 'accept' : '';
+                $listed = false;
+
+                foreach ($existing['attendees'] as $attendee) {
+                    if ($attendee['role'] != 'ORGANIZER' && strcasecmp($attendee['email'], $event['attendee']) == 0) {
+                        $status_lc = strtolower($status);
+                        if (in_array($status_lc, $this->rsvp_status)) {
+                            $html = html::div('rsvp-status ' . $status_lc, $this->gettext(array(
+                                'name' => 'attendee' . $status_lc,
+                                'vars' => array(
+                                    'delegatedto' => rcube::Q($event['delegated-to'] ?: ($attendee['delegated-to'] ?: '?')),
+                                )
+                            )));
+                        }
+
+                        $action = $attendee['status'] == $status || !$latest ? '' : 'update';
+                        $listed = true;
+                        break;
+                    }
+                }
+
+                if (!$listed) {
+                    $html = html::div('rsvp-status', $this->gettext('itipnewattendee'));
+                }
+            }
+            else {
+                $html   = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
+                $action = '';
+            }
         }
-        else {
-          $html = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
-          $action = '';
+        else if ($event['method'] == 'CANCEL') {
+            if (!$existing) {
+                $html   = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
+                $action = '';
+            }
         }
-      }
-      else if ($event['method'] == 'CANCEL') {
-        if (!$existing) {
-          $html = html::div('rsvp-status hint', $this->gettext('itipobjectnotfound'));
-          $action = '';
+
+        return array(
+            'uid'        => $event['uid'],
+            'id'         => asciiwords($event['uid'], true),
+            'existing'   => $existing ? true : false,
+            'saved'      => $existing ? true : false,
+            'latest'     => $latest,
+            'status'     => $status,
+            'action'     => $action,
+            'rescheduled' => $rescheduled,
+            'html'       => $html,
+        );
+    }
+
+    protected function get_itip_diff($event, $existing)
+    {
+        if (empty($event) || empty($existing) || empty($event['message_uid'])) {
+            return;
         }
-      }
 
-      return array(
-          'uid'        => $event['uid'],
-          'id'         => asciiwords($event['uid'], true),
-          'existing'   => $existing ? true : false,
-          'saved'      => $existing ? true : false,
-          'latest'     => $latest,
-          'status'     => $status,
-          'action'     => $action,
-          'resheduled' => $resheduled,
-          'html'       => $html,
-      );
+        $itip = $this->lib->mail_get_itip_object($event['mbox'], $event['message_uid'], $event['mime_id'],
+            $event['task'] == 'calendar' ? 'event' : 'task');
+
+        if ($itip) {
+            // List of properties that could change without SEQUENCE bump
+            $attrs = array('description', 'title', 'location', 'url');
+            $diff  = array();
+
+            foreach ($attrs as $attr) {
+                if (isset($itip[$attr]) && $itip[$attr] != $existing[$attr]) {
+                    $diff[$attr] = array(
+                        'new' => $itip[$attr],
+                        'old' => $existing[$attr]
+                    );
+                }
+            }
+
+            $status             = array();
+            $itip_attendees     = array();
+            $existing_attendees = array();
+            $emails             = $this->lib->get_user_emails();
+
+            // Compare list of attendees (ignoring current user status)
+            foreach ((array) $existing['attendees'] as $idx => $attendee) {
+                if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+                    $status[strtolower($attendee['email'])] = $attendee['status'];
+                }
+                if ($attendee['role'] == 'ORGANIZER') {
+                    $attendee['status'] = 'ACCEPTED'; // sometimes is not set for exceptions
+                    $existing['attendees'][$idx] = $attendee;
+                }
+                $existing_attendees[] = $attendee['email'].$attendee['name'];
+            }
+            foreach ((array) $itip['attendees'] as $idx => $attendee) {
+                if ($attendee['email'] && ($_status = $status[strtolower($attendee['email'])])) {
+                    $attendee['status'] = $_status;
+                    $itip['attendees'][$idx] = $attendee;
+                }
+                $itip_attendees[] = $attendee['email'].$attendee['name'];
+            }
+
+            if ($itip_attendees != $existing_attendees) {
+                $diff['attendees'] = array(
+                    'new' => $itip['attendees'],
+                    'old' => $existing['attendees']
+                );
+            }
+
+            return $diff;
+        }
     }
 
     /**
@@ -508,6 +590,7 @@
             'sequence' => intval($event['sequence']),
             'method'   => $method,
             'task'     => $task,
+            'mime_id'  => $mime_id,
         );
 
         // create buttons to be activated from async request checking existence of this event in local calendars
@@ -530,6 +613,20 @@
                 }
             }
 
+            // It may happen that sender's address is different in From: and the attached iTip
+            // In such case use the ATTENDEE entry with the address from From: header
+            if (empty($metadata['attendee']) && !empty($event['_sender'])) {
+                // remove the organizer
+                $itip_attendees = array_filter($event['attendees'], function($item) { return $item['role'] != 'ORGANIZER'; });
+
+                // there must be only one attendee
+                if (is_array($itip_attendees) && count($itip_attendees) == 1) {
+                    $event_attendee       = $itip_attendees[key($itip_attendees)];
+                    $metadata['attendee'] = $event['_sender'];
+                    $rsvp_status          = strtoupper($event_attendee['status']);
+                }
+            }
+
             // 1. update the attendee status on our copy
             $update_button = html::tag('input', array(
                 'type' => 'button',
@@ -554,6 +651,13 @@
 
             $buttons[] = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
             $buttons[] = html::div(array('id' => 'accept-'.$dom_id, 'style' => 'display:none'), $accept_buttons);
+
+            // For replies we need more metadata
+            foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+                if (isset($event[$key])) {
+                    $metadata[$key] = $event[$key] instanceof DateTime ? $event[$key]->format('c') : $event[$key];
+                }
+            }
         }
         // when receiving iTip REQUEST messages:
         else if ($method == 'REQUEST') {
@@ -720,7 +824,7 @@
 
         return html::div($attrib,
             html::div('label', $this->gettext('acceptinvitation')) .
-            html::div('rsvp-buttons',
+            html::div('rsvp-buttons itip-buttons',
                 $buttons .
                 html::div('itip-reply-controls', $this->itip_rsvp_options_ui($attrib['id']))
             )
@@ -740,9 +844,15 @@
         }
         // add checkbox to suppress itip reply message
         else if ($itip_sending >= 2) {
+            $toggle_attrib = array(
+                'type'     => 'checkbox',
+                'id'       => 'noreply-'.$dom_id,
+                'value'    => 1,
+                'disabled' => $disable,
+                'checked'  => ($itip_sending & 1) == 0,
+            );
             $rsvp_additions = html::label(array('class' => 'noreply-toggle'),
-                html::tag('input', array('type' => 'checkbox', 'id' => 'noreply-'.$dom_id, 'value' => 1, 'disabled' => $disable, 'checked' => ($itip_sending & 1) == 0))
-                . ' ' . $this->gettext('itipsuppressreply')
+                html::tag('input', $toggle_attrib) . ' ' . $this->gettext('itipsuppressreply')
             );
         }
 
@@ -756,7 +866,8 @@
             'id'    => 'reply-comment-' . $dom_id,
             'name'  => '_comment',
             'cols'  => 40,
-            'rows'  => 6,
+            'rows'  => 4,
+            'class' => 'form-control',
             'style' => 'display:none',
             'placeholder' => $this->gettext('itipcomment')
         );
@@ -791,11 +902,11 @@
             $table->add('label', $this->gettext('recurring'));
             $table->add('recurrence', $this->lib->recurrence_text($event['recurrence']));
         }
-        if ($event['location']) {
+        if ($event['location'] && trim($event['location'])) {
             $table->add('label', $this->gettext('location'));
             $table->add('location', rcube::Q($event['location']));
         }
-        if ($event['sensitivity'] && $event['sensitivity'] != 'public') {
+        if ($event['sensitivity'] && !preg_match('/^(x-|public$)/i', $event['sensitivity'])) {
             $table->add('label', $this->gettext('sensitivity'));
             $table->add('sensitivity', ucfirst($this->gettext($event['sensitivity'])) . '!');
         }
@@ -803,7 +914,7 @@
             $table->add('label', $this->gettext('status'));
             $table->add('status', $this->gettext('status-' . strtolower($event['status'])));
         }
-        if ($event['comment']) {
+        if ($event['comment'] && trim($event['comment'])) {
             $table->add('label', $this->gettext('comment'));
             $table->add('location', rcube::Q($event['comment']));
         }

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_recurrence.php -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/lib/libcalendaring_recurrence.php Changed

@@ -152,4 +152,83 @@
         return $last;
     }
 
+    /**
+     * Find date/time of the first occurrence (excluding start date)
+     */
+    public function first_occurrence()
+    {
+        $start      = clone $this->start;
+        $orig_start = clone $this->start;
+        $r          = $this->recurrence;
+        $interval   = intval($r['INTERVAL'] ?: 1);
+
+        switch ($this->recurrence['FREQ']) {
+        case 'WEEKLY':
+            if (empty($this->recurrence['BYDAY'])) {
+                return $start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}W"));
+            break;
+
+        case 'MONTHLY':
+            if (empty($this->recurrence['BYDAY']) && empty($this->recurrence['BYMONTHDAY'])) {
+                return $start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}M"));
+            break;
+
+        case 'YEARLY':
+            if (empty($this->recurrence['BYDAY']) && empty($this->recurrence['BYMONTH'])) {
+                return $start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}Y"));
+            break;
+
+        default:
+            return $start;
+        }
+
+        $r = $this->recurrence;
+        $r['INTERVAL'] = $interval;
+        if ($r['COUNT']) {
+            // Increase count so we do not stop the loop to early
+            $r['COUNT'] += 100;
+        }
+
+        // Create recurrence that starts in the past
+        $recurrence = new self($this->lib);
+        $recurrence->init($r, $start);
+
+        // find the first occurrence
+        $found = false;
+        while ($next = $recurrence->next()) {
+            $start = $next;
+            if ($next >= $orig_start) {
+                $found = true;
+                break;
+            }
+        }
+
+        if (!$found) {
+            rcube::raise_error(array(
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => sprintf("Failed to find a first occurrence. Start: %s, Recurrence: %s",
+                    $orig_start->format(DateTime::ISO8601), json_encode($r)),
+            ), true);
+
+            return null;
+        }
+
+        if ($start Instanceof Horde_Date) {
+            $start = $start->toDateTime();
+        }
+
+        $start->_dateonly = $this->dateonly;
+
+        return $start;
+    }
 }

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/libcalendaring.js -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/libcalendaring.js Changed

@@ -94,6 +94,59 @@
       return fromto;
     };
 
+    /**
+     * Checks if the event/task has 'real' attendees, excluding the current user
+     */
+    this.has_attendees = function(event)
+    {
+        return !!(event.attendees && event.attendees.length && (event.attendees.length > 1 || String(event.attendees[0].email).toLowerCase() != settings.identity.email));
+    };
+
+    /**
+     * Check if the current user is an attendee of this event/task
+     */
+    this.is_attendee = function(event, role, email)
+    {
+        var i, emails = email ? ';' + email.toLowerCase() : settings.identity.emails;
+
+        for (i=0; event.attendees && i < event.attendees.length; i++) {
+            if ((!role || event.attendees[i].role == role) && event.attendees[i].email && emails.indexOf(';'+event.attendees[i].email.toLowerCase()) >= 0) {
+                return event.attendees[i];
+            }
+        }
+
+        return false;
+    };
+
+    /**
+     * Checks if the current user is the organizer of the event/task
+     */
+    this.is_organizer = function(event, email)
+    {
+        return this.is_attendee(event, 'ORGANIZER', email) || !event.id;
+    };
+
+    /**
+     * Check permissions on the given folder object
+     */
+    this.has_permission = function(folder, perm)
+    {
+        // multiple chars means "either of"
+        if (String(perm).length > 1) {
+            for (var i=0; i < perm.length; i++) {
+                if (this.has_permission(folder, perm[i])) {
+                    return true;
+                }
+            }
+        }
+
+        if (folder.rights && String(folder.rights).indexOf(perm) >= 0) {
+            return true;
+        }
+
+        return (perm == 'i' && folder.editable) || (perm == 'v' && folder.editable);
+    };
+
 
     /**
      * From time and date strings to a real date object
@@ -338,19 +391,15 @@
         });
         $(prefix+' select.edit-alarm-offset').change(function(){
             var val = $(this).val(), parent = $(this).parent();
-            parent.find('.edit-alarm-date, .edit-alarm-time')[val == '@' ? 'show' : 'hide']();
+            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-related')[val == '@' ? 'hide' : 'show']();
+            parent.find('.edit-alarm-related')[val === '@' ? 'hide' : 'show']();
         });
 
         $(prefix+' .edit-alarm-date').removeClass('hasDatepicker').removeAttr('id').datepicker(datepicker_settings);
 
-        $(prefix).on('click', 'a.delete-alarm', function(e){
-            if ($(this).closest('.edit-alarm-item').siblings().length > 0) {
-                $(this).closest('.edit-alarm-item').remove();
-            }
-            return false;
-        });
+        if (rcmail.env.action != 'print')
+            this.init_time_autocomplete($(prefix+' .edit-alarm-time')[0], {});
 
         // set a unique id attribute and set label reference accordingly
         if ((index || 0) > 0 && dom_id) {
@@ -359,16 +408,32 @@
             $(prefix+' label:first').attr('for', dom_id);
         }
 
-        $(prefix).on('click', 'a.add-alarm', function(e){
-            var i = $(this).closest('.edit-alarm-item').siblings().length + 1;
-            var item = $(this).closest('.edit-alarm-item').clone(false)
-              .removeClass('first')
-              .appendTo(prefix);
+        // Elastic
+        if (window.UI && UI.pretty_select) {
+          $(prefix + ' select').each(function() { UI.pretty_select(this); });
+        }
 
-              me.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
-              $('select.edit-alarm-type, select.edit-alarm-offset', item).change();
-              return false;
-        });
+        if (index)
+            return;
+
+        $(prefix)
+            .on('click', 'a.delete-alarm', function(e){
+                if ($(this).closest('.edit-alarm-item').siblings().length > 0) {
+                    $(this).closest('.edit-alarm-item').remove();
+                }
+                return false;
+            })
+            .on('click', 'a.add-alarm', function(e) {
+                var orig = $(this).closest('.edit-alarm-item'),
+                    i = orig.siblings().length + 1,
+                    item = orig.clone(false)
+                      .removeClass('first')
+                      .appendTo(orig.parent());
+
+                  me.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
+                  $('select.edit-alarm-type, select.edit-alarm-offset', item).change();
+                  return false;
+            });
     }
 
     this.set_alarms_edit = function(prefix, valarms)
@@ -378,15 +443,15 @@
         var i, alarm, domnode, val, offset;
         for (i=0; i < valarms.length; i++) {
           alarm = valarms[i];
+
           if (!alarm.action)
               alarm.action = 'DISPLAY';
 
-          if (i == 0) {
-              domnode = $(prefix + ' .edit-alarm-item').eq(0);
-          }
-          else {
-              domnode = $(prefix + ' .edit-alarm-item').eq(0).clone(false).removeClass('first').appendTo(prefix);
-              this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
+          domnode = $(prefix + ' .edit-alarm-item').eq(0);
+
+          if (i > 0) {
+            domnode = domnode.clone(false).removeClass('first').insertAfter(domnode);
+            this.init_alarms_edit(prefix + ' .edit-alarm-item:eq(' + i + ')', i);
           }
 
           $('select.edit-alarm-type', domnode).val(alarm.action);
@@ -535,7 +600,7 @@
         var default_props = {
                 delay: 100,
                 minLength: 1,
-                appendTo: props.container,
+                appendTo: props.container || $(elem).parents('form'),
                 source: time_autocomplete_list,
                 open: time_autocomplete_open,
                 // change: time_autocomplete_change,
@@ -570,8 +635,8 @@
         if (this.alarm_dialog)
             this.alarm_dialog.dialog('destroy').remove();
 
-        var i, actions, adismiss, asnooze, alarm, html,
-            audio_alarms = [], records = [], event_ids = [], buttons = {};
+        var i, actions, adismiss, asnooze, alarm, html, type,
+            audio_alarms = [], records = [], event_ids = [], buttons = [];
 
         for (i=0; i < alarms.length; i++) {
             alarm = alarms[i];
@@ -585,21 +650,27 @@
 
             event_ids.push(alarm.id);
 
-            html = '<h3 class="event-title">' + Q(alarm.title) + '</h3>';
+            type = alarm.id.match(/^task/) ? 'type-task' : 'type-event';
+
+            html = '<h3 class="event-title ' + type + '">' + Q(alarm.title) + '</h3>';
             html += '<div class="event-section">' + Q(alarm.location || '') + '</div>';
             html += '<div class="event-section">' + Q(this.event_date_text(alarm)) + '</div>';
 
-            adismiss = $('<a href="#" class="alarm-action-dismiss"></a>').html(rcmail.gettext('dismiss','libcalendaring')).click(function(e){
-                me.dismiss_link = $(this);
-                me.dismiss_alarm(me.dismiss_link.data('id'), 0, e);
-            });
-            asnooze = $('<a href="#" class="alarm-action-snooze"></a>').html(rcmail.gettext('snooze','libcalendaring')).click(function(e){
-                me.snooze_dropdown($(this), e);
-                e.stopPropagation();
-                return false;
-            });
-            actions = $('<div>').addClass('alarm-actions').append(adismiss.data('id', alarm.id)).append(asnooze.data('id', alarm.id));
+            adismiss = $('<a href="#" class="alarm-action-dismiss"></a>')
+                .text(rcmail.gettext('dismiss','libcalendaring'))
+                .click(function(e) {
+                    me.dismiss_link = $(this);
+                    me.dismiss_alarm(me.dismiss_link.data('id'), 0, e);
+                });
+            asnooze = $('<a href="#" class="alarm-action-snooze"></a>')
+                .text(rcmail.gettext('snooze','libcalendaring'))
+                .click(function(e) {
+                    me.snooze_dropdown($(this), e);
+                    e.stopPropagation();
+                    return false;
+                });
 
+            actions = $('<div>').addClass('alarm-actions').append(adismiss.data('id', alarm.id)).append(asnooze.data('id', alarm.id));
             records.push($('<div>').addClass('alarm-item').html(html).append(actions));
         }
 
@@ -611,18 +682,26 @@
 
         this.alarm_dialog = $('<div>').attr('id', 'alarm-display').append(records);
 
-        buttons[rcmail.gettext('close')] = function() {
-            $(this).dialog('close');
-        };
+        buttons.push({
+            text: rcmail.gettext('dismissall','libcalendaring'),
+            click: function(e) {
+                // submit dismissed event_ids to server
+                me.dismiss_alarm(me.alarm_ids.join(','), 0, e);
+                $(this).dialog('close');
+            },
+            'class': 'delete'
+        });
 
-        buttons[rcmail.gettext('dismissall','libcalendaring')] = function(e) {
-            // submit dismissed event_ids to server
-            me.dismiss_alarm(me.alarm_ids.join(','), 0, e);
-            $(this).dialog('close');
-        };
+        buttons.push({
+            text: rcmail.gettext('close'),
+            click: function() {
+                $(this).dialog('close');
+            },
+            'class': 'cancel'
+        });
 
         this.alarm_dialog.appendTo(document.body).dialog({
-            modal: false,
+            modal: true,
             resizable: true,
             closeOnEscape: false,
             dialogClass: 'alarms',
@@ -666,6 +745,7 @@
         // Internet Explorer does not support wav files,
         // support in other browsers depends on enabled plugins,
         // so we use wav as a fallback
+
         src += bw.ie || (plugin && plugin.enabledPlugin) ? '.mp3' : '.wav';
 
         // HTML5
@@ -889,10 +969,8 @@
             .html('<span>' + Q(this.format_datetime(date, 1)) + '</span>')
             .appendTo('#edit-recurrence-rdates');
 
-        $('<a>').attr('href', '#del')
-            .addClass('iconbutton delete')
-            .html(rcmail.get_label('delete', 'libcalendaring'))
-            .attr('title', rcmail.get_label('delete', 'libcalendaring'))
+        $('<a>').attr({href: '#del', 'class': 'iconbutton delete icon button', title: rcmail.get_label('delete', 'libcalendaring')})
+            .append($('<span class="inner">').text(rcmail.get_label('delete', 'libcalendaring')))
             .appendTo(li);
     };
 
@@ -980,8 +1058,7 @@
             var li = $('<li>').addClass('link')
                 .addClass('message eml')
                 .append($('<a>')
-                    .attr('href', link.mailurl)
-                    .addClass('messagelink')
+                    .attr({href: link.mailurl, 'class': 'messagelink'})
                     .text(link.subject || link.uri)
                 )
                 .appendTo(ul);
@@ -989,17 +1066,25 @@
             // add icon to remove the link
             if (edit) {
                 $('<a>')
-                    .attr('href', '#delete')
-                    .attr('title', rcmail.gettext('removelink', plugin))
-                    .attr('data-uri', link.uri)
-                    .addClass('delete')
-                    .text(rcmail.gettext('delete'))
+                    .attr({href: '#delete', title: rcmail.gettext('removelink', plugin), 'data-uri': link.uri, 'class': 'delete'})
+                    .append($('<span class="inner">').text(rcmail.gettext('delete')))
                     .appendTo(li);
             }
         });
 
         container.empty().append(ul);
     }
+
+    // resize and reposition (center) the dialog window
+    this.dialog_resize = function(id, height, width)
+    {
+        var win = $(window), w = win.width(), h = win.height();
+
+        $(id).dialog('option', {
+            height: Math.min(h-20, height+130),
+            width: Math.min(w-20, width+50)
+        });
+    };
 }
 
 //////  static methods
@@ -1026,9 +1111,9 @@
     }
 
     if (data['delegated-to'])
-        tooltip = rcmail.gettext('delegatedto', context) + ' ' + data['delegated-to'];
+        tooltip = rcmail.gettext('libcalendaring.delegatedto') + ' ' + data['delegated-to'];
     else if (data['delegated-from'])
-        tooltip = rcmail.gettext('delegatedfrom', context) + ' ' + data['delegated-from'];
+        tooltip = rcmail.gettext('libcalendaring.delegatedfrom') + ' ' + data['delegated-from'];
 
     return $('<span>').append(
             $('<span>').attr({'class': 'attendee ' + status, title: tooltip}).append(name.text(dispname))
@@ -1128,7 +1213,7 @@
                 setTimeout(function() { dialog.dialog("close"); }, 500);
             }
             else {
-                alert(rcmail.gettext('itip.delegateinvalidaddress'));
+                rcmail.alert_dialog(rcmail.gettext('itip.delegateinvalidaddress'));
                 $('#itip-delegate-to', doc).focus();
             }
         }
@@ -1207,12 +1292,9 @@
  */
 rcube_libcalendaring.remove_from_itip = function(event, task, title)
 {
-    if (confirm(rcmail.gettext('itip.deleteobjectconfirm').replace('$title', title))) {
-        rcmail.http_post(task + '/itip-remove',
-            event,
-            rcmail.set_busy(true, 'itip.savingdata')
-        );
-    }
+    rcmail.confirm_dialog(rcmail.gettext('itip.deleteobjectconfirm').replace('$title', title), 'delete', function() {
+        rcmail.http_post(task + '/itip-remove', event, rcmail.set_busy(true, 'itip.savingdata'));
+    });
 };
 
 /**
@@ -1261,6 +1343,8 @@
  */
 rcube_libcalendaring.fetch_itip_object_status = function(p)
 {
+  p.mbox = rcmail.env.mailbox;
+  p.message_uid = rcmail.env.uid;
   rcmail.http_post(p.task + '/itip-status', { data: p });
 };
 
@@ -1292,7 +1376,7 @@
   $('#'+p.action+'-'+p.id).show().find('input.button').last().after(p.select);
 
   // highlight date if date change detected
-  if (p.resheduled)
+  if (p.rescheduled)
     $('.calendar-eventdetails td.date').addClass('modified');
 
   // show itip box appendix after replacing the given placeholders
@@ -1384,17 +1468,4 @@
   rcmail.addEventListener('plugin.update_itip_object_status', rcube_libcalendaring.update_itip_object_status)
     .addEventListener('plugin.fetch_itip_object_status', rcube_libcalendaring.fetch_itip_object_status)
     .addEventListener('plugin.itip_message_processed', rcube_libcalendaring.itip_message_processed);
-
-  if (rcmail.env.action == 'get-attachment' && rcmail.gui_objects['attachmentframe']) {
-    rcmail.register_command('print-attachment', function() {
-      var frame = rcmail.get_frame_window(rcmail.gui_objects['attachmentframe'].id);
-      if (frame) frame.print();
-    }, true);
-  }
-
-  if (rcmail.env.action == 'get-attachment' && rcmail.env.attachment_download_url) {
-    rcmail.register_command('download-attachment', function() {
-      rcmail.location_href(rcmail.env.attachment_download_url, window);
-    }, true);
-  }
 });

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/libcalendaring.php -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/libcalendaring.php Changed

@@ -137,7 +137,7 @@
                 'statusorganizer', 'statusaccepted', 'statusdeclined',
                 'statusdelegated', 'statusunknown', 'statusneeds-action',
                 'statustentative', 'statuscompleted', 'statusin-process',
-                'delegatedto', 'delegatedfrom'
+                'delegatedto', 'delegatedfrom', 'showmore'
             );
         }
 
@@ -250,10 +250,6 @@
         );
         $settings['today'] = $this->rc->gettext('today');
 
-        // define list of file types which can be displayed inline
-        // same as in program/steps/mail/show.inc
-        $settings['mimetypes'] = (array)$this->rc->config->get('client_mimetypes');
-
         return $settings;
     }
 
@@ -348,12 +344,12 @@
     {
         unset($attrib['name']);
 
-        $input_value = new html_inputfield(array('name' => 'alarmvalue[]', 'class' => 'edit-alarm-value', 'size' => 3));
-        $input_date  = new html_inputfield(array('name' => 'alarmdate[]', 'class' => 'edit-alarm-date', 'size' => 10));
-        $input_time  = new html_inputfield(array('name' => 'alarmtime[]', 'class' => 'edit-alarm-time', 'size' => 6));
-        $select_type    = new html_select(array('name' => 'alarmtype[]', 'class' => 'edit-alarm-type', 'id' => $attrib['id']));
-        $select_offset  = new html_select(array('name' => 'alarmoffset[]', 'class' => 'edit-alarm-offset'));
-        $select_related = new html_select(array('name' => 'alarmrelated[]', 'class' => 'edit-alarm-related'));
+        $input_value    = new html_inputfield(array('name' => 'alarmvalue[]', 'class' => 'edit-alarm-value form-control input-group-prepend', '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']));
+        $select_offset  = new html_select(array('name' => 'alarmoffset[]', 'class' => 'edit-alarm-offset form-control'));
+        $select_related = new html_select(array('name' => 'alarmrelated[]', 'class' => 'edit-alarm-related form-control'));
         $object_type    = $attrib['_type'] ?: 'event';
 
         $select_type->add($this->gettext('none'), '');
@@ -373,9 +369,10 @@
         // pre-set with default values from user settings
         $preset = self::parse_alarm_value($this->rc->config->get('calendar_default_alarm_offset', '-15M'));
         $hidden = array('style' => 'display:none');
-        $html = html::span('edit-alarm-set',
+
+        return html::span('edit-alarm-set',
             $select_type->show($this->rc->config->get('calendar_default_alarm_type', '')) . ' ' .
-            html::span(array('class' => 'edit-alarm-values', 'style' => 'display:none'),
+            html::span(array('class' => 'edit-alarm-values input-group', 'style' => 'display:none'),
                 $input_value->show($preset[0]) . ' ' .
                 $select_offset->show($preset[1]) . ' ' .
                 $select_related->show() . ' ' .
@@ -383,12 +380,6 @@
                 $input_time->show('', $hidden)
             )
         );
-
-        // TODO: support adding more alarms
-        #$html .= html::a(array('href' => '#', 'id' => 'edit-alam-add', 'title' => $this->gettext('addalarm')),
-        #  $attrib['addicon'] ? html::img(array('src' => $attrib['addicon'], 'alt' => 'add')) : '(+)');
-
-        return $html;
     }
 
     /**
@@ -859,30 +850,35 @@
         switch ($attrib['part']) {
             // frequency selector
             case 'frequency':
-                $select = new html_select(array('name' => 'frequency', 'id' => 'edit-recurrence-frequency'));
+                $select = new html_select(array('name' => 'frequency', 'id' => 'edit-recurrence-frequency', 'class' => 'form-control'));
                 $select->add($this->gettext('never'),   '');
                 $select->add($this->gettext('daily'),   'DAILY');
                 $select->add($this->gettext('weekly'),  'WEEKLY');
                 $select->add($this->gettext('monthly'), 'MONTHLY');
                 $select->add($this->gettext('yearly'),  'YEARLY');
                 $select->add($this->gettext('rdate'),   'RDATE');
-                $html = html::label('edit-recurrence-frequency', $this->gettext('frequency')) . $select->show('');
+                $html = html::label(array('for' => 'edit-recurrence-frequency', 'class' => 'col-form-label col-sm-2'), $this->gettext('frequency'))
+                    . html::div('col-sm-10', $select->show(''));
                 break;
 
             // daily recurrence
             case 'daily':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-daily'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-daily', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('days')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-daily'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-daily', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('days')))));
                 break;
 
             // weekly recurrence form
             case 'weekly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-weekly'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-weekly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('weeks')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-weekly'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-weekly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('weeks')))));
+
                 // weekday selection
-                $daymap = array('sun','mon','tue','wed','thu','fri','sat');
+                $daymap   = array('sun','mon','tue','wed','thu','fri','sat');
                 $checkbox = new html_checkbox(array('name' => 'byday', 'class' => 'edit-recurrence-weekly-byday'));
-                $first = $this->rc->config->get('calendar_first_day', 1);
+                $first    = $this->rc->config->get('calendar_first_day', 1);
+
                 for ($weekdays = '', $j = $first; $j <= $first+6; $j++) {
                     $d = $j % 7;
                     $weekdays .= html::label(array('class' => 'weekday'),
@@ -890,13 +886,16 @@
                         $this->gettext($daymap[$d])
                     ) . ' ';
                 }
-                $html .= html::div($attrib, html::label(null, $this->gettext('bydays')) . $weekdays);
+
+                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bydays'))
+                    . html::div('col-sm-10 form-control-plaintext', $weekdays));
                 break;
 
             // monthly recurrence form
             case 'monthly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-monthly'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-monthly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('months')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-monthly'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-monthly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('months')))));
 
                 $checkbox = new html_checkbox(array('name' => 'bymonthday', 'class' => 'edit-recurrence-monthly-bymonthday'));
                 for ($monthdays = '', $d = 1; $d <= 31; $d++) {
@@ -909,62 +908,81 @@
                 $table = new html_table(array('cols' => 2, 'border' => 0, 'cellpadding' => 0, 'class' => 'formtable'));
                 $table->add('label', html::label(null, $radio->show('BYMONTHDAY', array('value' => 'BYMONTHDAY')) . ' ' . $this->gettext('each')));
                 $table->add(null, $monthdays);
-                $table->add('label', html::label(null, $radio->show('', array('value' => 'BYDAY')) . ' ' . $this->gettext('onevery')));
-                $table->add(null, $this->rrule_selectors($attrib['part']));
+                $table->add('label', html::label(null, $radio->show('', array('value' => 'BYDAY')) . ' ' . $this->gettext('every')));
+                $table->add('recurrence-onevery', $this->rrule_selectors($attrib['part']));
 
-                $html .= html::div($attrib, $table->show());
+                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bydays'))
+                    . html::div('col-sm-10 form-control-plaintext', $table->show()));
                 break;
 
             // annually recurrence form
             case 'yearly':
-                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval', 'id' => 'edit-recurrence-interval-yearly'));
-                $html = html::div($attrib, html::label('edit-recurrence-interval-yearly', $this->gettext('every')) . $select->show(1) . html::span('label-after', $this->gettext('years')));
+                $select = $this->interval_selector(array('name' => 'interval', 'class' => 'edit-recurrence-interval form-control', 'id' => 'edit-recurrence-interval-yearly'));
+                $html = html::div($attrib, html::label(array('for' => 'edit-recurrence-interval-yearly', 'class' => 'col-form-label col-sm-2'), $this->gettext('every'))
+                    . html::div('col-sm-10 input-group', $select->show(1) . html::span('label-after input-group-append', html::span('input-group-text', $this->gettext('years')))));
+
                 // month selector
                 $monthmap = array('','jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec');
                 $checkbox = new html_checkbox(array('name' => 'bymonth', 'class' => 'edit-recurrence-yearly-bymonth'));
+
                 for ($months = '', $m = 1; $m <= 12; $m++) {
                     $months .= html::label(array('class' => 'month'), $checkbox->show(null, array('value' => $m)) . $this->gettext($monthmap[$m]));
                     $months .= $m % 4 ? ' ' : html::br();
                 }
-                $html .= html::div($attrib + array('id' => 'edit-recurrence-yearly-bymonthblock'), $months);
 
-                // day rule selection
-                $html .= html::div($attrib, html::label(null, $this->gettext('onevery')) . $this->rrule_selectors($attrib['part'], '---'));
+                $html .= html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), $this->gettext('bymonths'))
+                    . html::div('col-sm-10 form-control-plaintext',
+                        html::div(array('id' => 'edit-recurrence-yearly-bymonthblock'), $months)
+                        . html::div('recurrence-onevery', $this->rrule_selectors($attrib['part'], '---'))
+                    ));
                 break;
 
             // end of recurrence form
             case 'until':
-                $radio = new html_radiobutton(array('name' => 'repeat', 'class' => 'edit-recurrence-until'));
-                $select = $this->interval_selector(array('name' => 'times', 'id' => 'edit-recurrence-repeat-times'));
-                $input = new html_inputfield(array('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => "10"));
+                $radio  = new html_radiobutton(array('name' => 'repeat', 'class' => 'edit-recurrence-until'));
+                $select = $this->interval_selector(array('name' => 'times', 'id' => 'edit-recurrence-repeat-times', 'class' => 'form-control'));
+                $input  = new html_inputfield(array('name' => 'untildate', 'id' => 'edit-recurrence-enddate', 'size' => '10', 'class' => 'form-control datepicker'));
 
                 $html = html::div('line first',
-                    html::label(null, $radio->show('', array('value' => '', 'id' => 'edit-recurrence-repeat-forever')) . ' ' .
-                        $this->gettext('forever'))
+                    $radio->show('', array('value' => '', 'id' => 'edit-recurrence-repeat-forever'))
+                        . ' ' . html::label('edit-recurrence-repeat-forever', $this->gettext('forever'))
                 );
 
-                $forntimes = $this->gettext(array(
-                    'name' => 'forntimes',
-                    'vars' => array('nr' => '%s'))
-                );
+                $label = $this->gettext('ntimes');
+                if (strpos($label, '$') === 0) {
+                    $label = str_replace('$n', '', $label);
+                    $group  = $select->show(1)
+                        . html::span('input-group-append', html::span('input-group-text', rcube::Q($label)));
+                }
+                else {
+                    $label = str_replace('$n', '', $label);
+                    $group  = html::span('input-group-prepend', html::span('input-group-text', rcube::Q($label)))
+                        . $select->show(1);
+                }
+
                 $html .= html::div('line',
-                    $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count', 'aria-label' => sprintf($forntimes, 'N'))) . ' ' .
-                        sprintf($forntimes, $select->show(1))
+                    $radio->show('', array('value' => 'count', 'id' => 'edit-recurrence-repeat-count'))
+                        . ' ' . html::label('edit-recurrence-repeat-count', $this->gettext('for'))
+                        . ' ' . html::span('input-group', $group)
                 );
 
                 $html .= html::div('line',
-                    $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until', 'aria-label' => $this->gettext('untilenddate'))) . ' ' .
-                        $this->gettext('untildate') . ' ' . $input->show('', array('aria-label' => $this->gettext('untilenddate')))
+                    $radio->show('', array('value' => 'until', 'id' => 'edit-recurrence-repeat-until', 'aria-label' => $this->gettext('untilenddate')))
+                        . ' ' . html::label('edit-recurrence-repeat-until', $this->gettext('untildate'))
+                        . ' ' . $input->show('', array('aria-label' => $this->gettext('untilenddate')))
                 );
 
-                $html = html::div($attrib, html::label(null, ucfirst($this->gettext('recurrencend'))) . $html);
+                $html = html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2'), ucfirst($this->gettext('recurrencend')))
+                    . html::div('col-sm-10', $html));
                 break;
 
             case 'rdate':
-                $ul = html::tag('ul', array('id' => 'edit-recurrence-rdates'), '');
-                $input = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10"));
+                $ul     = html::tag('ul', array('id' => 'edit-recurrence-rdates', 'class' => 'recurrence-rdates'), '');
+                $input  = new html_inputfield(array('name' => 'rdate', 'id' => 'edit-recurrence-rdate-input', 'size' => "10", 'class' => 'form-control datepicker'));
                 $button = new html_inputfield(array('type' => 'button', 'class' => 'button add', 'value' => $this->gettext('addrdate')));
-                $html .= html::div($attrib, $ul . html::div('inputform', $input->show() . $button->show()));
+
+                $html = html::div($attrib, html::label(array('class' => 'col-form-label col-sm-2', 'for' => 'edit-recurrence-rdate-input'), $this->gettext('bydates'))
+                    . html::div('col-sm-10', $ul . html::div('inputform', $input->show() . $button->show())));
                 break;
         }
 
@@ -987,7 +1005,7 @@
     private function rrule_selectors($part, $noselect = null)
     {
         // rule selectors
-        $select_prefix = new html_select(array('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix"));
+        $select_prefix = new html_select(array('name' => 'bydayprefix', 'id' => "edit-recurrence-$part-prefix", 'class' => 'form-control'));
         if ($noselect) $select_prefix->add($noselect, '');
         $select_prefix->add(array(
                 $this->gettext('first'),
@@ -998,7 +1016,7 @@
             ),
             array(1, 2, 3, 4, -1));
 
-        $select_wday = new html_select(array('name' => 'byday', 'id' => "edit-recurrence-$part-byday"));
+        $select_wday = new html_select(array('name' => 'byday', 'id' => "edit-recurrence-$part-byday", 'class' => 'form-control'));
         if ($noselect) $select_wday->add($noselect, '');
 
         $daymap = array('sunday','monday','tuesday','wednesday','thursday','friday','saturday');
@@ -1016,8 +1034,9 @@
      */
     public function to_client_recurrence($recurrence, $allday = false)
     {
-        if ($recurrence['UNTIL'])
+        if ($recurrence['UNTIL']) {
             $recurrence['UNTIL'] = $this->adjust_timezone($recurrence['UNTIL'], $allday)->format('c');
+        }
 
         // format RDATE values
         if (is_array($recurrence['RDATE'])) {
@@ -1060,259 +1079,6 @@
     }
 
 
-    /*********  Attachments handling  *********/
-
-    /**
-     * Handler for attachment uploads
-     */
-    public function attachment_upload($session_key, $id_prefix = '')
-    {
-        // Upload progress update
-        if (!empty($_GET['_progress'])) {
-            $this->rc->upload_progress();
-        }
-
-        $recid = $id_prefix . rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
-        $uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GPC);
-
-        if (!is_array($_SESSION[$session_key]) || $_SESSION[$session_key]['id'] != $recid) {
-            $_SESSION[$session_key] = array();
-            $_SESSION[$session_key]['id'] = $recid;
-            $_SESSION[$session_key]['attachments'] = array();
-        }
-
-        // clear all stored output properties (like scripts and env vars)
-        $this->rc->output->reset();
-
-        if (is_array($_FILES['_attachments']['tmp_name'])) {
-            foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
-              // Process uploaded attachment if there is no error
-              $err = $_FILES['_attachments']['error'][$i];
-
-              if (!$err) {
-                $attachment = array(
-                    'path' => $filepath,
-                    'size' => $_FILES['_attachments']['size'][$i],
-                    'name' => $_FILES['_attachments']['name'][$i],
-                    'mimetype' => rcube_mime::file_content_type($filepath, $_FILES['_attachments']['name'][$i], $_FILES['_attachments']['type'][$i]),
-                    'group' => $recid,
-                );
-
-                $attachment = $this->rc->plugins->exec_hook('attachment_upload', $attachment);
-              }
-
-              if (!$err && $attachment['status'] && !$attachment['abort']) {
-                  $id = $attachment['id'];
-
-                  // store new attachment in session
-                  unset($attachment['status'], $attachment['abort']);
-                  $_SESSION[$session_key]['attachments'][$id] = $attachment;
-
-                  if (($icon = $_SESSION[$session_key . '_deleteicon']) && is_file($icon)) {
-                      $button = html::img(array(
-                          'src' => $icon,
-                          'alt' => $this->rc->gettext('delete')
-                      ));
-                  }
-                  else {
-                      $button = rcube::Q($this->rc->gettext('delete'));
-                  }
-
-                  $content = html::a(array(
-                      'href' => "#delete",
-                      'class' => 'delete',
-                      'onclick' => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", rcmail_output::JS_OBJECT_NAME, $id),
-                      'title' => $this->rc->gettext('delete'),
-                      'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
-                  ), $button);
-
-                  $content .= rcube::Q($attachment['name']);
-
-                  $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
-                      'html' => $content,
-                      'name' => $attachment['name'],
-                      'mimetype' => $attachment['mimetype'],
-                      'classname' => rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
-                      'complete' => true), $uploadid);
-              }
-              else {  // upload failed
-                  if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
-                    $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
-                        'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
-                  }
-                  else if ($attachment['error']) {
-                      $msg = $attachment['error'];
-                  }
-                  else {
-                      $msg = $this->rc->gettext('fileuploaderror');
-                  }
-
-                  $this->rc->output->command('display_message', $msg, 'error');
-                  $this->rc->output->command('remove_from_attachment_list', $uploadid);
-                }
-            }
-        }
-        else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            // if filesize exceeds post_max_size then $_FILES array is empty,
-            // show filesizeerror instead of fileuploaderror
-            if ($maxsize = ini_get('post_max_size'))
-                $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
-                    'size' => $this->rc->show_bytes(parse_bytes($maxsize)))));
-            else
-                $msg = $this->rc->gettext('fileuploaderror');
-
-            $this->rc->output->command('display_message', $msg, 'error');
-            $this->rc->output->command('remove_from_attachment_list', $uploadid);
-        }
-
-        $this->rc->output->send('iframe');
-    }
-
-
-    /**
-     * Deliver an event/task attachment to the client
-     * (similar as in Roundcube core program/steps/mail/get.inc)
-     */
-    public function attachment_get($attachment)
-    {
-        ob_end_clean();
-
-        if ($attachment && $attachment['body']) {
-            // allow post-processing of the attachment body
-            $part = new rcube_message_part;
-            $part->filename  = $attachment['name'];
-            $part->size      = $attachment['size'];
-            $part->mimetype  = $attachment['mimetype'];
-
-            $plugin = $this->rc->plugins->exec_hook('message_part_get', array(
-                'body'     => $attachment['body'],
-                'mimetype' => strtolower($attachment['mimetype']),
-                'download' => !empty($_GET['_download']),
-                'part'     => $part,
-            ));
-
-            if ($plugin['abort'])
-                exit;
-
-            $mimetype = $plugin['mimetype'];
-            list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
-
-            $browser = $this->rc->output->browser;
-
-            // send download headers
-            if ($plugin['download']) {
-                header("Content-Type: application/octet-stream");
-                if ($browser->ie)
-                    header("Content-Type: application/force-download");
-            }
-            else if ($ctype_primary == 'text') {
-                header("Content-Type: text/$ctype_secondary");
-            }
-            else {
-                header("Content-Type: $mimetype");
-                header("Content-Transfer-Encoding: binary");
-            }
-
-            // display page, @TODO: support text/plain (and maybe some other text formats)
-            if ($mimetype == 'text/html' && empty($_GET['_download'])) {
-                $OUTPUT = new rcmail_html_page();
-                // @TODO: use washtml on $body
-                $OUTPUT->write($plugin['body']);
-            }
-            else {
-                // don't kill the connection if download takes more than 30 sec.
-                @set_time_limit(0);
-
-                $filename = $attachment['name'];
-                $filename = preg_replace('[\r\n]', '', $filename);
-
-                if ($browser->ie && $browser->ver < 7)
-                    $filename = rawurlencode(abbreviate_string($filename, 55));
-                else if ($browser->ie)
-                    $filename = rawurlencode($filename);
-                else
-                    $filename = addcslashes($filename, '"');
-
-                $disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
-                header("Content-Disposition: $disposition; filename=\"$filename\"");
-
-                echo $plugin['body'];
-            }
-
-            exit;
-        }
-
-        // if we arrive here, the requested part was not found
-        header('HTTP/1.1 404 Not Found');
-        exit;
-    }
-
-    /**
-     * Show "loading..." page in attachment iframe
-     */
-    public function attachment_loading_page()
-    {
-        $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
-        $message = $this->rc->gettext('loadingdata');
-
-        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
-        print "<html>\n<head>\n"
-            . '<meta http-equiv="refresh" content="0; url='.rcube::Q($url).'">' . "\n"
-            . '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
-            . "</head>\n<body>\n$message\n</body>\n</html>";
-        exit;
-    }
-
-    /**
-     * Template object for attachment display frame
-     */
-    public function attachment_frame($attrib = array())
-    {
-        $mimetype = strtolower($this->attachment['mimetype']);
-        list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
-
-        $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary == 'text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
-
-        $this->rc->output->add_gui_object('attachmentframe', $attrib['id']);
-
-        return html::iframe($attrib);
-    }
-
-    /**
-     *
-     */
-    public function attachment_header($attrib = array())
-    {
-        $rcmail = rcmail::get_instance();
-        $dl_link = strtolower($attrib['downloadlink']) == 'true';
-        $dl_url = $this->rc->url(array('_frame' => null, '_download' => 1) + $_GET);
-
-        $table = new html_table(array('cols' => $dl_link ? 3 : 2));
-
-        if (!empty($this->attachment['name'])) {
-            $table->add('title', rcube::Q($this->rc->gettext('filename')));
-            $table->add('header', rcube::Q($this->attachment['name']));
-            if ($dl_link) {
-                $table->add('download-link', html::a($dl_url, rcube::Q($this->rc->gettext('download'))));
-            }
-        }
-
-        if (!empty($this->attachment['mimetype'])) {
-            $table->add('title', rcube::Q($this->rc->gettext('type')));
-            $table->add('header', rcube::Q($this->attachment['mimetype']));
-        }
-
-        if (!empty($this->attachment['size'])) {
-            $table->add('title', rcube::Q($this->rc->gettext('filesize')));
-            $table->add('header', rcube::Q($this->rc->show_bytes($this->attachment['size'])));
-        }
-
-        $this->rc->output->set_env('attachment_download_url', $dl_url);
-
-        return $table->show($attrib);
-    }
-
-
     /*********  iTip message detection  *********/
 
     /**

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/libvcalendar.php -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/libvcalendar.php Changed

@@ -45,11 +45,13 @@
         'delegated-from'  => 'DELEGATED-FROM',
         'delegated-to'    => 'DELEGATED-TO',
         'schedule-status' => 'SCHEDULE-STATUS',
+        'schedule-agent'  => 'SCHEDULE-AGENT',
         'sent-by'         => 'SENT-BY',
     );
     private $organizer_keymap = array(
         'name'            => 'CN',
         'schedule-status' => 'SCHEDULE-STATUS',
+        'schedule-agent'  => 'SCHEDULE-AGENT',
         'sent-by'         => 'SENT-BY',
     );
     private $iteratorkey = 0;
@@ -549,6 +551,10 @@
                     $attendee['role'] = 'ORGANIZER';
                     $attendee['status'] = 'ACCEPTED';
                     $event['organizer'] = $attendee;
+
+                    if (array_key_exists('schedule-agent', $attendee)) {
+                        $schedule_agent = $attendee['schedule-agent'];
+                    }
                 }
                 else if ($attendee['email'] != $event['organizer']['email']) {
                     $event['attendees'][] = $attendee;
@@ -708,6 +714,12 @@
             $event['end'] = clone $event['start'];
         }
 
+        // T2531: Remember SCHEDULE-AGENT in custom property to properly
+        // support event updates via CalDAV when SCHEDULE-AGENT=CLIENT is used
+        if (isset($schedule_agent)) {
+            $event['x-custom'][] = array('SCHEDULE-AGENT', $schedule_agent);
+        }
+
         // minimal validation
         if (empty($event['uid']) || ($event['_type'] == 'event' && empty($event['start']) != empty($event['end']))) {
             throw new VObject\ParseException('Object validation failed: missing mandatory object properties');
@@ -1002,7 +1014,7 @@
         $ve->UID = $event['uid'];
 
         // set DTSTAMP according to RFC 5545, 3.8.7.2.
-        $dtstamp = !empty($event['changed']) && !empty($this->method) ? $event['changed'] : new DateTime('now', new \DateTimeZone('UTC'));
+        $dtstamp = !empty($event['changed']) && empty($this->method) ? $event['changed'] : new DateTime('now', new \DateTimeZone('UTC'));
         $ve->DTSTAMP = $this->datetime_prop($cal, 'DTSTAMP', $dtstamp, true);
 
         // all-day events end the next day
@@ -1164,6 +1176,13 @@
             $ve->add($va);
         }
 
+        // Find SCHEDULE-AGENT
+        foreach ((array)$event['x-custom'] as $prop) {
+            if ($prop[0] === 'SCHEDULE-AGENT') {
+                $schedule_agent = $prop[1];
+            }
+        }
+
         foreach ((array)$event['attendees'] as $attendee) {
             if ($attendee['role'] == 'ORGANIZER') {
                 if (empty($event['organizer']))
@@ -1172,14 +1191,26 @@
             else if (!empty($attendee['email'])) {
                 if (isset($attendee['rsvp']))
                     $attendee['rsvp'] = $attendee['rsvp'] ? 'TRUE' : null;
-                $ve->add('ATTENDEE', 'mailto:' . $attendee['email'],
-                    array_filter(self::map_keys($attendee, $this->attendee_keymap)));
+
+                $mailto   = $attendee['email'];
+                $attendee = array_filter(self::map_keys($attendee, $this->attendee_keymap));
+
+                if ($schedule_agent !== null && !isset($attendee['SCHEDULE-AGENT'])) {
+                    $attendee['SCHEDULE-AGENT'] = $schedule_agent;
+                }
+
+                $ve->add('ATTENDEE', 'mailto:' . $mailto, $attendee);
             }
         }
 
         if ($event['organizer']) {
-            $ve->add('ORGANIZER', 'mailto:' . $event['organizer']['email'],
-                array_filter(self::map_keys($event['organizer'], $this->organizer_keymap)));
+            $organizer = array_filter(self::map_keys($event['organizer'], $this->organizer_keymap));
+
+            if ($schedule_agent !== null && !isset($organizer['SCHEDULE-AGENT'])) {
+                $organizer['SCHEDULE-AGENT'] = $schedule_agent;
+            }
+
+            $ve->add('ORGANIZER', 'mailto:' . $event['organizer']['email'], $organizer);
         }
 
         foreach ((array)$event['url'] as $url) {

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/de_CH.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/de_DE.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/de_DE.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/el.inc Added

@@ -0,0 +1,29 @@
+<?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'] = 'μέχρι';
+$labels['alarmemail'] = 'Αποστολή αλληλογραφίας';
+$labels['alarmdisplay'] = 'Εμφάνιση μηνύματος';
+$labels['alarmaudio'] = 'Αναπαραγωγή ήχου';
+$labels['alarmdisplayoption'] = 'Μήνυμα';
+$labels['alarmemailoption'] = 'Ηλεκτρονική αλληλογραφία';
+$labels['alarmaudiooption'] = 'Ήχος';
+$labels['trigger-H'] = 'ώρες πριν';
+$labels['trigger+M'] = 'λεπτά μετά';
+$labels['trigger+H'] = 'ώρες μετά';
+$labels['trigger+D'] = 'ημέρες μετά';
+$labels['triggerend-M'] = 'λεπτά πριν το τέλος';
+$labels['triggerend-H'] = 'ώρες πριν το τέλος';
+$labels['triggerend-D'] = 'ημέρες πριν το τέλος';
+$labels['triggerend+M'] = 'λεπτά πριν το τέλος';
+$labels['triggerend+D'] = 'ημέρες μετά το τέλος';
+$labels['frequency'] = 'Επανάληψη';
+$labels['recurrencend'] = 'μέχρι';
+$labels['statusorganizer'] = 'Οργανωτής';
+$labels['statuscompleted'] = 'Ολοκληρώθηκε';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/en_US.inc Changed

@@ -70,7 +70,9 @@
 $labels['weeks'] = 'week(s)';
 $labels['months'] = 'month(s)';
 $labels['years'] = 'year(s)';
+$labels['bydates'] = 'On';
 $labels['bydays'] = 'On';
+$labels['bymonths'] = 'On';
 $labels['untildate'] = 'the';
 $labels['each'] = 'Each';
 $labels['onevery'] = 'On every';
@@ -78,7 +80,9 @@
 $labels['forever'] = 'forever';
 $labels['recurrencend'] = 'until';
 $labels['untilenddate'] = 'until date';
-$labels['forntimes'] = 'for $nr time(s)';
+$labels['forntimes'] = 'for $nr time(s)'; // old
+$labels['ntimes'] = '$n time(s)';
+$labels['for'] = 'for';
 $labels['first'] = 'first';
 $labels['second'] = 'second';
 $labels['third'] = 'third';
@@ -97,8 +101,6 @@
 $labels['statusunknown'] = 'Unknown';
 $labels['statuscompleted'] = 'Completed';
 $labels['statusin-process'] = 'In process';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 
 // itip related labels
 $labels['itipinvitation'] = 'Invitation to';
@@ -177,6 +179,8 @@
 $labels['delegateto'] = 'Delegate to';
 $labels['delegatersvpme'] = 'Keep me informed about updates of this incidence';
 $labels['delegateinvalidaddress'] = 'Please enter a valid email address for the delegate';
+$labels['delegatedto'] = 'Delegated to:';
+$labels['delegatedfrom'] = 'Delegated from:';
 
 $labels['savingdata'] = 'Saving data...';

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/es_AR.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/es_AR.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/es_ES.inc Changed

@@ -10,8 +10,10 @@
 $labels['at'] = 'at';
 $labels['alarmemail'] = 'Send Email';
 $labels['alarmdisplay'] = 'Show message';
+$labels['alarmaudio'] = 'Reproducir sonido';
 $labels['alarmdisplayoption'] = 'Message';
 $labels['alarmemailoption'] = 'Correo electrónico';
+$labels['alarmaudiooption'] = 'Sonido';
 $labels['alarmat'] = 'at $datetime';
 $labels['trigger@'] = 'on date';
 $labels['trigger-M'] = 'minutes before';
@@ -20,6 +22,20 @@
 $labels['trigger+M'] = 'minutes after';
 $labels['trigger+H'] = 'hours after';
 $labels['trigger+D'] = 'days after';
+$labels['triggerend-M'] = 'minutos para finalizar';
+$labels['triggerend-H'] = 'horas para finalizar';
+$labels['triggerend-D'] = 'días para finalizar';
+$labels['triggerend+M'] = 'minutos tras finalizar';
+$labels['triggerend+H'] = 'horas tras finalizar';
+$labels['triggerend+D'] = 'días tras finalizar';
+$labels['trigger0'] = 'a tiempo';
+$labels['triggerattime'] = 'al iniciar';
+$labels['triggerattimeend'] = 'al finalizar';
+$labels['relatedstart'] = 'iniciar';
+$labels['relatedendevent'] = 'fin';
+$labels['relatedendtask'] = 'Plazo estipulado';
+$labels['addalarm'] = 'Añadir alarma';
+$labels['removealarm'] = 'Eliminar alarma';
 $labels['alarmtitle'] = 'Upcoming events';
 $labels['dismissall'] = 'Dismiss all';
 $labels['dismiss'] = 'Dismiss';
@@ -30,6 +46,7 @@
 $labels['repeattomorrow'] = 'Repeat tomorrow';
 $labels['repeatinweek'] = 'Repeat in a week';
 $labels['showmore'] = 'Show more...';
+$labels['recurring'] = 'Repeticiones';
 $labels['frequency'] = 'Repeat';
 $labels['never'] = 'never';
 $labels['daily'] = 'daily';
@@ -41,6 +58,7 @@
 $labels['days'] = 'day(s)';
 $labels['weeks'] = 'week(s)';
 $labels['months'] = 'month(s)';
+$labels['years'] = 'año(s)';
 $labels['bydays'] = 'On';
 $labels['untildate'] = 'the';
 $labels['each'] = 'Each';
@@ -48,6 +66,7 @@
 $labels['onsamedate'] = 'On the same date';
 $labels['forever'] = 'forever';
 $labels['recurrencend'] = 'until';
+$labels['untilenddate'] = 'hasta la fecha';
 $labels['forntimes'] = 'for $nr time(s)';
 $labels['first'] = 'first';
 $labels['second'] = 'second';
@@ -56,10 +75,85 @@
 $labels['last'] = 'last';
 $labels['dayofmonth'] = 'Day of month';
 $labels['addrdate'] = 'Add repeat date';
+$labels['except'] = 'excepto';
 $labels['statusorganizer'] = 'Organizador';
+$labels['statusaccepted'] = 'Aceptada';
 $labels['statustentative'] = 'Provisional';
+$labels['statusdeclined'] = 'Rechazado';
+$labels['statusdelegated'] = 'Delgado';
 $labels['statusneeds-action'] = 'Necesita acción';
 $labels['statusunknown'] = 'Desconocido';
 $labels['statuscompleted'] = 'Realizado';
 $labels['statusin-process'] = 'En proceso';
+$labels['itipinvitation'] = 'Invitación para';
+$labels['itipupdate'] = 'Actualización de';
+$labels['itipcancellation'] = 'Cancelado:';
+$labels['itipreply'] = 'Responder a';
+$labels['itipaccepted'] = 'Aceptar';
+$labels['itiptentative'] = 'Tal vez';
+$labels['itipdeclined'] = 'Declinar';
+$labels['itipdelegated'] = 'Delegado';
+$labels['itipneeds-action'] = 'Posponer';
+$labels['itipcomment'] = 'Su respuesta';
+$labels['itipeditresponse'] = 'Introducir un texto de respuesta';
+$labels['itipsendercomment'] = 'Comentario del remitente:';
+$labels['itipsuppressreply'] = 'No enviar una respuesta';
+$labels['itipobjectnotfound'] = 'El objeto referido en este mensaje no se encontró en su cuenta.';
+$labels['itipsubjectaccepted'] = '$name ha aceptado el "$title"';
+$labels['itipsubjecttentative'] = '$name aceptado provisionalmente el "$title"';
+$labels['itipsubjectdeclined'] = '$name ha declinado el "$title"';
+$labels['itipsubjectin-process'] = '$name está procesando el "$title"';
+$labels['itipsubjectcompleted'] = '$name ha completado el "$title"';
+$labels['itipsubjectcancel'] = 'Se ha cancelado su participación en "$title';
+$labels['itipsubjectdelegated'] = '$name ha delegado el "$title"';
+$labels['itipsubjectdelegatedto'] = '$name ha delegado en ti el "$title"';
+$labels['itipnewattendee'] = 'Esta es la respuesta de un nuevo participante';
+$labels['updateattendeestatus'] = 'Actualizar el estado del participante';
+$labels['acceptinvitation'] = '¿Acepta esta inviitación?';
+$labels['acceptattendee'] = 'Aceptar participante';
+$labels['declineattendee'] = 'Declinar participante';
+$labels['declineattendeeconfirm'] = 'Introduzca un mensaje para el participante rechazado (opcional):';
+$labels['rsvpmodeall'] = 'Las series completas';
+$labels['rsvpmodecurrent'] = 'Este caso sólo';
+$labels['rsvpmodefuture'] = 'Este y los futuros casos';
+$labels['itipsingleoccurrence'] = 'Se trata de un <em>caso aislado</ em> en una serie de eventos';
+$labels['itipfutureoccurrence'] = 'Se refiere a <em>este y todos los casos futuros</ em> en una serie de eventos';
+$labels['itipmessagesingleoccurrence'] = 'El mensaje solo hace referencia a este caso aislado';
+$labels['itipmessagefutureoccurrence'] = 'El mensaje hace referencia a este y todos los casos futuros';
+$labels['youhaveaccepted'] = 'Ha aceptado esta invitación';
+$labels['youhavetentative'] = 'Ha aceptado esta invitación provisionalmente';
+$labels['youhavedeclined'] = 'Ha declinado esta invitación';
+$labels['youhavedelegated'] = 'Ha delegado esta invitación';
+$labels['youhavein-process'] = 'Está trabajando en esta asignación';
+$labels['youhavecompleted'] = 'Ha completado esta asignación';
+$labels['youhaveneeds-action'] = 'Sigue pendiente su respuesta a esta convitación';
+$labels['youhavepreviouslyaccepted'] = 'Ha aceptado esta invitación anteriormente';
+$labels['youhavepreviouslytentative'] = 'Ya ha aceptado esta invitación provisionalmente';
+$labels['youhavepreviouslydeclined'] = 'Ha declinado esta invitación anteriormente';
+$labels['youhavepreviouslydelegated'] = 'Ha adelegado esta invitación anteriormente';
+$labels['youhavepreviouslyin-process'] = 'Ya ha informado anteriormente para trabajar en esta asignación';
+$labels['youhavepreviouslycompleted'] = 'Ya ha completado esta asignación';
+$labels['youhavepreviouslyneeds-action'] = 'Sigue pendiente su respuesta a esta invitación';
+$labels['attendeeaccepted'] = 'El participante ha aceptado';
+$labels['attendeetentative'] = 'El participante ha aceptado provisionalmente';
+$labels['attendeedeclined'] = 'El participante ha declinado';
+$labels['attendeedelegated'] = 'El participante ha delegado en $delegatedto';
+$labels['attendeein-process'] = 'El participante está en proceso';
+$labels['attendeecompleted'] = 'El participante ha completado';
+$labels['notanattendee'] = 'Usted no está en la lista como asistente de este proyecto';
+$labels['outdatedinvitation'] = 'Esta invitación se ha sustituido por una nueva versión';
+$labels['importtocalendar'] = 'Guardar en mi calendario';
+$labels['removefromcalendar'] = 'Eliminar de mi calendario';
+$labels['updatemycopy'] = 'Actualizar mi copia';
+$labels['openpreview'] = 'Abrir vista previa';
+$labels['deleteobjectconfirm'] = '¿Esta seguro de eliminar  este objeto?';
+$labels['declinedeleteconfirm'] = '¿También desea eliminar este objeto declinado del calendario?';
+$labels['delegateinvitation'] = 'Delegar invitación';
+$labels['delegateto'] = 'Delegar en';
+$labels['delegatersvpme'] = 'Mantenerme informado de las actualizaciones de esta incidencia';
+$labels['delegateinvalidaddress'] = 'Introduzca una dirección de correo electrónico válida para delegar';
 $labels['savingdata'] = 'Guardando datos...';
+$labels['expandattendeegroup'] = 'Sustituir con los miembros del grupo';
+$labels['expandattendeegroupnodata'] = 'No puede sustituirse este grupo. No se han encontrado miembros.';
+$labels['expandattendeegrouperror'] = 'No puede sustituirse este grupo. Tal vez tenga demasiados miembros.';
+$labels['expandattendeegroupsizelimit'] = 'Este grupo contiene demasiados miembros que sustituir.';

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/fr_FR.inc Changed

@@ -6,13 +6,13 @@
  *
  * For translation see https://www.transifex.com/projects/p/kolab/resource/libcalendaring/
  */
-$labels['until'] = 'Jusqu\'à';
+$labels['until'] = 'jusqu\'à';
 $labels['at'] = 'à';
-$labels['alarmemail'] = 'Envoyer un email';
+$labels['alarmemail'] = 'Envoyer un e-mail';
 $labels['alarmdisplay'] = 'Voir le message';
 $labels['alarmaudio'] = 'Alerte sonore';
 $labels['alarmdisplayoption'] = 'Message';
-$labels['alarmemailoption'] = 'Email';
+$labels['alarmemailoption'] = 'E-mail';
 $labels['alarmaudiooption'] = 'Son';
 $labels['alarmat'] = 'à $datetime';
 $labels['trigger@'] = 'à la date';
@@ -22,6 +22,18 @@
 $labels['trigger+M'] = 'minutes après';
 $labels['trigger+H'] = 'heures après';
 $labels['trigger+D'] = 'jours après';
+$labels['triggerend-M'] = 'minutes avant la fin';
+$labels['triggerend-H'] = 'heures avant la fin';
+$labels['triggerend-D'] = 'jours avant la fin';
+$labels['triggerend+M'] = 'minutes après la fin';
+$labels['triggerend+H'] = 'heures après la fin';
+$labels['triggerend+D'] = 'jours après la fin';
+$labels['trigger0'] = 'dans les temps';
+$labels['triggerattime'] = 'au début';
+$labels['triggerattimeend'] = 'à la fin';
+$labels['relatedstart'] = 'début';
+$labels['relatedendevent'] = 'fin';
+$labels['relatedendtask'] = 'date de fin';
 $labels['addalarm'] = 'Ajouter une alarme';
 $labels['removealarm'] = 'Supprimer l\'alarme';
 $labels['alarmtitle'] = 'Evénements à venir';
@@ -36,12 +48,12 @@
 $labels['showmore'] = 'Afficher plus...';
 $labels['recurring'] = 'Répétitions';
 $labels['frequency'] = 'Répéter';
-$labels['never'] = 'Jamais';
-$labels['daily'] = 'Quotidienne';
-$labels['weekly'] = 'Hebdomadaire';
-$labels['monthly'] = 'Mensuelle';
-$labels['yearly'] = 'Annuelle';
-$labels['rdate'] = 'on dates';
+$labels['never'] = 'jamais';
+$labels['daily'] = 'quotidienne';
+$labels['weekly'] = 'hebdomadaire';
+$labels['monthly'] = 'mensuelle';
+$labels['yearly'] = 'annuelle';
+$labels['rdate'] = 'à certaines dates';
 $labels['every'] = 'Tous les';
 $labels['days'] = 'jour(s)';
 $labels['weeks'] = 'semaine(s)';
@@ -51,9 +63,9 @@
 $labels['untildate'] = 'le';
 $labels['each'] = 'Chaque';
 $labels['onevery'] = 'Tous les';
-$labels['onsamedate'] = 'à la même date';
+$labels['onsamedate'] = 'À la même date';
 $labels['forever'] = 'toujours';
-$labels['recurrencend'] = 'Jusqu\'à';
+$labels['recurrencend'] = 'jusqu\'à';
 $labels['untilenddate'] = 'jusqu\'à la date';
 $labels['forntimes'] = '$nr fois';
 $labels['first'] = 'premier';
@@ -62,17 +74,20 @@
 $labels['fourth'] = 'quatrième';
 $labels['last'] = 'dernier';
 $labels['dayofmonth'] = 'Jour du mois';
-$labels['addrdate'] = 'Add repeat date';
+$labels['addrdate'] = 'Ajoutez une date répétée';
 $labels['except'] = 'sauf';
 $labels['statusorganizer'] = 'Organisateur';
+$labels['statusaccepted'] = 'Accepté';
 $labels['statustentative'] = 'Provisoire';
+$labels['statusdeclined'] = 'Refusé';
+$labels['statusdelegated'] = 'Délégué';
 $labels['statusneeds-action'] = 'Action exigée';
 $labels['statusunknown'] = 'Inconnu';
 $labels['statuscompleted'] = 'Terminée';
 $labels['statusin-process'] = 'En cours';
 $labels['itipinvitation'] = 'Invitation à';
 $labels['itipupdate'] = 'Mise à jour de';
-$labels['itipcancellation'] = 'Annulation:';
+$labels['itipcancellation'] = 'Annulation :';
 $labels['itipreply'] = 'Répondre à';
 $labels['itipaccepted'] = 'Accepter';
 $labels['itiptentative'] = 'Peut-être';
@@ -83,59 +98,59 @@
 $labels['itipeditresponse'] = 'Saisissez votre réponse';
 $labels['itipsendercomment'] = 'Commentaire des expéditeurs';
 $labels['itipsuppressreply'] = 'Ne pas envoyer de réponse';
-$labels['itipobjectnotfound'] = 'L\'objet en lié à ce message n\'a pas été trouvé sur votre compte.';
+$labels['itipobjectnotfound'] = 'L\'objet auquel il est fait référence dans ce message n\'a pas été trouvé dans votre compte.';
 $labels['itipsubjectaccepted'] = '"$title" a été accepté par $name';
-$labels['itipsubjecttentative'] = '"$title" a été accepté provisoirement par $name';
+$labels['itipsubjecttentative'] = '"$title" a provisoirement été accepté par $name';
 $labels['itipsubjectdeclined'] = '"$title" a été refusé par $name';
 $labels['itipsubjectin-process'] = '"$title" est en cours de traitement par $name';
-$labels['itipsubjectcompleted'] = '"$title" a été traité par $name';
+$labels['itipsubjectcompleted'] = '"$title" a été rempli par $name';
 $labels['itipsubjectcancel'] = 'Votre affectation à "$title" a été annulée';
 $labels['itipsubjectdelegated'] = '"$title$ a été délégué par $name';
 $labels['itipsubjectdelegatedto'] = '"$title" vous a été délégué par $name';
-$labels['itipnewattendee'] = 'Ceci est une réponse d\'un nouveau participant';
-$labels['updateattendeestatus'] = 'Modifier le statut des participants';
-$labels['acceptinvitation'] = 'Acceptez-vous cette invitation?';
+$labels['itipnewattendee'] = 'Voici la réponse d\'un nouveau participant';
+$labels['updateattendeestatus'] = 'Modifier le statut du participant';
+$labels['acceptinvitation'] = 'Acceptez-vous cette invitation ?';
 $labels['acceptattendee'] = 'Accepter l\'utilisateur';
-$labels['declineattendee'] = 'Décliner l\'utilisateur';
-$labels['declineattendeeconfirm'] = 'Saisissez un message pour l\'utilisateur qui décline l\'invitation (optionnel) :';
+$labels['declineattendee'] = 'Refuser l\'utilisateur';
+$labels['declineattendeeconfirm'] = 'Saisissez un message pour l\'utilisateur refusé (optionnel) :';
 $labels['rsvpmodeall'] = 'Les séries entières';
 $labels['rsvpmodecurrent'] = 'Cette occurrence seulement';
 $labels['rsvpmodefuture'] = 'Celle-ci et les occurrences futures';
 $labels['itipsingleoccurrence'] = 'C\'est une <em>seule occurrence</em> parmi une série d\'événements';
 $labels['itipfutureoccurrence'] = 'Se réfère à <em>celle-ci et à toutes les occurrences futures</em> parmi une série d\'événements';
-$labels['itipmessagesingleoccurrence'] = 'Le message se réfère seulement à cette seule occurrence';
+$labels['itipmessagesingleoccurrence'] = 'Le message se réfère seulement à cette occurrence';
 $labels['itipmessagefutureoccurrence'] = 'Le message se réfère à celle-ci et à toutes les occurrences futures';
 $labels['youhaveaccepted'] = 'Vous avez accepté cette invitation';
-$labels['youhavetentative'] = 'Vous avez accepté provisoirement cette invitation';
+$labels['youhavetentative'] = 'Vous avez provisoirement accepté cette invitation';
 $labels['youhavedeclined'] = 'Vous avez refusé cette invitation';
 $labels['youhavedelegated'] = 'Vous avez délégué cette invitation';
-$labels['youhavein-process'] = 'Vous traiter cette affectation';
+$labels['youhavein-process'] = 'Vous traitez cette affectation';
 $labels['youhavecompleted'] = 'Vous avez traité cette affectation';
 $labels['youhaveneeds-action'] = 'Vous êtes en attente d\'une réponse à cette invitation';
 $labels['youhavepreviouslyaccepted'] = 'Vous avez déjà accepté cette invitation';
 $labels['youhavepreviouslytentative'] = 'Vous avez déjà tenté d\'accepter cette invitation';
 $labels['youhavepreviouslydeclined'] = 'Vous avez déjà décliné cette invitation';
 $labels['youhavepreviouslydelegated'] = 'Vous avez déjà délégué cette invitation';
-$labels['youhavepreviouslyin-process'] = 'Vous avez déjà signalé que vous traitez cette affectation';
+$labels['youhavepreviouslyin-process'] = 'Vous avez déjà signalé que vous traitiez cette affectation';
 $labels['youhavepreviouslycompleted'] = 'Vous avez déjà fini le traitement de cette affectation';
-$labels['youhavepreviouslyneeds-action'] = 'Vous êtes en attente de la réponse pour cette invitation';
-$labels['attendeeaccepted'] = 'Cet utilisateur a accepté l\'invitaion';
+$labels['youhavepreviouslyneeds-action'] = 'Vous êtes en attente de réponse pour cette invitation';
+$labels['attendeeaccepted'] = 'Cet utilisateur a accepté l\'invitation';
 $labels['attendeetentative'] = 'Cette utilisateur tente d\'accepter l\'invitation';
 $labels['attendeedeclined'] = 'Cet utilisateur a décliné l\'invitation';
 $labels['attendeedelegated'] = 'Cet utilisateur a délégué à $delegatedto';
 $labels['attendeein-process'] = 'Cet utilisateur traite la tâche';
 $labels['attendeecompleted'] = 'Cet utilisateur a fini la tâche';
-$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet évènement';
-$labels['outdatedinvitation'] = 'Cet invitation a été remplacée par une nouvelle version';
-$labels['importtocalendar'] = 'Enregistrer dans mon agenda';
-$labels['removefromcalendar'] = 'Supprimer de mon agenda';
+$labels['notanattendee'] = 'Vous n\'êtes pas dans la liste des participants à cet événement';
+$labels['outdatedinvitation'] = 'Cette invitation a été remplacée par une nouvelle version';
+$labels['importtocalendar'] = 'Enregistrer dans mon calendrier';
+$labels['removefromcalendar'] = 'Supprimer de mon calendrier';
 $labels['updatemycopy'] = 'Mise à jour de ma copie';
 $labels['openpreview'] = 'Ouvrir la prévisualisation';
 $labels['deleteobjectconfirm'] = 'Voulez-vous vraiment supprimer cet objet ?';
 $labels['declinedeleteconfirm'] = 'Voulez-vous supprimer cet objet décliné de votre compte ?';
 $labels['delegateinvitation'] = 'Invitation à déléguer';
 $labels['delegateto'] = 'Déléguer à ';
-$labels['delegatersvpme'] = 'Me tenir informé des mises à jours de cet effet';
+$labels['delegatersvpme'] = 'Me tenir informé des mises à jour de cet effet';
 $labels['delegateinvalidaddress'] = 'Entrer une adresse électronique valide pour le délégué';
 $labels['savingdata'] = 'Enregistrer...';
 $labels['expandattendeegroup'] = 'Remplacement par les membres du groupe';

iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/lv.inc Added

@@ -0,0 +1,161 @@
+<?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'] = 'līdz';
+$labels['at'] = ' ';
+$labels['alarmemail'] = 'Nosūtīt e-pastu';
+$labels['alarmdisplay'] = 'Parādīt paziņojumu';
+$labels['alarmaudio'] = 'Spēlēt skaņu';
+$labels['alarmdisplayoption'] = 'Paziņojums';
+$labels['alarmemailoption'] = 'E-pasts';
+$labels['alarmaudiooption'] = 'Skaņa';
+$labels['alarmat'] = '$datetime';
+$labels['trigger@'] = 'tieši šai datumā';
+$labels['trigger-M'] = 'minūtes pirms';
+$labels['trigger-H'] = 'stundas pirms';
+$labels['trigger-D'] = 'dienas pirms';
+$labels['trigger+M'] = 'minūtes pēc';
+$labels['trigger+H'] = 'stundas pēc';
+$labels['trigger+D'] = 'dienas pēc';
+$labels['triggerend-M'] = 'minūtes pirms beigām';
+$labels['triggerend-H'] = 'stundas pirms beigām';
+$labels['triggerend-D'] = 'dienas pirms beigām';
+$labels['triggerend+M'] = 'minūtes pēc beigām';
+$labels['triggerend+H'] = 'stundas pēc beigām';
+$labels['triggerend+D'] = 'dienas pēc beigām';
+$labels['trigger0'] = 'tieši laikā';
+$labels['triggerattime'] = 'sākumā';
+$labels['triggerattimeend'] = 'beigās';
+$labels['relatedstart'] = 'sākums';
+$labels['relatedendevent'] = 'beigas';
+$labels['relatedendtask'] = 'ilgums';
+$labels['addalarm'] = 'Pievienot atgādinājumu';
+$labels['removealarm'] = 'Noņemt atgādinājumu';
+$labels['alarmtitle'] = 'Tuvojošies notikumi';
+$labels['dismissall'] = 'Aizmirst visus';
+$labels['dismiss'] = 'Aizmirst';
+$labels['snooze'] = 'Iesnausties';
+$labels['repeatinmin'] = 'Atgādināt $min minūtes pirms';
+$labels['repeatinhr'] = 'Atgādināt 1 stundu pirms';
+$labels['repeatinhrs'] = 'Atgādināt $hrs stundas pirms';
+$labels['repeattomorrow'] = 'Atgādināt rīt';
+$labels['repeatinweek'] = 'Atgādināt pēc nedēļas';
+$labels['showmore'] = 'Parādīt vairāk ...';
+$labels['recurring'] = 'Atkārtojumi';
+$labels['frequency'] = 'Atkārtot';
+$labels['never'] = 'nekad';
+$labels['daily'] = 'ikdienas';
+$labels['weekly'] = 'iknedēļas';
+$labels['monthly'] = 'ikmēneša';
+$labels['yearly'] = 'ikgadējs';
+$labels['rdate'] = 'datumos';
+$labels['every'] = 'Katrā';
+$labels['days'] = 'dienā(-s)';
+$labels['weeks'] = 'nedēļā(-s)';
+$labels['months'] = 'mēnesī(-šos)';
+$labels['years'] = 'gadā(-os)';
+$labels['bydays'] = ' ';
+$labels['untildate'] = ' ';
+$labels['each'] = 'Katru';
+$labels['onevery'] = 'Katrā';
+$labels['onsamedate'] = 'Tai pašā dienā';
+$labels['forever'] = 'bezgalīgi';
+$labels['recurrencend'] = 'līdz';
+$labels['untilenddate'] = 'līdz datumam';
+$labels['forntimes'] = '$nr reizi(-es)';
+$labels['first'] = 'pirmā';
+$labels['second'] = 'otrā';
+$labels['third'] = 'trešā';
+$labels['fourth'] = 'ceturtā';
+$labels['last'] = 'pēdējā';
+$labels['dayofmonth'] = 'Mēneša diena';
+$labels['addrdate'] = 'Pievienot atkārtošanas datumu';
+$labels['except'] = 'izņemot';
+$labels['statusorganizer'] = 'Organizētājs';
+$labels['statusaccepted'] = 'Pieņemts';
+$labels['statustentative'] = 'Varbūt';
+$labels['statusdeclined'] = 'Noraidīts';
+$labels['statusdelegated'] = 'Deleģēts';
+$labels['statusneeds-action'] = 'Nepieciešama darbība';
+$labels['statusunknown'] = 'Nezināms';
+$labels['statuscompleted'] = 'Pabeigts';
+$labels['statusin-process'] = 'Procesā';
+$labels['itipinvitation'] = 'Uzaicinājums uz';
+$labels['itipupdate'] = 'Izmaiņas';
+$labels['itipcancellation'] = 'Atcelts:';
+$labels['itipreply'] = 'Atbildēt:';
+$labels['itipaccepted'] = 'Pieņemt';
+$labels['itiptentative'] = 'Varbūt';
+$labels['itipdeclined'] = 'Noraidīt';
+$labels['itipdelegated'] = 'Deleģēt';
+$labels['itipneeds-action'] = 'Aizturēt';
+$labels['itipcomment'] = 'Jūsu atbilde';
+$labels['itipeditresponse'] = 'Ievadiet atbildes tekstu';
+$labels['itipsendercomment'] = 'Sūtītāja piezīmes:';
+$labels['itipsuppressreply'] = 'Nesūtīt atbildi';
+$labels['itipobjectnotfound'] = 'Nav atrodams objekts uz ko atsaucas šis ziņojums ';
+$labels['itipsubjectaccepted'] = '$name pieņēma "$title"';
+$labels['itipsubjecttentative'] = '$name akceptēja varbūtēju dalību "$title"';
+$labels['itipsubjectdeclined'] = '
+$name noraidīja "$title"
+';
+$labels['itipsubjectin-process'] = '$name apstrādā "$title"';
+$labels['itipsubjectcompleted'] = '$name pabeidza "$title"';
+$labels['itipsubjectcancel'] = 'Jūsu dalība "$title" tika atcelta';
+$labels['itipsubjectdelegated'] = '$name deleģēja "$title"';
+$labels['itipsubjectdelegatedto'] = '$name deleģēja jums "$title"';
+$labels['itipnewattendee'] = 'Šī ir atbilde no jauna dalībnieka';
+$labels['updateattendeestatus'] = 'Atjaunot dalībnieka statusu';
+$labels['acceptinvitation'] = 'Vai pieņemat šo uzaicinājumu?';
+$labels['acceptattendee'] = 'Pievienot dalībnieku';
+$labels['declineattendee'] = 'Noraidīt dalībnieku';
+$labels['declineattendeeconfirm'] = 'Ievadiet (neobligātu) ziņojumu noraidītajam dalībniekam:';
+$labels['rsvpmodeall'] = 'Visa virkne';
+$labels['rsvpmodecurrent'] = 'Tikai šai reizē';
+$labels['rsvpmodefuture'] = 'Šai un nākošajās reizēs';
+$labels['itipsingleoccurrence'] = 'Šis ir <em>vienreizējs</em> notikums no virknes';
+$labels['itipfutureoccurrence'] = 'Attiecas uz <em>šo un visām nākamajām</em> notikuma reizēm';
+$labels['itipmessagesingleoccurrence'] = 'Ziņojums attiecas tikai uz šo vienu reizi';
+$labels['itipmessagefutureoccurrence'] = 'Ziņojums attiecas uz šo un visām nākamajām reizēm';
+$labels['youhaveaccepted'] = 'Jūs pieņēmāt šo uzaicinājumu';
+$labels['youhavetentative'] = 'Jūs varbūtēji akceptējāt šo uzaicinājumu';
+$labels['youhavedeclined'] = 'Jūs noraidījāt šo uzaicinājumu';
+$labels['youhavedelegated'] = 'Jūs deleģējāt šo uzaicinājumu';
+$labels['youhavein-process'] = 'Jūs strādājat pie šī norīkojuma';
+$labels['youhavecompleted'] = 'Jūs esat pabeidzis šo norīkojumu';
+$labels['youhaveneeds-action'] = 'Tiek gaidīta jūsu atbilde uz šo uzaicinājumu';
+$labels['youhavepreviouslyaccepted'] = 'Jūs jau bijāt pieņēmis šo uzaicinājumu';
+$labels['youhavepreviouslytentative'] = 'Jūs jau bijāt varbūtēji akceptējis šo uzaicinājumu';
+$labels['youhavepreviouslydeclined'] = 'Jūs jau bijāt noraidījis šo uzaicinājumu';
+$labels['youhavepreviouslydelegated'] = 'Jūs jau bijāt deleģējis šo uzaicinājumu';
+$labels['youhavepreviouslyin-process'] = 'Jūs jau esat ziņojis par veikto darbu šai norīkojumā';
+$labels['youhavepreviouslycompleted'] = 'Jūs jau agrāk esat izpildījis šo norīkojumu';
+$labels['youhavepreviouslyneeds-action'] = 'Tiek gaidīta jūsu atbilde uz šo uzaicinājumu';
+$labels['attendeeaccepted'] = 'Dalībnieks pieņēma';
+$labels['attendeetentative'] = 'Dalībnieks varbūtēji pieņēma';
+$labels['attendeedeclined'] = 'Dalībnieks noraidīja';
+$labels['attendeedelegated'] = 'Dalībnieks deleģēja $delegatedto';
+$labels['attendeein-process'] = 'Dalībnieks apstrādā';
+$labels['attendeecompleted'] = 'Dalībnieks beidza apstrādi';
+$labels['notanattendee'] = 'Jūs neesat šī objekta dalībnieku sarakstā';
+$labels['outdatedinvitation'] = 'Šis uzaicinājums ir aizstāts ar jaunāku versiju';
+$labels['importtocalendar'] = 'Saglabāt manā kalendārā';
+$labels['removefromcalendar'] = 'Dzēst no mana kalendāra';
+$labels['updatemycopy'] = 'Jaunināt manu kopiju';
+$labels['openpreview'] = 'Atvērt priekšskatu';
+$labels['deleteobjectconfirm'] = 'Vai tiešām vēlaties dzēst šo objektu?';
+$labels['declinedeleteconfirm'] = 'Vai jūs vēlaties arī dzēst šo noraidīto uzaicinājumu no sava konta?';
+$labels['delegateinvitation'] = 'Deleģēt uzaicinājumu';
+$labels['delegateto'] = 'Deleģēt';
+$labels['delegatersvpme'] = 'Informēt mani par šī notikuma izmaiņām';
+$labels['delegateinvalidaddress'] = 'Lūdzu ievadiet derīgu e-pasta adresi, kam jūs deleģējat';
+$labels['savingdata'] = 'Saglabājam...';
+$labels['expandattendeegroup'] = 'Aizstāt ar grupas locekļiem';
+$labels['expandattendeegroupnodata'] = 'Grupu nevar aizstāt. Tajā nav neviena locekļa.';
+$labels['expandattendeegrouperror'] = 'Grupu nevar aizstāt. Tajā ir pārāk daudz locekļu.';
+$labels['expandattendeegroupsizelimit'] = 'Grupu nevar aizstāt. Tajā ir pārāk daudz locekļu.';

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/nl_NL.inc Changed

@@ -8,10 +8,12 @@
  */
 $labels['until'] = 'tot';
 $labels['at'] = 'om';
-$labels['alarmemail'] = 'Verzend E-mail';
+$labels['alarmemail'] = 'E-mail versturen';
 $labels['alarmdisplay'] = 'Bericht weergeven';
+$labels['alarmaudio'] = 'Geluid afspelen';
 $labels['alarmdisplayoption'] = 'Bericht';
 $labels['alarmemailoption'] = 'E-mail';
+$labels['alarmaudiooption'] = 'Geluid';
 $labels['alarmat'] = 'op $datetime';
 $labels['trigger@'] = 'op datum';
 $labels['trigger-M'] = 'minuten voor';
@@ -20,32 +22,51 @@
 $labels['trigger+M'] = 'minuten na';
 $labels['trigger+H'] = 'uren na';
 $labels['trigger+D'] = 'dagen na';
-$labels['alarmtitle'] = 'Aankomende evenementen';
-$labels['repeatinmin'] = 'Herhaal over $min minuten';
-$labels['repeatinhr'] = 'Herhaal over 1 uur';
-$labels['repeatinhrs'] = 'Herhaal over $hrs uur';
-$labels['repeattomorrow'] = 'Herhaal morgen';
-$labels['repeatinweek'] = 'Herhaal over een week';
-$labels['showmore'] = 'Toon meer...';
-$labels['frequency'] = 'Herhaal';
+$labels['triggerend-M'] = 'minuten vóór einde';
+$labels['triggerend-H'] = 'uren vóór einde';
+$labels['triggerend-D'] = 'dagen vóór einde';
+$labels['triggerend+M'] = 'minuten na einde';
+$labels['triggerend+H'] = 'uren na einde';
+$labels['triggerend+D'] = 'dagen na einde';
+$labels['trigger0'] = 'op tijd';
+$labels['triggerattime'] = 'op begintijd';
+$labels['triggerattimeend'] = 'op eindtijd';
+$labels['relatedstart'] = 'begin';
+$labels['relatedendevent'] = 'einde';
+$labels['relatedendtask'] = 'vervaltijd';
+$labels['addalarm'] = 'Herinnering toevoegen';
+$labels['removealarm'] = 'Herinnering verwijderen';
+$labels['alarmtitle'] = 'Geplande activiteiten';
+$labels['dismissall'] = 'Alles negeren';
+$labels['dismiss'] = 'Negeren';
+$labels['snooze'] = 'Uitstellen';
+$labels['repeatinmin'] = 'Binnen $min minuten herhalen';
+$labels['repeatinhr'] = 'Binnen 1 uur herhalen';
+$labels['repeatinhrs'] = 'Binnen $hrs uren herhalen';
+$labels['repeattomorrow'] = 'Morgen herhalen';
+$labels['repeatinweek'] = 'Binnen een week herhalen';
+$labels['showmore'] = 'Meer tonen...';
+$labels['recurring'] = 'Herhalingen';
+$labels['frequency'] = 'Herhalen';
 $labels['never'] = 'nooit';
-$labels['daily'] = 'dagelijks';
-$labels['weekly'] = 'wekelijks';
-$labels['monthly'] = 'maandelijks';
-$labels['yearly'] = 'jaarlijks';
+$labels['daily'] = 'elke dag';
+$labels['weekly'] = 'elke week';
+$labels['monthly'] = 'elke maand';
+$labels['yearly'] = 'elk jaar';
 $labels['rdate'] = 'op datums';
 $labels['every'] = 'Elke';
 $labels['days'] = 'dag(en)';
 $labels['weeks'] = 'week / weken';
 $labels['months'] = 'maand(en)';
-$labels['years'] = 'ja(a)r(en) in:';
+$labels['years'] = 'jaar (jaren)';
 $labels['bydays'] = 'Op';
 $labels['untildate'] = 'de';
 $labels['each'] = 'Elke';
 $labels['onevery'] = 'Op elke';
 $labels['onsamedate'] = 'Op dezelfde datum';
-$labels['forever'] = 'oneindig';
+$labels['forever'] = 'voor altijd';
 $labels['recurrencend'] = 'tot';
+$labels['untilenddate'] = 'tot datum';
 $labels['forntimes'] = 'voor $nr keer';
 $labels['first'] = 'eerste';
 $labels['second'] = 'tweede';
@@ -53,42 +74,86 @@
 $labels['fourth'] = 'vierde';
 $labels['last'] = 'laatste';
 $labels['dayofmonth'] = 'Dag van de maand';
-$labels['addrdate'] = 'Voeg herhaal datum toe';
-$labels['statusorganizer'] = 'Organisatie';
+$labels['addrdate'] = 'Herhaaldatum toevoegen';
+$labels['except'] = 'behalve';
+$labels['statusorganizer'] = 'Organisator';
+$labels['statusaccepted'] = 'Geaccepteerd';
 $labels['statustentative'] = 'Misschien';
-$labels['statusneeds-action'] = 'Needs action';
+$labels['statusdeclined'] = 'Afgeslagen';
+$labels['statusdelegated'] = 'Gedelegeerd';
+$labels['statusneeds-action'] = 'Actie vereist';
 $labels['statusunknown'] = 'Onbekend';
-$labels['statuscompleted'] = 'Completed';
-$labels['statusin-process'] = 'In process';
+$labels['statuscompleted'] = 'Voltooid';
+$labels['statusin-process'] = 'In behandeling';
 $labels['itipinvitation'] = 'Uitnodiging voor';
 $labels['itipupdate'] = 'Update van';
-$labels['itipcancellation'] = 'Afgelast:';
-$labels['itipaccepted'] = 'Accepteer';
+$labels['itipcancellation'] = 'Geannuleerd:';
+$labels['itipreply'] = 'Antwoord aan';
+$labels['itipaccepted'] = 'Accepteren';
 $labels['itiptentative'] = 'Misschien';
-$labels['itipdeclined'] = 'Afwijzen';
+$labels['itipdeclined'] = 'Afslaan';
 $labels['itipdelegated'] = 'Gedelegeerde';
+$labels['itipneeds-action'] = 'Uitstellen';
 $labels['itipcomment'] = 'Uw antwoord';
-$labels['itipeditresponse'] = 'Voeg een antwoord tekst toe';
-$labels['itipsendercomment'] = 'Opmerking van verzender:';
-$labels['itipobjectnotfound'] = 'Het object waaraan in dit bericht wordt gerefereerd is niet gevonden in uw account.';
+$labels['itipeditresponse'] = 'Typ het antwoord';
+$labels['itipsendercomment'] = 'Opmerking van afzender:';
+$labels['itipsuppressreply'] = 'Geen antwoord sturen';
+$labels['itipobjectnotfound'] = 'Het object uit dit bericht is niet in uw account gevonden.';
 $labels['itipsubjectaccepted'] = '"$title" is geaccepteerd door $name';
+$labels['itipsubjecttentative'] = '"$title" is onder voorbehoud geaccepteerd door $name';
+$labels['itipsubjectdeclined'] = '"$title" is afgeslagen door $name';
+$labels['itipsubjectin-process'] = '"$title" wordt behandeld door $name';
+$labels['itipsubjectcompleted'] = '"$title" is voltooid door $name';
 $labels['itipsubjectcancel'] = 'Uw deelname aan "$title" is geannuleerd';
+$labels['itipsubjectdelegated'] = '"$title" is gedelegeerd door $name';
+$labels['itipsubjectdelegatedto'] = '"$title" is door $name gedelegeerd aan u';
 $labels['itipnewattendee'] = 'Dit is een antwoord van een nieuwe deelnemer';
-$labels['updateattendeestatus'] = 'Update status van deelnemer';
-$labels['acceptinvitation'] = 'Accepteer je deze uitnodiging?';
-$labels['acceptattendee'] = 'Accepteer deelnemer';
-$labels['declineattendee'] = 'Afwijzen deelnemer';
+$labels['updateattendeestatus'] = 'Status van deelnemer bijwerken';
+$labels['acceptinvitation'] = 'Accepteert u deze uitnodiging?';
+$labels['acceptattendee'] = 'Deelnemer accepteren';
+$labels['declineattendee'] = 'Deelnemer afwijzen';
 $labels['declineattendeeconfirm'] = 'Voeg een bericht toe voor de afgewezen deelnemer (optioneel):';
-$labels['youhaveaccepted'] = 'Je hebt de uitnodiging geaccepteerd';
-$labels['youhavedeclined'] = 'Je hebt deze uitnodiging afgewezen';
-$labels['youhavedelegated'] = 'U heeft deze uitnodiging gedelegeerd';
+$labels['rsvpmodeall'] = 'De gehele reeks';
+$labels['rsvpmodecurrent'] = 'Alleen deze activiteit';
+$labels['rsvpmodefuture'] = 'Deze en toekomstige activiteiten';
+$labels['itipsingleoccurrence'] = 'Dit is <em>een enkele activiteit</em> uit een reeks activiteiten';
+$labels['itipfutureoccurrence'] = 'Verwijst naar <em>deze en alle toekomstige activiteiten</em> uit een reeks activiteiten';
+$labels['itipmessagesingleoccurrence'] = 'Het bericht verwijst alleen naar deze activiteit';
+$labels['itipmessagefutureoccurrence'] = 'Het bericht verwijst naar deze en alle toekomstige activiteiten';
+$labels['youhaveaccepted'] = 'U hebt deze uitnodiging geaccepteerd';
+$labels['youhavetentative'] = 'U hebt deze uitnodiging onder voorbehoud geaccepteerd';
+$labels['youhavedeclined'] = 'U hebt deze uitnodiging afgeslagen';
+$labels['youhavedelegated'] = 'U hebt deze uitnodiging gedelegeerd';
+$labels['youhavein-process'] = 'U werkt momenteel aan deze opdracht';
+$labels['youhavecompleted'] = 'U hebt deze opdracht voltooid';
+$labels['youhaveneeds-action'] = 'U hebt deze uitnodiging nog niet beantwoord';
+$labels['youhavepreviouslyaccepted'] = 'U hebt deze uitnodiging eerder al geaccepteerd';
+$labels['youhavepreviouslytentative'] = 'U hebt deze uitnodiging eerder al onder voorbehoud geaccepteerd';
+$labels['youhavepreviouslydeclined'] = 'U hebt deze uitnodiging eerder al afgeslagen';
+$labels['youhavepreviouslydelegated'] = 'U hebt deze uitnodiging eerder al gedelegeerd';
+$labels['youhavepreviouslyin-process'] = 'U hebt eerder al gemeld dat u aan deze opdracht werkt';
+$labels['youhavepreviouslycompleted'] = 'U hebt deze opdracht eerder al voltooid';
+$labels['youhavepreviouslyneeds-action'] = 'U hebt deze uitnodiging nog niet beantwoord';
 $labels['attendeeaccepted'] = 'Deelnemer heeft geaccepteerd';
-$labels['attendeetentative'] = 'Deelnemer heeft voorwaardelijk geaccepteerd';
-$labels['attendeedeclined'] = 'Deelnemer heeft afgewezen ';
-$labels['attendeedelegated'] = 'Deelnemer heeft gedelegeerd aan ';
-$labels['importtocalendar'] = 'Bewaar in mijn kalender';
-$labels['removefromcalendar'] = 'Verwijder van mijn kalender';
-$labels['updatemycopy'] = 'Wijzig mijn kopie';
-$labels['deleteobjectconfirm'] = 'Wilt u echt dit object verwijderen?';
-$labels['declinedeleteconfirm'] = 'Wilt u tevens deze afgewezen object verwijderen uit uw kalender?';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
+$labels['attendeetentative'] = 'Deelnemer heeft onder voorbehoud geaccepteerd';
+$labels['attendeedeclined'] = 'Deelnemer heeft afgeslagen';
+$labels['attendeedelegated'] = 'Deelnemer heeft gedelegeerd aan $delegatedto';
+$labels['attendeein-process'] = 'De deelnemer heeft de status gewijzigd in ‘In behandeling’';
+$labels['attendeecompleted'] = 'De deelnemer heeft de status gewijzigd in ‘Voltooid’';
+$labels['notanattendee'] = 'U staat niet op de lijst met deelnemers aan deze activiteit';
+$labels['outdatedinvitation'] = 'Deze uitnodiging is vervangen door een nieuwere versie';
+$labels['importtocalendar'] = 'Opslaan in mijn agenda';
+$labels['removefromcalendar'] = 'Verwijderen uit mijn agenda';
+$labels['updatemycopy'] = 'Mijn exemplaar bijwerken';
+$labels['openpreview'] = 'Voorbeeld openen';
+$labels['deleteobjectconfirm'] = 'Weet u zeker dat u dit object wilt verwijderen?';
+$labels['declinedeleteconfirm'] = 'Wilt u dit afgewezen object ook verwijderen uit uw account?';
+$labels['delegateinvitation'] = 'Uitnodiging delegeren';
+$labels['delegateto'] = 'Delegeren aan';
+$labels['delegatersvpme'] = 'Houd me op de hoogte over updates voor deze incidentie';
+$labels['delegateinvalidaddress'] = 'Voer een geldig e-mailadres voor de gedelegeerde in';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['expandattendeegroup'] = 'Vervangen door groepsleden';
+$labels['expandattendeegroupnodata'] = 'Deze groep kan niet worden vervangen. Geen leden gevonden.';
+$labels['expandattendeegrouperror'] = 'Deze groep kan niet worden vervangen. De groep bevat mogelijk te veel leden.';
+$labels['expandattendeegroupsizelimit'] = 'Deze groep bevat te veel leden om te vervangen.';

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/pt_PT.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/pt_PT.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/localization/ru_RU.inc -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/localization/ru_RU.inc Changed

@@ -33,6 +33,8 @@
 $labels['triggerattimeend'] = 'в момент окончания';
 $labels['relatedstart'] = 'начало';
 $labels['relatedendevent'] = 'окончание';
+$labels['relatedendtask'] = 'срок';
+$labels['addalarm'] = 'Добавить напоминание';
 $labels['removealarm'] = 'Удалить уведомление';
 $labels['alarmtitle'] = 'Предстоящие события';
 $labels['dismissall'] = 'Отменить все';
@@ -75,7 +77,10 @@
 $labels['addrdate'] = 'Add repeat date';
 $labels['except'] = 'исключая';
 $labels['statusorganizer'] = 'Организатор';
+$labels['statusaccepted'] = 'Принято';
 $labels['statustentative'] = 'Неопределённо';
+$labels['statusdeclined'] = 'Отклонено';
+$labels['statusdelegated'] = 'Поручено';
 $labels['statusneeds-action'] = 'Требует действия';
 $labels['statusunknown'] = 'Неизвестно';
 $labels['statuscompleted'] = 'Завершенные';
@@ -105,6 +110,8 @@
 $labels['itipnewattendee'] = 'Это ответ от нового участника';
 $labels['updateattendeestatus'] = 'Обновить статус участника';
 $labels['acceptinvitation'] = 'Вы принимаете это приглашение?';
+$labels['acceptattendee'] = 'Добавить участника';
+$labels['declineattendee'] = 'Удалить участника';
 $labels['declineattendeeconfirm'] = 'Введите сообщение для отклонённого участника (не обязательно):';
 $labels['rsvpmodeall'] = 'Вся серия';
 $labels['rsvpmodecurrent'] = 'Только это событие';
@@ -127,6 +134,7 @@
 $labels['youhavepreviouslyin-process'] = 'Вы уже предоставили отчет о проделанной работе на это задание';
 $labels['youhavepreviouslycompleted'] = 'Вы уже завершили это задание';
 $labels['youhavepreviouslyneeds-action'] = 'Ваш ответ на это приглашение всё ещё ожидается';
+$labels['attendeeaccepted'] = 'Участник принял';
 $labels['attendeetentative'] = 'Участник предварительно принял приглашение';
 $labels['attendeedeclined'] = 'Участник отказался от приглашения';
 $labels['attendeedelegated'] = 'Участник делегировал приглашение $delegatedto';

iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/skins/larry/images Added

iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/skins/larry/images/badge.png Changed

iRony-0.4.0.tar.gz/lib/plugins/libcalendaring/skins/larry/libcal.css -> iRony-0.4.1.tar.gz/lib/plugins/libcalendaring/skins/larry/libcal.css Changed

@@ -118,8 +118,9 @@
 	min-width: 5em;
 }
 
-#edit-recurrence-yearly-bymonthblock {
-	margin-left: 7.5em;
+.recurrence-form .event-section label + div,
+.recurrence-form .form-section label + div {
+	display: inline-block;
 }
 
 #edit-recurrence-rdates {
@@ -131,6 +132,10 @@
 	overflow: auto;
 }
 
+#edit-recurrence-rdates:empty {
+	margin: 0;
+}
+
 #edit-recurrence-rdates li {
 	display: block;
 	position: relative;
@@ -140,20 +145,12 @@
 
 #edit-recurrence-rdates li a.delete {
 	position: absolute;
-	top: 2px;
+	top: 5px;
 	right: 0;
-	width: 20px;
-	height: 18px;
+	width: 8px;
+	height: 16px;
 	background-position: -7px -337px;
-}
-
-#recurrence-form-until div.line {
-	margin-left: 7.5em;
-	margin-bottom: 0.3em;
-}
-
-#recurrence-form-until div.line.first {
-	margin-top: -1.4em;
+	border: 0;
 }
 
 .itip-dialog-form input.text {
@@ -164,3 +161,61 @@
 	margin-left: 0;
 	margin-right: 10px;
 }
+
+.edit-attendees-table td.options a.button {
+	border: 0;
+}
+
+.ui-widget-content a.button {
+	color: #52525;
+}
+
+#event-status-badge {
+	width: 100px;
+	height: 100px;
+	position: absolute;
+	top: 0;
+	right: 0;
+	overflow: hidden;
+}
+
+#event-status-badge span {
+	display: none;
+	text-transform: uppercase;
+	width: 150px;
+	height: 20px;
+	line-height: 20px;
+	position: absolute;
+	left: -20px;
+	top: 35px;
+	padding-left: 10px;
+	text-align: center;
+	font-weight: bold;
+	font-size: 12px;
+	color: #fff;
+	box-shadow: 1px 1px 2px #ccc, -1px -1px 2px #ccc;
+	-webkit-transform: rotate(45deg);
+	-moz-transform: rotate(45deg);
+	-ms-transform: rotate(45deg);
+	-o-transform: rotate(45deg);
+	transform: rotate(45deg);
+}
+
+.status-cancelled #event-status-badge span {
+	background: url(images/badge.png) 26px -24px no-repeat #cc0000;
+	display: block;
+}
+
+.sensitivity-private #event-status-badge span {
+	background: url(images/badge.png) 40px -52px no-repeat #0066ff;
+	display: block;
+}
+
+.sensitivity-confidential #event-status-badge span {
+	background: url(images/badge.png) 20px 2px no-repeat #cc0000;
+	display: block;
+}
+
+#edit-attendees-comment {
+	margin-top: .5em;
+}

iRony-0.4.0.tar.gz/lib/plugins/libkolab/SQL/mysql.initial.sql -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/mysql.initial.sql Changed

@@ -1,7 +1,7 @@
 /**
  * libkolab database schema
  *
- * @version 1.1
+ * @version 1.2
  * @author Thomas Bruederli
  * @licence GNU AGPL
  **/
@@ -29,7 +29,7 @@
 CREATE TABLE `kolab_cache_contact` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -53,7 +53,7 @@
 CREATE TABLE `kolab_cache_event` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -73,7 +73,7 @@
 CREATE TABLE `kolab_cache_task` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -93,7 +93,7 @@
 CREATE TABLE `kolab_cache_journal` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -113,7 +113,7 @@
 CREATE TABLE `kolab_cache_note` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -131,7 +131,7 @@
 CREATE TABLE `kolab_cache_file` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -151,7 +151,7 @@
 CREATE TABLE `kolab_cache_configuration` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -171,7 +171,7 @@
 CREATE TABLE `kolab_cache_freebusy` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -188,4 +188,4 @@
 
 /*!40014  SET FOREIGN_KEY_CHECKS=1 */;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2015020600');
+REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2018021300');

iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/mysql/2017071900.sql Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/mysql/2018021300.sql Added

iRony-0.4.0.tar.gz/lib/plugins/libkolab/SQL/oracle.initial.sql -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/oracle.initial.sql Changed

@@ -1,7 +1,7 @@
 /**
  * libkolab database schema
  *
- * @version 1.1
+ * @version 1.2
  * @author Aleksander Machniak
  * @licence GNU AGPL
  **/
@@ -33,7 +33,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -56,7 +56,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -75,7 +75,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -94,7 +94,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -113,7 +113,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -130,7 +130,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -149,7 +149,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -168,7 +168,7 @@
     "folder_id" number NOT NULL
         REFERENCES "kolab_folders" ("folder_id") ON DELETE CASCADE,
     "msguid" number NOT NULL,
-    "uid" varchar(128) NOT NULL,
+    "uid" varchar(512) NOT NULL,
     "created" timestamp DEFAULT NULL,
     "changed" timestamp DEFAULT NULL,
     "data" clob NOT NULL,
@@ -183,4 +183,4 @@
 CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
 
 
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2015020600');
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2018021300');

iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/oracle/2017071900.sql Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/oracle/2018021300.sql Changed

iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/sqlite Added

iRony-0.4.0.tar.gz/lib/plugins/libkolab/SQL/sqlite.initial.sql -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/sqlite.initial.sql Changed

@@ -1,7 +1,7 @@
 /**
  * libkolab database schema
  *
- * @version 1.1
+ * @version 1.2
  * @author Thomas Bruederli
  * @licence GNU AGPL
  **/
@@ -21,7 +21,7 @@
 CREATE TABLE kolab_cache_contact (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -42,7 +42,7 @@
 CREATE TABLE kolab_cache_event (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -59,7 +59,7 @@
 CREATE TABLE kolab_cache_task (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -76,7 +76,7 @@
 CREATE TABLE kolab_cache_journal (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -93,7 +93,7 @@
 CREATE TABLE kolab_cache_note (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -108,7 +108,7 @@
 CREATE TABLE kolab_cache_file (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -125,7 +125,7 @@
 CREATE TABLE kolab_cache_configuration (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -142,7 +142,7 @@
 CREATE TABLE kolab_cache_freebusy (
   folder_id INTEGER NOT NULL,
   msguid INTEGER NOT NULL,
-  uid VARCHAR(128) NOT NULL,
+  uid VARCHAR(512) NOT NULL,
   created DATETIME DEFAULT NULL,
   changed DATETIME DEFAULT NULL,
   data TEXT NOT NULL,
@@ -156,4 +156,4 @@
 
 CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);
 
-INSERT INTO system (name, value) VALUES ('libkolab-version', '2015020600');
+INSERT INTO system (name, value) VALUES ('libkolab-version', '2018021300');

iRony-0.4.1.tar.gz/lib/plugins/libkolab/SQL/sqlite/2017071900.sql Added

@@ -0,0 +1,146 @@
+TRUNCATE kolab_folders;
+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,
+  xml 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,
+  xml 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,
+  xml 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,
+  xml 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,
+  xml 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,
+  xml 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,
+  xml 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,
+  xml 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.1.tar.gz/lib/plugins/libkolab/SQL/sqlite/2018021300.sql Added

iRony-0.4.0.tar.gz/lib/plugins/libkolab/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/composer.json Changed

iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_attachments_handler.php Added

@@ -0,0 +1,370 @@
+<?php
+
+/**
+ * Shared code for attachments handling in Kolab plugins
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_attachments_handler
+{
+    private $rc;
+    private $attachment;
+
+    public function __construct()
+    {
+        $this->rc = rcmail::get_instance();
+    }
+
+    public static function ui()
+    {
+        $rcmail = rcmail::get_instance();
+        $self   = new self;
+
+        $rcmail->output->add_handler('plugin.attachments_form', array($self, 'files_form'));
+        $rcmail->output->add_handler('plugin.attachments_list', array($self, 'files_list'));
+        $rcmail->output->add_handler('plugin.filedroparea', array($self, 'files_drop_area'));
+    }
+
+    /**
+     * Generate HTML element for attachments list
+     */
+    public function files_list($attrib = array())
+    {
+        if (!$attrib['id']) {
+            $attrib['id'] = 'kolabattachmentlist';
+        }
+
+        // define list of file types which can be displayed inline
+        // same as in program/steps/mail/show.inc
+        $this->rc->output->set_env('mimetypes', (array)$this->rc->config->get('client_mimetypes'));
+
+        $this->rc->output->add_gui_object('attachmentlist', $attrib['id']);
+
+        return html::tag('ul', $attrib, '', html::$common_attrib);
+    }
+
+    /**
+     * Generate the form for event attachments upload
+     */
+    public function files_form($attrib = array())
+    {
+        // add ID if not given
+        if (!$attrib['id']) {
+            $attrib['id'] = 'kolabuploadform';
+        }
+
+        return $this->rc->upload_form($attrib, 'uploadform', 'upload-file', array('multiple' => true));
+    }
+
+    /**
+     * Register UI object for HTML5 drag & drop file upload
+     */
+    public function files_drop_area($attrib = array())
+    {
+        // add ID if not given
+        if (!$attrib['id']) {
+            $attrib['id'] = 'kolabfiledroparea';
+        }
+
+        $this->rc->output->add_gui_object('filedrop', $attrib['id']);
+        $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
+    }
+
+    /**
+     * Displays attachment preview page
+     */
+    public function attachment_page($attachment)
+    {
+        $this->attachment = $attachment;
+
+        $this->rc->plugins->include_script('libkolab/libkolab.js');
+
+        $this->rc->output->add_handler('plugin.attachmentframe', array($this, 'attachment_frame'));
+        $this->rc->output->add_handler('plugin.attachmentcontrols', array($this, 'attachment_header'));
+        $this->rc->output->set_env('filename', $attachment['name']);
+        $this->rc->output->set_env('mimetype', $attachment['mimetype']);
+        $this->rc->output->send('libkolab.attachment');
+    }
+
+    /**
+     * Handler for attachment uploads
+     */
+    public function attachment_upload($session_key, $id_prefix = '')
+    {
+        // Upload progress update
+        if (!empty($_GET['_progress'])) {
+            $this->rc->upload_progress();
+        }
+
+        $recid    = $id_prefix . rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
+        $uploadid = rcube_utils::get_input_value('_uploadid', rcube_utils::INPUT_GPC);
+
+        if (!is_array($_SESSION[$session_key]) || $_SESSION[$session_key]['id'] != $recid) {
+            $_SESSION[$session_key] = array();
+            $_SESSION[$session_key]['id'] = $recid;
+            $_SESSION[$session_key]['attachments'] = array();
+        }
+
+        // clear all stored output properties (like scripts and env vars)
+        $this->rc->output->reset();
+
+        if (is_array($_FILES['_attachments']['tmp_name'])) {
+            foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
+                // Process uploaded attachment if there is no error
+                $err = $_FILES['_attachments']['error'][$i];
+
+                if (!$err) {
+                    $filename   = $_FILES['_attachments']['name'][$i];
+                    $attachment = array(
+                        'path'     => $filepath,
+                        'size'     => $_FILES['_attachments']['size'][$i],
+                        'name'     => $filename,
+                        'mimetype' => rcube_mime::file_content_type($filepath, $filename, $_FILES['_attachments']['type'][$i]),
+                        'group'    => $recid,
+                    );
+
+                    $attachment = $this->rc->plugins->exec_hook('attachment_upload', $attachment);
+                }
+
+                if (!$err && $attachment['status'] && !$attachment['abort']) {
+                    $id = $attachment['id'];
+
+                    // store new attachment in session
+                    unset($attachment['status'], $attachment['abort']);
+                    $this->rc->session->append($session_key . '.attachments', $id, $attachment);
+
+                    if (($icon = $_SESSION[$session_key . '_deleteicon']) && is_file($icon)) {
+                        $button = html::img(array(
+                            'src' => $icon,
+                            'alt' => $this->rc->gettext('delete')
+                        ));
+                    }
+                    else if ($_SESSION[$session_key . '_textbuttons']) {
+                        $button = rcube::Q($this->rc->gettext('delete'));
+                    }
+                    else {
+                        $button = '';
+                    }
+
+                    $link_content = sprintf('<span class="attachment-name">%s</span><span class="attachment-size">(%s)</span>',
+                        rcube::Q($attachment['name']), $this->rc->show_bytes($attachment['size']));
+
+                    $delete_link = html::a(array(
+                            'href'       => "#delete",
+                            'class'      => 'delete',
+                            'onclick'    => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", rcmail_output::JS_OBJECT_NAME, $id),
+                            'title'      => $this->rc->gettext('delete'),
+                            'aria-label' => $this->rc->gettext('delete') . ' ' . $attachment['name'],
+                        ), $button);
+
+                    $content_link = html::a(array(
+                            'href'    => "#load",
+                            'class'   => 'filename',
+                            'onclick' => 'return false', // sprintf("return %s.command('load-attachment','rcmfile%s', this, event)", rcmail_output::JS_OBJECT_NAME, $id),
+                         ), $link_content);
+
+                    $content .= $_SESSION[$session_key . '_icon_pos'] == 'left' ? $delete_link.$content_link : $content_link.$delete_link;
+
+                    $this->rc->output->command('add2attachment_list', "rcmfile$id", array(
+                            'html'      => $content,
+                            'name'      => $attachment['name'],
+                            'mimetype'  => $attachment['mimetype'],
+                            'classname' => 'no-menu ' . rcube_utils::file2class($attachment['mimetype'], $attachment['name']),
+                            'complete'  => true
+                        ), $uploadid);
+                }
+                else {  // upload failed
+                    if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+                        $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
+                            'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+                    }
+                    else if ($attachment['error']) {
+                        $msg = $attachment['error'];
+                    }
+                    else {
+                        $msg = $this->rc->gettext('fileuploaderror');
+                    }
+
+                    $this->rc->output->command('display_message', $msg, 'error');
+                    $this->rc->output->command('remove_from_attachment_list', $uploadid);
+                }
+            }
+        }
+        else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            // if filesize exceeds post_max_size then $_FILES array is empty,
+            // show filesizeerror instead of fileuploaderror
+            if ($maxsize = ini_get('post_max_size'))
+                $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
+                    'size' => $this->rc->show_bytes(parse_bytes($maxsize)))));
+            else
+                $msg = $this->rc->gettext('fileuploaderror');
+
+            $this->rc->output->command('display_message', $msg, 'error');
+            $this->rc->output->command('remove_from_attachment_list', $uploadid);
+        }
+
+        $this->rc->output->send('iframe');
+    }
+
+
+    /**
+     * Deliver an event/task attachment to the client
+     * (similar as in Roundcube core program/steps/mail/get.inc)
+     */
+    public function attachment_get($attachment)
+    {
+        ob_end_clean();
+
+        if ($attachment && $attachment['body']) {
+            // allow post-processing of the attachment body
+            $part = new rcube_message_part;
+            $part->filename  = $attachment['name'];
+            $part->size      = $attachment['size'];
+            $part->mimetype  = $attachment['mimetype'];
+
+            $plugin = $this->rc->plugins->exec_hook('message_part_get', array(
+                'body'     => $attachment['body'],
+                'mimetype' => strtolower($attachment['mimetype']),
+                'download' => !empty($_GET['_download']),
+                'part'     => $part,
+            ));
+
+            if ($plugin['abort'])
+                exit;
+
+            $mimetype = $plugin['mimetype'];
+            list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
+
+            $browser = $this->rc->output->browser;
+
+            // send download headers
+            if ($plugin['download']) {
+                header("Content-Type: application/octet-stream");
+                if ($browser->ie)
+                    header("Content-Type: application/force-download");
+            }
+            else if ($ctype_primary == 'text') {
+                header("Content-Type: text/$ctype_secondary");
+            }
+            else {
+                header("Content-Type: $mimetype");
+                header("Content-Transfer-Encoding: binary");
+            }
+
+            // display page, @TODO: support text/plain (and maybe some other text formats)
+            if ($mimetype == 'text/html' && empty($_GET['_download'])) {
+                $OUTPUT = new rcmail_html_page();
+                // @TODO: use washtml on $body
+                $OUTPUT->write($plugin['body']);
+            }
+            else {
+                // don't kill the connection if download takes more than 30 sec.
+                @set_time_limit(0);
+
+                $filename = $attachment['name'];
+                $filename = preg_replace('[\r\n]', '', $filename);
+
+                if ($browser->ie && $browser->ver < 7)
+                    $filename = rawurlencode(abbreviate_string($filename, 55));
+                else if ($browser->ie)
+                    $filename = rawurlencode($filename);
+                else
+                    $filename = addcslashes($filename, '"');
+
+                $disposition = !empty($_GET['_download']) ? 'attachment' : 'inline';
+                header("Content-Disposition: $disposition; filename=\"$filename\"");
+
+                echo $plugin['body'];
+            }
+
+            exit;
+        }
+
+        // if we arrive here, the requested part was not found
+        header('HTTP/1.1 404 Not Found');
+        exit;
+    }
+
+    /**
+     * Show "loading..." page in attachment iframe
+     */
+    public function attachment_loading_page()
+    {
+        $url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
+        $message = $this->rc->gettext('loadingdata');
+
+        header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
+        print "<html>\n<head>\n"
+            . '<meta http-equiv="refresh" content="0; url='.rcube::Q($url).'">' . "\n"
+            . '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
+            . "</head>\n<body>\n$message\n</body>\n</html>";
+        exit;
+    }
+
+    /**
+     * Template object for attachment display frame
+     */
+    public function attachment_frame($attrib = array())
+    {
+        $mimetype = strtolower($this->attachment['mimetype']);
+        list($ctype_primary, $ctype_secondary) = explode('/', $mimetype);
+
+        $attrib['src'] = './?' . str_replace('_frame=', ($ctype_primary == 'text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']);
+
+        $this->rc->output->add_gui_object('attachmentframe', $attrib['id']);
+
+        return html::iframe($attrib);
+    }
+
+    /**
+     *
+     */
+    public function attachment_header($attrib = array())
+    {
+        $rcmail  = rcmail::get_instance();
+        $dl_link = strtolower($attrib['downloadlink']) == 'true';
+        $dl_url  = $this->rc->url(array('_frame' => null, '_download' => 1) + $_GET);
+        $table   = new html_table(array('cols' => $dl_link ? 3 : 2));
+
+        if (!empty($this->attachment['name'])) {
+            $table->add('title', rcube::Q($this->rc->gettext('filename')));
+            $table->add('header', rcube::Q($this->attachment['name']));
+
+            if ($dl_link) {
+                $table->add('download-link', html::a($dl_url, rcube::Q($this->rc->gettext('download'))));
+            }
+        }
+
+        if (!empty($this->attachment['mimetype'])) {
+            $table->add('title', rcube::Q($this->rc->gettext('type')));
+            $table->add('header', rcube::Q($this->attachment['mimetype']));
+        }
+
+        if (!empty($this->attachment['size'])) {
+            $table->add('title', rcube::Q($this->rc->gettext('filesize')));
+            $table->add('header', rcube::Q($this->rc->show_bytes($this->attachment['size'])));
+        }
+
+        $this->rc->output->set_env('attachment_download_url', $dl_url);
+
+        return $table->show($attrib);
+    }
+}

iRony-0.4.0.tar.gz/lib/plugins/libkolab/lib/kolab_date_recurrence.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_date_recurrence.php Changed

@@ -138,4 +138,95 @@
 
         return false;
     }
+
+    /**
+     * Find date/time of the first occurrence
+     */
+    public function first_occurrence()
+    {
+        $event      = $this->object->to_array();
+        $start      = clone $this->start;
+        $orig_start = clone $this->start;
+        $interval   = intval($event['recurrence']['INTERVAL'] ?: 1);
+
+        switch ($event['recurrence']['FREQ']) {
+        case 'WEEKLY':
+            if (empty($event['recurrence']['BYDAY'])) {
+                return $orig_start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}W"));
+            break;
+
+        case 'MONTHLY':
+            if (empty($event['recurrence']['BYDAY']) && empty($event['recurrence']['BYMONTHDAY'])) {
+                return $orig_start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}M"));
+            break;
+
+        case 'YEARLY':
+            if (empty($event['recurrence']['BYDAY']) && empty($event['recurrence']['BYMONTH'])) {
+                return $orig_start;
+            }
+
+            $start->sub(new DateInterval("P{$interval}Y"));
+            break;
+
+        case 'DAILY':
+            if (!empty($event['recurrence']['BYMONTH'])) {
+                break;
+            }
+
+        default:
+            return $orig_start;
+        }
+
+        $event['start'] = $start;
+        $event['recurrence']['INTERVAL'] = $interval;
+        if ($event['recurrence']['COUNT']) {
+            // Increase count so we do not stop the loop to early
+            $event['recurrence']['COUNT'] += 100;
+        }
+
+        // Create recurrence that starts in the past
+        $object_type = $this->object instanceof kolab_format_task ? 'task' : 'event';
+        $object      = kolab_format::factory($object_type, 3.0);
+        $object->set($event);
+        $recurrence = new self($object);
+
+        $orig_date = $orig_start->format('Y-m-d');
+        $found     = false;
+
+        // find the first occurrence
+        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;
+            }
+        }
+
+        if (!$found) {
+            rcube::raise_error(array(
+                'file' => __FILE__,
+                'line' => __LINE__,
+                'message' => sprintf("Failed to find a first occurrence. Start: %s, Recurrence: %s",
+                    $orig_start->format(DateTime::ISO8601), json_encode($event['recurrence'])),
+            ), true);
+
+            return null;
+        }
+
+        if ($event['allday']) {
+            $start->_dateonly = true;
+        }
+
+        return $start;
+    }
 }

iRony-0.4.0.tar.gz/lib/plugins/libkolab/lib/kolab_format.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_format.php Changed

iRony-0.4.0.tar.gz/lib/plugins/libkolab/lib/kolab_format_xcal.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_format_xcal.php Changed

@@ -440,7 +440,7 @@
                     if (isset($this->weekday_map[$day])) {
                         // @TODO: libkolabxml does not support BYSETPOS, neither we.
                         // However, we can convert most common cases to BYDAY
-                        if (!$occurence && $freq == 'MONTHLY' && !empty($bysetpos)) {
+                        if (!$occurrence && $freq == 'MONTHLY' && !empty($bysetpos)) {
                             foreach ($bysetpos as $pos) {
                                 $byday->push(new DayPos(intval($pos), $this->weekday_map[$day]));
                             }
@@ -498,14 +498,22 @@
             $this->obj->setRecurrenceDates($rdates);
         }
 
-        // save alarm
+        // save alarm(s)
         $valarms = new vectoralarm;
+        $valarm_hashes = array();
         if ($object['valarms']) {
             foreach ($object['valarms'] as $valarm) {
                 if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
                     continue;  // skip unknown alarm types
                 }
 
+                // Get rid of duplicates, some CalDAV clients can set them
+                $hash = serialize($valarm);
+                if (in_array($hash, $valarm_hashes)) {
+                    continue;
+                }
+                $valarm_hashes[] = $hash;
+
                 if ($valarm['action'] == 'EMAIL') {
                     $recipients = new vectorcontactref;
                     foreach (($valarm['attendees'] ?: array($object['_owner'])) as $email) {
@@ -530,7 +538,15 @@
                 if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTime) {
                     $alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
                 }
+                else if (preg_match('/^@([0-9]+)$/', $valarm['trigger'], $m)) {
+                    $alarm->setStart(self::get_datetime($m[1], new DateTimeZone('UTC')));
+                }
                 else {
+                    // Support also interval in format without PT, e.g. -10M
+                    if (preg_match('/^([-+]*)([0-9]+[DHMS])$/', strtoupper($valarm['trigger']), $m)) {
+                        $valarm['trigger'] = $m[1] . ($m[2][strlen($m[2])-1] == 'D' ? 'P' : 'PT') . $m[2];
+                    }
+
                     try {
                         $period   = new DateInterval(preg_replace('/[^0-9PTWDHMS]/', '', $valarm['trigger']));
                         $duration = new Duration($period->d, $period->h, $period->i, $period->s, $valarm['trigger'][0] == '-');

iRony-0.4.0.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_storage.php Changed

@@ -576,10 +576,22 @@
      */
     public static function custom_displayname($folder)
     {
+        static $_metadata;
+
         // find custom display name in folder METADATA
         if (self::$config->get('kolab_custom_display_names', true) && self::setup()) {
-            // For performance reasons ask for all folders, it will be cached as one cache entry
-            $metadata = self::$imap->get_metadata("*", array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
+            if ($_metadata !== null) {
+                $metadata = $_metadata;
+            }
+            else {
+                // For performance reasons ask for all folders, it will be cached as one cache entry
+                $metadata = self::$imap->get_metadata("*", array(self::NAME_KEY_PRIVATE, self::NAME_KEY_SHARED));
+
+                // If cache is disabled store result in memory
+                if (!self::$config->get('imap_cache')) {
+                    $_metadata = $metadata;
+                }
+            }
 
             if ($data = $metadata[$folder]) {
                 if (($name = $data[self::NAME_KEY_PRIVATE]) || ($name = $data[self::NAME_KEY_SHARED])) {
@@ -836,13 +848,7 @@
         $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();
-        }
+        $folderdata = self::folders_typedata($prefix);
 
         if (!is_array($folderdata)) {
             return array();
@@ -874,11 +880,6 @@
 
         // 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)) {

iRony-0.4.0.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_storage_cache.php Changed

iRony-0.4.0.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder_api.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder_api.php Changed

iRony-0.4.0.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder_user.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_storage_folder_user.php Changed

iRony-0.4.1.tar.gz/lib/plugins/libkolab/lib/kolab_utils.php Added

@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * Utility class providing unified functionality for other plugins.
+ *
+ * @version @package_version@
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+class kolab_utils
+{
+    public static function folder_form($form, $folder, $domain, $hidden_fields = array())
+    {
+        $rcmail = rcmail::get_instance();
+
+        // add folder ACL tab
+        if (is_string($folder) && strlen($folder)) {
+            $form['sharing'] = array(
+                'name'    => rcube::Q($rcmail->gettext('libkolab.tabsharing')),
+                'content' => self::folder_acl_form($folder),
+            );
+        }
+
+        $form_html = '';
+
+        if (is_array($hidden_fields)) {
+            foreach ($hidden_fields as $field) {
+                $hiddenfield = new html_hiddenfield($field);
+                $form_html .= $hiddenfield->show() . "\n";
+            }
+        }
+
+        // create form output
+        foreach ($form as $tab) {
+            if (is_array($tab['fields']) && empty($tab['content'])) {
+                $table = new html_table(array('cols' => 2, 'class' => 'propform'));
+                foreach ($tab['fields'] 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']);
+                }
+                $content = $table->show();
+            }
+            else {
+                $content = $tab['content'];
+            }
+
+            if (!empty($content)) {
+                $form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) . "\n";
+            }
+        }
+
+        return $form_html;
+    }
+
+    /**
+     * Handler for ACL form template object
+     */
+    public static function folder_acl_form($folder)
+    {
+        $rcmail  = rcmail::get_instance();
+        $storage = $rcmail->get_storage();
+        $options = $storage->folder_info($folder);
+
+        $rcmail->plugins->load_plugin('acl', true);
+
+        // get sharing UI from acl plugin
+        $acl = $rcmail->plugins->exec_hook('folder_form', array(
+                'form'    => array(),
+                'options' => $options,
+                'name'    => $folder
+        ));
+
+        return $acl['form']['sharing']['content'] ?: html::div('hint', $rcmail->gettext('libkolab.aclnorights'));
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/libkolab.js Added

@@ -0,0 +1,686 @@
+/**
+ * Kolab groupware utilities
+ *
+ * @author Thomas Bruederli <bruederli@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2015-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+var libkolab_audittrail = {}, libkolab = {};
+
+libkolab_audittrail.quote_html = function(str)
+{
+    return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+};
+
+// show object changelog in a dialog
+libkolab_audittrail.object_history_dialog = function(p)
+{
+    // render dialog
+    var $dialog = $(p.container);
+
+    // close show dialog first
+    if ($dialog.is(':ui-dialog'))
+        $dialog.dialog('close');
+
+    // hide and reset changelog table
+    $dialog.find('div.notfound-message').remove();
+    $dialog.find('.changelog-table').show().children('tbody')
+        .html('<tr><td colspan="4"><span class="loading">' + rcmail.gettext('loading') + '</span></td></tr>');
+
+    // open jquery UI dialog
+    $dialog.dialog({
+        modal: true,
+        resizable: true,
+        closeOnEscape: true,
+        title: p.title,
+        open: function() {
+            $dialog.attr('aria-hidden', 'false');
+        },
+        close: function() {
+            $dialog.dialog('destroy').attr('aria-hidden', 'true').hide();
+        },
+        buttons: [
+            {
+                text: rcmail.gettext('close'),
+                click: function() { $dialog.dialog('close'); },
+                'class': 'cancel',
+                autofocus: true
+            }
+        ],
+        minWidth: 450,
+        width: 650,
+        height: 350,
+        minHeight: 200
+    })
+    .show().children('.compare-button').hide();
+
+    // initialize event handlers for history dialog UI elements
+    if (!$dialog.data('initialized')) {
+      // compare button
+      $dialog.find('.compare-button input').click(function(e) {
+        var rev1 = $dialog.find('.changelog-table input.diff-rev1:checked').val(),
+          rev2 = $dialog.find('.changelog-table input.diff-rev2:checked').val();
+
+          if (rev1 && rev2 && rev1 != rev2) {
+            // swap revisions if the user got it wrong
+            if (rev1 > rev2) {
+              var tmp = rev2;
+              rev2 = rev1;
+              rev1 = tmp;
+            }
+
+            if (p.comparefunc) {
+                p.comparefunc(rev1, rev2);
+            }
+          }
+          else {
+              alert('Invalid selection!')
+          }
+
+          if (!rcube_event.is_keyboard(e) && this.blur) {
+              this.blur();
+          }
+          return false;
+      });
+
+      // delegate handlers for list actions
+      $dialog.find('.changelog-table tbody').on('click', 'td.actions a', function(e) {
+          var link = $(this),
+            action = link.hasClass('restore') ? 'restore' : 'show',
+            event = $('#eventhistory').data('event'),
+            rev = link.attr('data-rev');
+
+            // ignore clicks on first row (current revision)
+            if (link.closest('tr').hasClass('first')) {
+                return false;
+            }
+
+            // let the user confirm the restore action
+            if (action == 'restore' && !confirm(rcmail.gettext('revisionrestoreconfirm', p.module).replace('$rev', rev))) {
+                return false;
+            }
+
+            if (p.listfunc) {
+                p.listfunc(action, rev);
+            }
+
+            if (!rcube_event.is_keyboard(e) && this.blur) {
+                this.blur();
+            }
+            return false;
+      })
+      .on('click', 'input.diff-rev1', function(e) {
+          if (!this.checked) return true;
+
+          var rev1 = this.value, selection_valid = false;
+          $dialog.find('.changelog-table input.diff-rev2').each(function(i, elem) {
+              $(elem).prop('disabled', elem.value <= rev1);
+              if (elem.checked && elem.value > rev1) {
+                  selection_valid = true;
+              }
+          });
+          if (!selection_valid) {
+              $dialog.find('.changelog-table input.diff-rev2:not([disabled])').last().prop('checked', true);
+          }
+      });
+
+      $dialog.addClass('changelog-dialog').data('initialized', true);
+    }
+
+    return $dialog;
+};
+
+// callback from server with changelog data
+libkolab_audittrail.render_changelog = function(data, object, folder)
+{
+    var Q = libkolab_audittrail.quote_html;
+
+    var $dialog = $('.changelog-dialog')
+    if (data === false || !data.length) {
+        return false;
+    }
+
+    var i, change, accessible, op_append,
+      first = data.length - 1, last = 0,
+      is_writeable = !!folder.editable,
+      op_labels = {
+          RECEIVE:   'actionreceive',
+          APPEND:    'actionappend',
+          MOVE:      'actionmove',
+          DELETE:    'actiondelete',
+          READ:      'actionread',
+          FLAGSET:   'actionflagset',
+          FLAGCLEAR: 'actionflagclear'
+      },
+      actions = '<a href="#show" class="iconbutton preview" title="'+ rcmail.gettext('showrevision','libkolab') +'" data-rev="{rev}" /> ' +
+          (is_writeable ? '<a href="#restore" class="iconbutton restore" title="'+ rcmail.gettext('restore','libkolab') + '" data-rev="{rev}" />' : ''),
+      tbody = $dialog.find('.changelog-table tbody').html('');
+
+    for (i=first; i >= 0; i--) {
+        change = data[i];
+        accessible = change.date && change.user;
+
+        if (change.op == 'MOVE' && change.mailbox) {
+            op_append = ' ⇢ ' + change.mailbox;
+        }
+        else if ((change.op == 'FLAGSET' || change.op == 'FLAGCLEAR') && change.flags) {
+            op_append = ': ' + change.flags;
+        }
+        else {
+            op_append = '';
+        }
+
+        $('<tr class="' + (i == first ? 'first' : (i == last ? 'last' : '')) + (accessible ? '' : 'undisclosed') + '">')
+            .append('<td class="diff">' + (accessible && change.op != 'DELETE' ? 
+                '<input type="radio" name="rev1" class="diff-rev1" value="' + change.rev + '" title="" '+ (i == last ? 'checked="checked"' : '') +' /> '+
+                '<input type="radio" name="rev2" class="diff-rev2" value="' + change.rev + '" title="" '+ (i == first ? 'checked="checked"' : '') +' /></td>'
+                : ''))
+            .append('<td class="revision">' + Q(i+1) + '</td>')
+            .append('<td class="date">' + Q(change.date || '') + '</td>')
+            .append('<td class="user">' + Q(change.user || 'undisclosed') + '</td>')
+            .append('<td class="operation" title="' + op_append + '">' + Q(rcmail.gettext(op_labels[change.op] || '', 'libkolab') + op_append) + '</td>')
+            .append('<td class="actions">' + (accessible && change.op != 'DELETE' ? actions.replace(/\{rev\}/g, change.rev) : '') + '</td>')
+            .appendTo(tbody);
+    }
+
+    if (first > 0) {
+        $dialog.find('.compare-button').fadeIn(200);
+        $dialog.find('.changelog-table tr.last input.diff-rev1').click();
+    }
+
+    // set dialog size according to content
+    libkolab_audittrail.dialog_resize($dialog.get(0), $dialog.height() + 15, 600);
+
+    return $dialog;
+};
+
+// resize and reposition (center) the dialog window
+libkolab_audittrail.dialog_resize = function(id, height, width)
+{
+    var win = $(window), w = win.width(), h = win.height();
+    $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) });
+};
+
+/**
+ * Open an attachment either in a browser window for inline view or download it
+ */
+libkolab.load_attachment = function(query, attachment)
+{
+    query._frame = 1;
+
+    // open attachment in frame if it's of a supported mimetype similar as in app.js
+    if (attachment.id && attachment.mimetype && $.inArray(attachment.mimetype, rcmail.env.mimetypes) >= 0) {
+        if (rcmail.open_window(rcmail.url('get-attachment', query), true, true)) {
+            return;
+        }
+    }
+
+    query._frame = null;
+    query._download = 1;
+    rcmail.goto_url('get-attachment', query, false);
+};
+
+/**
+ * Build attachments list element
+ */
+libkolab.list_attachments = function(list, container, edit, data, ondelete, onload)
+{
+    var ul = $('<ul>').addClass('attachmentslist');
+
+    $.each(list || [], function(i, elem) {
+        var li = $('<li>').addClass(elem.classname);
+
+        // name/link
+        $('<a>').attr({href: '#load', 'class': 'filename'})
+            .append($('<span class="attachment-name">').text(elem.name))
+            .click({record: data, attachment: elem}, function(e) {
+                if (onload) {
+                    onload(e.data);
+                }
+                return false;
+            })
+            .appendTo(li);
+
+        if (edit) {
+            rcmail.env.attachments[elem.id] = elem;
+            // delete link
+            $('<a>').attr({href: '#delete', title: rcmail.gettext('delete'), 'class': 'delete'})
+                .click({id: elem.id}, function(e) {
+                    $(this.parentNode).hide();
+                    delete rcmail.env.attachments[e.data.id];
+                    if (ondelete) {
+                        ondelete(e.data.id);
+                    }
+                    return false;
+                })
+                .appendTo(li);
+        }
+
+        ul.append(li);
+    });
+
+    if (edit && rcmail.gui_objects.attachmentlist) {
+        ul.id = rcmail.gui_objects.attachmentlist.id;
+        rcmail.gui_objects.attachmentlist = ul.get(0);
+    }
+
+    container.empty().append(ul);
+};
+
+
+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);
+
+                      if (!rcube_event.is_keyboard(e) && e.target.blur)
+                        e.target.blur();
+
+                      // 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();
+              }
+
+              prop.li = item.parent().get(0);
+              me.triggerEvent('add-item', prop);
+          }
+
+          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
+if (window.rcube_treelist_widget) {
+    kolab_folderlist.prototype = rcube_treelist_widget.prototype;
+}
+
+
+window.rcmail && rcmail.addEventListener('init', function(e) {
+    var loading_lock;
+
+    if (rcmail.env.task == 'mail') {
+        rcmail.register_command('kolab-mail-history', function() {
+            var dialog, uid = rcmail.get_single_uid(), rec = { uid: uid, mbox: rcmail.get_message_mailbox(uid) };
+            if (!uid || !window.libkolab_audittrail) {
+                return false;
+            }
+
+            // render dialog
+            $dialog = libkolab_audittrail.object_history_dialog({
+                module: 'libkolab',
+                container: '#mailmessagehistory',
+                title: rcmail.gettext('objectchangelog','libkolab')
+            });
+
+            $dialog.data('rec', rec);
+
+            // fetch changelog data
+            loading_lock = rcmail.set_busy(true, 'loading', loading_lock);
+            rcmail.http_post('plugin.message-changelog', { _uid: rec.uid, _mbox: rec.mbox }, loading_lock);
+
+        }, rcmail.env.action == 'show');
+
+        rcmail.addEventListener('plugin.message_render_changelog', function(data) {
+            var $dialog = $('#mailmessagehistory'),
+                rec = $dialog.data('rec');
+
+            if (data === false || !data.length || !rec) {
+              // display 'unavailable' message
+              $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','libkolab') + '</div>')
+                  .insertBefore($dialog.find('.changelog-table').hide());
+              return;
+            }
+
+            data.module = 'libkolab';
+            libkolab_audittrail.render_changelog(data, rec, {});
+        });
+
+        rcmail.env.message_commands.push('kolab-mail-history');
+    }
+
+    if (rcmail.env.action == 'get-attachment') {
+        if (rcmail.gui_objects.attachmentframe) {
+            rcmail.gui_objects.messagepartframe = rcmail.gui_objects.attachmentframe;
+            rcmail.enable_command('image-scale', 'image-rotate', !!/^image\//.test(rcmail.env.mimetype));
+            rcmail.register_command('print-attachment', function() {
+                var frame = rcmail.get_frame_window(rcmail.gui_objects.attachmentframe.id);
+                if (frame) frame.print();
+            }, true);
+        }
+
+        if (rcmail.env.attachment_download_url) {
+            rcmail.register_command('download-attachment', function() {
+                rcmail.location_href(rcmail.env.attachment_download_url, window);
+            }, true);
+        }
+    }
+});

iRony-0.4.0.tar.gz/lib/plugins/libkolab/libkolab.php -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/libkolab.php Changed

@@ -57,13 +57,16 @@
 
         $this->add_texts('localization/', false);
 
+        if ($rcmail->output->type == 'html') {
+            $rcmail->output->add_handler('libkolab.folder_search_form', array($this, 'folder_search_form'));
+            $this->include_stylesheet($this->local_skin_path() . '/libkolab.css');
+        }
+
         // embed scripts and templates for email message audit trail
         if ($rcmail->task == 'mail' && self::get_bonnie_api()) {
             if ($rcmail->output->type == 'html') {
                 $this->add_hook('render_page', array($this, 'bonnie_render_page'));
-
-                $this->include_script('js/audittrail.js');
-                $this->include_stylesheet($this->local_skin_path() . '/libkolab.css');
+                $this->include_script('libkolab.js');
 
                 // add 'Show history' item to message menu
                 $this->api->add_content(html::tag('li', null,
@@ -277,6 +280,7 @@
             'libkolab.actionflagset',
             'libkolab.actionflagclear',
             'libkolab.objectchangelog',
+            'libkolab.objectchangelognotavailable',
             'close'
         );
 
@@ -339,4 +343,29 @@
     {
         return $event['allday'] ? 'Ymd' : 'Ymd\THis';
     }
+
+    /**
+     * Returns HTML code for folder search widget
+     *
+     * @param array $attrib Named parameters
+     *
+     * @return string HTML code for the gui object
+     */
+    public function folder_search_form($attrib)
+    {
+        $rcmail = rcube::get_instance();
+        $attrib += array(
+            'gui-object'    => false,
+            'wrapper'       => true,
+            'form-name'     => 'foldersearchform',
+            'command'       => 'non-extsing-command',
+            'reset-command' => 'non-existing-command',
+        );
+
+        if ($attrib['label-domain'] && !strpos($attrib['buttontitle'], '.')) {
+            $attrib['buttontitle'] = $attrib['label-domain'] . '.' . $attrib['buttontitle'];
+        }
+
+        return $rcmail->output->search_form($attrib);
+    }
 }

iRony-0.4.0.tar.gz/lib/plugins/libkolab/localization/cs_CZ.inc -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/cs_CZ.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/libkolab/localization/de_DE.inc -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/de_DE.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/el.inc Added

iRony-0.4.0.tar.gz/lib/plugins/libkolab/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/en_US.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/libkolab/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/es_ES.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/lv.inc Added

iRony-0.4.0.tar.gz/lib/plugins/libkolab/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/nl_NL.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/libkolab/localization/pt_BR.inc -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/localization/pt_BR.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/images Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/images/eye.svg Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/calendar.less Added

@@ -0,0 +1,1932 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for calendar plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.toolbarmenu.listing li {
+    a.calendarlink:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
+
+    a.send:before {
+        content: @fa-var-paper-plane;
+    }
+}
+
+// Icon for resources in autocompletion list
+.listing.iconized li.resource > i:before {
+    content: @fa-var-cube;
+}
+
+a.button.today:before {
+    .font-icon-regular(@fa-var-calendar);
+}
+
+a.button.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.cal---invitation--pending .calname:before,
+            &.calendar.cal---invitation--declined .calname:before {
+                .font-icon-regular(@fa-var-calendar-alt);
+            }
+
+            &.calendar.cal-__bdays__ .calname:before {
+                content: @fa-var-birthday-cake;
+            }
+
+            &.calendar.cal---invitation--pending,
+            &.calendar.cal---invitation--declined,
+            &.calendar.cal-__bdays__ {
+                font-style: italic;
+
+                a.quickview {
+                    padding-right: .25rem;
+                }
+
+                a.calname {
+                    padding-right: 4em;
+                }
+
+                .count {
+                    right: 5.5em;
+                    font-style: normal;
+                }
+            }
+        }
+
+        // Calednars list element (color indicator) used in Larry
+        span.handle {
+            display: none;
+        }
+    }
+}
+
+#calendarcategories {
+    .input-group:not(:last-child) {
+        margin-bottom: .25rem;
+    }
+}
+
+fieldset.categories .input-group {
+    .minicolors-input {
+        border-radius: 0;
+    }
+
+    .minicolors + .input-group-append {
+        margin-left: 0;
+    }
+
+    a.button.create {
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-plus;
+            line-height: 1;
+        }
+    }
+}
+
+.calendar-invitebox {
+    & > i.icon:before {
+        content: @fa-var-calendar !important;
+    }
+}
+
+.calendar-agenda-preview {
+    display: none;
+    margin-top: .5rem;
+    border-top: 1px solid #ddd;
+
+    h3 {
+        margin-top: .5rem;
+    }
+
+    .event-row {
+        white-space: nowrap;
+        .overflow-ellipsis;
+
+        &.current {
+            color: #333;
+            font-weight: bold;
+        }
+
+        &.no-event {
+            color: @color-black-shade-text;
+            font-style: italic;
+        }
+    }
+
+    .event-title {
+        padding-left: .5rem;
+    }
+
+    .event-date {
+    }
+}
+
+#calendar.content {
+    overflow: hidden !important; // fullcalendar widget implements scrolling on its own
+    position: relative;
+}
+
+.calendar-datepicker {
+    // overwrite jQuery-UI datepicker styles
+    .ui-datepicker {
+        top: initial !important;
+        left: initial !important;
+        position: relative !important;
+        transform: unset;
+        box-shadow: none;
+        border: 0;
+        border-radius: 0;
+        width: auto;
+        min-width: auto !important;
+        font-size: .9rem;
+        background-color: @color-black-shade-bg;
+
+        table {
+            margin: 0;
+        }
+
+        td a {
+            font-size: .9rem !important;
+        }
+    }
+
+    .ui-datepicker-header {
+        background-color: @color-black-shade-bg;
+        border-top: 1px solid @color-layout-border;
+    }
+
+    .ui-dialog & {
+        .ui-datepicker {
+            background: transparent;
+        }
+
+        .ui-datepicker-header {
+            background: transparent;
+            border: 0;
+        }
+
+        td a {
+            line-height: 3em !important;
+            font-size: 1rem !important;
+        }
+    }
+}
+
+body.quickview-active .fc-content {
+    background: data-uri("image/svg+xml;charset=utf-8", "../images/eye.svg") center no-repeat;
+    background-size: 50%;
+}
+
+// Fullcalendar styles
+@color-calendar-border: @color-layout-border;
+
+.fc {
+    flex: auto !important;
+
+    .fc-header {
+        tr {
+            background-color: @color-black-shade-bg;
+        }
+    }
+
+    .fc-header-left {
+        width: 25%;
+
+        span {
+            display: none;
+        }
+
+    }
+
+    .fc-header-center {
+        text-align: center;
+
+        h2 {
+            margin: 0;
+            color: @color-black-shade-text;
+            white-space: nowrap;
+        }
+    }
+
+    .fc-header-right {
+        width: 25%;
+        text-align: right;
+
+        span {
+            display: none;
+        }
+    }
+
+    .btn-group {
+        padding: .5rem;
+    }
+
+    .fc-header-title {
+        h2 {
+            font-size: 1.25rem;
+            font-weight: bold;
+        }
+    }
+
+    .fc-view {
+        width: 100%;
+        overflow: hidden;
+    }
+
+    // Cell Styles
+
+    .fc-widget-header,    // <th>, usually
+    .fc-widget-content {  // <td>, usually
+        border: 1px solid @color-calendar-border;
+    }
+
+    .fc-cell-overlay { // semi-transparent rectangle while dragging
+        background: #bce8f1;
+        opacity: .3;
+    }
+
+    // Buttons
+
+    .fc-button {
+        position: relative;
+        display: inline-block;
+        padding: 0 .6em;
+        overflow: hidden;
+        height: 1.9em;
+        line-height: 1.9em;
+        white-space: nowrap;
+        cursor: pointer;
+    }
+
+    // Button states
+    // borrowed from twitter bootstrap (http://twitter.github.com/bootstrap/)
+
+    .fc-state-highlight { // <td> today cell, TODO: add .fc-today to <th>
+        background: fadeout(@color-main, 92%);
+    }
+
+/*
+    .fc-state-default {
+        border: 1px solid;
+        background-color: #f4f4f4;
+    }
+
+    .fc-state-hover,
+    .fc-state-down,
+    .fc-state-active,
+    .fc-state-disabled {
+        color: #333333;
+        background-color: #e6e6e6;
+    }
+    .fc-state-hover {
+        color: #333333;
+        text-decoration: none;
+    }
+
+    .fc-state-down,
+    .fc-state-active {
+        background-color: #cccccc;
+        outline: 0;
+    }
+*/
+    .fc-state-disabled {
+        cursor: default;
+        opacity: 0.65;
+    }
+
+    // Global Event Styles
+
+    .fc-event-container {
+        & > * {
+            z-index: 8;
+        }
+
+        & > .ui-draggable-dragging,
+        & > .ui-resizable-resizing {
+            z-index: 9;
+        }
+    }
+
+    .fc-event {
+        border: 1px solid #3a87ad; // default BORDER color
+        background-color: #3a87ad; // default BACKGROUND color
+        color: #fff;               // default TEXT color
+        font-size: .85em;
+        cursor: default;
+
+        .fc-rtl & {
+            text-align: right;
+        }
+    }
+
+    a.fc-event {
+        text-decoration: none;
+    }
+
+    a.fc-event,
+    .fc-event-draggable {
+        cursor: pointer;
+    }
+
+    .fc-event-inner {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+    }
+
+    .fc-event-time,
+    .fc-event-title {
+        padding: 0 1px;
+    }
+
+    .ui-resizable-handle {
+        z-index: 99999;
+    }
+
+    // Horizontal Events
+
+    .fc-event-hori {
+        border-width: 1px 0;
+        margin-bottom: 1px;
+    }
+
+    .fc-ltr .fc-event-hori.fc-event-start,
+    .fc-rtl .fc-event-hori.fc-event-end {
+        border-left-width: 1px;
+    }
+
+    .fc-ltr .fc-event-hori.fc-event-end,
+    .fc-rtl .fc-event-hori.fc-event-start {
+        border-right-width: 1px;
+    }
+
+    // resizable
+
+    .fc-event-hori {
+        .ui-resizable-e {
+            cursor: e-resize;
+        }
+
+        .ui-resizable-w {
+            cursor: w-resize;
+        }
+    }
+
+    // Reusable Separate-border Table
+
+    .fc-border-separate {
+        border-collapse: separate;
+
+        th,
+        td {
+            border-width: 1px 0 0 1px;
+
+            &.fc-last {
+                border-right-width: 1px;
+            }
+        }
+
+        tr.fc-last th,
+        tr.fc-last td {
+            border-bottom-width: 1px;
+        }
+
+        tbody tr.fc-first td,
+        tbody tr.fc-first th {
+            border-top-width: 0;
+        }
+    }
+
+    .fc-event-date,
+    .fc-event-time {
+        white-space: nowrap;
+    }
+
+    // Month View, Basic Week View, Basic Day View
+
+    .fc-week-number {
+        width: 22px;
+        text-align: center;
+
+        div {
+            padding: 0 2px;
+        }
+    }
+
+    .fc-day {
+        vertical-align: top;
+    }
+
+    .fc-day-header {
+        color: @color-black-shade-text;
+    }
+
+    .fc-grid {
+        th {
+            text-align: center;
+        }
+
+        .fc-day-number {
+            float: right;
+            padding: 0 2px;
+            font-size: .9rem;
+        }
+
+        .fc-other-month .fc-day-number {
+            opacity: 0.3;
+        }
+
+        .fc-day-content {
+            clear: both;
+            padding: 2px 2px 1px; // distance between events and day edges
+        }
+
+        // event styles
+        .fc-event-time {
+            font-weight: bold;
+            white-space: nowrap;
+        }
+
+        // right-to-left
+        .fc-rtl & .fc-day-number {
+            float: left;
+        }
+
+        .fc-rtl & .fc-event-time {
+            float: right;
+        }
+    }
+
+    .fc-more-link {
+        font-size: 0.85em;
+        white-space: nowrap;
+        text-decoration: none;
+        cursor: pointer;
+        padding: 1px;
+        color: @color-link !important;
+    }
+
+    // Agenda Week View, Agenda Day View
+
+    .fc-agenda-days {
+        th {
+            text-align: center;
+        }
+
+        .fc-widget-header {
+            color: @color-black-shade-text;
+        }
+    }
+
+    .fc-agenda {
+        table {
+            border-collapse: separate;
+        }
+
+        .fc-agenda-axis {
+            width: 50px;
+            padding: 0 4px;
+            vertical-align: middle;
+            text-align: right;
+            white-space: nowrap;
+            font-weight: normal;
+            font-size: .9rem;
+            border-left: 0;
+            color: @color-black-shade-text;
+        }
+
+        .fc-week-number {
+            font-weight: bold;
+        }
+
+        .fc-day-content {
+            padding: 2px 2px 1px;
+        }
+    }
+
+    // make axis border take precedence
+
+    .fc-agenda-days .fc-agenda-axis {
+        border-right-width: 1px;
+    }
+
+    .fc-agenda-days .fc-col0 {
+        border-left-width: 0;
+    }
+
+    // all-day area
+
+    .fc-agenda-allday {
+        th {
+            border-width: 0 1px;
+        }
+
+        .fc-day-content {
+            min-height: 34px;
+        }
+    }
+
+    // divider (between all-day and slots)
+
+    .fc-agenda-divider-inner {
+        height: 1px;
+        overflow: hidden;
+    }
+
+    // slot rows
+
+    .fc-agenda-slots {
+        th {
+            border-width: 1px 1px 0;
+        }
+
+        td {
+            border-width: 1px 0 0;
+            background: none;
+        }
+
+        td div {
+            height: 20px;
+        }
+
+        tr.fc-slot0 th,
+        tr.fc-slot0 td {
+            border-top-width: 0;
+        }
+
+        tr.fc-minor th,
+        tr.fc-minor td {
+            border-top-style: dotted;
+        }
+    }
+
+    // Vertical Events
+
+    .fc-event-vert {
+        border-width: 0 1px;
+
+        .fc-event-head,
+        .fc-event-content {
+            position: relative;
+            z-index: 2;
+            width: 100%;
+            overflow: hidden;
+        }
+
+        &.fc-event-start {
+            border-top-width: 1px;
+        }
+
+        &.fc-event-end {
+            border-bottom-width: 1px;
+        }
+
+        .fc-event-time {
+            white-space: nowrap;
+            font-size: 10px;
+            font-weight: bold;
+        }
+
+        .fc-event-inner {
+            position: relative;
+            z-index: 2;
+        }
+
+        .fc-event-bg { // makes the event lighter w/ a semi-transparent overlay
+            position: absolute;
+            z-index: 1;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: #fff;
+            opacity: .25;
+        }
+    }
+
+    // resizable
+
+    .fc-event-vert .ui-resizable-s {
+        bottom: 0        !important; // importants override pre jquery ui 1.7 styles
+        width: 100%      !important;
+        height: 8px      !important;
+        overflow: hidden !important;
+        line-height: 8px !important;
+        font-size: 11px  !important;
+        font-family: monospace;
+        text-align: center;
+        cursor: s-resize;
+    }
+
+    .fc-timeline {
+        position: absolute;
+        width: 100%;
+        left: 0;
+        margin: 0;
+        padding: 0;
+        border: none;
+        border-top: 2px solid @color-success;
+        z-index: 999;
+    }
+
+    // List view  (by bruederli@kolabsys.com)
+
+    .fc-view-list,
+    .fc-view-table {
+        border-left: 0;
+        border-bottom: 0;
+        border-top: 1px solid @color-layout-border;
+        width: auto;
+
+        .fc-list-header,
+        td.fc-list-header {
+            border-width: 0;
+            border-bottom-width: 1px;
+            padding: 3px 5px;
+            font-weight: bold;
+        }
+
+        .fc-event {
+            font-size: 1rem;
+        }
+    }
+
+    .fc-list-section {
+        padding: 4px 2px;
+        border-width: 0;
+        border-bottom-width: 1px;
+
+        .fc-event {
+            position: relative;
+            margin: 1px 2px 3px 2px;
+
+            td:not(.fc-event-handle) {
+                vertical-align: top;
+            }
+        }
+
+        .fc-event-time {
+            .overflow-ellipsis;
+        }
+
+        .fc-event-title {
+            font-weight: bold;
+        }
+    }
+
+    .fc-view-list .fc-last {
+        border-bottom: 0;
+    }
+
+    .fc-view-table {
+        tr.fc-event {
+            background: inherit;
+            color: inherit;
+
+            td {
+                padding: 2px;
+                border-bottom: 1px solid @color-calendar-border;
+            }
+
+            td.fc-event-handle {
+                padding: 7px 8px 6px 5px;
+                vertical-align: top;
+            }
+        }
+
+        .fc-first td.fc-list-header {
+            border-top-width: 0;
+        }
+
+        .fc-event-handle {
+            .fc-event-inner {
+                display: block;
+                width: 8px;
+                height: 10px;
+            }
+        }
+
+        table {
+            table-layout: fixed;
+            width: 100%;
+        }
+
+        .fc-event-inner {
+            border-color: inherit;
+            background-color: inherit;
+        }
+
+        col.fc-event-handle {
+            width: 18px;
+        }
+
+        col.fc-event-date {
+            width: 7em;
+            white-space: nowrap;
+            padding-right: 1em;
+
+            .fc-list-day & {
+                width: 1px;
+            }
+        }
+
+        col.fc-event-time {
+            width: 9em;
+            white-space: nowrap;
+            padding-right: 1em;
+        }
+    }
+
+    .fc-event-hori.fc-type-freebusy,
+    .fc-event-vert.fc-type-freebusy {
+        opacity: 0.6;
+
+        .fc-event-title {
+            position: absolute;
+            top: -5000px;
+        }
+    }
+
+    .fc-event-row.fc-type-freebusy td {
+        color: #999;
+    }
+
+    .fc-event-vert.fc-invitation-needs-action,
+    .fc-event-hori.fc-invitation-needs-action {
+        border: 1px dashed #5757c7 !important;
+    }
+
+    .fc-event-vert.fc-invitation-tentative,
+    .fc-event-hori.fc-invitation-tentative {
+        border: 1px dashed #eb8900 !important;
+    }
+
+    .fc-event-vert.fc-invitation-declined,
+    .fc-event-hori.fc-invitation-declined {
+        border: 1px dashed #c00 !important;
+    }
+
+    .fc-event-vert.fc-event-ns-other.fc-invitation-declined,
+    .fc-event-hori.fc-event-ns-other.fc-invitation-declined {
+        opacity: 0.7;
+    }
+
+    .fc-event-ns-other.fc-invitation-declined .fc-event-title {
+        text-decoration: line-through;
+    }
+
+    .fc-event-vert.fc-invitation-tentative .fc-event-bg {
+        background: url(data:image/gif;base64,R0lGODlhCAAIAPABAOuJAP///yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
+    }
+
+    .fc-event-vert.fc-invitation-needs-action .fc-event-bg {
+        background: url(data:image/gif;base64,R0lGODlhCAAIAPABAFdXx////yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
+    }
+
+    .fc-event-vert.fc-invitation-declined .fc-event-bg {
+        background: url(data:image/gif;base64,R0lGODlhCAAIAPABAMwAAP///yH/C1hNUCBEYXRhWE1QAT8AIfkEBQAAAQAsAAAAAAgACAAAAg4Egmipx+ZaDPCtVPFNBQA7) 0 0 repeat #fff;
+    }
+
+    .fc-view-table tr.fc-invitation-tentative td,
+    .fc-view-table tr.fc-invitation-declined td,
+    .fc-view-table tr.fc-invitation-needs-action td {
+        color: #888;
+    }
+
+    .fc-view-table tr.fc-invitation-tentative td.fc-event-title,
+    .fc-view-table tr.fc-invitation-declined td.fc-event-title,
+    .fc-view-table tr.fc-invitation-needs-action td.fc-event-title {
+        font-weight: normal;
+    }
+
+    .fc-needs-action,
+    .fc-declined,
+    .cal-event-status-cancelled {
+        opacity: 0.6;
+    }
+
+    .fc-icon-alarms,
+    .fc-icon-sensitive,
+    .fc-icon-recurring {
+        display: inline-block;
+        width: 1em;
+        height: 1em;
+        margin-left: .25rem;
+
+        &:before {
+            &:extend(.font-icon-class);
+            font-size: 1em;
+            line-height: 1;
+        }
+    }
+
+    .fc-icon-recurring:before {
+        .font-icon-regular(@fa-var-clone);
+    }
+
+    .fc-icon-alarms:before {
+        content: @fa-var-bell;
+    }
+
+    .fc-icon-sensitive:before {
+        content: @fa-var-lock;
+    }
+
+    .fc-event-temp {
+        opacity: 0.4;
+    }
+
+    .fc-sat, .fc-sun {
+        background-color: fadeout(@color-black-shade-text, 97%);
+    }
+
+    // remove redundant borders
+    .fc-first tbody .fc-day-header,
+    .fc-first .fc-day-header.fc-first,
+    .fc-week .fc-first {
+        border-left: 0;
+    }
+
+    .fc-agenda-days tbody .fc-last > *,
+    .fc-agenda-slots tr:last-child td,
+    .fc-week.fc-last .fc-day {
+        border-bottom: 0;
+    }
+}
+
+// Add scrollbar on iOS
+html:matches(.ipad,.iphone) {
+    .ui-dialog-content:not(.iframe),
+    #fish-eye-view,
+    .fc-list-content,
+    .fc-view > div > div {
+        &::-webkit-scrollbar {
+            -webkit-appearance: none;
+        }
+
+        &::-webkit-scrollbar:vertical {
+             width: .6rem;
+        }
+
+        &::-webkit-scrollbar:horizontal {
+            height: .6rem;
+        }
+
+        &::-webkit-scrollbar-thumb {
+            background-color: rgba(0, 0, 0, .4);
+            border-radius: .3rem;
+            border: 2px solid #fff;
+        }
+    }
+}
+
+// fullcalendar style overrides for printing
+.print-content {
+    .fc-header {
+        tr {
+            background-color: #fff;
+        }
+    }
+
+    .fc-header-center {
+        width: 100%;
+        h2 {
+            color: #000;
+            padding-bottom: .75rem;
+            font-size: 1.5rem !important;
+        }
+    }
+
+    .ui-resizable-handle,
+    .fc-agenda-gutter,
+    .fc-header-left,
+    .fc-header-right {
+        display: none !important;
+    }
+
+    .fc-view {
+        overflow: visible;
+    }
+
+    .fc-list-section td,
+    .fc-event {
+        color: black !important;
+    }
+
+    .fc-state-highlight,
+    .fc-event:not(.fc-event-row) .fc-event-skin {
+        background-color: #fff !important;
+    }
+
+    .fc-event-title {
+        font-weight: bold;
+    }
+
+    .fc-event-hori {
+        .fc-event-title {
+            font-weight: normal;
+            white-space: nowrap;
+        }
+
+        .fc-event-time {
+            white-space: nowrap;
+            font-weight: normal !important;
+            font-size: 10px;
+            padding-right: 0.6em;
+        }
+    }
+
+    .fc-grid .fc-event-time {
+        font-weight: normal !important;
+        padding-right: 0.3em;
+    }
+
+    .fc-event-categories {
+        font-style: italic;
+    }
+
+    .fc-event-location {
+        font-size: 100%;
+    }
+
+    .fc-agenda-slots td div {
+        height: 1.4em;
+    }
+
+    .fc-widget-header, .fc-widget-content {
+        border-color: @color-calendar-border;
+    }
+
+    .fc-view-list, .fc-view-table {
+        border: 0;
+    }
+
+    .fc-view-list div.fc-list-header,
+    .fc-view-table td.fc-list-header {
+        padding: 0.3em;
+        background: #fff;
+        font-weight: bold;
+        font-size: 1.2em;
+        color: #333;
+        border-color: @color-calendar-border;
+        border-style: solid;
+        border-width: 1px 0;
+    }
+
+    .fc-list-section .fc-event {
+        cursor: auto;
+    }
+
+    .fc-view-table {
+        tr.fc-event {
+            td,
+            td.fc-event-handle {
+                border-color: @color-calendar-border;
+                padding-top: .5em;
+                padding-bottom: .5em;
+            }
+
+            td.fc-event-handle {
+                padding-top: .8em;
+            }
+
+            .fc-event-description {
+                padding-left: 1.5em;
+                padding-top: 0;
+            }
+        }
+
+        tr.fc-last td {
+            border: 0;
+        }
+
+        col.fc-event-location {
+            width: 20%;
+        }
+    }
+
+    .fc-event-description {
+        white-space: pre-wrap;
+
+        .fc-event-vert & {
+            font-size: 90%;
+            font-style: italic;
+        }
+    }
+
+    .fc-day {
+        font-size: 90%;
+    }
+
+    .fc-view-month .fc-event-hori .fc-event-inner {
+        background: #fff !important;
+    }
+
+    // add back borders removed in non-print view
+    .fc-first .fc-day-header.fc-first,
+    .fc-agenda .fc-agenda-axis,
+    .fc-first .fc-day-header,
+    .fc-week .fc-first {
+        border-left: 1px solid @color-calendar-border;
+    }
+
+    .fc-agenda-days th:nth-last-child(2),
+    .fc-agenda-allday td,
+    .fc-agenda-slots td.fc-widget-content {
+        border-right: 1px solid @color-calendar-border;
+    }
+
+    .fc-agenda-days tr.fc-last > *,
+    .fc-week.fc-last .fc-day {
+        border-bottom: 1px solid @color-calendar-border;
+    }
+}
+
+body.task-calendar {
+    #print-layout {
+        #calendar-view-selector {
+            float: right;
+            padding-top: .25rem;
+        }
+    }
+
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        & > #layout > div.sidebar {
+            flex: 2 !important;
+            max-width: 400px;
+        }
+    }
+
+    // improve datepicker
+    .ui-datepicker {
+        td {
+            width: 12.5%;
+        }
+
+        .ui-datepicker-week-col {
+            color: @color-black-shade-border;
+            text-align: center;
+        }
+    }
+
+    .ui-datepicker-inline {
+        .ui-datepicker-week-col {
+            color: @color-link;
+            cursor: pointer;
+        }
+
+        .ui-datepicker-activerange {
+            background-color: @color-list-selected-background;
+        }
+    }
+}
+
+#timezone-display {
+    font-size: .9rem;
+    color: @color-black-shade-text;
+}
+
+#agendaoptions {
+    padding: 0 .5rem .5rem .5rem;
+    display: flex;
+    background-color: @color-black-shade-bg;
+
+    .input-group {
+        padding-right: .5rem;
+        flex-wrap: nowrap;
+        width: 50%;
+
+        &:last-child {
+            padding-right: 0;
+        }
+    }
+
+    select {
+        min-width: 7em;
+    }
+
+    .input-group-prepend {
+        overflow: hidden;
+        margin-bottom: 0;
+
+        span {
+            display: block;
+            .overflow-ellipsis;
+        }
+    }
+}
+
+#searchcontrols {
+    z-index: 3;
+    position: absolute;
+    top: 7.5rem;
+    right: 0;
+    display: none !important; // FIXME: this is now disabled, do we really need this widget?
+    height: @layout-header-height;
+    overflow: hidden;
+    transform: translateX(80%);
+    transition: transform 0.3s ease-in-out;
+    background-color: fadeout(lighten(@color-main, 15%), 10%);
+    border-radius: .3rem 0 0 .3rem;
+
+    .toolbar {
+        float: right;
+        height: @layout-header-height;
+
+        a.button:before {
+            width: auto;
+            height: 1.75rem;
+            display: block;
+            float: none;
+        }
+    }
+
+    a.button.icon.tools {
+        padding: 0 .25rem;
+        display: inline-block;
+        height: @layout-header-height;
+
+        span.inner {
+            display: none;
+        }
+
+        &:before {
+            line-height: @layout-header-height;
+            margin: 0;
+        }
+    }
+
+    &.open {
+        transform: translateX(0);
+
+        a.button.icon.tools:before {
+            content: @fa-var-chevron-right;
+        }
+    }
+
+    a {
+        color: @color-image-tools;
+
+        &:focus,
+        &:hover {
+            background-color: @color-image-tools-hover !important;
+            outline: 0;
+        }
+    }
+
+    .message {
+        display: none;
+    }
+}
+
+#eventshow {
+    margin: 0;
+
+    .event-title {
+        font-size: 1.5rem;
+        font-weight: bold;
+    }
+
+    .event-location {
+        .overflow-ellipsis;
+        white-space: nowrap;
+    }
+
+    .event-description {
+        margin: 1rem 0;
+    }
+
+    .event-attendees {
+        margin-bottom: 1rem;
+
+        .attendee {
+            margin-right: .25rem;
+        }
+    }
+
+    .event-partstat {
+        & > span {
+            display: flex;
+        }
+
+        .rsvp-status {
+            &:before {
+                display: inline;
+                float: none;
+            }
+        }
+
+        .changersvp {
+            cursor: pointer;
+            font-size: 1.2rem;
+            margin-left: 1em;
+
+            &:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-pen-square;
+                float: none;
+                display: inline;
+                line-height: 1;
+            }
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+}
+
+#eventedit {
+    .edit-attendees-table td {
+        padding-top: .15rem;
+
+        &.role {
+            padding-left: 0;
+            width: 9em;
+        }
+    }
+}
+
+#fish-eye-view {
+    padding: 0;
+
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        border-bottom: 1px solid @color-calendar-border;
+    }
+
+    .fc-header {
+        display: none;
+    }
+
+    .fc-view {
+        position: initial !important;
+    }
+
+    .fc-agenda-days tr.fc-first th {
+        border-top: 0;
+    }
+
+    .fc-agenda-divider + div {
+        height: 100% !important;
+        overflow: initial !important;
+    }
+}
+
+@color-availability-unknown:        #bbb;           // Larry: #ddd;
+@color-availability-free:           @color-success; // Larry: #abd640;
+@color-availability-busy:           @color-error;   // Larry: #e26569;
+@color-availability-tentative:      #8383fc;
+@color-availability-out-of-office:  #fbaa68;
+
+.availability {
+    span {
+        margin-right: .5rem;
+        color: @color-black-shade-text;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-square;
+            display: inline;
+            float: none;
+        }
+
+        &.legend:before {
+            font-size: 1em;
+        }
+
+        &.loading:before {
+            .animated-icon-class;
+            content: @fa-var-circle-notch;
+            display: block;
+            line-height: 1;
+        }
+
+        &.unknown:before {
+            color: @color-availability-unknown;
+        }
+
+        &.free:before {
+            color: @color-availability-free;
+        }
+
+        &.busy:before {
+            color: @color-availability-busy;
+        }
+
+        &.tentative:before {
+            color: @color-availability-tentative;
+        }
+
+        &.out-of-office:before {
+            color: @color-availability-out-of-office;
+        }
+    }
+}
+
+// fixes additional checkbox in Elastic's .datetime widget
+.datetime {
+    label {
+        margin-left: 1em;
+        margin-top: .4rem;
+
+        label {
+            line-height: 1;
+
+            &:before {
+                margin-right: .25rem;
+            }
+        }
+    }
+
+    input {
+        width: 10em !important;
+    }
+
+    input[type=checkbox] {
+        width: auto !important;
+    }
+
+    @media screen and (max-width: 420px) {
+        input {
+            width: 8em !important;
+
+            & + input {
+                width: 6em !important;
+            }
+        }
+    }
+}
+
+.calendar-scheduler {
+    .nav {
+        align-items: center;
+
+        button:first-child {
+            margin-right: .25rem;
+        }
+
+        & > div {
+            white-space: nowrap;
+        }
+
+        @media screen and (max-width: 420px) {
+            button {
+                padding-left: .5rem;
+                padding-right: .5rem;
+            }
+        }
+    }
+
+    .schedule-buttons {
+        .prev-slot:before {
+            content: @fa-var-chevron-left;
+        }
+
+        .next-slot:after {
+            &:extend(.font-icon-class);
+            content: @fa-var-chevron-right;
+            display: inline-block;
+            float: none;
+            margin-right: 0;
+        }
+    }
+
+    .schedule-options {
+        flex: 1;
+        margin-left: 1rem;
+
+        html.layout-phone & {
+            order: 100;
+            margin-left: 0;
+        }
+
+        label {
+            vertical-align: middle;
+        }
+
+        input.icon-checkbox + label:before {
+            margin-right:.25rem;
+            display: inline;
+            float: none;
+        }
+    }
+
+    .schedule-nav {
+        flex: 1;
+        margin-left: .3rem;
+        text-align: right;
+
+        button {
+            line-height: 1.8;
+        }
+    }
+
+    .schedule-range {
+        width: 50%;
+        margin-top: 2rem;
+
+        html.layout-phone & {
+            margin: 0;
+        }
+    }
+
+    .schedule-legend {
+        .attendee {
+            margin-right: .5rem;
+        }
+    }
+
+    .attendees-list {
+        position: relative;
+
+        a.attendee-role-toggle {
+            position: absolute;
+            left: 0;
+            display: inline-block;
+            width: 1em;
+            cursor: pointer;
+        }
+
+        div.attendee {
+            border-top: 1px solid @color-list-border;
+            line-height: 1.7rem;
+            height: 1.8rem;
+        }
+
+        .attendee {
+            white-space: nowrap;
+
+            &.spacer {
+                height: 10px;
+            }
+
+            &.loading:before {
+                .animated-icon-class;
+                .font-icon-solid(@fa-var-circle-notch);
+            }
+
+            &.total {
+                font-weight: bold;
+            }
+
+            &.total,
+            &.spacer {
+                &:before {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    .schedule-table {
+        table-layout: fixed;
+
+        th {
+            border-top: 0;
+        }
+
+        td.attendees {
+            width: 25%;
+            overflow: hidden;
+            border-top: 0;
+
+            html.layout-phone & {
+                width: 35%;
+            }
+
+            .attendees-list {
+                border-bottom: 1px solid @color-table-border;
+            }
+        }
+
+        td.times {
+            width: auto;
+            border-top: 0;
+
+            table {
+                margin: 0;
+            }
+
+            td {
+                height: 1.8rem;
+                border-top: 1px solid @color-list-border;
+                white-space: nowrap;
+            }
+        }
+
+        div.scroll {
+            position: relative;
+            overflow: auto;
+        }
+
+        .timesheader {
+            height: 1.4rem;
+            border-top: 1px solid @color-table-border;
+        }
+
+        .boxtitle {
+            margin: 0;
+            padding: 0;
+            font-size: 1rem;
+            font-weight: bold;
+            padding-top: .5rem;
+            line-height: 2;
+        }
+
+        td {
+            padding: 4px;
+        }
+
+        tbody td {
+            padding: 0;
+
+            div {
+                height: 100%;
+            }
+        }
+
+        tr.spacer td {
+            padding: 0;
+            height: 10px;
+        }
+
+        tr.dates th[colspan="1"] {
+            min-width: 48px;
+            max-width: 48px;
+            text-align: center;
+            font-size: .7rem;
+            line-height: 2.9;
+        }
+
+        tr.times td {
+            cursor: pointer;
+            min-width: 48px;
+            max-width: 48px;
+            font-size: .7rem;
+            text-align: center;
+            color: @color-link;
+            height: 1.4rem;
+            padding: 0 .1rem;
+            vertical-align: middle;
+            border-top: 1px solid @color-table-border;
+            border-left: 1px solid @color-list-border;
+        }
+
+        .fbcontent {
+            td {
+                border-left: 1px solid @color-list-border;
+            }
+
+            &:last-child td {
+                border-bottom: 1px solid @color-table-border;
+            }
+        }
+
+        div.unknown {
+            background-color: @color-availability-unknown;
+        }
+
+        div.free {
+            background-color: @color-availability-free;
+        }
+
+        div.busy {
+            background-color: @color-availability-busy;
+        }
+
+        div.tentative {
+            background-color: @color-availability-tentative;
+        }
+
+        div.out-of-office {
+            background-color: @color-availability-out-of-office;
+        }
+
+        div.all-busy,
+        div.all-tentative,
+        div.all-out-of-office {
+            overflow: hidden;
+
+            // This span imitates a slanting line across the parent element
+            span {
+                display: block;
+                width: 300%;
+                height: 300%;
+                border: 1px solid #fff;
+                background: darken(@color-availability-busy, 10%);
+                transform: rotate(42deg) translate(2%);
+            }
+
+            &.w10 span {
+                display: none;
+            }
+
+            &.w20 span,
+            &.w25 span {
+                transform: rotate(17deg) translate(-9%);
+            }
+
+            &.w30 span {
+                transform: rotate(28deg) translate(-7%);
+            }
+
+            &.w40 span {
+                transform: rotate(36deg) translate(-3%);
+            }
+
+            &.w60 span {
+                transform: rotate(48deg) translate(6%);
+            }
+
+            &.w70 span,
+            &.w75 span {
+                transform: rotate(55deg) translate(12%, 30%);
+            }
+
+            &.w80 span {
+                transform: rotate(56deg) translate(13%, 30%);
+            }
+
+            &.w90 span {
+                transform: rotate(59deg) translate(16%, 30%);
+            }
+
+            &.w100 span {
+                transform: rotate(62deg) translate(19%, 30%);
+            }
+        }
+
+        div.all-tentative span {
+            background: darken(@color-availability-tentative, 10%);
+        }
+
+        div.all-out-of-office span {
+            background: darken(@color-availability-out-of-office, 10%);
+        }
+    }
+}
+
+#schedule-event-time {
+    position: absolute;
+    opacity: .75;
+    border-radius: .3rem;
+    cursor: move;
+    border: 2px solid @color-black-shade-text;
+    background-color: @color-black-shade-bg;
+}
+
+.resources-dialog {
+    .resource-selection {
+        flex: 4;
+        min-width: 300px;
+    }
+
+    .resource-content {
+        flex: 10;
+        margin-left: 1em;
+    }
+
+    .listing li.resource > a {
+        color: @color-font;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-cube;
+        }
+    }
+
+    .slot-nav {
+        display: none; // TODO
+    }
+}
+
+#resource-availability {
+    height: 100%;
+
+    .fc {
+        height: 100%;
+        overflow: hidden;
+        position: relative;
+    }
+
+    .fc-content {
+    }
+
+    .fc-view {
+        border-left: 1px solid @color-calendar-border;
+        border-bottom: 1px solid @color-calendar-border;
+    }
+
+    table.fc-header {
+        display: none;
+    }
+}
+
+.standalone-invitebox {
+    margin: 0 auto;
+    padding-top: 36vh;
+    max-width: 500px;
+    width: 95%;
+    background: url("@{skin-path}/images/watermark.jpg") center -20px no-repeat;
+    background-size: auto 40%;
+
+    .invitebox {
+        border: 1px solid @color-layout-border !important;
+    }
+}
+
+.searchbar a.button.date {
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        display: none;
+    }
+
+    &:before {
+        line-height: 1.25;
+    }
+}
+
+@media screen and (max-width: @screen-width-small) {
+    .fc {
+        .fc-header-left {
+            display: block;
+            width: 100%;
+            padding: 0;
+
+            button {
+                flex: 1 1 auto;
+                border-radius: 0;
+            }
+
+            .btn-group {
+                padding: 0;
+                display: flex;
+            }
+        }
+
+        .fc-header-center,
+        .fc-header-right {
+            display: none;
+        }
+
+        .fc-list-content {
+            table,
+            tbody {
+                display: flex;
+                flex-direction: column;
+                padding: 0 !important;
+            }
+        }
+
+        .fc-list-header {
+            td {
+                display: block;
+                text-align: center;
+                color: @color-black-shade-text;
+            }
+        }
+
+        // Use flexbox to reconstruct agenda view on mobile
+        .fc-list-section {
+            tr.fc-event {
+                border: 0;
+                margin: 0;
+                display: flex;
+                flex-wrap: wrap;
+
+                td {
+                    border: 0;
+                }
+
+                .fc-event-handle {
+                    padding: .5rem;
+                }
+
+                .fc-event-time {
+                    flex: 1;
+                    text-align: right;
+                    padding-right: .5rem;
+                }
+
+                .fc-event-title {
+                    .overflow-ellipsis;
+                    white-space: nowrap;
+                    min-width: 100%;
+                    border-bottom: 1px solid @color-list-border;
+                    padding: .1rem .25rem .1rem 1.7rem;
+                }
+
+                .fc-event-location {
+                    display: none;
+                }
+            }
+        }
+    }
+
+    #agendaoptions {
+        padding-top: .5rem;
+    }
+
+    .calendar-scheduler {
+        .schedule-range {
+            width: 100%;
+        }
+    }
+
+    .sidebar .calendar-datepicker {
+        display: none;
+    }
+
+    .resources-dialog {
+        .resource-content {
+            display: none;
+            margin: 0;
+        }
+
+        .resource-content {
+            ul {
+                margin: 1em 1em 0 1em;
+            }
+        }
+    }
+
+    #resource-availability {
+        margin: 0 1em;
+    }
+}
+
+@media screen and (min-width: (@screen-width-small + 1px)) and (max-width: 920px) {
+    .fc {
+        .fc-header {
+            display: block;
+
+            tr {
+                display: flex;
+            }
+        }
+
+        .fc-header-center {
+            .overflow-ellipsis;
+            flex: 1;
+
+            h2 {
+                font-size: 1rem;
+                line-height: 1;
+                padding-top: .75rem;
+            }
+        }
+
+        .fc-header-left,
+        .fc-header-right {
+            width: auto;
+
+            .btn {
+                padding-left: .5rem;
+                padding-right: .5rem;
+            }
+        }
+    }
+}
+
+body.task-calendar .header-title {
+    position: relative;
+
+    .tz {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        line-height: 2;
+        font-size: .8rem;
+        font-weight: normal;
+        color: @color-black-shade-text;
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_activesync.less Added

@@ -0,0 +1,53 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_activesync plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.listing.iconized li {
+    &.activesync > a:before {
+        content: @fa-var-rss-square;
+    }
+}
+
+#devices-table {
+    td:not(.selection) {
+        display: flex;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-rss-square; // TODO: mobile icon is not free
+        }
+
+        span {
+            .overflow-ellipsis;
+        }
+    }
+
+    .devicealias {
+        flex: 1;
+    }
+
+    .devicetype {
+        max-width: 40%;
+        font-style: italic;
+        padding-left: .5em;
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_delegation.less Added

@@ -0,0 +1,35 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_delegation plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.listing.iconized li {
+    &.delegation > a:before {
+        content: @fa-var-user-secret; // TODO: a better icon
+    }
+}
+
+#delegate-table {
+    td:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-user-secret; // TODO: a better icon
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_files.less Added

@@ -0,0 +1,472 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_files plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+a.btn.fromcloud:before,
+li > a.icon.saveas:before,
+a.button.filesaveall:before,
+a.button.saveas:before {
+    &:extend(.font-icon-class);
+    content: @fa-var-folder;
+}
+
+.toolbarmenu.listing li a.mount.storage:before {
+    content: @fa-var-database;
+}
+
+.toolbar a.button.open:before {
+    content: @fa-var-eye;
+}
+
+.toolbar a.button.rename:before {
+    content: @fa-var-pen-square;
+}
+
+.toolbar a.button.cancel:before {
+    content: @fa-var-times;
+}
+
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset a.btn-link.options.add-folder {
+    order: -1;
+
+    &:before {
+        content: @fa-var-plus;
+    }
+}
+
+.folderlist {
+    li.collection {
+        a.name {
+            padding-left: .5em;
+        }
+
+        &.audio a.name:before {
+            .font-icon-solid(@fa-var-volume-up);
+        }
+
+        &.video a.name:before {
+            .font-icon-solid(@fa-var-video);
+        }
+
+        &.image a.name:before {
+            content: @fa-var-image;
+        }
+
+        &.document a.name:before {
+            .font-icon-solid(@fa-var-book);
+        }
+
+        &.sessions a.name:before {
+            .font-icon-solid(@fa-var-users);
+        }
+    }
+
+    li.mailbox {
+        a.subscription {
+            cursor: pointer;
+            // reset listing's link style
+            padding: 0;
+            border-left: 0;
+            width: auto;
+
+            &:before {
+                .font-icon-regular(@fa-var-bookmark); // TODO: better icon
+                height: auto;
+                color: @color-link;
+                margin-right: .25rem;
+            }
+
+            &.subscribed:before {
+                &:extend(.font-icon-class);
+                .font-icon-solid(@fa-var-bookmark); // TODO: better icon
+            }
+        }
+    }
+}
+
+#filelistcontainer {
+    position: relative;
+}
+
+#filelistbox {
+    height: 100%;
+
+    &.droptarget {
+        &.active {
+            box-shadow: 0 0 2px 1px darken(@color-toolbar-button-background-hover, 20%) inset;
+        }
+
+        &.hover {
+            box-shadow: 0 0 2px 1px darken(@color-toolbar-button-background-hover, 20%) inset;
+            background-color: @color-toolbar-button-background-hover;
+        }
+    }
+}
+
+.filelist {
+    thead {
+        display: none;
+    }
+
+    td.options {
+        display: none;
+    }
+
+    td.name {
+        position: relative;
+    }
+
+    td.mtime {
+        width: 11em;
+    }
+
+    td.size {
+        text-align: right;
+        width: 6em;
+    }
+
+    tr.session > td.name {
+        padding-right: 2em;
+
+        &:after {
+            &:extend(.font-icon-class);
+            content: @fa-var-users;
+            color: @color-black-shade-border;
+            position: absolute;
+            right: .25em;
+            top: 0;
+        }
+    }
+
+    tr.session.invited > td.name:after {
+        color: @color-success;
+    }
+
+    tr.session.owner > td.name:after {
+        color: @color-black;
+    }
+}
+
+@media screen and (max-width: @screen-width-xs) {
+    .filelist {
+        td.mtime {
+            display: none;
+        }
+    }
+}
+
+.filelist tbody td.filename {
+    & span {
+        background: transparent !important;
+    }
+
+    & span:before {
+        &:extend(.font-icon-class);
+        .font-icon-regular(@fa-var-file);
+    }
+
+    &.pdf span:before,
+    &.application_pdf span:before {
+        content: @fa-var-file-pdf;
+    }
+
+    &.application_vnd_ms_word span:before,
+    &.application_msword span:before {
+        content: @fa-var-file-word;
+    }
+
+    &.application_vnd_ms_excel span:before,
+    &.application_vnd_oasis_opendocument_spreadsheet span:before,
+    &.application_vnd_oasis_opendocument_spreadsheet_template span:before {
+        content: @fa-var-file-excel;
+    }
+
+    &.application_vnd_ms_powerpoint span:before {
+        content: @fa-var-file-powerpoint;
+    }
+
+    &.application_vnd_oasis_opendocument_text span:before {
+        content: @fa-var-file-alt; // TODO
+    }
+
+    &.application_vnd_oasis_opendocument_presentation span:before,
+    &.application_vnd_oasis_opendocument_presentation_template span:before {
+        content: @fa-var-file-powerpoint; // TODO
+    }
+
+    &.tar span:before,
+    &.application_zip span:before,
+    &.application_x_7z_compressed span:before,
+    &.application_x_ace span:before,
+    &.application_x_arc span:before,
+    &.application_x_arj span:before,
+    &.application_x_bzip_compressed_tar span:before,
+    &.application_x_lha span:before,
+    &.application_x_rar span:before,
+    &.application_x_tarz span:before,
+    &.application_x_tzo span:before,
+    &.application_x_zip span:before,
+    &.application_x_zoo span:before {
+        content: @fa-var-file-archive;
+    }
+
+    &.image span:before,
+    &.image_png span:before,
+    &.image_svg_xml span:before,
+    &.image_jpeg span:before,
+    &.image_jpeg2000 span:before,
+    &.image_x_eps span:before,
+    &.application_vnd_stardivision_draw span:before,
+    &.application_vnd_sun_xml_draw span:before,
+    &.application_vnd_sun_xml_draw_template span:before {
+        content: @fa-var-file-image;
+    }
+
+    &.application_pgp_keys span:before,
+    &.application_pkcs7_mime span:before {
+        // TODO
+    }
+
+    &.audio span:before {
+        content: @fa-var-file-audio;
+    }
+
+    &.video span:before {
+        content: @fa-var-file-video;
+    }
+
+    &.ascii span:before,
+    &.text_plain span:before {
+        content: @fa-var-file-alt;
+    }
+
+    &.vcalendar span:before {
+        // TODO
+    }
+
+    &.vcard span:before,
+    &.text_x_vcard span:before {
+        // TODO
+    }
+
+    &.text_html span:before {
+        content: @fa-var-file-code;
+    }
+
+    &.style_css span:before {
+        // TODO
+    }
+
+    &.text_csv span:before {
+        // TODO
+    }
+
+    &.message_rfc822 span:before {
+        // TODO
+    }
+}
+
+#folder-mount-form {
+    td.source {
+        display: flex;
+        align-items: flex-start;
+        padding: .5rem;
+
+        &.selected {
+            background-color: @color-list-selected-background;
+        }
+
+        & > input {
+            height: 32px;
+            margin-right: .5rem;
+        }
+
+        & > div {
+            flex: 1;
+        }
+
+        img {
+            height: 32px;
+            margin-right: .5rem;
+        }
+
+        .name {
+            font-weight: bold;
+        }
+
+        .description {
+            font-size: 90%;
+        }
+
+        table {
+            margin-top: .5rem;
+        }
+
+        .form-group {
+            margin-bottom: 0;
+        }
+    }
+
+    .auth-options {
+        margin-top: .5rem;
+
+        & > label:before {
+            line-height: 1;
+        }
+    }
+}
+
+.files-dialog {
+    .selection-list {
+        flex: 1;
+        min-width: 220px;
+    }
+
+    .selection-content {
+        flex: 2;
+
+        @media screen and (min-width: (@screen-width-small + 1px)) {
+            border: 1px solid @color-layout-border;
+            border-left: 0;
+        }
+    }
+
+    a.subscription {
+        display: none;
+    }
+
+    @media screen and (max-width: @screen-width-small) {
+        .selection-list {
+            display: none;
+        }
+    }
+}
+
+.document-editor-header {
+    .toolbar {
+        text-align: left !important;
+    }
+
+    .header-title {
+        margin: 0 !important;
+    }
+
+    a.button.icon.members:before {
+        content: @fa-var-users;
+    }
+
+    #collaborators {
+        order: 9;
+        display: flex;
+        margin-right: .5rem;
+
+        a.button.add:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-plus;
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+
+    #doc-title {
+        flex: 1;
+        order: 8;
+
+        input {
+            display: inline;
+        }
+    }
+}
+
+.session-members {
+    img.photo {
+        width: 48px;
+        height: 48px;
+        min-width: 48px;
+        overflow: hidden;
+        background: url("@{skin-path}/images/contactpic.png") center center no-repeat #fff;
+        background-size: cover;
+        border-radius: 50%;
+        border: solid 3px #eee;
+        margin-left: .5rem;
+    }
+
+    ul {
+        padding: 0;
+        margin: 0;
+        list-style-type: none;
+
+        li {
+            display: flex;
+            align-items: center;
+        }
+
+        img.photo {
+            margin-left: 0;
+            margin-right: 1em;
+        }
+    }
+}
+
+.editors-dialog {
+    table {
+        th {
+            border: 0;
+        }
+
+        tr:last-child td {
+            border-bottom: 1px solid @color-layout-border;
+        }
+
+        td.options {
+            width: 1%;
+
+            a.delete:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-trash-alt;
+                display: inline;
+                line-height: 1;
+            }
+        }
+    }
+
+    label {
+        display: block;
+    }
+}
+
+button.participant.add:before {
+    content: @fa-var-user-plus;
+}
+
+.iframe-wrapper.file-type-audio,
+.iframe-wrapper.file-type-video {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    @media screen and (min-width: (@screen-width-small + 1px)) {
+        padding: 1em;
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_notes.less Added

@@ -0,0 +1,97 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for kolab_notes plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.toolbarmenu.listing li {
+    a.appendnote:before {
+        .font-icon-regular(@fa-var-sticky-note);
+    }
+}
+
+// Fixes TinyMCE editor height=0 issue
+#noteform iframe {
+    min-height: 10rem;
+}
+
+#notereferences {
+    margin-top: .5rem;
+
+    .attachmentslist a.delete {
+        margin-left: .5rem;
+    }
+}
+
+#notedetailstitle {
+    .dates {
+        color: @color-list-secondary;
+    }
+}
+
+#print-layout {
+    #notetitle {
+        font-size: 1.5rem;
+        line-height: 2;
+    }
+
+    #notetags {
+        margin-bottom: .5rem;
+    }
+
+    #notecreated {
+        margin-right: 2rem;
+    }
+}
+
+#kolabnoteslist {
+    tr {
+        display: flex;
+    }
+
+    td.title {
+        .overflow-ellipsis;
+        flex: 1;
+
+        &:before {
+            &:extend(.font-icon-class);
+            .font-icon-regular(@fa-var-sticky-note);
+        }
+    }
+
+    td.date {
+        overflow: unset;
+        color: @color-list-secondary;
+        font-style: italic;
+    }
+}
+
+.kolabmessagenotes {
+    & > i.icon:before {
+        .font-icon-regular(@fa-var-sticky-note) !important;
+    }
+
+    & > a {
+        .overflow-ellipsis;
+        white-space: nowrap;
+        display: block;
+        text-decoration: none;
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/kolab_tags.less Added

@@ -0,0 +1,122 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin style of kolab_tags plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.toolbarmenu.listing li {
+    a.tags:before {
+        content: @fa-var-tags;
+    }
+
+    a.tag:before,
+    a.tag.remove:before,
+    a.tag.remove.all:before {
+        content: @fa-var-tag;
+    }
+}
+
+#taglist {
+    li {
+        padding: 0 .5rem;
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-tag;
+            margin: 0 .5rem 0 .2rem;
+        }
+    }
+}
+
+#tagsform option:before,
+#taglist li:before,
+#tag-selector li a:before {
+    color: darken(@color-main, 15%); // default tag color
+}
+
+#tagsform option:checked:before,
+#tag-selector li:hover a:before {
+    color: #fff;
+}
+
+#tagsform {
+    min-height: 15rem;
+
+    select {
+        padding: 0;
+        margin-bottom: .5rem;
+
+        &:focus {
+            box-shadow: none !important;
+            border: 1px solid @color-layout-border;
+        }
+    }
+
+    option {
+        color: @color-font; // fix Firefox issue caused by text-shadow below
+        text-shadow: none;
+        padding: .5rem;
+        outline: 0;
+        border: 0;
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-tag;
+            line-height: 1;
+        }
+    }
+
+    .buttons {
+        text-align: center;
+
+        button {
+            margin: 0 .25rem;
+        }
+    }
+}
+
+.tagbox {
+    color: #fff;
+    background-color: @color-main !important;
+    border: 0 !important;
+    border-radius: .25rem;
+    max-width: 4em;
+    padding: .1rem .4rem;
+    margin-right: .2rem;
+    font-weight: bold;
+
+    &:not(.tagedit-listelement) a {
+        color: inherit;
+        padding-left: .5rem;
+        text-decoration: none;
+    }
+
+    h2 > & {
+        font-size: 1.2rem;
+    }
+}
+
+.tag-droppable.formcontainer {
+    &.ui-droppable-active {
+        background-color: @color-black-shade-bg !important;
+    }
+    &.ui-droppable-hover {
+        background-color: @color-list-droptarget-background !important;
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/libcalendaring.less Added

@@ -0,0 +1,725 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for libcalendaring plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+.invitebox {
+    & > i.icon {
+        position: absolute;
+        top: 0;
+        padding-top: .5em;
+    }
+
+    & > span {
+        padding-left: 2.5em;
+    }
+
+    td {
+        padding: 2px;
+        vertical-align: top;
+
+        &.ititle {
+            font-weight: bold;
+            padding-right: 0.5em;
+        }
+
+        &.label {
+            color: #666;
+            padding-right: 1em;
+        }
+
+        &.sensitivity {
+            font-weight: bold;
+        }
+
+        &.recurrence-id {
+            text-transform: uppercase;
+            font-style: italic;
+        }
+
+        &.date.modified {
+            font-weight: bold;
+            color: @color-error;
+        }
+
+        em {
+            font-weight: bold;
+        }
+    }
+
+    .itip-buttons {
+        display: flex;
+        flex-wrap: wrap;
+
+        input.button {
+            margin: 0 .25rem .25rem 0;
+        }
+    }
+
+    .rsvp-buttons {
+        width: 100%;
+        padding-top: .25rem;
+    }
+
+    .itip-reply-controls {
+        margin-top: .25rem;
+        width: 100%;
+
+        & > label {
+            display: inline;
+
+            label {
+                line-height: 1;
+                margin-right: .25rem;
+            }
+        }
+
+        a {
+            margin-left: 1em;
+            white-space: nowrap;
+        }
+    }
+
+    .rsvp-status {
+        margin: .5rem 0;
+        width: 100%;
+
+        &.hint {
+            color: #666;
+            font-style: italic;
+        }
+    }
+
+    .folder-select {
+        white-space: nowrap;
+
+        select {
+            display: initial;
+            width: auto;
+        }
+    }
+}
+
+.rsvp-status {
+    &:before {
+        line-height: 1.1;
+        color: lighten(@color-black, 25%);
+        float: none;
+        display: inline;
+    }
+
+    &.loading:before {
+        &:extend(.font-icon-class);
+        .animated-icon-class;
+        content: @fa-var-circle-notch;
+        line-height: 1;
+    }
+
+    &.declined:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-ban;
+        color: @color-error;
+    }
+
+    &.tentative:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-check-circle;
+        color: @color-warning;
+    }
+
+    &.accepted:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-check-circle;
+        color: @color-success;
+    }
+
+    &.delegated:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-share;
+    }
+
+    &.needs-action:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-question-circle;
+    }
+}
+
+.attendee {
+    &:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-question-circle;
+        display: inline;
+        float: none;
+        font-size: 1em;
+        color: @color-black-shade-text;
+    }
+
+    &.req-participant:before {
+        content: @fa-var-user;
+    }
+
+    &.opt-participant:before {
+        .font-icon-regular(@fa-var-user);
+    }
+
+    &.non-participant:before {
+        content: @fa-var-user;
+        color: #ccc;
+    }
+
+    &.chair:before {
+        content: @fa-var-user; // todo
+        color: @color-warning;
+    }
+
+    &.completed:before,
+    &.accepted:before {
+        content: @fa-var-check-circle;
+        color: @color-success;
+    }
+
+    &.declined:before {
+        content: @fa-var-ban;
+        color: @color-error;
+    }
+
+    &.tentative:before {
+        content: @fa-var-check-circle;
+        color: @color-warning;
+    }
+
+    &.delegated:before {
+        content: @fa-var-share;
+    }
+
+    &.organizer:before {
+        content: @fa-var-briefcase; // TODO: better icon
+    }
+
+    &.in-process:before {
+        content: @fa-var-cog;
+    }
+}
+
+.attendees-comentbox {
+    label {
+        display: inline;
+    }
+}
+
+.edit-attendees-table {
+    width: 100%;
+
+    th, td {
+        width: 1%;
+        text-align: center;
+    }
+
+    td {
+        border: 0;
+        padding: 0 .3rem;
+    }
+
+    th {
+        border-bottom: 1px solid #eee !important;
+    }
+
+    th.name, td.name, th.role, td.role {
+        width: auto;
+        text-align: left;
+    }
+
+    th.invite {
+        input {
+            display: none;
+        }
+
+        label {
+            cursor: pointer;
+        }
+
+        label:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-envelope;
+            display: inline;
+            float: none;
+            margin-left: .25rem;
+        }
+
+    }
+    td.invite {
+        label:before {
+            line-height: 1.6;
+            height: 1.5em;
+        }
+    }
+
+    td.name {
+        span {
+            line-height: 2.5;
+            display: flex;
+
+            & > :first-child {
+                .overflow-ellipsis;
+                // width and flex is required to make overflow working
+                flex: 1;
+                width: 1px;
+                white-space: nowrap;
+            }
+        }
+    }
+
+    td.availability,
+    td.confirmstate {
+        span {
+            margin: 0;
+        }
+
+        span:after,
+        span:before {
+            line-height: 2;
+            margin: 0;
+            font-size: 1.2em;
+            height: 2em;
+            width: 2em;
+        }
+    }
+
+    td.options {
+        a {
+            display: inline-block;
+            height: 2em;
+
+            &:before {
+                line-height: 1.8;
+                margin: 0;
+            }
+        }
+    }
+
+    a.expandlink {
+        &:before {
+            content: @fa-var-plus-square;
+            line-height: 2;
+        }
+    }
+
+    .inner {
+        display: none;
+    }
+
+    html.layout-phone & {
+        th.availability,
+        th.confirmstate {
+            text-indent: -5000px;
+        }
+
+        td.role {
+            max-width: 7em;
+        }
+
+        select {
+            padding: 0 .5rem;
+        }
+
+    }
+}
+
+html.touch {
+    .edit-attendees-table {
+        td.invite {
+            label:before {
+                line-height: 1.2;
+                height: 1.2em;
+            }
+        }
+    }
+}
+
+.form-searchbar {
+    display: flex;
+    margin-bottom: .5rem;
+
+    input[type=text] {
+        flex: 1;
+
+        html.layout-phone & {
+            max-width: 50%;
+        }
+    }
+
+    input[type=button] {
+        margin-left: .5em;
+        .overflow-ellipsis;
+    }
+}
+
+.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 {
+    .font-icon-regular(@fa-var-calendar-alt);
+}
+
+.alarms-input {
+    .edit-alarm-item {
+        display: flex;
+
+        & + .edit-alarm-item {
+            margin-top: .25rem;
+        }
+    }
+
+    .edit-alarm-buttons {
+        a {
+            line-height: 1;
+            padding: .375em .25em;
+            margin: 0 .25rem;
+
+            &:before {
+                margin: 0;
+                width: 1em;
+            }
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+
+    .edit-alarm-item.first .delete-alarm {
+        display: none;
+    }
+
+    .edit-alarm-item:not(.first) .add-alarm {
+        display: none;
+    }
+
+    .edit-alarm-type {
+        flex: 1;
+    }
+
+    .edit-alarm-set {
+        display: flex;
+        flex: 1;
+    }
+
+    .edit-alarm-values {
+        margin-left: .25rem;
+        flex: 5;
+    }
+
+    .edit-alarm-offset {
+        flex: 5;
+    }
+
+    .edit-alarm-date,
+    .edit-alarm-time,
+    .edit-alarm-related {
+        flex: 3;
+    }
+}
+
+.recurrence-form {
+    .recurrence-rdates {
+        width: 100%;
+        padding: 0;
+        list-style-type: none;
+
+        &:empty {
+            margin: 0;
+        }
+
+        a.delete {
+            margin-left: 2em;
+            &:before {
+                display: inline-block;
+                float: none;
+            }
+        }
+
+        .inner {
+            display: none;
+        }
+    }
+
+    .recurrence-onevery {
+        select {
+            width: 40%;
+            display: inline;
+        }
+    }
+
+    .inputform {
+        display: flex;
+
+        input.button {
+            margin-left: .25rem;
+        }
+    }
+
+    div.line {
+        width: 100%;
+        display: flex;
+        margin-bottom: .25rem;
+
+        label {
+            margin-left: .5em;
+            min-width: 4em;
+            line-height: 2.5;
+        }
+    }
+
+    .month,
+    .monthday,
+    .weekday {
+        display: inline-block;
+        width: 3.5em;
+        margin-right: .5rem;
+
+        input {
+            margin-right: .25rem;
+        }
+    }
+
+    .monthday {
+        width: 2.75em;
+    }
+
+    .table td {
+        border: 0;
+        padding: 0;
+
+        &.label {
+            white-space: nowrap;
+        }
+
+        &:first-child label {
+            line-height: 2.5;
+        }
+
+        & label.monthday:first-child {
+            margin-top: .5rem;
+        }
+    }
+
+    .input-group-append,
+    .input-group-prepend {
+        display: initial; // fixes buggy height of the element
+    }
+}
+
+#event-status-badge {
+    width: 7rem;
+    height: 7rem;
+    position: absolute;
+    top: 0;
+    right: 0;
+    overflow: hidden;
+
+    span {
+        display: none;
+        text-transform: uppercase;
+        line-height: 20px;
+        position: absolute;
+        left: -2.4rem;
+        top: 2.4rem;
+        width: 13.2rem;
+        text-align: center;
+        font-weight: bold;
+        font-size: .85rem;
+        color: #fff;
+        -webkit-transform: rotate(45deg);
+        transform: rotate(45deg);
+
+        &:before {
+            &:extend(.font-icon-class);
+            display: inline;
+            float: none;
+        }
+
+        .status-cancelled & {
+            background-color: darken(@color-error, 10%);
+            display: block;
+
+            &:before {
+                content: @fa-var-times-circle;
+            }
+        }
+
+        .sensitivity-private & {
+            background-color: darken(@color-warning, 10%);
+            display: block;
+
+            &:before {
+                content: @fa-var-lock;
+            }
+        }
+
+        .sensitivity-confidential & {
+            background-color: darken(@color-error, 10%);
+            display: block;
+
+            &:before {
+                content: @fa-var-user-secret;
+            }
+        }
+    }
+}
+
+#alarm-display {
+    h3 {
+        font-size: 1.2rem;
+        margin-bottom: .25rem;
+
+        &:before {
+            &:extend(.font-icon-class);
+            .font-icon-regular(@fa-var-calendar-alt);
+            font-size: 1em;
+        }
+
+        &.type-task:before {
+            .font-icon-regular(@fa-var-calendar-check);
+        }
+    }
+
+    .event-section {
+        font-size: .9rem;
+        color: @color-black-shade-text;
+        white-space: nowrap;
+        .overflow-ellipsis;
+    }
+
+    .alarm-actions {
+        text-align: right;
+        margin-bottom: .25rem;
+
+        a {
+            &:first-child {
+                margin-right: 1em;
+            }
+
+            &:before {
+                &:extend(.font-icon-class);
+                display: inline;
+                float: none;
+            }
+        }
+    }
+
+    a.alarm-action-snooze:before {
+        content: @fa-var-bell-slash;
+    }
+
+    a.alarm-action-dismiss:before {
+        content: @fa-var-trash-alt;
+    }
+}
+
+#alarm-snooze-dropdown a:before {
+    .font-icon-regular(@fa-var-clock);
+}
+
+.dialog-message {
+    margin: 0;
+    opacity: .95;
+    width: 100%;
+    padding: .75em;
+    margin-top: .25em;
+    color: @color-message;
+    background-color: @color-message-warning-background;
+
+    & > label {
+        margin: 0;
+        display: block;
+
+        label:before {
+            line-height: 1.25;
+            margin-right: .25rem;
+        }
+    }
+
+    .message {
+        display: flex;
+    }
+
+    & + .savemode {
+        margin-top: 1rem;
+
+        a.btn {
+            margin-right: .5rem;
+        }
+    }
+
+    & > .savemode {
+        margin-top: .5rem;
+
+        label {
+            margin-right: 1rem;
+        }
+
+        input {
+            margin-right: .25rem;
+        }
+    }
+}
+
+@media screen and (max-width: 420px) {
+    .nav-link.nav-icon {
+        width: 3em;
+        margin-right: 5px;
+        padding: .5rem .5rem .5rem .65rem;
+
+        &:before {
+            .font-icon-class;
+            margin: 0 1rem 0 0;
+            width: 1em;
+            line-height: 1.2;
+        }
+
+        &.resources:before {
+            content: @fa-var-cube;
+            margin-left: .1rem;
+        }
+
+        &.attachments:before {
+            content: @fa-var-paperclip;
+        }
+
+        &.attendees:before {
+            content: @fa-var-users;
+        }
+    }
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/include/tasklist.less Added

@@ -0,0 +1,367 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for tasklist plugin.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#taskmenu a.tasklist:before {
+    content: @fa-var-calendar-check;
+}
+
+.toolbarmenu.listing li {
+    a.tasklistlink:before,
+    a.taskaddlink:before {
+        .font-icon-regular(@fa-var-calendar-check);
+    }
+}
+
+.tasklist-invitebox {
+    & > i.icon:before {
+        content: @fa-var-calendar-check !important;
+    }
+}
+
+.listing {
+    li {
+        & > div {
+            &.tasklist .listname:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-calendar-check;
+            }
+        }
+    }
+}
+
+@tasklist-record-height: 3.8rem;
+
+#tasklist {
+    li.taskitem {
+        border-bottom: 0;
+
+        div.taskhead {
+            position: relative;
+            display: block;
+            height: @tasklist-record-height;
+            padding-left: (1 * @listing-treetoggle-width);
+            outline: 0;
+
+            &.flagged {
+                color: @color-list-flagged !important;
+            }
+
+            &.selected {
+                background-color: @color-list-selected-background;
+            }
+
+            &.droptarget {
+                background-color: @color-list-droptarget-background;
+            }
+        }
+
+        & > div,
+        & > span {
+            border-bottom: 1px solid @color-list-border;
+        }
+
+        ul {
+            padding: 0;
+            border: 0;
+
+            li {
+                padding-left: 0;
+                .taskhead, .title { padding-left: (2 * @listing-treetoggle-width + .25rem); }
+                .childtoggle { left: @listing-treetoggle-width; }
+
+                li {
+                    .taskhead, .title { padding-left: (3 * @listing-treetoggle-width + .25rem); }
+                    .childtoggle { left: (2 * @listing-treetoggle-width); }
+
+                    li {
+                        .taskhead, .title { padding-left: (4 * @listing-treetoggle-width + .25rem); }
+                        .childtoggle { left: (3 * @listing-treetoggle-width); }
+
+                        li {
+                            .taskhead, .title { padding-left: (5 * @listing-treetoggle-width + .25rem); }
+                            .childtoggle { left: (4 * @listing-treetoggle-width); }
+
+                            li {
+                                .taskhead, .title { padding-left: (6 * @listing-treetoggle-width + .25rem); }
+                                .childtoggle { left: (5 * @listing-treetoggle-width); }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    .childtoggle {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: @listing-treetoggle-width;
+        padding: 0 0 0 .25rem;
+        height: @tasklist-record-height;
+        cursor: pointer;
+        z-index: 1;
+
+        .inner {
+            display: none;
+        }
+
+        &:before {
+            &:extend(.font-icon-class);
+            content: @fa-var-angle-right;
+            margin: 0;
+            width: 1em;
+            line-height: @tasklist-record-height;
+        }
+
+        &.expanded:before {
+            content: @fa-var-angle-down;
+        }
+
+        &.collapsed:before {
+            content: @fa-var-angle-right;
+        }
+
+        &.complete {
+            span.title {
+                text-decoration: line-through;
+            }
+
+            .progressbar {
+                display: none;
+            }
+        }
+    }
+
+    span.title {
+        position: absolute;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        line-height: 2em;
+        padding: 0 0 0 .2em;
+        padding-left: (1 * @listing-treetoggle-width + .25rem);
+        margin-right: 2em;
+        .overflow-ellipsis;
+    }
+
+    span.tags {
+        position: absolute;
+        right: 2em;
+        top: 0;
+        line-height: 2em;
+        text-align: right;
+    }
+
+    span.date {
+        position: absolute;
+        padding-left: .2em;
+        font-size: 90%;
+        line-height: 2.5;
+        color: @color-list-secondary;
+        cursor: pointer;
+
+        input {
+            line-height: 1;
+            padding: 0;
+            margin-top: -2px;
+        }
+    }
+
+    span.flagged {
+        position: absolute;
+        right: 0;
+        top: 0;
+        line-height: 1.8em;
+        cursor: pointer;
+    }
+
+    .taskhead:not(.flagged):hover span.flagged:before {
+        &:extend(.font-icon-class);
+        .font-icon-regular(@fa-var-flag);
+    }
+
+    .taskhead.flagged span.flagged:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-flag;
+    }
+
+    .progressbar {
+        position: absolute;
+        bottom: 1px;
+        left: .2em;
+        right: .2em;
+
+        .progressvalue {
+            border-top: 2px solid @color-warning;
+        }
+    }
+
+    input + label,
+    input.complete {
+        position: absolute;
+        right: .25rem;
+        bottom: 0;
+        top: auto;
+        padding: 0 .2em 0 0;
+        cursor: pointer;
+        z-index: 1;
+        line-height: 1;
+        height: 1.5em;
+        font-size: 1.15em;
+    }
+
+    .actions {
+        display: none;
+    }
+
+    // Focus indicator
+    @media screen and (min-width: @screen-width-large) {
+        .taskhead {
+            border-left: 2px solid transparent;
+        }
+
+        .taskhead.focused {
+            border-left: 2px solid @color-list-focus-indicator;
+            outline: 0;
+        }
+    }
+}
+
+html.touch #tasklist {
+    li {
+        font-size: 1rem;
+    }
+
+    span.flagged,
+    input[type=checkbox],
+    .icon-checkbox + label {
+        display: none;
+    }
+
+    span.title {
+        margin-right: .5rem;
+    }
+
+    span.tags {
+        right: .5rem;
+    }
+}
+
+#taskshow {
+    & + .formbuttons {
+        button.disabled {
+            display: none;
+        }
+    }
+
+    .task-parent-title {
+        color: @color-black-shade-text;
+        font-size: 90%;
+        margin-bottom: .5rem;
+    }
+
+    .task-title {
+        font-size: 1.5rem;
+        font-weight: bold;
+    }
+
+    .task-description {
+        margin: 1rem 0;
+    }
+
+    &.status-completed h2 {
+        text-decoration: line-through;
+    }
+
+    &.status-flagged h2:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-flag;
+        color: @color-error;
+        font-size: .9em;
+    }
+
+    .attachmentslist li {
+        margin-right: 1em;
+    }
+}
+
+#taskedit-attachment-form {
+    // fixes redundant scrolling and height issue on task edit form
+    position: absolute;
+}
+
+.messagetasklinks {
+    & > i.icon:before {
+        content: @fa-var-calendar-check !important;
+    }
+
+    .tasklist {
+        list-style-type: none;
+        margin: 0;
+        padding: 0;
+    }
+
+    input {
+        height: auto !important;
+    }
+}
+
+#print-layout {
+    #tasklist {
+        padding: 0;
+
+        li {
+            list-style-type: none;
+        }
+
+        .description {
+            display: block;
+            white-space: pre-wrap;
+        }
+
+        .title {
+            position: relative;
+            font-weight: bold;
+            padding: 0;
+            margin: 0;
+        }
+
+        .taskhead {
+            height: auto;
+        }
+    }
+}
+
+.taskitem-draghelper {
+    .overflow-ellipsis;
+}
+
+.quickview-active {
+    // TODO ?
+}
+
+#rootdroppable {
+    // TODO ?
+}
+

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/libkolab.less Added

@@ -0,0 +1,554 @@
+/**
+ * Kolab core library
+ *
+ * This file contains Elastic skin styles for various Kolab plugins.
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2012-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+@skin: "elastic";
+@skin-path: "../../../../skins/@{skin}";
+
+@import (reference) "@{skin-path}/styles/variables";
+@import (reference) "@{skin-path}/styles/mixins";
+
+
+/*** Common folders list extensions ***/
+
+.listing {
+    // Fix focus indicator, because we add div element in the list record
+    @media screen and (min-width: @screen-width-large) {
+        li > div > a {
+            border-left: 2px solid transparent;
+        }
+        li > div > a:focus {
+            border-left: 2px solid @color-list-focus-indicator;
+            outline: 0;
+        }
+    }
+
+    li {
+        & > div {
+            display: flex;
+
+            & > a:first-child {
+                .overflow-ellipsis;
+                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;
+                }
+            }
+
+            &.folder .listname:before {
+                &:extend(.font-icon-class);
+                content: @fa-var-sticky-note;
+                margin-right: .5rem;
+            }
+
+            span.actions {
+                display: flex;
+
+                input + & {
+                    padding-right: 2em;
+                }
+
+                a {
+                    padding: 0;
+                    margin: 0;
+                    margin-right: .2rem;
+                    cursor: pointer;
+
+                    &:before {
+                        margin: 0;
+                    }
+
+                    &.remove {
+                        display: none;
+                    }
+                }
+            }
+
+            a.quickview {
+                &:before {
+                    content: @fa-var-eye;
+                    opacity: .2;
+                    color: @color-link;
+                }
+
+                &:after {
+                    display: none !important;
+                }
+            }
+
+            &.focusview {
+                a.quickview:before {
+                    content: @fa-var-eye;
+                    opacity: 1;
+                }
+            }
+
+            .subscribed {
+                cursor: pointer;
+                // reset listing's link style
+                padding: 0;
+                border-left: 0;
+                width: auto;
+
+                &:before {
+                    .font-icon-regular(@fa-var-bookmark); // TODO: better icon
+                    height: auto;
+                    color: @color-link;
+                    margin-right: .25rem;
+                }
+            }
+
+            // span.subscribed is used on addressbooks list, a.subscribed in other places
+            span.subscribed:before {
+                &:extend(.font-icon-class);
+                .font-icon-regular(@fa-var-bookmark); // TODO: better icon
+            }
+
+            &.subscribed {
+                .subscribed:before {
+                    .font-icon-solid(@fa-var-bookmark); // TODO: better icon
+                }
+            }
+        }
+
+        &.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;
+            }
+        }
+
+        & > div.other.user > .listname,
+        &.other.user > div a:first-child {
+            &:before {
+                .font-icon-solid(@fa-var-user);
+            }
+        }
+
+        & > div.virtual.user > .listname,
+        &.virtual.user > div a:first-child {
+            &:after {
+                display: none;
+            }
+        }
+
+        & > div.virtual.shared > .listname,
+        &.virtual.shared > div a:first-child {
+            &:before {
+                .font-icon-solid(@fa-var-share-alt);
+            }
+
+            &:after {
+                display: none;
+            }
+        }
+
+        &.virtual > div > a {
+            opacity: .5;
+        }
+    }
+
+    // Tree structure fix
+    &.treelist:not(.notree) {
+        & > li > div > a {
+            padding-left: @listing-treetoggle-width;
+        }
+    }
+
+    input.flex-checkbox {
+        position: relative !important;
+        margin: 0 0 0 .25em !important;
+
+        & + label {
+            position: relative !important;
+            margin: 0 .3em 0 -1em !important;
+            right: 0 !important;
+            font-size: 1.15em;
+        }
+    }
+
+    li.droptarget > div {
+        background-color: @color-list-droptarget-background;
+    }
+
+    li .count {
+        position: absolute;
+        top: 0;
+        right: 0;
+        min-width: 2em;
+        line-height: 1.4rem;
+        margin: (@listing-line-height - 1.4rem)/2;
+        padding: 0 .3em;
+        border-radius: .4em;
+        background: @color-list-secondary;
+        color: #fff;
+        text-align: center;
+        font-weight: bold;
+
+        html.touch & {
+            line-height: 2rem;
+            margin: (@listing-touch-line-height - 2rem)/2;
+        }
+    }
+}
+
+html.touch .listing {
+    li {
+        & > div {
+            a:after {
+                height: @listing-touch-line-height !important;
+            }
+        }
+
+        .actions {
+            margin-left: .2rem;
+            a {
+                margin-right: .5rem;
+            }
+        }
+    }
+}
+
+.searchresults {
+    .boxtitle {
+        line-height: 2rem !important;
+        font-size: 80%;
+        padding: 0 .5rem;
+        margin: 0;
+        color: @color-popover-separator;
+        background-color: @color-popover-separator-background;
+        text-align: center;
+        border-bottom: 1px solid @color-layout-border;
+    }
+}
+
+.folderlist li.mailbox {
+    &.type-event > a:before {
+        .font-icon-solid(@fa-var-calendar);
+    }
+    &.type-task > a:before {
+        .font-icon-solid(@fa-var-calendar-check);
+    }
+    &.type-journal > a:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
+    &.type-contact > a:before {
+        .font-icon-regular(@fa-var-address-book);
+    }
+    &.type-note > a:before {
+        .font-icon-regular(@fa-var-sticky-note);
+    }
+    &.type-configuration > a:before {
+        .font-icon-solid(@fa-var-cog);
+    }
+    &.type-freebusy > a:before {
+        .font-icon-regular(@fa-var-calendar);
+    }
+    &.type-file > a:before {
+        .font-icon-solid(@fa-var-folder);
+    }
+}
+
+.toolbarmenu.listing li {
+    &.search {
+        padding: .25rem .5rem;
+        .input-group {
+
+            i.icon {
+                font-size: 80%;
+                padding: .5rem;
+            }
+
+            input {
+                font-size: 100%;
+            }
+        }
+    }
+
+    a.history:before {
+        content: @fa-var-history;
+    }
+}
+
+.formbuttons-secondary-kolab {
+    display: inline;
+}
+
+a.history {
+    &.disabled {
+        display: none;
+    }
+
+    &:before {
+        &:extend(.font-icon-class);
+        content: @fa-var-history;
+        display: inline;
+        float: none;
+    }
+}
+
+// E.g. notes preview frame
+.watermark {
+    & > * {
+        display: none;
+    }
+
+    &.formcontainer {
+        background: transparent !important;
+
+        &  > * {
+            display: initial;
+        }
+    }
+}
+
+.form-group > .datetime {
+    display: flex;
+    white-space: nowrap;
+
+    input {
+        width: 10em;
+    }
+
+    input:first-child {
+        margin-right: .5rem;
+        width: 15em;
+    }
+
+    a {
+        margin-left: 1em;
+        text-align: right;
+        flex: 1;
+        line-height: 2.4;
+    }
+}
+
+button.btn.save.notify:before {
+    content: @fa-var-envelope;
+}
+
+button.btn.print:before {
+    content: @fa-var-print;
+}
+
+.formcontent.text-only .faded * {
+    color: @color-black-shade-text;
+}
+
+.print-config {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    z-index: 10000;
+    padding: .5em 1em;
+    background-color: @color-black-shade-bg;
+
+    button.print {
+        margin-right: 1rem;
+    }
+
+    .prop {
+        margin-left: .5rem;
+        display: inline-block;
+        vertical-align: middle;
+
+        label {
+            margin: 0;
+        }
+
+        label:before {
+            line-height: 1.25;
+            margin-right: .25rem;
+        }
+    }
+
+    @media print {
+        display: none;
+    }
+
+    & + .print-content {
+        position: relative;
+        top: 0;
+        left: 0;
+        height: auto;
+        margin: 5em auto 0 auto;
+        overflow: visible;
+    }
+}
+
+.selection-dialog {
+    .ui-dialog-content {
+        display: flex !important;
+        overflow: hidden !important;
+    }
+
+    .selection-list {
+        display: flex;
+        flex-direction: column;
+        border: 1px solid @color-layout-border;
+        justify-content: center;
+    }
+
+    .ui-dialog-content .popupmenu {
+        display: flex !important; // overwrites .popupmenu style
+        width: 100%;
+    }
+
+    .scroller {
+        flex: 1;
+        overflow-y: auto;
+    }
+
+    .header {
+        border-bottom: 1px solid @color-layout-border;
+        display: flex;
+        background-color: @color-layout-header-background;
+        font-size: @layout-header-font-size;
+        font-weight: bold;
+        line-height: @layout-header-height;
+        height: @layout-header-height;
+        min-height: @layout-header-height;
+        padding: 0 .25em;
+        position: relative; // for absolute positioning of searchbar
+        overflow: hidden;
+        white-space: nowrap;
+    }
+
+    .header-title {
+        width: 100%;
+        text-align: center;
+        margin: 0 2em;
+    }
+
+    .selection-content {
+        display: flex;
+        flex-direction: column;
+    }
+
+    .tab-content {
+        margin-top: 1rem;
+        height: 100%;
+        overflow-y: auto;
+    }
+
+    .form-addon {
+        margin: 0;
+        padding: .5rem 0;
+        width: 100%;
+        background-color: @color-black-shade-bg;
+        border-top: 1px solid @color-layout-border;
+    }
+
+    // overwrite .popupmenu colors
+    .listing {
+        ul {
+            background-color: @color-layout-list-background;
+        }
+
+        li.selected {
+            color: @color-font;
+        }
+    }
+
+    @media screen and (max-width: @screen-width-small) {
+        .ui-dialog-content {
+            padding: 0 !important;
+        }
+
+        .selection-list {
+            border: 0;
+        }
+
+        .ui-dialog-titlebar {
+            display: none;
+            margin: 0;
+        }
+
+        .selection-content {
+            .header-title {
+                margin-left: 0;
+            }
+        }
+
+        .header {
+            a:before {
+                font-size: 1.75rem;
+            }
+        }
+    }
+}
+
+// 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;
+    }
+
+    #taskmenu {
+        a {
+            height: auto;
+            width: 100%;
+
+            &:before {
+                height: 2.1rem;
+                width: 100%;
+            }
+        }
+
+        .special-buttons {
+            width: 2.5rem;
+        }
+
+        span.inner {
+            display: none;
+        }
+    }
+}
+
+@import "include/calendar";
+@import "include/kolab_activesync";
+@import "include/kolab_delegation";
+@import "include/kolab_files";
+@import "include/kolab_notes";
+@import "include/kolab_tags";
+@import "include/libcalendaring";
+@import "include/tasklist";

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/templates/attachment.html Added

@@ -0,0 +1,69 @@
+<roundcube:include file="includes/layout.html" />
+
+<h1 class="voice"><roundcube:var name="env:filename" /></h1>
+
+<div class="sidebar 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>
+	</div>
+	<div class="scroller">
+		<roundcube:object name="plugin.attachmentcontrols" class="listing props-table" role="contentinfo"
+			aria-labelledby="aria-label-contentinfo" />
+	</div>
+</div>
+
+<div class="content 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">
+			<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"
+				class="button print disabled" classAct="button print" 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"
+					label="zoomin" title="increaseimage" innerclass="inner" />
+				<roundcube:button command="image-scale" type="link" prop="-" data-hidden="small"
+					class="button zoomout disabled" classAct="button zoomout"
+					label="zoomout" title="decreaseimage" innerclass="inner" />
+				<roundcube:button command="image-rotate" type="link"
+					class="button rotate disabled" classAct="button rotate" data-hidden="small"
+					label="rotate" title="rotateimage" innerclass="inner" />
+			<roundcube:endif />
+		</div>
+	</div>
+	<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
+	<div class="iframe-wrapper">
+		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" title="arialabelattachmentpreview"
+			role="main" aria-labelledby="aria-label-messagepart" />
+	</div>
+</div>
+
+<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">
+			<roundcube:button command="image-scale" type="link" prop="+"
+				class="button zoomin disabled" classAct="button zoomin"
+				label="zoomin" title="increaseimage" innerclass="inner" />
+			<roundcube:button command="image-scale" type="link" prop="-"
+				class="button zoomout disabled" classAct="button zoomout"
+				label="zoomout" title="decreaseimage" innerclass="inner" />
+			<roundcube:button command="image-rotate" type="link"
+				class="button rotate disabled" classAct="button 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')))"
+			data-label-show="<roundcube:label name="showtools" />" data-label-hide="<roundcube:label name="hidetools" />" title="<roundcube:label name="showtools" />">
+			<span class="inner"><roundcube:label name="showtools" /></span>
+		</a>
+	</div>
+<roundcube:endif />
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/elastic/templates/folderform.html Added

iRony-0.4.0.tar.gz/lib/plugins/libkolab/skins/larry/libkolab.css -> iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/larry/libkolab.css Changed

@@ -65,3 +65,74 @@
 #mailmessagehistory .changelog-table .operation {
 	width: 25%;
 }
+
+fieldset.birthdays .proplist li {
+	padding: 0;
+	border: 0;
+}
+
+fieldset.categories input {
+	height: auto !important;
+	line-height: 16px !important;
+}
+
+#calendarcategories .minicolors-swatch {
+	height: 14px;
+	width: 14px;
+}
+
+a.button.input-group-text {
+	line-height: 19px;
+	vertical-align: middle;
+}
+
+.libkolab.attachmentwin #attachmenttoolbar {
+	position: relative;
+	top: -6px;
+	height: 40px;
+}
+
+.libkolab.attachmentwin #attachmentcontainer {
+	position: absolute;
+	top: 0;
+	left: 232px;
+	right: 0;
+	bottom: 0;
+}
+
+.libkolab.attachmentwin #attachmentframe {
+	width: 100%;
+	height: 100%;
+	border: 0;
+	background-color: #fff;
+	border-radius: 4px;
+}
+
+.libkolab.attachmentwin #partheader {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 220px;
+	bottom: 0;
+}
+
+.libkolab.attachmentwin #partheader table {
+	table-layout: fixed;
+	overflow: hidden;
+}
+
+.libkolab.attachmentwin #partheader table td {
+	color: #666;
+	padding: 4px 6px;
+	text-overflow: ellipsis;
+	overflow: hidden;
+}
+
+.libkolab.attachmentwin #partheader table td.header {
+	font-weight: bold;
+}
+
+.libkolab.attachmentwin #partheader table td.title {
+	width: 60px;
+	padding-right: 0;
+}

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/larry/templates Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/larry/templates/attachment.html Added

@@ -0,0 +1,65 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="extwin libkolab attachmentwin">
+
+<div id="header">
+<div id="topline" role="banner" aria-labelledby="aria-label-topnav">
+	<div class="topleft">
+		<roundcube:container name="topline-left" id="topline-left" />
+	</div>
+	<roundcube:container name="topline-center" id="topline-center" />
+	<div class="topright">
+		<roundcube:container name="topline-right" id="topline-right" />
+		<roundcube:button name="close" type="link" label="close" class="closelink" onclick="self.close()" />
+	</div>
+</div>
+</div>
+
+<div id="mainscreen">
+
+<h1 class="voice"><roundcube:label name="attachment" />: <roundcube:var name="env:filename" /></h1>
+
+<h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolbar" /></h2>
+<div id="attachmenttoolbar" class="toolbar fullwidth" role="toolbar" aria-labelledby="aria-label-toolbar">
+	<roundcube:button command="download-attachment" type="link" class="button download disabled" classAct="button download" classSel="button download pressed" label="download" title="download" />
+	<roundcube:button command="print-attachment" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="print" />
+	<roundcube:container name="toolbar" id="messagetoolbar" />
+</div>
+
+<div id="mainscreencontent">
+
+	<div id="partheader" class="uibox listbox" role="contentinfo" aria-labelledby="aria-label-contentinfo">
+		<h2 class="boxtitle" id="aria-label-contentinfo"><roundcube:label name="properties" /></h2>
+		<div class="scroller">
+			<roundcube:object name="plugin.attachmentcontrols" class="listing" />
+		</div>
+	</div>
+
+	<div id="attachmentcontainer" class="uibox" role="main" aria-labelledby="aria-label-messagepart">
+		<h2 id="aria-label-messagepart" class="voice"><roundcube:label name="arialabelattachmentpreview" /></h2>
+		<div class="iframebox">
+		<roundcube:object name="plugin.attachmentframe" id="attachmentframe" frameborder="0" title="arialabelattachmentpreview" />
+		</div>
+	</div>
+
+</div>
+
+</div>
+
+<script type="text/javascript">
+
+$(document).ready(function() {
+    if (window.rcube_splitter) {
+        new rcube_splitter({ id:'mailpartsplitterv', p1:'#partheader', p2:'#attachmentcontainer',
+            orientation:'v', relative:true, start:226, min:150, size:12}).init();
+    }
+});
+
+</script>
+
+</body>
+</html>

iRony-0.4.1.tar.gz/lib/plugins/libkolab/skins/larry/templates/folderform.html Added

iRony-0.4.1.tar.gz/lib/plugins/libkolab/tests/kolab_date_recurrence.php Added

@@ -0,0 +1,234 @@
+<?php
+
+/**
+ * kolab_date_recurrence tests
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2017, 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_test extends PHPUnit_Framework_TestCase
+{
+    function setUp()
+    {
+        $rcube = rcmail::get_instance();
+        $rcube->plugins->load_plugin('libkolab', true, true);
+    }
+
+    /**
+     * kolab_date_recurrence::first_occurrence()
+     *
+     * @dataProvider data_first_occurrence
+     */
+    function test_first_occurrence($recurrence_data, $start, $expected)
+    {
+        $start = new DateTime($start);
+        if (!empty($recurrence_data['UNTIL'])) {
+            $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
+        }
+
+        $event  = array('start' => $start, 'recurrence' => $recurrence_data);
+        $object = kolab_format::factory('event', 3.0);
+        $object->set($event);
+
+        $recurrence = new kolab_date_recurrence($object);
+        $first      = $recurrence->first_occurrence();
+
+        $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
+    }
+
+    /**
+     * Data for test_first_occurrence()
+     */
+    function data_first_occurrence()
+    {
+        // TODO: BYYEARDAY, BYWEEKNO, BYSETPOS, WKST
+
+        return array(
+            // non-recurring
+            array(
+                array(),                                     // recurrence data
+                '2017-08-31 11:00:00',                       // start date
+                '2017-08-31 11:00:00',                       // expected result
+            ),
+            // daily
+            array(
+                array('FREQ' => 'DAILY', 'INTERVAL' => '1'), // recurrence data
+                '2017-08-31 11:00:00',                       // start date
+                '2017-08-31 11:00:00',                       // expected result
+            ),
+            // TODO: this one is not supported by the Calendar UI
+            array(
+                array('FREQ' => 'DAILY', 'INTERVAL' => '1', 'BYMONTH' => 1),
+                '2017-08-31 11:00:00',
+                '2018-01-01 11:00:00',
+            ),
+            // weekly
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-08-31 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-06 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'TH'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-08-31 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'FR'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-01 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '2'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-08-31 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '3', 'BYDAY' => 'WE'),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-20 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'COUNT' => 1),
+                '2017-08-31 11:00:00', // Thursday
+                '2017-09-06 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'WEEKLY', 'INTERVAL' => '1', 'BYDAY' => 'WE', 'UNTIL' => '2017-09-01'),
+                '2017-08-31 11:00:00', // Thursday
+                '',
+            ),
+            // monthly
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1'),
+                '2017-09-08 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+                '2017-08-31 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYMONTHDAY' => '8,9'),
+                '2017-09-08 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '1WE'),
+                '2017-08-16 11:00:00',
+                '2017-09-06 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '1', 'BYDAY' => '-1WE'),
+                '2017-08-16 11:00:00',
+                '2017-08-30 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2'),
+                '2017-09-08 11:00:00',
+                '2017-09-08 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'MONTHLY', 'INTERVAL' => '2', 'BYMONTHDAY' => '8'),
+                '2017-08-31 11:00:00',
+                '2017-09-08 11:00:00', // ??????
+            ),
+            // yearly
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1'),
+                '2017-08-16 12:00:00',
+                '2017-08-16 12:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8'),
+                '2017-08-16 12:00:00',
+                '2017-08-16 12:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYDAY' => '-1MO'),
+                '2017-08-16 11:00:00',
+                '2017-12-25 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '8', 'BYDAY' => '-1MO'),
+                '2017-08-16 11:00:00',
+                '2017-08-28 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1', 'BYDAY' => '1MO'),
+                '2017-08-16 11:00:00',
+                '2018-01-01 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '1', 'BYMONTH' => '1,9', 'BYDAY' => '1MO'),
+                '2017-08-16 11:00:00',
+                '2017-09-04 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '2'),
+                '2017-08-16 11:00:00',
+                '2017-08-16 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYMONTH' => '8'),
+                '2017-08-16 11:00:00',
+                '2017-08-16 11:00:00',
+            ),
+            array(
+                array('FREQ' => 'YEARLY', 'INTERVAL' => '2', 'BYDAY' => '-1MO'),
+                '2017-08-16 11:00:00',
+                '2017-12-25 11:00:00',
+            ),
+            // on dates (FIXME: do we really expect the first occurrence to be on the start date?)
+            array(
+                array('RDATE' => array (new DateTime('2017-08-10 11:00:00 Europe/Warsaw'))),
+                '2017-08-01 11:00:00',
+                '2017-08-01 11:00:00',
+            ),
+        );
+    }
+
+    /**
+     * kolab_date_recurrence::first_occurrence() for all-day events
+     *
+     * @dataProvider data_first_occurrence
+     */
+    function test_first_occurrence_allday($recurrence_data, $start, $expected)
+    {
+        $start = new DateTime($start);
+        if (!empty($recurrence_data['UNTIL'])) {
+            $recurrence_data['UNTIL'] = new DateTime($recurrence_data['UNTIL']);
+        }
+
+        $event  = array('start' => $start, 'recurrence' => $recurrence_data, 'allday' => true);
+        $object = kolab_format::factory('event', 3.0);
+        $object->set($event);
+
+        $recurrence = new kolab_date_recurrence($object);
+        $first      = $recurrence->first_occurrence();
+
+        $this->assertEquals($expected, $first ? $first->format('Y-m-d H:i:s') : '');
+    }
+}
+

iRony-0.4.0.tar.gz/lib/plugins/logon_page/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/logon_page/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/odfviewer/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/odfviewer/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/pdfviewer/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/pdfviewer/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/README -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/README Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/drivers/kolab/tasklist_kolab_driver.php Changed

@@ -1693,7 +1693,7 @@
         $hidden_fields[] = array('name' => 'oldname', 'value' => $folder_name);
 
         // folder name (default field)
-        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'taskedit-tasklistame', 'size' => 20));
+        $input_name = new html_inputfield(array('name' => 'name', 'id' => 'taskedit-tasklistname', 'size' => 20));
         $fieldprop['name']['value'] = $input_name->show($list['editname'], array('disabled' => ($options['norename'] || $options['protected'])));
 
         // prevent user from moving folder
@@ -1719,78 +1719,6 @@
             $form['properties']['fields'][$f] = $fieldprop[$f];
         }
 
-        // add folder ACL tab
-        if ($action != 'form-new') {
-            $form['sharing'] = array(
-                'name'    => rcube::Q($this->plugin->gettext('tabsharing')),
-                'content' => html::tag('iframe', array(
-                    'src' => $this->rc->url(array('_action' => 'folder-acl', '_folder' => $folder_name, 'framed' => 1)),
-                    'width' => '100%',
-                    'height' => 280,
-                    'border' => 0,
-                    'style' => 'border:0'),
-                '')
-            );
-        }
-
-        $form_html = '';
-        if (is_array($hidden_fields)) {
-            foreach ($hidden_fields as $field) {
-                $hiddenfield = new html_hiddenfield($field);
-                $form_html .= $hiddenfield->show() . "\n";
-            }
-        }
-
-        // create form output
-        foreach ($form as $tab) {
-            if (is_array($tab['fields']) && empty($tab['content'])) {
-                $table = new html_table(array('cols' => 2));
-                foreach ($tab['fields'] as $col => $colprop) {
-                    $label = !empty($colprop['label']) ? $colprop['label'] : $this->plugin->gettext($col);
-
-                    $table->add('title', html::label($colprop['id'], rcube::Q($label)));
-                    $table->add(null, $colprop['value']);
-                }
-                $content = $table->show();
-            }
-            else {
-                $content = $tab['content'];
-            }
-
-            if (!empty($content)) {
-                $form_html .= html::tag('fieldset', null, html::tag('legend', null, rcube::Q($tab['name'])) . $content) . "\n";
-            }
-        }
-
-        return $form_html;
-    }
-
-    /**
-     * Handler to render ACL form for a notes folder
-     */
-    public function folder_acl()
-    {
-        $this->plugin->require_plugin('acl');
-        $this->rc->output->add_handler('folderacl', array($this, 'folder_acl_form'));
-        $this->rc->output->send('tasklist.kolabacl');
-    }
-
-    /**
-     * Handler for ACL form template object
-     */
-    public function folder_acl_form()
-    {
-        $folder = rcube_utils::get_input_value('_folder', rcube_utils::INPUT_GPC);
-
-        if (strlen($folder)) {
-            $storage = $this->rc->get_storage();
-            $options = $storage->folder_info($folder);
-
-            // get sharing UI from acl plugin
-            $acl = $this->rc->plugins->exec_hook('folder_form',
-                array('form' => array(), 'options' => $options, 'name' => $folder));
-        }
-
-        return $acl['form']['sharing']['content'] ?: html::div('hint', $this->plugin->gettext('aclnorights'));
+        return kolab_utils::folder_form($form, $folder_name, 'tasklist', $hidden_fields);
     }
 }

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/manage.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/manage.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/de_DE/LC_MESSAGES/overview.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/manage.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/manage.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/en_US/LC_MESSAGES/overview.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/index.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +20,10 @@
 
 #: ../../en_US/_plugins/tasks/index.rst:9
 msgid "Tasks"
-msgstr ""
+msgstr "Tareas"
 
 #: ../../en_US/_plugins/tasks/index.rst:11
 msgid ""
 "The *Tasks* module helps you organize your daily jobs and ToDo's and will "
 "alert you about upcoming deadlines."
-msgstr ""
+msgstr "El módulo *Tareas* le ayuda a organizar sus trabajos diarios y las tareas por hacer y le avisará sobre los próximos plazos."

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/manage.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/manage.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +20,13 @@
 
 #: ../../en_US/_plugins/tasks/manage.rst:7
 msgid "Managing Tasks"
-msgstr ""
+msgstr "Gestionar tareas"
 
 #: ../../en_US/_plugins/tasks/manage.rst:9
 msgid ""
 "All the described functions to manage your tasks are accessible from the "
 "main task view."
-msgstr ""
+msgstr "Todas las funciones descritas para administrar sus tareas son accesibles desde la vista de tareas principal."
 
 #: ../../en_US/_plugins/tasks/manage.rst:13
 msgid "Create new Tasks"

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/es_ES/LC_MESSAGES/overview.po Changed

@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Roundcube Webmail Help package.
 # 
 # Translators:
+# Berta Narváez <bertanarvaez@hotmail.com>, 2017
 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"
+"PO-Revision-Date: 2017-09-21 17:03+0000\n"
+"Last-Translator: Berta Narváez <bertanarvaez@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/kolab/kolab-documentation/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,14 +20,14 @@
 
 #: ../../en_US/_plugins/tasks/overview.rst:6
 msgid "Overview"
-msgstr ""
+msgstr "Información general"
 
 #: ../../en_US/_plugins/tasks/overview.rst:8
 msgid ""
 "The content area of the tasks screen is divided into three areas: the "
 ":ref:`Tasks <tasklist-tasks>` itself, the :ref:`Tags <taskslist-tags>` and "
 "the :ref:`Tasklist Selector <tasklist-lists>`."
-msgstr ""
+msgstr "El área de contenido de la pantalla de tareas se divide en tres áreas: la :ref: `Tasks <tasklist-tasks>`, la :ref: Tags <taskslist-tags>` y la :ref:`Tasklist Selector <tasklist-lists>`."
 
 #: ../../en_US/_plugins/tasks/overview.rst:16
 msgid "The Tasks List"

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/fr_FR/LC_MESSAGES/overview.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/nl_NL/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/index.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/manage.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/pl_PL/LC_MESSAGES/overview.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/overview.po -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/helpdocs/locale/sv/LC_MESSAGES/overview.po Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/bg_BG.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/bg_BG.inc Changed

@@ -22,6 +22,7 @@
 $labels['nrtasklistsfound'] = 'Намерени са $nr списъка със задачи';
 $labels['removelist'] = 'Премахни от списъка';
 $labels['showcaldavurl'] = 'Покажи CalDAV URL адреса';
+$labels['caldavurldescription'] = 'Копирайте този адрес в <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> приложението, което използвате (напр. Evolution или Mozilla Thunderbird), за да синхронизирате този конкретен списък със задачи с вашият компютър или мобилно устройство.';
 $labels['newtask'] = 'Нова задача';
 $labels['createtask'] = 'Създаване на задача <Enter>';
 $labels['createnewtask'] = 'Запазване като задача';
@@ -128,7 +129,6 @@
 $labels['sendnotifications'] = 'Notify assignees about modifications';
 $labels['sendcancellation'] = 'Notify assignees about task cancellation';
 $labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
 $labels['itipupdatesubject'] = '"$title" has been updated';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $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.";
@@ -160,8 +160,6 @@
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr повече...';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['savetotasklist'] = 'Запазване в задачи';
 $labels['comment'] = 'Comment';
 $labels['errorimportingtask'] = 'Failed to import task(s)';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/ca_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/ca_ES.inc Changed

@@ -125,7 +125,6 @@
 $labels['sendnotifications'] = 'Notify assignees about modifications';
 $labels['sendcancellation'] = 'Notify assignees about task cancellation';
 $labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
 $labels['itipupdatesubject'] = '"$title" ha estat actualitzat';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $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.";
@@ -159,8 +158,6 @@
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr més...';
-$labels['delegatedto'] = 'Delegat a:';
-$labels['delegatedfrom'] = 'Delegat de:';
 $labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Comentari';
 $labels['errorimportingtask'] = 'Failed to import task(s)';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/cs_CZ.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/cs_CZ.inc Changed

@@ -13,6 +13,7 @@
 $labels['export'] = 'Uložit jako ICS';
 $labels['exporttitle'] = 'Uložit jako iCalendar';
 $labels['exportattachments'] = 'S přílohami';
+$labels['currentview'] = 'Nynější pohled';
 $labels['tasklistsubscribe'] = 'Ukazovat seznam trvale';
 $labels['listsearchresults'] = 'Dostupné seznamy úkolů';
 $labels['findlists'] = 'Najít seznamy úkolů...';
@@ -131,7 +132,6 @@
 $labels['sendnotifications'] = 'Uvědomit pověřence o změnách';
 $labels['sendcancellation'] = 'Uvědomit pověřence o zrušení úkolu';
 $labels['invitationsubject'] = 'Byl(a) jste přidělen(a) k "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDokdy: \$date\n\nPřiděleno: \$attendees\n\nPodrobnosti o úkolu najdete v přiloženém souboru typu iCalendar. Můžete si ho nahrát do programu na úkoly.";
 $labels['itipupdatesubject'] = 'Událost "$title" byla aktualizována';
 $labels['itipupdatesubjectempty'] = 'Úkol, který se vás týká, byl aktualizován';
 $labels['itipupdatemailbody'] = "*\$title*\n\nDokdy: \$date\n\nPřiděleno: \$attendees\n\nAktualizované podrobnosti o úkolu najdete v přiloženém souboru typu iCalendar. Můžete si ho nahrát do programu na úkoly.";
@@ -145,8 +145,8 @@
 $labels['objectchangelognotavailable'] = 'Historie změn není pro tento úkol dostupná';
 $labels['objectdiffnotavailable'] = 'Pro vybrané verze není žádné srovnání možné';
 $labels['revisionrestoreconfirm'] = 'Opravdu chcete obnovit změnu $rev tohoto úkolu? Tímto dojde k nahrazení nynějšího úkolu starou verzí.';
-$labels['objectrestoresuccess'] = 'Pozměnění $rev úspěšně obnoveno';
-$labels['objectrestoreerror'] = 'Nepodařilo se obnovit staré pozměnění';
+$labels['objectrestoresuccess'] = 'Změna $rev úspěšně obnovena';
+$labels['objectrestoreerror'] = 'Nepodařilo se obnovit starou změnu';
 $labels['itipobjectnotfound'] = 'Úkol, na který tato zpráva odkazuje nebyl nalezen ve vašem seznamu úkolů.';
 $labels['itipmailbodyaccepted'] = "\$sender přijal přidělení úkolu:\n\n*\$title*\n\nTermín: \$date\n\nZadávající: \$attendees";
 $labels['itipmailbodytentative'] = "\$sender předběžně přijal přidělení k následujícímu úkolu:\n\n*\$title*\n\nTermín: \$date\n\nPřiděleno: \$attendees";
@@ -172,8 +172,6 @@
 $labels['removefromcalendar'] = 'Odstranit z mých úkolů';
 $labels['delegateinvitation'] = 'Delegovat přidělení';
 $labels['andnmore'] = 'dalších $nr...';
-$labels['delegatedto'] = 'Pověřený:';
-$labels['delegatedfrom'] = 'Pověřující:';
 $labels['savetotasklist'] = 'Uložit do úkolů';
 $labels['comment'] = 'Poznámka';
 $labels['errorimportingtask'] = 'Nepodařilo se zavést úkol(y)';
@@ -188,4 +186,5 @@
 $labels['itipinvalidrequest'] = 'Tato pozvánka již není platná';
 $labels['sentresponseto'] = 'Odpověď na přidělení byla úspěšně odeslána na adresu $mailto';
 $labels['successremoval'] = 'Úkol byl úspěšně smazán.';
+$labels['invalidlistproperties'] = 'Neplatné vlastnosti seznamu! Vložte, prosím, platný název.';
 $labels['arialabelsortmenu'] = 'Volby pro třídění úkolů';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/da_DK.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/da_DK.inc Changed

@@ -13,6 +13,7 @@
 $labels['export'] = 'Eksport';
 $labels['exporttitle'] = 'Eksportér til iCalendar';
 $labels['exportattachments'] = 'Med vedhæftninger';
+$labels['currentview'] = 'Aktuel visning';
 $labels['tasklistsubscribe'] = 'List permanently';
 $labels['listsearchresults'] = 'Available Tasklists';
 $labels['findlists'] = 'Find tasklists...';
@@ -80,7 +81,7 @@
 $labels['taskactions'] = 'Task options...';
 $labels['tabsummary'] = 'Resumé';
 $labels['tabrecurrence'] = 'Gentagelse';
-$labels['tabassignments'] = 'Assignments';
+$labels['tabassignments'] = 'Opgaver';
 $labels['tabattachments'] = 'Vedhæftninger';
 $labels['tabsharing'] = 'Deling';
 $labels['editlist'] = 'Redigér liste';
@@ -107,36 +108,36 @@
 $labels['deletelistconfirm'] = 'Vil du virkelig slette denne liste og alle dens opgaver?';
 $labels['deletelistconfirmrecursive'] = 'Vil du virkelig slette denne liste og alle dens dellister og opgaver?';
 $labels['aclnorights'] = 'You do not have administrator rights on this task list.';
-$labels['changetaskconfirm'] = 'Update task';
+$labels['changetaskconfirm'] = 'Opdater opgave';
 $labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
 $labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
-$labels['quickaddinput'] = 'New task date and title';
-$labels['arialabelquickaddbox'] = 'Quick add new task';
-$labels['arialabelsearchform'] = 'Task search form';
-$labels['arialabelquicksearchbox'] = 'Task search input';
-$labels['arialabellistsearchform'] = 'Tasklists search form';
+$labels['quickaddinput'] = 'Dato og title for ny opgave';
+$labels['arialabelquickaddbox'] = 'Hurtig oprettelse af opgave';
+$labels['arialabelsearchform'] = 'Opgave søge formular';
+$labels['arialabelquicksearchbox'] = 'Opgave søge input';
+$labels['arialabellistsearchform'] = 'Opgaveliste søge formular';
 $labels['arialabeltaskselector'] = 'List mode';
-$labels['arialabeltasklisting'] = 'Tasks listing';
-$labels['attendee'] = 'Assignee';
+$labels['arialabeltasklisting'] = 'Opgave visning';
+$labels['attendee'] = 'Erhververen';
 $labels['role'] = 'Rolle';
 $labels['availability'] = 'Tilg.';
 $labels['confirmstate'] = 'Status';
-$labels['addattendee'] = 'Add assignee';
+$labels['addattendee'] = 'Tilføj erhververen';
 $labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Påkrævet';
 $labels['roleoptional'] = 'Valgfri';
 $labels['rolechair'] = 'Formand';
 $labels['rolenonparticipant'] = 'Observer';
 $labels['sendinvitations'] = 'Send invitationer';
-$labels['sendnotifications'] = 'Notify assignees about modifications';
-$labels['sendcancellation'] = 'Notify assignees about task cancellation';
-$labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
+$labels['sendnotifications'] = 'Informér erhververen om ændringer';
+$labels['sendcancellation'] = 'Informér erhververen om annullering af opgave';
+$labels['invitationsubject'] = 'Du er blevet tildet opgaven "$title"';
 $labels['itipupdatesubject'] = '"$title" er blevet opdateret';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $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" er blevet annulleret';
 $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'] = 'save in ';
+$labels['saveintasklist'] = 'Gem i';
 $labels['taskhistory'] = 'Historik';
 $labels['objectchangelog'] = 'Ændringshistorik';
 $labels['objectdiff'] = 'Ændringer fra $rev1 til $rev2';
@@ -171,8 +172,6 @@
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr flere...';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Comment';
 $labels['errorimportingtask'] = 'Failed to import task(s)';
@@ -187,4 +186,5 @@
 $labels['itipinvalidrequest'] = 'Denne invitation er ikke længere gyldig';
 $labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
 $labels['successremoval'] = 'The task has been deleted successfully.';
+$labels['invalidlistproperties'] = 'Ugyldige liste parametre! Angiv et gyldigt navn.';
 $labels['arialabelsortmenu'] = 'Tasks sorting options';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/de_CH.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/de_CH.inc Changed

@@ -13,9 +13,21 @@
 $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</aClient-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 eingeben (z.B. Samstag, Rasenmähen)';
 $labels['createfrommail'] = 'Als Aufgabe speichern';
+$labels['printtitle'] = 'Aufgaben drucken';
 $labels['printdescriptions'] = 'Beschrieb drucken';
 $labels['mark'] = 'Markieren';
 $labels['unmark'] = 'Markierung aufheben';
@@ -23,38 +35,53 @@
 $labels['delete'] = 'Löschen';
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
+$labels['datetime'] = 'Fällig';
+$labels['duetime'] = 'Frist';
 $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'] = 'Gekündigt';
+$labels['assignedto'] = 'Zugewiesen an';
 $labels['created'] = 'Erstellt';
 $labels['changed'] = 'Geändert';
 $labels['taskoptions'] = 'Optionen';
 $labels['all'] = 'Alle';
 $labels['flagged'] = 'Markiert';
 $labels['complete'] = 'Erledigt';
+$labels['completeness'] = 'Fortschritt';
 $labels['overdue'] = 'Überfällig';
 $labels['today'] = 'Heute';
 $labels['tomorrow'] = 'Morgen';
 $labels['next7days'] = 'Nächste 7 Tage';
 $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'] = 'kein Datum';
 $labels['removetag'] = 'Löschen';
 $labels['removelink'] = 'E-Mail-Referenz entfernen';
+$labels['auto'] = 'Automatisch';
 $labels['taskdetails'] = 'Details';
 $labels['newtask'] = 'Neue Aufgabe';
 $labels['edittask'] = 'Aufgabe bearbeiten';
 $labels['save'] = 'Speichern';
 $labels['cancel'] = 'Abbrechen';
+$labels['saveandnotify'] = 'Speichern und Benachrichtigen';
 $labels['addsubtask'] = 'Neue Teilaufgabe';
 $labels['deletetask'] = 'Aufgabe löschen';
 $labels['deletethisonly'] = 'Nur diese Aufgabe löschen';
 $labels['deletewithchilds'] = 'Mit allen Teilaufhaben löschen';
+$labels['taskactions'] = 'Aufgabeneinstellungen...';
 $labels['tabsummary'] = 'Übersicht';
 $labels['tabrecurrence'] = 'Wiederholung';
+$labels['tabassignments'] = 'Zuweisungen';
 $labels['tabattachments'] = 'Anhänge';
 $labels['tabsharing'] = 'Freigabe';
 $labels['editlist'] = 'Liste bearbeiten';
@@ -63,6 +90,8 @@
 $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'] = 'diesen';
@@ -72,63 +101,11 @@
 $labels['errorsaving'] = 'Fehler beim Speichern.';
 $labels['notasksfound'] = 'Für die aktuellen Kriterien wurden keine Aufgaben gefunden.';
 $labels['invalidstartduedates'] = 'Beginn der Aufgabe darf nicht grösser als das Enddatum sein.';
+$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'] = 'Möchten Sie diese Aufgabe wirklich löschen?';
 $labels['deleteparenttasktconfirm'] = 'Möchten Sie diese Aufgabe inklusive aller Teilaufgaben wirklich löschen?';
 $labels['deletelistconfirm'] = 'Möchten Sie diese Liste mit allen Aufgaben wirklich löschen?';
-$labels['role'] = 'Rolle';
-$labels['availability'] = 'Verfüg.';
-$labels['confirmstate'] = 'Status';
-$labels['roleorganizer'] = 'Organisator';
-$labels['rolerequired'] = 'Erforderlich';
-$labels['roleoptional'] = 'Optional';
-$labels['rolechair'] = 'Chair';
-$labels['sendinvitations'] = 'Einladungen versenden';
-$labels['itipupdatesubject'] = '"$title" wurde aktualisiert';
-$labels['itipcancelsubject'] = '"$title" wurde abgesagt';
-$labels['taskhistory'] = 'Verlauf';
-$labels['objectchangelog'] = 'Änderungsverlauf';
-$labels['objectdiff'] = 'Änderungen aus $rev1 nach $rev2';
-$labels['objectdiffnotavailable'] = 'Vergleich für die gewählten Versionen nicht möglich';
-$labels['objectrestoresuccess'] = 'Version $rev erfolgreich wiederhergestellt';
-$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Version';
-$labels['itipcomment'] = 'Kommentar zur Einladungs/Benachrichtigung';
-$labels['andnmore'] = '$nr weitere...';
-$labels['delegatedto'] = 'Delegiert an:';
-$labels['delegatedfrom'] = 'Delegiert von:';
-$labels['comment'] = 'Kommentar';
-$labels['attendeupdateesuccess'] = 'Teilnehmerstatus erfolgreich aktualisiert';
-$labels['itipinvalidrequest'] = 'Diese Einladung ist nicht mehr gültig';
-$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</aClient-Anwendung (z.B. Evolution oder Mozilla Thunderbird), um diese spezifische Aufgabenliste mit Ihrem Computer oder Mobilgerät zu synchronisieren.';
-$labels['createtask'] = 'Aufgabe erstellen <Enter>';
-$labels['printtitle'] = 'Aufgaben drucken';
-$labels['datetime'] = 'Fällig';
-$labels['duetime'] = 'Frist';
-$labels['status-needs-action'] = 'Braucht Aktion';
-$labels['status-in-process'] = 'In Bearbeitung';
-$labels['status-completed'] = 'Abgeschlossen';
-$labels['assignedto'] = 'Zugewiesen an';
-$labels['completeness'] = 'Fortschritt';
-$labels['assigned'] = 'Zugewiesen';
-$labels['assignedtitle'] = 'Aufgaben, welche an andere vergeben wurden';
-$labels['mytasks'] = 'Meine Aufgaben';
-$labels['mytaskstitle'] = 'An mich übertragene Aufgaben';
-$labels['auto'] = 'Automatisch';
-$labels['saveandnotify'] = 'Speichern und Benachrichtigen';
-$labels['taskactions'] = 'Aufgabeneinstellungen...';
-$labels['tabassignments'] = 'Zuweisungen';
-$labels['viewactions'] = 'Ansicht-Aktionen';
-$labels['focusview'] = 'Nur diese Liste anzeigen';
-$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['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';
@@ -142,19 +119,35 @@
 $labels['arialabeltaskselector'] = 'Listenmodus';
 $labels['arialabeltasklisting'] = 'Aufgabenauflistung';
 $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'] = 'Chair';
 $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\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$labels['invitationmailbody'] = "*\$title*\n\nFällig: \$date\n\nBeauftragte: \$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['itipupdatemailbody'] = "*\$title*\n\nFällig: \$date\n\nBeauftragte: \$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'] = 'Verlauf';
+$labels['objectchangelog'] = 'Änderungsverlauf';
+$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'] = 'Version $rev erfolgreich wiederhergestellt';
+$labels['objectrestoreerror'] = 'Fehler beim Wiederherstellen der alten Version';
 $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";
@@ -173,12 +166,15 @@
 $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/Benachrichtigung';
 $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['errorimportingtask'] = 'Fehler beim Importieren der Aufgabe(n)';
 $labels['importwarningexists'] = 'Eine Kopie dieser Aufgabe exisistiert bereits in Ihrer Aufgabenliste';
 $labels['importsuccess'] = '$nr Aufgaben erfolgreich importiert';
@@ -186,7 +182,9 @@
 $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.0.tar.gz/lib/plugins/tasklist/localization/de_DE.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/de_DE.inc Changed

@@ -36,7 +36,7 @@
 $labels['title'] = 'Titel';
 $labels['description'] = 'Beschreibung';
 $labels['datetime'] = 'Fällig';
-$labels['duetime'] = 'Frist';
+$labels['duetime'] = 'Fällig';
 $labels['start'] = 'Beginn';
 $labels['starttime'] = 'Startzeit';
 $labels['alarms'] = 'Erinnerung';
@@ -132,7 +132,7 @@
 $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\nAngehängt finden Sie eine iCalendar-Datei mit allen Aufgabendetails, welche in Ihre Aufgabenanwendung importiert werden kann.";
+$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.";
@@ -173,8 +173,6 @@
 $labels['removefromcalendar'] = 'Aus meinen Aufgaben entfernen';
 $labels['delegateinvitation'] = 'Zuweisung delegieren';
 $labels['andnmore'] = '$nr weitere...';
-$labels['delegatedto'] = 'Delegiert an:';
-$labels['delegatedfrom'] = 'Delegiert von:';
 $labels['savetotasklist'] = 'In den Aufgaben speichern';
 $labels['comment'] = 'Kommentar';
 $labels['errorimportingtask'] = 'Fehler beim Importieren der Aufgabe(n)';

iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/el.inc Added

@@ -0,0 +1,47 @@
+<?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'] = 'Εργασίες';
+$labels['list'] = 'Λίστα εργασιών';
+$labels['tags'] = 'Ετικέτες';
+$labels['export'] = 'Εξαγωγή';
+$labels['exporttitle'] = 'Εξαγωγή σε iCalendar';
+$labels['currentview'] = 'τρέχουσα προβολή';
+$labels['searchterms'] = 'Όροι αναζήτησης';
+$labels['removelist'] = 'Αφαίρεση από την λίστα';
+$labels['newtask'] = 'Νέα εργασία';
+$labels['createfrommail'] = 'Αποθήκευση ως εργασία';
+$labels['printtitle'] = 'Εκτύπωση εργασιών';
+$labels['edit'] = 'Επεξεργασία';
+$labels['delete'] = 'Διαγραφή';
+$labels['title'] = 'Τίτλος';
+$labels['description'] = 'Περιγραφή';
+$labels['start'] = 'Έναρξη';
+$labels['starttime'] = 'Ώρα έναρξης';
+$labels['repeat'] = 'Επανάληψη';
+$labels['status'] = 'Κατάσταση';
+$labels['status-completed'] = 'Ολοκληρώθηκε';
+$labels['created'] = 'Δημιουργήθηκε';
+$labels['changed'] = 'Τελευταία τροποποίηση';
+$labels['today'] = 'Σήμερα';
+$labels['tomorrow'] = 'Αύριο';
+$labels['removetag'] = 'Αφαίρεση';
+$labels['newtask'] = 'Νέα εργασία';
+$labels['save'] = 'Αποθήκευση';
+$labels['cancel'] = 'Άκυρο';
+$labels['tabsummary'] = 'Περίληψη';
+$labels['listname'] = 'Όνομα';
+$labels['yes'] = 'ναι';
+$labels['savingdata'] = 'Αποθήκευση δεδομένων...';
+$labels['role'] = 'Ρόλος';
+$labels['availability'] = 'Διαθ.';
+$labels['confirmstate'] = 'Κατάσταση';
+$labels['roleorganizer'] = 'Οργανωτής';
+$labels['taskhistory'] = 'Ιστορικό';
+$labels['objectchangelog'] = 'Αλλαγή ιστορικού';
+$labels['comment'] = 'Σχόλιο';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/en_US.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/en_US.inc Changed

@@ -20,6 +20,7 @@
 $labels['tasklistsubscribe'] = 'List permanently';
 $labels['listsearchresults'] = 'Available Tasklists';
 $labels['findlists'] = 'Find tasklists...';
+$labels['findtasks'] = 'Find tasks...';
 $labels['searchterms'] = 'Search terms';
 $labels['notasklistsfound'] = 'No tasklists found';
 $labels['nrtasklistsfound'] = '$nr tasklists found';
@@ -74,7 +75,7 @@
 $labels['removelink'] = 'Remove email reference';
 $labels['auto'] = 'Auto';
 
-$labels['taskdetails'] = 'Details';
+$labels['taskdetails'] = 'Task details';
 $labels['newtask'] = 'New Task';
 $labels['edittask'] = 'Edit Task';
 $labels['save'] = 'Save';
@@ -98,8 +99,10 @@
 $labels['listname'] = 'Name';
 $labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Import';
+$labels['importtasks'] = 'Import Tasks';
 $labels['viewactions'] = 'View actions';
 $labels['focusview'] = 'View only this list';
+$labels['activate'] = 'Activate';
 
 // date words
 $labels['on'] = 'on';
@@ -132,6 +135,9 @@
 $labels['arialabellistsearchform'] = 'Tasklists search form';
 $labels['arialabeltaskselector'] = 'List mode';
 $labels['arialabeltasklisting'] = 'Tasks listing';
+$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['arialabeltasklistform'] = 'Tasks list properties';
+$labels['arialabeltaskform'] = 'Task editing form';
 
 // attendees
 $labels['attendee'] = 'Assignee';
@@ -148,7 +154,7 @@
 $labels['sendnotifications'] = 'Notify assignees about modifications';
 $labels['sendcancellation'] = 'Notify assignees about task cancellation';
 $labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
+$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\n\$description\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
 $labels['itipupdatesubject'] = '"$title" has been updated';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $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.";
@@ -196,12 +202,16 @@
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 
+$labels['importtext'] = 'You can upload tasks in <a href="https://wikipedia.org/wiki/ICalendar">iCalendar</a> format (.ics).';
 $labels['andnmore'] = '$nr more...';
 $labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Comment';
+$labels['rsvpcomment'] = 'Comment';
 $labels['errorimportingtask'] = 'Failed to import task(s)';
 $labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
 $labels['importsuccess'] = 'Successfully imported $nr tasks';
+$labels['importnone'] = 'No tasks found to be imported';
+$labels['importerror'] = 'An error occured while importing';
 $labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
 $labels['nowritetasklistfound'] = 'No tasklist found to save the task';
 $labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
@@ -212,4 +222,3 @@
 $labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
 $labels['successremoval'] = 'The task has been deleted successfully.';
 $labels['invalidlistproperties'] = 'Invalid list properties! Please set a valid name.';
-$labels['arialabelsortmenu'] = 'Tasks sorting options';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/es_AR.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/es_AR.inc Changed

@@ -132,7 +132,6 @@
 $labels['sendnotifications'] = 'Notificar a los asignados sobre las modificaciones';
 $labels['sendcancellation'] = 'Notificar a los asignados sobre la cancelación de la tarea';
 $labels['invitationsubject'] = 'Ha sido asignado a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\nEncontrará adjunto un archivo iCalendar con todos los detalles de la tarea, el cual puede importar a su aplicación de tareas.";
 $labels['itipupdatesubject'] = '"$title" ha sido actualizado';
 $labels['itipupdatesubjectempty'] = 'Una tarea que le interesa ha sido actualizada';
 $labels['itipupdatemailbody'] = "*\$title*\n\nVencimiento: \$date\n\nAsignados: \$attendees\n\Encontrará adjunto un archivo iCalendar con todos los detalles de la tarea, el cual puede importar a su aplicación de tareas.";
@@ -173,8 +172,6 @@
 $labels['removefromcalendar'] = 'Eliminar de mis tareas';
 $labels['delegateinvitation'] = 'Delegar asignación';
 $labels['andnmore'] = '$nr más...';
-$labels['delegatedto'] = 'Delegado a:';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['savetotasklist'] = 'Guardar como tareas';
 $labels['comment'] = 'Comentario';
 $labels['errorimportingtask'] = 'Fallo al importar tarea(s)';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/es_ES.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/es_ES.inc Changed

@@ -13,6 +13,7 @@
 $labels['export'] = 'Exportar';
 $labels['exporttitle'] = 'Exportar a iCalendar';
 $labels['exportattachments'] = 'con los adjuntos';
+$labels['currentview'] = 'Vista actual';
 $labels['tasklistsubscribe'] = 'Lista Permanente';
 $labels['listsearchresults'] = 'Lista de tareas disponibles';
 $labels['findlists'] = 'Buscar lista de tareas';
@@ -131,10 +132,10 @@
 $labels['sendnotifications'] = 'Notificar a los asignados sobre modificaciones';
 $labels['sendcancellation'] = 'Notificar a los asignados sobre la cancelación de tareas';
 $labels['invitationsubject'] = 'Usted ha sido asignado a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nSe adjunta un archivo iCalendar con todos los detalles de la tarea, el mismo se puede importar a la aplicación de tareas.";
 $labels['itipupdatesubject'] = '"$title" ha sido actualizada';
 $labels['itipupdatesubjectempty'] = 'Una tarea que le concierne ha sido actualizada';
 $labels['itipupdatemailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nSe adjunta un archivo iCalendar con los detalles de la tarea actualizada, el mismo se puede importar a la aplicación de tareas.";
+$labels['itipcancelsubject'] = 'Se ha cancelado "$título"';
 $labels['itipcancelmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nLa tarea ha sido cancelado por \$organizer.\n\nSe adjunta un archivo iCalendar con los detalles de la tarea actualizada.";
 $labels['saveintasklist'] = 'salvar en';
 $labels['taskhistory'] = 'Historial';
@@ -171,8 +172,6 @@
 $labels['removefromcalendar'] = 'Borrar de mis tareas';
 $labels['delegateinvitation'] = 'Delegar asignación';
 $labels['andnmore'] = '$nr más...';
-$labels['delegatedto'] = 'Delegar a: ';
-$labels['delegatedfrom'] = 'Delegado de:';
 $labels['savetotasklist'] = 'Salvar a las tareas';
 $labels['comment'] = 'Comentario';
 $labels['errorimportingtask'] = 'Fallo al importar la(s) tarea(s)';
@@ -187,4 +186,5 @@
 $labels['itipinvalidrequest'] = 'Esta invitación ya no es válida';
 $labels['sentresponseto'] = 'Respuesta de asignación con éxito enviada a $mailto';
 $labels['successremoval'] = 'La tarea se ha eliminado correctamente.';
+$labels['invalidlistproperties'] = 'Las propiedades de la lista no son válidas. Establezca un nombre válido.';
 $labels['arialabelsortmenu'] = 'Opciones de clasificación de tareas';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/et_EE.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/et_EE.inc Changed

@@ -124,7 +124,6 @@
 $labels['sendnotifications'] = 'Notify assignees about modifications';
 $labels['sendcancellation'] = 'Notify assignees about task cancellation';
 $labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
 $labels['itipupdatesubject'] = '"$title" has been updated';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $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.";
@@ -155,8 +154,6 @@
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = '$nr more...';
-$labels['delegatedto'] = 'Delegated to: ';
-$labels['delegatedfrom'] = 'Delegated from: ';
 $labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Kommentaar';
 $labels['errorimportingtask'] = 'Failed to import task(s)';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/fi_FI.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/fi_FI.inc Changed

@@ -47,6 +47,7 @@
 $labels['status-in-process'] = 'Prosessissa';
 $labels['status-completed'] = 'Valmis';
 $labels['status-cancelled'] = 'Peruttu';
+$labels['assignedto'] = 'Määritetty henkilölle';
 $labels['created'] = 'Luotu';
 $labels['changed'] = 'Viimeksi muokattu';
 $labels['taskoptions'] = 'Valinnat';
@@ -110,7 +111,9 @@
 $labels['roleoptional'] = 'Valinnainen';
 $labels['rolechair'] = 'Kutsuja';
 $labels['sendinvitations'] = 'Lähetä kutsut';
+$labels['invitationsubject'] = 'Sinut on määritetty tehtävään "$title"';
 $labels['itipupdatesubject'] = '"$title" on päivitetty';
+$labels['itipupdatesubjectempty'] = 'Sinua koskeva tehtävä on päivitetty';
 $labels['itipcancelsubject'] = '"$title" on peruttu';
 $labels['taskhistory'] = 'Historia';
 $labels['objectchangelog'] = 'Muutoshistoria';
@@ -122,8 +125,6 @@
 $labels['itipcomment'] = 'Kutsun/herätteen kommentit';
 $labels['removefromcalendar'] = 'Poista omista tehtävistä';
 $labels['andnmore'] = '$nr lisää...';
-$labels['delegatedto'] = 'Delegoitu henkilölle:';
-$labels['delegatedfrom'] = 'Delegoitus henkilöltä:';
 $labels['savetotasklist'] = 'Tallenna tehtäviin';
 $labels['comment'] = 'Kommentti';
 $labels['errorimportingtask'] = 'Tehtävien tuonti epäonnistui';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/fr_FR.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/fr_FR.inc Changed

@@ -12,20 +12,21 @@
 $labels['tags'] = 'Étiquettes';
 $labels['export'] = 'Exporter';
 $labels['exporttitle'] = 'Exporter vers iCalendar';
-$labels['exportattachments'] = 'With attachments';
+$labels['exportattachments'] = 'Avec pièces jointes';
+$labels['currentview'] = 'stade actuel';
 $labels['tasklistsubscribe'] = 'Lister définitivement';
-$labels['listsearchresults'] = 'Listes de Tâche disponibles';
-$labels['findlists'] = 'Trouver listes de Tache....';
+$labels['listsearchresults'] = 'Listes des tâches disponibles';
+$labels['findlists'] = 'Trouver listes de tâches...';
 $labels['searchterms'] = 'Critères de recherche';
 $labels['notasklistsfound'] = 'Aucune liste de tâches trouvée';
 $labels['nrtasklistsfound'] = '$nr listes de tâches trouvées';
-$labels['removelist'] = 'supprimer de la liste';
+$labels['removelist'] = 'Supprimer de la liste';
 $labels['showcaldavurl'] = 'Afficher l\'URL CalDAV';
 $labels['caldavurldescription'] = 'Copier cette adresse vers une application cliente compatible <a href="http://fr.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> (par exemple Evolution et Mozilla Thunderbird) afin de synchroniser cette liste de tâches spécifique avec votre ordinateur ou votre smartphone.';
 $labels['newtask'] = 'Nouvelle tâche';
 $labels['createtask'] = 'Créer une tâche <Entrer>';
 $labels['createnewtask'] = 'Créer une nouvelle tâche (ex : Samedi, tondre la pelouse)';
-$labels['createfrommail'] = 'Sauvegarder comme une tâche';
+$labels['createfrommail'] = 'Sauvegarder en tant que tâche';
 $labels['printtitle'] = 'Imprimer tâches';
 $labels['printdescriptions'] = 'Imprimer les descriptions';
 $labels['mark'] = 'Sélectionner';
@@ -60,10 +61,10 @@
 $labels['next7days'] = '7 prochains jours';
 $labels['later'] = 'Plus tard';
 $labels['assigned'] = 'Affectée';
-$labels['assignedtitle'] = 'Tâches que vous avez affecté à d\'autres';
+$labels['assignedtitle'] = 'Tâches que vous avez affectée à d\'autres';
 $labels['mytasks'] = 'Mes tâches';
 $labels['mytaskstitle'] = 'Tâches qui me sont affectées';
-$labels['nodate'] = 'Pas de date';
+$labels['nodate'] = 'pas de date';
 $labels['removetag'] = 'Supprimer';
 $labels['removelink'] = 'Enlever référence d\'e-mail';
 $labels['auto'] = 'Automatique';
@@ -75,7 +76,7 @@
 $labels['saveandnotify'] = 'Enregistrer et notifier';
 $labels['addsubtask'] = 'Ajouter une sous-tâche';
 $labels['deletetask'] = 'Supprimer la tâche';
-$labels['deletethisonly'] = 'Supprimer seulement cette tâche';
+$labels['deletethisonly'] = 'Supprimer cette tâche seulement';
 $labels['deletewithchilds'] = 'Supprimer avec toutes les sous-tâches';
 $labels['taskactions'] = 'Options de la tâche...';
 $labels['tabsummary'] = 'Résumé';
@@ -97,24 +98,24 @@
 $labels['next'] = 'suivant';
 $labels['yes'] = 'oui';
 $labels['savingdata'] = 'Enregistrer...';
-$labels['errorsaving'] = 'Échec lors de la sauvegarde des donnés';
-$labels['notasksfound'] = 'Pas de tâche trouvé avec les critères sélectionnés';
-$labels['invalidstartduedates'] = 'La date de début ne doit pas être supérieur à la date de fin';
-$labels['invalidstartduetimes'] = 'Les dates de début et de fin d\'échéance doivent toutes les deux spécifier une heure ou pas.';
-$labels['recurrencerequiresdate'] = 'La tâches récurrentes exigent une date soit de début soit de fin d\'échéance.';
-$labels['deletetasktconfirm'] = 'Êtes-vous sur de vouloir supprimer cette tâche?';
-$labels['deleteparenttasktconfirm'] = 'Êtes-vous sur de vouloir supprimer cette tâche et ses sous-tâches?';
-$labels['deletelistconfirm'] = 'Êtes-vous sur de vouloir supprimer cette liste et toutes ses tâches?';
-$labels['deletelistconfirmrecursive'] = 'Voulez-vous vraiment supprimer cette liste avec tous ses sous-listes et tâches?';
-$labels['aclnorights'] = 'Vous ne disposez pas des droits d´ administrateur pour cette liste de tâches.';
+$labels['errorsaving'] = 'Échec lors de la sauvegarde des donnés.';
+$labels['notasksfound'] = 'Pas de tâche trouvée avec les critères sélectionnés';
+$labels['invalidstartduedates'] = 'La date de début ne doit pas être ultérieure à la date de fin';
+$labels['invalidstartduetimes'] = 'Les dates de début et de fin d\'échéance doivent toutes deux spécifier une heure, ou non.';
+$labels['recurrencerequiresdate'] = 'Les tâches récurrentes exigent une date de début ou de fin d\'échéance.';
+$labels['deletetasktconfirm'] = 'Êtes-vous sûr de vouloir supprimer cette tâche ?';
+$labels['deleteparenttasktconfirm'] = 'Êtes-vous sûr de vouloir supprimer cette tâche et ses sous-tâches ?';
+$labels['deletelistconfirm'] = 'Êtes-vous sûr de vouloir supprimer cette liste et toutes ses tâches ?';
+$labels['deletelistconfirmrecursive'] = 'Voulez-vous vraiment supprimer cette liste avec toutes ses sous-listes et tâches ?';
+$labels['aclnorights'] = 'Vous ne disposez pas des droits d\'administrateur pour cette liste de tâches.';
 $labels['changetaskconfirm'] = 'Modifier la tâche';
-$labels['changeconfirmnotifications'] = 'Voulez-vous avertir les invitées à propos de cette modification ?';
-$labels['partstatupdatenotification'] = 'Voulez-vous avertir l\'organisateur a propos du changement de statut ?';
+$labels['changeconfirmnotifications'] = 'Voulez-vous avertir les invités de cette modification ?';
+$labels['partstatupdatenotification'] = 'Voulez-vous avertir l\'organisateur du changement de statut ?';
 $labels['quickaddinput'] = 'Nouvelle tâche, date et titre';
 $labels['arialabelquickaddbox'] = 'Ajout rapide d\'une nouvelle tâche';
-$labels['arialabelsearchform'] = 'Recherche de tâches';
-$labels['arialabelquicksearchbox'] = 'Saisie d\'une recherche de tâche';
-$labels['arialabellistsearchform'] = 'Recherche de listes de tâches';
+$labels['arialabelsearchform'] = 'Formulaire de recherche de tâches';
+$labels['arialabelquicksearchbox'] = 'Saisie d\'une recherche de tâches';
+$labels['arialabellistsearchform'] = 'Formulaire de recherche de listes de tâches';
 $labels['arialabeltaskselector'] = 'Type de liste';
 $labels['arialabeltasklisting'] = 'Liste des tâches';
 $labels['attendee'] = 'Utilisateurs affectés';
@@ -124,26 +125,26 @@
 $labels['addattendee'] = 'Affecter un utilisateur';
 $labels['roleorganizer'] = 'Organisateur';
 $labels['rolerequired'] = 'Requis';
-$labels['roleoptional'] = 'Optionel';
-$labels['rolechair'] = 'Chair';
+$labels['roleoptional'] = 'Optionnel';
+$labels['rolechair'] = 'Présidence';
 $labels['rolenonparticipant'] = 'Observateur';
 $labels['sendinvitations'] = 'Envoyer les invitations';
-$labels['sendnotifications'] = 'Avertir les utilisateurs concernant les modifications';
-$labels['sendcancellation'] = 'Avertir les utilisateurs concernant l\'annulation de la tâche';
+$labels['sendnotifications'] = 'Avertir les utilisateurs des modifications';
+$labels['sendcancellation'] = 'Avertir les utilisateurs de l\'annulation de la tâche';
 $labels['invitationsubject'] = 'Vous avez été affecté à la tâche "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nFin: \$date\n\nAffectée à : \$attendees\n\nVous trouverez en attachement un objet de type iCalendar comprenant le détail de cette tâche et que vous pouvez importer dans votre gestionnaire de tâches.";
 $labels['itipupdatesubject'] = '"$title" a été modifié';
 $labels['itipupdatesubjectempty'] = 'Une tâche vous concernant a été modifiée';
 $labels['itipupdatemailbody'] = "*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees\n\nVous trouverez en attachement un objet de type iCalendar comprenant le détail de cette tâche modifiée et que vous pouvez importer dans votre gestionnaire de tâches.";
-$labels['itipcancelmailbody'] = "*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees\n\nLa tâche a été supprimée par \$organizer.\n\nous trouverez en attachement un objet de type iCalendar comprenant le détail de cette tâche.";
-$labels['saveintasklist'] = 'Sauvegardé dans';
+$labels['itipcancelsubject'] = '"$title" a été annulé';
+$labels['itipcancelmailbody'] = "*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees\n\nLa tâche a été supprimée par \$organizer.\n\Vous trouverez en pièce jointe un objet de type iCalendar comprenant le détail de cette tâche.";
+$labels['saveintasklist'] = 'sauvegardé dans';
 $labels['taskhistory'] = 'Historique';
 $labels['objectchangelog'] = 'Historique des modifications';
-$labels['objectdiff'] = 'Modifications depuis $rev1 jusqu\'à $rev2';
-$labels['objectnotfound'] = 'Échec lors du chargement des données de taches';
+$labels['objectdiff'] = 'Modifications de $rev1 à $rev2';
+$labels['objectnotfound'] = 'Échec lors du chargement des données de tâches';
 $labels['objectchangelognotavailable'] = 'Il n\'y a pas d\'historique des modifications pour cette tâche';
 $labels['objectdiffnotavailable'] = 'La comparaison des versions sélectionnées est impossible';
-$labels['revisionrestoreconfirm'] = 'Voulez-vous vraiment restaurer la version $rev de cet tâche ? Cela va remplacer l\'événement courant par l\'ancienne version.';
+$labels['revisionrestoreconfirm'] = 'Voulez-vous vraiment restaurer la version $rev de cette tâche ? Ceci remplacera l\'événement actuel par l\'ancienne version.';
 $labels['objectrestoresuccess'] = 'La révision $rev a été restaurée avec succès';
 $labels['objectrestoreerror'] = 'Échec lors de la restauration de la précédente révision';
 $labels['itipobjectnotfound'] = 'La tâche correspondant à ce massage n\'a pas été trouvée dans votre liste de têches.';
@@ -151,26 +152,26 @@
 $labels['itipmailbodytentative'] = "\$sender va tenter d’accepter l'affectation à cette tâche :\n\n*\$title*\n\nFin : \$date\n\nAffectée à : \$attendees";
 $labels['itipmailbodydeclined'] = "\$sender ne pourra probablement pas accepter l'affectation à cette tâche :\n\n*\$title*\n\nFin : \$date\n\nAffectée à: \$attendees";
 $labels['itipmailbodycancel'] = "\$sender a refusé l'affectation à cette tâche :\n\n*\$title*\n\nFin : \$date";
-$labels['itipmailbodyin-process'] = "\$sender a fixer le statut de la tâche suivante dans l'état \"en cours de traitement\"  :\n\n*\$title*\n\nFin : \$date";
+$labels['itipmailbodyin-process'] = "\$sender a fixé le statut de la tâche suivante dans l'état \"en cours de traitement\"  :\n\n*\$title*\n\nFin : \$date";
 $labels['itipmailbodycompleted'] = "\$sender a fini la tâche suivante :\n\n*\$title*\n\nFin: \$date";
+$labels['itipmailbodydelegated'] = "\$sender a délégué la tâche suivante :\n\n*\$title*\n\nDue: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender vous a délégué la tâche suivante :\n\n*\$title*\n\nDue: \$date";
 $labels['attendeeaccepted'] = 'L\'utilisateur a accepté l\'affectation';
-$labels['attendeetentative'] = 'L\'utilisateur va tenté d\'accepter l\'affectation';
+$labels['attendeetentative'] = 'L\'utilisateur a tenté d\'accepter l\'affectation';
 $labels['attendeedeclined'] = 'L\'utilisateur a décliné l\'affectation';
-$labels['attendeedelegated'] = 'L\'affectation a été délégué à $delegatedto';
+$labels['attendeedelegated'] = 'L\'affectation a été déléguée à $delegatedto';
 $labels['attendeein-process'] = 'Cette tâche est en cours de traitement par les utilisateurs affectés';
-$labels['attendeecompleted'] = 'Cette tâche a été traité par les utilisateurs affectés';
-$labels['acceptinvitation'] = 'Acceptez-vous cet affectation ?';
-$labels['itipdeclinetask'] = 'Décline à l\'organisateur votre affectation à cette tâche';
+$labels['attendeecompleted'] = 'Cette tâche a été traitée par les utilisateurs affectés';
+$labels['acceptinvitation'] = 'Acceptez-vous cette affectation ?';
+$labels['itipdeclinetask'] = 'Déclinez votre affectation à cette tâche auprès de l\'organisateur';
 $labels['declinedeleteconfirm'] = 'Voulez-vous supprimer cette tâche déclinée de votre liste ?';
 $labels['itipcomment'] = 'Commentaire d’invitation ou de notification';
-$labels['itipcommenttitle'] = 'Ce commentaire sera inséré au message d\'invitation envoyé aux utilisateurs affectés';
+$labels['itipcommenttitle'] = 'Ce commentaire sera inséré au message d\'invitation/de notification envoyé aux utilisateurs affectés';
 $labels['itipsendsuccess'] = 'Notification envoyée aux utilisateurs assignés';
 $labels['errornotifying'] = 'Erreur d\'envoi des notifications aux utilisateurs affectés à la tâche';
 $labels['removefromcalendar'] = 'Supprimer de mes tâches';
 $labels['delegateinvitation'] = 'Déléguer l\'affectation';
 $labels['andnmore'] = '$nr de plus...';
-$labels['delegatedto'] = 'Délégué à :';
-$labels['delegatedfrom'] = 'Délégué de :';
 $labels['savetotasklist'] = 'Sauvegarde des tâches';
 $labels['comment'] = 'Commentaire';
 $labels['errorimportingtask'] = 'Importation impossible';
@@ -182,7 +183,8 @@
 $labels['updatedsuccessfully'] = 'Cette tâche a été modifiée avec succès dans \'$list\'';
 $labels['attendeupdateesuccess'] = 'Le statut des participants a été modifié';
 $labels['itipresponseerror'] = 'Impossible d\'envoyer la réponse de l\'utilisateur affecté à la tâche';
-$labels['itipinvalidrequest'] = 'C\'est invitation n\'est plus valide.';
-$labels['sentresponseto'] = 'La réponse de l\'utilisateur affecté a été envoyé avec succès à $mailto';
+$labels['itipinvalidrequest'] = 'Cette invitation n\'est plus valide';
+$labels['sentresponseto'] = 'La réponse de l\'utilisateur affecté a été envoyée avec succès à $mailto';
 $labels['successremoval'] = 'Cette tâche a été supprimée avec succès.';
+$labels['invalidlistproperties'] = 'Propriétés de la liste invalides ! Veuillez saisir un nom valide.';
 $labels['arialabelsortmenu'] = 'Options de tri des tâches';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/he_IL.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/he_IL.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/hr_HR.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/hr_HR.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/hu_HU.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/hu_HU.inc Changed

@@ -125,7 +125,6 @@
 $labels['sendnotifications'] = 'Notify assignees about modifications';
 $labels['sendcancellation'] = 'Notify assignees about task cancellation';
 $labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
 $labels['itipupdatesubject'] = '$title - módosítva';
 $labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
 $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.";
@@ -156,8 +155,6 @@
 $labels['removefromcalendar'] = 'Remove from my tasks';
 $labels['delegateinvitation'] = 'Delegate assignment';
 $labels['andnmore'] = 'még $nr ...';
-$labels['delegatedto'] = 'Beosztva ide: ';
-$labels['delegatedfrom'] = 'Beosztva innen: ';
 $labels['savetotasklist'] = 'Save to tasks';
 $labels['comment'] = 'Comment';
 $labels['errorimportingtask'] = 'Failed to import task(s)';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/it_IT.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/it_IT.inc Changed

@@ -126,7 +126,6 @@
 $labels['sendnotifications'] = 'Informa gli assegnatari delle modifiche';
 $labels['sendcancellation'] = 'Informa gli assegnatari della cancellazione dell\'attività';
 $labels['invitationsubject'] = 'Sei stato assegnato a "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nScadenza: \$date\n\nAssegnatari: \$attendees\n\nIn allegato un file iCalendar con tutti i dettagli dell'attività che puoi importare nella tua applicazione di attività.";
 $labels['itipupdatesubject'] = '"$title" è stato aggiornato';
 $labels['itipupdatesubjectempty'] = 'Un\'attività che ti riguarda è stata aggiornata';
 $labels['itipupdatemailbody'] = "*\$title*\n\nScadenza: \$date\n\nAssegnatari: \$attendees\n\nIn allegato un file iCalendar con i dettagli dell'attività aggiornati che puoi importare nella tua applicazione di attività.";
@@ -155,8 +154,6 @@
 $labels['errornotifying'] = 'Impossibile inviare notifiche agli assegnatari dell\'attività';
 $labels['removefromcalendar'] = 'Rimuovi dalle mie attività';
 $labels['andnmore'] = 'Altri $nr...';
-$labels['delegatedto'] = 'Delegato a:';
-$labels['delegatedfrom'] = 'Delegato da:';
 $labels['savetotasklist'] = 'Salva su attività';
 $labels['comment'] = 'Commento';
 $labels['errorimportingtask'] = 'Impossibile importare attività';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/ja_JP.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/ja_JP.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/ko_KR.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/ko_KR.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/lv.inc Added

@@ -0,0 +1,67 @@
+<?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['export'] = 'Eksportēt';
+$labels['exporttitle'] = 'Eksportēt uz iCalendar';
+$labels['exportattachments'] = 'Ar pielikumiem';
+$labels['tasklistsubscribe'] = 'Rādīt sarakstā vienmēr';
+$labels['searchterms'] = 'Meklēšanas nosacījumi';
+$labels['removelist'] = 'Dzēst no saraksta';
+$labels['printdescriptions'] = 'Drukāt aprakstus';
+$labels['edit'] = 'Labot';
+$labels['description'] = 'Apraksts';
+$labels['start'] = 'Sākums';
+$labels['starttime'] = 'Sākums';
+$labels['alarms'] = 'Atgādinājums';
+$labels['repeat'] = 'Atkārtot';
+$labels['links'] = 'Atsauce';
+$labels['status'] = 'Statuss';
+$labels['status-needs-action'] = 'Nepieciešama darbība';
+$labels['status-in-process'] = 'Procesā';
+$labels['status-completed'] = 'Pabeigts';
+$labels['status-cancelled'] = 'Atcelts';
+$labels['created'] = 'Izveidots';
+$labels['changed'] = 'Mainīts';
+$labels['taskoptions'] = 'iespējas';
+$labels['all'] = 'Visi';
+$labels['today'] = 'Šodien';
+$labels['tomorrow'] = 'Rīt';
+$labels['removelink'] = 'Noņemt atsauci uz e-pastu';
+$labels['taskdetails'] = 'Detaļas';
+$labels['save'] = 'Saglabāt';
+$labels['cancel'] = 'Atcelt';
+$labels['tabsummary'] = 'Kopsavilkums';
+$labels['tabrecurrence'] = 'Atkārtojums';
+$labels['tabattachments'] = 'Pielikumi';
+$labels['tabsharing'] = 'Dalīšanās';
+$labels['listname'] = 'Nosaukums';
+$labels['showalarms'] = 'Rādīt atgādinājumus';
+$labels['at'] = ' ';
+$labels['yes'] = 'jā';
+$labels['savingdata'] = 'Saglabājam...';
+$labels['role'] = 'Loma';
+$labels['availability'] = 'Pieej.';
+$labels['confirmstate'] = 'Statuss';
+$labels['roleorganizer'] = 'Organizētājs';
+$labels['rolerequired'] = 'Obligāti';
+$labels['roleoptional'] = 'Pēc izvēles';
+$labels['rolechair'] = 'Vadītājs';
+$labels['sendinvitations'] = 'Nosūtīt uzaicinājumus';
+$labels['itipupdatesubject'] = '"$title" ir mainīts';
+$labels['itipcancelsubject'] = '"$title" ir atcelts';
+$labels['taskhistory'] = 'Vēsture';
+$labels['objectchangelog'] = 'Mainīt vēsturi';
+$labels['objectdiff'] = 'Izmaiņas no $rev1 uz $rev2';
+$labels['objectdiffnotavailable'] = 'Izvēlētās versijas nav salīdzināmas';
+$labels['objectrestoresuccess'] = 'Versija $rev veiksmīgi atjaunota';
+$labels['objectrestoreerror'] = 'Kļūda atjaunojot veco versiju';
+$labels['itipcomment'] = 'Uzaicinājumam/paziņojuma komentārs';
+$labels['andnmore'] = 'vēl $nr ...';
+$labels['comment'] = 'Komentārs';
+$labels['attendeupdateesuccess'] = 'Dalībnieku statusi veiksmīgi atjaunoti';
+$labels['itipinvalidrequest'] = 'Šis uzaicinājums vairs nav spēkā';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/nl_NL.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/nl_NL.inc Changed

@@ -9,170 +9,182 @@
 $labels['navtitle'] = 'Taken';
 $labels['lists'] = 'Takenlijsten';
 $labels['list'] = 'Takenlijst';
-$labels['tags'] = 'Labels';
-$labels['export'] = 'Exporteer naar ICS';
-$labels['exporttitle'] = 'Als iCalender exporteren';
-$labels['exportattachments'] = 'Exporteer bijlages';
-$labels['tasklistsubscribe'] = 'Permanent weergeven';
-$labels['listsearchresults'] = 'Available Tasklists';
-$labels['findlists'] = 'Find tasklists...';
-$labels['searchterms'] = 'Search terms';
-$labels['notasklistsfound'] = 'No tasklists found';
-$labels['nrtasklistsfound'] = '$nr tasklists found';
-$labels['removelist'] = 'Remove from list';
-$labels['newtask'] = 'Nieuwe Taak';
-$labels['createtask'] = 'Create Task <Enter>';
-$labels['createnewtask'] = 'Creer een nieuwe Taak (bijv. Zaterdag, gras maaien)';
-$labels['createfrommail'] = 'Als taak opslaan';
+$labels['tags'] = 'Tags';
+$labels['export'] = 'Exporteren';
+$labels['exporttitle'] = 'Exporteren naar iCalendar';
+$labels['exportattachments'] = 'Met bijlagen';
+$labels['currentview'] = 'huidige weergave';
+$labels['tasklistsubscribe'] = 'Definitief weergeven';
+$labels['listsearchresults'] = 'Beschikbare takenlijsten';
+$labels['findlists'] = 'Takenlijsten zoeken...';
+$labels['searchterms'] = 'Zoektermen';
+$labels['notasklistsfound'] = 'Geen takenlijsten gevonden';
+$labels['nrtasklistsfound'] = '$nr takenlijsten gevonden';
+$labels['removelist'] = 'Verwijderen uit lijst';
+$labels['showcaldavurl'] = 'CalDAV-URL tonen';
+$labels['caldavurldescription'] = 'Kopieer dit adres naar een <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a>-client (bijv. Evolution of Mozilla Thunderbird) om deze specifieke takenlijst te synchroniseren met uw computer of mobiele apparaat.';
+$labels['newtask'] = 'Nieuwe taak';
+$labels['createtask'] = 'Taak maken <Enter>';
+$labels['createnewtask'] = 'Nieuwe taak maken (bijv. gras maaien op zaterdag)';
+$labels['createfrommail'] = 'Opslaan als taak';
 $labels['printtitle'] = 'Taken afdrukken';
-$labels['printdescriptions'] = 'Print beschrijvingen';
+$labels['printdescriptions'] = 'Beschrijvingen afdrukken';
 $labels['mark'] = 'Markeren';
-$labels['unmark'] = 'Demarkeren';
-$labels['edit'] = 'Wijzigen';
+$labels['unmark'] = 'Markering opheffen';
+$labels['edit'] = 'Bewerken';
 $labels['delete'] = 'Verwijderen';
-$labels['title'] = 'Titel';
+$labels['title'] = 'Naam';
 $labels['description'] = 'Beschrijving';
 $labels['datetime'] = 'Vóór';
-$labels['duetime'] = 'Due time';
+$labels['duetime'] = 'Vervaltijd';
 $labels['start'] = 'Begin';
-$labels['starttime'] = 'Start time';
+$labels['starttime'] = 'Begintijd';
 $labels['alarms'] = 'Herinnering';
-$labels['repeat'] = 'Herhaal';
-$labels['links'] = 'Reference';
+$labels['repeat'] = 'Herhalen';
+$labels['links'] = 'Referentie';
 $labels['status'] = 'Status';
-$labels['status-needs-action'] = 'Needs action';
-$labels['status-in-process'] = 'In process';
-$labels['status-completed'] = 'Completed';
-$labels['status-cancelled'] = 'Afgelast';
-$labels['assignedto'] = 'Assigned to';
-$labels['created'] = 'Created';
-$labels['changed'] = 'Last Modified';
+$labels['status-needs-action'] = 'Actie vereist';
+$labels['status-in-process'] = 'In behandeling';
+$labels['status-completed'] = 'Voltooid';
+$labels['status-cancelled'] = 'Geannuleerd';
+$labels['assignedto'] = 'Toegewezen aan';
+$labels['created'] = 'Gemaakt op';
+$labels['changed'] = 'Laatst gewijzigd op';
 $labels['taskoptions'] = 'Opties';
-$labels['all'] = 'Alle';
+$labels['all'] = 'Alles';
 $labels['flagged'] = 'Gemarkeerd';
-$labels['complete'] = 'Compleet';
-$labels['completeness'] = 'Progress';
+$labels['complete'] = 'Voltooien';
+$labels['completeness'] = 'Voortgang';
 $labels['overdue'] = 'Achterstallig';
 $labels['today'] = 'Vandaag';
 $labels['tomorrow'] = 'Morgen';
 $labels['next7days'] = 'Volgende 7 dagen';
 $labels['later'] = 'Later';
-$labels['assigned'] = 'Assigned';
-$labels['assignedtitle'] = 'Tasks you assigned to others';
-$labels['mytasks'] = 'My tasks';
-$labels['mytaskstitle'] = 'Tasks assigned to you';
+$labels['assigned'] = 'Toegewezen';
+$labels['assignedtitle'] = 'Taken die u aan anderen hebt toegewezen';
+$labels['mytasks'] = 'Mijn taken';
+$labels['mytaskstitle'] = 'Taken die aan u zijn toegewezen';
 $labels['nodate'] = 'geen datum';
-$labels['removetag'] = 'Verwijder';
-$labels['removelink'] = 'Remove email reference';
-$labels['auto'] = 'Auto';
+$labels['removetag'] = 'Verwijderen';
+$labels['removelink'] = 'E-mailreferentie verwijderen';
+$labels['auto'] = 'Automatisch';
 $labels['taskdetails'] = 'Details';
-$labels['newtask'] = 'Nieuwe Taak';
-$labels['edittask'] = 'Taak Wijzigen';
+$labels['newtask'] = 'Nieuwe taak';
+$labels['edittask'] = 'Taak bewerken';
 $labels['save'] = 'Opslaan';
 $labels['cancel'] = 'Annuleren';
-$labels['saveandnotify'] = 'Save and Notify';
-$labels['addsubtask'] = 'Voeg subtaak toe';
-$labels['deletetask'] = 'Verwijder taak';
-$labels['deletethisonly'] = 'Verwijder alleen deze taak';
-$labels['deletewithchilds'] = 'Verwijder inclusief subtaken';
-$labels['taskactions'] = 'Task options...';
+$labels['saveandnotify'] = 'Opslaan en melden';
+$labels['addsubtask'] = 'Subtaak toevoegen';
+$labels['deletetask'] = 'Taak verwijderen';
+$labels['deletethisonly'] = 'Alleen deze taak verwijderen';
+$labels['deletewithchilds'] = 'Verwijderen inclusief subtaken';
+$labels['taskactions'] = 'Taakopties...';
 $labels['tabsummary'] = 'Samenvatting';
 $labels['tabrecurrence'] = 'Herhaling';
-$labels['tabassignments'] = 'Assignments';
-$labels['tabattachments'] = 'Toebehoren';
+$labels['tabassignments'] = 'Toegewezen taken';
+$labels['tabattachments'] = 'Bijlagen';
 $labels['tabsharing'] = 'Delen';
-$labels['editlist'] = 'Lijst wijzigen';
+$labels['editlist'] = 'Lijst bewerken';
 $labels['createlist'] = 'Lijst toevoegen';
-$labels['listactions'] = 'Lijst opties...';
+$labels['listactions'] = 'Lijstopties...';
 $labels['listname'] = 'Naam';
-$labels['showalarms'] = 'Laat herinneringen zien';
+$labels['showalarms'] = 'Herinneringen tonen';
 $labels['import'] = 'Importeren';
-$labels['viewactions'] = 'View actions';
-$labels['focusview'] = 'Bekijk alleen deze lijst';
+$labels['viewactions'] = 'Acties weergeven';
+$labels['focusview'] = 'Alleen deze lijst weergeven';
 $labels['on'] = 'op';
 $labels['at'] = 'om';
 $labels['this'] = 'deze';
 $labels['next'] = 'volgende';
 $labels['yes'] = 'ja';
-$labels['savingdata'] = 'Data wordt opgeslagen...';
-$labels['errorsaving'] = 'Fout in opslaan van data.';
-$labels['notasksfound'] = 'Geen taken gevonden voor de gegeven criteria';
-$labels['invalidstartduedates'] = 'Begin datum kan niet later zijn dan vervaldag.';
-$labels['deletetasktconfirm'] = 'Wilt u deze taak echt verwijderen?';
-$labels['deleteparenttasktconfirm'] = 'Wilt u deze taak en alle subtaken echt verwijderen?';
-$labels['deletelistconfirm'] = 'Wilt u deze lijst met alle taken echt verwijderen?';
-$labels['deletelistconfirmrecursive'] = 'Wilt u deze lijst en alle taken en subtaken echt verwijderen?';
-$labels['aclnorights'] = 'You do not have administrator rights on this task list.';
-$labels['changetaskconfirm'] = 'Update task';
-$labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
-$labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
-$labels['quickaddinput'] = 'New task date and title';
-$labels['arialabelquickaddbox'] = 'Quick add new task';
-$labels['arialabelsearchform'] = 'Task search form';
-$labels['arialabelquicksearchbox'] = 'Task search input';
-$labels['arialabellistsearchform'] = 'Tasklists search form';
-$labels['arialabeltaskselector'] = 'List mode';
-$labels['arialabeltasklisting'] = 'Tasks listing';
-$labels['attendee'] = 'Assignee';
+$labels['savingdata'] = 'Gegevens opslaan...';
+$labels['errorsaving'] = 'Fout bij opslaan van gegevens.';
+$labels['notasksfound'] = 'Geen taken gevonden voor de opgegeven criteria';
+$labels['invalidstartduedates'] = 'Begindatum kan niet na vervaldatum vallen.';
+$labels['invalidstartduetimes'] = 'Zowel de begindatum als de einddatum moet al dan niet een tijd opgeven.';
+$labels['recurrencerequiresdate'] = 'Herhaalde taken vereisen een begin- of vervaldatum.';
+$labels['deletetasktconfirm'] = 'Weet u zeker dat u deze taak wilt verwijderen?';
+$labels['deleteparenttasktconfirm'] = 'Weet u zeker dat u deze taak en alle subtaken wilt verwijderen?';
+$labels['deletelistconfirm'] = 'Weet u zeker dat u deze lijst met alle taken wilt verwijderen?';
+$labels['deletelistconfirmrecursive'] = 'Weet u zeker dat u deze lijst met alle taken en subtaken wilt verwijderen?';
+$labels['aclnorights'] = 'U hebt geen administratorrechten voor deze takenlijst.';
+$labels['changetaskconfirm'] = 'Taak bijwerken';
+$labels['changeconfirmnotifications'] = 'Wilt u de wijziging melden aan de deelnemers?';
+$labels['partstatupdatenotification'] = 'Wilt u de gewijzigde status melden aan de organisator?';
+$labels['quickaddinput'] = 'Nieuwe datum en naam voor taak';
+$labels['arialabelquickaddbox'] = 'Snel nieuwe taak toevoegen';
+$labels['arialabelsearchform'] = 'Zoekformulier voor taken';
+$labels['arialabelquicksearchbox'] = 'Zoekopdracht voor taken';
+$labels['arialabellistsearchform'] = 'Zoekformulier voor takenlijsten';
+$labels['arialabeltaskselector'] = 'Lijstmodus';
+$labels['arialabeltasklisting'] = 'Taken in lijst weergeven';
+$labels['attendee'] = 'Toegewezen persoon';
 $labels['role'] = 'Rol';
-$labels['availability'] = 'Beschikb.';
+$labels['availability'] = 'Beschikbaar';
 $labels['confirmstate'] = 'Status';
-$labels['addattendee'] = 'Add assignee';
-$labels['roleorganizer'] = 'Organisatie';
+$labels['addattendee'] = 'Toegewezen persoon toevoegen';
+$labels['roleorganizer'] = 'Organisator';
 $labels['rolerequired'] = 'Verplicht';
 $labels['roleoptional'] = 'Optioneel';
 $labels['rolechair'] = 'Voorzitter';
-$labels['rolenonparticipant'] = 'Observer';
-$labels['sendinvitations'] = 'Verzend uitnodigingen';
-$labels['sendnotifications'] = 'Notify assignees about modifications';
-$labels['sendcancellation'] = 'Notify assignees about task cancellation';
-$labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
-$labels['itipupdatesubject'] = '"$title" is gewijzigd';
-$labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
-$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['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'] = 'save in ';
+$labels['rolenonparticipant'] = 'Waarnemer';
+$labels['sendinvitations'] = 'Uitnodigingen versturen';
+$labels['sendnotifications'] = 'Wijzigingen melden aan toegewezen personen';
+$labels['sendcancellation'] = 'Annulering van activiteiten melden aan toegewezen personen';
+$labels['invitationsubject'] = '"$title" is toegewezen aan u';
+$labels['itipupdatesubject'] = '"$title" is bijgewerkt';
+$labels['itipupdatesubjectempty'] = 'Een taak die u aangaat is bijgewerkt';
+$labels['itipupdatemailbody'] = "*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de taak die u in uw programma voor taakbeheer kunt importeren.";
+$labels['itipcancelsubject'] = '"$title" is geannuleerd';
+$labels['itipcancelmailbody'] = "*\$title*\n\nWanneer: \$date\n\nToegewezen personen: \$attendees\n\nDe taak is geannuleerd door \$organizer.\n\nAls bijlage vindt u een iCalendar-bestand met de bijgewerkte gegevens van de taak.";
+$labels['saveintasklist'] = 'opslaan in ';
 $labels['taskhistory'] = 'Geschiedenis';
-$labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
-$labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
-$labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
-$labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$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'] = 'Assignee has accepted';
-$labels['attendeetentative'] = 'Assignee has tentatively accepted';
-$labels['attendeedeclined'] = 'Assignee has declined';
-$labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
-$labels['attendeein-process'] = 'Assignee is in-process';
-$labels['attendeecompleted'] = 'Assignee has completed';
-$labels['acceptinvitation'] = 'Do you accept this assignment?';
-$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'] = 'Invitation/notification comment';
-$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
-$labels['itipsendsuccess'] = 'Notification sent to assignees';
-$labels['errornotifying'] = 'Failed to send notifications to task assignees';
-$labels['removefromcalendar'] = 'Remove from my tasks';
-$labels['delegateinvitation'] = 'Delegate assignment';
-$labels['andnmore'] = '$nr meer...';
-$labels['delegatedto'] = 'Gedelegeerd aan';
-$labels['delegatedfrom'] = 'Gedelegeerd door';
-$labels['savetotasklist'] = 'Save to tasks';
+$labels['objectchangelog'] = 'Geschiedenis wijzigen';
+$labels['objectdiff'] = 'Wijzigingen van $rev1 tot $rev2';
+$labels['objectnotfound'] = 'Laden van taakgegevens is mislukt';
+$labels['objectchangelognotavailable'] = 'Voor deze taak kunt u de geschiedenis niet wijzigen';
+$labels['objectdiffnotavailable'] = 'Geen vergelijking mogelijk voor de geselecteerde revisies';
+$labels['revisionrestoreconfirm'] = 'Weet u zeker dat u revisie $rev van deze taak wilt herstellen? Met deze actie vervangt u de huidige taak door de oude versie.';
+$labels['objectrestoresuccess'] = 'Revisie $rev met succes hersteld';
+$labels['objectrestoreerror'] = 'Herstellen van oude revisie is mislukt';
+$labels['itipobjectnotfound'] = 'De taak uit dit bericht is niet in uw takenlijst gevonden.';
+$labels['itipmailbodyaccepted'] = "\$sender heeft de volgende toegewezen taak geaccepteerd:\n\n*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees";
+$labels['itipmailbodytentative'] = "\$sender heeft de volgende toegewezen taak onder voorbehoud geaccepteerd:\n\n*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees";
+$labels['itipmailbodydeclined'] = "\$sender heeft de volgende toegewezen taak afgewezen:\n\n*\$title*\n\nEinde: \$date\n\nToegewezen personen: \$attendees";
+$labels['itipmailbodycancel'] = "\$sender heeft de door u toegewezen taak geweigerd:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodyin-process'] = "\$sender heeft de status van de volgende taak ingesteld op ‘In behandeling’:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodycompleted'] = "\$sender heeft de volgende taak voltooid:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodydelegated'] = "\$sender heeft de volgende taak gedelegeerd:\n\n*\$title*\n\nEinde: \$date";
+$labels['itipmailbodydelegatedto'] = "\$sender heeft de volgende taak gedelegeerd aan u:\n\n*\$title*\n\nEinde: \$date";
+$labels['attendeeaccepted'] = 'Toegewezen persoon heeft geaccepteerd';
+$labels['attendeetentative'] = 'Toegewezen persoon heeft onder voorbehoud geaccepteerd';
+$labels['attendeedeclined'] = 'Toegewezen persoon heeft afgeslagen';
+$labels['attendeedelegated'] = 'Toegewezen persoon heeft gedelegeerd aan $delegatedto';
+$labels['attendeein-process'] = 'De toegewezen persoon heeft de status gewijzigd in ‘In behandeling';
+$labels['attendeecompleted'] = 'De toegewezen persoon heeft de status gewijzigd in ‘Voltooid’';
+$labels['acceptinvitation'] = 'Accepteert u deze toegewezen taak?';
+$labels['itipdeclinetask'] = 'Toegewezen taak afslaan en organisator verwittigen';
+$labels['declinedeleteconfirm'] = 'Wilt u deze afgeslagen taak ook verwijderen uit uw takenlijst?';
+$labels['itipcomment'] = 'Opmerking bij uitnodiging/melding';
+$labels['itipcommenttitle'] = 'Deze opmerking wordt toegevoegd aan de uitnodiging/melding die naar de toegewezen personen wordt verstuurd';
+$labels['itipsendsuccess'] = 'Melding is naar toegewezen personen verstuurd';
+$labels['errornotifying'] = 'Versturen van meldingen naar toegewezen personen van taak is mislukt';
+$labels['removefromcalendar'] = 'Verwijderen uit mijn taken';
+$labels['delegateinvitation'] = 'Toegewezen taak delegeren';
+$labels['andnmore'] = 'Nog $nr..';
+$labels['savetotasklist'] = 'Opslaan in taken';
 $labels['comment'] = 'Opmerking';
-$labels['errorimportingtask'] = 'Failed to import task(s)';
-$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
-$labels['importsuccess'] = 'Successfully imported $nr tasks';
-$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
-$labels['nowritetasklistfound'] = 'No tasklist found to save the task';
-$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
-$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
-$labels['attendeupdateesuccess'] = 'Status van genodigde succesvol gewijzigd';
-$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
-$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet langer geldig';
-$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
-$labels['successremoval'] = 'The task has been deleted successfully.';
-$labels['arialabelsortmenu'] = 'Tasks sorting options';
+$labels['errorimportingtask'] = 'Importeren van taken is mislukt';
+$labels['importwarningexists'] = 'Een exemplaar van deze taak staat al in uw takenlijst.';
+$labels['importsuccess'] = '$nr taken met succes geïmporteerd';
+$labels['newerversionexists'] = 'Er bestaat al een nieuwere versie van deze taak! Bewerking afgebroken.';
+$labels['nowritetasklistfound'] = 'Geen takenlijst gevonden om de taak op te slaan';
+$labels['importedsuccessfully'] = 'De taak is met succes toegevoegd aan \'$list\'';
+$labels['updatedsuccessfully'] = 'De taak is met succes bijgewerkt in \'$list\'';
+$labels['attendeupdateesuccess'] = 'Status van deelnemer met succes bijgewerkt';
+$labels['itipresponseerror'] = 'Versturen van antwoord op deze toegewezen taak is mislukt';
+$labels['itipinvalidrequest'] = 'Deze uitnodiging is niet meer geldig';
+$labels['sentresponseto'] = 'Antwoord op toegewezen taak is met succes verstuurd naar $mailto';
+$labels['successremoval'] = 'De taak is met succes verwijderd.';
+$labels['invalidlistproperties'] = 'Ongeldige eigenschappen van lijst! Stel een geldige naam in.';
+$labels['arialabelsortmenu'] = 'Sorteeropties voor taken';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/pl_PL.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/pl_PL.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/pt_BR.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/pt_BR.inc Changed

@@ -12,82 +12,86 @@
 $labels['tags'] = 'Etiquetas';
 $labels['export'] = 'Exportar';
 $labels['exporttitle'] = 'Exportar para iCalendar';
-$labels['exportattachments'] = 'With attachments';
+$labels['exportattachments'] = 'Com anexos';
+$labels['currentview'] = 'visão atual';
 $labels['tasklistsubscribe'] = 'Listar permanentemente';
-$labels['listsearchresults'] = 'Available Tasklists';
-$labels['findlists'] = 'Find tasklists...';
-$labels['searchterms'] = 'Search terms';
-$labels['notasklistsfound'] = 'No tasklists found';
-$labels['nrtasklistsfound'] = '$nr tasklists found';
-$labels['removelist'] = 'Remove from list';
+$labels['listsearchresults'] = 'Listas de tarefas disponíveis';
+$labels['findlists'] = 'Encontrar listas de tarefas...';
+$labels['searchterms'] = 'Encontrar termos';
+$labels['notasklistsfound'] = 'Listas de tarefas não encontradas';
+$labels['nrtasklistsfound'] = '$nr listas de tarefas encontradas';
+$labels['removelist'] = 'Remover da lista';
+$labels['showcaldavurl'] = 'Mostrar URL de CalDAV';
+$labels['caldavurldescription'] = 'Copie este endereço para uma aplicação <a href="http://en.wikipedia.org/wiki/CalDAV" target="_blank">CalDAV</a> cliente (ex.: Evolution ou Mozilla Thunderbird) para sincronizar esta lista de tarefas específica com o seu computador ou dispositivo móvel.';
 $labels['newtask'] = 'Nova Tarefa';
-$labels['createtask'] = 'Create Task <Enter>';
+$labels['createtask'] = 'Criar Tarefa <Enter>';
 $labels['createnewtask'] = 'Criar nova Tarefa (ex.: Sábado, Cortar a grama)';
 $labels['createfrommail'] = 'Salvar como tarefa';
-$labels['printdescriptions'] = 'Descrições de impressão';
+$labels['printtitle'] = 'Imprimir tarefas';
+$labels['printdescriptions'] = 'Imprimir descrições';
 $labels['mark'] = 'Marcar';
 $labels['unmark'] = 'Desmarcar';
 $labels['edit'] = 'Editar';
-$labels['delete'] = 'Deletar';
+$labels['delete'] = 'Excluir';
 $labels['title'] = 'Título';
 $labels['description'] = 'Descrição';
-$labels['datetime'] = 'Due';
-$labels['duetime'] = 'Due time';
+$labels['datetime'] = 'Vencimento';
+$labels['duetime'] = 'Hora de vencimento';
 $labels['start'] = 'Início';
-$labels['starttime'] = 'Start time';
+$labels['starttime'] = 'Hora de início';
 $labels['alarms'] = 'Lembrete';
 $labels['repeat'] = 'Repetir';
-$labels['links'] = 'Reference';
+$labels['links'] = 'Referência';
 $labels['status'] = 'Situação';
-$labels['status-needs-action'] = 'Needs action';
-$labels['status-in-process'] = 'In process';
-$labels['status-completed'] = 'Completed';
-$labels['status-cancelled'] = 'Cancalado';
-$labels['assignedto'] = 'Assigned to';
-$labels['created'] = 'Created';
-$labels['changed'] = 'Last Modified';
+$labels['status-needs-action'] = 'Precisa ação';
+$labels['status-in-process'] = 'Em progresso';
+$labels['status-completed'] = 'Completo';
+$labels['status-cancelled'] = 'Cancelado';
+$labels['assignedto'] = 'Atribuído à';
+$labels['created'] = 'Criado';
+$labels['changed'] = 'Última modificação';
 $labels['taskoptions'] = 'Opções';
 $labels['all'] = 'Todos';
 $labels['flagged'] = 'Marcado';
-$labels['complete'] = 'Completado';
-$labels['completeness'] = 'Progress';
+$labels['complete'] = 'Completo';
+$labels['completeness'] = 'Progresso';
 $labels['overdue'] = 'Atrasado';
 $labels['today'] = 'Hoje';
 $labels['tomorrow'] = 'Amanhã';
 $labels['next7days'] = 'Próximos 7 dias';
 $labels['later'] = 'Mais tarde';
-$labels['assigned'] = 'Assigned';
-$labels['assignedtitle'] = 'Tasks you assigned to others';
-$labels['mytasks'] = 'My tasks';
-$labels['mytaskstitle'] = 'Tasks assigned to you';
+$labels['assigned'] = 'Atribuído';
+$labels['assignedtitle'] = 'Tarefas que você designou para outros';
+$labels['mytasks'] = 'Minhas tarefas';
+$labels['mytaskstitle'] = 'Tarefas designadas para você';
 $labels['nodate'] = 'sem data';
 $labels['removetag'] = 'Remover';
-$labels['removelink'] = 'Remove email reference';
-$labels['auto'] = 'Auto';
+$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';
 $labels['cancel'] = 'Cancelar';
-$labels['saveandnotify'] = 'Save and Notify';
+$labels['saveandnotify'] = 'Salvar e Notificar';
 $labels['addsubtask'] = 'Adicionar subtarefa';
 $labels['deletetask'] = 'Remover tarefa';
-$labels['deletethisonly'] = 'Remover esta tarefa somente';
+$labels['deletethisonly'] = 'Excluir somente esta tarefa';
 $labels['deletewithchilds'] = 'Remover com todas as subtarefas';
-$labels['taskactions'] = 'Task options...';
-$labels['tabsummary'] = 'Sumário';
-$labels['tabrecurrence'] = 'Repetição';
-$labels['tabassignments'] = 'Assignments';
+$labels['taskactions'] = 'Opções de tarefas...';
+$labels['tabsummary'] = 'Resumo';
+$labels['tabrecurrence'] = 'Recorrência';
+$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';
-$labels['showalarms'] = 'Show reminders';
+$labels['showalarms'] = 'Mostrar lembrentes';
 $labels['import'] = 'Importar';
-$labels['viewactions'] = 'View actions';
-$labels['focusview'] = 'View only this list';
+$labels['viewactions'] = 'Ver ações';
+$labels['focusview'] = 'Ver somente esta lista';
 $labels['on'] = 'em';
 $labels['at'] = 'no';
 $labels['this'] = 'este';
@@ -97,80 +101,43 @@
 $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['deletetasktconfirm'] = 'Você realmente quer remover esta tarefa?';
-$labels['deleteparenttasktconfirm'] = 'Você realmente quer remover esta tarefa e todas suas subtarefas?';
-$labels['deletelistconfirm'] = 'Você realmente quer remover esta lista com todas as suas tarefas?';
-$labels['deletelistconfirmrecursive'] = 'Do you really want to delete this list with all its sub-lists and tasks?';
-$labels['aclnorights'] = 'You do not have administrator rights on this task list.';
-$labels['changetaskconfirm'] = 'Update task';
-$labels['changeconfirmnotifications'] = 'Do you want to notify the attendees about the modification?';
-$labels['partstatupdatenotification'] = 'Do you want to notify the organizer about the status change?';
-$labels['quickaddinput'] = 'New task date and title';
-$labels['arialabelquickaddbox'] = 'Quick add new task';
-$labels['arialabelsearchform'] = 'Task search form';
-$labels['arialabelquicksearchbox'] = 'Task search input';
-$labels['arialabellistsearchform'] = 'Tasklists search form';
-$labels['arialabeltaskselector'] = 'List mode';
-$labels['arialabeltasklisting'] = 'Tasks listing';
-$labels['attendee'] = 'Assignee';
+$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?';
+$labels['deletelistconfirm'] = 'Você realmente quer excluir esta lista com todas as suas tarefas?';
+$labels['deletelistconfirmrecursive'] = 'Você realmente quer excluir esta lista com todas suas sublistas e tarefas?';
+$labels['aclnorights'] = 'Você não tem permissões de administrador nesta lista de tareas.';
+$labels['changetaskconfirm'] = 'Atualizar tarefa';
+$labels['changeconfirmnotifications'] = 'Você deseja notificar os participantes sobre essa modificação?';
+$labels['partstatupdatenotification'] = 'Você deseja notificar o organizador sobre a mudança de status?';
+$labels['quickaddinput'] = 'Nova data e título da tarefa';
+$labels['arialabelquickaddbox'] = 'Adicionar rapidamente nova tarefa';
+$labels['arialabelsearchform'] = 'Formulário de busca de tarefa';
+$labels['arialabelquicksearchbox'] = 'Entrada de busca de tarefa';
+$labels['arialabellistsearchform'] = 'Formulário de busca de listas de tarefas';
+$labels['arialabeltaskselector'] = 'Modo lista';
+$labels['arialabeltasklisting'] = 'Listagem de tarefas';
+$labels['attendee'] = 'Designar';
 $labels['role'] = 'Papel';
 $labels['availability'] = 'Disp.';
 $labels['confirmstate'] = 'Situação';
-$labels['addattendee'] = 'Add assignee';
+$labels['addattendee'] = 'Adicionar designação';
 $labels['roleorganizer'] = 'Organizador';
 $labels['rolerequired'] = 'Obrigatório';
 $labels['roleoptional'] = 'Opcional';
-$labels['rolechair'] = 'Chair';
-$labels['rolenonparticipant'] = 'Observer';
+$labels['rolechair'] = 'Cadeira';
+$labels['rolenonparticipant'] = 'Observador';
 $labels['sendinvitations'] = 'Enviar convites';
-$labels['sendnotifications'] = 'Notify assignees about modifications';
-$labels['sendcancellation'] = 'Notify assignees about task cancellation';
-$labels['invitationsubject'] = 'You\'ve been assigned to "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nDue: \$date\n\nAssignees: \$attendees\n\nPlease find attached an iCalendar file with all the task details which you can import to your tasks application.";
+$labels['sendnotifications'] = 'Notificar designados sobre as modificações';
+$labels['sendcancellation'] = 'Notificar designados sobre tarefa cancelada';
+$labels['invitationsubject'] = 'Você foi designado para "$title"';
 $labels['itipupdatesubject'] = '"$title" foi atualizado';
-$labels['itipupdatesubjectempty'] = 'A task that concerns you has been updated';
-$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['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'] = 'save in ';
-$labels['itipobjectnotfound'] = 'The task referred by this message was not found in your tasks list.';
-$labels['itipmailbodyaccepted'] = "\$sender has accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
-$labels['itipmailbodytentative'] = "\$sender has tentatively accepted the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
-$labels['itipmailbodydeclined'] = "\$sender has declined the assignment to the following task:\n\n*\$title*\n\nDue: \$date\n\nAssignees: \$attendees";
-$labels['itipmailbodycancel'] = "\$sender has rejected your assignment to the following task:\n\n*\$title*\n\nDue: \$date";
-$labels['itipmailbodyin-process'] = "\$sender has set the status of the following task to in-process:\n\n*\$title*\n\nDue: \$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'] = 'Assignee has accepted';
-$labels['attendeetentative'] = 'Assignee has tentatively accepted';
-$labels['attendeedeclined'] = 'Assignee has declined';
-$labels['attendeedelegated'] = 'Assignee has delegated to $delegatedto';
-$labels['attendeein-process'] = 'Assignee is in-process';
-$labels['attendeecompleted'] = 'Assignee has completed';
-$labels['acceptinvitation'] = 'Do you accept this assignment?';
-$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'] = 'Invitation/notification comment';
-$labels['itipcommenttitle'] = 'This comment will be attached to the invitation/notification message sent to assignees';
-$labels['itipsendsuccess'] = 'Notification sent to assignees';
-$labels['errornotifying'] = 'Failed to send notifications to task assignees';
-$labels['removefromcalendar'] = 'Remove from my tasks';
-$labels['delegateinvitation'] = 'Delegate assignment';
-$labels['andnmore'] = '$nr mais...';
-$labels['delegatedto'] = 'Delegado para:';
-$labels['delegatedfrom'] = 'Delegado de:';
-$labels['savetotasklist'] = 'Save to tasks';
+$labels['itipupdatesubjectempty'] = 'Uma tarefa de sua atenção foi atualizada';
+$labels['saveintasklist'] = 'salvar em';
+$labels['taskhistory'] = 'Histórico';
+$labels['objectchangelog'] = 'Mudar Histórico';
 $labels['comment'] = 'Comentário';
-$labels['errorimportingtask'] = 'Failed to import task(s)';
-$labels['importwarningexists'] = 'A copy of this task already exists in your tasklist.';
-$labels['importsuccess'] = 'Successfully imported $nr tasks';
-$labels['newerversionexists'] = 'A newer version of this task already exists! Aborted.';
-$labels['nowritetasklistfound'] = 'No tasklist found to save the task';
-$labels['importedsuccessfully'] = 'The task was successfully added to \'$list\'';
-$labels['updatedsuccessfully'] = 'The task was successfully updated in \'$list\'';
 $labels['attendeupdateesuccess'] = 'O status do participante foi atualizado com sucesso.';
-$labels['itipresponseerror'] = 'Failed to send the response to this task assignment';
 $labels['itipinvalidrequest'] = 'Este convite não é mais válido';
-$labels['sentresponseto'] = 'Successfully sent assignment response to $mailto';
-$labels['successremoval'] = 'The task has been deleted successfully.';
-$labels['arialabelsortmenu'] = 'Tasks sorting options';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/pt_PT.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/pt_PT.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/ru_RU.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/ru_RU.inc Changed

@@ -13,6 +13,7 @@
 $labels['export'] = 'Экспорт';
 $labels['exporttitle'] = 'Экспорт в iCalendar';
 $labels['exportattachments'] = 'С вложениями';
+$labels['currentview'] = 'текущее представление';
 $labels['tasklistsubscribe'] = 'Всегда показывать';
 $labels['listsearchresults'] = 'Доступные списки задач';
 $labels['findlists'] = 'Найти списки задач...';
@@ -100,6 +101,7 @@
 $labels['errorsaving'] = 'Не удалось сохранить.';
 $labels['notasksfound'] = 'По заданному условию не найдено задач';
 $labels['invalidstartduedates'] = 'Начальная дата не может превышать конечную.';
+$labels['invalidstartduetimes'] = 'Для обоих параметров: "дата начала" и "дата окончания" должно быть указано или не указано время.';
 $labels['recurrencerequiresdate'] = 'Повторяющиеся задачи требуют даты начала или завершения.';
 $labels['deletetasktconfirm'] = 'Вы действительно хотите удалить эту задачу?';
 $labels['deleteparenttasktconfirm'] = 'Вы действительно хотите удалить эту задачу и все ее подзадачи?';
@@ -130,7 +132,6 @@
 $labels['sendnotifications'] = 'Оповестить ответственных о изменениях';
 $labels['sendcancellation'] = 'Оповестить ответственных об отмене задачи';
 $labels['invitationsubject'] = 'Вас назначили ответственным за "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nКогда: \$date\n\nОтветственные: \$attendees\n\nПожалуйста найдите вложения в iCalendar файл со всеми задачами которое Вы можете импортировать в вашу программу задач.";
 $labels['itipupdatesubject'] = '"$title" было обновлено';
 $labels['itipupdatesubjectempty'] = 'Задача, касающаяся вас, была обновлена';
 $labels['itipupdatemailbody'] = "*\$title*\n\nКогда: \$date\n\nОтветственные: \$attendees\n\nПожалуйста найдите вложения в iCalendar файл со всеми деталями задач которое Вы можете импортировать в вашу программу задач.";
@@ -171,8 +172,6 @@
 $labels['removefromcalendar'] = 'Удалить из моих задач';
 $labels['delegateinvitation'] = 'Назначение представителей';
 $labels['andnmore'] = '$nr больше...';
-$labels['delegatedto'] = 'Поручено:';
-$labels['delegatedfrom'] = 'Поручено от:';
 $labels['savetotasklist'] = 'Сохранить в задачи';
 $labels['comment'] = 'Комментарий';
 $labels['errorimportingtask'] = 'Не удалось импортировать задачи';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/sl_SI.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/sl_SI.inc Changed

@@ -125,7 +125,6 @@
 $labels['sendnotifications'] = 'Pošlji dodanim osebam obvestila o spremembah';
 $labels['sendcancellation'] = 'Pošlji dodanim osebam obvestila o preklicu naloge';
 $labels['invitationsubject'] = 'Dodani ste bili nalogi "$title"';
-$labels['invitationmailbody'] = "*\$title*\n\nPoteče: \$date\n\nAssignees: \$attendees\n\nProsim preglejte iCalendar datoteko v priponki z vsemi podrobnostmi naloge. Datoteko lahko uvozite v vašo aplikacijo.";
 $labels['itipupdatesubject'] = '"$title" je bil posodobljen';
 $labels['itipupdatesubjectempty'] = 'Zadevna naloga je bila posodobljena';
 $labels['itipupdatemailbody'] = "*\$title*\n\nPoteče: \$date\n\nAssignees: \$attendees\n\nProsim preglejte iCalendar datoteko v priponki z vsemi podrobnostmi glede naloge. Datoteko lahko uvozite v vašo aplikacijo.";
@@ -159,8 +158,6 @@
 $labels['removefromcalendar'] = 'Odstrani iz seznama';
 $labels['delegateinvitation'] = 'Prenesi nalogo';
 $labels['andnmore'] = '$nr več...';
-$labels['delegatedto'] = 'Preneseno na:';
-$labels['delegatedfrom'] = 'Preneseno od:';
 $labels['savetotasklist'] = 'Shrani kot nalogo';
 $labels['comment'] = 'Komentar';
 $labels['errorimportingtask'] = 'Napaka pri uvozu nalog(e)';

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/sv_SE.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/sv_SE.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/th_TH.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/th_TH.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/uk_UA.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/uk_UA.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/vi_VN.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/vi_VN.inc Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/localization/zh_TW.inc -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/localization/zh_TW.inc Changed

iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/elastic Added

iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/elastic/templates Added

iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/elastic/templates/dialog.html Added

iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/elastic/templates/mainview.html Added

@@ -0,0 +1,331 @@
+<roundcube:include file="includes/layout.html" />
+<roundcube:include file="includes/menu.html" />
+
+<h1 class="voice"><roundcube:label name="tasklist.navtitle" /></h1>
+
+
+<div class="sidebar 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>
+		<roundcube:button name="tasklistactionsmenu" id="tasklistoptionsmenulink" type="link"
+			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"
+		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" />
+	</div>
+</div>
+
+
+<div class="list 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 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">
+			<a href="#threads" class="button threads" 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"
+				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"
+		label="tasksearchform" label-domain="tasklist" buttontitle="tasklist.findtasks" ariatag="h2" />
+	<div class="pagenav pagenav-list toolbar" 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>
+	<div id="taskselector-content" class="navlist scroller" aria-labelledby="aria-label-taskselector">
+		<h2 class="voice" id="aria-label-taskselector"><roundcube:label name="tasklist.arialabeltaskselector" /></h2>
+		<ul id="taskselector" class="listing" role="listbox" aria-controls="tasklist">
+			<li class="all selected" role="radio" aria-checked="true" aria-labelledby="aria-radio-all"><a href="#all" id="aria-radio-all"><roundcube:label name="tasklist.all" /></a></li>
+			<li class="overdue inactive" role="radio" aria-checked="false" aria-labelledby="aria-radio-overdue"><a href="#overdue" id="aria-radio-overdue"><roundcube:label name="tasklist.overdue" /><span class="count"></span></a></li>
+			<li class="today" role="radio" aria-checked="false" aria-labelledby="aria-radio-today"><a href="#today" id="aria-radio-today"><roundcube:label name="tasklist.today" /><span class="count"></span></a></li>
+			<li class="tomorrow" role="radio" aria-checked="false" aria-labelledby="aria-radio-tomorrow"><a href="#tomorrow" id="aria-radio-tomorrow"><roundcube:label name="tasklist.tomorrow" /><span class="count"></span></a></li>
+			<roundcube:if condition="env:tasklist_driver != 'kolab'" />
+			<li class="week" role="radio" aria-checked="false" aria-labelledby="aria-radio-week"><a href="#week" id="aria-radio-week"><roundcube:label name="tasklist.next7days" /></a></li>
+			<roundcube:endif />
+			<li class="later" role="radio" aria-checked="false" aria-labelledby="aria-radio-later"><a href="#later" id="aria-radio-later"><roundcube:label name="tasklist.later" /><span class="count"></span></a></li>
+			<li class="nodate" role="radio" aria-checked="false" aria-labelledby="aria-radio-nodate"><a href="#nodate" id="aria-radio-nodate"><roundcube:label name="tasklist.nodate" ucfirst="true" /></a></li>
+			<li class="flagged" role="radio" aria-checked="false" aria-labelledby="aria-radio-flagged"><a href="#flagged" id="aria-radio-flagged"><roundcube:label name="tasklist.flagged" /></a></li>
+			<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+			<li class="mytasks" role="radio" aria-checked="false" aria-labelledby="aria-radio-mytasks"><a href="#mytasks" id="aria-radio-mytasks" title="<roundcube:label name='tasklist.mytaskstitle'/>"><roundcube:label name="tasklist.mytasks" /></a></li>
+			<li class="assigned" role="radio" aria-checked="false" aria-labelledby="aria-radio-assigned"><a href="#assigned" id="aria-radio-assigned" title="<roundcube:label name='tasklist.assignedtitle'/>"><roundcube:label name="tasklist.assigned" /></a></li>
+			<roundcube:endif />
+			<li class="complete" role="radio" aria-checked="false" aria-labelledby="aria-radio-complete"><a href="#complete" id="aria-radio-complete"><roundcube:label name="tasklist.complete" /><span class="count"></span></a></li>
+		</ul>
+	</div>
+	<div class="scroller">
+		<h2 id="aria-label-taskslist" class="voice"><roundcube:label name="tasklist.navtitle" /></h2>
+		<roundcube:object name="plugin.tasks" id="tasklist" role="tree"
+			class="listing" role="listbox" data-list="tasklist"
+			data-label-msg="listempty" data-label-ext="listusebutton" data-create-command="newtask" />
+	</div>
+</div>
+
+
+<div class="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">
+			<roundcube:button command="newtask" type="link"
+				class="button create disabled" classAct="button 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"
+				label="print" title="tasklist.printtitle" innerClass="inner" />
+			<roundcube:button command="delete-task" type="link"
+				label="delete" title="tasklist.removetask"
+				class="button delete disabled" classAct="button delete" innerclass="inner" />
+			<span class="spacer"></span>
+			<roundcube:button command="import" type="link"
+				class="button import disabled" classAct="button import"
+				label="import" title="tasklist.importtasks" innerClass="inner" />
+			<roundcube:button command="export" type="link"
+				class="button export disabled" classAct="button export"
+				label="tasklist.export" title="tasklist.exporttitle" innerClass="inner" />
+			<roundcube:container name="toolbar" id="taskstoolbar" />
+		</div>
+	</div>
+	
+	<h2 id="aria-label-taskform" class="voice"><roundcube:label name="tasklist.arialabeltaskform" /></h2>
+	<div class="content scroller watermark" role="main" aria-labelledby="aria-label-taskform">
+		<roundcube:include file="/templates/taskedit.html" />
+		<div id="taskshow" class="hidden formcontent propform text-only" data-nodialog="true">
+			<div id="event-status-badge"><span></span></div>
+			<div id="task-parent-title" class="task-parent-title"></div>
+			<h2 id="task-title" class="task-title"></h2>
+			<div id="task-description" class="task-description"></div>
+			<div id="task-attendees" class="form-group row task-attendees">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.assignedto" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-tags" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.tags" /></label>
+				<span class="task-text tagedit col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-start" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.start" /></label>
+				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-starttime"></span></span>
+			</div>
+			<div id="task-date" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.datetime" /></label>
+				<span class="col-sm-8 form-control-plaintext"><span class="task-text"></span> <span id="task-time"></span></span>
+			</div>
+			<div id="task-recurrence" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.repeat" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-alarm" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.alarms" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-organizer" class="form-group row task-attendees">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.roleorganizer" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-list" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.list" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-completeness" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.complete" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-status" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.status" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-links" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.links" /></label>
+				<span class="task-text col-sm-8"></span>
+			</div>
+			<div id="task-attachments" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="attachments" /></label>
+				<div class="task-text col-sm-8"></div>
+			</div>
+			<div id="task-created" class="form-group row faded">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.created" /></label>
+				<span class="task-text task-created col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-changed" class="form-group row faded">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.changed" /></label>
+				<span class="task-text task-changed col-sm-8 form-control-plaintext"></span>
+			</div>
+			<div id="task-rsvp-comment" class="form-group row">
+				<label class="col-sm-4 col-form-label"><roundcube:label name="tasklist.rsvpcomment" /></label>
+				<span class="task-text col-sm-8 form-control-plaintext"></span>
+			</div>
+			<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="tasklist-invitebox invitebox boxinformation" style="display:none" />
+		</div>
+		<div class="formbuttons">
+			<roundcube:button command="save-task" label="save"
+				class="btn btn-primary submit disabled" classAct="btn btn-primary submit" innerCLass="inner" />
+			<roundcube:button command="edit-task" label="edit"
+				class="btn btn-primary edit disabled" classAct="btn btn-primary edit" innerclass="inner" />
+			<roundcube:button command="add-child-task" label="tasklist.addsubtask"
+				class="create btn btn-secondary disabled" classAct="create btn btn-secondary" innerclass="inner" />
+			<roundcube:if condition="config:kolab_bonnie_api" />
+				<roundcube:button command="task-history" type="link" label="libkolab.showhistory"
+					class="btn btn-secondary history task-history disabled" classAct="btn btn-secondary history task-history" />
+			<roundcube:endif />
+		</div>
+	</div>
+</div>
+
+<roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" />
+<div id="taskhistory" class="popupmenu" aria-hidden="true">
+	<roundcube:object name="plugin.object_changelog_table" class="changelog-table" />
+	<div class="compare-button"><input type="button" class="button" value="↳ <roundcube:label name='libkolab.compare' />" /></div>
+</div>
+
+<div id="taskdiff" class="popupmenu" aria-hidden="true">
+	<div class="form-group row task-parent-title">
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span> &raquo;
+	</div>
+	<h2 class="task-title">Task Title</h2>
+	<h2 class="task-title-new task-text-new"></h2>
+	<div class="form-group row task-description">
+		<label><roundcube:label name="calendar.description" /></label>
+		<div class="task-text-diff" style="white-space:pre-wrap"></div>
+		<div class="task-text-old"></div>
+		<div class="task-text-new"></div>
+	</div>
+	<div class="form-group row task-flagged">
+		<label><roundcube:label name="tasklist.flagged" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-start">
+		<label><roundcube:label name="tasklist.start" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-date">
+		<label><roundcube:label name="tasklist.datetime" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-recurrence">
+		<label><roundcube:label name="tasklist.repeat" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-alarms">
+		<label><roundcube:label name="tasklist.alarms" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-attendees">
+		<label><roundcube:label name="tasklist.assignedto" /><span class="index"></span></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-complete">
+		<label><roundcube:label name="tasklist.complete" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-status">
+		<label><roundcube:label name="tasklist.status" /></label>
+		<span class="task-text-old"></span> &#8674;
+		<span class="task-text-new"></span>
+	</div>
+	<div class="form-group row task-links">
+		<label><roundcube:label name="tasklist.links" /><span class="index"></span></label>
+		<span class="task-text"></span>
+	</div>
+	<div class="form-group row task-attachments">
+		<label><roundcube:label name="attachments" /><span class="index"></span></label>
+		<div class="task-text-old"></div>
+		<div class="task-text-new"></div>
+	</div>
+</div>
+<roundcube:endif />
+
+<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">
+		<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="edit" class="edit disabled" classAct="edit active" />
+		<roundcube:button type="link-menuitem" command="list-delete" label="delete" class="delete disabled" classAct="delete active" />
+		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="list-remove" label="tasklist.removelist" class="remove disabled" classAct="remove active" />
+		<roundcube:endif />
+		<roundcube:if condition="config:calendar_caldav_url" />
+			<roundcube:button type="link-menuitem" command="list-showurl" label="tasklist.showcaldavurl" class="showurl disabled" classAct="showurl active" />
+		<roundcube:endif />
+		<roundcube:if condition="env:tasklist_driver == 'kolab'" />
+			<roundcube:button type="link-menuitem" command="folders" task="settings" label="managefolders" class="folders disabled" classAct="folders active" />
+		<roundcube:endif />
+	</ul>
+</div>
+
+<div id="listoptions-menu" class="popupmenu propform">
+	<h3 id="aria-label-taskviewsortmenu" class="voice"><roundcube:label name="tasklist.arialabelsortmenu" /></h3>
+	<div class="form-group row">
+		<label for="options-sortcol" class="col-form-label col-sm-4"><roundcube:label name="listsorting" /></label>
+		<div class="col-sm-8">
+			<select id="options-sortcol" class="form-control">
+				<option value="auto"><roundcube:label name="tasklist.auto" /></option>
+				<option value="datetime"><roundcube:label name="tasklist.datetime" /></option>
+				<option value="startdatetime"><roundcube:label name="tasklist.start" /></option>
+				<option value="flagged"><roundcube:label name="tasklist.flagged" /></option>
+				<option value="complete"><roundcube:label name="tasklist.completeness" /></option>
+				<option value="changed"><roundcube:label name="tasklist.changed" /></option>
+			</select>
+		</div>
+	</div>
+	<div class="form-group row">
+		<label for="options-ord" class="col-form-label col-sm-4"><roundcube:label name="listorder" /></label>
+		<div class="col-sm-8">
+			<select id="options-ord" class="form-control">
+				<option value="asc"><roundcube:label name="sortasc" /></option>
+				<option value="desc"><roundcube:label name="sortdesc" /></option>
+			</select>
+		</div>
+	</div>
+	<roundcube:add_label name="listoptionstitle" />
+</div>
+
+<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>
+</div>
+
+<div id="tasklistform" class="popupmenu formcontent">
+	<roundcube:label name="loading" />
+	<roundcube:container name="tasklistform" id="tasklistform" />
+</div>
+
+<div id="tasksimport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.tasks_import_form" id="tasks-import-form" />
+</div>
+
+<div id="tasksexport" class="popupmenu formcontent">
+	<roundcube:object name="plugin.tasks_export_form" id="tasks-export-form" />
+</div>
+
+<script>
+rcmail.addEventListener('tasks-insertrow', function(o) {
+    UI.pretty_checkbox($(o.div).find('input'));
+});
+
+$('#taskselector a').on('click', function() {
+    var node = $(this).clone();
+    node.find('span').remove();
+    $('#taskselector-name').text(node.text());
+});
+</script>
+
+<roundcube:include file="includes/footer.html" />

iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/elastic/templates/print.html Added

iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/elastic/templates/taskedit.html Added

@@ -0,0 +1,127 @@
+<div id="taskedit" class="<roundcube:exp expression="env:framed ? '' : 'hidden '">formcontent" data-nodialog="true" data-notabs="true">
+	<form id="taskeditform" class="tabbed" action="#" method="post" enctype="multipart/form-data">
+		
+		<fieldset id="taskedit-panel-main">
+			<legend><roundcube:label name="tasklist.tabsummary" /></legend>
+			<div class="form-group">
+				<label for="taskedit-title"><roundcube:label name="tasklist.title" /></label>
+				<input type="text" class="form-control" name="title" id="taskedit-title" size="60" />
+			</div>
+			<div class="form-group">
+				<label for="taskedit-description"><roundcube:label name="tasklist.description" /></label>
+				<textarea name="description" id="taskedit-description" class="form-control" rows="5" cols="60"></textarea>
+			</div>
+			<div class="form-group">
+				<label for="tagedit-input"><roundcube:label name="tasklist.tags" /></label>
+				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit" tabindex="0" />
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-startdate" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.start" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="startdate" size="10" id="taskedit-startdate" class="form-control datepicker" /> &nbsp;
+					<input type="text" name="starttime" size="6" id="taskedit-starttime" class="form-control" aria-label="<roundcube:label name='tasklist.starttime' />" />
+					<a href="#nodate" class="edit-nodate" rel="#taskedit-startdate,#taskedit-starttime"><roundcube:label name="tasklist.nodate" /></a>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-date" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.datetime" /></label>
+				<div class="col-sm-10 datetime">
+					<input type="text" name="date" size="10" id="taskedit-date" class="form-control datepicker" /> &nbsp;
+					<input type="text" name="time" size="6" id="taskedit-time" class="form-control" aria-label="<roundcube:label name='tasklist.duetime' />" />
+					<a href="#nodate" class="edit-nodate" rel="#taskedit-date,#taskedit-time"><roundcube:label name="tasklist.nodate" /></a>
+				</div>
+			</div>
+			<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">
+						<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>
+					</div>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-completeness" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.complete" /></label>
+				<div class="col-sm-10 input-percent-slider">
+					<input type="text" name="title" id="taskedit-completeness" size="3" autocomplete="off" class="form-control" />
+					<span class="label">%</span><div id="taskedit-completeness-slider"></div>
+				</div>
+			</div>
+			<div class="form-group row">
+				<label for="taskedit-status" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.status" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.status_select" id="taskedit-status" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row" id="tasklist-select">
+				<label for="taskedit-tasklist" class="col-sm-2 col-form-label"><roundcube:label name="tasklist.list" /></label>
+				<div class="col-sm-10">
+					<roundcube:object name="plugin.tasklist_select" id="taskedit-tasklist" class="form-control" />
+				</div>
+			</div>
+			<div class="form-group row" id="taskedit-links">
+				<label class="col-sm-2 col-form-label"><roundcube:label name="tasklist.links" /></label>
+				<div class="col-sm-10">
+					<div class="task-text"></div>
+				</div>
+			</div>
+		</fieldset>
+		
+		<fieldset id="taskedit-panel-recurrence">
+			<legend><roundcube:label name="tasklist.tabrecurrence" /></legend>
+			<div class="form-group row">
+				<roundcube:object name="plugin.recurrence_form" part="frequency" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-daily">
+				<roundcube:object name="plugin.recurrence_form" part="daily" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-weekly">
+				<roundcube:object name="plugin.recurrence_form" part="weekly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-monthly">
+				<roundcube:object name="plugin.recurrence_form" part="monthly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-yearly">
+				<roundcube:object name="plugin.recurrence_form" part="yearly" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-until">
+				<roundcube:object name="plugin.recurrence_form" part="until" class="form-group row" />
+			</div>
+			<div class="recurrence-form" id="recurrence-form-rdate">
+				<roundcube:object name="plugin.recurrence_form" part="rdate" class="form-group row" />
+			</div>
+		</fieldset>
+		
+		<fieldset id="taskedit-panel-attendees" data-navlink-class="nav-icon attendees">
+			<legend><roundcube:label name="tasklist.tabassignments" /></legend>
+			<div class="form-group row" id="taskedit-organizer">
+				<label for="edit-identities-list" class="col-form-label col-sm-2"><roundcube:label name="tasklist.roleorganizer" /></label>
+				<roundcube:object name="plugin.identity_select" id="edit-identities-list" class="col-sm-10 form-control" />
+			</div>
+			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="tasklist.arialabeleventassignments" /></h3>
+			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="edit-attendees-table no-img table table-sm"
+				coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
+			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
+		</fieldset>
+		
+		<fieldset id="taskedit-panel-attachments" data-navlink-class="nav-icon attachments">
+			<legend><roundcube:label name="tasklist.tabattachments" /></legend>
+			<div id="taskedit-attachments-droparea" class="file-upload">
+				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
+				<div id="taskedit-attachments-form" class="upload-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+					<roundcube:object name="plugin.attachments_form" mode="hint" />
+					<button class="btn btn-secondary attach" href="#" onclick="rcmail.upload_input('taskedit-attachment-form'); return false"><roundcube:label name="addattachment" /></button>
+				</div>
+				<div id="taskedit-attachments">
+					<roundcube:object name="plugin.attachments_list" id="taskedit-attachment-list" class="attachmentslist" />
+				</div>
+			</div>
+			<roundcube:object name="plugin.filedroparea" id="taskedit-attachments-droparea" />
+		</fieldset>
+	</form>
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" />
+</div>

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/images/buttons.png -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/larry/images/buttons.png Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/images/sendinvitation.png -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/larry/images/sendinvitation.png Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/images/sprites.png -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/larry/images/sprites.png Changed

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/tasklist.css -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/larry/tasklist.css Changed

@@ -64,17 +64,9 @@
 	width: 15px;
 }
 
-#tagsbox {
-	position: absolute;
-	top: 42px;
-	left: 0;
-	width: 100%;
-	height: 242px;
-}
-
 #tasklistsbox {
 	position: absolute;
-	top: 300px;
+	top: 42px;
 	left: 0;
 	width: 100%;
 	bottom: 0px;
@@ -105,7 +97,6 @@
 	top: 68px;
 }
 
-
 #taskselector {
 	margin: -1px 40px 0 0;
 	padding: 0;
@@ -118,7 +109,6 @@
 	padding-right: 0.3em;
 }
 
-.tagcloud li,
 #taskselector li a {
 	display: inline-block;
 	color: #004458;
@@ -130,12 +120,10 @@
 	border-color: transparent;
 }
 
-.webkit .tagcloud li,
 .webkit #taskselector li a {
 	padding-bottom: 0.25em;
 }
 
-
 #taskselector li:first-child {
 	border-top: 0;
 	border-radius: 4px 4px 0 0;
@@ -155,20 +143,9 @@
 	color: #97b3bf;
 }
 
-.tagcloud li.selected,
 #taskselector li.selected a {
 	color: #fff;
 	background: #005d76;
-	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
-	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: linear-gradient(top, #005d76 0%, #004558 100%);
-	box-shadow: inset 0 1px 1px 0 #003645;
-	-o-box-shadow: inset 0 1px 1px 0 #003645;
-	-webkit-box-shadow: inset 0 1px 1px 0 #003645;
-	-moz-box-shadow: inset 0 1px 1px 0 #003645;
-	border-color: #003645;
 	border-radius: 10px;
 	text-shadow: none;
 }
@@ -181,12 +158,6 @@
 	min-width: 1.8em;
 	padding: 2px 4px;
 	background: #004558;
-	background: -moz-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#005d76), color-stop(100%,#004558));
-	background: -o-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: -ms-linear-gradient(top, #005d76 0%, #004558 100%);
-	background: linear-gradient(top, #005d76 0%, #004558 100%);
-	box-shadow: 0 1px 2px 0 rgba(24,24,24,0.6);
 	color: #fff;
 	border-radius: 3px;
 	text-align: center;
@@ -217,51 +188,6 @@
 	border-color: #ff3800 transparent;
 }
 
-.tagcloud {
-	padding: 0;
-	margin: 6px;
-	list-style: none;
-}
-
-.tagcloud li {
-	display: inline-block;
-	color: #004458;
-	padding-right: 0.2em;
-	margin-right: 0.3em;
-	margin-bottom: 0.4em;
-	min-width: 1.2em;
-	cursor: pointer;
-}
-
-.tagcloud li.inactive {
-	color: #89b3be;
-	padding-right: 0.6em;
-	font-size: 80%;
-/*	display: none; */
-}
-
-.tagcloud li .count {
-	position: relative;
-	top: -1px;
-	margin-left: 5px;
-	padding: 0.15em 0.5em;
-	font-size: 80%;
-	font-weight: bold;
-	color: #59838e;
-	background: #c7e3ef;
-	box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	-o-box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	-webkit-box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	-moz-box-shadow: inset 0 1px 1px 0 #b0ccd7;
-	border-color: #b0ccd7;
-	border-radius: 8px;
-}
-
-.tag-draghelper .tag .count,
-.tagcloud li.inactive .count {
-	display: none;
-}
-
 #tasklistsbox .treelist li {
 	margin: 0;
 	display: block;
@@ -296,7 +222,7 @@
 	display: block;
 }
 
-#tasklistsbox .treelist li span.listname {
+#tasklistsbox .treelist li a.listname {
 	display: block;
 	position: absolute;
 	top: 7px;
@@ -312,11 +238,11 @@
 }
 
 .quickview-active #tasklistsbox .treelist li input,
-.quickview-active #tasklistsbox .treelist li span.listname {
+.quickview-active #tasklistsbox .treelist li a.listname {
 	opacity: 0.35;
 }
 
-.quickview-active #tasklistsbox .treelist div.focusview span.listname {
+.quickview-active #tasklistsbox .treelist div.focusview a.listname {
 	opacity: 1.0;
 }
 
@@ -334,15 +260,9 @@
 #tasklistsbox .treelist div:hover span.actions {
 	top: 1px;
 	right: 1px;
-	border: 1px solid #c6c6c6;
+	border: 1px solid #ababab;
 	border-radius: 4px;
-	background: #f7f7f7;
-	background: -moz-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f9f9f9), color-stop(100%,#e6e6e6));
-	background: -o-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: -ms-linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	background: linear-gradient(top, #f9f9f9 0%, #e6e6e6 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#e6e6e6', GradientType=0);
+	background: #f1f1f1;
 }
 
 #tasklistsbox .treelist div a.remove,
@@ -403,19 +323,19 @@
 	outline: 2px solid rgba(30,150,192, 0.5);
 }
 
-#tasklistsbox .treelist li.selected > div > span.listname {
+#tasklistsbox .treelist li.selected > div > a.listname {
 	font-weight: bold;
 }
 
-#tasklistsbox .treelist .readonly > span.listname {
+#tasklistsbox .treelist .readonly > a.listname {
 	background-position: right -142px;
 }
 
-#tasklistsbox .treelist .user > span.listname {
+#tasklistsbox .treelist .user > a.listname {
 	background-position: right -160px;
 }
 
-#tasklistsbox .treelist .virtual > span.listname {
+#tasklistsbox .treelist .virtual > a.listname {
 	color: #aaa;
 	top: 4px;
 	left: 20px;
@@ -499,7 +419,7 @@
 
 #quickaddbox .button {
 	margin-left: 5px;
-	padding: 3px 10px;
+	padding: 4px 10px;
 	font-weight: bold;
 }
 
@@ -509,7 +429,7 @@
 	left: 0;
 	right: 0;
 	bottom: 0;
-	background: rgba(255, 255, 255, 0.2);
+	background: rgba(255, 255, 255, 0.25);
 	overflow: visible;
 }
 
@@ -534,12 +454,7 @@
 
 #tasksview .buttonbar {
 	color: #777;
-	background: #eee;
-	background: -moz-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#eee), color-stop(100%,#dfdfdf));
-	background: -o-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-	background: -ms-linear-gradient(top, #eee 0%, #dfdfdf 100%);
-	background: linear-gradient(top, #eee 0%, #dfdfdf 100%);
+	background: #eaeaea;
 	border-bottom: 1px solid #ccc;
 	position: relative;
 	line-height: 13px;
@@ -578,7 +493,6 @@
 	font-size: 14px;
 	color: #666;
 	margin: 1.5em;
-	text-shadow: 0px 1px 1px #fff;
 	text-align:center;
 }
 
@@ -627,9 +541,9 @@
 	border: 1px solid #fff;
 	border-radius: 5px;
 	background: #fff;
-	-webkit-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
-	-moz-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
-	box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.5);
+	-webkit-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.4);
+	-moz-box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.4);
+	box-shadow: 0 1px 1px 0 rgba(50, 50, 50, 0.4);
 	padding-right: 26em;
 	white-space: nowrap;
 	overflow: hidden;
@@ -688,7 +602,6 @@
 	text-align: right;
 }
 
-.tag-draghelper .tag,
 .taskhead .tags .tag {
 	font-size: 85%;
 	background: #d9ecf4;
@@ -698,11 +611,6 @@
 	margin-right: 3px;
 }
 
-.tag-draghelper li.tag {
-	list-style: none;
-	font-size: 100%;
-}
-
 .taskhead .date {
 	position: absolute;
 	top: 4px;
@@ -816,10 +724,6 @@
 }
 
 .taskitem-draghelper {
-/*
-	width: 32px;
-	height: 26px;
-*/
 	background: #444;
 	border: 1px solid #555;
 	border-radius: 4px;
@@ -864,6 +768,18 @@
 	display: none;
 }
 
+body.taskdialog {
+	margin: 0;
+	overflow-y: auto;
+}
+
+body.taskdialog #taskedit {
+	display: block;
+	top: 0;
+	padding: 1em;
+	border: 0;
+}
+
 #taskedit {
 	position: relative;
 	top: -1.5em;
@@ -896,10 +812,6 @@
 	color: #999;
 }
 
-.taskshow.status-cancelled {
-	background: url(images/badge_cancelled.png) top right no-repeat;
-}
-
 .task-parent-title {
 	position: relative;
 	top: -0.6em;
@@ -1047,14 +959,14 @@
 	display: block;
 	color: #333;
 	font-weight: bold;
-	padding: 3px 4px 3px 30px;
+	padding: 2px 4px 2px 30px;
 	text-shadow: 0px 1px 1px #fff;
 	text-decoration: none;
 	white-space: nowrap;
 	line-height: 20px;
 }
 
-#taskedit-attachments ul li a.file {
+#taskedit-attachments ul li a.filename {
 	padding: 0;
 }
 
@@ -1194,10 +1106,13 @@
 }
 
 #taskedit-links .task-text {
-	margin-left: 8em;
 	min-height: 22px;
 }
 
+#taskedit-links .attachmentslist li {
+	padding-right: 2em;
+}
+
 #taskedit-links .attachmentslist li a.delete {
 	top: 0;
 	background-position: -6px -378px;
@@ -1271,18 +1186,18 @@
 	min-height: 290px;
 }
 
-.tasklistview .uidialog .propform #taskedit-tasklistame {
+.tasklistview .uidialog .propform #taskedit-tasklistname {
 	width: 20em;
 }
 
-.task-dialog-message {
+.dialog-message {
 	margin-top: 0.5em;
 	padding: 0.8em;
 	border: 1px solid #ffdf0e;
 	background-color: #fef893;
 }
 
-.task-dialog-message .message,
+.dialog-message .message,
 .task-update-confirm .message {
 	margin-bottom: 0.5em;
 }
@@ -1462,62 +1377,19 @@
 	vertical-align: middle;
 }
 
-
-.tasklist.attachmentwin #attachmenttoolbar {
-	position: relative;
-	top: -6px;
-	height: 40px;
-}
-
-.tasklist.attachmentwin #attachmentcontainer {
-	position: absolute;
-	top: 0;
-	left: 232px;
-	right: 0;
-	bottom: 0;
-}
-
-.tasklist.attachmentwin #attachmentframe {
-	width: 100%;
-	height: 100%;
-	border: 0;
-	background-color: #fff;
-	border-radius: 4px;
-}
-
-.tasklist.attachmentwin #partheader {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 220px;
-	bottom: 0;
-}
-
-.tasklist.attachmentwin #partheader table {
-	table-layout: fixed;
-	overflow: hidden;
-}
-
-.tasklist.attachmentwin #partheader table td {
-	color: #666;
-	padding: 4px 6px;
-	text-overflow: ellipsis;
-	overflow: hidden;
+.form-section label + div {
+	line-height: 2;
+	vertical-align: top;
 }
 
-.tasklist.attachmentwin #partheader table td.header {
-	font-weight: bold;
+.form-section label + div {
+	display: inline-block;
 }
 
-.tasklist.attachmentwin #partheader table td.title {
-	width: 60px;
-	padding-right: 0;
+.col-form-label {
+	line-height: 2;
 }
 
-
-/** Special hacks for IE7 **/
-/** They need to be in this file to also affect the task-create dialog embedded in mail view **/
-
-html.ie7 #taskedit-completeness-slider {
-	display: inline;
+.col-sm-4 {
+	min-width: 8em !important;
 }

iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/larry/templates/dialog.html Added

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/templates/mainview.html -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/larry/templates/mainview.html Changed

@@ -17,17 +17,11 @@
 		<div id="taskstoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
 			<roundcube:button command="newtask" type="link" class="button newtask disabled" classAct="button newtask" classSel="button newtask pressed" label="tasklist.newtask" title="tasklist.newtask" />
 			<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="tasklist.printtitle" />
+			<roundcube:button command="import" type="link" class="button import disabled" classAct="button import" classSel="button import pressed" label="import" title="tasklist.importtasks" />
 			<roundcube:button command="export" type="link" class="button export disabled" classAct="button export" classSel="button export pressed" label="tasklist.export" title="tasklist.exporttitle" />
 			<roundcube:container name="toolbar" id="taskstoolbar" />
 		</div>
 
-		<div id="tagsbox" class="uibox listbox">
-			<h2 class="boxtitle" id="aria-label-tagsbox"><roundcube:label name="tasklist.tags" id="taglist" /></h2>
-			<div class="scroller">
-				<roundcube:object name="plugin.tagslist" id="tagslist" class="tagcloud" role="region" aria-labelledby="aria-label-tagsbox" aria-controls="thelist" />
-			</div>
-		</div>
-
 		<div id="tasklistsbox" class="uibox listbox" role="navigation" aria-labelledby="aria-label-tasklists">
 			<h2 class="boxtitle" id="aria-label-tasklists"><roundcube:label name="tasklist.lists" />
 				<a href="#tasklists" class="iconbutton search" title="<roundcube:label name='tasklist.findlists' />" tabindex="0"><roundcube:label name="tasklist.findlists" /></a>
@@ -38,31 +32,31 @@
 					<label for="tasklistsearch" class="voice"><roundcube:label name="tasklist.searchterms" /></label>
 					<input type="text" name="q" id="tasklistsearch" placeholder="<roundcube:label name='tasklist.findlists' />" />
 					<a class="iconbutton searchicon"></a>
-					<roundcube:button command="reset-listsearch" id="tasklistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+					<roundcube:button type="link" command="reset-listsearch" id="tasklistsearch-reset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 				</div>
 			</div>
 			<div class="scroller withfooter">
 			<roundcube:object name="plugin.tasklists" id="tasklists" class="treelist listing" />
 			</div>
 			<div class="boxfooter">
-				<roundcube:button command="list-create" type="link" title="tasklist.createlist" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="tasklist.createlist" /><roundcube:button name="tasklistoptionslink" id="tasklistoptionsmenulink" type="link" title="tasklist.listactions" class="listbutton groupactions" onclick="return UI.toggle_popup('tasklistoptionsmenu', event, { above:true })" innerClass="inner" label="tasklist.listactions" aria-haspopup="true" aria-expanded="false" aria-owns="tasklistoptionsmenu-menu" />
+				<roundcube:button type="link" command="list-create" type="link" title="tasklist.createlist" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" label="tasklist.createlist" /><roundcube:button name="tasklistoptionslink" id="tasklistoptionsmenulink" type="link" title="tasklist.listactions" class="listbutton groupactions" onclick="return UI.toggle_popup('tasklistoptionsmenu', event, { above:true })" innerClass="inner" label="tasklist.listactions" aria-haspopup="true" aria-expanded="false" aria-owns="tasklistoptionsmenu-menu" />
 			</div>
 		</div>
 
 		<div id="tasklistoptionsmenu" class="popupmenu" aria-hidden="true">
 			<h3 id="aria-label-tasklistoptions" class="voice"><roundcube:label name="tasklist.listactions" /></h3>
 			<ul class="toolbarmenu" id="tasklistoptionsmenu-menu" role="menu" aria-labelledby="aria-label-tasklistoptions">
-				<li role="menuitem"><roundcube:button command="list-edit" label="edit" classAct="active" /></li>
-				<li role="menuitem"><roundcube:button command="list-delete" label="delete" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-edit" label="edit" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-delete" label="delete" classAct="active" /></li>
 				
 				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
-				<li role="menuitem"><roundcube:button command="list-remove" label="tasklist.removelist" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-remove" label="tasklist.removelist" classAct="active" /></li>
 				<roundcube:endif />
 				<roundcube:if condition="config:calendar_caldav_url" />
-				<li role="menuitem"><roundcube:button command="list-showurl" label="tasklist.showcaldavurl" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="list-showurl" label="tasklist.showcaldavurl" classAct="active" /></li>
 				<roundcube:endif />
 				<roundcube:if condition="env:tasklist_driver == 'kolab'" />
-				<li role="menuitem"><roundcube:button command="folders" task="settings" type="link" label="managefolders" classAct="active" /></li>
+				<li role="menuitem"><roundcube:button type="link" command="folders" task="settings" label="managefolders" classAct="active" /></li>
 				<roundcube:endif />
 			</ul>
 		</div>
@@ -80,7 +74,7 @@
 		<label for="quicksearchbox" class="voice"><roundcube:label name="tasklist.arialabelquicksearchbox" /></label>
 		<roundcube:object name="plugin.searchform" id="quicksearchbox" />
 		<a id="searchmenulink" class="iconbutton searchoptions" > </a>
-		<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
+		<roundcube:button type="link" command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" label="resetsearch" />
 	</div>
 
 	<div id="tasksview" class="uibox">
@@ -130,8 +124,8 @@
 			<div id="taskviewactions" class="popupmenu" aria-hidden="true" data-align="right">
 				<h3 id="aria-label-taskviewactions" class="voice"><roundcube:label name="tasklist.viewactions" /></h3>
 				<ul class="toolbarmenu" id="taskviewactions-menu" role="menu" aria-labelledby="aria-label-taskviewactions">
-					<li role="menuitem"><roundcube:button command="expand-all" label="expand-all" class="icon" classAct="icon active" innerclass="icon expand" /></li>
-					<li role="menuitem"><roundcube:button command="collapse-all" label="collapse-all" class="icon" classAct="icon active" innerclass="icon collapse" /></li>
+					<li role="menuitem"><roundcube:button type="link" command="expand-all" label="expand-all" class="icon" classAct="icon active" innerclass="icon expand" /></li>
+					<li role="menuitem"><roundcube:button type="link" command="collapse-all" label="collapse-all" class="icon" classAct="icon active" innerclass="icon collapse" /></li>
 				</ul>
 			</div>
 		</div>
@@ -165,6 +159,7 @@
 
 <div id="taskshow" class="taskshow">
 	<div id="task-parent-title" class="form-section task-parent-title"></div>
+	<div id="event-status-badge"><span></span></div>
 	<div class="form-section">
 		<h2 id="task-title"></h2>
 	</div>
@@ -240,7 +235,7 @@
 		<span class="task-text"></span>
 	</div>
 
-	<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="task-dialog-message" style="display:none" />
+	<roundcube:object name="plugin.task_rsvp_buttons" id="task-rsvp" class="dialog-message" style="display:none" />
 </div>
 
 <roundcube:if condition="env:tasklist_driver == 'kolab' && config:kolab_bonnie_api" />
@@ -321,6 +316,10 @@
 	<roundcube:container name="tasklistform" id="tasklistform" />
 </div>
 
+<div id="tasksimport" class="uidialog">
+	<roundcube:object name="plugin.tasks_import_form" id="tasks-import-form" uploadFieldSize="30" />
+</div>
+
 <div id="tasksexport" class="uidialog">
 	<roundcube:object name="plugin.tasks_export_form" id="tasks-export-form" />
 </div>
@@ -338,8 +337,6 @@
 
 	new rcube_splitter({ id:'taskviewsplitter', p1:'#sidebar', p2:'#mainview-right',
 		orientation:'v', relative:true, start:240, min:180, size:12 }).init();
-	new rcube_splitter({ id:'taskviewsplitterv', p1:'#tagsbox', p2:'#tasklistsbox',
-		orientation:'h', relative:true, start:242, min:120, size:12, offset:4 }).init();
 
 	// animation to unfold list search box
 	$('#tasklistsbox .boxtitle a.search').click(function(e){

iRony-0.4.0.tar.gz/lib/plugins/tasklist/skins/larry/templates/taskedit.html -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/skins/larry/templates/taskedit.html Changed

@@ -1,4 +1,4 @@
-<div id="taskedit" class="uidialog uidialog-tabbed">
+<div id="taskedit" class="uidialog uidialog-tabbed"<roundcube:exp expression="env:framed ? 'data-nodialog=true' : ''">>
 	<form id="taskeditform" action="#" method="post" enctype="multipart/form-data">
 		<ul>
 			<li><a href="#taskedit-panel-main"><roundcube:label name="tasklist.tabsummary" /></a></li><li><a href="#taskedit-panel-recurrence"><roundcube:label name="tasklist.tabrecurrence" /></a></li><li id="edit-tab-attendees"><a href="#taskedit-panel-attendees"><roundcube:label name="tasklist.tabassignments" /></a></li><li id="taskedit-tab-attachments"><a href="#taskedit-panel-attachments"><roundcube:label name="tasklist.tabattachments" /></a></li>
@@ -17,7 +17,7 @@
 			</div>
 			<div class="form-section">
 				<label for="tagedit-input"><roundcube:label name="tasklist.tags" /></label>
-				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit" tabindex="0" />
+				<roundcube:object name="plugin.tags_editline" id="taskedit-tagline" class="tagedit tagline" tabindex="0" />
 			</div>
 			<div class="form-section">
 				<label for="taskedit-startdate"><roundcube:label name="tasklist.start" /></label>
@@ -92,20 +92,21 @@
 			</div>
 			<h3 id="aria-label-attendeestable" class="voice"><roundcube:label name="tasklist.arialabeleventassignments" /></h3>
 			<roundcube:object name="plugin.attendees_list" id="edit-attendees-table" class="records-table edit-attendees-table" coltitle="attendee" aria-labelledby="aria-label-attendeestable" />
-			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" />
-			<roundcube:include file="/templates/freebusylegend.html" />
+			<roundcube:object name="plugin.attendees_form" id="edit-attendees-form" size="30" />
 		</div>
 		
 		<div id="taskedit-panel-attachments">
 			<div id="taskedit-attachments">
 				<roundcube:object name="plugin.attachments_list" id="taskedit-attachment-list" class="attachmentslist" />
 			</div>
-			<div id="taskedit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform">
+			<div id="taskedit-attachments-form" role="region" aria-labelledby="aria-label-attachmentuploadform" style="text-align:center">
 				<h3 id="aria-label-attachmentuploadform" class="voice"><roundcube:label name="arialabelattachmentuploadform" /></h3>
-				<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" attachmentFieldSize="30" />
+				<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="hint" />
+				<a class="button" tabindex="1" href="#" onclick="rcmail.upload_input('taskedit-attachment-form')"><roundcube:label name="addattachment" /></a>
 			</div>
 			<roundcube:object name="plugin.filedroparea" id="taskedit-panel-attachments" />
 		</div>
 	</form>
-	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="task-dialog-message" style="display:none" />
+	<roundcube:object name="plugin.edit_attendees_notify" id="edit-attendees-notify" class="dialog-message" style="display:none" />
+	<roundcube:object name="plugin.attachments_form" id="taskedit-attachment-form" mode="smart" />
 </div>

iRony-0.4.0.tar.gz/lib/plugins/tasklist/tasklist.js -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/tasklist.js Changed

@@ -58,7 +58,6 @@
     };
 
     /*  private vars  */
-    var tagsfilter = [];
     var filtermask = FILTER_MASK_ALL;
     var loadstate = { filter:-1, lists:'', search:null };
     var idcount = 0;
@@ -69,13 +68,12 @@
     var taskcounts = {};
     var listindex = [];
     var listdata = {};
-    var tags = [];
+    var tagsfilter = [];
     var draghelper;
     var search_request;
     var search_query;
     var completeness_slider;
     var task_draghelper;
-    var tag_draghelper;
     var task_drag_active = false;
     var list_scroll_top = 0;
     var scroll_delay = 400;
@@ -93,11 +91,11 @@
     // general datepicker settings
     var datepicker_settings = {
       // translate from PHP format to datepicker format
-      dateFormat: settings['date_format'].replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
-      firstDay : settings['first_day'],
-//      dayNamesMin: settings['days_short'],
-//      monthNames: settings['months'],
-//      monthNamesShort: settings['months'],
+      dateFormat: settings.date_format.replace(/M/g, 'm').replace(/mmmmm/, 'MM').replace(/mmm/, 'M').replace(/dddd/, 'DD').replace(/ddd/, 'D').replace(/yy/g, 'y'),
+      firstDay : settings.first_day,
+//      dayNamesMin: settings.days_short,
+//      monthNames: settings.months,
+//      monthNamesShort: settings.months,
       changeMonth: false,
       showOtherMonths: true,
       selectOtherMonths: true
@@ -122,6 +120,8 @@
     this.list_remove = list_remove;
     this.list_showurl = list_showurl;
     this.list_edit_dialog = list_edit_dialog;
+    this.list_set_sort_and_order = list_set_sort_and_order;
+    this.get_setting = get_setting;
     this.unlock_saving = unlock_saving;
 
     /* imports */
@@ -144,6 +144,27 @@
             return;
         }
 
+        if (rcmail.env.action == 'dialog-ui') {
+            task_edit_dialog(null, 'new', rcmail.env.task_prop);
+
+            rcmail.addEventListener('plugin.unlock_saving', function(status) {
+                unlock_saving();
+
+                if (status) {
+                    var rc = window.parent.rcmail,
+                        win = rc.env.contentframe ? rc.get_frame_window(rc.env.contentframe) : window.parent;
+
+                   if (win) {
+                        win.location.reload();
+                    }
+
+                    window.parent.kolab_task_dialog_element.dialog('destroy');
+                }
+            });
+
+            return;
+        }
+
         // initialize task list selectors
         for (var id in me.tasklists) {
             if (settings.selected_list && me.tasklists[settings.selected_list] && !me.tasklists[settings.selected_list].active) {
@@ -173,13 +194,14 @@
         });
         tasklists_widget.addEventListener('select', function(node) {
             var id = $(this).data('id');
-            rcmail.enable_command('list-edit', has_permission(me.tasklists[node.id], 'wa'));
-            rcmail.enable_command('list-delete', has_permission(me.tasklists[node.id], 'xa'));
-            rcmail.enable_command('list-import', has_permission(me.tasklists[node.id], 'i'));
+            rcmail.enable_command('list-edit', me.has_permission(me.tasklists[node.id], 'wa'));
+            rcmail.enable_command('list-delete', me.has_permission(me.tasklists[node.id], 'xa'));
+            rcmail.enable_command('list-import', me.has_permission(me.tasklists[node.id], 'i'));
             rcmail.enable_command('list-remove', me.tasklists[node.id] && me.tasklists[node.id].removable);
             rcmail.enable_command('list-showurl', me.tasklists[node.id] && !!me.tasklists[node.id].caldavurl);
             me.selected_list = node.id;
             rcmail.update_state({source: node.id});
+            rcmail.triggerEvent('show-list', {title: me.tasklists[node.id].name});
         });
         tasklists_widget.addEventListener('subscribe', function(p) {
             var list;
@@ -208,9 +230,19 @@
             if (data.length)
                 rcmail.display_message(rcmail.gettext('nrtasklistsfound','tasklist').replace('$nr', data.length), 'voice');
             else
-                rcmail.display_message(rcmail.gettext('notasklistsfound','tasklist'), 'info');
+                rcmail.display_message(rcmail.gettext('notasklistsfound','tasklist'), 'notice');
         });
 
+        // Make Elastic checkboxes pretty
+        if (window.UI && UI.pretty_checkbox) {
+            $(rcmail.gui_objects.tasklistslist).find('input[type=checkbox]').each(function() {
+                UI.pretty_checkbox($(this).addClass('flex-checkbox'));
+            });
+            tasklists_widget.addEventListener('add-item', function(prop) {
+                UI.pretty_checkbox($(prop.li).find('input').addClass('flex-checkbox'));
+            });
+        }
+
         // init (delegate) event handler on tasklist checkboxes
         tasklists_widget.container.on('click', 'input[type=checkbox]', function(e) {
             var list, id = this.value;
@@ -288,6 +320,9 @@
             setTimeout(fetch_counts, 200);
         });
 
+        rcmail.addEventListener('plugin.import_success', function(p){ rctasks.import_success(p); });
+        rcmail.addEventListener('plugin.import_error', function(p){ rctasks.import_error(p); });
+
         rcmail.addEventListener('plugin.task_render_changelog', task_render_changelog);
         rcmail.addEventListener('plugin.task_show_diff', task_show_diff);
         rcmail.addEventListener('plugin.task_show_revision', function(data){ task_show_dialog(null, data, true); });
@@ -341,57 +376,6 @@
             return false;
         }).find('input[type=text]').placeholder(rcmail.gettext('createnewtask','tasklist'));
 
-        // click-handler on tags list
-        $(rcmail.gui_objects.tagslist).on('click', 'li', function(e){
-            var item = e.target.nodeName == 'LI' ? $(e.target) : $(e.target).closest('li'),
-                tag = item.data('value');
-
-            if (!tag)
-                return false;
-
-            // reset selection on regular clicks
-            var index = $.inArray(tag, tagsfilter);
-            var shift = e.shiftKey || e.ctrlKey || e.metaKey;
-
-            if (!shift) {
-                if (tagsfilter.length > 1)
-                    index = -1;
-
-                $('li', rcmail.gui_objects.tagslist).removeClass('selected').attr('aria-checked', 'false');
-                tagsfilter = [];
-            }
-
-            // add tag to filter
-            if (index < 0) {
-                item.addClass('selected').attr('aria-checked', 'true');
-                tagsfilter.push(tag);
-            }
-            else if (shift) {
-                item.removeClass('selected').attr('aria-checked', 'false');
-                var a = tagsfilter.slice(0,index);
-                tagsfilter = a.concat(tagsfilter.slice(index+1));
-            }
-
-            list_tasks();
-
-            // clear text selection in IE after shift+click
-            if (shift && document.selection)
-              document.selection.empty();
-
-            e.preventDefault();
-            return false;
-        })
-        .on('keypress', 'li', function(e) {
-            if (e.keyCode == 13) {
-                $(this).trigger('click', { pointerType:'keyboard' });
-            }
-        })
-        .mousedown(function(e){
-            // disable content selection with the mouse
-            e.preventDefault();
-            return false;
-        });
-
         // click-handler on task list items (delegate)
         $(rcmail.gui_objects.resultlist).on('click', function(e){
             var item = $(e.target);
@@ -416,7 +400,7 @@
                 case 'childtoggle':
                     rec.collapsed = !rec.collapsed;
                     li.children('.childtasks:first').toggle().attr('aria-hidden', rec.collapsed ? 'true' : 'false');
-                    $(e.target).toggleClass('collapsed').html(rec.collapsed ? '&#9654;' : '&#9660;');
+                    $(e.target).toggleClass('collapsed').html('').append($('<span class="inner">').text(rec.collapsed ? '&#9654;' : '&#9660;'));
                     rcmail.http_post('tasks/task', { action:'collapse', t:{ id:rec.id, list:rec.list }, collapsed:rec.collapsed?1:0 });
                     if (e.shiftKey)  // expand/collapse all childs
                         li.children('.childtasks:first .childtoggle.'+(rec.collapsed?'expanded':'collapsed')).click();
@@ -444,7 +428,7 @@
                         return false;
 
                     var link = $(e.target).html(''),
-                        input = $('<input type="text" size="10" />').appendTo(link).val(rec.date || '')
+                        input = $('<input type="text" size="10" />').appendTo(link).val(rec.date || '');
 
                     input.datepicker($.extend({
                         onClose: function(dateText, inst) {
@@ -484,8 +468,11 @@
                     return true;
 
                 default:
-                    if (e.target.nodeName != 'INPUT')
+                    if (e.target.nodeName != 'INPUT') {
                         task_show_dialog(id);
+                        $(rcmail.gui_objects.resultlist).find('.selected').removeClass('selected');
+                        $(item).addClass('selected');
+                    }
                     break;
             }
 
@@ -504,6 +491,9 @@
                     task_edit_dialog(id, 'edit');
                 clearSelection();
             }
+
+            $(rcmail.gui_objects.resultlist).find('.selected').removeClass('selected');
+            $(item).addClass('selected');
         })
         .on('keydown', '.taskhead', function(e) {
             if (e.target.nodeName == 'INPUT' && e.target.type == 'text')
@@ -553,12 +543,16 @@
                     focused_subclass = item.get(0) !== e.target ? e.target.className : null;
                 }
             }
+
+            $(item).addClass('focused');
         })
         .on('focusout', '.taskhead', function(e){
             var item = $(e.target);
             if (focused_task && item.data('id') == focused_task) {
                 focused_task = focused_subclass = null;
             }
+
+            $(item).removeClass('focused');
         });
 
         /**
@@ -646,6 +640,70 @@
                 }, 1);
             }
         }, datepicker_settings);
+
+        rcmail.addEventListener('kolab-tags-search', filter_tasks)
+            .addEventListener('kolab-tags-drop-data', function(e) { return listdata[e.id]; })
+            .addEventListener('kolab-tags-drop', function(e) {
+                var rec = listdata[e.id];
+                if (rec && rec.id && e.tag) {
+                    if (!rec.tags)
+                        rec.tags = [];
+                    rec.tags.push(e.tag);
+                    save_task(rec, 'edit');
+                }
+            });
+
+        // Create simple list widget replacement for Elastic skin,
+        // as we do not use list nor treelist widget for tasks list
+        rcmail.tasklist = {
+            _find_sibling: function(dir) {
+                if (me.selected_task && me.selected_task.id) {
+                    var n = false,
+                        target = $('li[rel="' + me.selected_task.id + '"] > .taskhead', rcmail.gui_objects.resultlist)[0],
+                        items = $(rcmail.gui_objects.resultlist).find('.taskhead');
+
+                    items.each(function(i, item) {
+                        if (item === target) {
+                            n = i;
+                            return false;
+                        }
+                    });
+
+                    if (n !== false) {
+                        return items[n + dir];
+                    }
+                }
+            },
+            get_single_selection: function() {
+                if (me.selected_task) {
+                    return me.selected_task.id;
+                }
+            },
+            get_node: function(uid) {
+                if (me.selected_task && me.selected_task.id) {
+                    return {collapsed: true};
+                }
+            },
+            expand: function() {
+                if (me.selected_task && me.selected_task.id) {
+                    var parent = $('li[rel="' + me.selected_task.id + '"]', rcmail.gui_objects.resultlist).parent('.childtasks')[0];
+                    if (parent) {
+                        $(parent).parent().children('.childtoggle.collapsed').click();
+                    }
+                }
+            },
+            get_next: function() {
+                return rcmail.tasklist._find_sibling(1);
+            },
+            get_prev: function() {
+                return rcmail.tasklist._find_sibling(-1);
+            },
+            select: function(node) {
+                $(node).click();
+            }
+        };
+
+        rcmail.triggerEvent('tasklist-init');
     }
 
     /**
@@ -653,18 +711,23 @@
      */
     function init_taskedit()
     {
-        $('#taskedit').tabs({
+        $('#taskedit:not([data-notabs])').tabs({
             activate: function(event, ui) {
                 // reset autocompletion on tab change (#3389)
                 rcmail.ksearch_blur();
             }
         });
 
-        var completeness_slider_change = function(e, ui){
-          var v = completeness_slider.slider('value');
-          if (v >= 98) v = 100;
-          if (v <= 2)  v = 0;
-          $('#taskedit-completeness').val(v);
+        $('#taskedit li.nav-item a').on('click', function() {
+            // reset autocompletion on tab change (#3389)
+            rcmail.ksearch_blur();
+        });
+
+        var completeness_slider_change = function(e, ui) {
+            var v = completeness_slider.slider('value');
+            if (v >= 98) v = 100;
+            if (v <= 2)  v = 0;
+            $('#taskedit-completeness').val(v);
         };
         completeness_slider = $('#taskedit-completeness-slider').slider({
             range: 'min',
@@ -688,75 +751,55 @@
             return false;
         });
 
-      // init attendees autocompletion
-      var ac_props;
-      // parallel autocompletion
-      if (rcmail.env.autocomplete_threads > 0) {
-        ac_props = {
-          threads: rcmail.env.autocomplete_threads,
-          sources: rcmail.env.autocomplete_sources
-        };
-      }
-      rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
-      rcmail.addEventListener('autocomplete_insert', function(e) {
-          var success = false;
-          if (e.field.name == 'participant') {
-              success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:(e.data && e.data.type == 'group' ? 'GROUP' : 'INDIVIDUAL') });
-          }
-          if (e.field && success) {
-              e.field.value = '';
-          }
-      });
+        // init attendees autocompletion
+        var ac_props;
+        // parallel autocompletion
+        if (rcmail.env.autocomplete_threads > 0) {
+            ac_props = {
+                threads: rcmail.env.autocomplete_threads,
+                sources: rcmail.env.autocomplete_sources
+            };
+        }
+        rcmail.init_address_input_events($('#edit-attendee-name'), ac_props);
+        rcmail.addEventListener('autocomplete_insert', function(e) {
+            var cutype, success = false;
+            if (e.field.name == 'participant') {
+                cutype = e.data && e.data.type == 'group' && e.result_type == 'person' ? 'GROUP' : 'INDIVIDUAL';
+                success = add_attendees(e.insert, { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype: cutype });
+            }
+            if (e.field && success) {
+                e.field.value = '';
+            }
+        });
 
-      $('#edit-attendee-add').click(function() {
-          var input = $('#edit-attendee-name');
-          rcmail.ksearch_blur();
-          if (add_attendees(input.val(), { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'INDIVIDUAL' })) {
-              input.val('');
-          }
-      });
+        $('#edit-attendee-add').click(function() {
+            var input = $('#edit-attendee-name');
+            rcmail.ksearch_blur();
+            if (add_attendees(input.val(), { role:'REQ-PARTICIPANT', status:'NEEDS-ACTION', cutype:'INDIVIDUAL' })) {
+                input.val('');
+            }
+        });
 
-      // handle change of "send invitations" checkbox
-      $('#edit-attendees-invite').change(function() {
-        $('#edit-attendees-donotify,input.edit-attendee-reply').prop('checked', this.checked);
-        // hide/show comment field
-        $('#taskeditform .attendees-commentbox')[this.checked ? 'show' : 'hide']();
-      });
-
-      // delegate change task to "send invitations" checkbox
-      $('#edit-attendees-donotify').change(function() {
-        $('#edit-attendees-invite').click();
-        return false;
-      });
+        // handle change of "send invitations" checkbox
+        $('#edit-attendees-invite').change(function() {
+            $('#edit-attendees-donotify,input.edit-attendee-reply').prop('checked', this.checked);
+            // hide/show comment field
+            $('#taskeditform .attendees-commentbox')[this.checked ? 'show' : 'hide']();
+        });
+
+        // delegate change task to "send invitations" checkbox
+        $('#edit-attendees-donotify').change(function() {
+            $('#edit-attendees-invite').click();
+            return false;
+        });
 
         // configure drop-down menu on time input fields based on jquery UI autocomplete
-        $('#taskedit-starttime, #taskedit-time, #taskedit input.edit-alarm-time').each(function() {
+        $('#taskedit-starttime, #taskedit-time').each(function() {
             me.init_time_autocomplete(this, {container: '#taskedit'});
         });
     }
 
     /**
-     * Check permissions on the given list object
-     */
-    function has_permission(list, perm)
-    {
-        // multiple chars means "either of"
-        if (String(perm).length > 1) {
-            for (var i=0; i < perm.length; i++) {
-                if (has_permission(list, perm[i])) {
-                    return true;
-                }
-            }
-        }
-
-        if (list.rights && String(list.rights).indexOf(perm) >= 0) {
-            return true;
-        }
-
-        return (perm == 'i' && list.editable);
-    }
-
-    /**
      * Request counts from the server
      */
     function fetch_counts()
@@ -807,6 +850,15 @@
     }
 
     /**
+     * Filter tasks by tag
+     */
+    function filter_tasks(tags)
+    {
+        tagsfilter = tags;
+        list_tasks();
+    }
+
+    /**
      * Remove all tasks of the given list from the UI
      */
     function remove_tasks(list_id)
@@ -824,88 +876,148 @@
         loadstate.lists = active_lists();
     }
 
+    // open a dialog to upload an .ics file with tasks to be imported
+    this.import_tasks = function(tasklist)
+    {
+        // close show dialog first
+        var buttons = {},
+            $dialog = $("#tasksimport").clone(true).removeClass('uidialog'),
+            form = $dialog.find('form').get(0);
+
+        if ($dialog.is(':ui-dialog'))
+            $dialog.dialog('close');
+
+        if (tasklist)
+            $('#task-import-list').val(tasklist);
+
+        buttons[rcmail.gettext('import', 'tasklist')] = function() {
+            if (form && form.elements._data.value) {
+                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');
+
+                    // display error message if no sophisticated response from server arrived (e.g. iframe load error)
+                    if (me.import_succeeded === null)
+                        rcmail.display_message(rcmail.get_label('importerror', 'tasklist'), 'error');
+                });
+
+                // display upload indicator (with extended timeout)
+                var timeout = rcmail.env.request_timeout;
+                rcmail.env.request_timeout = 600;
+                me.import_succeeded = null;
+                saving_lock = rcmail.set_busy(true, 'uploading');
+                $('.ui-dialog-buttonpane button', $dialog.parent()).button('disable');
+
+                // restore settings
+                rcmail.env.request_timeout = timeout;
+            }
+        };
+
+        buttons[rcmail.gettext('cancel', 'tasklist')] = function() {
+            $(this).dialog('close');
+        };
+
+        // open jquery UI dialog
+        this.import_dialog = rcmail.show_popup_dialog($dialog, rcmail.gettext('tasklist.importtasks'), buttons, {
+            closeOnEscape: false,
+            button_classes: ['import mainaction', 'cancel'],
+            close: null // do not remove the $dialog element
+        });
+    };
+
+    // callback from server if import succeeded
+    this.import_success = function(p)
+    {
+        this.import_succeeded = true;
+        this.import_dialog.dialog('close');
+        rcmail.set_busy(false, null, saving_lock);
+        saving_lock = null;
+        rcmail.gui_objects.importform.reset();
+
+        if (p.refetch) {
+            list_tasks(null, true);
+            setTimeout(fetch_counts, 200);
+        }
+    };
+
+    // callback from server to report errors on import
+    this.import_error = function(p)
+    {
+        this.import_succeeded = false;
+        rcmail.set_busy(false, null, saving_lock);
+        saving_lock = null;
+        rcmail.display_message(p.message || rcmail.get_label('importerror', 'tasklist'), 'error');
+    };
+
     // open a tasks export dialog
     this.export_tasks = function()
     {
-      // close show dialog first
-      var $dialog = $("#tasksexport"),
-        form = rcmail.gui_objects.exportform,
-        buttons = {};
-
-      if (!form)
-        return;
-
-      if ($dialog.is(':ui-dialog'))
-        $dialog.dialog('close');
-
-      $("#task-export-list").val('');
-
-      buttons[rcmail.gettext('export', 'tasklist')] = function() {
-        var data = {},
-            source = $('#task-export-list option:selected').val(),
-            form_elements = $('select, input', form);
-
-        // "current view" export, use hidden form to POST task IDs
-        if (source === '') {
-          var cache = {}, tasks = [], inputs = [],
-            postform = $('#tasks-export-form-post');
+        // close show dialog first
+        var $dialog = $("#tasksexport").clone(true).removeClass('uidialog'),
+            form = $dialog.find('form').get(0),
+            buttons = {};
 
-          $.each(listindex || [], function() {
-            var rec = listdata[this];
-            if (match_filter(rec, cache)) {
-              tasks.push(rec.id);
+        if ($dialog.is(':ui-dialog'))
+            $dialog.dialog('close');
+
+        $("#task-export-list").val('');
+
+        buttons[rcmail.gettext('export', 'tasklist')] = function() {
+            var data = {},
+                source = $('#task-export-list').val(),
+                form_elements = $('select, input', form);
+
+            // "current view" export, use hidden form to POST task IDs
+            if (source === '') {
+                var cache = {}, tasks = [], inputs = [],
+                    postform = $('#tasks-export-form-post');
+
+                $.each(listindex || [], function() {
+                    var rec = listdata[this];
+                    if (match_filter(rec, cache)) {
+                        tasks.push(rec.id);
+                    }
+                });
+
+                // copy form inputs, there may be controls added by other plugins
+                form_elements.each(function() {
+                    if (this.type != 'checkbox' || this.checked)
+                        inputs.push($('<input>').attr({type: 'hidden', name: this.name, value: this.value}));
+                });
+
+                inputs.push($('<input>').attr({type: 'hidden', name: '_token', value: rcmail.env.request_token}));
+                inputs.push($('<input>').attr({type: 'hidden', name: 'id', value: tasks.join(',')}));
+
+                if (!postform.length)
+                    postform = $('<form>')
+                        .attr({style: 'display: none', method: 'POST', action: '?_task=tasks&_action=export'})
+                        .appendTo('body');
+
+                postform.html('').append(inputs).submit();
             }
-          });
+            // otherwise we can use simple GET
+            else {
+                form_elements.each(function() {
+                    if (this.type != 'checkbox' || this.checked)
+                        data[this.name] = $(this).val();
+                });
 
-          // copy form inputs, there may be controls added by other plugins
-          form_elements.each(function() {
-            if (this.type != 'checkbox' || this.checked)
-              inputs.push($('<input>').attr({type: 'hidden', name: this.name, value: this.value}));
-          });
+                rcmail.goto_url('export', data, false);
+            }
 
-          inputs.push($('<input>').attr({type: 'hidden', name: '_token', value: rcmail.env.request_token}));
-          inputs.push($('<input>').attr({type: 'hidden', name: 'id', value: tasks.join(',')}));
+            $(this).dialog('close');
+        };
 
-          if (!postform.length)
-            postform = $('<form>')
-              .attr({style: 'display: none', method: 'POST', action: '?_task=tasks&_action=export'})
-              .appendTo('body');
+        buttons[rcmail.gettext('cancel', 'tasklist')] = function() {
+            $(this).dialog('close');
+        };
 
-          postform.html('').append(inputs).submit();
-        }
-        // otherwise we can use simple GET
-        else {
-          form_elements.each(function() {
-            if (this.type != 'checkbox' || this.checked)
-              data[this.name] = $(this).val();
-          });
-
-          rcmail.goto_url('export', data);
-        }
-
-        $dialog.dialog("close");
-      };
-
-      buttons[rcmail.gettext('cancel', 'tasklist')] = function() {
-        $dialog.dialog("close");
-      };
-
-      // open jquery UI dialog
-      $dialog.dialog({
-        modal: true,
-        resizable: false,
-        closeOnEscape: false,
-        title: rcmail.gettext('exporttitle', 'tasklist'),
-        open: function() {
-          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().addClass('mainaction');
-        },
-        close: function() {
-          $('.ui-dialog-buttonpane button', $dialog.parent()).button('enable');
-          $dialog.dialog("destroy").hide();
-        },
-        buttons: buttons,
-        width: 520
-      }).show();
+        // open jquery UI dialog
+        rcmail.show_popup_dialog($dialog, rcmail.gettext('exporttitle', 'tasklist'), buttons, {
+            button_classes: ['export mainaction', 'cancel'],
+            close: null // do not remove the $dialog element
+        });
     };
 /*
     // download the selected task as iCal
@@ -916,7 +1028,6 @@
       }
     };
 */
-
     /**
      * Modify query parameters for refresh requests
      */
@@ -954,7 +1065,7 @@
         // sort index before rendering
         listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
 
-        append_tags(response.tags || []);
+        update_taglist(response.tags || []);
         render_tasklist();
 
         // show selected task dialog
@@ -984,7 +1095,10 @@
             cache = {},
             activetags = {},
             msgbox = $('#listmessagebox').hide(),
-            list = $(rcmail.gui_objects.resultlist).html('');
+            list = $(rcmail.gui_objects.resultlist);
+            selected = $('.taskhead.selected', list).parent().attr('rel');
+
+        list.html('');
 
         for (var i=0; i < listindex.length; i++) {
             id = listindex[i];
@@ -1012,12 +1126,16 @@
             return;
 
         fix_tree_toggles();
-        update_tagcloud(activetags);
+        update_taglist();
 
         if (!count) {
             msgbox.html(rcmail.gettext('notasksfound','tasklist')).show();
             rcmail.display_message(rcmail.gettext('notasksfound','tasklist'), 'voice');
         }
+        else if (selected) {
+            // mark back the selected task
+            $('li[rel="' + selected + '"] > .taskhead').addClass('selected');
+        }
     }
 
     /**
@@ -1031,7 +1149,7 @@
                 childs = $('.childtasks li', li);
 
             $('.childtoggle', li)[(childs.length ? 'show' : 'hide')]();
-        })
+        });
     }
 
     /**
@@ -1045,7 +1163,7 @@
         $('.taskitem .childtoggle')
             .removeClass(collapsed ? 'expanded' : 'collapsed')
             .addClass(collapsed ? 'collapsed' : 'expanded')
-            .html(collapsed ? '&#9654;' : '&#9660;');
+            .html('').append($('<span class="inner">').text(collapsed ? '&#9654;' : '&#9660;'));
 
         // store new toggle collapse states
         var ids = [];
@@ -1059,130 +1177,28 @@
     }
 
     /**
-     *
-     */
-    function append_tags(taglist)
-    {
-        // find new tags
-        var newtags = [];
-        for (var i=0; i < taglist.length; i++) {
-            if ($.inArray(taglist[i], tags) < 0)
-                newtags.push(taglist[i]);
-        }
-        tags = tags.concat(newtags);
-
-        // append new tags to tag cloud
-        $.each(newtags, function(i, tag){
-            $('<li role="checkbox" aria-checked="false" tabindex="0"></li>')
-                .attr('rel', tag)
-                .data('value', tag)
-                .html(Q(tag) + '<span class="count"></span>')
-                .appendTo(rcmail.gui_objects.tagslist)
-                .draggable({
-                    addClasses: false,
-                    revert: 'invalid',
-                    revertDuration: 300,
-                    helper: tag_draggable_helper,
-                    start: tag_draggable_start,
-                    appendTo: 'body',
-                    cursor: 'pointer'
-                });
-            });
-
-        // re-sort tags list
-        $(rcmail.gui_objects.tagslist).children('li').sortElements(function(a,b){
-            return $.text([a]).toLowerCase() > $.text([b]).toLowerCase() ? 1 : -1;
-        });
-    }
-
-    /**
      * Display the given counts to each tag and set those inactive which don't
      * have any matching tasks in the current view.
      */
-    function update_tagcloud(counts)
-    {
-        // compute counts first by iterating over all visible task items
-        if (typeof counts == 'undefined') {
-            counts = {};
-            $('li.taskitem', rcmail.gui_objects.resultlist).each(function(i,li){
-                var t, id = $(li).attr('rel'),
-                    rec = listdata[id];
-                for (var j=0; rec && rec.tags && j < rec.tags.length; j++) {
-                    t = rec.tags[j];
-                    if (typeof counts[t] == 'undefined')
-                        counts[t] = 0;
-                    counts[t]++;
-                }
-            });
-        }
-
-        $(rcmail.gui_objects.tagslist).children('li').each(function(i,li){
-            var elem = $(li), tag = elem.attr('rel'),
-                count = counts[tag] || 0;
-
-            elem.children('.count').html(count+'');
-            if (count == 0) elem.addClass('inactive');
-            else            elem.removeClass('inactive');
-        });
-    }
-
-    /*  Helper functions for drag & drop functionality of tags  */
-    
-    function tag_draggable_helper()
-    {
-        if (!tag_draghelper)
-            tag_draghelper = $('<div class="tag-draghelper"></div>');
-        else
-            tag_draghelper.html('');
-
-        $(this).clone().addClass('tag').appendTo(tag_draghelper);
-        return tag_draghelper;
-    }
-
-    function tag_draggable_start(event, ui)
+    function update_taglist(tags)
     {
-        $('.taskhead').droppable({
-            hoverClass: 'droptarget',
-            accept: tag_droppable_accept,
-            drop: tag_draggable_dropped,
-            addClasses: false
+        var counts = {};
+        $.each(listdata, function(id, rec) {
+            for (var t, j=0; rec && rec.tags && j < rec.tags.length; j++) {
+                t = rec.tags[j];
+                if (typeof counts[t] == 'undefined')
+                    counts[t] = 0;
+                counts[t]++;
+            }
         });
-    }
-
-    function tag_droppable_accept(draggable)
-    {
-        if (rcmail.busy)
-            return false;
-
-        var tag = draggable.data('value'),
-            drop_id = $(this).data('id'),
-            drop_rec = listdata[drop_id],
-            list = drop_rec && me.tasklists[drop_rec.list] ? me.tasklists[drop_rec.list] : { editable:true };
-
-        // target is not editable or already has this tag assigned
-        if (!drop_rec || drop_rec.readonly || !has_permission(list, 'i') || (drop_rec.tags && $.inArray(tag, drop_rec.tags) >= 0)) {
-            return false;
-        }
 
-        return true;
-    }
+        rcmail.triggerEvent('kolab-tags-counts', {counter: counts});
 
-    function tag_draggable_dropped(event, ui)
-    {
-        var drop_id = $(this).data('id'),
-            tag = ui.draggable.data('value'),
-            rec = listdata[drop_id];
-
-        if (rec && rec.id) {
-            if (!rec.tags) rec.tags = [];
-            rec.tags.push(tag);
-            save_task(rec, 'edit');
+        if (tags && tags.length) {
+            rcmail.triggerEvent('kolab-tags-refresh', {tags: tags});
         }
     }
 
-    /**
-     *
-     */
     function update_counts(counts)
     {
         // got new data
@@ -1267,8 +1283,7 @@
             $('li[rel="'+id+'"]', rcmail.gui_objects.resultlist).remove();
         }
 
-        append_tags(rec.tags || []);
-        update_tagcloud();
+        update_taglist(rec.tags || []);
         fix_tree_toggles();
 
         // refresh currently displayed task details dialog
@@ -1283,7 +1298,7 @@
     function save_task(rec, action)
     {
         // show confirmation dialog when status of an assigned task has changed
-        if (rec._status_before !== undefined && is_attendee(rec))
+        if (rec._status_before !== undefined && me.is_attendee(rec))
             return save_task_confirm(rec, action);
 
         if (!rcmail.busy) {
@@ -1302,11 +1317,11 @@
     var save_task_confirm = function(rec, action, updates)
     {
         var data = $.extend({}, rec, updates || {}),
-          notify = false, partstat = false, html = '',
-          do_confirm = settings.itip_notify & 2;
+            notify = false, partstat = false, html = '',
+            do_confirm = settings.itip_notify & 2;
 
         // task has attendees, ask whether to notify them
-        if (has_attendees(rec) && is_organizer(rec)) {
+        if (me.has_attendees(rec) && me.is_organizer(rec)) {
             notify = true;
             if (do_confirm) {
                 html = rcmail.gettext('changeconfirmnotifications', 'tasklist');
@@ -1316,14 +1331,14 @@
             }
         }
         // ask whether to change my partstat and notify organizer
-        else if (data._status_before !== undefined && data.status && data._status_before != data.status && is_attendee(rec)) {
-          partstat = true;
-          if (do_confirm) {
-              html = rcmail.gettext('partstatupdatenotification', 'tasklist');
-          }
-          else if (settings.itip_notify & 1) {
-              data._reportpartstat = data.status == 'CANCELLED' ? 'DECLINED' : data.status;
-          }
+        else if (data._status_before !== undefined && data.status && data._status_before != data.status && me.is_attendee(rec)) {
+            partstat = true;
+            if (do_confirm) {
+                html = rcmail.gettext('partstatupdatenotification', 'tasklist');
+            }
+            else if (settings.itip_notify & 1) {
+                data._reportpartstat = data.status == 'CANCELLED' ? 'DECLINED' : data.status;
+            }
         }
 
         // remove to avoid endless recursion
@@ -1336,6 +1351,7 @@
             var buttons = [];
             buttons.push({
                 text: rcmail.gettext('saveandnotify', 'tasklist'),
+                'class': 'mainaction save notify',
                 click: function() {
                     if (notify)   data._notify = 1;
                     if (partstat) data._reportpartstat = data.status == 'CANCELLED' ? 'DECLINED' : data.status;
@@ -1345,6 +1361,7 @@
             });
             buttons.push({
                 text: rcmail.gettext('save', 'tasklist'),
+                'class': 'save',
                 click: function() {
                     save_task(data, action);
                     $(this).dialog('close');
@@ -1352,10 +1369,11 @@
             });
             buttons.push({
                 text: rcmail.gettext('cancel', 'tasklist'),
+                'class': 'cancel',
                 click: function() {
                     $(this).dialog('close');
                     if (updates)
-                      render_task(rec, rec.id);  // restore previous state
+                        render_task(rec, rec.id);  // restore previous state
                 }
             });
 
@@ -1392,6 +1410,12 @@
             rcmail.set_busy(false, null, saving_lock);
             $('button.ui-button:ui-button').button('option', 'disabled', false);
             saving_lock = null;
+
+            // Elastic
+            if (!$('.selected', rcmail.gui_objects.resultlist).length) {
+                $('#taskedit').parents('.watermark').removeClass('formcontainer');
+                rcmail.triggerEvent('show-list', {force: true});
+            }
         }
     }
 
@@ -1400,17 +1424,13 @@
      */
     function render_task(rec, replace)
     {
-        var tags_html = '';
-        for (var j=0; rec.tags && j < rec.tags.length; j++)
-            tags_html += '<span class="tag">' + Q(rec.tags[j]) + '</span>';
-
         var label_id = rcmail.html_identifier(rec.id) + '-title';
         var div = $('<div>').addClass('taskhead').html(
             '<div class="progressbar"><div class="progressvalue" style="width:' + (rec.complete * 100) + '%"></div></div>' +
             '<input type="checkbox" name="completed[]" value="1" class="complete" aria-label="' + rcmail.gettext('complete','tasklist') + '" ' + (is_complete(rec) ? 'checked="checked" ' : '') + '/>' + 
             '<span class="flagged" role="checkbox" tabindex="0" aria-checked="' + (rec.flagged ? 'true' : 'false') + '" aria-label="' + rcmail.gettext('flagged','tasklist') + '"></span>' +
             '<span class="title" id="' + label_id + '">' + text2html(Q(rec.title)) + '</span>' +
-            '<span class="tags">' + tags_html + '</span>' +
+            '<span class="tags"></span>' +
             '<span class="date">' + Q(rec.date || rcmail.gettext('nodate','tasklist')) + '</span>' +
             '<a href="#" class="actions" aria-haspopup="true" aria-expanded="false">' + rcmail.gettext('taskactions','tasklist') + '</a>'
             )
@@ -1429,6 +1449,14 @@
                 revertDuration: 300
             });
 
+        if (window.kolab_tags_text_block) {
+            var tags = rec.tags || [];
+
+            if (tags.length) {
+                window.kolab_tags_text_block(tags, $('.tags', div));
+            }
+        }
+
         if (is_complete(rec))
             div.addClass('complete');
         if (rec.flagged)
@@ -1448,7 +1476,7 @@
             li = $('<li role="treeitem">')
                 .attr('rel', rec.id)
                 .addClass('taskitem')
-                .append((rec.collapsed ? '<span class="childtoggle collapsed">&#9654;' : '<span class="childtoggle expanded">&#9660;') + '</span>')
+                .append((rec.collapsed ? '<span class="childtoggle collapsed"><span class="inner">&#9654;' : '<span class="childtoggle expanded"><span class="inner">&#9660;') + '</span></span>')
                 .append(div)
                 .append('<ul class="childtasks" role="group" style="' + (rec.collapsed ? 'display:none' : '') + '" aria-hidden="' + (rec.collapsed ? 'true' : 'false') +'"></ul>');
 
@@ -1459,6 +1487,8 @@
         if (!inplace && parent && parent.length)
             li.appendTo(parent);
 
+        rcmail.triggerEvent('tasks-insertrow', {div: div});
+
         if (replace) {
             resort_task(rec, li, true);
             // TODO: remove the item after a while if it doesn't match the current filter anymore
@@ -1650,11 +1680,15 @@
 
 
     /*  Helper functions for drag & drop functionality  */
-    
-    function task_draggable_helper()
+
+    function task_draggable_helper(e)
     {
         if (!task_draghelper)
-            task_draghelper = $('<div class="taskitem-draghelper">&#x2714;</div>');
+            task_draghelper = $('<div id="rcmdraglayer" class="taskitem-draghelper">');
+
+        var title = $(e.target).parents('li').first().find('.title:first').text();
+
+        task_draghelper.html(Q(title) || '&#x2714');
 
         return task_draghelper;
     }
@@ -1665,6 +1699,7 @@
             hoverClass: 'droptarget',
             accept: task_droppable_accept,
             drop: task_draggable_dropped,
+            tolerance: 'pointer',
             addClasses: false
         };
 
@@ -1798,29 +1833,8 @@
             scroll_timer = window.setTimeout(function(){ tasklist_drag_scroll(container, dir); }, scroll_speed);
     }
 
-    // check if the task has 'real' attendees, excluding the current user
-    var has_attendees = function(task)
-    {
-        return !!(task.attendees && task.attendees.length && (task.attendees.length > 1 || String(task.attendees[0].email).toLowerCase() != settings.identity.email));
-    };
-
-    // check if the current user is an attendee of this task
-    var is_attendee = function(task, email, role)
-    {
-        var i, attendee, emails = email ? ';' + email.toLowerCase() : settings.identity.emails;
-
-        for (i=0; task.attendees && i < task.attendees.length; i++) {
-            attendee = task.attendees[i];
-            if ((!role || attendee.role == role) && attendee.email && emails.indexOf(';'+attendee.email.toLowerCase()) >= 0) {
-                return attendee;
-            }
-        }
-
-        return false;
-    };
-
     // check if the current user is the organizer
-    var is_organizer = function(task, email)
+    this.is_organizer = function(task, email)
     {
         if (!email) email = task.organizer ? task.organizer.email : null;
         if (email)
@@ -1861,7 +1875,7 @@
                 success = true;
             }
             else {
-                alert(rcmail.gettext('noemailwarning'));
+                rcmail.alert_dialog(rcmail.gettext('noemailwarning'));
             }
         }
 
@@ -1883,10 +1897,12 @@
         var dispname = Q(data.name || data.email);
         if (data.email)
             dispname = '<a href="mailto:' + data.email + '" title="' + Q(data.email) + '" class="mailtolink" data-cutype="' + data.cutype + '">' + dispname + '</a>';
+        else
+            dispname = '<span>' + dispname + '</span>';
 
         // delete icon
-        var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : rcmail.gettext('delete');
-        var dellink = '<a href="#delete" class="iconlink delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
+        var icon = rcmail.env.deleteicon ? '<img src="' + rcmail.env.deleteicon + '" alt="" />' : '<span class="inner">' + Q(rcmail.gettext('delete')) + '</span>';
+        var dellink = '<a href="#delete" class="iconlink icon button delete deletelink" title="' + Q(rcmail.gettext('delete')) + '">' + icon + '</a>';
         var tooltip, status = (data.status || '').toLowerCase(),
             status_label = rcmail.gettext('status' + status, 'libcalendaring');
 
@@ -1903,12 +1919,14 @@
 
         // add expand button for groups
         if (data.cutype == 'GROUP') {
-            dispname += ' <a href="#expand" data-email="' + Q(data.email) + '" class="iconbutton add expandlink" title="' + rcmail.gettext('expandattendeegroup','libcalendaring') + '">' +
-                rcmail.gettext('expandattendeegroup','libcalendaring') + '</a>';
+            dispname += ' <a href="#expand" data-email="' + Q(data.email)
+                + '" class="iconbutton add icon button expandlink" title="' + rcmail.gettext('expandattendeegroup','libcalendaring') + '">'
+                + '<span class="inner">' + rcmail.gettext('expandattendeegroup','libcalendaring') + '</span></a>';
         }
 
+        var elastic = $(attendees_list).parents('.no-img').length > 0;
         var html = '<td class="name"><span class="attendee-name">' + dispname + '</span></td>' +
-            '<td class="confirmstate"><span class="' + status + '" title="' + Q(tooltip) + '">' + Q(status ? status_label : '') + '</span></td>' +
+            '<td class="confirmstate"><span class="attendee ' + status + '" title="' + Q(tooltip) + '">' + Q(status && !elastic ? status_label : '') + '</span></td>' +
             (data.cutype != 'RESOURCE' ? '<td class="invite">' + (readonly || !invbox ? '' : invbox) + '</td>' : '') +
             '<td class="options">' + (readonly ? '' : dellink) + '</td>';
 
@@ -1929,6 +1947,10 @@
             $('#taskeditform .attendees-commentbox')[enabled ? 'show' : 'hide']();
         });
 
+        // Make Elastic checkboxes pretty
+        if (window.UI && UI.pretty_checkbox)
+            $(tr).find('input[type=checkbox]').each(function() { UI.pretty_checkbox(this); });
+
         task_attendees.push(data);
         return true;
     };
@@ -1954,10 +1976,16 @@
      */
     function task_show_dialog(id, data, temp)
     {
-        var $dialog = $('#taskshow'), rec, list;
+        var rec, list, elastic = false, $dialog = $('#taskshow');
+        if ($dialog.data('nodialog')) {
+            elastic = true;
+            $('#taskedit').addClass('hidden').parent().addClass('watermark'); // Elastic
+        }
+        else {
+            $dialog.filter(':ui-dialog').dialog('close');
+        }
 
-        if ($dialog.is(':ui-dialog'))
-          $dialog.dialog('close');
+        rcmail.enable_command('edit-task', 'delete-task', 'save-task', 'task-history', false);
 
         // remove status-* classes
         $dialog.removeClass(function(i, oldclass) {
@@ -1971,38 +1999,43 @@
         me.selected_task = rec;
         list = rec.list && me.tasklists[rec.list] ? me.tasklists[rec.list] : {};
 
+        // hide nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > .disabled').hide();
+
+        // for Elastic
+        rcmail.triggerEvent('show-content', {
+            mode: 'info',
+            title: rcmail.gettext('taskdetails', 'tasklist'),
+            obj: $('#taskshow').parent(),
+            scrollElement: $('#taskshow')
+        });
+
+        var status = rcmail.gettext('status-' + String(rec.status).toLowerCase(),'tasklist');
+
         // fill dialog data
         $('#task-parent-title').html(Q(rec.parent_title || '')+' &raquo;').css('display', rec.parent_title ? 'block' : 'none');
         $('#task-title').html(text2html(Q(rec.title || '')));
         $('#task-description').html(text2html(rec.description || '', 300, 6))[(rec.description ? 'show' : 'hide')]();
-        $('#task-date')[(rec.date ? 'show' : 'hide')]().children('.task-text').html(Q(rec.date || rcmail.gettext('nodate','tasklist')));
-        $('#task-time').html(Q(rec.time || ''));
-        $('#task-start')[(rec.startdate ? 'show' : 'hide')]().children('.task-text').html(Q(rec.startdate || ''));
-        $('#task-starttime').html(Q(rec.starttime || ''));
+        $('#task-date')[(rec.date ? 'show' : 'hide')]().find('.task-text').text(rec.date || rcmail.gettext('nodate','tasklist'));
+        $('#task-time').text(rec.time || '');
+        $('#task-start')[(rec.startdate ? 'show' : 'hide')]().find('.task-text').text(rec.startdate || '');
+        $('#task-starttime').text(rec.starttime || '');
         $('#task-alarm')[(rec.alarms_text ? 'show' : 'hide')]().children('.task-text').html(Q(rec.alarms_text));
         $('#task-completeness .task-text').html(((rec.complete || 0) * 100) + '%');
-        $('#task-status')[(rec.status ? 'show' : 'hide')]().children('.task-text').html(rcmail.gettext('status-'+String(rec.status).toLowerCase(),'tasklist'));
+        $('#task-status')[(rec.status ? 'show' : 'hide')]().children('.task-text').text(status);
         $('#task-list .task-text').html(Q(me.tasklists[rec.list] ? me.tasklists[rec.list].name : ''));
-        $('#task-attendees, #task-organizer, #task-created-changed, #task-rsvp, #task-rsvp-comment').hide();
+        $('#task-attendees, #task-organizer, #task-created-changed, #task-created, #task-changed, #task-rsvp, #task-rsvp-comment').hide();
 
-        var itags = get_inherited_tags(rec);
-        var taglist = $('#task-tags')[(rec.tags && rec.tags.length || itags.length ? 'show' : 'hide')]().children('.task-text').empty();
-        if (rec.tags && rec.tags.length) {
-            $.each(rec.tags, function(i,val){
-                $('<span>').addClass('tag-element').html(Q(val)).appendTo(taglist);
-            });
-        }
+        $('#event-status-badge > span').text(status);
 
-        // append inherited tags
-        if (itags.length) {
-            $.each(itags, function(i,val){
-                if (!rec.tags || $.inArray(val, rec.tags) < 0)
-                    $('<span>').addClass('tag-element inherit').html(Q(val)).appendTo(taglist);
-            });
-            // re-sort tags list
-            $(taglist).children().sortElements(function(a,b){
-                return $.text([a]).toLowerCase() > $.text([b]).toLowerCase() ? 1 : -1;
-            });
+        // tags
+        var taglist = $('#task-tags').hide().children('.task-text').empty();
+        if (window.kolab_tags_text_block) {
+            var tags = $.uniqueStrings((rec.tags || []).concat(get_inherited_tags(rec)));
+            if (tags.length) {
+                window.kolab_tags_text_block(tags, taglist);
+                $('#task-tags').show();
+            }
         }
 
         if (rec.status) {
@@ -2021,9 +2054,9 @@
         }
 
         if (rec.created || rec.changed) {
-            $('#task-created-changed .task-created').html(Q(rec.created_ || rcmail.gettext('unknown','tasklist')))
-            $('#task-created-changed .task-changed').html(Q(rec.changed_ || rcmail.gettext('unknown','tasklist')))
-            $('#task-created-changed').show()
+            $('.task-created', $dialog).text(rec.created_ || rcmail.gettext('unknown','tasklist'));
+            $('.task-changed', $dialog).text(rec.changed_ || rcmail.gettext('unknown','tasklist'));
+            $('#task-created-changed, #task-created, #task-changed').show();
         }
 
         // build attachments list
@@ -2053,7 +2086,7 @@
             });
 */
             var j, data, rsvp = false, mystatus = null, line, morelink, html = '', overflow = '',
-                organizer = is_organizer(rec);
+                organizer = me.is_organizer(rec);
 
             for (j=0; j < rec.attendees.length; j++) {
                 data = rec.attendees[j];
@@ -2107,7 +2140,7 @@
                     .html(rcmail.gettext('status' + mystatus, 'libcalendaring'));
             }
 */
-            var show_rsvp = !temp && rsvp && list.editable && !is_organizer(rec) && rec.status != 'CANCELLED';
+            var show_rsvp = !temp && rsvp && list.editable && !me.is_organizer(rec) && rec.status != 'CANCELLED';
             $('#task-rsvp')[(show_rsvp ? 'show' : 'hide')]();
             $('#task-rsvp .rsvp-buttons input').prop('disabled', false).filter('input[rel='+mystatus+']').prop('disabled', true);
 
@@ -2125,7 +2158,8 @@
         // define dialog buttons
         var buttons = [];
         if (list.editable && !rec.readonly) {
-              buttons.push({
+            rcmail.enable_command('edit-task', 'add-child-task', true);
+            buttons.push({
                 text: rcmail.gettext('edit','tasklist'),
                 click: function() {
                     task_edit_dialog(me.selected_task.id, 'edit');
@@ -2134,7 +2168,8 @@
             });
         }
 
-        if (has_permission(list, 'td') && !rec.readonly) {
+        if (me.has_permission(list, 'td') && !rec.readonly) {
+            rcmail.enable_command('delete-task', true);
             buttons.push({
                 text: rcmail.gettext('delete','tasklist'),
                 'class': 'delete',
@@ -2146,32 +2181,43 @@
             });
         }
 
-        // open jquery UI dialog
-        $dialog.dialog({
-          modal: false,
-          resizable: true,
-          closeOnEscape: true,
-          title: rcmail.gettext('taskdetails', 'tasklist'),
-          open: function() {
-              $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
-          },
-          close: function() {
-              $dialog.dialog('destroy').appendTo(document.body);
-              $('.libcal-rsvp-replymode').hide();
-          },
-          dragStart: function() {
-              $('.libcal-rsvp-replymode').hide();
-          },
-          resizeStart: function() {
-              $('.libcal-rsvp-replymode').hide();
-          },
-          buttons: buttons,
-          minWidth: 500,
-          width: 580
-        }).show();
+        rcmail.enable_command('task-history', !!list.history);
 
-        // set dialog size according to content
-        me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+        if (!elastic) {
+            // open jquery UI dialog
+            $dialog.dialog({
+                modal: false,
+                resizable: true,
+                closeOnEscape: true,
+                title: rcmail.gettext('taskdetails', 'tasklist'),
+                open: function() {
+                    $dialog.parent().find('.ui-button:not(.ui-dialog-titlebar-close)').first().focus();
+                },
+                close: function() {
+                    $dialog.dialog('destroy').appendTo(document.body);
+                    $('.libcal-rsvp-replymode').hide();
+                },
+                dragStart: function() {
+                    $('.libcal-rsvp-replymode').hide();
+                },
+                resizeStart: function() {
+                    $('.libcal-rsvp-replymode').hide();
+                },
+                buttons: buttons,
+                minWidth: 500,
+                width: 580
+            }).show();
+
+            // set dialog size according to content
+            me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+        }
+
+        // Elastic
+        $dialog.removeClass('hidden').parents('.watermark').addClass('formcontainer');
+        $('#taskshow').parent().trigger('loaded');
+
+        // hide nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > :not(.disabled)').show();
     }
 
     /**
@@ -2222,7 +2268,7 @@
 
         if (data === false || !data.length || !rec) {
           // display 'unavailable' message
-          $('<div class="notfound-message task-dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','tasklist') + '</div>')
+          $('<div class="notfound-message dialog-message warning">' + rcmail.gettext('objectchangelognotavailable','tasklist') + '</div>')
             .insertBefore($dialog.find('.changelog-table').hide());
           return;
         }
@@ -2361,17 +2407,43 @@
      */
     function task_edit_dialog(id, action, presets)
     {
-        $('#taskshow:ui-dialog').dialog('close');
+        var elastic = false, infodialog = $('#taskshow');
+        if (infodialog.data('nodialog') || $('#taskedit').data('nodialog')) {
+
+            elastic = true;
+            infodialog.addClass('hidden').parent().addClass('watermark'); // Elastic
+        }
+        else {
+            infodialog.filter(':ui-dialog').dialog('close');
+        }
+
+        rcmail.enable_command('edit-task', 'delete-task', 'add-child-task', 'save-task', 'task-history', false);
 
         var selected_list, rec = listdata[id] || presets,
             $dialog = $('<div>'),
             editform = $('#taskedit'),
+            readonly = rec && rec.readonly,
             list = rec.list && me.tasklists[rec.list] ? me.tasklists[rec.list] :
                 (me.selected_list ? me.tasklists[me.selected_list] : { editable: action == 'new', rights: action == 'new' ? 'rwitd' : 'r' });
 
-        if (rcmail.busy || !has_permission(list, 'i') || (action == 'edit' && (!rec || rec.readonly)))
+        if (rcmail.busy || !me.has_permission(list, 'i') || (action == 'edit' && (!rec || rec.readonly)))
             return false;
 
+        // hide nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > .disabled').hide();
+
+        if (action == 'new') {
+            $(rcmail.gui_objects.resultlist).find('.selected').removeClass('selected');
+        }
+
+        // for Elastic
+        rcmail.triggerEvent('show-content', {
+            mode: rec.uid ? 'edit' : 'add',
+            title: rcmail.gettext(rec.uid ? 'edittask' : 'newtask', 'tasklist'),
+            obj: $('#taskedit').parent(),
+            scrollElement: $('#taskedit')
+        });
+
         me.selected_task = $.extend({ valarms:[] }, rec);  // clone task object
         rec = me.selected_task;
 
@@ -2399,14 +2471,15 @@
         var notify = $('#edit-attendees-donotify').get(0);
         var invite = $('#edit-attendees-invite').get(0);
         var comment = $('#edit-attendees-comment');
+        var taglist;
 
         invite.checked = settings.itip_notify & 1 > 0;
-        notify.checked = has_attendees(rec) && invite.checked;
+        notify.checked = me.has_attendees(rec) && invite.checked;
 
         // set tasklist selection according to permissions
         tasklist.find('option').each(function(i, opt) {
             var l = me.tasklists[opt.value] || {},
-                writable = l.editable || (action == 'new' && has_permission(l, 'i'));
+                writable = l.editable || (action == 'new' && me.has_permission(l, 'i'));
             $(opt).prop('disabled', !writable);
 
             if (!selected_list && writable)
@@ -2416,23 +2489,10 @@
         tasklist.val(rec.list || me.selected_list || selected_list);
 
         // tag-edit line
-        var tagline = $(rcmail.gui_objects.edittagline).empty();
-        $.each(typeof rec.tags == 'object' && rec.tags.length ? rec.tags : [''], function(i,val){
-            $('<input>')
-                .attr('name', 'tags[]')
-                .attr('tabindex', '0')
-                .addClass('tag')
-                .val(val)
-                .appendTo(tagline);
-        });
-
-        $('input.tag', rcmail.gui_objects.edittagline).tagedit({
-            animSpeed: 100,
-            allowEdit: false,
-            checkNewEntriesCaseSensitive: false,
-            autocompleteOptions: { source: tags, minLength: 0, noCheck: true, appendTo:'#taskedit' },
-            texts: { removeLinkTitle: rcmail.gettext('removetag', 'tasklist') }
-        });
+        if (window.kolab_tags_input) {
+            $('#taskedit-tagline').parent('.form-group').show();
+            taglist = kolab_tags_input($('#taskedit-tagline'), rec.tags, readonly);
+        }
 
         // set alarm(s)
         me.set_alarms_edit('#taskedit-alarms', action != 'new' && rec.valarms ? rec.valarms : []);
@@ -2449,13 +2509,13 @@
         me.set_recurrence_edit(rec);
 
         // init attendees tab
-        var organizer = !rec.attendees || is_organizer(rec),
+        var organizer = !rec.attendees || me.is_organizer(rec),
             allow_invitations = organizer || (rec.owner && rec.owner == 'anonymous') || settings.invite_shared;
 
         task_attendees = [];
         attendees_list = $('#edit-attendees-table > tbody').html('');
-        $('#edit-attendees-notify')[(allow_invitations && has_attendees(rec) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
-        $('#edit-localchanges-warning')[(has_attendees(rec) && !(allow_invitations || (rec.owner && is_organizer(rec, rec.owner))) ? 'show' : 'hide')]();
+        $('#edit-attendees-notify')[(allow_invitations && me.has_attendees(rec) && (settings.itip_notify & 2) ? 'show' : 'hide')]();
+        $('#edit-localchanges-warning')[(me.has_attendees(rec) && !(allow_invitations || (rec.owner && me.is_organizer(rec, rec.owner))) ? 'show' : 'hide')]();
 
         // attendees (aka assignees)
         if (list.attendees) {
@@ -2483,17 +2543,19 @@
                 }
             });
 
-            $('#edit-tab-attendees').show();
+            $('#edit-tab-attendees').show(); // Larry
+            $('a[href="#taskedit-panel-attendees"]').parent().show(); // Elastic
             $('#edit-attendees-form')[(allow_invitations?'show':'hide')]();
             $('#edit-identities-list').val(identity_id);
             $('#taskedit-organizer')[(organizer ? 'show' : 'hide')]();
         }
         else {
-            $('#edit-tab-attendees').hide();
+            $('#edit-tab-attendees').hide(); // Larry
+            $('a[href="#taskedit-panel-attendees"]').parent().hide(); // Elastic
         }
 
         // attachments
-        rcmail.enable_command('remove-attachment', list.editable);
+        rcmail.enable_command('remove-attachment', 'upload-file', list.editable);
         me.selected_task.deleted_attachments = [];
         // we're sharing some code for uploads handling with app.js
         rcmail.env.attachments = [];
@@ -2507,17 +2569,16 @@
         }
 
         // show/hide tabs according to calendar's feature support
-        $('#taskedit-tab-attachments')[(list.attachments||rec.attachments?'show':'hide')]();
+        $('#taskedit-tab-attachments')[(list.attachments||rec.attachments?'show':'hide')](); // Larry
+        $('a[href="#taskedit-panel-attachments"]').parent()[(list.attachments||rec.attachments?'show':'hide')](); // Elastic
 
         // activate the first tab
-        $('#taskedit').tabs('option', 'active', 0);
+        $('#taskedit:not([data-notabs])').tabs('option', 'active', 0); // Larry
+        if ($('#taskedit').data('notabs'))
+            $('#taskedit li.nav-item:first-child a').tab('show'); // Elastic
 
         // define dialog buttons
-        var buttons = [];
-        buttons.push({
-            text: rcmail.gettext('save', 'tasklist'),
-            'class': 'mainaction',
-            click: function() {
+        var buttons = [], save_func = function() {
             var data = me.selected_task;
             data._status_before = me.selected_task.status + '';
 
@@ -2525,8 +2586,9 @@
             $.each({ title:title, description:description, date:recdate, time:rectime, startdate:recstartdate, starttime:recstarttime, status:taskstatus }, function(key,input){
                 data[key] = input.val();
             });
+
             data.list = tasklist.find('option:selected').val();
-            data.tags = [];
+            data.tags = taglist ? kolab_tags_input_value(taglist) : [];
             data.attachments = [];
             data.attendees = task_attendees;
             data.valarms = me.serialize_alarms('#taskedit-alarms');
@@ -2541,30 +2603,19 @@
                 var startdate = $.datepicker.parseDate(datepicker_settings.dateFormat, data.startdate, datepicker_settings);
                 var duedate = $.datepicker.parseDate(datepicker_settings.dateFormat, data.date, datepicker_settings);
                 if (startdate > duedate) {
-                    alert(rcmail.gettext('invalidstartduedates', 'tasklist'));
+                    rcmail.alert_dialog(rcmail.gettext('invalidstartduedates', 'tasklist'));
                     return false;
                 }
                 else if ((data.time == '') != (data.starttime == '')) {
-                    alert(rcmail.gettext('invalidstartduetimes', 'tasklist'));
+                    rcmail.alert_dialog(rcmail.gettext('invalidstartduetimes', 'tasklist'));
                     return false;
                 }
             }
             else if (data.recurrence && !data.startdate && !data.date) {
-                alert(rcmail.gettext('recurrencerequiresdate', 'tasklist'));
+                rcmail.alert_dialog(rcmail.gettext('recurrencerequiresdate', 'tasklist'));
                 return false;
             }
 
-            // collect tags
-            $('input[type="hidden"]', rcmail.gui_objects.edittagline).each(function(i,elem) {
-                if (elem.value)
-                    data.tags.push(elem.value);
-            });
-            // including the "pending" one in the text box
-            var newtag = $('#tagedit-input').val();
-            if (newtag != '') {
-                data.tags.push(newtag);
-            }
-
             // uploaded attachments list
             for (var i in rcmail.env.attachments) {
                 if (i.match(/^rcmfile(.+)/))
@@ -2610,7 +2661,7 @@
             }
 
             // tell server to send notifications
-            if ((has_attendees(data) || (rec.id && has_attendees(rec))) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
+            if ((me.has_attendees(data) || (rec.id && me.has_attendees(rec))) && allow_invitations && (notify.checked || invite.checked || need_invitation)) {
                 data._notify = settings.itip_notify;
                 data._comment = comment.val();
             }
@@ -2618,12 +2669,21 @@
                 delete data._notify;
             }
 
-            if (save_task(data, action))
+            if (save_task(data, action) && !elastic)
                 $dialog.dialog('close');
-        }  // end click:
+        };
+
+        rcmail.enable_command('save-task', true);
+        rcmail.env.task_save_func = save_func;
+
+        buttons.push({
+            text: rcmail.gettext('save', 'tasklist'),
+            'class': 'mainaction',
+            click: save_func
         });
 
         if (action != 'new') {
+            rcmail.enable_command('delete-task', true);
             buttons.push({
                 text: rcmail.gettext('delete', 'tasklist'),
                 'class': 'delete',
@@ -2642,117 +2702,73 @@
         });
 
         // open jquery UI dialog
-        $dialog.dialog({
-          modal: true,
-          resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
-          closeOnEscape: false,
-          title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
-          close: function() {
-              rcmail.ksearch_blur();
-              editform.hide().appendTo(document.body);
-              $dialog.dialog('destroy').remove();
-          },
-          buttons: buttons,
-          minHeight: 460,
-          minWidth: 500,
-          width: 580
-        }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE
+        if (!elastic) {
+            $dialog.dialog({
+                modal: true,
+                resizable: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
+                closeOnEscape: false,
+                title: rcmail.gettext((action == 'edit' ? 'edittask' : 'newtask'), 'tasklist'),
+                close: function() {
+                    rcmail.ksearch_blur();
+                    editform.hide().appendTo(document.body);
+                    $dialog.dialog('destroy').remove();
+                },
+                buttons: buttons,
+                minHeight: 460,
+                minWidth: 500,
+                width: 580
+            }).append(editform.show());  // adding form content AFTERWARDS massively speeds up opening on IE
+
+            // set dialog size according to content
+            me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+        }
+
+        // Elastic
+        editform.removeClass('hidden').parents('.watermark').addClass('formcontainer');
+        $('#taskedit').parent().trigger('loaded');
 
         title.select();
 
-        // set dialog size according to content
-        me.dialog_resize($dialog.get(0), $dialog.height(), 580);
+        // show nav buttons on mobile (elastic)
+        $('.content-frame-navigation > .buttons > :not(.disabled)').show();
     }
 
     /**
      * Open a task attachment either in a browser window for inline view or download it
      */
-    function load_attachment(rec, att)
+    function load_attachment(data)
     {
+        var rec = data.record;
+
         // can't open temp attachments
         if (!rec.id || rec.id < 0)
             return false;
 
-        var query = { _id: att.id, _t: rec.recurrence_id||rec.id, _list:rec.list, _frame: 1 };
+        var query = {_id: data.attachment.id, _t: rec.recurrence_id || rec.id, _list: rec.list};
+
         if (rec.rev)
             query._rev = rec.rev;
 
-
-        // open attachment in frame if it's of a supported mimetype
-        // similar as in app.js and calendar_ui.js
-        if (att.id && att.mimetype && $.inArray(att.mimetype, settings.mimetypes)>=0) {
-            if (rcmail.open_window(rcmail.url('get-attachment', query), true, true)) {
-                return;
-            }
-        }
-
-        query._frame = null;
-        query._download = 1;
-        rcmail.goto_url('get-attachment', query, false);
+        libkolab.load_attachment(query, data.attachment);
     };
 
     /**
      * Build task attachments list
      */
-    function task_show_attachments(list, container, rec, edit)
+    function task_show_attachments(list, container, task, edit)
     {
-        var i, id, len, content, li, elem,
-            ul = $('<ul>').addClass('attachmentslist');
-
-        for (i=0, len=list.length; i<len; i++) {
-            elem = list[i];
-            li = $('<li>').addClass(elem.classname);
-
-            if (edit) {
-                rcmail.env.attachments[elem.id] = elem;
-                // delete icon
-                content = $('<a>')
-                    .attr('href', '#delete')
-                    .attr('title', rcmail.gettext('delete'))
-                    .addClass('delete')
-                    .click({ id:elem.id }, function(e) {
-                        remove_attachment(this, e.data.id);
-                        return false;
-                    });
-
-                if (!rcmail.env.deleteicon) {
-                    content.html(rcmail.gettext('delete'));
-                }
-                else {
-                    $('<img>').attr('src', rcmail.env.deleteicon).attr('alt', rcmail.gettext('delete')).appendTo(content);
-                }
-
-                li.append(content);
-            }
-
-            // name/link
-            $('<a>')
-                .attr('href', '#load')
-                .addClass('file')
-                .html(elem.name).click({ task:rec, att:elem }, function(e) {
-                    load_attachment(e.data.task, e.data.att);
-                    return false;
-                }).appendTo(li);
-
-            ul.append(li);
-        }
-
-        if (edit && rcmail.gui_objects.attachmentlist) {
-            ul.id = rcmail.gui_objects.attachmentlist.id;
-            rcmail.gui_objects.attachmentlist = ul.get(0);
-        }
-
-        container.empty().append(ul);
+      libkolab.list_attachments(list, container, edit, task,
+        function(id) { remove_attachment(id); },
+        function(data) { load_attachment(data); }
+      );
     };
 
     /**
      *
      */
-    function remove_attachment(elem, id)
+    function remove_attachment(id)
     {
-        $(elem.parentNode).hide();
         me.selected_task.deleted_attachments.push(id);
-        delete rcmail.env.attachments[id];
     }
 
     /**
@@ -2823,6 +2839,7 @@
             html = rcmail.gettext('deleteparenttasktconfirm','tasklist');
             buttons.push({
                 text: rcmail.gettext('deletethisonly','tasklist'),
+                'class': 'delete',
                 click: function() {
                     _delete_task(id, 0);
                     $(this).dialog('close');
@@ -2830,6 +2847,7 @@
             });
             buttons.push({
                 text: rcmail.gettext('deletewithchilds','tasklist'),
+                'class': 'delete',
                 click: function() {
                     _delete_task(id, 1);
                     $(this).dialog('close');
@@ -2848,21 +2866,22 @@
             });
         }
 
-        if (is_attendee(rec)) {
-            html += '<div class="task-dialog-message">' +
-                '<label><input class="confirm-attendees-decline" type="checkbox" checked="checked" value="1" name="_decline" />&nbsp;' +
+        if (me.is_attendee(rec)) {
+            html += '<div class="dialog-message">' +
+                '<label><input class="confirm-attendees-decline pretty-checkbox" type="checkbox" checked="checked" value="1" name="_decline" />&nbsp;' +
                     rcmail.gettext('itipdeclinetask', 'tasklist') + 
                 '</label></div>';
         }
-        else if (has_attendees(rec) && is_organizer(rec)) {
-            html += '<div class="task-dialog-message">' +
-                '<label><input class="confirm-attendees-notify" type="checkbox" checked="checked" value="1" name="_notify" />&nbsp;' +
+        else if (me.has_attendees(rec) && me.is_organizer(rec)) {
+            html += '<div class="dialog-message">' +
+                '<label><input class="confirm-attendees-notify pretty-checkbox" type="checkbox" checked="checked" value="1" name="_notify" />&nbsp;' +
                     rcmail.gettext('sendcancellation', 'tasklist') + 
                 '</label></div>';
         }
 
         buttons.push({
             text: rcmail.gettext('cancel', 'tasklist'),
+            'class': 'cancel',
             click: function() {
                 $(this).dialog('close');
             }
@@ -2956,20 +2975,7 @@
      */
     function list_set_sort(col)
     {
-        if (settings.sort_col != col) {
-          settings.sort_col = col;
-          $('#taskviewsortmenu .sortcol').attr('aria-checked', 'false').removeClass('selected')
-              .filter('.by-' + col).attr('aria-checked', 'true').addClass('selected');
-
-          // re-sort list index and re-render list
-          listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
-          render_tasklist();
-
-          rcmail.enable_command('list-order', settings.sort_col != 'auto');
-          $('#taskviewsortmenu .sortorder').removeClass('selected').filter('[aria-checked=true]').addClass('selected');
-
-          rcmail.save_pref({ name: 'tasklist_sort_col', value: (col == 'auto' ? '' : col) });
-        }
+        list_set_sort_and_order(col, settings.sort_order);
     }
 
     /**
@@ -2977,108 +2983,95 @@
      */
     function list_set_order(order)
     {
-        if (settings.sort_order != order) {
-          settings.sort_order = order;
-          $('#taskviewsortmenu .sortorder').attr('aria-checked', 'false').removeClass('selected')
-              .filter('.' + order).attr('aria-checked', 'true').addClass('selected');
-
-          // re-sort list index and re-render list
-          listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
-          render_tasklist();
-
-          rcmail.save_pref({ name: 'tasklist_sort_order', value: order });
-        }
+        list_set_sort_and_order(settings.sort_col, order);
     }
 
     /**
-     *
+     * Change tasks list sorting and/or order
      */
-    function list_edit_dialog(id)
+    function list_set_sort_and_order(col, order)
     {
-        var list = me.tasklists[id],
-            $dialog = $(rcmail.gui_containers.tasklistform);
+        var col_change = settings.sort_col != col,
+            ord_change = settings.sort_order != order;
 
-        if ($dialog.is(':ui-dialog'))
-            $dialog.dialog('close');
+        if (col_change || ord_change) {
+            settings.sort_col = col;
+            settings.sort_order = order;
+
+            // re-sort list index and re-render list
+            listindex.sort(function(a, b) { return task_cmp(listdata[a], listdata[b]); });
+            render_tasklist();
+
+            rcmail.enable_command('list-order', settings.sort_col != 'auto');
 
-        if (!list)
-            list = { name:'', editable:true, rights:'riwta', showalarms:true };
+            if (col_change)
+                rcmail.save_pref({ name: 'tasklist_sort_col', value: (col == 'auto' ? '' : col) });
 
-        var editform, name, alarms;
+            if (ord_change)
+                rcmail.save_pref({ name: 'tasklist_sort_order', value: order });
+
+            $('#taskviewsortmenu .sortcol').attr('aria-checked', 'false').removeClass('selected')
+                .filter('.by-' + col).attr('aria-checked', 'true').addClass('selected');
+            $('#taskviewsortmenu .sortorder').removeClass('selected')
+                .filter('[aria-checked=true]').addClass('selected');
+        }
+    }
+
+    function get_setting(name)
+    {
+        return settings[name];
+    }
+
+    /**
+     * Dialog for tasks list creation/update
+     */
+    function list_edit_dialog(id)
+    {
+        var list = me.tasklists[id] || {name: '', editable: true, rights: 'riwta', showalarms: true},
+            title = rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
+            params = {action: (list.id ? 'form-edit' : 'form-new'), l: { id:list.id }, _framed: 1},
+            $dialog = $('<iframe>').attr('src', rcmail.url('tasklist', params)).on('load', function() {
+                $(this).contents().find('#taskedit-showalarms')
+                    .prop('checked', list.showalarms);
+                $(this).contents().find('#taskedit-tasklistname')
+                    .prop('disabled', !me.has_permission(list, 'a') || list.norename)
+                    .val(list.editname || list.name)
+                    .select();
+            }),
+            save_func = function() {
+                var data,
+                    form = $dialog.contents().find('#tasklisteditform'),
+                    name = form.find('#taskedit-tasklistname');
 
-        $dialog.html(rcmail.get_label('loading'));
-        $.ajax({
-            type: 'GET',
-            dataType: 'html',
-            url: rcmail.url('tasklist'),
-            data: { action:(list.id ? 'form-edit' : 'form-new'), l:{ id:list.id } },
-            success: function(data) {
-                $dialog.html(data);
-                rcmail.triggerEvent('tasklist_editform_load', list);
-
-                // resize and reposition dialog window
-                editform = $('#tasklisteditform');
-                me.dialog_resize(rcmail.gui_containers.tasklistform, editform.height(), editform.width());
-
-                name = $('#taskedit-tasklistame').prop('disabled', !has_permission(list, 'a')||list.norename).val(list.editname || list.name);
-                alarms = $('#taskedit-showalarms').prop('checked', list.showalarms).get(0);
-                name.select();
-
-                // suppress form submission with <Enter>
-                editform.on('submit', function(e) {
-                    e.preventDefault();
+                // form is not loaded
+                if (!form || !form.length)
                     return false;
-                });
-            }
-        });
 
-        // dialog buttons
-        var buttons = [];
+                // do some input validation
+                if (!name.val() || name.val().length < 2) {
+                    rcmail.alert_dialog(rcmail.gettext('invalidlistproperties', 'tasklist'), function() {
+                        name.select();
+                    });
 
-        buttons.push({
-            text: rcmail.gettext('save','tasklist'),
-            'class': 'mainaction',
-            click: function() {
-            // do some input validation
-            if (!name.val() || name.val().length < 2) {
-                alert(rcmail.gettext('invalidlistproperties', 'tasklist'));
-                name.select();
-                return;
-            }
+                    return false;
+                }
 
-            // post data to server
-            var data = editform.serializeJSON();
-            if (list.id)
-                data.id = list.id;
-            if (alarms)
-                data.showalarms = alarms.checked ? 1 : 0;
+                // post data to server
+                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 });
-            $dialog.dialog('close');
-        }  // end click:
-        });
+                saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
+                rcmail.http_post('tasklist', {action: (list.id ? 'edit' : 'new'), l: data});
+                return true;
+            };
 
-        buttons.push({
-            text: rcmail.gettext('cancel','tasklist'),
-            click: function() {
-                $dialog.dialog('close');
-            }
+        rcmail.simple_dialog($dialog, title, save_func, {
+            width: 600,
+            height: 400
         });
-
-        // open jquery UI dialog
-        $dialog.dialog({
-            modal: true,
-            resizable: true,
-            closeOnEscape: false,
-            title: rcmail.gettext((list.id ? 'editlist' : 'createlist'), 'tasklist'),
-            close: function() {
-                $dialog.dialog('destroy').hide();
-            },
-            buttons: buttons,
-            minWidth: 400,
-            width: 420
-        }).show();
     }
 
     /**
@@ -3087,11 +3080,13 @@
     function list_delete(id)
     {
         var list = me.tasklists[id];
-        if (list && !list.norename && confirm(rcmail.gettext(list.children ? 'deletelistconfirmrecursive' : 'deletelistconfirm', 'tasklist'))) {
-            saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
-            rcmail.http_post('tasklist', { action:'delete', l:{ id:list.id } });
-            return true;
+        if (list && !list.norename) {
+            rcmail.confirm_dialog(rcmail.gettext(list.children ? 'deletelistconfirmrecursive' : 'deletelistconfirm', 'tasklist'), 'delete', function() {
+                saving_lock = rcmail.set_busy(true, 'tasklist.savingdata');
+                rcmail.http_post('tasklist', { action:'delete', l:{ id:list.id } });
+            });
         }
+
         return false;
     }
 
@@ -3192,28 +3187,20 @@
     }
 
     /**
-     *
+     * Display tasklist CalDAV URL dialog
      */
     function list_showurl(id)
     {
         var list = me.tasklists[id];
         if (list && list.caldavurl) {
-            $('div.showurldialog:ui-dialog').dialog('close');
-
-            var $dialog = $('<div>').addClass('showurldialog').append('<p>'+rcmail.gettext('caldavurldescription', 'tasklist')+'</p>'),
-                textbox = $('<textarea>').addClass('urlbox').css('width', '100%').attr('rows', 2).appendTo($dialog);
-
-            $dialog.dialog({
-                resizable: true,
-                closeOnEscape: true,
-                title: rcmail.gettext('showcaldavurl', 'tasklist'),
-                close: function() {
-                  $dialog.dialog("destroy").remove();
-                },
-                width: 520
-            }).show();
-
-            textbox.val(list.caldavurl).select();
+            var dialog = $('<div>').addClass('showurldialog').append('<p>'+rcmail.gettext('caldavurldescription', 'tasklist')+'</p>'),
+                textbox = $('<textarea>').addClass('urlbox form-control').css('width', '100%')
+                    .attr({rows: 3, readonly: true}).appendTo(dialog);
+
+            rcmail.simple_dialog(dialog, 'tasklist.showcaldavurl', null, {
+                open: function() { textbox.val(list.caldavurl).select(); },
+                cancel_button: 'close'
+            });
         }
     }
 
@@ -3260,8 +3247,9 @@
         }
     }
 
-
-    // method to show the print dialog.
+    /**
+     * Method to show the tasks print page.
+     */
     function print_tasks()
     {
         var param = {}, active = active_lists();
@@ -3340,13 +3328,6 @@
         return active;
     }
 
-    // resize and reposition (center) the dialog window
-    this.dialog_resize = function(id, height, width)
-    {
-        var win = $(window), w = win.width(), h = win.height();
-        $(id).dialog('option', { height: Math.min(h-20, height+130), width: Math.min(w-20, width+50) });
-    };
-
     /**
      * Enable/disable focusview mode for the given list
      */
@@ -3401,27 +3382,6 @@
     init_taskedit();
 }
 
-
-// extend jQuery
-// from http://james.padolsey.com/javascript/sorting-elements-with-jquery/
-jQuery.fn.sortElements = (function(){
-    var sort = [].sort;
-
-    return function(comparator, getSortable) {
-        getSortable = getSortable || function(){ return this };
-
-        var last = null;
-        return sort.call(this, comparator).each(function(i){
-            // at this point the array is sorted, so we can just detach each one from wherever it is, and add it after the last
-            var node = $(getSortable.call(this));
-            var parent = node.parent();
-            if (last) last.after(node);
-            else      parent.prepend(node);
-            last = node;
-        });
-    };
-})();
-
 // equivalent to $.unique() but working on arrays of strings
 jQuery.uniqueStrings = (function() {
     return function(arr) {
@@ -3438,28 +3398,69 @@
     };
 })();
 
+/**
+ * Tasks list options dialog
+ */
+function tasklist_options_menu(p)
+{
+    var content = $('#listoptions-menu'),
+        width = content.width() + 25,
+        dialog = content.clone();
+
+    // set form values
+    $('#options-sortcol', dialog).val(rctasks.get_setting('sort_col') || 'auto');
+    $('#options-ord', dialog).val(rctasks.get_setting('sort_order') || 'asc');
+
+    // Fix id/for attributes
+    $('select', dialog).each(function() { this.id = this.id + '-clone'; });
+    $('label', dialog).each(function() { $(this).attr('for', $(this).attr('for') + '-clone'); });
+
+    var save_func = function(e) {
+        if (rcube_event.is_keyboard(e.originalEvent)) {
+            $('#listmenulink').focus();
+        }
+
+        var col = $('#options-sortcol-clone', dialog).val(),
+            ord = $('#options-ord-clone', dialog).val();
+
+        rctasks.list_set_sort_and_order(col, ord);
+        return true;
+    };
+
+    dialog = rcmail.simple_dialog(dialog, rcmail.gettext('listoptionstitle'), save_func, {
+        closeOnEscape: true,
+        minWidth: 400,
+        width: width
+    });
+};
+
 
 /* tasklist plugin UI initialization */
 var rctasks;
-window.rcmail && rcmail.addEventListener('init', function(evt) {
 
-  rctasks = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, rcmail.env.libcal_settings));
+window.rcmail && rcmail.addEventListener('init', function(evt) {
+    rctasks = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, rcmail.env.libcal_settings));
 
-  // register button commands
-  rcmail.register_command('newtask', function(){ rctasks.edit_task(null, 'new', {}); }, true);
-  rcmail.register_command('print', function(){ rctasks.print_tasks(); }, true);
-
-  rcmail.register_command('list-create', function(){ rctasks.list_edit_dialog(null); }, true);
-  rcmail.register_command('list-edit', function(){ rctasks.list_edit_dialog(rctasks.selected_list); }, false);
-  rcmail.register_command('list-delete', function(){ rctasks.list_delete(rctasks.selected_list); }, false);
-  rcmail.register_command('list-remove', function(){ rctasks.list_remove(rctasks.selected_list); }, false);
-  rcmail.register_command('list-showurl', function(){ rctasks.list_showurl(rctasks.selected_list); }, false);
-
-  rcmail.register_command('export', function(){ rctasks.export_tasks(); }, true);
-  rcmail.register_command('search', function(){ rctasks.quicksearch(); }, true);
-  rcmail.register_command('reset-search', function(){ rctasks.reset_search(); }, true);
-  rcmail.register_command('expand-all', function(){ rctasks.expand_collapse(true); }, true);
-  rcmail.register_command('collapse-all', function(){ rctasks.expand_collapse(false); }, true);
+    // register button commands
+    rcmail.register_command('newtask', function(){ rctasks.edit_task(null, 'new', {}); }, true);
+    rcmail.register_command('print', function(){ rctasks.print_tasks(); }, true);
+    rcmail.register_command('import', function(){ rctasks.import_tasks(rctasks.selected_list); }, true);
+    rcmail.register_command('edit-task', function(){ rctasks.edit_task(rctasks.selected_task.id, 'edit'); });
+    rcmail.register_command('delete-task', function(){ rctasks.delete_task(rctasks.selected_task.id); });
+    rcmail.register_command('add-child-task', function(){ rctasks.add_childtask(rctasks.selected_task.id); });
+    rcmail.register_command('save-task', function(){ rcmail.env.task_save_func(); });
+
+    rcmail.register_command('list-create', function(){ rctasks.list_edit_dialog(null); }, true);
+    rcmail.register_command('list-edit', function(){ rctasks.list_edit_dialog(rctasks.selected_list); }, false);
+    rcmail.register_command('list-delete', function(){ rctasks.list_delete(rctasks.selected_list); }, false);
+    rcmail.register_command('list-remove', function(){ rctasks.list_remove(rctasks.selected_list); }, false);
+    rcmail.register_command('list-showurl', function(){ rctasks.list_showurl(rctasks.selected_list); }, false);
+
+    rcmail.register_command('export', function(){ rctasks.export_tasks(); }, true);
+    rcmail.register_command('search', function(){ rctasks.quicksearch(); }, true);
+    rcmail.register_command('reset-search', function(){ rctasks.reset_search(); }, true);
+    rcmail.register_command('expand-all', function(){ rctasks.expand_collapse(true); }, true);
+    rcmail.register_command('collapse-all', function(){ rctasks.expand_collapse(false); }, true);
 
-  rctasks.init();
+    rctasks.init();
 });

iRony-0.4.0.tar.gz/lib/plugins/tasklist/tasklist.php -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/tasklist.php Changed

@@ -74,6 +74,7 @@
     function init()
     {
         $this->require_plugin('libcalendaring');
+        $this->require_plugin('libkolab');
         $this->require_plugin('jqueryui');
 
         $this->rc  = rcube::get_instance();
@@ -115,10 +116,10 @@
             $this->register_action('counts', array($this, 'fetch_counts'));
             $this->register_action('fetch', array($this, 'fetch_tasks'));
             $this->register_action('print', array($this, 'print_tasks'));
-            $this->register_action('inlineui', array($this, 'get_inline_ui'));
-            $this->register_action('mail2task', array($this, 'mail_message2task'));
+            $this->register_action('dialog-ui', array($this, 'mail_message2task'));
             $this->register_action('get-attachment', array($this, 'attachment_get'));
             $this->register_action('upload', array($this, 'attachment_upload'));
+            $this->register_action('import', array($this, 'import_tasks'));
             $this->register_action('export', array($this, 'export_tasks'));
             $this->register_action('mailimportitip', array($this, 'mail_import_itip'));
             $this->register_action('mailimportattach', array($this, 'mail_import_attachment'));
@@ -139,7 +140,7 @@
             }
 
             // add 'Create event' item to message menu
-            if ($this->api->output->type == 'html') {
+            if ($this->api->output->type == 'html' && $_GET['_rel'] != 'task') {
                 $this->api->add_content(html::tag('li', null, 
                     $this->api->output->button(array(
                         'command'  => 'tasklist-create-from-mail',
@@ -181,8 +182,9 @@
      */
     private function load_driver()
     {
-        if (is_object($this->driver))
+        if (is_object($this->driver)) {
             return;
+        }
 
         $driver_name  = $this->rc->config->get('tasklist_driver', 'database');
         $driver_class = 'tasklist_' . $driver_name . '_driver';
@@ -190,18 +192,11 @@
         require_once($this->home . '/drivers/tasklist_driver.php');
         require_once($this->home . '/drivers/' . $driver_name . '/' . $driver_class . '.php');
 
-        switch ($driver_name) {
-        case "kolab":
-            $this->require_plugin('libkolab');
-        default:
-            $this->driver = new $driver_class($this);
-            break;
-        }
+        $this->driver = new $driver_class($this);
 
         $this->rc->output->set_env('tasklist_driver', $driver_name);
     }
 
-
     /**
      * Dispatcher for task-related actions initiated by the client
      */
@@ -559,7 +554,7 @@
         }
 
         // unlock client
-        $this->rc->output->command('plugin.unlock_saving');
+        $this->rc->output->command('plugin.unlock_saving', $success);
 
         if ($refresh) {
             if ($refresh['id']) {
@@ -995,6 +990,7 @@
         switch ($action) {
         case 'form-new':
         case 'form-edit':
+            $this->load_ui();
             echo $this->ui->tasklist_editform($action, $list);
             exit;
 
@@ -1051,7 +1047,7 @@
             }
             // report more results available
             if ($this->driver->search_more_results) {
-                $this->rc->output->show_message('autocompletemore', 'info');
+                $this->rc->output->show_message('autocompletemore', 'notice');
             }
 
             $this->rc->output->command('multi_thread_http_response', $results, rcube_utils::get_input_value('_reqid', rcube_utils::INPUT_GPC));
@@ -1450,42 +1446,6 @@
         $this->rc->output->send('tasklist.mainview');
     }
 
-
-    /**
-     *
-     */
-    public function get_inline_ui()
-    {
-        foreach (array('save','cancel','savingdata') as $label)
-            $texts['tasklist.'.$label] = $this->gettext($label);
-
-        $texts['tasklist.newtask'] = $this->gettext('createfrommail');
-
-
-        $this->ui->init_templates();
-        $this->ui->tasklists();
-
-        // collect env variables
-        $env = array(
-            'tasklists' => $this->rc->output->get_env('tasklists'),
-            'tasklist_settings' => $this->ui->load_settings(),
-        );
-
-        echo $this->api->output->parse('tasklist.taskedit', false, false);
-
-        $script_add = '';
-        foreach ($this->ui->get_gui_objects() as $obj => $id) {
-            $script_add .= rcmail_output::JS_OBJECT_NAME . ".gui_object('$obj', '$id');\n";
-        }
-
-        echo html::tag('script', array('type' => 'text/javascript'),
-            rcmail_output::JS_OBJECT_NAME . ".set_env(" . json_encode($env) . ");\n".
-            rcmail_output::JS_OBJECT_NAME . ".add_label(" . json_encode($texts) . ");\n".
-            $script_add
-        );
-        exit;
-    }
-
     /**
      * Handler for keep-alive requests
      * This will check for updated data in active lists and sync them to the client
@@ -1552,6 +1512,126 @@
     }
 
     /**
+     * Handler for importing .ics files
+     */
+    function import_tasks()
+    {
+        // Upload progress update
+        if (!empty($_GET['_progress'])) {
+            $this->rc->upload_progress();
+        }
+
+        @set_time_limit(0);
+
+        // process uploaded file if there is no error
+        $err = $_FILES['_data']['error'];
+
+        if (!$err && $_FILES['_data']['tmp_name']) {
+            $source = rcube_utils::get_input_value('source', rcube_utils::INPUT_GPC);
+            $lists  = $this->driver->get_lists();
+            $list   = $lists[$source] ?: $this->get_default_tasklist();
+            $source = $list['id'];
+
+            // extract zip file
+            if ($_FILES['_data']['type'] == 'application/zip') {
+                $count = 0;
+                if (class_exists('ZipArchive', false)) {
+                    $zip = new ZipArchive();
+                    if ($zip->open($_FILES['_data']['tmp_name'])) {
+                        $randname = uniqid('zip-' . session_id(), true);
+                        $tmpdir   = slashify($this->rc->config->get('temp_dir', sys_get_temp_dir())) . $randname;
+                        mkdir($tmpdir, 0700);
+
+                        // extract each ical file from the archive and import it
+                        for ($i = 0; $i < $zip->numFiles; $i++) { 
+                            $filename = $zip->getNameIndex($i);
+                            if (preg_match('/\.ics$/i', $filename)) {
+                                $tmpfile = $tmpdir . '/' . basename($filename);
+                                if (copy('zip://' . $_FILES['_data']['tmp_name'] . '#'.$filename, $tmpfile)) {
+                                    $count += $this->import_from_file($tmpfile, $source, $errors);
+                                    unlink($tmpfile);
+                                }
+                            }
+                        }
+
+                        rmdir($tmpdir);
+                        $zip->close();
+                    }
+                    else {
+                        $errors = 1;
+                        $msg = 'Failed to open zip file.';
+                    }
+                }
+                else {
+                    $errors = 1;
+                    $msg = 'Zip files are not supported for import.';
+                }
+            }
+            else {
+                // attempt to import the uploaded file directly
+                $count = $this->import_from_file($_FILES['_data']['tmp_name'], $source, $errors);
+            }
+
+            if ($count) {
+                $this->rc->output->command('display_message', $this->gettext(array('name' => 'importsuccess', 'vars' => array('nr' => $count))), 'confirmation');
+                $this->rc->output->command('plugin.import_success', array('source' => $source, 'refetch' => true));
+            }
+            else if (!$errors) {
+                $this->rc->output->command('display_message', $this->gettext('importnone'), 'notice');
+                $this->rc->output->command('plugin.import_success', array('source' => $source));
+            }
+            else {
+                $this->rc->output->command('plugin.import_error', array('message' => $this->gettext('importerror') . ($msg ? ': ' . $msg : '')));
+            }
+        }
+        else {
+            if ($err == UPLOAD_ERR_INI_SIZE || $err == UPLOAD_ERR_FORM_SIZE) {
+                $msg = $this->rc->gettext(array('name' => 'filesizeerror', 'vars' => array(
+                    'size' => $this->rc->show_bytes(parse_bytes(ini_get('upload_max_filesize'))))));
+            }
+            else {
+                $msg = $this->rc->gettext('fileuploaderror');
+            }
+
+            $this->rc->output->command('plugin.import_error', array('message' => $msg));
+        }
+
+        $this->rc->output->send('iframe');
+    }
+
+    /**
+     * Helper function to parse and import a single .ics file
+     */
+    private function import_from_file($filepath, $source, &$errors)
+    {
+        $user_email = $this->rc->user->get_username();
+        $ical       = $this->get_ical();
+        $errors     = !$ical->fopen($filepath);
+        $count      = $i = 0;
+
+        foreach ($ical as $task) {
+            // keep the browser connection alive on long import jobs
+            if (++$i > 100 && $i % 100 == 0) {
+                echo "";
+                ob_flush();
+            }
+
+            if ($task['_type'] == 'task') {
+                $task['list'] = $source;
+
+                if ($this->driver->create_task($task)) {
+                    $count++;
+                }
+                else {
+                    $errors++;
+                }
+            }
+        }
+
+        return $count;
+    }
+
+    /**
      * Construct the ics file for exporting tasks to iCalendar format
      */
     function export_tasks()
@@ -1632,7 +1712,8 @@
     */
     public function attachment_upload()
     {
-        $this->lib->attachment_upload(self::SESSION_KEY);
+        $handler = new kolab_attachments_handler();
+        $handler->attachment_upload(self::SESSION_KEY);
     }
 
     /**
@@ -1640,9 +1721,11 @@
      */
     public function attachment_get()
     {
+        $handler = new kolab_attachments_handler();
+
         // show loading page
         if (!empty($_GET['_preload'])) {
-            return $this->lib->attachment_loading_page();
+            return $handler->attachment_loading_page();
         }
 
         $task = rcube_utils::get_input_value('_t', rcube_utils::INPUT_GPC);
@@ -1650,20 +1733,17 @@
         $id   = rcube_utils::get_input_value('_id', rcube_utils::INPUT_GPC);
         $rev  = rcube_utils::get_input_value('_rev', rcube_utils::INPUT_GPC);
 
-        $task = array('id' => $task, 'list' => $list, 'rev' => $rev);
+        $task       = array('id' => $task, 'list' => $list, 'rev' => $rev);
         $attachment = $this->driver->get_attachment($id, $task);
 
         // show part page
         if (!empty($_GET['_frame'])) {
-            $this->lib->attachment = $attachment;
-            $this->register_handler('plugin.attachmentframe', array($this->lib, 'attachment_frame'));
-            $this->register_handler('plugin.attachmentcontrols', array($this->lib, 'attachment_header'));
-            $this->rc->output->send('tasklist.attachment');
+            $handler->attachment_page($attachment);
         }
         // deliver attachment content
         else if ($attachment) {
             $attachment['body'] = $this->driver->get_attachment_body($id, $task);
-            $this->lib->attachment_get($attachment);
+            $handler->attachment_get($attachment);
         }
 
         // if we arrive here, the requested part was not found
@@ -1676,19 +1756,22 @@
 
     public function mail_message2task()
     {
-        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_POST);
-        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
+        $this->load_ui();
+        $this->ui->init();
+        $this->ui->init_templates();
+        $this->ui->tasklists();
+
+        $uid  = rcube_utils::get_input_value('_uid', rcube_utils::INPUT_GET);
+        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_GET);
         $task = array();
 
-        // establish imap connection
-        $imap = $this->rc->get_storage();
-        $imap->set_folder($mbox);
-        $message = new rcube_message($uid);
+        $imap    = $this->rc->get_storage();
+        $message = new rcube_message($uid, $mbox);
 
         if ($message->headers) {
-            $task['title'] = trim($message->subject);
+            $task['title']       = trim($message->subject);
             $task['description'] = trim($message->first_text_part());
-            $task['id'] = -$uid;
+            $task['id']          = -$uid;
 
             $this->load_driver();
 
@@ -1699,18 +1782,19 @@
             // copy mail attachments to task
             else if ($message->attachments && $this->driver->attachments) {
                 if (!is_array($_SESSION[self::SESSION_KEY]) || $_SESSION[self::SESSION_KEY]['id'] != $task['id']) {
-                    $_SESSION[self::SESSION_KEY] = array();
-                    $_SESSION[self::SESSION_KEY]['id'] = $task['id'];
-                    $_SESSION[self::SESSION_KEY]['attachments'] = array();
+                    $_SESSION[self::SESSION_KEY] = array(
+                        'id'          => $task['id'],
+                        'attachments' => array(),
+                    );
                 }
 
                 foreach ((array)$message->attachments as $part) {
                     $attachment = array(
-                        'data' => $imap->get_message_part($uid, $part->mime_id, $part),
-                        'size' => $part->size,
-                        'name' => $part->filename,
+                        'data'     => $imap->get_message_part($uid, $part->mime_id, $part),
+                        'size'     => $part->size,
+                        'name'     => $part->filename,
                         'mimetype' => $part->mimetype,
-                        'group' => $task['id'],
+                        'group'    => $task['id'],
                     );
 
                     $attachment = $this->rc->plugins->exec_hook('attachment_save', $attachment);
@@ -1729,13 +1813,13 @@
                 }
             }
 
-            $this->rc->output->command('plugin.mail2taskdialog', $task);
+            $this->rc->output->set_env('task_prop', $task);
         }
         else {
             $this->rc->output->command('display_message', $this->gettext('messageopenerror'), 'error');
         }
 
-        $this->rc->output->send();
+        $this->rc->output->send('tasklist.dialog');
     }
 
     /**
@@ -1763,7 +1847,7 @@
 
             // get prepared inline UI for this event object
             if ($ical_objects->method) {
-                $html .= html::div('tasklist-invitebox',
+                $html .= html::div('tasklist-invitebox invitebox boxinformation',
                     $this->itip->mail_itip_inline_ui(
                         $task,
                         $ical_objects->method,
@@ -1805,7 +1889,7 @@
             );
         }
         if (count($links)) {
-            $html .= html::div('messagetasklinks', html::tag('ul', 'tasklist', join("\n", $links)));
+            $html .= html::div('messagetasklinks boxinformation', html::tag('ul', 'tasklist', join("\n", $links)));
         }
 
         // prepend iTip/relation boxes to message body
@@ -2273,7 +2357,7 @@
         // get a list of writeable lists to save new tasks to
         if ((!$existing || $is_shared) && $response['action'] == 'rsvp' || $response['action'] == 'import') {
             $lists  = $this->driver->get_lists($mode);
-            $select = new html_select(array('name' => 'tasklist', 'id' => 'itip-saveto', 'is_escaped' => true));
+            $select = new html_select(array('name' => 'tasklist', 'id' => 'itip-saveto', 'is_escaped' => true, 'class' => 'form-control'));
             $select->add('--', '');
 
             foreach ($lists as $list) {

iRony-0.4.0.tar.gz/lib/plugins/tasklist/tasklist_base.js -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/tasklist_base.js Changed

@@ -6,7 +6,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2013, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2013-2018, Kolab Systems AG <contact@kolabsys.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -27,17 +27,8 @@
  
 function rcube_tasklist(settings)
 {
-    /* private vars */
-    var ui_loaded = false;
-    var me = this;
-    var mywin = window;
-
-    /*  public members  */
-    this.ui = null;
-
     /* public methods */
     this.create_from_mail = create_from_mail;
-    this.mail2taskdialog = mail2task_dialog;
     this.save_to_tasklist = save_to_tasklist;
 
 
@@ -46,51 +37,37 @@
      */
     function create_from_mail(uid)
     {
-        if (uid || (uid = rcmail.get_single_uid())) {
-            // load calendar UI (scripts and edit dialog template)
-            if (!ui_loaded) {
-                $.when(
-                    $.getScript(rcmail.assets_path('plugins/tasklist/tasklist.js')),
-                    $.get(rcmail.url('tasks/inlineui'), function(html) { $(document.body).append(html); }, 'html')
-                ).then(function() {
-                    // register attachments form
-                    // rcmail.gui_object('attachmentlist', 'attachmentlist');
-
-                    ui_loaded = true;
-                    me.ui = new rcube_tasklist_ui($.extend(rcmail.env.tasklist_settings, settings));
-                    create_from_mail(uid);  // start over
-                });
-
-                return;
-            }
-
-            // get message contents for task dialog
-            var lock = rcmail.set_busy(true, 'loading');
-            rcmail.http_post('tasks/mail2task', {
-                '_mbox': rcmail.env.mailbox,
-                '_uid': uid
-            }, lock);
+        if (!uid && !(uid = rcmail.get_single_uid())) {
+            return;
         }
-    }
-
-    /**
-     * Callback function to put the given task properties into the dialog
-     */
-    function mail2task_dialog(prop)
-    {
-        this.ui.edit_task(null, 'new', prop);
-        rcmail.addEventListener('responseaftertask', refresh_mailview);
-    }
 
-    /**
-     * Reload the mail view/preview to update the tasks listing
-     */
-    function refresh_mailview(e)
-    {
-        var win = rcmail.env.contentframe ? rcmail.get_frame_window(rcmail.env.contentframe) : mywin;
-        if (win && e.response.action == 'task') {
-            win.location.reload();
-        }
+        var url = {_mbox: rcmail.env.mailbox, _uid: uid, _framed: 1},
+            buttons = {},
+            button_classes = ['mainaction save', 'cancel'],
+            title = rcmail.gettext('tasklist.createfrommail'),
+            dialog = $('<iframe>').attr({
+                id: 'kolabtasksinlinegui',
+                name: 'kolabtasksdialog',
+                src: rcmail.url('tasks/dialog-ui', url)
+            });
+
+        // dialog buttons
+        buttons[rcmail.gettext('save')] = function() {
+            var frame = rcmail.get_frame_window('kolabtasksinlinegui');
+            frame.rcmail.command('save-task');
+        };
+
+        buttons[rcmail.gettext('cancel')] = function() {
+            dialog.dialog('destroy');
+        };
+
+        // open jquery UI dialog
+        window.kolab_task_dialog_element = dialog = rcmail.show_popup_dialog(dialog, title, buttons, {
+            button_classes: button_classes,
+            minWidth: 500,
+            width: 600,
+            height: 600
+        });
     }
 
     // handler for attachment-save-tasklist commands
@@ -108,7 +85,7 @@
     }
 
     // register event handlers on linked task items in message view
-    // the checkbox allows to mark a task as complete 
+    // the checkbox allows to mark a task as complete
     if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
         $('div.messagetasklinks input.complete').click(function(e) {
             var $this = $(this);
@@ -130,8 +107,6 @@
 
     rcmail.register_command('tasklist-create-from-mail', function() { tasks.create_from_mail(); });
     rcmail.register_command('attachment-save-task', function() { tasks.save_to_tasklist(); });
-    rcmail.addEventListener('plugin.mail2taskdialog', function(p) { tasks.mail2taskdialog(p); });
-    rcmail.addEventListener('plugin.unlock_saving', function(p) { tasks.ui && tasks.ui.unlock_saving(); });
 
     if (rcmail.env.action != 'show')
         rcmail.env.message_commands.push('tasklist-create-from-mail');

iRony-0.4.0.tar.gz/lib/plugins/tasklist/tasklist_ui.php -> iRony-0.4.1.tar.gz/lib/plugins/tasklist/tasklist_ui.php Changed

@@ -51,13 +51,12 @@
             'classsel'   => 'button-tasklist button-selected',
             'innerclass' => 'button-inner',
             'label'      => 'tasklist.navtitle',
+            'type'       => 'link'
         ), 'taskbar');
 
         $this->plugin->include_stylesheet($this->plugin->local_skin_path() . '/tasklist.css');
 
         if ($this->rc->task == 'mail' || $this->rc->task == 'tasks') {
-            jqueryui::tagedit();
-
             $this->plugin->include_script('tasklist_base.js');
 
             // copy config to client
@@ -144,13 +143,9 @@
         $this->plugin->register_handler('plugin.searchform', array($this->rc->output, 'search_form'));
         $this->plugin->register_handler('plugin.quickaddform', array($this, 'quickadd_form'));
         $this->plugin->register_handler('plugin.tasks', array($this, 'tasks_resultview'));
-        $this->plugin->register_handler('plugin.tagslist', array($this, 'tagslist'));
         $this->plugin->register_handler('plugin.tags_editline', array($this, 'tags_editline'));
         $this->plugin->register_handler('plugin.alarm_select', array($this, 'alarm_select'));
         $this->plugin->register_handler('plugin.recurrence_form', array($this->plugin->lib, 'recurrence_form'));
-        $this->plugin->register_handler('plugin.attachments_form', array($this, 'attachments_form'));
-        $this->plugin->register_handler('plugin.attachments_list', array($this, 'attachments_list'));
-        $this->plugin->register_handler('plugin.filedroparea', array($this, 'file_drop_area'));
         $this->plugin->register_handler('plugin.attendees_list', array($this, 'attendees_list'));
         $this->plugin->register_handler('plugin.attendees_form', array($this, 'attendees_form'));
         $this->plugin->register_handler('plugin.identity_select', array($this, 'identity_select'));
@@ -158,17 +153,12 @@
         $this->plugin->register_handler('plugin.task_rsvp_buttons', array($this->plugin->itip, 'itip_rsvp_buttons'));
         $this->plugin->register_handler('plugin.object_changelog_table', array('libkolab', 'object_changelog_table'));
         $this->plugin->register_handler('plugin.tasks_export_form', array($this, 'tasks_export_form'));
+        $this->plugin->register_handler('plugin.tasks_import_form', array($this, 'tasks_import_form'));
 
-        jqueryui::tagedit();
+        kolab_attachments_handler::ui();
 
         $this->plugin->include_script('tasklist.js');
-        $this->rc->output->include_script('treelist.js');
-
-        // include kolab folderlist widget if available
-        if (in_array('libkolab', $this->plugin->api->loaded_plugins())) {
-            $this->plugin->api->include_script('libkolab/js/folderlist.js');
-            $this->plugin->api->include_script('libkolab/js/audittrail.js');
-        }
+        $this->plugin->api->include_script('libkolab/libkolab.js');
     }
 
     /**
@@ -206,6 +196,8 @@
             }
         }
 
+        $this->rc->output->include_script('treelist.js');
+
         $this->rc->output->set_env('source', rcube_utils::get_input_value('source', rcube_utils::INPUT_GET));
         $this->rc->output->set_env('tasklists', $jsenv);
         $this->register_gui_object('tasklistslist', $attrib['id']);
@@ -261,8 +253,8 @@
         }
 
         $classes = array('tasklist');
-        $title = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
-          html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
+        $title   = $prop['title'] ?: ($prop['name'] != $prop['listname'] || strlen($prop['name']) > 25 ?
+            html_entity_decode($prop['name'], ENT_COMPAT, RCUBE_CHARSET) : '');
 
         if ($prop['virtual'])
             $classes[] = 'virtual';
@@ -275,15 +267,22 @@
 
         if (!$activeonly || $prop['active']) {
             $label_id = 'tl:' . $id;
+            $chbox = html::tag('input', array(
+                    'type'    => 'checkbox',
+                    'name'    => '_list[]',
+                    'value'   => $id,
+                    'checked' => $prop['active'],
+                    'title'   => $this->plugin->gettext('activate'),
+                    'aria-labelledby' => $label_id
+            ));
+
             return html::div(join(' ', $classes),
-                html::span(array('class' => 'listname', 'title' => $title, 'id' => $label_id), $prop['listname'] ?: $prop['name']) .
-                  ($prop['virtual'] ? '' :
-                      html::tag('input', array('type' => 'checkbox', 'name' => '_list[]', 'value' => $id, 'checked' => $prop['active'], 'aria-labelledby' => $label_id)) .
-                      html::span('actions', 
-                          ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '') .
-                          html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ') .
-                          (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
-                      )
+                html::a(array('class' => 'listname', 'title' => $title, 'href' => '#', 'id' => $label_id), $prop['listname'] ?: $prop['name']) .
+                    ($prop['virtual'] ? '' : $chbox . html::span('actions',
+                          ($prop['removable'] ? html::a(array('href' => '#', 'class' => 'remove', 'title' => $this->plugin->gettext('removelist')), ' ') : '')
+                          . html::a(array('href' => '#', 'class' => 'quickview', 'title' => $this->plugin->gettext('focusview'), 'role' => 'checkbox', 'aria-checked' => 'false'), ' ')
+                          . (isset($prop['subscribed']) ? html::a(array('href' => '#', 'class' => 'subscribed', 'title' => $this->plugin->gettext('tasklistsubscribe'), 'role' => 'checkbox', 'aria-checked' => $prop['subscribed'] ? 'true' : 'false'), ' ') : '')
+                    )
                 )
             );
         }
@@ -335,31 +334,40 @@
         return $select->show($default);
     }
 
-
     function tasklist_editform($action, $list = array())
     {
+        $this->action = $action;
+        $this->list   = $list;
+
+        $this->rc->output->set_env('pagetitle', $this->plugin->gettext('arialabeltasklistform'));
+        $this->rc->output->add_handler('folderform', array($this, 'tasklistform'));
+        $this->rc->output->send('libkolab.folderform');
+    }
+
+    function tasklistform($attrib)
+    {
         $fields = array(
             'name' => array(
-                'id' => 'taskedit-tasklistame',
+                'id'    => 'taskedit-tasklistname',
                 'label' => $this->plugin->gettext('listname'),
-                'value' => html::tag('input', array('id' => 'taskedit-tasklistame', 'name' => 'name', 'type' => 'text', 'class' => 'text', 'size' => 40)),
+                'value' => html::tag('input', array('id' => 'taskedit-tasklistname', 'name' => 'name', 'type' => 'text', 'class' => 'text', 'size' => 40)),
             ),
 /*
             'color' => array(
-                'id' => 'taskedit-color',
+                'id'    => 'taskedit-color',
                 'label' => $this->plugin->gettext('color'),
                 'value' => html::tag('input', array('id' => 'taskedit-color', 'name' => 'color', 'type' => 'text', 'class' => 'text colorpicker', 'size' => 6)),
             ),
 */
             'showalarms' => array(
-                'id' => 'taskedit-showalarms',
+                'id'    => 'taskedit-showalarms',
                 'label' => $this->plugin->gettext('showalarms'),
                 'value' => html::tag('input', array('id' => 'taskedit-showalarms', 'name' => 'color', 'type' => 'checkbox')),
             ),
         );
 
-        return html::tag('form', array('action' => "#", 'method' => "post", 'id' => 'tasklisteditform'),
-            $this->plugin->driver->tasklist_edit_form($action, $list, $fields)
+        return html::tag('form', $attrib + array('action' => "#", 'method' => "post", 'id' => 'tasklisteditform'),
+            $this->plugin->driver->tasklist_edit_form($this->action, $this->list, $fields)
         );
     }
 
@@ -381,7 +389,12 @@
 
         $label = html::label(array('for' => 'quickaddinput', 'class' => 'voice'), $this->plugin->gettext('quickaddinput'));
         $input = new html_inputfield(array('name' => 'text', 'id' => 'quickaddinput'));
-        $button = html::tag('input', array('type' => 'submit', 'value' => '+', 'title' => $this->plugin->gettext('createtask'), 'class' => 'button mainaction'));
+        $button = html::tag('input', array(
+                'type'  => 'submit',
+                'value' => '+',
+                'title' => $this->plugin->gettext('createtask'),
+                'class' => 'button mainaction'
+        ));
 
         $this->register_gui_object('quickaddform', $attrib['id']);
         return html::tag('form', $attrib, $label . $input->show() . $button);
@@ -401,18 +414,6 @@
     }
 
     /**
-     * Container for a tags cloud
-     */
-    function tagslist($attrib)
-    {
-        $attrib += array('id' => 'rcmtasktagslist');
-        unset($attrib['name']);
-
-        $this->register_gui_object('tagslist', $attrib['id']);
-        return html::tag('ul', $attrib, '');
-    }
-
-    /**
      * Interactive UI element to add/remove tags
      */
     function tags_editline($attrib)
@@ -426,58 +427,6 @@
     }
 
     /**
-     * Generate HTML element for attachments list
-     */
-    function attachments_list($attrib = array())
-    {
-        if (!$attrib['id'])
-            $attrib['id'] = 'rcmtaskattachmentlist';
-
-        $this->register_gui_object('attachmentlist', $attrib['id']);
-
-        return html::tag('ul', $attrib, '', html::$common_attrib);
-    }
-
-    /**
-     * Generate the form for event attachments upload
-     */
-    function attachments_form($attrib = array())
-    {
-        // add ID if not given
-        if (!$attrib['id'])
-            $attrib['id'] = 'rcmtaskuploadform';
-
-        // Get max filesize, enable upload progress bar
-        $max_filesize = $this->rc->upload_init();
-
-        $button = new html_inputfield(array('type' => 'button'));
-        $input = new html_inputfield(array(
-            'type' => 'file',
-            'name' => '_attachments[]',
-            'multiple' => 'multiple',
-            'size' => $attrib['attachmentfieldsize'],
-        ));
-
-        return html::div($attrib,
-            html::div(null, $input->show()) .
-            html::div('buttons', $button->show($this->rc->gettext('upload'), array('class' => 'button mainaction',
-                'onclick' => rcmail_output::JS_OBJECT_NAME . ".upload_file(this.form)"))) .
-            html::div('hint', $this->rc->gettext(array('name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize))))
-        );
-    }
-
-    /**
-     * Register UI object for HTML5 drag & drop file upload
-     */
-    function file_drop_area($attrib = array())
-    {
-        if ($attrib['id']) {
-            $this->register_gui_object('filedrop', $attrib['id']);
-            $this->rc->output->set_env('filedrop', array('action' => 'upload', 'fieldname' => '_attachments'));
-        }
-    }
-
-    /**
      *
      */
     function attendees_list($attrib = array())
@@ -493,7 +442,7 @@
         $table->add_header('confirmstate', $this->plugin->gettext('confirmstate'));
         if ($invitations) {
             $table->add_header(array('class' => 'invite', 'title' => $this->plugin->gettext('sendinvitations')),
-                $invite->show(1) . html::label('edit-attendees-invite', $this->plugin->gettext('sendinvitations')));
+                $invite->show(1) . html::label('edit-attendees-invite', html::span('inner', $this->plugin->gettext('sendinvitations'))));
         }
         $table->add_header('options', '');
 
@@ -512,16 +461,16 @@
      */
     function attendees_form($attrib = array())
     {
-        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => 30));
+        $input    = new html_inputfield(array('name' => 'participant', 'id' => 'edit-attendee-name', 'size' => $attrib['size'], 'class' => 'form-control'));
         $textarea = new html_textarea(array('name' => 'comment', 'id' => 'edit-attendees-comment',
-            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('itipcommenttitle')));
+            'rows' => 4, 'cols' => 55, 'title' => $this->plugin->gettext('itipcommenttitle'), 'class' => 'form-control'));
 
         return html::div($attrib,
-            html::div(null, $input->show() . " " .
+            html::div('form-searchbar', $input->show() . " " .
                 html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-add', 'value' => $this->plugin->gettext('addattendee')))
                 // . " " . html::tag('input', array('type' => 'button', 'class' => 'button', 'id' => 'edit-attendee-schedule', 'value' => $this->plugin->gettext('scheduletime').'...'))
                 ) .
-            html::p('attendees-commentbox', html::label(null, $this->plugin->gettext('itipcomment') . $textarea->show()))
+            html::p('attendees-commentbox', html::label('edit-attendees-comment', $this->plugin->gettext('itipcomment')) . $textarea->show())
         );
     }
 
@@ -530,11 +479,59 @@
      */
     function edit_attendees_notify($attrib = array())
     {
-        $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1));
+        $checkbox = new html_checkbox(array('name' => '_notify', 'id' => 'edit-attendees-donotify', 'value' => 1, 'class' => 'pretty-checkbox'));
         return html::div($attrib, html::label(null, $checkbox->show(1) . ' ' . $this->plugin->gettext('sendnotifications')));
     }
 
     /**
+     * Form for uploading and importing tasks
+     */
+    function tasks_import_form($attrib = array())
+    {
+        if (!$attrib['id']) {
+            $attrib['id'] = 'rcmImportForm';
+        }
+
+        // Get max filesize, enable upload progress bar
+        $max_filesize = $this->rc->upload_init();
+        $accept       = '.ics, text/calendar, text/x-vcalendar, application/ics';
+        if (class_exists('ZipArchive', false)) {
+            $accept .= ', .zip, application/zip';
+        }
+
+        $input = new html_inputfield(array(
+                'type'   => 'file',
+                'name'   => '_data',
+                'size'   => $attrib['uploadfieldsize'],
+                'accept' => $accept
+        ));
+
+        $html = html::div('form-section form-group row',
+            html::label(array('class' => 'col-sm-4 col-form-label', 'for' => 'importfile'), rcube::Q($this->rc->gettext('importfromfile')))
+            . html::div('col-sm-8', $input->show()
+                . html::div('hint', $this->rc->gettext(array('id' => 'importfile', 'name' => 'maxuploadsize', 'vars' => array('size' => $max_filesize)))))
+        );
+
+        $html .= html::div('form-section form-group row',
+            html::label(array('for' => 'task-import-list', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('list'))
+            . html::div('col-sm-8', $this->tasklist_select(array('name' => 'source', 'id' => 'task-import-list', 'editable' => true)))
+        );
+
+        $this->rc->output->add_gui_object('importform', $attrib['id']);
+        $this->rc->output->add_label('import', 'importerror');
+
+        return html::tag('p', null, $this->plugin->gettext('importtext'))
+            .html::tag('form', array(
+                'action'  => $this->rc->url(array('task' => 'tasklist', 'action' => 'import')),
+                'method'  => 'post',
+                'enctype' => 'multipart/form-data',
+                'id'      => $attrib['id'],
+            ),
+            $html
+        );
+    }
+
+    /**
      * Form to select options for exporting tasks
      */
     function tasks_export_form($attrib = array())
@@ -543,25 +540,27 @@
             $attrib['id'] = 'rcmTaskExportForm';
         }
 
-        $html .= html::div('form-section',
-            html::label('task-export-list', $this->plugin->gettext('list')) .
-                $this->tasklist_select(array(
+        $html .= html::div('form-section form-group row',
+            html::label(array('for' => 'task-export-list', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('list'))
+            . html::div('col-sm-8', $this->tasklist_select(array(
                         'name'  => 'source',
                         'id'    => 'task-export-list',
                         'extra' => array('' => '- ' . $this->plugin->gettext('currentview') . ' -'),
-                ))
+                )))
         );
 
-        $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'task-export-attachments', 'value' => 1));
-        $html .= html::div('form-section',
-            html::label('task-export-attachments', $this->plugin->gettext('exportattachments')) .
-                $checkbox->show(1)
+        $checkbox = new html_checkbox(array('name' => 'attachments', 'id' => 'task-export-attachments', 'value' => 1, 'class' => 'form-check-input pretty-checkbox'));
+        $html .= html::div('form-section form-group row form-check',
+            html::label(array('for' => 'task-export-attachments', 'class' => 'col-sm-4 col-form-label'), $this->plugin->gettext('exportattachments'))
+            . html::div('col-sm-8', $checkbox->show(1))
         );
 
         $this->register_gui_object('exportform', $attrib['id']);
 
-        return html::tag('form', array('action' => $this->rc->url(array('task' => 'tasklist', 'action' => 'export')),
-            'method' => "post", 'id' => $attrib['id']),
+        return html::tag('form', array(
+                'action' => $this->rc->url(array('task' => 'tasklist', 'action' => 'export')),
+                'method' => 'post', 'id' => $attrib['id']
+            ),
             $html
         );
     }

iRony-0.4.0.tar.gz/lib/plugins/tinymce_config/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/tinymce_config/composer.json Changed

iRony-0.4.0.tar.gz/lib/plugins/wap_client/composer.json -> iRony-0.4.1.tar.gz/lib/plugins/wap_client/composer.json Changed

iRony-0.4.0.tar.gz/public_html/index.php -> iRony-0.4.1.tar.gz/public_html/index.php Changed

iRony-0.4.0.tar.gz/test/Unit/CardDAV/ContactsBackend.php -> iRony-0.4.1.tar.gz/test/Unit/CardDAV/ContactsBackend.php Changed

@@ -52,4 +52,36 @@
             array('PHOTO;MEDIATYPE=image/jpeg:http://example.com/photo.jpg', null, '4.0'),
         );
     }
+
+    /**
+     * Test vCard BDAY/ANNIVERSARY input (T2492)
+     *
+     * @dataProvider data_T2492
+     */
+    function test_T2492($input, $output, $key)
+    {
+        $backend = new ContactsBackend;
+        $vcard   = "BEGIN:VCARD\nVERSION:4.0\nN:Thompson;Default;;;\nUID:1\n$input\nEND:VCARD";
+        $contact = $backend->parse_vcard($vcard);
+
+        if ($result = $contact[$key]) {
+            $result = $result->format('Ymd');
+        }
+
+        $this->assertSame($output, $result);
+    }
+
+    function data_T2492()
+    {
+        return array(
+            array("BDAY:19960415", "19960415", 'birthday'),
+            array("BDAY:19960415T231000Z", "19960415", 'birthday'),
+            array("BDAY:--0415", date('Y')."0415", 'birthday'),
+            array("BDAY;VALUE=text:circa 1800", null, 'birthday'),
+            array("ANNIVERSARY:19960415", "19960415", 'anniversary'),
+            array("ANNIVERSARY:19960415T231000Z", "19960415", 'anniversary'),
+            array("ANNIVERSARY:--0415", date('Y')."0415", 'anniversary'),
+            array("ANNIVERSARY;VALUE=text:circa 1800", null, 'anniversary'),
+        );
+    }
 }

iRony-0.4.0.tar.gz/test/bootstrap.php -> iRony-0.4.1.tar.gz/test/bootstrap.php Changed

iRony-0.4.0.tar.gz/vendor/autoload.php -> iRony-0.4.1.tar.gz/vendor/autoload.php Changed

iRony-0.4.0.tar.gz/vendor/composer/ClassLoader.php -> iRony-0.4.1.tar.gz/vendor/composer/ClassLoader.php Changed

iRony-0.4.0.tar.gz/vendor/composer/autoload_real.php -> iRony-0.4.1.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit3b3e2fbbb3ba6d75632d32dacb2b9848
+class ComposerAutoloaderInitaff53652df7607c02df41f22eea50854
 {
     private static $loader;
 
@@ -19,15 +19,15 @@
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit3b3e2fbbb3ba6d75632d32dacb2b9848', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInitaff53652df7607c02df41f22eea50854', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit3b3e2fbbb3ba6d75632d32dacb2b9848', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInitaff53652df7607c02df41f22eea50854', '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\ComposerStaticInit3b3e2fbbb3ba6d75632d32dacb2b9848::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInitaff53652df7607c02df41f22eea50854::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {

iRony-0.4.0.tar.gz/vendor/composer/autoload_static.php -> iRony-0.4.1.tar.gz/vendor/composer/autoload_static.php Changed

iRony-0.4.0.tar.gz/vendor/composer/installed.json -> iRony-0.4.1.tar.gz/vendor/composer/installed.json Changed

@@ -1,42 +1,56 @@
 [
     {
-        "name": "sabre/vobject",
-        "version": "3.5.x-dev",
-        "version_normalized": "3.5.9999999.9999999-dev",
+        "name": "sabre/dav",
+        "version": "2.1.11",
+        "version_normalized": "2.1.11.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/fruux/sabre-vobject.git",
-            "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c"
+            "url": "https://github.com/sabre-io/dav.git",
+            "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c",
-            "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c",
+            "url": "https://api.github.com/repos/sabre-io/dav/zipball/fa10928802aea9b3136519640aa3c3c59e9e1084",
+            "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084",
             "shasum": ""
         },
         "require": {
+            "ext-ctype": "*",
+            "ext-date": "*",
+            "ext-dom": "*",
+            "ext-iconv": "*",
+            "ext-libxml": "*",
             "ext-mbstring": "*",
-            "php": ">=5.3.1"
+            "ext-pcre": "*",
+            "ext-simplexml": "*",
+            "ext-spl": "*",
+            "php": ">=5.4.1",
+            "sabre/event": "^2.0.0",
+            "sabre/http": "^3.0.0",
+            "sabre/vobject": "^3.3.4"
         },
         "require-dev": {
-            "phpunit/phpunit": "*",
-            "squizlabs/php_codesniffer": "*"
+            "evert/phpdoc-md": "~0.1.0",
+            "phpunit/phpunit": "~4.2",
+            "squizlabs/php_codesniffer": "~1.5.3"
         },
-        "time": "2016-10-07T03:20:40+00:00",
+        "suggest": {
+            "ext-curl": "*",
+            "ext-pdo": "*"
+        },
+        "time": "2016-10-07T03:29:06+00:00",
         "bin": [
-            "bin/vobject",
-            "bin/generate_vcards"
+            "bin/sabredav",
+            "bin/naturalselection"
         ],
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "3.2.x-dev"
-            }
-        },
-        "installation-source": "source",
+        "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Sabre\\VObject\\": "lib/"
+                "Sabre\\DAV\\": "lib/DAV/",
+                "Sabre\\DAVACL\\": "lib/DAVACL/",
+                "Sabre\\CalDAV\\": "lib/CalDAV/",
+                "Sabre\\CardDAV\\": "lib/CardDAV/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -49,36 +63,30 @@
                 "email": "me@evertpot.com",
                 "homepage": "http://evertpot.com/",
                 "role": "Developer"
-            },
-            {
-                "name": "Dominik Tobschall",
-                "email": "dominik@fruux.com",
-                "homepage": "http://tobschall.de/",
-                "role": "Developer"
             }
         ],
-        "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
-        "homepage": "http://sabre.io/vobject/",
+        "description": "WebDAV Framework for PHP",
+        "homepage": "http://sabre.io/",
         "keywords": [
-            "VObject",
-            "iCalendar",
-            "jCal",
-            "jCard",
-            "vCard"
+            "CalDAV",
+            "CardDAV",
+            "WebDAV",
+            "framework",
+            "iCalendar"
         ]
     },
     {
         "name": "sabre/event",
-        "version": "2.0.x-dev",
-        "version_normalized": "2.0.9999999.9999999-dev",
+        "version": "2.0.2",
+        "version_normalized": "2.0.2.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/fruux/sabre-event.git",
+            "url": "https://github.com/sabre-io/event.git",
             "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
+            "url": "https://api.github.com/repos/sabre-io/event/zipball/337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
             "reference": "337b6f5e10ea6e0b21e22c7e5788dd3883ae73ff",
             "shasum": ""
         },
@@ -91,7 +99,7 @@
         },
         "time": "2015-05-19T10:24:22+00:00",
         "type": "library",
-        "installation-source": "source",
+        "installation-source": "dist",
         "autoload": {
             "psr-4": {
                 "Sabre\\Event\\": "lib/"
@@ -122,16 +130,16 @@
     },
     {
         "name": "sabre/http",
-        "version": "3.0.x-dev",
-        "version_normalized": "3.0.9999999.9999999-dev",
+        "version": "3.0.5",
+        "version_normalized": "3.0.5.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/fruux/sabre-http.git",
+            "url": "https://github.com/sabre-io/http.git",
             "reference": "6b06c03376219b3d608e1f878514ec105ed1b577"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-http/zipball/6b06c03376219b3d608e1f878514ec105ed1b577",
+            "url": "https://api.github.com/repos/sabre-io/http/zipball/6b06c03376219b3d608e1f878514ec105ed1b577",
             "reference": "6b06c03376219b3d608e1f878514ec105ed1b577",
             "shasum": ""
         },
@@ -149,7 +157,7 @@
         },
         "time": "2015-05-11T15:25:57+00:00",
         "type": "library",
-        "installation-source": "source",
+        "installation-source": "dist",
         "autoload": {
             "psr-4": {
                 "Sabre\\HTTP\\": "lib/"
@@ -174,57 +182,43 @@
         ]
     },
     {
-        "name": "sabre/dav",
-        "version": "2.1.x-dev",
-        "version_normalized": "2.1.9999999.9999999-dev",
+        "name": "sabre/vobject",
+        "version": "3.5.3",
+        "version_normalized": "3.5.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/fruux/sabre-dav.git",
-            "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084"
+            "url": "https://github.com/sabre-io/vobject.git",
+            "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/fa10928802aea9b3136519640aa3c3c59e9e1084",
-            "reference": "fa10928802aea9b3136519640aa3c3c59e9e1084",
+            "url": "https://api.github.com/repos/sabre-io/vobject/zipball/129d80533a9ec0d9cacfb50b51180c34edb6874c",
+            "reference": "129d80533a9ec0d9cacfb50b51180c34edb6874c",
             "shasum": ""
         },
         "require": {
-            "ext-ctype": "*",
-            "ext-date": "*",
-            "ext-dom": "*",
-            "ext-iconv": "*",
-            "ext-libxml": "*",
             "ext-mbstring": "*",
-            "ext-pcre": "*",
-            "ext-simplexml": "*",
-            "ext-spl": "*",
-            "php": ">=5.4.1",
-            "sabre/event": "^2.0.0",
-            "sabre/http": "^3.0.0",
-            "sabre/vobject": "^3.3.4"
+            "php": ">=5.3.1"
         },
         "require-dev": {
-            "evert/phpdoc-md": "~0.1.0",
-            "phpunit/phpunit": "~4.2",
-            "squizlabs/php_codesniffer": "~1.5.3"
-        },
-        "suggest": {
-            "ext-curl": "*",
-            "ext-pdo": "*"
+            "phpunit/phpunit": "*",
+            "squizlabs/php_codesniffer": "*"
         },
-        "time": "2016-10-07T03:29:06+00:00",
+        "time": "2016-10-07T03:20:40+00:00",
         "bin": [
-            "bin/sabredav",
-            "bin/naturalselection"
+            "bin/vobject",
+            "bin/generate_vcards"
         ],
         "type": "library",
-        "installation-source": "source",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.2.x-dev"
+            }
+        },
+        "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Sabre\\DAV\\": "lib/DAV/",
-                "Sabre\\DAVACL\\": "lib/DAVACL/",
-                "Sabre\\CalDAV\\": "lib/CalDAV/",
-                "Sabre\\CardDAV\\": "lib/CardDAV/"
+                "Sabre\\VObject\\": "lib/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -237,16 +231,22 @@
                 "email": "me@evertpot.com",
                 "homepage": "http://evertpot.com/",
                 "role": "Developer"
+            },
+            {
+                "name": "Dominik Tobschall",
+                "email": "dominik@fruux.com",
+                "homepage": "http://tobschall.de/",
+                "role": "Developer"
             }
         ],
-        "description": "WebDAV Framework for PHP",
-        "homepage": "http://sabre.io/",
+        "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
+        "homepage": "http://sabre.io/vobject/",
         "keywords": [
-            "CalDAV",
-            "CardDAV",
-            "WebDAV",
-            "framework",
-            "iCalendar"
+            "VObject",
+            "iCalendar",
+            "jCal",
+            "jCard",
+            "vCard"
         ]
     }
 ]

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2271 0

Request History

vanmeeuwen created request over 6 years ago

Check in 0.4.1

vanmeeuwen accepted review over 6 years ago

vanmeeuwen approved review over 6 years ago

vanmeeuwen accepted request over 6 years ago