diff -pruN 1.0.8-2/debian/changelog 1.0.10-1/debian/changelog --- 1.0.8-2/debian/changelog 2016-06-08 07:09:58.000000000 +0000 +++ 1.0.10-1/debian/changelog 2019-10-18 18:35:16.000000000 +0000 @@ -1,3 +1,28 @@ +php-horde-mapi (1.0.10-1) unstable; urgency=medium + + * New upstream version 1.0.10 + * Bump debhelper from old 11 to 12. + * d/control: Orphaning package (See #942282) + + -- Mathieu Parent Fri, 18 Oct 2019 20:35:16 +0200 + +php-horde-mapi (1.0.8-4) unstable; urgency=medium + + * Update Standards-Version to 4.1.4, no change + * Update Maintainer field + + -- Mathieu Parent Tue, 15 May 2018 18:41:48 +0200 + +php-horde-mapi (1.0.8-3) unstable; urgency=medium + + * Update Standards-Version to 4.1.3, no change + * Upgrade debhelper to compat 11 + * Update Vcs-* fields + * Use secure copyright format URI + * Replace "Priority: extra" by "Priority: optional" + + -- Mathieu Parent Fri, 06 Apr 2018 14:27:05 +0200 + php-horde-mapi (1.0.8-2) unstable; urgency=medium * Update Standards-Version to 3.9.8, no change diff -pruN 1.0.8-2/debian/compat 1.0.10-1/debian/compat --- 1.0.8-2/debian/compat 2016-06-08 07:09:58.000000000 +0000 +++ 1.0.10-1/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -pruN 1.0.8-2/debian/control 1.0.10-1/debian/control --- 1.0.8-2/debian/control 2016-06-08 07:09:58.000000000 +0000 +++ 1.0.10-1/debian/control 2019-10-18 18:35:16.000000000 +0000 @@ -1,13 +1,13 @@ Source: php-horde-mapi Section: php -Priority: extra -Maintainer: Horde Maintainers -Uploaders: Mathieu Parent -Build-Depends: debhelper (>= 9), pkg-php-tools (>= 1~), pear-horde-channel -Standards-Version: 3.9.8 +Priority: optional +Maintainer: Horde Maintainers +Uploaders: Debian QA Group +Build-Depends: pkg-php-tools (>= 1~), pear-horde-channel, debhelper-compat (= 12) +Standards-Version: 4.1.4 Homepage: http://www.horde.org/ -Vcs-git: https://anonscm.debian.org/git/pkg-horde/PEAR/php-horde-mapi.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-horde/PEAR/php-horde-mapi.git +Vcs-Git: https://salsa.debian.org/horde-team/php-horde-mapi.git +Vcs-Browser: https://salsa.debian.org/horde-team/php-horde-mapi Package: php-horde-mapi Architecture: all diff -pruN 1.0.8-2/debian/copyright 1.0.10-1/debian/copyright --- 1.0.8-2/debian/copyright 2016-06-08 07:09:58.000000000 +0000 +++ 1.0.10-1/debian/copyright 2019-10-18 18:35:16.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Horde MAPI utility library Upstream-Contact: Horde Horde development diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/doc/Horde/Mapi/CHANGES 1.0.10-1/Horde_Mapi-1.0.10/doc/Horde/Mapi/CHANGES --- 1.0.8-2/Horde_Mapi-1.0.10/doc/Horde/Mapi/CHANGES 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/doc/Horde/Mapi/CHANGES 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,76 @@ +------- +v1.0.10 +------- + +[mjr] Remove Autoloading of unused Math_BigInteger (Remi Collet + , PR #2). + + +------ +v1.0.9 +------ + +[mjr] No longer support Math_BigInteger, require the bcmath extension instead. + + +------ +v1.0.8 +------ + +[mjr] Fix dependency on Horde_Date 2.3.0. + + +------ +v1.0.7 +------ + +[mjr] Work around BC break in PHP 5.5.10 with converting timezone abbreviations + to full timezone names. + + +------ +v1.0.6 +------ + +[jan] Mark PHP 7 as supported. + + +------ +v1.0.5 +------ + +[mjr] Remove bcmath extension requirement and add PEAR Math_BigInteger package + in it's place. + + +------ +v1.0.4 +------ + +[jan] Improve PSR-2 compatibility. + + +------ +v1.0.3 +------ + +[mjr] Make bcmath an optional, not required, extension (Bug #13285). + + +------ +v1.0.2 +------ + +[mjr] Clarify license is LGPL and fix package.xml/composer.json files. + + +------ +v1.0.1 +------ + + +------ +v1.0.0 +------ + +Initial release. diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/doc/Horde/Mapi/COPYING 1.0.10-1/Horde_Mapi-1.0.10/doc/Horde/Mapi/COPYING --- 1.0.8-2/Horde_Mapi-1.0.10/doc/Horde/Mapi/COPYING 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/doc/Horde/Mapi/COPYING 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,458 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +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 +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/lib/Horde/Mapi/Exception.php 1.0.10-1/Horde_Mapi-1.0.10/lib/Horde/Mapi/Exception.php --- 1.0.8-2/Horde_Mapi-1.0.10/lib/Horde/Mapi/Exception.php 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/lib/Horde/Mapi/Exception.php 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,27 @@ + + * @package Mapi_Utils + */ +/** + * Base exception class for Horde_Mapi + * + * Copyright 2010-2017 Horde LLC (http://www.horde.org/) + * + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @copyright 2010-2017 Horde LLC (http://www.horde.org) + * @author Michael J Rubinsky + * @package Mapi_Utils + */ +class Horde_Mapi_Exception extends Horde_Exception_Wrapped +{ +} \ No newline at end of file diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/lib/Horde/Mapi/Timezone.php 1.0.10-1/Horde_Mapi-1.0.10/lib/Horde/Mapi/Timezone.php --- 1.0.8-2/Horde_Mapi-1.0.10/lib/Horde/Mapi/Timezone.php 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/lib/Horde/Mapi/Timezone.php 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,434 @@ + + * @package Mapi_Utils + */ +/** + * Utility functions for dealing with Microsoft MAPI Timezone format. + * + * Copyright 2009-2017 Horde LLC (http://www.horde.org/) + * + * See the enclosed file COPYING for license information (LGPL). If you + * did not receive this file, see http://www.horde.org/licenses/lgpl21. + * + * Code dealing with searching for a timezone identifier from an AS timezone + * blob inspired by code in the Tine20 Project (http://tine20.org). + * + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @copyright 2009-2017 Horde LLC (http://www.horde.org) + * @author Michael J Rubinsky + * @package Mapi_Utils + */ +class Horde_Mapi_Timezone +{ + /** + * Date to use as start date when iterating through offsets looking for a + * transition. + * + * @var Horde_Date + */ + protected $_startDate; + + /** + * Convert a timezone from the MAPI base64 structure to a TZ offset + * hash. + * + * @param base64 encoded timezone structure defined by MS as: + * 
+     *      typedef struct TIME_ZONE_INFORMATION {
+     *        LONG Bias;
+     *        WCHAR StandardName[32];
+     *        SYSTEMTIME StandardDate;
+     *        LONG StandardBias;
+     *        WCHAR DaylightName[32];
+     *        SYSTEMTIME DaylightDate;
+     *        LONG DaylightBias;};
+     *
+ * + * With the SYSTEMTIME format being: + * 
+     * typedef struct _SYSTEMTIME {
+     *     WORD wYear;
+     *     WORD wMonth;
+     *     WORD wDayOfWeek;
+     *     WORD wDay; (Used as week number)
+     *     WORD wHour;
+     *     WORD wMinute;
+     *     WORD wSecond;
+     *     WORD wMilliseconds;
+     *   } SYSTEMTIME, *PSYSTEMTIME;
+     *
+ * + * See: http://msdn.microsoft.com/en-us/library/ms724950%28VS.85%29.aspx + * and: http://msdn.microsoft.com/en-us/library/ms725481%28VS.85%29.aspx + * + * @return array Hash of offset information + */ + public static function getOffsetsFromSyncTZ($data) + { + if (version_compare(PHP_VERSION, '5.5', '>=')) { + $format = 'lbias/Z64stdname/vstdyear/vstdmonth/vstdday/vstdweek/vstdhour/vstdminute/vstdsecond/vstdmillis/' + . 'lstdbias/Z64dstname/vdstyear/vdstmonth/vdstday/vdstweek/vdsthour/vdstminute/vdstsecond/vdstmillis/' + . 'ldstbias'; + } else { + $format = 'lbias/a64stdname/vstdyear/vstdmonth/vstdday/vstdweek/vstdhour/vstdminute/vstdsecond/vstdmillis/' + . 'lstdbias/a64dstname/vdstyear/vdstmonth/vdstday/vdstweek/vdsthour/vdstminute/vdstsecond/vdstmillis/' + . 'ldstbias'; + } + $tz = unpack($format, base64_decode($data)); + $tz['timezone'] = $tz['bias']; + $tz['timezonedst'] = $tz['dstbias']; + + if (!Horde_Mapi::isLittleEndian()) { + $tz['bias'] = Horde_Mapi::chbo($tz['bias']); + $tz['stdbias'] = Horde_Mapi::chbo($tz['stdbias']); + $tz['dstbias'] = Horde_Mapi::chbo($tz['dstbias']); + } + + return $tz; + } + + /** + * Build an MAPI TZ blob given a TZ Offset hash. + * + * @param array $offsets A TZ offset hash + * + * @return string A base64_encoded MAPI Timezone structure suitable + * for transmitting via wbxml. + */ + public static function getSyncTZFromOffsets(array $offsets) + { + if (!Horde_Mapi::isLittleEndian()) { + $offsets['bias'] = Horde_Mapi::chbo($offsets['bias']); + $offsets['stdbias'] = Horde_Mapi::chbo($offsets['stdbias']); + $offsets['dstbias'] = Horde_Mapi::chbo($offsets['dstbias']); + } + + $packed = pack('la64vvvvvvvvla64vvvvvvvvl', + $offsets['bias'], '', 0, $offsets['stdmonth'], $offsets['stdday'], $offsets['stdweek'], $offsets['stdhour'], $offsets['stdminute'], $offsets['stdsecond'], $offsets['stdmillis'], + $offsets['stdbias'], '', 0, $offsets['dstmonth'], $offsets['dstday'], $offsets['dstweek'], $offsets['dsthour'], $offsets['dstminute'], $offsets['dstsecond'], $offsets['dstmillis'], + $offsets['dstbias']); + + return base64_encode($packed); + } + + /** + * Create a offset hash suitable for use in ActiveSync transactions + * + * @param Horde_Date $date A date object representing the date to base the + * the tz data on. + * + * @return array An offset hash. + */ + public static function getOffsetsFromDate(Horde_Date $date) + { + $offsets = array( + 'bias' => 0, + 'stdname' => '', + 'stdyear' => 0, + 'stdmonth' => 0, + 'stdday' => 0, + 'stdweek' => 0, + 'stdhour' => 0, + 'stdminute' => 0, + 'stdsecond' => 0, + 'stdmillis' => 0, + 'stdbias' => 0, + 'dstname' => '', + 'dstyear' => 0, + 'dstmonth' => 0, + 'dstday' => 0, + 'dstweek' => 0, + 'dsthour' => 0, + 'dstminute' => 0, + 'dstsecond' => 0, + 'dstmillis' => 0, + 'dstbias' => 0 + ); + + $timezone = $date->toDateTime()->getTimezone(); + // If transition parsing failed, we won't have a multi-element array. + $transitions = self::_getTransitions($timezone, $date); + if (!empty($transitions)) { + list($std, $dst) = self::_getTransitions($timezone, $date); + } + if (!empty($std)) { + $offsets['bias'] = $std['offset'] / 60 * -1; + if ($dst) { + $offsets = self::_generateOffsetsForTransition($offsets, $std, 'std'); + $offsets = self::_generateOffsetsForTransition($offsets, $dst, 'dst'); + $offsets['stdhour'] += $dst['offset'] / 3600; + $offsets['dsthour'] += $std['offset'] / 3600; + $offsets['dstbias'] = ($dst['offset'] - $std['offset']) / 60 * -1; + } + } + + return $offsets; + } + + /** + * Get the transition data for moving from DST to STD time. + * + * @param DateTimeZone $timezone The timezone to get the transition for + * @param Horde_Date $date The date to start from. Really only the + * year we are interested in is needed. + * + * @return array An array containing the the STD and DST transitions + */ + protected static function _getTransitions(DateTimeZone $timezone, Horde_Date $date) + { + + $std = $dst = array(); + $transitions = $timezone->getTransitions( + mktime(0, 0, 0, 12, 1, $date->year - 1), + mktime(24, 0, 0, 12, 31, $date->year) + ); + + if ($transitions === false) { + return array(); + } + + foreach ($transitions as $i => $transition) { + try { + $d = new Horde_Date($transition['time']); + $d->setTimezone('UTC'); + } catch (Exception $e) { + continue; + } + if (($d->format('Y') == $date->format('Y')) && isset($transitions[$i + 1])) { + $next = new Horde_Date($transitions[$i + 1]['ts']); + if ($d->format('Y') == $next->format('Y')) { + $dst = $transition['isdst'] ? $transition : $transitions[$i + 1]; + $std = $transition['isdst'] ? $transitions[$i + 1] : $transition; + } else { + $dst = $transition['isdst'] ? $transition: null; + $std = $transition['isdst'] ? null : $transition; + } + break; + } elseif ($i == count($transitions) - 1) { + $std = $transition; + } + } + + return array($std, $dst); + } + + /** + * Calculate the offsets for the specified transition + * + * @param array $offsets A TZ offset hash + * @param array $transition A transition hash + * @param string $type Transition type - dst or std + * + * @return array A populated offset hash + */ + protected static function _generateOffsetsForTransition(array $offsets, array $transition, $type) + { + // We can't use Horde_Date directly here, since it is unable to + // properly convert to UTC from local ON the exact hour of a std -> dst + // transition. This is due to a conversion to DateTime in the localtime + // zone internally before the timezone change is applied + $transitionDate = new DateTime($transition['time']); + $transitionDate->setTimezone(new DateTimeZone('UTC')); + $transitionDate = new Horde_Date($transitionDate); + $offsets[$type . 'month'] = $transitionDate->format('n'); + $offsets[$type . 'day'] = $transitionDate->format('w'); + $offsets[$type . 'minute'] = (int)$transitionDate->format('i'); + $offsets[$type . 'hour'] = (int)$transitionDate->format('H'); + for ($i = 5; $i > 0; $i--) { + if (self::_isNthOcurrenceOfWeekdayInMonth($transition['ts'], $i)) { + $offsets[$type . 'week'] = $i; + break; + } + } + + return $offsets; + } + + /** + * Attempt to guess the timezone identifier from the $offsets array. + * + * Since it's impossible to know exactly which olson timezone name a + * specific set of offsets represent (multiple timezone names may be + * described by the same offsets for any given year) we allow passing an + * expected timezone. If this matches one of the timezones that matches the + * offsets, we return that. Otherwise, we attempt to get the full timezone + * name from Horde_Date and if that fails, return the abbreviated timezone + * name of the first timezone that matches the provided offsets. + * + * @param array|string $offsets The timezone to check. Either an array + * of offsets or an activesynz tz blob. + * @param string $expectedTimezone The expected timezone. If not empty, and + * present in the results, will return. + * + * @return string The timezone identifier. + */ + public function getTimezone($offsets, $expectedTimezone = null) + { + $timezones = $this->getListOfTimezones($offsets, $expectedTimezone); + if (isset($timezones[$expectedTimezone])) { + return $expectedTimezone; + } else { + return Horde_Date::getTimezoneAlias(current($timezones)); + } + } + + /** + * Get the list of timezone identifiers that match the given offsets, having + * a preference for $expectedTimezone if it's present in the results. + * + * @param array|string $offsets Either an offset array, or a AS timezone + * structure. + * @param string $expectedTimezone The expected timezone. + * + * @return array An array of timezone identifiers + */ + public function getListOfTimezones($offsets, $expectedTimezone = null) + { + if (is_string($offsets)) { + $offsets = self::getOffsetsFromSyncTZ($offsets); + } + $this->_setDefaultStartDate($offsets); + $timezones = array(); + foreach (DateTimeZone::listIdentifiers() as $timezoneIdentifier) { + $timezone = new DateTimeZone($timezoneIdentifier); + if (false !== ($matchingTransition = $this->_checkTimezone($timezone, $offsets))) { + if ($timezoneIdentifier == $expectedTimezone) { + $timezones = array($timezoneIdentifier => $matchingTransition['abbr']); + break; + } else { + $timezones[$timezoneIdentifier] = $matchingTransition['abbr']; + } + } + } + + if (empty($timezones)) { + throw new Horde_Mapi_Exception('No timezone found for the given offsets'); + } + + return $timezones; + } + + /** + * Set default value for $_startDate. + * + * Tries to guess the correct startDate depending on object property. Falls + * back to current date. + * + * @param array $offsets Offsets may be avaluated for a given start year + */ + protected function _setDefaultStartDate(array $offsets = null) + { + if (!empty($this->_startDate)) { + return; + } + + if (!empty($offsets['stdyear'])) { + $this->_startDate = new Horde_Date($offsets['stdyear'] . '-01-01'); + } else { + $start = new Horde_Date(time()); + $start->year--; + $this->_startDate = $start; + } + } + + /** + * Check if the given timezone matches the offsets and also evaluate the + * daylight saving time transitions for this timezone if necessary. + * + * @param DateTimeZone $timezone The timezone to check. + * @param array $offsets The offsets to check. + * + * @return array|boolean An array of transition data or false if timezone + * does not match offset. + */ + protected function _checkTimezone(DateTimeZone $timezone, array $offsets) + { + list($std, $dst) = $this->_getTransitions($timezone, $this->_startDate); + if ($this->_checkTransition($std, $dst, $offsets)) { + return $std; + } + + return false; + } + + /** + * Check if the given standardTransition and daylightTransition match to the + * given offsets. + * + * @param array $std The Standard transition date. + * @param array $dst The DST transition date. + * @param array $offsets The offsets to check. + * + * @return boolean + */ + protected function _checkTransition(array $std, array $dst, array $offsets) + { + if (empty($std) || empty($offsets)) { + return false; + } + + $standardOffset = ($offsets['bias'] + $offsets['stdbias']) * 60 * -1; + + // check each condition in a single if statement and break the chain + // when one condition is not met - for performance reasons + if ($standardOffset == $std['offset']) { + if ((empty($offsets['dstmonth']) && (empty($dst) || empty($dst['isdst']))) || + (empty($dst) && !empty($offsets['dstmonth']))) { + // Offset contains DST, but no dst to compare + return true; + } + $daylightOffset = ($offsets['bias'] + $offsets['dstbias']) * 60 * -1; + // the milestone is sending a positive value for daylightBias while it should send a negative value + $daylightOffsetMilestone = ($offsets['dstbias'] + ($offsets['dstbias'] * -1) ) * 60 * -1; + + if ($daylightOffset == $dst['offset'] || $daylightOffsetMilestone == $dst['offset']) { + $standardParsed = new DateTime($std['time']); + $daylightParsed = new DateTime($dst['time']); + + if ($standardParsed->format('n') == $offsets['stdmonth'] && + $daylightParsed->format('n') == $offsets['dstmonth'] && + $standardParsed->format('w') == $offsets['stdday'] && + $daylightParsed->format('w') == $offsets['dstday']) + { + return self::_isNthOcurrenceOfWeekdayInMonth($dst['ts'], $offsets['dstweek']) && + self::_isNthOcurrenceOfWeekdayInMonth($std['ts'], $offsets['stdweek']); + } + } + } + + return false; + } + + /** + * Test if the weekday of the given timestamp is the nth occurence of this + * weekday within its month, where '5' indicates the last occurrence even if + * there is less than five occurrences. + * + * @param integer $timestamp The timestamp to check. + * @param integer $occurence 1 to 5, where 5 indicates the final occurrence + * during the month if that day of the week does + * not occur 5 times + * @return boolean + */ + protected static function _isNthOcurrenceOfWeekdayInMonth($timestamp, $occurence) + { + $original = new Horde_Date($timestamp); + $original->setTimezone('UTC'); + if ($occurence == 5) { + $modified = $original->add(array('mday' => 7)); + return $modified->month > $original->month; + } else { + $modified = $original->sub(array('mday' => 7 * $occurence)); + $modified2 = $original->sub(array('mday' => 7 * ($occurence - 1))); + + return $modified->month < $original->month && + $modified2->month == $original->month; + } + } + +} diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/lib/Horde/Mapi.php 1.0.10-1/Horde_Mapi-1.0.10/lib/Horde/Mapi.php --- 1.0.8-2/Horde_Mapi-1.0.10/lib/Horde/Mapi.php 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/lib/Horde/Mapi.php 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,205 @@ + + * @package Mapi_Utils + */ +/** + * Utility functions for dealing with Microsoft MAPI structures. + * + * Copyright 2009-2017 Horde LLC (http://www.horde.org/) + * + * See the enclosed file COPYING for license information (LGPL). If you + * did not receive this file, see http://www.horde.org/licenses/lgpl21. + * + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @copyright 2009-2017 Horde LLC (http://www.horde.org) + * @author Michael J Rubinsky + * @package Mapi_Utils + */ +class Horde_Mapi +{ + /** + * Determine if the current machine is little endian. + * + * @return boolean True if endianness is little endian, otherwise false. + */ + public static function isLittleEndian() + { + $testint = 0x00FF; + $p = pack('S', $testint); + + return ($testint === current(unpack('v', $p))); + } + + /** + * Change the byte order of a number. Used to allow big endian machines to + * decode the timezone blobs, which are encoded in little endian order. + * + * @param integer $num The number to reverse. + * + * @return integer The number, in the reverse byte order. + */ + public static function chbo($num) + { + $u = unpack('l', strrev(pack('l', $num))); + + return $u[1]; + } + + /** + * Obtain the UID from a MAPI GOID. + * + * See http://msdn.microsoft.com/en-us/library/hh338153%28v=exchg.80%29.aspx + * + * @param string $goid Base64 encoded Global Object Identifier. + * + * @return string The UID + */ + public static function getUidFromGoid($goid) + { + $goid = base64_decode($goid); + + // First, see if it's an Outlook UID or not. + if (substr($goid, 40, 8) == 'vCal-Uid') { + // For vCal UID values: + // Bytes 37 - 40 contain length of data and padding + // Bytes 41 - 48 are == vCal-Uid + // Bytes 53 until next to the last byte (/0) contain the UID. + return trim(substr($goid, 52, strlen($goid) - 1)); + } else { + // If it's not a vCal UID, then it is Outlook style UID: + // The entire decoded goid is converted to hex representation with + // bytes 17 - 20 converted to zero + $hex = array(); + foreach (str_split($goid) as $chr) { + $hex[] = sprintf('%02X', ord($chr)); + } + array_splice($hex, 16, 4, array('00', '00', '00', '00')); + return implode('', $hex); + } + } + + /** + * Create a MAPI GOID from a UID + * See http://msdn.microsoft.com/en-us/library/ee157690%28v=exchg.80%29 + * + * @param string $uid The UID value to encode. + * + * @return string A Base64 encoded GOID + */ + public static function createGoid($uid, $options = array()) + { + // Bytes 1 - 16 MUST be equal to the GOID identifier: + $arrayid = '040000008200E00074C5B7101A82E008'; + + // Bytes 17 - 20 - Exception replace time (YH YL M D) + $exception = '00000000'; + + // Bytes 21 - 28 The 8 byte creation time (can be all zeros if not available). + $creationtime = '0000000000000000'; + + // Bytes 29 - 36 Reserved 8 bytes must be all zeros. + $reserved = '0000000000000000'; + + // Bytes 37 - 40 - A long value describing the size of the UID data. + $size = strlen($uid); + + // Bytes 41 - 52 - MUST BE vCal-Uid 0x01 0x00 0x00 0x00 + $vCard = '7643616C2D55696401000000'; + + // The UID Data: + $hexuid = ''; + foreach (str_split($uid) as $chr) { + $hexuid .= sprintf('%02X', ord($chr)); + } + + // Pack it + $goid = pack('H*H*H*H*VH*H*x', $arrayid, $exception, $creationtime, $reserved, $size, $vCard, $hexuid); + + return base64_encode($goid); + } + + /** + * Converts a Windows FILETIME value to a unix timestamp. + * + * Adapted from: + * http://stackoverflow.com/questions/610603/help-me-translate-long-value-expressed-in-hex-back-in-to-a-date-time + * + * @param string $ft Binary representation of FILETIME from a pTypDate + * MAPI property. + * + * @return integer The unix timestamp. + * @throws Horde_Mapi_Exception + */ + public static function filetimeToUnixtime($ft) + { + $ft = bin2hex($ft); + $dtval = substr($ft, 0, 16); // clip overlength string + $dtval = str_pad($dtval, 16, '0'); // pad underlength string + $quad = self::_flipEndian($dtval); + try { + $win64_datetime = self::_hexToBcint($quad); + return self::_win64ToUnix($win64_datetime); + } catch (Horde_Mapi_Exception $e) { + return -1; + } + } + + // swap little-endian to big-endian + protected static function _flipEndian($str) + { + // make sure #digits is even + if ( strlen($str) & 1 ) + $str = '0' . $str; + + $t = ''; + for ($i = strlen($str)-2; $i >= 0; $i-=2) + $t .= substr($str, $i, 2); + + return $t; + } + + // convert hex string to BC-int + protected static function _hexToBcint($str) + { + if (!extension_loaded('bcmath')) { + throw new Horde_Mapi_Exception('bcmath extension not loaded.'); + } + + $hex = array( + '0'=>'0', '1'=>'1', '2'=>'2', '3'=>'3', '4'=>'4', + '5'=>'5', '6'=>'6', '7'=>'7', '8'=>'8', '9'=>'9', + 'a'=>'10', 'b'=>'11', 'c'=>'12', 'd'=>'13', 'e'=>'14', 'f'=>'15', + 'A'=>'10', 'B'=>'11', 'C'=>'12', 'D'=>'13', 'E'=>'14', 'F'=>'15' + ); + + $bci = '0'; + $len = strlen($str); + for ($i = 0; $i < $len; ++$i) { + $bci = bcmul($bci, '16'); + $ch = $str[$i]; + if (isset($hex[$ch])) + $bci = bcadd($bci, $hex[$ch]); + } + + return $bci; + } + + protected static function _win64ToUnix($bci) + { + if (!extension_loaded('bcmath')) { + throw new Horde_Mapi_Exception('bcmath extension not loaded.'); + } + + // Unix epoch as a Windows file date-time value + $magicnum = '116444735995904000'; + $t = bcsub($bci, $magicnum); // Cast to Unix epoch + return bcdiv($t, '10000000', 0); // Convert from ticks to seconds + } + + +} diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/test/Horde/Mapi/AllTests.php 1.0.10-1/Horde_Mapi-1.0.10/test/Horde/Mapi/AllTests.php --- 1.0.8-2/Horde_Mapi-1.0.10/test/Horde/Mapi/AllTests.php 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/test/Horde/Mapi/AllTests.php 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,3 @@ +run(); diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/test/Horde/Mapi/bootstrap.php 1.0.10-1/Horde_Mapi-1.0.10/test/Horde/Mapi/bootstrap.php --- 1.0.8-2/Horde_Mapi-1.0.10/test/Horde/Mapi/bootstrap.php 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/test/Horde/Mapi/bootstrap.php 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,3 @@ + + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Mapi_Utils + * @subpackage UnitTests + */ + +/** + * @author Michael J Rubinsky + * @category Horde + * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 + * @package Mapi_Utils + * @subpackage UnitTests + */ +class Horde_Mapi_MapiTest extends PHPUnit_Framework_TestCase +{ + + public function testFiletimeToUnixTime() + { + $data = file_get_contents(__DIR__ . '/fixtures/filetime'); + + $this->assertEquals( + extension_loaded('bcmath') ? 1387818000 : -1, + Horde_Mapi::filetimeToUnixtime($data) + ); + } + + /** + * Test parsing GOID value. + */ + public function testParseGlobalObjectId() + { + // Outlook UID + $fixture = 'BAAAAIIA4AB0xbcQGoLgCAfUCRDgQMnBJoXEAQAAAAAAAAAAEAAAAAvw7UtuTulOnjnjhns3jvM='; + $uid = Horde_Mapi::getUidFromGoid($fixture); + $this->assertEquals( + '040000008200E00074C5B7101A82E00800000000E040C9C12685C4010000000000000000100000000BF0ED4B6E4EE94E9E39E3867B378EF3', + $uid); + + // vCal + $fixture = 'BAAAAIIA4AB0xbcQGoLgCAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAHZDYWwtVWlkAQAAAHs4MTQxMkQzQy0yQTI0LTRFOUQtQjIwRS0xMUY3QkJFOTI3OTl9AA=='; + $uid = Horde_Mapi::getUidFromGoid($fixture); + $this->assertEquals('{81412D3C-2A24-4E9D-B20E-11F7BBE92799}', $uid); + } + +} diff -pruN 1.0.8-2/Horde_Mapi-1.0.10/test/Horde/Mapi/TimezoneTest.php 1.0.10-1/Horde_Mapi-1.0.10/test/Horde/Mapi/TimezoneTest.php --- 1.0.8-2/Horde_Mapi-1.0.10/test/Horde/Mapi/TimezoneTest.php 1970-01-01 00:00:00.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.10/test/Horde/Mapi/TimezoneTest.php 2019-02-16 21:51:00.000000000 +0000 @@ -0,0 +1,183 @@ + + * @category Horde + * @package Mapi_Utils + */ +class Horde_Mapi_TimezoneTest extends Horde_Test_Case +{ + + protected $_offsets = array( + 'America/New_York' => array('bias' => 300, + 'stdname' => '', + 'stdyear' => 0, + 'stdmonth' => 11, + 'stdday' => 0, + 'stdweek' => 1, + 'stdhour' => 2, + 'stdminute' => 0, + 'stdsecond' => 0, + 'stdmillis' => 0, + 'stdbias' => 0, + 'dstname' => '', + 'dstyear' => 0, + 'dstmonth' => 3, + 'dstday' => 0, + 'dstweek' => 2, + 'dsthour' => 2, + 'dstminute' => 0, + 'dstsecond' => 0, + 'dstmillis' => 0, + 'dstbias' => -60), + 'Europe/Berlin' => array('bias' => -60, + 'stdname' => '', + 'stdyear' => 0, + 'stdmonth' => 10, + 'stdday' => 0, + 'stdweek' => 5, + 'stdhour' => 3, + 'stdminute' => 0, + 'stdsecond' => 0, + 'stdmillis' => 0, + 'stdbias' => 0, + 'dstname' => '', + 'dstyear' => 0, + 'dstmonth' => 3, + 'dstday' => 0, + 'dstweek' => 5, + 'dsthour' => 2, + 'dstminute' => 0, + 'dstsecond' => 0, + 'dstmillis' => 0, + 'dstbias' => -60), + 'America/Los_Angeles' => array('bias' => 480, + 'stdname' => '', + 'stdyear' => 0, + 'stdmonth' => 11, + 'stdday' => 0, + 'stdweek' => 1, + 'stdhour' => 2, + 'stdminute' => 0, + 'stdsecond' => 0, + 'stdmillis' => 0, + 'stdbias' => 0, + 'dstname' => '', + 'dstyear' => 0, + 'dstmonth' => 3, + 'dstday' => 0, + 'dstweek' => 2, + 'dsthour' => 2, + 'dstminute' => 0, + 'dstsecond' => 0, + 'dstmillis' => 0, + 'dstbias' => -60, + 'timezone' => 480, + 'timezonedst' => -60), + 'America/Phoenix' => array('bias' => 420, + 'stdname' => '', + 'stdyear' => 0, + 'stdmonth' => 0, + 'stdday' => 0, + 'stdweek' => 0, + 'stdhour' => 0, + 'stdminute' => 0, + 'stdsecond' => 0, + 'stdmillis' => 0, + 'stdbias' => 0, + 'dstname' => '', + 'dstyear' => 0, + 'dstmonth' => 0, + 'dstday' => 0, + 'dstweek' => 0, + 'dsthour' => 0, + 'dstminute' => 0, + 'dstsecond' => 0, + 'dstmillis' => 0, + 'dstbias' => 0) + ); + + protected $_packed = array( + 'America/New_York' => 'LAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==', + 'America/Los_Angeles' => '4AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==', + 'Europe/Berlin' => 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAIAAAAAAAAAxP///w==', + 'America/Phoenix' => 'pAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==', + ); + + + public function setUp() + { + $this->_oldTimezone = date_default_timezone_get(); + date_default_timezone_set('America/New_York'); + } + + public function tearDown() + { + date_default_timezone_set($this->_oldTimezone); + } + + /** + * Test building an Offset hash from a given ActiveSync style base64 encoded + * timezone structure. + */ + public function testOffsetsFromSyncTZ() + { + foreach ($this->_packed as $tz => $blob) { + $offsets = Horde_Mapi_Timezone::getOffsetsFromSyncTZ($blob); + foreach ($this->_offsets[$tz] as $key => $value) { + $this->assertEquals($value, $offsets[$key]); + } + } + } + + /** + * Test creating a Offset hash for a given timezone. + */ + public function testGetOffsetsFromDate() + { + // The actual time doesn't matter, we really only need a year and a + // timezone that we are interested in. + foreach ($this->_offsets as $tz => $expected) { + $date = new Horde_Date('2011-07-01', $tz); + $offsets = Horde_Mapi_Timezone::getOffsetsFromDate($date); + foreach ($offsets as $key => $value) { + $this->assertEquals($expected[$key], $value); + } + } + } + + /** + * Test generating an ActiveSync TZ structure given a TZ Offset hash + */ + public function testGetSyncTZFromOffsets() + { + foreach ($this->_offsets as $tz => $offsets) { + $blob = Horde_Mapi_Timezone::getSyncTZFromOffsets($offsets); + $this->assertEquals($this->_packed[$tz], $blob); + } + } + + /** + * Test guessing a timezone identifier from an ActiveSync timezone + * structure. + */ + public function testGuessTimezoneFromOffsets() + { + $timezones = new Horde_Mapi_Timezone(); + + // Test general functionality, with expected timezone. + foreach ($this->_packed as $tz => $blob) { + $guessed = $timezones->getTimezone($blob, $tz); + $this->assertEquals($tz, $guessed); + } + + // Test without a known timezone + $guessed = $timezones->getTimezone($this->_packed['America/New_York']); + $this->assertEquals('America/New_York', $guessed); + + $guessed = $timezones->getTimezone($this->_packed['Europe/Berlin']); + $this->assertEquals('Europe/Berlin', $guessed); + } + +} \ No newline at end of file diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/doc/Horde/Mapi/COPYING 1.0.10-1/Horde_Mapi-1.0.8/doc/Horde/Mapi/COPYING --- 1.0.8-2/Horde_Mapi-1.0.8/doc/Horde/Mapi/COPYING 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/doc/Horde/Mapi/COPYING 1970-01-01 00:00:00.000000000 +0000 @@ -1,458 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/lib/Horde/Mapi/Exception.php 1.0.10-1/Horde_Mapi-1.0.8/lib/Horde/Mapi/Exception.php --- 1.0.8-2/Horde_Mapi-1.0.8/lib/Horde/Mapi/Exception.php 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/lib/Horde/Mapi/Exception.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ - - * @package Mapi_Utils - */ -/** - * Base exception class for Horde_Mapi - * - * Copyright 2010-2016 Horde LLC (http://www.horde.org/) - * - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @copyright 2010-2016 Horde LLC (http://www.horde.org) - * @author Michael J Rubinsky - * @package Mapi_Utils - */ -class Horde_Mapi_Exception extends Horde_Exception_Wrapped -{ -} \ No newline at end of file diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/lib/Horde/Mapi/Timezone.php 1.0.10-1/Horde_Mapi-1.0.8/lib/Horde/Mapi/Timezone.php --- 1.0.8-2/Horde_Mapi-1.0.8/lib/Horde/Mapi/Timezone.php 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/lib/Horde/Mapi/Timezone.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,434 +0,0 @@ - - * @package Mapi_Utils - */ -/** - * Utility functions for dealing with Microsoft MAPI Timezone format. - * - * Copyright 2009-2016 Horde LLC (http://www.horde.org/) - * - * See the enclosed file COPYING for license information (LGPL). If you - * did not receive this file, see http://www.horde.org/licenses/lgpl21. - * - * Code dealing with searching for a timezone identifier from an AS timezone - * blob inspired by code in the Tine20 Project (http://tine20.org). - * - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @copyright 2009-2016 Horde LLC (http://www.horde.org) - * @author Michael J Rubinsky - * @package Mapi_Utils - */ -class Horde_Mapi_Timezone -{ - /** - * Date to use as start date when iterating through offsets looking for a - * transition. - * - * @var Horde_Date - */ - protected $_startDate; - - /** - * Convert a timezone from the MAPI base64 structure to a TZ offset - * hash. - * - * @param base64 encoded timezone structure defined by MS as: - * 
-     *      typedef struct TIME_ZONE_INFORMATION {
-     *        LONG Bias;
-     *        WCHAR StandardName[32];
-     *        SYSTEMTIME StandardDate;
-     *        LONG StandardBias;
-     *        WCHAR DaylightName[32];
-     *        SYSTEMTIME DaylightDate;
-     *        LONG DaylightBias;};
-     *
- * - * With the SYSTEMTIME format being: - * 
-     * typedef struct _SYSTEMTIME {
-     *     WORD wYear;
-     *     WORD wMonth;
-     *     WORD wDayOfWeek;
-     *     WORD wDay; (Used as week number)
-     *     WORD wHour;
-     *     WORD wMinute;
-     *     WORD wSecond;
-     *     WORD wMilliseconds;
-     *   } SYSTEMTIME, *PSYSTEMTIME;
-     *
- * - * See: http://msdn.microsoft.com/en-us/library/ms724950%28VS.85%29.aspx - * and: http://msdn.microsoft.com/en-us/library/ms725481%28VS.85%29.aspx - * - * @return array Hash of offset information - */ - public static function getOffsetsFromSyncTZ($data) - { - if (version_compare(PHP_VERSION, '5.5', '>=')) { - $format = 'lbias/Z64stdname/vstdyear/vstdmonth/vstdday/vstdweek/vstdhour/vstdminute/vstdsecond/vstdmillis/' - . 'lstdbias/Z64dstname/vdstyear/vdstmonth/vdstday/vdstweek/vdsthour/vdstminute/vdstsecond/vdstmillis/' - . 'ldstbias'; - } else { - $format = 'lbias/a64stdname/vstdyear/vstdmonth/vstdday/vstdweek/vstdhour/vstdminute/vstdsecond/vstdmillis/' - . 'lstdbias/a64dstname/vdstyear/vdstmonth/vdstday/vdstweek/vdsthour/vdstminute/vdstsecond/vdstmillis/' - . 'ldstbias'; - } - $tz = unpack($format, base64_decode($data)); - $tz['timezone'] = $tz['bias']; - $tz['timezonedst'] = $tz['dstbias']; - - if (!Horde_Mapi::isLittleEndian()) { - $tz['bias'] = Horde_Mapi::chbo($tz['bias']); - $tz['stdbias'] = Horde_Mapi::chbo($tz['stdbias']); - $tz['dstbias'] = Horde_Mapi::chbo($tz['dstbias']); - } - - return $tz; - } - - /** - * Build an MAPI TZ blob given a TZ Offset hash. - * - * @param array $offsets A TZ offset hash - * - * @return string A base64_encoded MAPI Timezone structure suitable - * for transmitting via wbxml. - */ - public static function getSyncTZFromOffsets(array $offsets) - { - if (!Horde_Mapi::isLittleEndian()) { - $offsets['bias'] = Horde_Mapi::chbo($offsets['bias']); - $offsets['stdbias'] = Horde_Mapi::chbo($offsets['stdbias']); - $offsets['dstbias'] = Horde_Mapi::chbo($offsets['dstbias']); - } - - $packed = pack('la64vvvvvvvvla64vvvvvvvvl', - $offsets['bias'], '', 0, $offsets['stdmonth'], $offsets['stdday'], $offsets['stdweek'], $offsets['stdhour'], $offsets['stdminute'], $offsets['stdsecond'], $offsets['stdmillis'], - $offsets['stdbias'], '', 0, $offsets['dstmonth'], $offsets['dstday'], $offsets['dstweek'], $offsets['dsthour'], $offsets['dstminute'], $offsets['dstsecond'], $offsets['dstmillis'], - $offsets['dstbias']); - - return base64_encode($packed); - } - - /** - * Create a offset hash suitable for use in ActiveSync transactions - * - * @param Horde_Date $date A date object representing the date to base the - * the tz data on. - * - * @return array An offset hash. - */ - public static function getOffsetsFromDate(Horde_Date $date) - { - $offsets = array( - 'bias' => 0, - 'stdname' => '', - 'stdyear' => 0, - 'stdmonth' => 0, - 'stdday' => 0, - 'stdweek' => 0, - 'stdhour' => 0, - 'stdminute' => 0, - 'stdsecond' => 0, - 'stdmillis' => 0, - 'stdbias' => 0, - 'dstname' => '', - 'dstyear' => 0, - 'dstmonth' => 0, - 'dstday' => 0, - 'dstweek' => 0, - 'dsthour' => 0, - 'dstminute' => 0, - 'dstsecond' => 0, - 'dstmillis' => 0, - 'dstbias' => 0 - ); - - $timezone = $date->toDateTime()->getTimezone(); - // If transition parsing failed, we won't have a multi-element array. - $transitions = self::_getTransitions($timezone, $date); - if (!empty($transitions)) { - list($std, $dst) = self::_getTransitions($timezone, $date); - } - if (!empty($std)) { - $offsets['bias'] = $std['offset'] / 60 * -1; - if ($dst) { - $offsets = self::_generateOffsetsForTransition($offsets, $std, 'std'); - $offsets = self::_generateOffsetsForTransition($offsets, $dst, 'dst'); - $offsets['stdhour'] += $dst['offset'] / 3600; - $offsets['dsthour'] += $std['offset'] / 3600; - $offsets['dstbias'] = ($dst['offset'] - $std['offset']) / 60 * -1; - } - } - - return $offsets; - } - - /** - * Get the transition data for moving from DST to STD time. - * - * @param DateTimeZone $timezone The timezone to get the transition for - * @param Horde_Date $date The date to start from. Really only the - * year we are interested in is needed. - * - * @return array An array containing the the STD and DST transitions - */ - protected static function _getTransitions(DateTimeZone $timezone, Horde_Date $date) - { - - $std = $dst = array(); - $transitions = $timezone->getTransitions( - mktime(0, 0, 0, 12, 1, $date->year - 1), - mktime(24, 0, 0, 12, 31, $date->year) - ); - - if ($transitions === false) { - return array(); - } - - foreach ($transitions as $i => $transition) { - try { - $d = new Horde_Date($transition['time']); - $d->setTimezone('UTC'); - } catch (Exception $e) { - continue; - } - if (($d->format('Y') == $date->format('Y')) && isset($transitions[$i + 1])) { - $next = new Horde_Date($transitions[$i + 1]['ts']); - if ($d->format('Y') == $next->format('Y')) { - $dst = $transition['isdst'] ? $transition : $transitions[$i + 1]; - $std = $transition['isdst'] ? $transitions[$i + 1] : $transition; - } else { - $dst = $transition['isdst'] ? $transition: null; - $std = $transition['isdst'] ? null : $transition; - } - break; - } elseif ($i == count($transitions) - 1) { - $std = $transition; - } - } - - return array($std, $dst); - } - - /** - * Calculate the offsets for the specified transition - * - * @param array $offsets A TZ offset hash - * @param array $transition A transition hash - * @param string $type Transition type - dst or std - * - * @return array A populated offset hash - */ - protected static function _generateOffsetsForTransition(array $offsets, array $transition, $type) - { - // We can't use Horde_Date directly here, since it is unable to - // properly convert to UTC from local ON the exact hour of a std -> dst - // transition. This is due to a conversion to DateTime in the localtime - // zone internally before the timezone change is applied - $transitionDate = new DateTime($transition['time']); - $transitionDate->setTimezone(new DateTimeZone('UTC')); - $transitionDate = new Horde_Date($transitionDate); - $offsets[$type . 'month'] = $transitionDate->format('n'); - $offsets[$type . 'day'] = $transitionDate->format('w'); - $offsets[$type . 'minute'] = (int)$transitionDate->format('i'); - $offsets[$type . 'hour'] = (int)$transitionDate->format('H'); - for ($i = 5; $i > 0; $i--) { - if (self::_isNthOcurrenceOfWeekdayInMonth($transition['ts'], $i)) { - $offsets[$type . 'week'] = $i; - break; - } - } - - return $offsets; - } - - /** - * Attempt to guess the timezone identifier from the $offsets array. - * - * Since it's impossible to know exactly which olson timezone name a - * specific set of offsets represent (multiple timezone names may be - * described by the same offsets for any given year) we allow passing an - * expected timezone. If this matches one of the timezones that matches the - * offsets, we return that. Otherwise, we attempt to get the full timezone - * name from Horde_Date and if that fails, return the abbreviated timezone - * name of the first timezone that matches the provided offsets. - * - * @param array|string $offsets The timezone to check. Either an array - * of offsets or an activesynz tz blob. - * @param string $expectedTimezone The expected timezone. If not empty, and - * present in the results, will return. - * - * @return string The timezone identifier. - */ - public function getTimezone($offsets, $expectedTimezone = null) - { - $timezones = $this->getListOfTimezones($offsets, $expectedTimezone); - if (isset($timezones[$expectedTimezone])) { - return $expectedTimezone; - } else { - return Horde_Date::getTimezoneAlias(current($timezones)); - } - } - - /** - * Get the list of timezone identifiers that match the given offsets, having - * a preference for $expectedTimezone if it's present in the results. - * - * @param array|string $offsets Either an offset array, or a AS timezone - * structure. - * @param string $expectedTimezone The expected timezone. - * - * @return array An array of timezone identifiers - */ - public function getListOfTimezones($offsets, $expectedTimezone = null) - { - if (is_string($offsets)) { - $offsets = self::getOffsetsFromSyncTZ($offsets); - } - $this->_setDefaultStartDate($offsets); - $timezones = array(); - foreach (DateTimeZone::listIdentifiers() as $timezoneIdentifier) { - $timezone = new DateTimeZone($timezoneIdentifier); - if (false !== ($matchingTransition = $this->_checkTimezone($timezone, $offsets))) { - if ($timezoneIdentifier == $expectedTimezone) { - $timezones = array($timezoneIdentifier => $matchingTransition['abbr']); - break; - } else { - $timezones[$timezoneIdentifier] = $matchingTransition['abbr']; - } - } - } - - if (empty($timezones)) { - throw new Horde_Mapi_Exception('No timezone found for the given offsets'); - } - - return $timezones; - } - - /** - * Set default value for $_startDate. - * - * Tries to guess the correct startDate depending on object property. Falls - * back to current date. - * - * @param array $offsets Offsets may be avaluated for a given start year - */ - protected function _setDefaultStartDate(array $offsets = null) - { - if (!empty($this->_startDate)) { - return; - } - - if (!empty($offsets['stdyear'])) { - $this->_startDate = new Horde_Date($offsets['stdyear'] . '-01-01'); - } else { - $start = new Horde_Date(time()); - $start->year--; - $this->_startDate = $start; - } - } - - /** - * Check if the given timezone matches the offsets and also evaluate the - * daylight saving time transitions for this timezone if necessary. - * - * @param DateTimeZone $timezone The timezone to check. - * @param array $offsets The offsets to check. - * - * @return array|boolean An array of transition data or false if timezone - * does not match offset. - */ - protected function _checkTimezone(DateTimeZone $timezone, array $offsets) - { - list($std, $dst) = $this->_getTransitions($timezone, $this->_startDate); - if ($this->_checkTransition($std, $dst, $offsets)) { - return $std; - } - - return false; - } - - /** - * Check if the given standardTransition and daylightTransition match to the - * given offsets. - * - * @param array $std The Standard transition date. - * @param array $dst The DST transition date. - * @param array $offsets The offsets to check. - * - * @return boolean - */ - protected function _checkTransition(array $std, array $dst, array $offsets) - { - if (empty($std) || empty($offsets)) { - return false; - } - - $standardOffset = ($offsets['bias'] + $offsets['stdbias']) * 60 * -1; - - // check each condition in a single if statement and break the chain - // when one condition is not met - for performance reasons - if ($standardOffset == $std['offset']) { - if ((empty($offsets['dstmonth']) && (empty($dst) || empty($dst['isdst']))) || - (empty($dst) && !empty($offsets['dstmonth']))) { - // Offset contains DST, but no dst to compare - return true; - } - $daylightOffset = ($offsets['bias'] + $offsets['dstbias']) * 60 * -1; - // the milestone is sending a positive value for daylightBias while it should send a negative value - $daylightOffsetMilestone = ($offsets['dstbias'] + ($offsets['dstbias'] * -1) ) * 60 * -1; - - if ($daylightOffset == $dst['offset'] || $daylightOffsetMilestone == $dst['offset']) { - $standardParsed = new DateTime($std['time']); - $daylightParsed = new DateTime($dst['time']); - - if ($standardParsed->format('n') == $offsets['stdmonth'] && - $daylightParsed->format('n') == $offsets['dstmonth'] && - $standardParsed->format('w') == $offsets['stdday'] && - $daylightParsed->format('w') == $offsets['dstday']) - { - return self::_isNthOcurrenceOfWeekdayInMonth($dst['ts'], $offsets['dstweek']) && - self::_isNthOcurrenceOfWeekdayInMonth($std['ts'], $offsets['stdweek']); - } - } - } - - return false; - } - - /** - * Test if the weekday of the given timestamp is the nth occurence of this - * weekday within its month, where '5' indicates the last occurrence even if - * there is less than five occurrences. - * - * @param integer $timestamp The timestamp to check. - * @param integer $occurence 1 to 5, where 5 indicates the final occurrence - * during the month if that day of the week does - * not occur 5 times - * @return boolean - */ - protected static function _isNthOcurrenceOfWeekdayInMonth($timestamp, $occurence) - { - $original = new Horde_Date($timestamp); - $original->setTimezone('UTC'); - if ($occurence == 5) { - $modified = $original->add(array('mday' => 7)); - return $modified->month > $original->month; - } else { - $modified = $original->sub(array('mday' => 7 * $occurence)); - $modified2 = $original->sub(array('mday' => 7 * ($occurence - 1))); - - return $modified->month < $original->month && - $modified2->month == $original->month; - } - } - -} diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/lib/Horde/Mapi.php 1.0.10-1/Horde_Mapi-1.0.8/lib/Horde/Mapi.php --- 1.0.8-2/Horde_Mapi-1.0.8/lib/Horde/Mapi.php 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/lib/Horde/Mapi.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,200 +0,0 @@ - - * @package Mapi_Utils - */ -/** - * Utility functions for dealing with Microsoft MAPI structures. - * - * Copyright 2009-2016 Horde LLC (http://www.horde.org/) - * - * See the enclosed file COPYING for license information (LGPL). If you - * did not receive this file, see http://www.horde.org/licenses/lgpl21. - * - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @copyright 2009-2016 Horde LLC (http://www.horde.org) - * @author Michael J Rubinsky - * @package Mapi_Utils - */ -class Horde_Mapi -{ - /** - * Determine if the current machine is little endian. - * - * @return boolean True if endianness is little endian, otherwise false. - */ - public static function isLittleEndian() - { - $testint = 0x00FF; - $p = pack('S', $testint); - - return ($testint === current(unpack('v', $p))); - } - - /** - * Change the byte order of a number. Used to allow big endian machines to - * decode the timezone blobs, which are encoded in little endian order. - * - * @param integer $num The number to reverse. - * - * @return integer The number, in the reverse byte order. - */ - public static function chbo($num) - { - $u = unpack('l', strrev(pack('l', $num))); - - return $u[1]; - } - - /** - * Obtain the UID from a MAPI GOID. - * - * See http://msdn.microsoft.com/en-us/library/hh338153%28v=exchg.80%29.aspx - * - * @param string $goid Base64 encoded Global Object Identifier. - * - * @return string The UID - */ - public static function getUidFromGoid($goid) - { - $goid = base64_decode($goid); - - // First, see if it's an Outlook UID or not. - if (substr($goid, 40, 8) == 'vCal-Uid') { - // For vCal UID values: - // Bytes 37 - 40 contain length of data and padding - // Bytes 41 - 48 are == vCal-Uid - // Bytes 53 until next to the last byte (/0) contain the UID. - return trim(substr($goid, 52, strlen($goid) - 1)); - } else { - // If it's not a vCal UID, then it is Outlook style UID: - // The entire decoded goid is converted to hex representation with - // bytes 17 - 20 converted to zero - $hex = array(); - foreach (str_split($goid) as $chr) { - $hex[] = sprintf('%02X', ord($chr)); - } - array_splice($hex, 16, 4, array('00', '00', '00', '00')); - return implode('', $hex); - } - } - - /** - * Create a MAPI GOID from a UID - * See http://msdn.microsoft.com/en-us/library/ee157690%28v=exchg.80%29 - * - * @param string $uid The UID value to encode. - * - * @return string A Base64 encoded GOID - */ - public static function createGoid($uid, $options = array()) - { - // Bytes 1 - 16 MUST be equal to the GOID identifier: - $arrayid = '040000008200E00074C5B7101A82E008'; - - // Bytes 17 - 20 - Exception replace time (YH YL M D) - $exception = '00000000'; - - // Bytes 21 - 28 The 8 byte creation time (can be all zeros if not available). - $creationtime = '0000000000000000'; - - // Bytes 29 - 36 Reserved 8 bytes must be all zeros. - $reserved = '0000000000000000'; - - // Bytes 37 - 40 - A long value describing the size of the UID data. - $size = strlen($uid); - - // Bytes 41 - 52 - MUST BE vCal-Uid 0x01 0x00 0x00 0x00 - $vCard = '7643616C2D55696401000000'; - - // The UID Data: - $hexuid = ''; - foreach (str_split($uid) as $chr) { - $hexuid .= sprintf('%02X', ord($chr)); - } - - // Pack it - $goid = pack('H*H*H*H*VH*H*x', $arrayid, $exception, $creationtime, $reserved, $size, $vCard, $hexuid); - - return base64_encode($goid); - } - - /** - * Converts a Windows FILETIME value to a unix timestamp. - * - * Adapted from: - * http://stackoverflow.com/questions/610603/help-me-translate-long-value-expressed-in-hex-back-in-to-a-date-time - * - * @param string $ft Binary representation of FILETIME from a pTypDate - * MAPI property. - * - * @return integer The unix timestamp. - * @throws Horde_Mapi_Exception - */ - public static function filetimeToUnixtime($ft) - { - $ft = bin2hex($ft); - $dtval = substr($ft, 0, 16); // clip overlength string - $dtval = str_pad($dtval, 16, '0'); // pad underlength string - $quad = self::_flipEndian($dtval); - $win64_datetime = self::_hexToBcint($quad); - return self::_win64ToUnix($win64_datetime); - } - - // swap little-endian to big-endian - protected static function _flipEndian($str) - { - // make sure #digits is even - if ( strlen($str) & 1 ) - $str = '0' . $str; - - $t = ''; - for ($i = strlen($str)-2; $i >= 0; $i-=2) - $t .= substr($str, $i, 2); - - return $t; - } - - // convert hex string to BC-int - protected static function _hexToBcint($str) - { - $hex = array( - '0'=>'0', '1'=>'1', '2'=>'2', '3'=>'3', '4'=>'4', - '5'=>'5', '6'=>'6', '7'=>'7', '8'=>'8', '9'=>'9', - 'a'=>'10', 'b'=>'11', 'c'=>'12', 'd'=>'13', 'e'=>'14', 'f'=>'15', - 'A'=>'10', 'B'=>'11', 'C'=>'12', 'D'=>'13', 'E'=>'14', 'F'=>'15' - ); - - $bci = new Math_BigInteger('0'); - $len = strlen($str); - for ($i = 0; $i < $len; ++$i) { - $bci = $bci->multiply(new Math_BigInteger('16')); - $ch = $str[$i]; - if (isset($hex[$ch])) { - $bci = $bci->add(new Math_BigInteger($hex[$ch])); - } - } - - return $bci; - } - - /** - * - * @param Math_BigInteger $bci - * @return string - */ - protected static function _win64ToUnix($bci) - { - // Unix epoch as a Windows file date-time value - $t = $bci->subtract(new Math_BigInteger('116444735995904000')); // Cast to Unix epoch - list($quotient, $remainder) = $t->divide(new Math_BigInteger('10000000')); - - return (string)$quotient; - } - - -} diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/AllTests.php 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/AllTests.php --- 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/AllTests.php 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/AllTests.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -run(); diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/Autoload.php 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/Autoload.php --- 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/Autoload.php 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/Autoload.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ - - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - */ - -/* Load Math_BigInteger now, before composer autoloaders can mess with the - * include path. This is to avoid using phpseclib's Math\BigInteger from - * Horde_Pgp instead of PEAR's Math_BigInteger. */ -require_once 'Math/BigInteger.php'; \ No newline at end of file diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/bootstrap.php 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/bootstrap.php --- 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/bootstrap.php 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/bootstrap.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ - - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Mapi_Utils - * @subpackage UnitTests - */ - -/** - * @author Michael J Rubinsky - * @category Horde - * @license http://www.horde.org/licenses/lgpl21 LGPL 2.1 - * @package Mapi_Utils - * @subpackage UnitTests - */ -class Horde_Mapi_MapiTest extends PHPUnit_Framework_TestCase -{ - - public function testFiletimeToUnixTime() - { - $data = file_get_contents(__DIR__ . '/fixtures/filetime'); - $this->assertEquals(Horde_Mapi::filetimeToUnixtime($data), 1387818000); - } - - /** - * Test parsing GOID value. - */ - public function testParseGlobalObjectId() - { - // Outlook UID - $fixture = 'BAAAAIIA4AB0xbcQGoLgCAfUCRDgQMnBJoXEAQAAAAAAAAAAEAAAAAvw7UtuTulOnjnjhns3jvM='; - $uid = Horde_Mapi::getUidFromGoid($fixture); - $this->assertEquals( - '040000008200E00074C5B7101A82E00800000000E040C9C12685C4010000000000000000100000000BF0ED4B6E4EE94E9E39E3867B378EF3', - $uid); - - // vCal - $fixture = 'BAAAAIIA4AB0xbcQGoLgCAAAAAAAAAAAAAAAAAAAAAAAAAAAMwAAAHZDYWwtVWlkAQAAAHs4MTQxMkQzQy0yQTI0LTRFOUQtQjIwRS0xMUY3QkJFOTI3OTl9AA=='; - $uid = Horde_Mapi::getUidFromGoid($fixture); - $this->assertEquals('{81412D3C-2A24-4E9D-B20E-11F7BBE92799}', $uid); - } - -} diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/phpunit.xml 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/phpunit.xml --- 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/phpunit.xml 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/phpunit.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ - diff -pruN 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/TimezoneTest.php 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/TimezoneTest.php --- 1.0.8-2/Horde_Mapi-1.0.8/test/Horde/Mapi/TimezoneTest.php 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/Horde_Mapi-1.0.8/test/Horde/Mapi/TimezoneTest.php 1970-01-01 00:00:00.000000000 +0000 @@ -1,183 +0,0 @@ - - * @category Horde - * @package Mapi_Utils - */ -class Horde_Mapi_TimezoneTest extends Horde_Test_Case -{ - - protected $_offsets = array( - 'America/New_York' => array('bias' => 300, - 'stdname' => '', - 'stdyear' => 0, - 'stdmonth' => 11, - 'stdday' => 0, - 'stdweek' => 1, - 'stdhour' => 2, - 'stdminute' => 0, - 'stdsecond' => 0, - 'stdmillis' => 0, - 'stdbias' => 0, - 'dstname' => '', - 'dstyear' => 0, - 'dstmonth' => 3, - 'dstday' => 0, - 'dstweek' => 2, - 'dsthour' => 2, - 'dstminute' => 0, - 'dstsecond' => 0, - 'dstmillis' => 0, - 'dstbias' => -60), - 'Europe/Berlin' => array('bias' => -60, - 'stdname' => '', - 'stdyear' => 0, - 'stdmonth' => 10, - 'stdday' => 0, - 'stdweek' => 5, - 'stdhour' => 3, - 'stdminute' => 0, - 'stdsecond' => 0, - 'stdmillis' => 0, - 'stdbias' => 0, - 'dstname' => '', - 'dstyear' => 0, - 'dstmonth' => 3, - 'dstday' => 0, - 'dstweek' => 5, - 'dsthour' => 2, - 'dstminute' => 0, - 'dstsecond' => 0, - 'dstmillis' => 0, - 'dstbias' => -60), - 'America/Los_Angeles' => array('bias' => 480, - 'stdname' => '', - 'stdyear' => 0, - 'stdmonth' => 11, - 'stdday' => 0, - 'stdweek' => 1, - 'stdhour' => 2, - 'stdminute' => 0, - 'stdsecond' => 0, - 'stdmillis' => 0, - 'stdbias' => 0, - 'dstname' => '', - 'dstyear' => 0, - 'dstmonth' => 3, - 'dstday' => 0, - 'dstweek' => 2, - 'dsthour' => 2, - 'dstminute' => 0, - 'dstsecond' => 0, - 'dstmillis' => 0, - 'dstbias' => -60, - 'timezone' => 480, - 'timezonedst' => -60), - 'America/Phoenix' => array('bias' => 420, - 'stdname' => '', - 'stdyear' => 0, - 'stdmonth' => 0, - 'stdday' => 0, - 'stdweek' => 0, - 'stdhour' => 0, - 'stdminute' => 0, - 'stdsecond' => 0, - 'stdmillis' => 0, - 'stdbias' => 0, - 'dstname' => '', - 'dstyear' => 0, - 'dstmonth' => 0, - 'dstday' => 0, - 'dstweek' => 0, - 'dsthour' => 0, - 'dstminute' => 0, - 'dstsecond' => 0, - 'dstmillis' => 0, - 'dstbias' => 0) - ); - - protected $_packed = array( - 'America/New_York' => 'LAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==', - 'America/Los_Angeles' => '4AEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsAAAABAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAACAAIAAAAAAAAAxP///w==', - 'Europe/Berlin' => 'xP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAoAAAAFAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMAAAAFAAIAAAAAAAAAxP///w==', - 'America/Phoenix' => 'pAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==', - ); - - - public function setUp() - { - $this->_oldTimezone = date_default_timezone_get(); - date_default_timezone_set('America/New_York'); - } - - public function tearDown() - { - date_default_timezone_set($this->_oldTimezone); - } - - /** - * Test building an Offset hash from a given ActiveSync style base64 encoded - * timezone structure. - */ - public function testOffsetsFromSyncTZ() - { - foreach ($this->_packed as $tz => $blob) { - $offsets = Horde_Mapi_Timezone::getOffsetsFromSyncTZ($blob); - foreach ($this->_offsets[$tz] as $key => $value) { - $this->assertEquals($value, $offsets[$key]); - } - } - } - - /** - * Test creating a Offset hash for a given timezone. - */ - public function testGetOffsetsFromDate() - { - // The actual time doesn't matter, we really only need a year and a - // timezone that we are interested in. - foreach ($this->_offsets as $tz => $expected) { - $date = new Horde_Date('2011-07-01', $tz); - $offsets = Horde_Mapi_Timezone::getOffsetsFromDate($date); - foreach ($offsets as $key => $value) { - $this->assertEquals($expected[$key], $value); - } - } - } - - /** - * Test generating an ActiveSync TZ structure given a TZ Offset hash - */ - public function testGetSyncTZFromOffsets() - { - foreach ($this->_offsets as $tz => $offsets) { - $blob = Horde_Mapi_Timezone::getSyncTZFromOffsets($offsets); - $this->assertEquals($this->_packed[$tz], $blob); - } - } - - /** - * Test guessing a timezone identifier from an ActiveSync timezone - * structure. - */ - public function testGuessTimezoneFromOffsets() - { - $timezones = new Horde_Mapi_Timezone(); - - // Test general functionality, with expected timezone. - foreach ($this->_packed as $tz => $blob) { - $guessed = $timezones->getTimezone($blob, $tz); - $this->assertEquals($tz, $guessed); - } - - // Test without a known timezone - $guessed = $timezones->getTimezone($this->_packed['America/New_York']); - $this->assertEquals('America/New_York', $guessed); - - $guessed = $timezones->getTimezone($this->_packed['Europe/Berlin']); - $this->assertEquals('Europe/Berlin', $guessed); - } - -} \ No newline at end of file diff -pruN 1.0.8-2/package.xml 1.0.10-1/package.xml --- 1.0.8-2/package.xml 2016-03-21 15:17:31.000000000 +0000 +++ 1.0.10-1/package.xml 2019-02-16 21:51:00.000000000 +0000 @@ -1,8 +1,8 @@ - + Horde_Mapi pear.horde.org - MAPI utility library. + MAPI utility library Provides various utility classes for dealing with Microsoft MAPI structured data. Michael J Rubinsky @@ -10,10 +10,10 @@ mrubinsk@horde.org yes - 2016-03-21 - + 2019-02-16 + - 1.0.8 + 1.0.10 1.0.0 @@ -22,20 +22,19 @@ LGPL-2.1 -* [mjr] Fix dependency on Horde_Date 2.3.0. +* [mjr] Remove Autoloading of unused Math_BigInteger (Remi Collet <remi@remirepo.net>, PR #2). + - - - + + + - - - + @@ -63,26 +62,21 @@ 3.0.0alpha1 3.0.0alpha1 - - Math_BigInteger - pear.php.net - 1.0.2 - 2.0.0 - 2.0.0 - + + bcmath + + - - @@ -223,5 +217,35 @@ * [mjr] Fix dependency on Horde_Date 2.3.0. + + + 1.0.9 + 1.0.0 + + + stable + stable + + 2019-02-09 + LGPL-2.1 + +* [mjr] No longer support Math_BigInteger, require the bcmath extension instead. + + + + + 1.0.10 + 1.0.0 + + + stable + stable + + 2019-02-16 + LGPL-2.1 + +* [mjr] Remove Autoloading of unused Math_BigInteger (Remi Collet <remi@remirepo.net>, PR #2). + +