Updated SVN properties

Committed By: Kevin Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6820 c91229c3-7414-0410-bfa2-8a42b809f60b

Updated SVN properties
Committed By: Kevin Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6820 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent e09cc82f
Showing 163 changed files with 72161 additions and 72161 deletions
about.php
bin/openoffice/pdfgen.py
bin/storageverification.php
bin/upgrade/pear-upgrade.bat
docs/COPYING
ktwsapi/README.txt
lib/actions/bulkaction.php
lib/actions/documentviewlet.inc.php
lib/actions/entitylist.php
lib/authentication/interceptorinstances.inc.php
lib/browse/columnentry.inc.php
lib/browse/columnregistry.inc.php
lib/metadata/fieldsetregistry.inc.php
lib/util/KTStopwords.php
lib/validation/basevalidator.inc.php
lib/validation/validatorfactory.inc.php
lib/widgets/basewidget.inc.php
lib/widgets/forms.inc.php
lib/widgets/widgetfactory.inc.php
lib/workflow/workflowadminutil.inc.php
 <?php
 /**
- * $Id: preferences.php 6203 2007-02-08 10:41:00Z kevin_fourie $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 #!/usr/bin/env python
 #
 #
-# $Id: view.php 6203 2007-02-08 10:41:00Z kevin_fourie $
+# $Id$
 #
 # The contents of this file are subject to the KnowledgeTree Public
 # License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
-
-; TEST ALL PEAR LIBRARIES BEFORE UPGRADING INTO RELEASE
-
-PATH=%PATH%;c:\php5\PEAR
-
-pear channel-update pear.php.net
-pear config-set php_dir "C:\kt\kt.trunk\thirdparty\pear"
-
-pear config-set preferred_state stable
-
-pear upgrade --alldeps PEAR
-pear upgrade --alldeps Cache_Lite
-pear upgrade --alldeps Config
-pear upgrade --alldeps DB
-pear upgrade --alldeps File
-
-;pear upgrade --alldeps MDB2#mysql
-
-pear upgrade --alldeps Log
-pear upgrade --alldeps PHP_Compat
-
-pear config-set preferred_state beta
-pear upgrade --alldeps File_Gettext
-pear upgrade --alldeps Net_LDAP
-pear upgrade --alldeps SOAP
-pear config-set preferred_state stable
-
+
+; TEST ALL PEAR LIBRARIES BEFORE UPGRADING INTO RELEASE
+
+PATH=%PATH%;c:\php5\PEAR
+
+pear channel-update pear.php.net
+pear config-set php_dir "C:\kt\kt.trunk\thirdparty\pear"
+
+pear config-set preferred_state stable
+
+pear upgrade --alldeps PEAR
+pear upgrade --alldeps Cache_Lite
+pear upgrade --alldeps Config
+pear upgrade --alldeps DB
+pear upgrade --alldeps File
+
+;pear upgrade --alldeps MDB2#mysql
+
+pear upgrade --alldeps Log
+pear upgrade --alldeps PHP_Compat
+
+pear config-set preferred_state beta
+pear upgrade --alldeps File_Gettext
+pear upgrade --alldeps Net_LDAP
+pear upgrade --alldeps SOAP
+pear config-set preferred_state stable
+
-KNOWLEDGETREE PUBLIC LICENSE
-Version 1.1.2
-
-1. Definitions.
-
-1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party.
-
-1.1. "Contributor" means each entity that creates or contributes to the creation of Modifications.
-
-1.2. "Contributor Version" means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-
-1.3. "Covered Code" means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
-
-1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted in the software development community for the electronic transfer of data.
-
-1.5. "Executable" means Covered Code in any form other than Source Code.
-
-1.6. "Initial Developer" means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-
-1.7. "Larger Work" means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-
-1.8. "License" means this document.
-
-1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. "Modifications" means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-
-B. Any new file that contains any part of the Original Code or previous Modifications.
-
-1.10. "Original Code" means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-
-1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-1.11. "Source Code" means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-
-1.12. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. Source Code License.
-
-2.1. The Initial Developer Grant.
-The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
-
-(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof).
-
-(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License.
-
-(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices.
-
-2.2. Contributor Grant.
-Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
-
-
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
-
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-
-(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code.
-
-(d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
-
-
-3. Distribution Obligations.
-
-3.1. Application of License.
-The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-3.2. Availability of Source Code.
-Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
-
-3.3. Description of Modifications.
-You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-3.4. Intellectual Property Matters
-
-(a) Third Party Claims.
-If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-
-(b) Contributor APIs.
-If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file.
-
-(c) Representations.
-
-Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
-
-
-3.5. Required Notices.
-You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-3.6. Distribution of Executable Versions.
-You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-3.7. Larger Works.
-You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-
-5. Application of this License.
-
-This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-6.1. New Versions.
-The Jam Warehouse Software (Pty) Ltd may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-6.2. Effect of New Versions.
-Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by The Jam Warehouse Software (Pty) Ltd, trading as KnowledgeTree. No one other than The Jam Warehouse Software (Pty) Ltd has the right to modify the terms applicable to Covered Code created under this License.
-
-6.3. Derivative Works.
-If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases "KnowledgeTree", "KPL" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the KnowledgeTree Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that:
-
-(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above.
-
-(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant.
-
-8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-
-8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-The Covered Code is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.
-
-11. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-Initial Developer may designate portions of the Covered Code as "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.
-KnowledgeTree Public License 1.1.2 - Exhibit A
-
-The contents of this file are subject to the KnowledgeTree Public
-License Version 1.1.2 ("License"); You may not use this file except in
-compliance with the License. You may obtain a copy of the License at
-http://www.knowledgetree.com/KPL
-
-Software distributed under the License is distributed on an "AS IS"
-basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
-See the License for the specific language governing rights and
-limitations under the License.
-
-All copies of the Covered Code must include on each user interface screen:
-   (i) the "Powered by KnowledgeTree" logo and
-   (ii) the KnowledgeTree copyright notice
-in the same form as they appear in the distribution.  See the License for
-requirements.
-
-The Original Code is: KnowledgeTree Open Source
-
-The Initial Developer of the Original Code is The Jam Warehouse Software
-(Pty) Ltd, trading as KnowledgeTree.
-Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
-(C) 2007 The Jam Warehouse Software (Pty) Ltd;
-All Rights Reserved.
-Contributor( s): ______________________________________
-
-[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.]
-KnowledgeTree Public License 1.1.2 - Exihibit B
-
-Additional Terms applicable to the KnowledgeTree Public License.
-
-I. Effect.
-These additional terms described in this KnowledgeTree Public License - Additional Terms shall apply to the Covered Code under this License.
-
-II. KnowledgeTree and logo.
-This License does not grant any rights to use the trademarks "KnowledgeTree" and the "KnowledgeTree" logos even if such marks are included in the Original Code or Modifications.
-
-However, in addition to the other notice obligations, all copies of the Covered Code in Executable and Source Code form distributed must, as a form of attribution of the original author, include on each user interface screen (i) the "KnowledgeTree Document Management Made Simple" logo and (ii) the copyright notice in the same form as the latest version of the Covered Code distributed by The Jam Warehouse Software (Pty) Ltd. at the time of distribution of such copy. In addition, the "KnowledgeTree Document Management Made Simple" logo must be visible to all users and be located at the top right-hand corner of each user interface screen, other than the user log-in page, on which it must be located at the top-center of the user log-in form. Notwithstanding the above, the dimensions of the "KnowledgeTree Document Management Made Simple" logo must be at least 200 x 40 pixels. When users click on the "KnowledgeTree Document Management Made Simple" logo it must direct them back to http://www.knowledgetree.com. In addition, the copyright notice must remain visible to all users at all times at the bottom of the user interface screen. When users click on the copyright notice, it must direct them back to http://www.knowledgetree.com
+KNOWLEDGETREE PUBLIC LICENSE
+Version 1.1.2
+
+1. Definitions.
+
+1.0.1. "Commercial Use" means distribution or otherwise making the Covered Code available to a third party.
+
+1.1. "Contributor" means each entity that creates or contributes to the creation of Modifications.
+
+1.2. "Contributor Version" means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
+
+1.3. "Covered Code" means the Original Code or Modifications or the combination of the Original Code and Modifications, in each case including portions thereof.
+
+1.4. "Electronic Distribution Mechanism" means a mechanism generally accepted in the software development community for the electronic transfer of data.
+
+1.5. "Executable" means Covered Code in any form other than Source Code.
+
+1.6. "Initial Developer" means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
+
+1.7. "Larger Work" means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
+
+1.8. "License" means this document.
+
+1.8.1. "Licensable" means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
+
+1.9. "Modifications" means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
+
+A. Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
+
+B. Any new file that contains any part of the Original Code or previous Modifications.
+
+1.10. "Original Code" means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
+
+1.10.1. "Patent Claims" means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
+
+1.11. "Source Code" means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
+
+1.12. "You" (or "Your") means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
+
+2. Source Code License.
+
+2.1. The Initial Developer Grant.
+The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
+
+(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
+
+(b) under Patents Claims infringed by the making, using or selling of Original Code, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Code (or portions thereof).
+
+(c) the licenses granted in this Section 2.1(a) and (b) are effective on the date Initial Developer first distributes Original Code under the terms of this License.
+
+(d) Notwithstanding Section 2.1(b) above, no patent license is granted: 1) for code that You delete from the Original Code; 2) separate from the Original Code; or 3) for infringements caused by: i) the modification of the Original Code or ii) the combination of the Original Code with other software or devices.
+
+2.2. Contributor Grant.
+Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
+
+
+(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
+
+(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: 1) Modifications made by that Contributor (or portions thereof); and 2) the combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
+
+(c) the licenses granted in Sections 2.2(a) and 2.2(b) are effective on the date Contributor first makes Commercial Use of the Covered Code.
+
+(d) Notwithstanding Section 2.2(b) above, no patent license is granted: 1) for any code that Contributor has deleted from the Contributor Version; 2) separate from the Contributor Version; 3) for infringements caused by: i) third party modifications of Contributor Version or ii) the combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or 4) under Patent Claims infringed by Covered Code in the absence of Modifications made by that Contributor.
+
+
+3. Distribution Obligations.
+
+3.1. Application of License.
+The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
+
+3.2. Availability of Source Code.
+Any Modification which You create or to which You contribute must be made available in Source Code form under the terms of this License either on the same media as an Executable version or via an accepted Electronic Distribution Mechanism to anyone to whom you made an Executable version available; and if made available via Electronic Distribution Mechanism, must remain available for at least twelve (12) months after the date it initially became available, or at least six (6) months after a subsequent version of that particular Modification has been made available to such recipients. You are responsible for ensuring that the Source Code version remains available even if the Electronic Distribution Mechanism is maintained by a third party.
+
+3.3. Description of Modifications.
+You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
+
+3.4. Intellectual Property Matters
+
+(a) Third Party Claims.
+If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
+
+(b) Contributor APIs.
+If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file.
+
+(c) Representations.
+
+Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
+
+
+3.5. Required Notices.
+You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear than any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
+
+3.6. Distribution of Executable Versions.
+You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code, and if You include a notice stating that the Source Code version of the Covered Code is available under the terms of this License, including a description of how and where You have fulfilled the obligations of Section 3.2. The notice must be conspicuously included in any notice in an Executable version, related documentation or collateral in which You describe recipients' rights relating to the Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
+
+3.7. Larger Works.
+You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
+
+4. Inability to Comply Due to Statute or Regulation.
+
+If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
+
+5. Application of this License.
+
+This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
+
+6. Versions of the License.
+
+6.1. New Versions.
+The Jam Warehouse Software (Pty) Ltd may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
+
+6.2. Effect of New Versions.
+Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License published by The Jam Warehouse Software (Pty) Ltd, trading as KnowledgeTree. No one other than The Jam Warehouse Software (Pty) Ltd has the right to modify the terms applicable to Covered Code created under this License.
+
+6.3. Derivative Works.
+If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrases "KnowledgeTree", "KPL" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the KnowledgeTree Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
+
+7. DISCLAIMER OF WARRANTY.
+
+COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
+
+8. TERMINATION.
+
+8.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
+
+8.2. If You initiate litigation by asserting a patent infringement claim (excluding declatory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You file such action is referred to as "Participant") alleging that:
+
+(a) such Participant's Contributor Version directly or indirectly infringes any patent, then any and all rights granted by such Participant to You under Sections 2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively, unless if within 60 days after receipt of notice You either: (i) agree in writing to pay Participant a mutually agreeable reasonable royalty for Your past and future use of Modifications made by such Participant, or (ii) withdraw Your litigation claim with respect to the Contributor Version against such Participant. If within 60 days of notice, a reasonable royalty and payment arrangement are not mutually agreed upon in writing by the parties or the litigation claim is not withdrawn, the rights granted by Participant to You under Sections 2.1 and/or 2.2 automatically terminate at the expiration of the 60 day notice period specified above.
+
+(b) any software, hardware, or device, other than such Participant's Contributor Version, directly or indirectly infringes any patent, then any rights granted to You by such Participant under Sections 2.1(b) and 2.2(b) are revoked effective as of the date You first made, used, sold, distributed, or had made, Modifications made by that Participant.
+
+8.3. If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
+
+8.4. In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
+
+9. LIMITATION OF LIABILITY.
+
+UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
+
+10. U.S. GOVERNMENT END USERS.
+
+The Covered Code is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Code with only those rights set forth herein.
+
+11. MISCELLANEOUS.
+
+This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by California law provisions (except to the extent applicable law, if any, provides otherwise), excluding its conflict-of-law provisions. With respect to disputes in which at least one party is a citizen of, or an entity chartered or registered to do business in the United States of America, any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California, with venue lying in Santa Clara County, California, with the losing party responsible for costs, including without limitation, court costs and reasonable attorneys' fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License.
+
+12. RESPONSIBILITY FOR CLAIMS.
+
+As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
+
+13. MULTIPLE-LICENSED CODE.
+
+Initial Developer may designate portions of the Covered Code as "Multiple-Licensed". "Multiple-Licensed" means that the Initial Developer permits you to utilize portions of the Covered Code under Your choice of the SPL or the alternative licenses, if any, specified by the Initial Developer in the file described in Exhibit A.
+KnowledgeTree Public License 1.1.2 - Exhibit A
+
+The contents of this file are subject to the KnowledgeTree Public
+License Version 1.1.2 ("License"); You may not use this file except in
+compliance with the License. You may obtain a copy of the License at
+http://www.knowledgetree.com/KPL
+
+Software distributed under the License is distributed on an "AS IS"
+basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+See the License for the specific language governing rights and
+limitations under the License.
+
+All copies of the Covered Code must include on each user interface screen:
+   (i) the "Powered by KnowledgeTree" logo and
+   (ii) the KnowledgeTree copyright notice
+in the same form as they appear in the distribution.  See the License for
+requirements.
+
+The Original Code is: KnowledgeTree Open Source
+
+The Initial Developer of the Original Code is The Jam Warehouse Software
+(Pty) Ltd, trading as KnowledgeTree.
+Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+(C) 2007 The Jam Warehouse Software (Pty) Ltd;
+All Rights Reserved.
+Contributor( s): ______________________________________
+
+[NOTE: The text of this Exhibit A may differ slightly from the text of the notices in the Source Code files of the Original Code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.]
+KnowledgeTree Public License 1.1.2 - Exihibit B
+
+Additional Terms applicable to the KnowledgeTree Public License.
+
+I. Effect.
+These additional terms described in this KnowledgeTree Public License - Additional Terms shall apply to the Covered Code under this License.
+
+II. KnowledgeTree and logo.
+This License does not grant any rights to use the trademarks "KnowledgeTree" and the "KnowledgeTree" logos even if such marks are included in the Original Code or Modifications.
+
+However, in addition to the other notice obligations, all copies of the Covered Code in Executable and Source Code form distributed must, as a form of attribution of the original author, include on each user interface screen (i) the "KnowledgeTree Document Management Made Simple" logo and (ii) the copyright notice in the same form as the latest version of the Covered Code distributed by The Jam Warehouse Software (Pty) Ltd. at the time of distribution of such copy. In addition, the "KnowledgeTree Document Management Made Simple" logo must be visible to all users and be located at the top right-hand corner of each user interface screen, other than the user log-in page, on which it must be located at the top-center of the user log-in form. Notwithstanding the above, the dimensions of the "KnowledgeTree Document Management Made Simple" logo must be at least 200 x 40 pixels. When users click on the "KnowledgeTree Document Management Made Simple" logo it must direct them back to http://www.knowledgetree.com. In addition, the copyright notice must remain visible to all users at all times at the bottom of the user interface screen. When users click on the copyright notice, it must direct them back to http://www.knowledgetree.com
-KnowledgeTree WebService API
-============================
-
-This folder contains the object model in various languages, used to access 
+KnowledgeTree WebService API
+============================
+
+This folder contains the object model in various languages, used to access 
 KnowledgeTree via web services.
 \ No newline at end of file
 <?php
 /**
- * $Id: documentaction.inc.php 5848 2006-08-16 15:58:51Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: documentaction.inc.php 5848 2006-08-16 15:58:51Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: entity.php 5758 2006-07-27 10:17:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: authenticationsource.inc.php 5758 2006-07-27 10:17:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: columnentry.inc.php 5492 2006-06-04 20:50:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: columnregistry.inc.php 5492 2006-06-04 20:50:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: config.inc.php 5758 2006-07-27 10:17:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: workflowtrigger.inc.php 5268 2006-04-18 13:42:22Z nbm $
+ * $Id$
  *
  * Provides a base class for workflow triggers.  This includes
  * the ability to serialise configuration arrays into the db
 <?php
 /**
- * $Id: workflowtriggerinstance.inc.php 5268 2006-04-18 13:42:22Z nbm $
+ * $Id$
  *
  * Provides both association between a transition and a trigger, and a 
  * way to store the configuration for that instance.
 <?php
 /**
- * $Id: dashboard.php 6039 2006-11-03 10:01:51Z bryndivey $
+ * $Id$
  *
  * Main dashboard page -- This page is presented to the user after login.
  * It contains a high level overview of the users subscriptions, checked out 
@@ -33,7 +33,7 @@
  * Contributor( s): ______________________________________
  *
  *
- * @version $Revision: 6039 $
+ * @version $Revision$
  * @author Michael Joseph <michael@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
  */
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: KTWorkflowTriggers.php 5439 2006-05-25 13:20:15Z bryndivey $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: documentFields.php 5801 2006-08-15 10:06:22Z bryndivey $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
-<?php
-/**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
- *    
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights and
- * limitations under the License.
- *
- * All copies of the Covered Code must include on each user interface screen:
- *    (i) the "Powered by KnowledgeTree" logo and
- *    (ii) the KnowledgeTree copyright notice
- * in the same form as they appear in the distribution.  See the License for
- * requirements.
- * 
- * The Original Code is: KnowledgeTree Open Source
- * 
- * The Initial Developer of the Original Code is The Jam Warehouse Software
- * (Pty) Ltd, trading as KnowledgeTree.
- * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
- * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
- * Contributor( s): ______________________________________
- */
-
-require_once('../../../config/dmsDefaults.php');
-require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
-
-require_once(KT_LIB_DIR . '/documentmanagement/Document.inc');
-require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransaction.inc');
- 
-$aDocuments =& Document::getList("status_id=" . DELETED);
-
-$pageNum = $_REQUEST['page'];
-
-$items = count($aDocuments);
-if(fmod($items, 10) > 0){
-	$pages = floor($items/10)+1;
-}else{
-	$pages = ($items/10);
-}
-if($pageNum == 1){
-	$listStart = 0;
-	$listEnd = 9;
-}elseif($pageNum == $pages){
-	$listStart = (10*($pageNum-1));
-	$listEnd = count($aDocuments)-1;
-}else{
-	$listStart = (10*($pageNum-1));
-	$listEnd = $listStart+9;
-}
-for($i = $listStart; $i <= $listEnd; $i++){
-	$output .=  "<tr>
-	      <td><input type='checkbox' name='selected_docs[]' value='".$aDocuments[$i]->getId()."'/></td>
-	      <td>".$aDocuments[$i]->getName()."</td>
-	      <td>".$aDocuments[$i]->getLastModifiedDate()."</td>
-	      <td>".$aDocuments[$i]->getLastDeletionComment()."</td>
-	    </tr>";
-}
-echo $output;
-?>
+<?php
+/**
+ * $Id$
+ *    
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ */
+
+require_once('../../../config/dmsDefaults.php');
+require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
+
+require_once(KT_LIB_DIR . '/documentmanagement/Document.inc');
+require_once(KT_LIB_DIR . '/documentmanagement/DocumentTransaction.inc');
+ 
+$aDocuments =& Document::getList("status_id=" . DELETED);
+
+$pageNum = $_REQUEST['page'];
+
+$items = count($aDocuments);
+if(fmod($items, 10) > 0){
+	$pages = floor($items/10)+1;
+}else{
+	$pages = ($items/10);
+}
+if($pageNum == 1){
+	$listStart = 0;
+	$listEnd = 9;
+}elseif($pageNum == $pages){
+	$listStart = (10*($pageNum-1));
+	$listEnd = count($aDocuments)-1;
+}else{
+	$listStart = (10*($pageNum-1));
+	$listEnd = $listStart+9;
+}
+for($i = $listStart; $i <= $listEnd; $i++){
+	$output .=  "<tr>
+	      <td><input type='checkbox' name='selected_docs[]' value='".$aDocuments[$i]->getId()."'/></td>
+	      <td>".$aDocuments[$i]->getName()."</td>
+	      <td>".$aDocuments[$i]->getLastModifiedDate()."</td>
+	      <td>".$aDocuments[$i]->getLastDeletionComment()."</td>
+	    </tr>";
+}
+echo $output;
+?>
 <?php
 /**
- * $Id: documentFields.php 5801 2006-08-15 10:06:22Z bryndivey $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: documentFields.php 5801 2006-08-15 10:06:22Z bryndivey $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
+ * $Id$
  *    
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: KTBulkExportPlugin.php 5758 2006-07-27 10:17:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: KTDocumentLinks.php 5758 2006-07-27 10:17:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: KTWebDAVDashletPlugin.php 6609 2007-05-30 14:40:10Z kevin_fourie $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
 <?php
 /**
- * $Id: OpenDocumentIndexer.php 5758 2006-07-27 10:17:43Z bshuttle $
+ * $Id$
  *
  * The contents of this file are subject to the KnowledgeTree Public
  * License Version 1.1.2 ("License"); You may not use this file except in
-.floatClear
-{
-    clear: none !important;
+.floatClear
+{
+    clear: none !important;
 }
 \ No newline at end of file
-<?php
-/**
- * $Id: view.php 6584 2007-05-23 13:43:15Z kevin_fourie $
- *    
- * The contents of this file are subject to the KnowledgeTree Public
- * License Version 1.1.2 ("License"); You may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.knowledgetree.com/KPL
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
- * See the License for the specific language governing rights and
- * limitations under the License.
- *
- * All copies of the Covered Code must include on each user interface screen:
- *    (i) the "Powered by KnowledgeTree" logo and
- *    (ii) the KnowledgeTree copyright notice
- * in the same form as they appear in the distribution.  See the License for
- * requirements.
- * 
- * The Original Code is: KnowledgeTree Open Source
- * 
- * The Initial Developer of the Original Code is The Jam Warehouse Software
- * (Pty) Ltd, trading as KnowledgeTree.
- * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
- * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
- * All Rights Reserved.
- * Contributor( s): ______________________________________
- */
-
-require_once('config/dmsDefaults.php');
-require_once(KT_LIB_DIR .'/authentication/DBAuthenticator.inc');
-require_once(KT_DIR. '/plugins/rssplugin/KTrss.inc.php');
-require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
-
-// widget includes.
-require_once(KT_LIB_DIR . "/widgets/portlet.inc.php");
-require_once(KT_LIB_DIR . "/widgets/fieldsetDisplay.inc.php");
-require_once(KT_LIB_DIR . "/widgets/FieldsetDisplayRegistry.inc.php");
-require_once(KT_LIB_DIR . "/actions/documentaction.inc.php");
-require_once(KT_LIB_DIR . "/browse/browseutil.inc.php");
-
-require_once(KT_LIB_DIR . '/mime.inc.php');
-
-// workaround to get http authentication working in cgi mode
-$altinfo = KTUtil::arrayGet( $_SERVER, 'kt_auth', KTUtil::arrayGet( $_SERVER, 'REDIRECT_kt_auth'));
-if ( !empty( $altinfo) && !isset( $_SERVER['PHP_AUTH_USER'])) {
-    $val = $altinfo;
-    $pieces = explode( ' ', $val);   // bad.
-    if ( $pieces[0] == 'Basic') {
-        $chunk = $pieces[1];
-        $decoded = base64_decode( $chunk);
-        $credential_info = explode( ':', $decoded);
-        if ( count( $credential_info) == 2) {
-            $_SERVER['PHP_AUTH_USER'] = $credential_info[0];
-            $_SERVER['PHP_AUTH_PW'] = $credential_info[1];
-            $_SERVER["AUTH_TYPE"] = 'Basic';
-        }
-    }
-}
-
-if (!validateUser($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
-   header('WWW-Authenticate: Basic realm="KnowledgeTree DMS"');
-   header('HTTP/1.0 401 Unauthorized');
-   echo 'This RSS feed requires authentication. Please enter your username and password.';
-   exit;
-} else {
-	$user = DBAuthenticator::getUser($_SERVER['PHP_AUTH_USER'], array('id'=>'id',));
-	$id =  $user[$_SERVER['PHP_AUTH_USER']]['id'];
-	
-	
-	if(KTUtil::arrayGet($_REQUEST, 'docId')){ // if a docId parameter is passed
-		// get document id from http request object
-		$iDocumentId = KTUtil::arrayGet($_REQUEST, 'docId');
-		
-		if(KTrss::validateDocumentPermissions($id, $iDocumentId)){ // if document passes validation check
-			// get document info
-			$aDocumentInfo[] = KTrss::getOneDocument($iDocumentId, $id);
-			
-			if($aDocumentInfo){			
-				// create rss xml for document
-				$documentFeed = KTrss::arrayToXML($aDocumentInfo);
-			}else{
-				// create rss xml for the error
-				$error = KTrss::errorToXML(_kt('This document has returned a empty response'));
-			}	
-		}else{
-			// create rss xml for error
-			$error = KTrss::errorToXML(_kt('You are either not authorised to view details on this document or it does not exist.' .
-					' Please visit http://' .$_SERVER['HTTP_HOST'].'/'.$GLOBALS['KTRootUrl'].'/ to browse for a valid document.'));
-		}
-		if(isset($error)){ // if an error exist, output...else out the result
-			echo $error;
-		}else{
-			echo $documentFeed;
-		}
-   	}elseif(KTUtil::arrayGet($_REQUEST, 'folderId')){ // if a folderId parameter is passed
-   		// get folder id from http request object
-   		$iFolderId = KTUtil::arrayGet($_REQUEST, 'folderId');
-
-		if(KTrss::validateFolderPermissions($id, $iFolderId)){ // if folder passes validation check
-			// get folder info
-			$aFolderInfo[] = KTrss::getOneFolder($iFolderId);
-			
-			if($aFolderInfo){
-				// create rss xml for folder
-				$folderFeed = KTrss::arrayToXML($aFolderInfo);
-			}else{
-				// create rss xml for error
-				$error = KTrss::errorToXML(_kt('This document has returned a empty response'));
-			}
-		}else{
-			// create rss xml for error
-			$error = KTrss::errorToXML(_kt('You are either not authorised to view details on this folder or it does not exist.' .
-					' Please visit http://' .$_SERVER['HTTP_HOST'].'/'.$GLOBALS['KTRootUrl'].'/ to browse for a valid folder.'));
-		}
-		if(isset($error)){ // if an error exist, output...else out the result
-			echo $error;
-		}else{
-			echo $folderFeed;
-		}
-   	}else{ // else do normal rss parsing
-   		// get full list of subscribed documents and folders
-	   	$aFullList = array_merge(KTrss::getDocuments($id), KTrss::getFolders($id));
-	   	$internalFeed = KTrss::arrayToXML($aFullList);
-	   	echo $internalFeed;
-   	}
-}
-
-// Validate user credentials
-function validateUser($username, $password){
-	return DBAuthenticator::checkPassword($username, $password);
-}
-?>
+<?php
+/**
+ * $Id$
+ *    
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1.2 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.knowledgetree.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.
+ * See the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * All copies of the Covered Code must include on each user interface screen:
+ *    (i) the "Powered by KnowledgeTree" logo and
+ *    (ii) the KnowledgeTree copyright notice
+ * in the same form as they appear in the distribution.  See the License for
+ * requirements.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2007 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ * Contributor( s): ______________________________________
+ */
+
+require_once('config/dmsDefaults.php');
+require_once(KT_LIB_DIR .'/authentication/DBAuthenticator.inc');
+require_once(KT_DIR. '/plugins/rssplugin/KTrss.inc.php');
+require_once(KT_LIB_DIR . '/browse/browseutil.inc.php');
+
+// widget includes.
+require_once(KT_LIB_DIR . "/widgets/portlet.inc.php");
+require_once(KT_LIB_DIR . "/widgets/fieldsetDisplay.inc.php");
+require_once(KT_LIB_DIR . "/widgets/FieldsetDisplayRegistry.inc.php");
+require_once(KT_LIB_DIR . "/actions/documentaction.inc.php");
+require_once(KT_LIB_DIR . "/browse/browseutil.inc.php");
+
+require_once(KT_LIB_DIR . '/mime.inc.php');
+
+// workaround to get http authentication working in cgi mode
+$altinfo = KTUtil::arrayGet( $_SERVER, 'kt_auth', KTUtil::arrayGet( $_SERVER, 'REDIRECT_kt_auth'));
+if ( !empty( $altinfo) && !isset( $_SERVER['PHP_AUTH_USER'])) {
+    $val = $altinfo;
+    $pieces = explode( ' ', $val);   // bad.
+    if ( $pieces[0] == 'Basic') {
+        $chunk = $pieces[1];
+        $decoded = base64_decode( $chunk);
+        $credential_info = explode( ':', $decoded);
+        if ( count( $credential_info) == 2) {
+            $_SERVER['PHP_AUTH_USER'] = $credential_info[0];
+            $_SERVER['PHP_AUTH_PW'] = $credential_info[1];
+            $_SERVER["AUTH_TYPE"] = 'Basic';
+        }
+    }
+}
+
+if (!validateUser($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'])) {
+   header('WWW-Authenticate: Basic realm="KnowledgeTree DMS"');
+   header('HTTP/1.0 401 Unauthorized');
+   echo 'This RSS feed requires authentication. Please enter your username and password.';
+   exit;
+} else {
+	$user = DBAuthenticator::getUser($_SERVER['PHP_AUTH_USER'], array('id'=>'id',));
+	$id =  $user[$_SERVER['PHP_AUTH_USER']]['id'];
+	
+	
+	if(KTUtil::arrayGet($_REQUEST, 'docId')){ // if a docId parameter is passed
+		// get document id from http request object
+		$iDocumentId = KTUtil::arrayGet($_REQUEST, 'docId');
+		
+		if(KTrss::validateDocumentPermissions($id, $iDocumentId)){ // if document passes validation check
+			// get document info
+			$aDocumentInfo[] = KTrss::getOneDocument($iDocumentId, $id);
+			
+			if($aDocumentInfo){			
+				// create rss xml for document
+				$documentFeed = KTrss::arrayToXML($aDocumentInfo);
+			}else{
+				// create rss xml for the error
+				$error = KTrss::errorToXML(_kt('This document has returned a empty response'));
+			}	
+		}else{
+			// create rss xml for error
+			$error = KTrss::errorToXML(_kt('You are either not authorised to view details on this document or it does not exist.' .
+					' Please visit http://' .$_SERVER['HTTP_HOST'].'/'.$GLOBALS['KTRootUrl'].'/ to browse for a valid document.'));
+		}
+		if(isset($error)){ // if an error exist, output...else out the result
+			echo $error;
+		}else{
+			echo $documentFeed;
+		}
+   	}elseif(KTUtil::arrayGet($_REQUEST, 'folderId')){ // if a folderId parameter is passed
+   		// get folder id from http request object
+   		$iFolderId = KTUtil::arrayGet($_REQUEST, 'folderId');
+
+		if(KTrss::validateFolderPermissions($id, $iFolderId)){ // if folder passes validation check
+			// get folder info
+			$aFolderInfo[] = KTrss::getOneFolder($iFolderId);
+			
+			if($aFolderInfo){
+				// create rss xml for folder
+				$folderFeed = KTrss::arrayToXML($aFolderInfo);
+			}else{
+				// create rss xml for error
+				$error = KTrss::errorToXML(_kt('This document has returned a empty response'));
+			}
+		}else{
+			// create rss xml for error
+			$error = KTrss::errorToXML(_kt('You are either not authorised to view details on this folder or it does not exist.' .
+					' Please visit http://' .$_SERVER['HTTP_HOST'].'/'.$GLOBALS['KTRootUrl'].'/ to browse for a valid folder.'));
+		}
+		if(isset($error)){ // if an error exist, output...else out the result
+			echo $error;
+		}else{
+			echo $folderFeed;
+		}
+   	}else{ // else do normal rss parsing
+   		// get full list of subscribed documents and folders
+	   	$aFullList = array_merge(KTrss::getDocuments($id), KTrss::getFolders($id));
+	   	$internalFeed = KTrss::arrayToXML($aFullList);
+	   	echo $internalFeed;
+   	}
+}
+
+// Validate user credentials
+function validateUser($username, $password){
+	return DBAuthenticator::checkPassword($username, $password);
+}
+?>
-@ECHO OFF
-CLS
-ECHO.
-FOR /F "tokens=5* delims= " %%A IN ('VOL C: ^| FIND "drive C"') DO SET OLDLABEL=%%B
-ECHO Enter name of database (default is dms):
-FOR /F "TOKENS=*" %%? IN ('LABEL C: 2^>NUL') DO SET INPUT=%%?
-SET INPUT
-CLS
-LABEL C: %OLDLABEL%
-PAUSE
-CLS
-ECHO ---- Dropping database %INPUT% ----
-mysqladmin -u root -p -f drop %INPUT%
-ECHO ---- Creating database %INPUT% ----
-mysqladmin -u root -p create %INPUT%
-ECHO ---- Creating structure for database %INPUT% ----
-mysql -u root %INPUT%<structure.sql
-ECHO ---- Inserting data into database %INPUT% ----
-mysql -u root -p %INPUT%< data.sql
-ECHO ---- Creating user information for database %INPUT% ----
+@ECHO OFF
+CLS
+ECHO.
+FOR /F "tokens=5* delims= " %%A IN ('VOL C: ^| FIND "drive C"') DO SET OLDLABEL=%%B
+ECHO Enter name of database (default is dms):
+FOR /F "TOKENS=*" %%? IN ('LABEL C: 2^>NUL') DO SET INPUT=%%?
+SET INPUT
+CLS
+LABEL C: %OLDLABEL%
+PAUSE
+CLS
+ECHO ---- Dropping database %INPUT% ----
+mysqladmin -u root -p -f drop %INPUT%
+ECHO ---- Creating database %INPUT% ----
+mysqladmin -u root -p create %INPUT%
+ECHO ---- Creating structure for database %INPUT% ----
+mysql -u root %INPUT%<structure.sql
+ECHO ---- Inserting data into database %INPUT% ----
+mysql -u root -p %INPUT%< data.sql
+ECHO ---- Creating user information for database %INPUT% ----
 mysql -u root -p %INPUT%<user.sql
 \ No newline at end of file
-CREATE TABLE `plugin_rss` 
-( `id` int(11) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  `url` varchar(200) NOT NULL,
-  `title` varchar(20) NOT NULL,
-  PRIMARY KEY  (`id`)) 
-ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
-CREATE TABLE `zseq_plugin_rss` 
-(
-  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,  
-   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1;
-
+CREATE TABLE `plugin_rss` 
+( `id` int(11) NOT NULL,
+  `user_id` int(11) NOT NULL,
+  `url` varchar(200) NOT NULL,
+  `title` varchar(20) NOT NULL,
+  PRIMARY KEY  (`id`)) 
+ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE `zseq_plugin_rss` 
+(
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,  
+   PRIMARY KEY  (`id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1;
+
 INSERT INTO `zseq_plugin_rss` (id) VALUES ('1');
 \ No newline at end of file
-CREATE TABLE `tag_words` (            
-   `id` int(10) NOT NULL,     
-   `tag` varchar(100) default NULL,    
-   PRIMARY KEY  (`id`))
-ENGINE=InnoDB DEFAULT CHARSET=utf8;  
-
-CREATE TABLE `document_tags` (
-   `document_id` int(10) NOT NULL, 
-   `tag_id` int(10) NOT NULL,       
-   PRIMARY KEY  (`document_id`,`tag_id`),
-   CONSTRAINT fk_document_tags_document_id FOREIGN KEY (document_id) REFERENCES documents(id) ON UPDATE CASCADE ON DELETE CASCADE,
-   CONSTRAINT fk_document_tags_tag_id FOREIGN KEY (tag_id) REFERENCES tag_words(id) ON UPDATE CASCADE ON DELETE CASCADE
-)
-ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `zseq_document_tags` (                    
-   `id` int(10) NOT NULL auto_increment,       
-   PRIMARY KEY  (`id`))
-ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-INSERT INTO `zseq_document_tags` (id) VALUES ('1');
-
-CREATE TABLE `zseq_tag_words` (                         
-   `id` int(10) NOT NULL auto_increment,        
-   PRIMARY KEY  (`id`))
-ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
-INSERT INTO `zseq_tag_words` (id) VALUES ('1');
-
+CREATE TABLE `tag_words` (            
+   `id` int(10) NOT NULL,     
+   `tag` varchar(100) default NULL,    
+   PRIMARY KEY  (`id`))
+ENGINE=InnoDB DEFAULT CHARSET=utf8;  
+
+CREATE TABLE `document_tags` (
+   `document_id` int(10) NOT NULL, 
+   `tag_id` int(10) NOT NULL,       
+   PRIMARY KEY  (`document_id`,`tag_id`),
+   CONSTRAINT fk_document_tags_document_id FOREIGN KEY (document_id) REFERENCES documents(id) ON UPDATE CASCADE ON DELETE CASCADE,
+   CONSTRAINT fk_document_tags_tag_id FOREIGN KEY (tag_id) REFERENCES tag_words(id) ON UPDATE CASCADE ON DELETE CASCADE
+)
+ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `zseq_document_tags` (                    
+   `id` int(10) NOT NULL auto_increment,       
+   PRIMARY KEY  (`id`))
+ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+INSERT INTO `zseq_document_tags` (id) VALUES ('1');
+
+CREATE TABLE `zseq_tag_words` (                         
+   `id` int(10) NOT NULL auto_increment,        
+   PRIMARY KEY  (`id`))
+ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
+INSERT INTO `zseq_tag_words` (id) VALUES ('1');
+
-ALTER TABLE fieldsets ADD disabled tinyint not null default 0;
-
+ALTER TABLE fieldsets ADD disabled tinyint not null default 0;
+
-CREATE TABLE `uploaded_files` (                                                           
-`tempfilename` varchar(100) NOT NULL,                                                   
-`filename` varchar(100) NOT NULL,                                                       
-`userid` int(11) NOT NULL,                                                              
-`uploaddate` timestamp NOT NULL,  
-`action` char(1) NOT NULL COMMENT 'A = Add, C = Checkin',                         
-`document_id` int(11) default NULL                                                      
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `download_files` (                              
-`document_id` int(10) unsigned NOT NULL,                   
-`session` varchar(100) NOT NULL,                           
-`download_date` timestamp NULL default CURRENT_TIMESTAMP,  
-`downloaded` int(10) unsigned NOT NULL default '0',        
-`filesize` int(10) unsigned NOT NULL,                      
-`content_version` int(10) unsigned NOT NULL,               
-`hash` varchar(100) NOT NULL,                              
-PRIMARY KEY  (`document_id`,`session`)                     
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-CREATE TABLE `index_files` (
-`document_id` int(10) unsigned NOT NULL,                                               
-`user_id` int(10) unsigned NOT NULL,                                                   
-`indexdate` timestamp NOT NULL,  
-PRIMARY KEY  (`document_id`)                                                           
+CREATE TABLE `uploaded_files` (                                                           
+`tempfilename` varchar(100) NOT NULL,                                                   
+`filename` varchar(100) NOT NULL,                                                       
+`userid` int(11) NOT NULL,                                                              
+`uploaddate` timestamp NOT NULL,  
+`action` char(1) NOT NULL COMMENT 'A = Add, C = Checkin',                         
+`document_id` int(11) default NULL                                                      
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `download_files` (                              
+`document_id` int(10) unsigned NOT NULL,                   
+`session` varchar(100) NOT NULL,                           
+`download_date` timestamp NULL default CURRENT_TIMESTAMP,  
+`downloaded` int(10) unsigned NOT NULL default '0',        
+`filesize` int(10) unsigned NOT NULL,                      
+`content_version` int(10) unsigned NOT NULL,               
+`hash` varchar(100) NOT NULL,                              
+PRIMARY KEY  (`document_id`,`session`)                     
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE `index_files` (
+`document_id` int(10) unsigned NOT NULL,                                               
+`user_id` int(10) unsigned NOT NULL,                                                   
+`indexdate` timestamp NOT NULL,  
+PRIMARY KEY  (`document_id`)                                                           
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;    
 \ No newline at end of file
-<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Generate PDF of{/i18n}:<br />{$context->oDocument->getName()}</h2>
-
-{$form->render()}
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Generate PDF of{/i18n}:<br />{$context->oDocument->getName()}</h2>
+
+{$form->render()}
-<div>
-<p>{i18n arg_appname="$appname"}To connect to #appname# via a third-party WebDAV client, please use the following address{/i18n}:<br/>
-<b><a href="{$url}ktwebdav/ktwebdav.php" target="_blank">{$url}ktwebdav/ktwebdav.php</a></b><br/><br/>
-{i18n arg_appname="$appname"}To connect with the #appname# Tools Suite, use this address{/i18n}:<br/>
-<b>{$url}</b><br/><br/>
-</p>
-</div>
-
+<div>
+<p>{i18n arg_appname="$appname"}To connect to #appname# via a third-party WebDAV client, please use the following address{/i18n}:<br/>
+<b><a href="{$url}ktwebdav/ktwebdav.php" target="_blank">{$url}ktwebdav/ktwebdav.php</a></b><br/><br/>
+{i18n arg_appname="$appname"}To connect with the #appname# Tools Suite, use this address{/i18n}:<br/>
+<b>{$url}</b><br/><br/>
+</p>
+</div>
+
@@ -16,7 +16,7 @@
 // | Author: Andrei Zmievski <andrei@php.net>                             |
 // +----------------------------------------------------------------------+
 //
-// $Id: Getopt.php,v 1.21.4.7 2003/12/05 21:57:01 andrei Exp $
+// $Id$
 require_once 'PEAR.php';
@@ -21,7 +21,7 @@
  * @author     Michael Lively Jr. <mlively@ft11.net>
  * @copyright  2001-2006 Sebastian Bergmann <sb@sebastian-bergmann.de>
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: GraphViz.php,v 1.25 2006/05/16 15:49:19 sebastian Exp $
+ * @version    CVS: $Id$
  * @link       http://pear.php.net/package/Image_GraphViz
  * @since      File available since Release 0.1
  */
@@ -16,7 +16,7 @@
 // | Author: Alexey Borzov <avb@php.net>                                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: Client.php,v 1.4 2004/03/23 13:35:37 avb Exp $
+// $Id$
 require_once 'HTTP/Request.php';
 require_once 'HTTP/Client/CookieManager.php';
@@ -29,7 +29,7 @@ require_once &#39;HTTP/Client/CookieManager.php&#39;;
  * 
  * @package HTTP_Client
  * @author Alexey Borzov <avb@php.net>
- * @version $Revision: 1.4 $
+ * @version $Revision$
  */
 class HTTP_Client
 {
@@ -16,14 +16,14 @@
 // | Author: Alexey Borzov <avb@php.net>                                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: CookieManager.php,v 1.3 2004/04/10 10:04:52 avb Exp $
+// $Id$
 /**
  * This class is used to store cookies and pass them between HTTP requests.
  * 
  * @package HTTP_Client
  * @author  Alexey Borzov <avb@php.net>
- * @version $Revision: 1.3 $
+ * @version $Revision$
  */
 class HTTP_Client_CookieManager
 {
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTTP::Download
- * 
- * PHP versions 4 and 5
- *
- * @category   HTTP
- * @package    HTTP_Download
- * @author     Michael Wallner <mike@php.net>
- * @copyright  2003-2005 Michael Wallner
- * @license    BSD, revised
- * @version    CVS: $Id: Download.php,v 1.75 2005/11/13 19:18:53 mike Exp $
- * @link       http://pear.php.net/package/HTTP_Download
- */
-
-// {{{ includes
-/**
- * Requires PEAR
- */
-require_once 'PEAR.php';
-
-/**
- * Requires HTTP_Header
- */
-require_once 'HTTP/Header.php';
-// }}}
-
-// {{{ constants
-/**#@+ Use with HTTP_Download::setContentDisposition() **/
-/**
- * Send data as attachment
- */
-define('HTTP_DOWNLOAD_ATTACHMENT', 'attachment');
-/**
- * Send data inline
- */
-define('HTTP_DOWNLOAD_INLINE', 'inline');
-/**#@-**/
-
-/**#@+ Use with HTTP_Download::sendArchive() **/
-/**
- * Send as uncompressed tar archive
- */
-define('HTTP_DOWNLOAD_TAR', 'TAR');
-/**
- * Send as gzipped tar archive
- */
-define('HTTP_DOWNLOAD_TGZ', 'TGZ');
-/**
- * Send as bzip2 compressed tar archive
- */
-define('HTTP_DOWNLOAD_BZ2', 'BZ2');
-/**
- * Send as zip archive
- */
-define('HTTP_DOWNLOAD_ZIP', 'ZIP');
-/**#@-**/
-
-/**#@+
- * Error constants
- */
-define('HTTP_DOWNLOAD_E_HEADERS_SENT',          -1);
-define('HTTP_DOWNLOAD_E_NO_EXT_ZLIB',           -2);
-define('HTTP_DOWNLOAD_E_NO_EXT_MMAGIC',         -3);
-define('HTTP_DOWNLOAD_E_INVALID_FILE',          -4);
-define('HTTP_DOWNLOAD_E_INVALID_PARAM',         -5);
-define('HTTP_DOWNLOAD_E_INVALID_RESOURCE',      -6);
-define('HTTP_DOWNLOAD_E_INVALID_REQUEST',       -7);
-define('HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE',  -8);
-define('HTTP_DOWNLOAD_E_INVALID_ARCHIVE_TYPE',  -9);
-/**#@-**/
-// }}}
-
-/** 
- * Send HTTP Downloads/Responses.
- *
- * With this package you can handle (hidden) downloads.
- * It supports partial downloads, resuming and sending 
- * raw data ie. from database BLOBs.
- * 
- * <i>ATTENTION:</i>
- * You shouldn't use this package together with ob_gzhandler or 
- * zlib.output_compression enabled in your php.ini, especially 
- * if you want to send already gzipped data!
- * 
- * @access   public
- * @version  $Revision: 1.75 $
- */
-class HTTP_Download
-{
-    // {{{ protected member variables
-    /**
-     * Path to file for download
-     *
-     * @see     HTTP_Download::setFile()
-     * @access  protected
-     * @var     string
-     */
-    var $file = '';
-    
-    /**
-     * Data for download
-     *
-     * @see     HTTP_Download::setData()
-     * @access  protected
-     * @var     string
-     */
-    var $data = null;
-    
-    /**
-     * Resource handle for download
-     *
-     * @see     HTTP_Download::setResource()
-     * @access  protected
-     * @var     int
-     */
-    var $handle = null;
-    
-    /**
-     * Whether to gzip the download
-     *
-     * @access  protected
-     * @var     bool
-     */
-    var $gzip = false;
-    
-    /**
-     * Whether to allow caching of the download on the clients side
-     * 
-     * @access  protected
-     * @var     bool
-     */
-    var $cache = true;
-    
-    /**
-     * Size of download
-     *
-     * @access  protected
-     * @var     int
-     */
-    var $size = 0;
-    
-    /**
-     * Last modified
-     *
-     * @access  protected
-     * @var     int
-     */
-    var $lastModified = 0;
-    
-    /**
-     * HTTP headers
-     *
-     * @access  protected
-     * @var     array
-     */
-    var $headers   = array(
-        'Content-Type'  => 'application/x-octetstream',
-        'Pragma'        => 'cache',
-        'Cache-Control' => 'public, must-revalidate, max-age=0',
-        'Accept-Ranges' => 'bytes',
-        'X-Sent-By'     => 'PEAR::HTTP::Download'
-    );
- 
-    /**
-     * HTTP_Header
-     * 
-     * @access  protected
-     * @var     object
-     */
-    var $HTTP = null;
-    
-    /**
-     * ETag
-     * 
-     * @access  protected
-     * @var     string
-     */
-    var $etag = '';
-    
-    /**
-     * Buffer Size
-     * 
-     * @access  protected
-     * @var     int
-     */
-    var $bufferSize = 2097152;
-    
-    /**
-     * Throttle Delay
-     * 
-     * @access  protected
-     * @var     float
-     */
-    var $throttleDelay = 0;
-    
-    /**
-     * Sent Bytes
-     * 
-     * @access  public
-     * @var     int
-     */
-    var $sentBytes = 0;
-    // }}}
-    
-    // {{{ constructor
-    /**
-     * Constructor
-     *
-     * Set supplied parameters.
-     * 
-     * @access  public
-     * @param   array   $params     associative array of parameters
-     * 
-     *          <b>one of:</b>
-     *                  o 'file'                => path to file for download
-     *                  o 'data'                => raw data for download
-     *                  o 'resource'            => resource handle for download
-     * <br/>
-     *          <b>and any of:</b>
-     *                  o 'cache'               => whether to allow cs caching
-     *                  o 'gzip'                => whether to gzip the download
-     *                  o 'lastmodified'        => unix timestamp
-     *                  o 'contenttype'         => content type of download
-     *                  o 'contentdisposition'  => content disposition
-     *                  o 'buffersize'          => amount of bytes to buffer
-     *                  o 'throttledelay'       => amount of secs to sleep
-     *                  o 'cachecontrol'        => cache privacy and validity
-     * 
-     * <br />
-     * 'Content-Disposition' is not HTTP compliant, but most browsers 
-     * follow this header, so it was borrowed from MIME standard.
-     * 
-     * It looks like this: <br />
-     * "Content-Disposition: attachment; filename=example.tgz".
-     * 
-     * @see HTTP_Download::setContentDisposition()
-     */
-    function HTTP_Download($params = array())
-    {
-        $this->HTTP = &new HTTP_Header;
-        $this->setParams($params);
-    }
-    // }}}
-    
-    // {{{ public methods
-    /**
-     * Set parameters
-     * 
-     * Set supplied parameters through its accessor methods.
-     *
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   array   $params     associative array of parameters
-     * 
-     * @see     HTTP_Download::HTTP_Download()
-     */
-    function setParams($params)
-    {
-        foreach((array) $params as $param => $value){
-            $method = 'set'. $param;
-            
-            if (!method_exists($this, $method)) {
-                return PEAR::raiseError(
-                    "Method '$method' doesn't exist.",
-                    HTTP_DOWNLOAD_E_INVALID_PARAM
-                );
-            }
-            
-            $e = call_user_func_array(array(&$this, $method), (array) $value);
-            
-            if (PEAR::isError($e)) {
-                return $e;
-            }
-        }
-        return true;
-    }
-    
-    /**
-     * Set path to file for download
-     *
-     * The Last-Modified header will be set to files filemtime(), actually.
-     * Returns PEAR_Error (HTTP_DOWNLOAD_E_INVALID_FILE) if file doesn't exist.
-     * Sends HTTP 404 status if $send_404 is set to true.
-     * 
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $file       path to file for download
-     * @param   bool    $send_404   whether to send HTTP/404 if
-     *                              the file wasn't found
-     */
-    function setFile($file, $send_404 = true)
-    {
-        $file = realpath($file);
-        if (!is_file($file)) {
-            if ($send_404) {
-                $this->HTTP->sendStatusCode(404);
-            }
-            return PEAR::raiseError(
-                "File '$file' not found.",
-                HTTP_DOWNLOAD_E_INVALID_FILE
-            );
-        }
-        $this->setLastModified(filemtime($file));
-        $this->file = $file;
-        $this->size = filesize($file);
-        return true;
-    }
-    
-    /**
-     * Set data for download
-     *
-     * Set $data to null if you want to unset this.
-     * 
-     * @access  public
-     * @return  void
-     * @param   $data   raw data to send
-     */
-    function setData($data = null)
-    {
-        $this->data = $data;
-        $this->size = strlen($data);
-    }
-    
-    /**
-     * Set resource for download
-     *
-     * The resource handle supplied will be closed after sending the download.
-     * Returns a PEAR_Error (HTTP_DOWNLOAD_E_INVALID_RESOURCE) if $handle 
-     * is no valid resource. Set $handle to null if you want to unset this.
-     * 
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   int     $handle     resource handle
-     */
-    function setResource($handle = null)
-    {
-        if (!isset($handle)) {
-            $this->handle = null;
-            $this->size = 0;
-            return true;
-        }
-        
-        if (is_resource($handle)) {
-            $this->handle = $handle;
-            $filestats    = fstat($handle);
-            $this->size   = $filestats['size'];
-            return true;
-        }
-
-        return PEAR::raiseError(
-            "Handle '$handle' is no valid resource.",
-            HTTP_DOWNLOAD_E_INVALID_RESOURCE
-        );
-    }
-    
-    /**
-     * Whether to gzip the download
-     *
-     * Returns a PEAR_Error (HTTP_DOWNLOAD_E_NO_EXT_ZLIB)
-     * if ext/zlib is not available/loadable.
-     * 
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   bool    $gzip   whether to gzip the download
-     */
-    function setGzip($gzip = false)
-    {
-        if ($gzip && !PEAR::loadExtension('zlib')){
-            return PEAR::raiseError(
-                'GZIP compression (ext/zlib) not available.',
-                HTTP_DOWNLOAD_E_NO_EXT_ZLIB
-            );
-        }
-        $this->gzip = (bool) $gzip;
-        return true;
-    }
-
-    /**
-     * Whether to allow caching
-     * 
-     * If set to true (default) we'll send some headers that are commonly
-     * used for caching purposes like ETag, Cache-Control and Last-Modified.
-     * 
-     * If caching is disabled, we'll send the download no matter if it
-     * would actually be cached at the client side.
-     *
-     * @access  public
-     * @return  void
-     * @param   bool    $cache  whether to allow caching
-     */
-    function setCache($cache = true)
-    {
-        $this->cache = (bool) $cache;
-    }
-    
-    /**
-     * Whether to allow proxies to cache
-     * 
-     * If set to 'private' proxies shouldn't cache the response.
-     * This setting defaults to 'public' and affects only cached responses.
-     * 
-     * @access  public
-     * @return  bool
-     * @param   string  $cache  private or public
-     * @param   int     $maxage maximum age of the client cache entry
-     */
-    function setCacheControl($cache = 'public', $maxage = 0)
-    {
-        switch ($cache = strToLower($cache))
-        {
-            case 'private':
-            case 'public':
-                $this->headers['Cache-Control'] = 
-                    $cache .', must-revalidate, max-age='. abs($maxage);
-                return true;
-            break;
-        }
-        return false;
-    }
-    
-    /**
-     * Set ETag
-     * 
-     * Sets a user-defined ETag for cache-validation.  The ETag is usually
-     * generated by HTTP_Download through its payload information.
-     * 
-     * @access  public
-     * @return  void
-     * @param   string  $etag Entity tag used for strong cache validation.
-     */
-    function setETag($etag = null)
-    {
-        $this->etag = (string) $etag;
-    }
-    
-    /**
-     * Set Size of Buffer
-     * 
-     * The amount of bytes specified as buffer size is the maximum amount
-     * of data read at once from resources or files.  The default size is 2M
-     * (2097152 bytes).  Be aware that if you enable gzip compression and
-     * you set a very low buffer size that the actual file size may grow
-     * due to added gzip headers for each sent chunk of the specified size.
-     * 
-     * Returns PEAR_Error (HTTP_DOWNLOAD_E_INVALID_PARAM) if $size is not
-     * greater than 0 bytes.
-     * 
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   int     $bytes Amount of bytes to use as buffer.
-     */
-    function setBufferSize($bytes = 2097152)
-    {
-        if (0 >= $bytes) {
-            return PEAR::raiseError(
-                'Buffer size must be greater than 0 bytes ('. $bytes .' given)',
-                HTTP_DOWNLOAD_E_INVALID_PARAM);
-        }
-        $this->bufferSize = abs($bytes);
-        return true;
-    }
-    
-    /**
-     * Set Throttle Delay
-     * 
-     * Set the amount of seconds to sleep after each chunck that has been
-     * sent.  One can implement some sort of throttle through adjusting the
-     * buffer size and the throttle delay.  With the following settings
-     * HTTP_Download will sleep a second after each 25 K of data sent.
-     * 
-     * <code>
-     *  Array(
-     *      'throttledelay' => 1,
-     *      'buffersize'    => 1024 * 25,
-     *  )
-     * </code>
-     * 
-     * Just be aware that if gzipp'ing is enabled, decreasing the chunk size 
-     * too much leads to proportionally increased network traffic due to added
-     * gzip header and bottom bytes around each chunk.
-     * 
-     * @access  public
-     * @return  void
-     * @param   float   $seconds    Amount of seconds to sleep after each 
-     *                              chunk that has been sent.
-     */
-    function setThrottleDelay($seconds = 0)
-    {
-        $this->throttleDelay = abs($seconds) * 1000;
-    }
-    
-    /**
-     * Set "Last-Modified"
-     *
-     * This is usually determined by filemtime() in HTTP_Download::setFile()
-     * If you set raw data for download with HTTP_Download::setData() and you
-     * want do send an appropiate "Last-Modified" header, you should call this
-     * method.
-     * 
-     * @access  public
-     * @return  void
-     * @param   int     unix timestamp
-     */
-    function setLastModified($last_modified)
-    {
-        $this->lastModified = $this->headers['Last-Modified'] = (int) $last_modified;
-    }
-    
-    /**
-     * Set Content-Disposition header
-     * 
-     * @see HTTP_Download::HTTP_Download
-     *
-     * @access  public
-     * @return  void
-     * @param   string  $disposition    whether to send the download
-     *                                  inline or as attachment
-     * @param   string  $file_name      the filename to display in
-     *                                  the browser's download window
-     * 
-     * <b>Example:</b>
-     * <code>
-     * $HTTP_Download->setContentDisposition(
-     *   HTTP_DOWNLOAD_ATTACHMENT,
-     *   'download.tgz'
-     * );
-     * </code>
-     */
-    function setContentDisposition( $disposition    = HTTP_DOWNLOAD_ATTACHMENT, 
-                                    $file_name      = null)
-    {
-        $cd = $disposition;
-        if (isset($file_name)) {
-            $cd .= '; filename="' . $file_name . '"';
-        } elseif ($this->file) {
-            $cd .= '; filename="' . basename($this->file) . '"';
-        }
-        $this->headers['Content-Disposition'] = $cd;
-    }
-    
-    /**
-     * Set content type of the download
-     *
-     * Default content type of the download will be 'application/x-octetstream'.
-     * Returns PEAR_Error (HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE) if 
-     * $content_type doesn't seem to be valid.
-     * 
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $content_type   content type of file for download
-     */
-    function setContentType($content_type = 'application/x-octetstream')
-    {
-        if (!preg_match('/^[a-z]+\w*\/[a-z]+[\w.;= -]*$/', $content_type)) {
-            return PEAR::raiseError(
-                "Invalid content type '$content_type' supplied.",
-                HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE
-            );
-        }
-        $this->headers['Content-Type'] = $content_type;
-        return true;
-    }
-    
-    /**
-     * Guess content type of file
-     * 
-     * First we try to use PEAR::MIME_Type, if installed, to detect the content 
-     * type, else we check if ext/mime_magic is loaded and properly configured.
-     *
-     * Returns PEAR_Error if:
-     *      o if PEAR::MIME_Type failed to detect a proper content type
-     *        (HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE)
-     *      o ext/magic.mime is not installed, or not properly configured
-     *        (HTTP_DOWNLOAD_E_NO_EXT_MMAGIC)
-     *      o mime_content_type() couldn't guess content type or returned
-     *        a content type considered to be bogus by setContentType()
-     *        (HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE)
-     * 
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     */
-    function guessContentType()
-    {
-        if (class_exists('MIME_Type') || @include_once 'MIME/Type.php') {
-            if (PEAR::isError($mime_type = MIME_Type::autoDetect($this->file))) {
-                return PEAR::raiseError($mime_type->getMessage(),
-                    HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE);
-            }
-            return $this->setContentType($mime_type);
-        }
-        if (!function_exists('mime_content_type')) {
-            return PEAR::raiseError(
-                'This feature requires ext/mime_magic!',
-                HTTP_DOWNLOAD_E_NO_EXT_MMAGIC
-            );
-        }
-        if (!is_file(ini_get('mime_magic.magicfile'))) {
-            return PEAR::raiseError(
-                'ext/mime_magic is loaded but not properly configured!',
-                HTTP_DOWNLOAD_E_NO_EXT_MMAGIC
-            );
-        }
-        if (!$content_type = @mime_content_type($this->file)) {
-            return PEAR::raiseError(
-                'Couldn\'t guess content type with mime_content_type().',
-                HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE
-            );
-        }
-        return $this->setContentType($content_type);
-    }
-
-    /**
-     * Send
-     *
-     * Returns PEAR_Error if:
-     *   o HTTP headers were already sent (HTTP_DOWNLOAD_E_HEADERS_SENT)
-     *   o HTTP Range was invalid (HTTP_DOWNLOAD_E_INVALID_REQUEST)
-     * 
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   bool    $autoSetContentDisposition Whether to set the
-     *                  Content-Disposition header if it isn't already.
-     */
-    function send($autoSetContentDisposition = true)
-    {
-        if (headers_sent()) {
-            return PEAR::raiseError(
-                'Headers already sent.',
-                HTTP_DOWNLOAD_E_HEADERS_SENT
-            );
-        }
-        
-        if (!ini_get('safe_mode')) {
-            @set_time_limit(0);
-        }
-        
-        if ($autoSetContentDisposition && 
-            !isset($this->headers['Content-Disposition'])) {
-            $this->setContentDisposition();
-        }
-        
-        if ($this->cache) {
-            $this->headers['ETag'] = $this->generateETag();
-            if ($this->isCached()) {
-                $this->HTTP->sendStatusCode(304);
-                $this->sendHeaders();
-                return true;
-            }
-        } else {
-            unset($this->headers['Last-Modified']);
-        }
-        
-        while (@ob_end_clean());
-        
-        if ($this->gzip) {
-            @ob_start('ob_gzhandler');
-        } else {
-            ob_start();
-        }
-        
-        $this->sentBytes = 0;
-        
-        if ($this->isRangeRequest()) {
-            $this->HTTP->sendStatusCode(206);
-            $chunks = $this->getChunks();
-        } else {
-            $this->HTTP->sendStatusCode(200);
-            $chunks = array(array(0, $this->size));
-            if (!$this->gzip && count(ob_list_handlers()) < 2) {
-                $this->headers['Content-Length'] = $this->size;
-            }
-        }
-
-        if (PEAR::isError($e = $this->sendChunks($chunks))) {
-            ob_end_clean();
-            $this->HTTP->sendStatusCode(416);
-            return $e;
-        }
-        
-        ob_end_flush();
-        flush();
-        return true;
-    }    
-
-    /**
-     * Static send
-     *
-     * @see     HTTP_Download::HTTP_Download()
-     * @see     HTTP_Download::send()
-     * 
-     * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   array   $params     associative array of parameters
-     * @param   bool    $guess      whether HTTP_Download::guessContentType()
-     *                               should be called
-     */
-    function staticSend($params, $guess = false)
-    {
-        $d = &new HTTP_Download();
-        $e = $d->setParams($params);
-        if (PEAR::isError($e)) {
-            return $e;
-        }
-        if ($guess) {
-            $e = $d->guessContentType();
-            if (PEAR::isError($e)) {
-                return $e;
-            }
-        }
-        return $d->send();
-    }
-    
-    /**
-     * Send a bunch of files or directories as an archive
-     * 
-     * Example:
-     * <code>
-     *  require_once 'HTTP/Download.php';
-     *  HTTP_Download::sendArchive(
-     *      'myArchive.tgz',
-     *      '/var/ftp/pub/mike',
-     *      HTTP_DOWNLOAD_TGZ,
-     *      '',
-     *      '/var/ftp/pub'
-     *  );
-     * </code>
-     *
-     * @see         Archive_Tar::createModify()
-     * @deprecated  use HTTP_Download_Archive::send()
-     * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $name       name the sent archive should have
-     * @param   mixed   $files      files/directories
-     * @param   string  $type       archive type
-     * @param   string  $add_path   path that should be prepended to the files
-     * @param   string  $strip_path path that should be stripped from the files
-     */
-    function sendArchive(   $name, 
-                            $files, 
-                            $type       = HTTP_DOWNLOAD_TGZ, 
-                            $add_path   = '', 
-                            $strip_path = '')
-    {
-        require_once 'HTTP/Download/Archive.php';
-        return HTTP_Download_Archive::send($name, $files, $type, 
-            $add_path, $strip_path);
-    }
-    // }}}
-    
-    // {{{ protected methods
-    /** 
-     * Generate ETag
-     * 
-     * @access  protected
-     * @return  string
-     */
-    function generateETag()
-    {
-        if (!$this->etag) {
-            if ($this->data) {
-                $md5 = md5($this->data);
-            } else {
-                $fst = is_resource($this->handle) ? 
-                    fstat($this->handle) : stat($this->file);
-                $md5 = md5($fst['mtime'] .'='. $fst['ino'] .'='. $fst['size']);
-            }
-            $this->etag = '"' . $md5 . '-' . crc32($md5) . '"';
-        }
-        return $this->etag;
-    }
-    
-    /** 
-     * Send multiple chunks
-     * 
-     * @access  protected
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   array   $chunks
-     */
-    function sendChunks($chunks)
-    {
-        if (count($chunks) == 1) {
-            return $this->sendChunk(array_shift($chunks));
-        }
-
-        $bound = uniqid('HTTP_DOWNLOAD-', true);
-        $cType = $this->headers['Content-Type'];
-        $this->headers['Content-Type'] =
-            'multipart/byteranges; boundary=' . $bound;
-        $this->sendHeaders();
-        foreach ($chunks as $chunk){
-            if (PEAR::isError($e = $this->sendChunk($chunk, $cType, $bound))) {
-                return $e;
-            }
-        }
-        #echo "\r\n--$bound--\r\n";
-        return true;
-    }
-    
-    /**
-     * Send chunk of data
-     * 
-     * @access  protected
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   array   $chunk  start and end offset of the chunk to send
-     * @param   string  $cType  actual content type
-     * @param   string  $bound  boundary for multipart/byteranges
-     */
-    function sendChunk($chunk, $cType = null, $bound = null)
-    {
-        list($offset, $lastbyte) = $chunk;
-        $length = ($lastbyte - $offset) + 1;
-        
-        if ($length < 1) {
-            return PEAR::raiseError(
-                "Error processing range request: $offset-$lastbyte/$length",
-                HTTP_DOWNLOAD_E_INVALID_REQUEST
-            );
-        }
-        
-        $range = $offset . '-' . $lastbyte . '/' . $this->size;
-        
-        if (isset($cType, $bound)) {
-            echo    "\r\n--$bound\r\n",
-                    "Content-Type: $cType\r\n",
-                    "Content-Range: bytes $range\r\n\r\n";
-        } else {
-            if ($this->isRangeRequest()) {
-                $this->headers['Content-Range'] = 'bytes '. $range;
-            }
-            $this->sendHeaders();
-        }
-
-        if ($this->data) {
-            while (($length -= $this->bufferSize) > 0) {
-                $this->flush(substr($this->data, $offset, $this->bufferSize));
-                $this->throttleDelay and $this->sleep();
-                $offset += $this->bufferSize;
-            }
-            if ($length) {
-                $this->flush(substr($this->data, $offset, $this->bufferSize + $length));
-            }
-        } else {
-            if (!is_resource($this->handle)) {
-                $this->handle = fopen($this->file, 'rb');
-            }
-            fseek($this->handle, $offset);
-            while (($length -= $this->bufferSize) > 0) {
-                $this->flush(fread($this->handle, $this->bufferSize));
-                $this->throttleDelay and $this->sleep();
-            }
-            if ($length) {
-                $this->flush(fread($this->handle, $this->bufferSize + $length));
-            }
-        }
-        return true;
-    }
-    
-    /** 
-     * Get chunks to send
-     * 
-     * @access  protected
-     * @return  array
-     */
-    function getChunks()
-    {
-        $parts = array();
-        foreach (explode(',', $this->getRanges()) as $chunk){
-            list($o, $e) = explode('-', $chunk);
-            if ($e >= $this->size || (empty($e) && $e !== 0 && $e !== '0')) {
-                $e = $this->size - 1;
-            }
-            if (empty($o) && $o !== 0 && $o !== '0') {
-                $o = $this->size - $e;
-                $e = $this->size - 1;
-            }
-            $parts[] = array($o, $e);
-        }
-        return $parts;
-    }
-    
-    /** 
-     * Check if range is requested
-     * 
-     * @access  protected
-     * @return  bool
-     */
-    function isRangeRequest()
-    {
-        if (!isset($_SERVER['HTTP_RANGE'])) {
-            return false;
-        }
-        return $this->isValidRange();
-    }
-    
-    /** 
-     * Get range request
-     * 
-     * @access  protected
-     * @return  array
-     */
-    function getRanges()
-    {
-        return preg_match('/^bytes=((\d*-\d*,? ?)+)$/', 
-            @$_SERVER['HTTP_RANGE'], $matches) ? $matches[1] : array();
-    }
-    
-    /** 
-     * Check if entity is cached
-     * 
-     * @access  protected
-     * @return  bool
-     */
-    function isCached()
-    {
-        return (
-            (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
-            $this->lastModified == strtotime(current($a = explode(
-                ';', $_SERVER['HTTP_IF_MODIFIED_SINCE'])))) ||
-            (isset($_SERVER['HTTP_IF_NONE_MATCH']) &&
-            $this->compareAsterisk('HTTP_IF_NONE_MATCH', $this->etag))
-        );
-    }
-    
-    /** 
-     * Check if entity hasn't changed
-     * 
-     * @access  protected
-     * @return  bool
-     */
-    function isValidRange()
-    {
-        if (isset($_SERVER['HTTP_IF_MATCH']) &&
-            !$this->compareAsterisk('HTTP_IF_MATCH', $this->etag)) {
-            return false;
-        }
-        if (isset($_SERVER['HTTP_IF_RANGE']) &&
-                  $_SERVER['HTTP_IF_RANGE'] !== $this->etag &&
-                  strtotime($_SERVER['HTTP_IF_RANGE']) !== $this->lastModified) {
-            return false;
-        }
-        if (isset($_SERVER['HTTP_IF_UNMODIFIED_SINCE'])) {
-            $lm = array_shift(explode(';', $_SERVER['HTTP_IF_UNMODIFIED_SINCE']));
-            if (strtotime($lm) !== $this->lastModified) {
-                return false;
-            }
-        }
-        if (isset($_SERVER['HTTP_UNLESS_MODIFIED_SINCE'])) {
-            $lm = array_shift(explode(';', $_SERVER['HTTP_UNLESS_MODIFIED_SINCE']));
-            if (strtotime($lm) !== $this->lastModified) {
-                return false;
-            }
-        }
-        return true;
-    }
-    
-    /** 
-     * Compare against an asterisk or check for equality
-     * 
-     * @access  protected
-     * @return  bool
-     * @param   string  key for the $_SERVER array
-     * @param   string  string to compare
-     */
-    function compareAsterisk($svar, $compare)
-    {
-        foreach (array_map('trim', explode(',', $_SERVER[$svar])) as $request) {
-            if ($request === '*' || $request === $compare) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     * Send HTTP headers
-     *
-     * @access  protected
-     * @return  void
-     */
-    function sendHeaders()
-    {
-        foreach ($this->headers as $header => $value) {
-            $this->HTTP->setHeader($header, $value);
-        }
-        $this->HTTP->sendHeaders();
-        /* NSAPI won't output anything if we did this */
-        if (strncasecmp(PHP_SAPI, 'nsapi', 5)) {
-            ob_flush();
-            flush();
-        }
-    }
-    
-    /**
-     * Flush
-     * 
-     * @access  protected
-     * @return  void
-     * @param   string  $data
-     */
-    function flush($data = '')
-    {
-        if ($dlen = strlen($data)) {
-            $this->sentBytes += $dlen;
-            echo $data;
-        }
-        ob_flush();
-        flush();
-    }
-    
-    /**
-     * Sleep
-     * 
-     * @access  protected
-     * @return  void
-     */
-    function sleep()
-    {
-        if (OS_WINDOWS) {
-            com_message_pump($this->throttleDelay);
-        } else {
-            usleep($this->throttleDelay * 1000);
-        }
-    }
-    // }}}
-}
-?>
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * HTTP::Download
+ * 
+ * PHP versions 4 and 5
+ *
+ * @category   HTTP
+ * @package    HTTP_Download
+ * @author     Michael Wallner <mike@php.net>
+ * @copyright  2003-2005 Michael Wallner
+ * @license    BSD, revised
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/HTTP_Download
+ */
+
+// {{{ includes
+/**
+ * Requires PEAR
+ */
+require_once 'PEAR.php';
+
+/**
+ * Requires HTTP_Header
+ */
+require_once 'HTTP/Header.php';
+// }}}
+
+// {{{ constants
+/**#@+ Use with HTTP_Download::setContentDisposition() **/
+/**
+ * Send data as attachment
+ */
+define('HTTP_DOWNLOAD_ATTACHMENT', 'attachment');
+/**
+ * Send data inline
+ */
+define('HTTP_DOWNLOAD_INLINE', 'inline');
+/**#@-**/
+
+/**#@+ Use with HTTP_Download::sendArchive() **/
+/**
+ * Send as uncompressed tar archive
+ */
+define('HTTP_DOWNLOAD_TAR', 'TAR');
+/**
+ * Send as gzipped tar archive
+ */
+define('HTTP_DOWNLOAD_TGZ', 'TGZ');
+/**
+ * Send as bzip2 compressed tar archive
+ */
+define('HTTP_DOWNLOAD_BZ2', 'BZ2');
+/**
+ * Send as zip archive
+ */
+define('HTTP_DOWNLOAD_ZIP', 'ZIP');
+/**#@-**/
+
+/**#@+
+ * Error constants
+ */
+define('HTTP_DOWNLOAD_E_HEADERS_SENT',          -1);
+define('HTTP_DOWNLOAD_E_NO_EXT_ZLIB',           -2);
+define('HTTP_DOWNLOAD_E_NO_EXT_MMAGIC',         -3);
+define('HTTP_DOWNLOAD_E_INVALID_FILE',          -4);
+define('HTTP_DOWNLOAD_E_INVALID_PARAM',         -5);
+define('HTTP_DOWNLOAD_E_INVALID_RESOURCE',      -6);
+define('HTTP_DOWNLOAD_E_INVALID_REQUEST',       -7);
+define('HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE',  -8);
+define('HTTP_DOWNLOAD_E_INVALID_ARCHIVE_TYPE',  -9);
+/**#@-**/
+// }}}
+
+/** 
+ * Send HTTP Downloads/Responses.
+ *
+ * With this package you can handle (hidden) downloads.
+ * It supports partial downloads, resuming and sending 
+ * raw data ie. from database BLOBs.
+ * 
+ * <i>ATTENTION:</i>
+ * You shouldn't use this package together with ob_gzhandler or 
+ * zlib.output_compression enabled in your php.ini, especially 
+ * if you want to send already gzipped data!
+ * 
+ * @access   public
+ * @version  $Revision$
+ */
+class HTTP_Download
+{
+    // {{{ protected member variables
+    /**
+     * Path to file for download
+     *
+     * @see     HTTP_Download::setFile()
+     * @access  protected
+     * @var     string
+     */
+    var $file = '';
+    
+    /**
+     * Data for download
+     *
+     * @see     HTTP_Download::setData()
+     * @access  protected
+     * @var     string
+     */
+    var $data = null;
+    
+    /**
+     * Resource handle for download
+     *
+     * @see     HTTP_Download::setResource()
+     * @access  protected
+     * @var     int
+     */
+    var $handle = null;
+    
+    /**
+     * Whether to gzip the download
+     *
+     * @access  protected
+     * @var     bool
+     */
+    var $gzip = false;
+    
+    /**
+     * Whether to allow caching of the download on the clients side
+     * 
+     * @access  protected
+     * @var     bool
+     */
+    var $cache = true;
+    
+    /**
+     * Size of download
+     *
+     * @access  protected
+     * @var     int
+     */
+    var $size = 0;
+    
+    /**
+     * Last modified
+     *
+     * @access  protected
+     * @var     int
+     */
+    var $lastModified = 0;
+    
+    /**
+     * HTTP headers
+     *
+     * @access  protected
+     * @var     array
+     */
+    var $headers   = array(
+        'Content-Type'  => 'application/x-octetstream',
+        'Pragma'        => 'cache',
+        'Cache-Control' => 'public, must-revalidate, max-age=0',
+        'Accept-Ranges' => 'bytes',
+        'X-Sent-By'     => 'PEAR::HTTP::Download'
+    );
+ 
+    /**
+     * HTTP_Header
+     * 
+     * @access  protected
+     * @var     object
+     */
+    var $HTTP = null;
+    
+    /**
+     * ETag
+     * 
+     * @access  protected
+     * @var     string
+     */
+    var $etag = '';
+    
+    /**
+     * Buffer Size
+     * 
+     * @access  protected
+     * @var     int
+     */
+    var $bufferSize = 2097152;
+    
+    /**
+     * Throttle Delay
+     * 
+     * @access  protected
+     * @var     float
+     */
+    var $throttleDelay = 0;
+    
+    /**
+     * Sent Bytes
+     * 
+     * @access  public
+     * @var     int
+     */
+    var $sentBytes = 0;
+    // }}}
+    
+    // {{{ constructor
+    /**
+     * Constructor
+     *
+     * Set supplied parameters.
+     * 
+     * @access  public
+     * @param   array   $params     associative array of parameters
+     * 
+     *          <b>one of:</b>
+     *                  o 'file'                => path to file for download
+     *                  o 'data'                => raw data for download
+     *                  o 'resource'            => resource handle for download
+     * <br/>
+     *          <b>and any of:</b>
+     *                  o 'cache'               => whether to allow cs caching
+     *                  o 'gzip'                => whether to gzip the download
+     *                  o 'lastmodified'        => unix timestamp
+     *                  o 'contenttype'         => content type of download
+     *                  o 'contentdisposition'  => content disposition
+     *                  o 'buffersize'          => amount of bytes to buffer
+     *                  o 'throttledelay'       => amount of secs to sleep
+     *                  o 'cachecontrol'        => cache privacy and validity
+     * 
+     * <br />
+     * 'Content-Disposition' is not HTTP compliant, but most browsers 
+     * follow this header, so it was borrowed from MIME standard.
+     * 
+     * It looks like this: <br />
+     * "Content-Disposition: attachment; filename=example.tgz".
+     * 
+     * @see HTTP_Download::setContentDisposition()
+     */
+    function HTTP_Download($params = array())
+    {
+        $this->HTTP = &new HTTP_Header;
+        $this->setParams($params);
+    }
+    // }}}
+    
+    // {{{ public methods
+    /**
+     * Set parameters
+     * 
+     * Set supplied parameters through its accessor methods.
+     *
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   array   $params     associative array of parameters
+     * 
+     * @see     HTTP_Download::HTTP_Download()
+     */
+    function setParams($params)
+    {
+        foreach((array) $params as $param => $value){
+            $method = 'set'. $param;
+            
+            if (!method_exists($this, $method)) {
+                return PEAR::raiseError(
+                    "Method '$method' doesn't exist.",
+                    HTTP_DOWNLOAD_E_INVALID_PARAM
+                );
+            }
+            
+            $e = call_user_func_array(array(&$this, $method), (array) $value);
+            
+            if (PEAR::isError($e)) {
+                return $e;
+            }
+        }
+        return true;
+    }
+    
+    /**
+     * Set path to file for download
+     *
+     * The Last-Modified header will be set to files filemtime(), actually.
+     * Returns PEAR_Error (HTTP_DOWNLOAD_E_INVALID_FILE) if file doesn't exist.
+     * Sends HTTP 404 status if $send_404 is set to true.
+     * 
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   string  $file       path to file for download
+     * @param   bool    $send_404   whether to send HTTP/404 if
+     *                              the file wasn't found
+     */
+    function setFile($file, $send_404 = true)
+    {
+        $file = realpath($file);
+        if (!is_file($file)) {
+            if ($send_404) {
+                $this->HTTP->sendStatusCode(404);
+            }
+            return PEAR::raiseError(
+                "File '$file' not found.",
+                HTTP_DOWNLOAD_E_INVALID_FILE
+            );
+        }
+        $this->setLastModified(filemtime($file));
+        $this->file = $file;
+        $this->size = filesize($file);
+        return true;
+    }
+    
+    /**
+     * Set data for download
+     *
+     * Set $data to null if you want to unset this.
+     * 
+     * @access  public
+     * @return  void
+     * @param   $data   raw data to send
+     */
+    function setData($data = null)
+    {
+        $this->data = $data;
+        $this->size = strlen($data);
+    }
+    
+    /**
+     * Set resource for download
+     *
+     * The resource handle supplied will be closed after sending the download.
+     * Returns a PEAR_Error (HTTP_DOWNLOAD_E_INVALID_RESOURCE) if $handle 
+     * is no valid resource. Set $handle to null if you want to unset this.
+     * 
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   int     $handle     resource handle
+     */
+    function setResource($handle = null)
+    {
+        if (!isset($handle)) {
+            $this->handle = null;
+            $this->size = 0;
+            return true;
+        }
+        
+        if (is_resource($handle)) {
+            $this->handle = $handle;
+            $filestats    = fstat($handle);
+            $this->size   = $filestats['size'];
+            return true;
+        }
+
+        return PEAR::raiseError(
+            "Handle '$handle' is no valid resource.",
+            HTTP_DOWNLOAD_E_INVALID_RESOURCE
+        );
+    }
+    
+    /**
+     * Whether to gzip the download
+     *
+     * Returns a PEAR_Error (HTTP_DOWNLOAD_E_NO_EXT_ZLIB)
+     * if ext/zlib is not available/loadable.
+     * 
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   bool    $gzip   whether to gzip the download
+     */
+    function setGzip($gzip = false)
+    {
+        if ($gzip && !PEAR::loadExtension('zlib')){
+            return PEAR::raiseError(
+                'GZIP compression (ext/zlib) not available.',
+                HTTP_DOWNLOAD_E_NO_EXT_ZLIB
+            );
+        }
+        $this->gzip = (bool) $gzip;
+        return true;
+    }
+
+    /**
+     * Whether to allow caching
+     * 
+     * If set to true (default) we'll send some headers that are commonly
+     * used for caching purposes like ETag, Cache-Control and Last-Modified.
+     * 
+     * If caching is disabled, we'll send the download no matter if it
+     * would actually be cached at the client side.
+     *
+     * @access  public
+     * @return  void
+     * @param   bool    $cache  whether to allow caching
+     */
+    function setCache($cache = true)
+    {
+        $this->cache = (bool) $cache;
+    }
+    
+    /**
+     * Whether to allow proxies to cache
+     * 
+     * If set to 'private' proxies shouldn't cache the response.
+     * This setting defaults to 'public' and affects only cached responses.
+     * 
+     * @access  public
+     * @return  bool
+     * @param   string  $cache  private or public
+     * @param   int     $maxage maximum age of the client cache entry
+     */
+    function setCacheControl($cache = 'public', $maxage = 0)
+    {
+        switch ($cache = strToLower($cache))
+        {
+            case 'private':
+            case 'public':
+                $this->headers['Cache-Control'] = 
+                    $cache .', must-revalidate, max-age='. abs($maxage);
+                return true;
+            break;
+        }
+        return false;
+    }
+    
+    /**
+     * Set ETag
+     * 
+     * Sets a user-defined ETag for cache-validation.  The ETag is usually
+     * generated by HTTP_Download through its payload information.
+     * 
+     * @access  public
+     * @return  void
+     * @param   string  $etag Entity tag used for strong cache validation.
+     */
+    function setETag($etag = null)
+    {
+        $this->etag = (string) $etag;
+    }
+    
+    /**
+     * Set Size of Buffer
+     * 
+     * The amount of bytes specified as buffer size is the maximum amount
+     * of data read at once from resources or files.  The default size is 2M
+     * (2097152 bytes).  Be aware that if you enable gzip compression and
+     * you set a very low buffer size that the actual file size may grow
+     * due to added gzip headers for each sent chunk of the specified size.
+     * 
+     * Returns PEAR_Error (HTTP_DOWNLOAD_E_INVALID_PARAM) if $size is not
+     * greater than 0 bytes.
+     * 
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   int     $bytes Amount of bytes to use as buffer.
+     */
+    function setBufferSize($bytes = 2097152)
+    {
+        if (0 >= $bytes) {
+            return PEAR::raiseError(
+                'Buffer size must be greater than 0 bytes ('. $bytes .' given)',
+                HTTP_DOWNLOAD_E_INVALID_PARAM);
+        }
+        $this->bufferSize = abs($bytes);
+        return true;
+    }
+    
+    /**
+     * Set Throttle Delay
+     * 
+     * Set the amount of seconds to sleep after each chunck that has been
+     * sent.  One can implement some sort of throttle through adjusting the
+     * buffer size and the throttle delay.  With the following settings
+     * HTTP_Download will sleep a second after each 25 K of data sent.
+     * 
+     * <code>
+     *  Array(
+     *      'throttledelay' => 1,
+     *      'buffersize'    => 1024 * 25,
+     *  )
+     * </code>
+     * 
+     * Just be aware that if gzipp'ing is enabled, decreasing the chunk size 
+     * too much leads to proportionally increased network traffic due to added
+     * gzip header and bottom bytes around each chunk.
+     * 
+     * @access  public
+     * @return  void
+     * @param   float   $seconds    Amount of seconds to sleep after each 
+     *                              chunk that has been sent.
+     */
+    function setThrottleDelay($seconds = 0)
+    {
+        $this->throttleDelay = abs($seconds) * 1000;
+    }
+    
+    /**
+     * Set "Last-Modified"
+     *
+     * This is usually determined by filemtime() in HTTP_Download::setFile()
+     * If you set raw data for download with HTTP_Download::setData() and you
+     * want do send an appropiate "Last-Modified" header, you should call this
+     * method.
+     * 
+     * @access  public
+     * @return  void
+     * @param   int     unix timestamp
+     */
+    function setLastModified($last_modified)
+    {
+        $this->lastModified = $this->headers['Last-Modified'] = (int) $last_modified;
+    }
+    
+    /**
+     * Set Content-Disposition header
+     * 
+     * @see HTTP_Download::HTTP_Download
+     *
+     * @access  public
+     * @return  void
+     * @param   string  $disposition    whether to send the download
+     *                                  inline or as attachment
+     * @param   string  $file_name      the filename to display in
+     *                                  the browser's download window
+     * 
+     * <b>Example:</b>
+     * <code>
+     * $HTTP_Download->setContentDisposition(
+     *   HTTP_DOWNLOAD_ATTACHMENT,
+     *   'download.tgz'
+     * );
+     * </code>
+     */
+    function setContentDisposition( $disposition    = HTTP_DOWNLOAD_ATTACHMENT, 
+                                    $file_name      = null)
+    {
+        $cd = $disposition;
+        if (isset($file_name)) {
+            $cd .= '; filename="' . $file_name . '"';
+        } elseif ($this->file) {
+            $cd .= '; filename="' . basename($this->file) . '"';
+        }
+        $this->headers['Content-Disposition'] = $cd;
+    }
+    
+    /**
+     * Set content type of the download
+     *
+     * Default content type of the download will be 'application/x-octetstream'.
+     * Returns PEAR_Error (HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE) if 
+     * $content_type doesn't seem to be valid.
+     * 
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   string  $content_type   content type of file for download
+     */
+    function setContentType($content_type = 'application/x-octetstream')
+    {
+        if (!preg_match('/^[a-z]+\w*\/[a-z]+[\w.;= -]*$/', $content_type)) {
+            return PEAR::raiseError(
+                "Invalid content type '$content_type' supplied.",
+                HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE
+            );
+        }
+        $this->headers['Content-Type'] = $content_type;
+        return true;
+    }
+    
+    /**
+     * Guess content type of file
+     * 
+     * First we try to use PEAR::MIME_Type, if installed, to detect the content 
+     * type, else we check if ext/mime_magic is loaded and properly configured.
+     *
+     * Returns PEAR_Error if:
+     *      o if PEAR::MIME_Type failed to detect a proper content type
+     *        (HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE)
+     *      o ext/magic.mime is not installed, or not properly configured
+     *        (HTTP_DOWNLOAD_E_NO_EXT_MMAGIC)
+     *      o mime_content_type() couldn't guess content type or returned
+     *        a content type considered to be bogus by setContentType()
+     *        (HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE)
+     * 
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     */
+    function guessContentType()
+    {
+        if (class_exists('MIME_Type') || @include_once 'MIME/Type.php') {
+            if (PEAR::isError($mime_type = MIME_Type::autoDetect($this->file))) {
+                return PEAR::raiseError($mime_type->getMessage(),
+                    HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE);
+            }
+            return $this->setContentType($mime_type);
+        }
+        if (!function_exists('mime_content_type')) {
+            return PEAR::raiseError(
+                'This feature requires ext/mime_magic!',
+                HTTP_DOWNLOAD_E_NO_EXT_MMAGIC
+            );
+        }
+        if (!is_file(ini_get('mime_magic.magicfile'))) {
+            return PEAR::raiseError(
+                'ext/mime_magic is loaded but not properly configured!',
+                HTTP_DOWNLOAD_E_NO_EXT_MMAGIC
+            );
+        }
+        if (!$content_type = @mime_content_type($this->file)) {
+            return PEAR::raiseError(
+                'Couldn\'t guess content type with mime_content_type().',
+                HTTP_DOWNLOAD_E_INVALID_CONTENT_TYPE
+            );
+        }
+        return $this->setContentType($content_type);
+    }
+
+    /**
+     * Send
+     *
+     * Returns PEAR_Error if:
+     *   o HTTP headers were already sent (HTTP_DOWNLOAD_E_HEADERS_SENT)
+     *   o HTTP Range was invalid (HTTP_DOWNLOAD_E_INVALID_REQUEST)
+     * 
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   bool    $autoSetContentDisposition Whether to set the
+     *                  Content-Disposition header if it isn't already.
+     */
+    function send($autoSetContentDisposition = true)
+    {
+        if (headers_sent()) {
+            return PEAR::raiseError(
+                'Headers already sent.',
+                HTTP_DOWNLOAD_E_HEADERS_SENT
+            );
+        }
+        
+        if (!ini_get('safe_mode')) {
+            @set_time_limit(0);
+        }
+        
+        if ($autoSetContentDisposition && 
+            !isset($this->headers['Content-Disposition'])) {
+            $this->setContentDisposition();
+        }
+        
+        if ($this->cache) {
+            $this->headers['ETag'] = $this->generateETag();
+            if ($this->isCached()) {
+                $this->HTTP->sendStatusCode(304);
+                $this->sendHeaders();
+                return true;
+            }
+        } else {
+            unset($this->headers['Last-Modified']);
+        }
+        
+        while (@ob_end_clean());
+        
+        if ($this->gzip) {
+            @ob_start('ob_gzhandler');
+        } else {
+            ob_start();
+        }
+        
+        $this->sentBytes = 0;
+        
+        if ($this->isRangeRequest()) {
+            $this->HTTP->sendStatusCode(206);
+            $chunks = $this->getChunks();
+        } else {
+            $this->HTTP->sendStatusCode(200);
+            $chunks = array(array(0, $this->size));
+            if (!$this->gzip && count(ob_list_handlers()) < 2) {
+                $this->headers['Content-Length'] = $this->size;
+            }
+        }
+
+        if (PEAR::isError($e = $this->sendChunks($chunks))) {
+            ob_end_clean();
+            $this->HTTP->sendStatusCode(416);
+            return $e;
+        }
+        
+        ob_end_flush();
+        flush();
+        return true;
+    }    
+
+    /**
+     * Static send
+     *
+     * @see     HTTP_Download::HTTP_Download()
+     * @see     HTTP_Download::send()
+     * 
+     * @static
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   array   $params     associative array of parameters
+     * @param   bool    $guess      whether HTTP_Download::guessContentType()
+     *                               should be called
+     */
+    function staticSend($params, $guess = false)
+    {
+        $d = &new HTTP_Download();
+        $e = $d->setParams($params);
+        if (PEAR::isError($e)) {
+            return $e;
+        }
+        if ($guess) {
+            $e = $d->guessContentType();
+            if (PEAR::isError($e)) {
+                return $e;
+            }
+        }
+        return $d->send();
+    }
+    
+    /**
+     * Send a bunch of files or directories as an archive
+     * 
+     * Example:
+     * <code>
+     *  require_once 'HTTP/Download.php';
+     *  HTTP_Download::sendArchive(
+     *      'myArchive.tgz',
+     *      '/var/ftp/pub/mike',
+     *      HTTP_DOWNLOAD_TGZ,
+     *      '',
+     *      '/var/ftp/pub'
+     *  );
+     * </code>
+     *
+     * @see         Archive_Tar::createModify()
+     * @deprecated  use HTTP_Download_Archive::send()
+     * @static
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   string  $name       name the sent archive should have
+     * @param   mixed   $files      files/directories
+     * @param   string  $type       archive type
+     * @param   string  $add_path   path that should be prepended to the files
+     * @param   string  $strip_path path that should be stripped from the files
+     */
+    function sendArchive(   $name, 
+                            $files, 
+                            $type       = HTTP_DOWNLOAD_TGZ, 
+                            $add_path   = '', 
+                            $strip_path = '')
+    {
+        require_once 'HTTP/Download/Archive.php';
+        return HTTP_Download_Archive::send($name, $files, $type, 
+            $add_path, $strip_path);
+    }
+    // }}}
+    
+    // {{{ protected methods
+    /** 
+     * Generate ETag
+     * 
+     * @access  protected
+     * @return  string
+     */
+    function generateETag()
+    {
+        if (!$this->etag) {
+            if ($this->data) {
+                $md5 = md5($this->data);
+            } else {
+                $fst = is_resource($this->handle) ? 
+                    fstat($this->handle) : stat($this->file);
+                $md5 = md5($fst['mtime'] .'='. $fst['ino'] .'='. $fst['size']);
+            }
+            $this->etag = '"' . $md5 . '-' . crc32($md5) . '"';
+        }
+        return $this->etag;
+    }
+    
+    /** 
+     * Send multiple chunks
+     * 
+     * @access  protected
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   array   $chunks
+     */
+    function sendChunks($chunks)
+    {
+        if (count($chunks) == 1) {
+            return $this->sendChunk(array_shift($chunks));
+        }
+
+        $bound = uniqid('HTTP_DOWNLOAD-', true);
+        $cType = $this->headers['Content-Type'];
+        $this->headers['Content-Type'] =
+            'multipart/byteranges; boundary=' . $bound;
+        $this->sendHeaders();
+        foreach ($chunks as $chunk){
+            if (PEAR::isError($e = $this->sendChunk($chunk, $cType, $bound))) {
+                return $e;
+            }
+        }
+        #echo "\r\n--$bound--\r\n";
+        return true;
+    }
+    
+    /**
+     * Send chunk of data
+     * 
+     * @access  protected
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   array   $chunk  start and end offset of the chunk to send
+     * @param   string  $cType  actual content type
+     * @param   string  $bound  boundary for multipart/byteranges
+     */
+    function sendChunk($chunk, $cType = null, $bound = null)
+    {
+        list($offset, $lastbyte) = $chunk;
+        $length = ($lastbyte - $offset) + 1;
+        
+        if ($length < 1) {
+            return PEAR::raiseError(
+                "Error processing range request: $offset-$lastbyte/$length",
+                HTTP_DOWNLOAD_E_INVALID_REQUEST
+            );
+        }
+        
+        $range = $offset . '-' . $lastbyte . '/' . $this->size;
+        
+        if (isset($cType, $bound)) {
+            echo    "\r\n--$bound\r\n",
+                    "Content-Type: $cType\r\n",
+                    "Content-Range: bytes $range\r\n\r\n";
+        } else {
+            if ($this->isRangeRequest()) {
+                $this->headers['Content-Range'] = 'bytes '. $range;
+            }
+            $this->sendHeaders();
+        }
+
+        if ($this->data) {
+            while (($length -= $this->bufferSize) > 0) {
+                $this->flush(substr($this->data, $offset, $this->bufferSize));
+                $this->throttleDelay and $this->sleep();
+                $offset += $this->bufferSize;
+            }
+            if ($length) {
+                $this->flush(substr($this->data, $offset, $this->bufferSize + $length));
+            }
+        } else {
+            if (!is_resource($this->handle)) {
+                $this->handle = fopen($this->file, 'rb');
+            }
+            fseek($this->handle, $offset);
+            while (($length -= $this->bufferSize) > 0) {
+                $this->flush(fread($this->handle, $this->bufferSize));
+                $this->throttleDelay and $this->sleep();
+            }
+            if ($length) {
+                $this->flush(fread($this->handle, $this->bufferSize + $length));
+            }
+        }
+        return true;
+    }
+    
+    /** 
+     * Get chunks to send
+     * 
+     * @access  protected
+     * @return  array
+     */
+    function getChunks()
+    {
+        $parts = array();
+        foreach (explode(',', $this->getRanges()) as $chunk){
+            list($o, $e) = explode('-', $chunk);
+            if ($e >= $this->size || (empty($e) && $e !== 0 && $e !== '0')) {
+                $e = $this->size - 1;
+            }
+            if (empty($o) && $o !== 0 && $o !== '0') {
+                $o = $this->size - $e;
+                $e = $this->size - 1;
+            }
+            $parts[] = array($o, $e);
+        }
+        return $parts;
+    }
+    
+    /** 
+     * Check if range is requested
+     * 
+     * @access  protected
+     * @return  bool
+     */
+    function isRangeRequest()
+    {
+        if (!isset($_SERVER['HTTP_RANGE'])) {
+            return false;
+        }
+        return $this->isValidRange();
+    }
+    
+    /** 
+     * Get range request
+     * 
+     * @access  protected
+     * @return  array
+     */
+    function getRanges()
+    {
+        return preg_match('/^bytes=((\d*-\d*,? ?)+)$/', 
+            @$_SERVER['HTTP_RANGE'], $matches) ? $matches[1] : array();
+    }
+    
+    /** 
+     * Check if entity is cached
+     * 
+     * @access  protected
+     * @return  bool
+     */
+    function isCached()
+    {
+        return (
+            (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) &&
+            $this->lastModified == strtotime(current($a = explode(
+                ';', $_SERVER['HTTP_IF_MODIFIED_SINCE'])))) ||
+            (isset($_SERVER['HTTP_IF_NONE_MATCH']) &&
+            $this->compareAsterisk('HTTP_IF_NONE_MATCH', $this->etag))
+        );
+    }
+    
+    /** 
+     * Check if entity hasn't changed
+     * 
+     * @access  protected
+     * @return  bool
+     */
+    function isValidRange()
+    {
+        if (isset($_SERVER['HTTP_IF_MATCH']) &&
+            !$this->compareAsterisk('HTTP_IF_MATCH', $this->etag)) {
+            return false;
+        }
+        if (isset($_SERVER['HTTP_IF_RANGE']) &&
+                  $_SERVER['HTTP_IF_RANGE'] !== $this->etag &&
+                  strtotime($_SERVER['HTTP_IF_RANGE']) !== $this->lastModified) {
+            return false;
+        }
+        if (isset($_SERVER['HTTP_IF_UNMODIFIED_SINCE'])) {
+            $lm = array_shift(explode(';', $_SERVER['HTTP_IF_UNMODIFIED_SINCE']));
+            if (strtotime($lm) !== $this->lastModified) {
+                return false;
+            }
+        }
+        if (isset($_SERVER['HTTP_UNLESS_MODIFIED_SINCE'])) {
+            $lm = array_shift(explode(';', $_SERVER['HTTP_UNLESS_MODIFIED_SINCE']));
+            if (strtotime($lm) !== $this->lastModified) {
+                return false;
+            }
+        }
+        return true;
+    }
+    
+    /** 
+     * Compare against an asterisk or check for equality
+     * 
+     * @access  protected
+     * @return  bool
+     * @param   string  key for the $_SERVER array
+     * @param   string  string to compare
+     */
+    function compareAsterisk($svar, $compare)
+    {
+        foreach (array_map('trim', explode(',', $_SERVER[$svar])) as $request) {
+            if ($request === '*' || $request === $compare) {
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    /**
+     * Send HTTP headers
+     *
+     * @access  protected
+     * @return  void
+     */
+    function sendHeaders()
+    {
+        foreach ($this->headers as $header => $value) {
+            $this->HTTP->setHeader($header, $value);
+        }
+        $this->HTTP->sendHeaders();
+        /* NSAPI won't output anything if we did this */
+        if (strncasecmp(PHP_SAPI, 'nsapi', 5)) {
+            ob_flush();
+            flush();
+        }
+    }
+    
+    /**
+     * Flush
+     * 
+     * @access  protected
+     * @return  void
+     * @param   string  $data
+     */
+    function flush($data = '')
+    {
+        if ($dlen = strlen($data)) {
+            $this->sentBytes += $dlen;
+            echo $data;
+        }
+        ob_flush();
+        flush();
+    }
+    
+    /**
+     * Sleep
+     * 
+     * @access  protected
+     * @return  void
+     */
+    function sleep()
+    {
+        if (OS_WINDOWS) {
+            com_message_pump($this->throttleDelay);
+        } else {
+            usleep($this->throttleDelay * 1000);
+        }
+    }
+    // }}}
+}
+?>
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTTP::Download::Archive
- * 
- * PHP versions 4 and 5
- *
- * @category   HTTP
- * @package    HTTP_Download
- * @author     Michael Wallner <mike@php.net>
- * @copyright  2003-2005 Michael Wallner
- * @license    BSD, revisewd
- * @version    CVS: $Id: Archive.php,v 1.4 2005/11/13 19:18:55 mike Exp $
- * @link       http://pear.php.net/package/HTTP_Download
- */
-
-/**
- * Requires HTTP_Download
- */
-require_once 'HTTP/Download.php';
-
-/**
- * Requires System
- */
-require_once 'System.php';
-
-/** 
- * HTTP_Download_Archive
- * 
- * Helper class for sending Archives.
- *
- * @access   public
- * @version  $Revision: 1.4 $
- */
-class HTTP_Download_Archive
-{
-    /**
-     * Send a bunch of files or directories as an archive
-     * 
-     * Example:
-     * <code>
-     *  require_once 'HTTP/Download/Archive.php';
-     *  HTTP_Download_Archive::send(
-     *      'myArchive.tgz',
-     *      '/var/ftp/pub/mike',
-     *      HTTP_DOWNLOAD_BZ2,
-     *      '',
-     *      '/var/ftp/pub'
-     *  );
-     * </code>
-     *
-     * @see         Archive_Tar::createModify()
-     * @static
-     * @access  public
-     * @return  mixed   Returns true on success or PEAR_Error on failure.
-     * @param   string  $name       name the sent archive should have
-     * @param   mixed   $files      files/directories
-     * @param   string  $type       archive type
-     * @param   string  $add_path   path that should be prepended to the files
-     * @param   string  $strip_path path that should be stripped from the files
-     */
-    function send($name, $files, $type = HTTP_DOWNLOAD_TGZ, $add_path = '', $strip_path = '')
-    {
-        $tmp = System::mktemp();
-        
-        switch ($type = strToUpper($type))
-        {
-            case HTTP_DOWNLOAD_TAR:
-                include_once 'Archive/Tar.php';
-                $arc = &new Archive_Tar($tmp);
-                $content_type = 'x-tar';
-            break;
-
-            case HTTP_DOWNLOAD_TGZ:
-                include_once 'Archive/Tar.php';
-                $arc = &new Archive_Tar($tmp, 'gz');
-                $content_type = 'x-gzip';
-            break;
-
-            case HTTP_DOWNLOAD_BZ2:
-                include_once 'Archive/Tar.php';
-                $arc = &new Archive_Tar($tmp, 'bz2');
-                $content_type = 'x-bzip2';
-            break;
-
-            case HTTP_DOWNLOAD_ZIP:
-                include_once 'Archive/Zip.php';
-                $arc = &new Archive_Zip($tmp);
-                $content_type = 'x-zip';
-            break;
-            
-            default:
-                return PEAR::raiseError(
-                    'Archive type not supported: ' . $type,
-                    HTTP_DOWNLOAD_E_INVALID_ARCHIVE_TYPE
-                );
-        }
-        
-        if ($type == HTTP_DOWNLOAD_ZIP) {
-            $options = array(   'add_path' => $add_path, 
-                                'remove_path' => $strip_path);
-            if (!$arc->create($files, $options)) {
-                return PEAR::raiseError('Archive creation failed.');
-            }
-        } else {
-            if (!$e = $arc->createModify($files, $add_path, $strip_path)) {
-                return PEAR::raiseError('Archive creation failed.');
-            }
-            if (PEAR::isError($e)) {
-                return $e;
-            }
-        }
-        unset($arc);
-        
-        $dl = &new HTTP_Download(array('file' => $tmp));
-        $dl->setContentType('application/' . $content_type);
-        $dl->setContentDisposition(HTTP_DOWNLOAD_ATTACHMENT, $name);
-        return $dl->send();
-    }
-}
-?>
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * HTTP::Download::Archive
+ * 
+ * PHP versions 4 and 5
+ *
+ * @category   HTTP
+ * @package    HTTP_Download
+ * @author     Michael Wallner <mike@php.net>
+ * @copyright  2003-2005 Michael Wallner
+ * @license    BSD, revisewd
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/HTTP_Download
+ */
+
+/**
+ * Requires HTTP_Download
+ */
+require_once 'HTTP/Download.php';
+
+/**
+ * Requires System
+ */
+require_once 'System.php';
+
+/** 
+ * HTTP_Download_Archive
+ * 
+ * Helper class for sending Archives.
+ *
+ * @access   public
+ * @version  $Revision$
+ */
+class HTTP_Download_Archive
+{
+    /**
+     * Send a bunch of files or directories as an archive
+     * 
+     * Example:
+     * <code>
+     *  require_once 'HTTP/Download/Archive.php';
+     *  HTTP_Download_Archive::send(
+     *      'myArchive.tgz',
+     *      '/var/ftp/pub/mike',
+     *      HTTP_DOWNLOAD_BZ2,
+     *      '',
+     *      '/var/ftp/pub'
+     *  );
+     * </code>
+     *
+     * @see         Archive_Tar::createModify()
+     * @static
+     * @access  public
+     * @return  mixed   Returns true on success or PEAR_Error on failure.
+     * @param   string  $name       name the sent archive should have
+     * @param   mixed   $files      files/directories
+     * @param   string  $type       archive type
+     * @param   string  $add_path   path that should be prepended to the files
+     * @param   string  $strip_path path that should be stripped from the files
+     */
+    function send($name, $files, $type = HTTP_DOWNLOAD_TGZ, $add_path = '', $strip_path = '')
+    {
+        $tmp = System::mktemp();
+        
+        switch ($type = strToUpper($type))
+        {
+            case HTTP_DOWNLOAD_TAR:
+                include_once 'Archive/Tar.php';
+                $arc = &new Archive_Tar($tmp);
+                $content_type = 'x-tar';
+            break;
+
+            case HTTP_DOWNLOAD_TGZ:
+                include_once 'Archive/Tar.php';
+                $arc = &new Archive_Tar($tmp, 'gz');
+                $content_type = 'x-gzip';
+            break;
+
+            case HTTP_DOWNLOAD_BZ2:
+                include_once 'Archive/Tar.php';
+                $arc = &new Archive_Tar($tmp, 'bz2');
+                $content_type = 'x-bzip2';
+            break;
+
+            case HTTP_DOWNLOAD_ZIP:
+                include_once 'Archive/Zip.php';
+                $arc = &new Archive_Zip($tmp);
+                $content_type = 'x-zip';
+            break;
+            
+            default:
+                return PEAR::raiseError(
+                    'Archive type not supported: ' . $type,
+                    HTTP_DOWNLOAD_E_INVALID_ARCHIVE_TYPE
+                );
+        }
+        
+        if ($type == HTTP_DOWNLOAD_ZIP) {
+            $options = array(   'add_path' => $add_path, 
+                                'remove_path' => $strip_path);
+            if (!$arc->create($files, $options)) {
+                return PEAR::raiseError('Archive creation failed.');
+            }
+        } else {
+            if (!$e = $arc->createModify($files, $add_path, $strip_path)) {
+                return PEAR::raiseError('Archive creation failed.');
+            }
+            if (PEAR::isError($e)) {
+                return $e;
+            }
+        }
+        unset($arc);
+        
+        $dl = &new HTTP_Download(array('file' => $tmp));
+        $dl->setContentType('application/' . $content_type);
+        $dl->setContentDisposition(HTTP_DOWNLOAD_ATTACHMENT, $name);
+        return $dl->send();
+    }
+}
+?>
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTTP::Download::PgLOB
- * 
- * PHP versions 4 and 5
- *
- * @category   HTTP
- * @package    HTTP_Download
- * @author     Michael Wallner <mike@php.net>
- * @copyright  2003-2005 Michael Wallner
- * @license    BSD, revised
- * @version    CVS: $Id: PgLOB.php,v 1.14 2005/11/13 19:18:55 mike Exp $
- * @link       http://pear.php.net/package/HTTP_Download
- */
-
-$GLOBALS['_HTTP_Download_PgLOB_Connection'] = null;
-stream_register_wrapper('pglob', 'HTTP_Download_PgLOB');
-
-/**
- * PgSQL large object stream interface for HTTP_Download
- * 
- * Usage:
- * <code>
- * require_once 'HTTP/Download.php';
- * require_once 'HTTP/Download/PgLOB.php';
- * $db = &DB::connect('pgsql://user:pass@host/db');
- * // or $db = pg_connect(...);
- * $lo = HTTP_Download_PgLOB::open($db, 12345);
- * $dl = &new HTTP_Download;
- * $dl->setResource($lo);
- * $dl->send()
- * </code>
- * 
- * @access  public
- * @version $Revision: 1.14 $
- */
-class HTTP_Download_PgLOB
-{
-    /**
-     * Set Connection
-     * 
-     * @static
-     * @access  public
-     * @return  bool
-     * @param   mixed   $conn
-     */
-    function setConnection($conn)
-    {
-        if (is_a($conn, 'DB_Common')) {
-            $conn = $conn->dbh;
-        } elseif (  is_a($conn, 'MDB_Common') || 
-                    is_a($conn, 'MDB2_Driver_Common')) {
-            $conn = $conn->connection;
-        }
-        if ($isResource = is_resource($conn)) {
-            $GLOBALS['_HTTP_Download_PgLOB_Connection'] = $conn;
-        }
-        return $isResource;
-    }
-    
-    /**
-     * Get Connection
-     * 
-     * @static
-     * @access  public
-     * @return  resource
-     */
-    function getConnection()
-    {
-        if (is_resource($GLOBALS['_HTTP_Download_PgLOB_Connection'])) {
-            return $GLOBALS['_HTTP_Download_PgLOB_Connection'];
-        }
-        return null;
-    }
-    
-    /**
-     * Open
-     * 
-     * @static
-     * @access  public
-     * @return  resource
-     * @param   mixed   $conn
-     * @param   int     $loid
-     * @param   string  $mode
-     */
-    function open($conn, $loid, $mode = 'rb')
-    {
-        HTTP_Download_PgLOB::setConnection($conn);
-        return fopen('pglob:///'. $loid, $mode);
-    }
-    
-    /**#@+
-     * Stream Interface Implementation
-     * @internal
-     */
-    var $ID = 0;
-    var $size = 0;
-    var $conn = null;
-    var $handle = null;
-    
-    function stream_open($path, $mode)
-    {
-        if (!$this->conn = HTTP_Download_PgLOB::getConnection()) {
-            return false;
-        }
-        if (!preg_match('/(\d+)/', $path, $matches)) {
-            return false;
-        }
-        $this->ID = $matches[1];
-        
-        if (!pg_query($this->conn, 'BEGIN')) {
-            return false;
-        }
-        
-        $this->handle = pg_lo_open($this->conn, $this->ID, $mode);
-        if (!is_resource($this->handle)) {
-            return false;
-        }
-        
-        // fetch size of lob
-        pg_lo_seek($this->handle, 0, PGSQL_SEEK_END);
-        $this->size = (int) pg_lo_tell($this->handle);
-        pg_lo_seek($this->handle, 0, PGSQL_SEEK_SET);
-        
-        return true;
-    }
-    
-    function stream_read($length)
-    {
-        return pg_lo_read($this->handle, $length);
-    }
-    
-    function stream_seek($offset, $whence = SEEK_SET)
-    {
-        return pg_lo_seek($this->handle, $offset, $whence);
-    }
-    
-    function stream_tell()
-    {
-        return pg_lo_tell($this->handle);
-    }
-    
-    function stream_eof()
-    {
-        return pg_lo_tell($this->handle) >= $this->size;
-    }
-    
-    function stream_flush()
-    {
-        return true;
-    }
-    
-    function stream_stat()
-    {
-        return array('size' => $this->size, 'ino' => $this->ID);
-    }
-    
-    function stream_write($data)
-    {
-        return pg_lo_write($this->handle, $data);
-    }
-    
-    function stream_close()
-    {
-        if (pg_lo_close($this->handle)) {
-            return pg_query($this->conn, 'COMMIT');
-        } else {
-            pg_query($this->conn ,'ROLLBACK');
-            return false;
-        }
-    }
-    /**#@-*/
-}
-
-?>
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * HTTP::Download::PgLOB
+ * 
+ * PHP versions 4 and 5
+ *
+ * @category   HTTP
+ * @package    HTTP_Download
+ * @author     Michael Wallner <mike@php.net>
+ * @copyright  2003-2005 Michael Wallner
+ * @license    BSD, revised
+ * @version    CVS: $Id$
+ * @link       http://pear.php.net/package/HTTP_Download
+ */
+
+$GLOBALS['_HTTP_Download_PgLOB_Connection'] = null;
+stream_register_wrapper('pglob', 'HTTP_Download_PgLOB');
+
+/**
+ * PgSQL large object stream interface for HTTP_Download
+ * 
+ * Usage:
+ * <code>
+ * require_once 'HTTP/Download.php';
+ * require_once 'HTTP/Download/PgLOB.php';
+ * $db = &DB::connect('pgsql://user:pass@host/db');
+ * // or $db = pg_connect(...);
+ * $lo = HTTP_Download_PgLOB::open($db, 12345);
+ * $dl = &new HTTP_Download;
+ * $dl->setResource($lo);
+ * $dl->send()
+ * </code>
+ * 
+ * @access  public
+ * @version $Revision$
+ */
+class HTTP_Download_PgLOB
+{
+    /**
+     * Set Connection
+     * 
+     * @static
+     * @access  public
+     * @return  bool
+     * @param   mixed   $conn
+     */
+    function setConnection($conn)
+    {
+        if (is_a($conn, 'DB_Common')) {
+            $conn = $conn->dbh;
+        } elseif (  is_a($conn, 'MDB_Common') || 
+                    is_a($conn, 'MDB2_Driver_Common')) {
+            $conn = $conn->connection;
+        }
+        if ($isResource = is_resource($conn)) {
+            $GLOBALS['_HTTP_Download_PgLOB_Connection'] = $conn;
+        }
+        return $isResource;
+    }
+    
+    /**
+     * Get Connection
+     * 
+     * @static
+     * @access  public
+     * @return  resource
+     */
+    function getConnection()
+    {
+        if (is_resource($GLOBALS['_HTTP_Download_PgLOB_Connection'])) {
+            return $GLOBALS['_HTTP_Download_PgLOB_Connection'];
+        }
+        return null;
+    }
+    
+    /**
+     * Open
+     * 
+     * @static
+     * @access  public
+     * @return  resource
+     * @param   mixed   $conn
+     * @param   int     $loid
+     * @param   string  $mode
+     */
+    function open($conn, $loid, $mode = 'rb')
+    {
+        HTTP_Download_PgLOB::setConnection($conn);
+        return fopen('pglob:///'. $loid, $mode);
+    }
+    
+    /**#@+
+     * Stream Interface Implementation
+     * @internal
+     */
+    var $ID = 0;
+    var $size = 0;
+    var $conn = null;
+    var $handle = null;
+    
+    function stream_open($path, $mode)
+    {
+        if (!$this->conn = HTTP_Download_PgLOB::getConnection()) {
+            return false;
+        }
+        if (!preg_match('/(\d+)/', $path, $matches)) {
+            return false;
+        }
+        $this->ID = $matches[1];
+        
+        if (!pg_query($this->conn, 'BEGIN')) {
+            return false;
+        }
+        
+        $this->handle = pg_lo_open($this->conn, $this->ID, $mode);
+        if (!is_resource($this->handle)) {
+            return false;
+        }
+        
+        // fetch size of lob
+        pg_lo_seek($this->handle, 0, PGSQL_SEEK_END);
+        $this->size = (int) pg_lo_tell($this->handle);
+        pg_lo_seek($this->handle, 0, PGSQL_SEEK_SET);
+        
+        return true;
+    }
+    
+    function stream_read($length)
+    {
+        return pg_lo_read($this->handle, $length);
+    }
+    
+    function stream_seek($offset, $whence = SEEK_SET)
+    {
+        return pg_lo_seek($this->handle, $offset, $whence);
+    }
+    
+    function stream_tell()
+    {
+        return pg_lo_tell($this->handle);
+    }
+    
+    function stream_eof()
+    {
+        return pg_lo_tell($this->handle) >= $this->size;
+    }
+    
+    function stream_flush()
+    {
+        return true;
+    }
+    
+    function stream_stat()
+    {
+        return array('size' => $this->size, 'ino' => $this->ID);
+    }
+    
+    function stream_write($data)
+    {
+        return pg_lo_write($this->handle, $data);
+    }
+    
+    function stream_close()
+    {
+        if (pg_lo_close($this->handle)) {
+            return pg_query($this->conn, 'COMMIT');
+        } else {
+            pg_query($this->conn ,'ROLLBACK');
+            return false;
+        }
+    }
+    /**#@-*/
+}
+
+?>
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTTP::Header
- * 
- * PHP versions 4 and 5
- *
- * @category    HTTP
- * @package     HTTP_Header
- * @author      Wolfram Kriesing <wk@visionp.de>
- * @author      Davey Shafik <davey@php.net>
- * @author      Michael Wallner <mike@php.net>
- * @copyright   2003-2005 The Authors
- * @license     BSD, revised
- * @version     CVS: $Id: Header.php,v 1.32 2005/11/08 19:06:10 mike Exp $
- * @link        http://pear.php.net/package/HTTP_Header
- */
-
-/**
- * Requires HTTP
- */
-require_once 'HTTP.php';
-
-/**#@+
- * Information Codes
- */
-define('HTTP_HEADER_STATUS_100', '100 Continue');
-define('HTTP_HEADER_STATUS_101', '101 Switching Protocols');
-define('HTTP_HEADER_STATUS_102', '102 Processing');
-define('HTTP_HEADER_STATUS_INFORMATIONAL',1);
-/**#@-*/
-
-/**#+
- * Success Codes
- */
-define('HTTP_HEADER_STATUS_200', '200 OK');
-define('HTTP_HEADER_STATUS_201', '201 Created');
-define('HTTP_HEADER_STATUS_202', '202 Accepted');
-define('HTTP_HEADER_STATUS_203', '203 Non-Authoritative Information');
-define('HTTP_HEADER_STATUS_204', '204 No Content');
-define('HTTP_HEADER_STATUS_205', '205 Reset Content');
-define('HTTP_HEADER_STATUS_206', '206 Partial Content');
-define('HTTP_HEADER_STATUS_207', '207 Multi-Status');
-define('HTTP_HEADER_STATUS_SUCCESSFUL',2);
-/**#@-*/
-
-/**#@+
- * Redirection Codes
- */
-define('HTTP_HEADER_STATUS_300', '300 Multiple Choices');
-define('HTTP_HEADER_STATUS_301', '301 Moved Permanently');
-define('HTTP_HEADER_STATUS_302', '302 Found');
-define('HTTP_HEADER_STATUS_303', '303 See Other');
-define('HTTP_HEADER_STATUS_304', '304 Not Modified');
-define('HTTP_HEADER_STATUS_305', '305 Use Proxy');
-define('HTTP_HEADER_STATUS_306', '306 (Unused)');
-define('HTTP_HEADER_STATUS_307', '307 Temporary Redirect');
-define('HTTP_HEADER_STATUS_REDIRECT',3);
-/**#@-*/
-
-/**#@+
- * Error Codes
- */
-define('HTTP_HEADER_STATUS_400', '400 Bad Request');
-define('HTTP_HEADER_STATUS_401', '401 Unauthorized');
-define('HTTP_HEADER_STATUS_402', '402 Payment Granted');
-define('HTTP_HEADER_STATUS_403', '403 Forbidden');
-define('HTTP_HEADER_STATUS_404', '404 File Not Found');
-define('HTTP_HEADER_STATUS_405', '405 Method Not Allowed');
-define('HTTP_HEADER_STATUS_406', '406 Not Acceptable');
-define('HTTP_HEADER_STATUS_407', '407 Proxy Authentication Required');
-define('HTTP_HEADER_STATUS_408', '408 Request Time-out');
-define('HTTP_HEADER_STATUS_409', '409 Conflict');
-define('HTTP_HEADER_STATUS_410', '410 Gone');
-define('HTTP_HEADER_STATUS_411', '411 Length Required');
-define('HTTP_HEADER_STATUS_412', '412 Precondition Failed');
-define('HTTP_HEADER_STATUS_413', '413 Request Entity Too Large');
-define('HTTP_HEADER_STATUS_414', '414 Request-URI Too Large');
-define('HTTP_HEADER_STATUS_415', '415 Unsupported Media Type');
-define('HTTP_HEADER_STATUS_416', '416 Requested range not satisfiable');
-define('HTTP_HEADER_STATUS_417', '417 Expectation Failed');
-define('HTTP_HEADER_STATUS_422', '422 Unprocessable Entity');
-define('HTTP_HEADER_STATUS_423', '423 Locked');
-define('HTTP_HEADER_STATUS_424', '424 Failed Dependency');
-define('HTTP_HEADER_STATUS_CLIENT_ERROR',4);
-/**#@-*/
-
-/**#@+
- * Server Errors
- */
-define('HTTP_HEADER_STATUS_500', '500 Internal Server Error');
-define('HTTP_HEADER_STATUS_501', '501 Not Implemented');
-define('HTTP_HEADER_STATUS_502', '502 Bad Gateway');
-define('HTTP_HEADER_STATUS_503', '503 Service Unavailable');
-define('HTTP_HEADER_STATUS_504', '504 Gateway Time-out');
-define('HTTP_HEADER_STATUS_505', '505 HTTP Version not supported');
-define('HTTP_HEADER_STATUS_507', '507 Insufficient Storage');
-define('HTTP_HEADER_STATUS_SERVER_ERROR',5);
-/**#@-*/
-
-/**
- * HTTP_Header
- * 
- * @package     HTTP_Header
- * @category    HTTP
- * @access      public
- * @version     $Revision: 1.32 $
- */
-class HTTP_Header extends HTTP
-{
-    /**
-     * Default Headers
-     * 
-     * The values that are set as default, are the same as PHP sends by default.
-     * 
-     * @var     array
-     * @access  private
-     */
-    var $_headers = array(
-        'content-type'  =>  'text/html',
-        'pragma'        =>  'no-cache',
-        'cache-control' =>  'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'
-    );
-
-    /**
-     * HTTP version
-     * 
-     * @var     string
-     * @access  private
-     */
-    var $_httpVersion = '1.0';
-
-    /**
-     * Constructor
-     *
-     * Sets HTTP version.
-     * 
-     * @access  public
-     * @return  object  HTTP_Header
-     */
-    function HTTP_Header()
-    {
-        if (isset($_SERVER['SERVER_PROTOCOL'])) {
-            $this->setHttpVersion(substr($_SERVER['SERVER_PROTOCOL'], -3));
-        }
-    }
-    
-    /**
-     * Set HTTP version
-     *
-     * @access  public
-     * @return  bool    Returns true on success or false if version doesn't 
-     *                  match 1.0 or 1.1 (note: 1 will result in 1.0)
-     * @param   mixed   $version HTTP version, either 1.0 or 1.1
-     */
-    function setHttpVersion($version)
-    {
-        $version = round((float) $version, 1);
-        if ($version < 1.0 || $version > 1.1) {
-            return false;
-        }
-        $this->_httpVersion = sprintf('%0.1f', $version);
-        return true;
-    }
-    
-    /**
-     * Get HTTP version
-     *
-     * @access  public
-     * @return  string
-     */
-    function getHttpVersion()
-    {
-        return $this->_httpVersion;
-    }
-    
-    /**
-     * Set Header
-     * 
-     * The default value for the Last-Modified header will be current
-     * date and atime if $value is omitted.
-     * 
-     * @access  public
-     * @return  bool    Returns true on success or false if $key was empty or
-     *                  $value was not of an scalar type.
-     * @param   string  $key The name of the header.
-     * @param   string  $value The value of the header. (NULL to unset header)
-     */
-    function setHeader($key, $value = null)
-    {
-        if (empty($key) || (isset($value) && !is_scalar($value))) {
-            return false;
-        }
-        
-        $key = strToLower($key);
-        if ($key == 'last-modified') {
-            if (!isset($value)) {
-                $value = HTTP::Date(time());
-            } elseif (is_numeric($value)) {
-                $value = HTTP::Date($value);
-            }
-        }
-        
-        if (isset($value)) {
-            $this->_headers[$key] = $value;
-        } else {
-            unset($this->_headers[$key]);
-        }
-        
-        return true;
-    }
-
-    /**
-     * Get Header
-     * 
-     * If $key is omitted, all stored headers will be returned.
-     * 
-     * @access  public
-     * @return  mixed   Returns string value of the requested header,
-     *                  array values of all headers or false if header $key
-     *                  is not set.
-     * @param   string  $key    The name of the header to fetch.
-     */
-    function getHeader($key = null)
-    {
-        if (!isset($key)) {
-            return $this->_headers;
-        }
-        
-        $key = strToLower($key);
-        
-        if (!isset($this->_headers[$key])) {
-            return false;
-        }
-        
-        return $this->_headers[$key];
-    }
-
-    /**
-     * Send Headers
-     * 
-     * Send out the header that you set via setHeader().
-     * 
-     * @access  public
-     * @return  bool    Returns true on success or false if headers are already
-     *                  sent.
-     * @param   array   $keys Headers to (not) send, see $include.
-     * @param   array   $include If true only $keys matching headers will be
-     *                  sent, if false only header not matching $keys will be
-     *                  sent.
-     */
-    function sendHeaders($keys = array(), $include = true)
-    {
-        if (headers_sent()) {
-            return false;
-        }
-        
-        if (count($keys)) {
-            array_change_key_case($keys, CASE_LOWER);
-            foreach ($this->_headers as $key => $value) {
-                if ($include ? in_array($key, $keys) : !in_array($key, $keys)) {
-                    header($key .': '. $value);
-                }
-            }
-        } else {
-            foreach ($this->_headers as $header => $value) {
-                header($header .': '. $value);
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Send Satus Code
-     * 
-     * Send out the given HTTP-Status code. Use this for example when you 
-     * want to tell the client this page is cached, then you would call 
-     * sendStatusCode(304).
-     *
-     * @see HTTP_Header_Cache::exitIfCached()
-     * 
-     * @access  public
-     * @return  bool    Returns true on success or false if headers are already
-     *                  sent.
-     * @param   int     $code The status code to send, i.e. 404, 304, 200, etc.
-     */
-    function sendStatusCode($code)
-    {
-        if (headers_sent()) {
-            return false;
-        }
-        
-        if ($code == (int) $code && defined('HTTP_HEADER_STATUS_'. $code)) {
-            $code = constant('HTTP_HEADER_STATUS_'. $code);
-        }
-        
-        if (strncasecmp(PHP_SAPI, 'cgi', 3)) {
-            header('HTTP/'. $this->_httpVersion .' '. $code);
-        } else {
-            header('Status: '. $code);
-        }
-        return true;
-    }
-
-    /**
-     * Date to Timestamp
-     * 
-     * Converts dates like
-     *      Mon, 31 Mar 2003 15:26:34 GMT
-     *      Tue, 15 Nov 1994 12:45:26 GMT
-     * into a timestamp, strtotime() didn't do it in older versions.
-     *
-     * @deprecated      Use PHPs strtotime() instead.
-     * @access  public
-     * @return  mixed   Returns int unix timestamp or false if the date doesn't
-     *                  seem to be a valid GMT date.
-     * @param   string  $date The GMT date.
-     */
-    function dateToTimestamp($date)
-    {
-        static $months = array(
-            null => 0, 'Jan' => 1, 'Feb' => 2, 'Mar' => 3, 'Apr' => 4,
-            'May' => 5, 'Jun' => 6, 'Jul' => 7, 'Aug' => 8, 'Sep' => 9,
-            'Oct' => 10, 'Nov' => 11, 'Dec' => 12
-        );
-        
-        if (-1 < $timestamp = strToTime($date)) {
-            return $timestamp;
-        }
-        
-        if (!preg_match('~[^,]*,\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+).*~',
-            $date, $m)) {
-            return false;
-        }
-        
-        // [0] => Mon, 31 Mar 2003 15:42:55 GMT
-        // [1] => 31 [2] => Mar [3] => 2003 [4] => 15 [5] => 42 [6] => 55
-        return mktime($m[4], $m[5], $m[6], $months[$m[2]], $m[1], $m[3]);
-    }
-
-    /**
-     * Redirect
-     * 
-     * This function redirects the client. This is done by issuing a Location 
-     * header and exiting.  Additionally to HTTP::redirect() you can also add 
-     * parameters to the url.
-     * 
-     * If you dont need parameters to be added, simply use HTTP::redirect()
-     * otherwise use HTTP_Header::redirect().
-     *
-     * @see     HTTP::redirect()
-     * @author  Wolfram Kriesing <wk@visionp.de>
-     * @access  public
-     * @return  void
-     * @param   string  $url The URL to redirect to, if none is given it 
-     *                  redirects to the current page.
-     * @param   array   $param Array of query string parameters to add; usually
-     *                  a set of key => value pairs; if an array entry consists
-     *                  only of an value it is used as key and the respective
-     *                  value is fetched from $GLOBALS[$value]
-     * @param   bool    $session Whether the session name/id should be added
-     */
-    function redirect($url = null, $param = array(), $session = false)
-    {
-        if (!isset($url)) {
-            $url = $_SERVER['PHP_SELF'];
-        }
-        
-        $qs = array();
-
-        if ($session) {
-            $qs[] = session_name() .'='. session_id();
-        }
-
-        if (is_array($param) && count($param)) {
-            if (count($param)) {
-                foreach ($param as $key => $val) {
-                    if (is_string($key)) {
-                        $qs[] = urlencode($key) .'='. urlencode($val);
-                    } else {
-                        $qs[] = urlencode($val) .'='. urlencode(@$GLOBALS[$val]);
-                    }
-                }
-            }
-        }
-        
-        if ($qstr = implode('&', $qs)) {
-            $purl = parse_url($url);
-            $url .= (isset($purl['query']) ? '&' : '?') . $qstr;
-        }
-
-        parent::redirect($url);
-    }
-
-    /**#@+
-     * @author  Davey Shafik <davey@php.net>
-     * @param   int $http_code HTTP Code to check
-     * @access  public
-     */
-
-    /**
-     * Return HTTP Status Code Type
-     *
-     * @return int|false
-     */
-    function getStatusType($http_code) 
-    {
-        if(is_int($http_code) && defined('HTTP_HEADER_STATUS_' .$http_code) || defined($http_code)) {
-            $type = substr($http_code,0,1);
-            switch ($type) {
-                case HTTP_HEADER_STATUS_INFORMATIONAL:
-                case HTTP_HEADER_STATUS_SUCCESSFUL:
-                case HTTP_HEADER_STATUS_REDIRECT:
-                case HTTP_HEADER_STATUS_CLIENT_ERROR:
-                case HTTP_HEADER_STATUS_SERVER_ERROR:
-                    return $type;
-                    break;
-                default:
-                    return false;
-                    break;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Return Status Code Message
-     *
-     * @return string|false
-     */
-    function getStatusText($http_code) 
-    {
-        if ($this->getStatusType($http_code)) {
-            if (is_int($http_code) && defined('HTTP_HEADER_STATUS_' .$http_code)) {
-                return substr(constant('HTTP_HEADER_STATUS_' .$http_code),4);
-            } else {
-                return substr($http_code,4);
-            }
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if HTTP Status code is Information (1xx)
-     *
-     * @return boolean
-     */
-    function isInformational($http_code) 
-    {
-        if ($status_type = $this->getStatusType($http_code)) {
-            return $status_type{0} == HTTP_HEADER_STATUS_INFORMATIONAL;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if HTTP Status code is Successful (2xx)
-     *
-     * @return boolean
-     */
-    function isSuccessful($http_code) 
-    {
-        if ($status_type = $this->getStatusType($http_code)) {
-            return $status_type{0} == HTTP_HEADER_STATUS_SUCCESSFUL;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if HTTP Status code is a Redirect (3xx)
-     *
-     * @return boolean
-     */
-    function isRedirect($http_code) 
-    {
-        if ($status_type = $this->getStatusType($http_code)) {
-            return $status_type{0} == HTTP_HEADER_STATUS_REDIRECT;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if HTTP Status code is a Client Error (4xx)
-     *
-     * @return boolean
-     */
-    function isClientError($http_code) 
-    {
-        if ($status_type = $this->getStatusType($http_code)) {
-            return $status_type{0} == HTTP_HEADER_STATUS_CLIENT_ERROR;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if HTTP Status code is Server Error (5xx)
-     *
-     * @return boolean
-     */
-    function isServerError($http_code) 
-    {
-        if ($status_type = $this->getStatusType($http_code)) {
-            return $status_type{0} == HTTP_HEADER_STATUS_SERVER_ERROR;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks if HTTP Status code is Server OR Client Error (4xx or 5xx)
-     *
-     * @return boolean
-     */
-    function isError($http_code) 
-    {
-        if ($status_type = $this->getStatusType($http_code)) {
-            return (($status_type == HTTP_HEADER_STATUS_CLIENT_ERROR) || ($status_type == HTTP_HEADER_STATUS_SERVER_ERROR)) ? true : false;
-        } else {
-            return false;
-        }
-    }
-    /**#@-*/
-}
-?>
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * HTTP::Header
+ * 
+ * PHP versions 4 and 5
+ *
+ * @category    HTTP
+ * @package     HTTP_Header
+ * @author      Wolfram Kriesing <wk@visionp.de>
+ * @author      Davey Shafik <davey@php.net>
+ * @author      Michael Wallner <mike@php.net>
+ * @copyright   2003-2005 The Authors
+ * @license     BSD, revised
+ * @version     CVS: $Id$
+ * @link        http://pear.php.net/package/HTTP_Header
+ */
+
+/**
+ * Requires HTTP
+ */
+require_once 'HTTP.php';
+
+/**#@+
+ * Information Codes
+ */
+define('HTTP_HEADER_STATUS_100', '100 Continue');
+define('HTTP_HEADER_STATUS_101', '101 Switching Protocols');
+define('HTTP_HEADER_STATUS_102', '102 Processing');
+define('HTTP_HEADER_STATUS_INFORMATIONAL',1);
+/**#@-*/
+
+/**#+
+ * Success Codes
+ */
+define('HTTP_HEADER_STATUS_200', '200 OK');
+define('HTTP_HEADER_STATUS_201', '201 Created');
+define('HTTP_HEADER_STATUS_202', '202 Accepted');
+define('HTTP_HEADER_STATUS_203', '203 Non-Authoritative Information');
+define('HTTP_HEADER_STATUS_204', '204 No Content');
+define('HTTP_HEADER_STATUS_205', '205 Reset Content');
+define('HTTP_HEADER_STATUS_206', '206 Partial Content');
+define('HTTP_HEADER_STATUS_207', '207 Multi-Status');
+define('HTTP_HEADER_STATUS_SUCCESSFUL',2);
+/**#@-*/
+
+/**#@+
+ * Redirection Codes
+ */
+define('HTTP_HEADER_STATUS_300', '300 Multiple Choices');
+define('HTTP_HEADER_STATUS_301', '301 Moved Permanently');
+define('HTTP_HEADER_STATUS_302', '302 Found');
+define('HTTP_HEADER_STATUS_303', '303 See Other');
+define('HTTP_HEADER_STATUS_304', '304 Not Modified');
+define('HTTP_HEADER_STATUS_305', '305 Use Proxy');
+define('HTTP_HEADER_STATUS_306', '306 (Unused)');
+define('HTTP_HEADER_STATUS_307', '307 Temporary Redirect');
+define('HTTP_HEADER_STATUS_REDIRECT',3);
+/**#@-*/
+
+/**#@+
+ * Error Codes
+ */
+define('HTTP_HEADER_STATUS_400', '400 Bad Request');
+define('HTTP_HEADER_STATUS_401', '401 Unauthorized');
+define('HTTP_HEADER_STATUS_402', '402 Payment Granted');
+define('HTTP_HEADER_STATUS_403', '403 Forbidden');
+define('HTTP_HEADER_STATUS_404', '404 File Not Found');
+define('HTTP_HEADER_STATUS_405', '405 Method Not Allowed');
+define('HTTP_HEADER_STATUS_406', '406 Not Acceptable');
+define('HTTP_HEADER_STATUS_407', '407 Proxy Authentication Required');
+define('HTTP_HEADER_STATUS_408', '408 Request Time-out');
+define('HTTP_HEADER_STATUS_409', '409 Conflict');
+define('HTTP_HEADER_STATUS_410', '410 Gone');
+define('HTTP_HEADER_STATUS_411', '411 Length Required');
+define('HTTP_HEADER_STATUS_412', '412 Precondition Failed');
+define('HTTP_HEADER_STATUS_413', '413 Request Entity Too Large');
+define('HTTP_HEADER_STATUS_414', '414 Request-URI Too Large');
+define('HTTP_HEADER_STATUS_415', '415 Unsupported Media Type');
+define('HTTP_HEADER_STATUS_416', '416 Requested range not satisfiable');
+define('HTTP_HEADER_STATUS_417', '417 Expectation Failed');
+define('HTTP_HEADER_STATUS_422', '422 Unprocessable Entity');
+define('HTTP_HEADER_STATUS_423', '423 Locked');
+define('HTTP_HEADER_STATUS_424', '424 Failed Dependency');
+define('HTTP_HEADER_STATUS_CLIENT_ERROR',4);
+/**#@-*/
+
+/**#@+
+ * Server Errors
+ */
+define('HTTP_HEADER_STATUS_500', '500 Internal Server Error');
+define('HTTP_HEADER_STATUS_501', '501 Not Implemented');
+define('HTTP_HEADER_STATUS_502', '502 Bad Gateway');
+define('HTTP_HEADER_STATUS_503', '503 Service Unavailable');
+define('HTTP_HEADER_STATUS_504', '504 Gateway Time-out');
+define('HTTP_HEADER_STATUS_505', '505 HTTP Version not supported');
+define('HTTP_HEADER_STATUS_507', '507 Insufficient Storage');
+define('HTTP_HEADER_STATUS_SERVER_ERROR',5);
+/**#@-*/
+
+/**
+ * HTTP_Header
+ * 
+ * @package     HTTP_Header
+ * @category    HTTP
+ * @access      public
+ * @version     $Revision$
+ */
+class HTTP_Header extends HTTP
+{
+    /**
+     * Default Headers
+     * 
+     * The values that are set as default, are the same as PHP sends by default.
+     * 
+     * @var     array
+     * @access  private
+     */
+    var $_headers = array(
+        'content-type'  =>  'text/html',
+        'pragma'        =>  'no-cache',
+        'cache-control' =>  'no-store, no-cache, must-revalidate, post-check=0, pre-check=0'
+    );
+
+    /**
+     * HTTP version
+     * 
+     * @var     string
+     * @access  private
+     */
+    var $_httpVersion = '1.0';
+
+    /**
+     * Constructor
+     *
+     * Sets HTTP version.
+     * 
+     * @access  public
+     * @return  object  HTTP_Header
+     */
+    function HTTP_Header()
+    {
+        if (isset($_SERVER['SERVER_PROTOCOL'])) {
+            $this->setHttpVersion(substr($_SERVER['SERVER_PROTOCOL'], -3));
+        }
+    }
+    
+    /**
+     * Set HTTP version
+     *
+     * @access  public
+     * @return  bool    Returns true on success or false if version doesn't 
+     *                  match 1.0 or 1.1 (note: 1 will result in 1.0)
+     * @param   mixed   $version HTTP version, either 1.0 or 1.1
+     */
+    function setHttpVersion($version)
+    {
+        $version = round((float) $version, 1);
+        if ($version < 1.0 || $version > 1.1) {
+            return false;
+        }
+        $this->_httpVersion = sprintf('%0.1f', $version);
+        return true;
+    }
+    
+    /**
+     * Get HTTP version
+     *
+     * @access  public
+     * @return  string
+     */
+    function getHttpVersion()
+    {
+        return $this->_httpVersion;
+    }
+    
+    /**
+     * Set Header
+     * 
+     * The default value for the Last-Modified header will be current
+     * date and atime if $value is omitted.
+     * 
+     * @access  public
+     * @return  bool    Returns true on success or false if $key was empty or
+     *                  $value was not of an scalar type.
+     * @param   string  $key The name of the header.
+     * @param   string  $value The value of the header. (NULL to unset header)
+     */
+    function setHeader($key, $value = null)
+    {
+        if (empty($key) || (isset($value) && !is_scalar($value))) {
+            return false;
+        }
+        
+        $key = strToLower($key);
+        if ($key == 'last-modified') {
+            if (!isset($value)) {
+                $value = HTTP::Date(time());
+            } elseif (is_numeric($value)) {
+                $value = HTTP::Date($value);
+            }
+        }
+        
+        if (isset($value)) {
+            $this->_headers[$key] = $value;
+        } else {
+            unset($this->_headers[$key]);
+        }
+        
+        return true;
+    }
+
+    /**
+     * Get Header
+     * 
+     * If $key is omitted, all stored headers will be returned.
+     * 
+     * @access  public
+     * @return  mixed   Returns string value of the requested header,
+     *                  array values of all headers or false if header $key
+     *                  is not set.
+     * @param   string  $key    The name of the header to fetch.
+     */
+    function getHeader($key = null)
+    {
+        if (!isset($key)) {
+            return $this->_headers;
+        }
+        
+        $key = strToLower($key);
+        
+        if (!isset($this->_headers[$key])) {
+            return false;
+        }
+        
+        return $this->_headers[$key];
+    }
+
+    /**
+     * Send Headers
+     * 
+     * Send out the header that you set via setHeader().
+     * 
+     * @access  public
+     * @return  bool    Returns true on success or false if headers are already
+     *                  sent.
+     * @param   array   $keys Headers to (not) send, see $include.
+     * @param   array   $include If true only $keys matching headers will be
+     *                  sent, if false only header not matching $keys will be
+     *                  sent.
+     */
+    function sendHeaders($keys = array(), $include = true)
+    {
+        if (headers_sent()) {
+            return false;
+        }
+        
+        if (count($keys)) {
+            array_change_key_case($keys, CASE_LOWER);
+            foreach ($this->_headers as $key => $value) {
+                if ($include ? in_array($key, $keys) : !in_array($key, $keys)) {
+                    header($key .': '. $value);
+                }
+            }
+        } else {
+            foreach ($this->_headers as $header => $value) {
+                header($header .': '. $value);
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Send Satus Code
+     * 
+     * Send out the given HTTP-Status code. Use this for example when you 
+     * want to tell the client this page is cached, then you would call 
+     * sendStatusCode(304).
+     *
+     * @see HTTP_Header_Cache::exitIfCached()
+     * 
+     * @access  public
+     * @return  bool    Returns true on success or false if headers are already
+     *                  sent.
+     * @param   int     $code The status code to send, i.e. 404, 304, 200, etc.
+     */
+    function sendStatusCode($code)
+    {
+        if (headers_sent()) {
+            return false;
+        }
+        
+        if ($code == (int) $code && defined('HTTP_HEADER_STATUS_'. $code)) {
+            $code = constant('HTTP_HEADER_STATUS_'. $code);
+        }
+        
+        if (strncasecmp(PHP_SAPI, 'cgi', 3)) {
+            header('HTTP/'. $this->_httpVersion .' '. $code);
+        } else {
+            header('Status: '. $code);
+        }
+        return true;
+    }
+
+    /**
+     * Date to Timestamp
+     * 
+     * Converts dates like
+     *      Mon, 31 Mar 2003 15:26:34 GMT
+     *      Tue, 15 Nov 1994 12:45:26 GMT
+     * into a timestamp, strtotime() didn't do it in older versions.
+     *
+     * @deprecated      Use PHPs strtotime() instead.
+     * @access  public
+     * @return  mixed   Returns int unix timestamp or false if the date doesn't
+     *                  seem to be a valid GMT date.
+     * @param   string  $date The GMT date.
+     */
+    function dateToTimestamp($date)
+    {
+        static $months = array(
+            null => 0, 'Jan' => 1, 'Feb' => 2, 'Mar' => 3, 'Apr' => 4,
+            'May' => 5, 'Jun' => 6, 'Jul' => 7, 'Aug' => 8, 'Sep' => 9,
+            'Oct' => 10, 'Nov' => 11, 'Dec' => 12
+        );
+        
+        if (-1 < $timestamp = strToTime($date)) {
+            return $timestamp;
+        }
+        
+        if (!preg_match('~[^,]*,\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+).*~',
+            $date, $m)) {
+            return false;
+        }
+        
+        // [0] => Mon, 31 Mar 2003 15:42:55 GMT
+        // [1] => 31 [2] => Mar [3] => 2003 [4] => 15 [5] => 42 [6] => 55
+        return mktime($m[4], $m[5], $m[6], $months[$m[2]], $m[1], $m[3]);
+    }
+
+    /**
+     * Redirect
+     * 
+     * This function redirects the client. This is done by issuing a Location 
+     * header and exiting.  Additionally to HTTP::redirect() you can also add 
+     * parameters to the url.
+     * 
+     * If you dont need parameters to be added, simply use HTTP::redirect()
+     * otherwise use HTTP_Header::redirect().
+     *
+     * @see     HTTP::redirect()
+     * @author  Wolfram Kriesing <wk@visionp.de>
+     * @access  public
+     * @return  void
+     * @param   string  $url The URL to redirect to, if none is given it 
+     *                  redirects to the current page.
+     * @param   array   $param Array of query string parameters to add; usually
+     *                  a set of key => value pairs; if an array entry consists
+     *                  only of an value it is used as key and the respective
+     *                  value is fetched from $GLOBALS[$value]
+     * @param   bool    $session Whether the session name/id should be added
+     */
+    function redirect($url = null, $param = array(), $session = false)
+    {
+        if (!isset($url)) {
+            $url = $_SERVER['PHP_SELF'];
+        }
+        
+        $qs = array();
+
+        if ($session) {
+            $qs[] = session_name() .'='. session_id();
+        }
+
+        if (is_array($param) && count($param)) {
+            if (count($param)) {
+                foreach ($param as $key => $val) {
+                    if (is_string($key)) {
+                        $qs[] = urlencode($key) .'='. urlencode($val);
+                    } else {
+                        $qs[] = urlencode($val) .'='. urlencode(@$GLOBALS[$val]);
+                    }
+                }
+            }
+        }
+        
+        if ($qstr = implode('&', $qs)) {
+            $purl = parse_url($url);
+            $url .= (isset($purl['query']) ? '&' : '?') . $qstr;
+        }
+
+        parent::redirect($url);
+    }
+
+    /**#@+
+     * @author  Davey Shafik <davey@php.net>
+     * @param   int $http_code HTTP Code to check
+     * @access  public
+     */
+
+    /**
+     * Return HTTP Status Code Type
+     *
+     * @return int|false
+     */
+    function getStatusType($http_code) 
+    {
+        if(is_int($http_code) && defined('HTTP_HEADER_STATUS_' .$http_code) || defined($http_code)) {
+            $type = substr($http_code,0,1);
+            switch ($type) {
+                case HTTP_HEADER_STATUS_INFORMATIONAL:
+                case HTTP_HEADER_STATUS_SUCCESSFUL:
+                case HTTP_HEADER_STATUS_REDIRECT:
+                case HTTP_HEADER_STATUS_CLIENT_ERROR:
+                case HTTP_HEADER_STATUS_SERVER_ERROR:
+                    return $type;
+                    break;
+                default:
+                    return false;
+                    break;
+            }
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Return Status Code Message
+     *
+     * @return string|false
+     */
+    function getStatusText($http_code) 
+    {
+        if ($this->getStatusType($http_code)) {
+            if (is_int($http_code) && defined('HTTP_HEADER_STATUS_' .$http_code)) {
+                return substr(constant('HTTP_HEADER_STATUS_' .$http_code),4);
+            } else {
+                return substr($http_code,4);
+            }
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if HTTP Status code is Information (1xx)
+     *
+     * @return boolean
+     */
+    function isInformational($http_code) 
+    {
+        if ($status_type = $this->getStatusType($http_code)) {
+            return $status_type{0} == HTTP_HEADER_STATUS_INFORMATIONAL;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if HTTP Status code is Successful (2xx)
+     *
+     * @return boolean
+     */
+    function isSuccessful($http_code) 
+    {
+        if ($status_type = $this->getStatusType($http_code)) {
+            return $status_type{0} == HTTP_HEADER_STATUS_SUCCESSFUL;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if HTTP Status code is a Redirect (3xx)
+     *
+     * @return boolean
+     */
+    function isRedirect($http_code) 
+    {
+        if ($status_type = $this->getStatusType($http_code)) {
+            return $status_type{0} == HTTP_HEADER_STATUS_REDIRECT;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if HTTP Status code is a Client Error (4xx)
+     *
+     * @return boolean
+     */
+    function isClientError($http_code) 
+    {
+        if ($status_type = $this->getStatusType($http_code)) {
+            return $status_type{0} == HTTP_HEADER_STATUS_CLIENT_ERROR;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if HTTP Status code is Server Error (5xx)
+     *
+     * @return boolean
+     */
+    function isServerError($http_code) 
+    {
+        if ($status_type = $this->getStatusType($http_code)) {
+            return $status_type{0} == HTTP_HEADER_STATUS_SERVER_ERROR;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Checks if HTTP Status code is Server OR Client Error (4xx or 5xx)
+     *
+     * @return boolean
+     */
+    function isError($http_code) 
+    {
+        if ($status_type = $this->getStatusType($http_code)) {
+            return (($status_type == HTTP_HEADER_STATUS_CLIENT_ERROR) || ($status_type == HTTP_HEADER_STATUS_SERVER_ERROR)) ? true : false;
+        } else {
+            return false;
+        }
+    }
+    /**#@-*/
+}
+?>
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
-
-/**
- * HTTP::Header::Cache
- * 
- * PHP versions 4 and 5
- *
- * @category    HTTP
- * @package     HTTP_Header
- * @author      Wolfram Kriesing <wk@visionp.de>
- * @author      Michael Wallner <mike@php.net>
- * @copyright   2003-2005 The Authors
- * @license     BSD, revised
- * @version     CVS: $Id: Cache.php,v 1.24 2005/11/08 19:06:14 mike Exp $
- * @link        http://pear.php.net/package/HTTP_Header
- */
-
-/**
- * Requires HTTP_Header
- */
-require_once 'HTTP/Header.php';
-
-/**
- * HTTP_Header_Cache
- * 
- * This package provides methods to easier handle caching of HTTP pages.  That 
- * means that the pages can be cached at the client (user agent or browser) and 
- * your application only needs to send "hey client you already have the pages".
- * 
- * Which is done by sending the HTTP-Status "304 Not Modified", so that your
- * application load and the network traffic can be reduced, since you only need
- * to send the complete page once.  This is really an advantage e.g. for 
- * generated style sheets, or simply pages that do only change rarely.
- * 
- * Usage:
- * <code>
- *  require_once 'HTTP/Header/Cache.php';
- *  $httpCache = new HTTP_Header_Cache(4, 'weeks');
- *  $httpCache->sendHeaders();
- *  // your code goes here
- * </code>
- * 
- * @package     HTTP_Header
- * @category    HTTP
- * @access      public
- * @version     $Revision: 1.24 $
- */
-class HTTP_Header_Cache extends HTTP_Header
-{
-    /**
-     * Constructor
-     * 
-     * Set the amount of time to cache.
-     * 
-     * @access  public
-     * @return  object  HTTP_Header_Cache
-     * @param   int     $expires 
-     * @param   string  $unit
-     */
-    function HTTP_Header_Cache($expires = 0, $unit = 'seconds')
-    {
-        parent::HTTP_Header();
-        $this->setHeader('Pragma', 'cache');
-        $this->setHeader('Last-Modified', $this->getCacheStart());
-        $this->setHeader('Cache-Control', 'private, must-revalidate, max-age=0');
-        
-        if ($expires) {
-            if (!$this->isOlderThan($expires, $unit)) {
-                $this->exitCached();
-            }
-            $this->setHeader('Last-Modified', time());
-        }
-    }
-
-    /**
-     * Get Cache Start
-     * 
-     * Returns the unix timestamp of the If-Modified-Since HTTP header or the
-     * current time if the header was not sent by the client.
-     * 
-     * @access  public
-     * @return  int     unix timestamp
-     */
-    function getCacheStart()
-    {
-        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && !$this->isPost()) {
-            return strtotime(current($array = explode(';', 
-                $_SERVER['HTTP_IF_MODIFIED_SINCE'])));
-        }
-        return time();
-    }
-
-    /**
-     * Is Older Than
-     * 
-     * You can call it like this:
-     * <code>
-     *  $httpCache->isOlderThan(1, 'day');
-     *  $httpCache->isOlderThan(47, 'days');
-     * 
-     *  $httpCache->isOlderThan(1, 'week');
-     *  $httpCache->isOlderThan(3, 'weeks');
-     * 
-     *  $httpCache->isOlderThan(1, 'hour');
-     *  $httpCache->isOlderThan(5, 'hours');
-     * 
-     *  $httpCache->isOlderThan(1, 'minute');
-     *  $httpCache->isOlderThan(15, 'minutes');
-     * 
-     *  $httpCache->isOlderThan(1, 'second');
-     *  $httpCache->isOlderThan(15);
-     * </code>
-     * 
-     * If you specify something greater than "weeks" as time untit, it just 
-     * works approximatly, because a month is taken to consist of 4.3 weeks.
-     * 
-     * @access  public
-     * @return  bool    Returns true if requested page is older than specified.
-     * @param   int     $time The amount of time.
-     * @param   string  $unit The unit of the time amount - (year[s], month[s], 
-     *                  week[s], day[s], hour[s], minute[s], second[s]).
-     */
-    function isOlderThan($time = 0, $unit = 'seconds')
-    {
-        if (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || $this->isPost()) {
-            return true;
-        }
-        if (!$time) {
-            return false;
-        }
-        
-        switch (strtolower($unit))
-        {
-            case 'year':
-            case 'years':
-                $time *= 12;
-            case 'month':
-            case 'months':
-                $time *= 4.3;
-            case 'week':
-            case 'weeks':
-                $time *= 7;
-            case 'day':
-            case 'days':
-                $time *= 24;
-            case 'hour':
-            case 'hours':
-                $time *= 60;
-            case 'minute':
-            case 'minutes':
-                $time *= 60;
-        }
-        
-        return (time() - $this->getCacheStart()) > $time;
-    }
-
-    /**
-     * Is Cached
-     * 
-     * Check whether we can consider to be cached on the client side.
-     * 
-     * @access  public
-     * @return  bool    Whether the page/resource is considered to be cached.
-     * @param   int     $lastModified Unix timestamp of last modification.
-     */
-    function isCached($lastModified = 0)
-    {
-        if ($this->isPost()) {
-            return false;
-        }
-        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && !$lastModified) {
-            return true;
-        }
-        if (!$seconds = time() - $lastModified) {
-            return false;
-        }
-        return !$this->isOlderThan($seconds);
-    }
-    
-    /**
-     * Is Post
-     * 
-     * Check if request method is "POST".
-     * 
-     * @access  public
-     * @return  bool
-     */
-    function isPost()
-    {
-        return  isset($_SERVER['REQUEST_METHOD']) and
-            'POST' == $_SERVER['REQUEST_METHOD'];
-    }
-    
-    /**
-     * Exit If Cached
-     * 
-     * Exit with "HTTP 304 Not Modified" if we consider to be cached.
-     * 
-     * @access  public
-     * @return  void
-     * @param   int     $lastModified Unix timestamp of last modification.
-     */
-    function exitIfCached($lastModified = 0)
-    {
-        if ($this->isCached($lastModified)) {
-            $this->exitCached();
-        }
-    }
-    
-    /**
-     * Exit Cached
-     * 
-     * Exit with "HTTP 304 Not Modified".
-     * 
-     * @access  public
-     * @return  void
-     */
-    function exitCached()
-    {
-        $this->sendHeaders();
-        $this->sendStatusCode(304);
-        exit;
-    }
-    
-    /**
-     * Set Last Modified
-     * 
-     * @access  public
-     * @return  void
-     * @param   int     $lastModified The unix timestamp of last modification.
-     */
-    function setLastModified($lastModified = null)
-    {
-        $this->setHeader('Last-Modified', $lastModified);
-    }
-}
-?>
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * HTTP::Header::Cache
+ * 
+ * PHP versions 4 and 5
+ *
+ * @category    HTTP
+ * @package     HTTP_Header
+ * @author      Wolfram Kriesing <wk@visionp.de>
+ * @author      Michael Wallner <mike@php.net>
+ * @copyright   2003-2005 The Authors
+ * @license     BSD, revised
+ * @version     CVS: $Id$
+ * @link        http://pear.php.net/package/HTTP_Header
+ */
+
+/**
+ * Requires HTTP_Header
+ */
+require_once 'HTTP/Header.php';
+
+/**
+ * HTTP_Header_Cache
+ * 
+ * This package provides methods to easier handle caching of HTTP pages.  That 
+ * means that the pages can be cached at the client (user agent or browser) and 
+ * your application only needs to send "hey client you already have the pages".
+ * 
+ * Which is done by sending the HTTP-Status "304 Not Modified", so that your
+ * application load and the network traffic can be reduced, since you only need
+ * to send the complete page once.  This is really an advantage e.g. for 
+ * generated style sheets, or simply pages that do only change rarely.
+ * 
+ * Usage:
+ * <code>
+ *  require_once 'HTTP/Header/Cache.php';
+ *  $httpCache = new HTTP_Header_Cache(4, 'weeks');
+ *  $httpCache->sendHeaders();
+ *  // your code goes here
+ * </code>
+ * 
+ * @package     HTTP_Header
+ * @category    HTTP
+ * @access      public
+ * @version     $Revision$
+ */
+class HTTP_Header_Cache extends HTTP_Header
+{
+    /**
+     * Constructor
+     * 
+     * Set the amount of time to cache.
+     * 
+     * @access  public
+     * @return  object  HTTP_Header_Cache
+     * @param   int     $expires 
+     * @param   string  $unit
+     */
+    function HTTP_Header_Cache($expires = 0, $unit = 'seconds')
+    {
+        parent::HTTP_Header();
+        $this->setHeader('Pragma', 'cache');
+        $this->setHeader('Last-Modified', $this->getCacheStart());
+        $this->setHeader('Cache-Control', 'private, must-revalidate, max-age=0');
+        
+        if ($expires) {
+            if (!$this->isOlderThan($expires, $unit)) {
+                $this->exitCached();
+            }
+            $this->setHeader('Last-Modified', time());
+        }
+    }
+
+    /**
+     * Get Cache Start
+     * 
+     * Returns the unix timestamp of the If-Modified-Since HTTP header or the
+     * current time if the header was not sent by the client.
+     * 
+     * @access  public
+     * @return  int     unix timestamp
+     */
+    function getCacheStart()
+    {
+        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && !$this->isPost()) {
+            return strtotime(current($array = explode(';', 
+                $_SERVER['HTTP_IF_MODIFIED_SINCE'])));
+        }
+        return time();
+    }
+
+    /**
+     * Is Older Than
+     * 
+     * You can call it like this:
+     * <code>
+     *  $httpCache->isOlderThan(1, 'day');
+     *  $httpCache->isOlderThan(47, 'days');
+     * 
+     *  $httpCache->isOlderThan(1, 'week');
+     *  $httpCache->isOlderThan(3, 'weeks');
+     * 
+     *  $httpCache->isOlderThan(1, 'hour');
+     *  $httpCache->isOlderThan(5, 'hours');
+     * 
+     *  $httpCache->isOlderThan(1, 'minute');
+     *  $httpCache->isOlderThan(15, 'minutes');
+     * 
+     *  $httpCache->isOlderThan(1, 'second');
+     *  $httpCache->isOlderThan(15);
+     * </code>
+     * 
+     * If you specify something greater than "weeks" as time untit, it just 
+     * works approximatly, because a month is taken to consist of 4.3 weeks.
+     * 
+     * @access  public
+     * @return  bool    Returns true if requested page is older than specified.
+     * @param   int     $time The amount of time.
+     * @param   string  $unit The unit of the time amount - (year[s], month[s], 
+     *                  week[s], day[s], hour[s], minute[s], second[s]).
+     */
+    function isOlderThan($time = 0, $unit = 'seconds')
+    {
+        if (!isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || $this->isPost()) {
+            return true;
+        }
+        if (!$time) {
+            return false;
+        }
+        
+        switch (strtolower($unit))
+        {
+            case 'year':
+            case 'years':
+                $time *= 12;
+            case 'month':
+            case 'months':
+                $time *= 4.3;
+            case 'week':
+            case 'weeks':
+                $time *= 7;
+            case 'day':
+            case 'days':
+                $time *= 24;
+            case 'hour':
+            case 'hours':
+                $time *= 60;
+            case 'minute':
+            case 'minutes':
+                $time *= 60;
+        }
+        
+        return (time() - $this->getCacheStart()) > $time;
+    }
+
+    /**
+     * Is Cached
+     * 
+     * Check whether we can consider to be cached on the client side.
+     * 
+     * @access  public
+     * @return  bool    Whether the page/resource is considered to be cached.
+     * @param   int     $lastModified Unix timestamp of last modification.
+     */
+    function isCached($lastModified = 0)
+    {
+        if ($this->isPost()) {
+            return false;
+        }
+        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && !$lastModified) {
+            return true;
+        }
+        if (!$seconds = time() - $lastModified) {
+            return false;
+        }
+        return !$this->isOlderThan($seconds);
+    }
+    
+    /**
+     * Is Post
+     * 
+     * Check if request method is "POST".
+     * 
+     * @access  public
+     * @return  bool
+     */
+    function isPost()
+    {
+        return  isset($_SERVER['REQUEST_METHOD']) and
+            'POST' == $_SERVER['REQUEST_METHOD'];
+    }
+    
+    /**
+     * Exit If Cached
+     * 
+     * Exit with "HTTP 304 Not Modified" if we consider to be cached.
+     * 
+     * @access  public
+     * @return  void
+     * @param   int     $lastModified Unix timestamp of last modification.
+     */
+    function exitIfCached($lastModified = 0)
+    {
+        if ($this->isCached($lastModified)) {
+            $this->exitCached();
+        }
+    }
+    
+    /**
+     * Exit Cached
+     * 
+     * Exit with "HTTP 304 Not Modified".
+     * 
+     * @access  public
+     * @return  void
+     */
+    function exitCached()
+    {
+        $this->sendHeaders();
+        $this->sendStatusCode(304);
+        exit;
+    }
+    
+    /**
+     * Set Last Modified
+     * 
+     * @access  public
+     * @return  void
+     * @param   int     $lastModified The unix timestamp of last modification.
+     */
+    function setLastModified($lastModified = null)
+    {
+        $this->setHeader('Last-Modified', $lastModified);
+    }
+}
+?>
@@ -32,7 +32,7 @@
 // | Author: Richard Heyes <richard@phpguru.org>                           |
 // +-----------------------------------------------------------------------+
 //
-// $Id: Request.php,v 1.43 2005/11/06 18:29:14 avb Exp $
+// $Id$
 //
 // HTTP_Request Class
 //
@@ -32,7 +32,7 @@
 // | Author: Alexey Borzov <avb@php.net>                                  |
 // +-----------------------------------------------------------------------+
 //
-// $Id: Listener.php,v 1.2 2003/10/26 10:28:29 avb Exp $
+// $Id$
 //
 /**
@@ -42,7 +42,7 @@
  *
  * @package HTTP_Request
  * @author  Alexey Borzov <avb@php.net>
- * @version $Revision: 1.2 $
+ * @version $Revision$
  */
 class HTTP_Request_Listener 
 {
-<?php
-// **********************************************
-//
-// This software is licensed by the LGPL
-// -> http://www.gnu.org/copyleft/lesser.txt
-// (c) 2001-2004 by Tomas Von Veschler Cox
-//
-// **********************************************
-//
-// $Id: Upload.php,v 1.42 2004/08/08 09:37:50 wenz Exp $
-
-/*
- * Pear File Uploader class. Easy and secure managment of files
- * submitted via HTML Forms.
- *
- * Leyend:
- * - you can add error msgs in your language in the HTTP_Upload_Error class
- *
- * TODO:
- * - try to think a way of having all the Error system in other
- *   file and only include it when an error ocurrs
- *
- * -- Notes for users HTTP_Upload >= 0.9.0 --
- *
- *  Error detection was enhanced, so you no longer need to
- *  check for PEAR::isError() in $upload->getFiles() or call
- *  $upload->isMissing(). Instead you'll
- *  get the error when do a check for $file->isError().
- *
- *  Example:
- *
- *  $upload = new HTTP_Upload('en');
- *  $file = $upload->getFiles('i_dont_exist_in_form_definition');
- *  if ($file->isError()) {
- *      die($file->getMessage());
- *  }
- *
- *  --
- *
- */
-
-require_once 'PEAR.php';
-
-/**
- * defines default chmod
- */
-define('HTTP_UPLOAD_DEFAULT_CHMOD', 0660);
-
-/**
- * Error Class for HTTP_Upload
- *
- * @author  Tomas V.V.Cox <cox@idecnet.com>
- * @see http://vulcanonet.com/soft/index.php?pack=uploader
- * @package HTTP_Upload
- * @category HTTP
- * @access public
- */
-class HTTP_Upload_Error extends PEAR
-{
-    /**
-     * Selected language for error messages
-     * @var string
-     */
-    var $lang = 'en';
-
-    /**
-     * Whether HTML entities shall be encoded automatically
-     * @var boolean
-     */
-    var $html = false;
-
-    /**
-     * Constructor
-     *
-     * Creates a new PEAR_Error
-     *
-     * @param string $lang The language selected for error code messages
-     * @access public
-     */
-    function HTTP_Upload_Error($lang = null, $html = false)
-    {
-        $this->lang = ($lang !== null) ? $lang : $this->lang;
-        $this->html = ($html !== false) ? $html : $this->html;
-        $ini_size = preg_replace('/m/i', '000000', ini_get('upload_max_filesize'));
-
-        if (function_exists('version_compare') &&
-            version_compare(phpversion(), '4.1', 'ge')) {
-            $maxsize = (isset($_POST['MAX_FILE_SIZE'])) ?
-                $_POST['MAX_FILE_SIZE'] : null;
-        } else {
-            global $HTTP_POST_VARS;
-            $maxsize = (isset($HTTP_POST_VARS['MAX_FILE_SIZE'])) ?
-                $HTTP_POST_VARS['MAX_FILE_SIZE'] : null;
-        }
-
-        if (empty($maxsize) || ($maxsize > $ini_size)) {
-            $maxsize = $ini_size;
-        }
-        // XXXXX Add here error messages in your language
-        $this->error_codes = array(
-            'TOO_LARGE' => array(
-                'es'    => "Fichero demasiado largo. El maximo permitido es: $maxsize bytes.",
-                'en'    => "File size too large. The maximum permitted size is: $maxsize bytes.",
-                'de'    => "Datei zu gro&szlig;. Die zul&auml;ssige Maximalgr&ouml;&szlig;e ist: $maxsize Bytes.",
-                'nl'    => "Het bestand is te groot, de maximale grootte is: $maxsize bytes.",
-                'fr'    => "Le fichier est trop gros. La taille maximum autoris&eacute;e est: $maxsize bytes.",
-                'it'    => "Il file &eacute; troppo grande. Il massimo permesso &eacute: $maxsize bytes.",
-                'pt_BR' => "Arquivo muito grande. O tamanho m&aacute;ximo permitido &eacute; $maxsize bytes."
-                ),
-            'MISSING_DIR' => array(
-                'es'    => 'Falta directorio destino.',
-                'en'    => 'Missing destination directory.',
-                'de'    => 'Kein Zielverzeichnis definiert.',
-                'nl'    => 'Geen bestemmings directory.',
-                'fr'    => 'Le r&eacute;pertoire de destination n\'est pas d&eacute;fini.',
-                'it'    => 'Manca la directory di destinazione.',
-                'pt_BR' => 'Aus&ecirc;ncia de diret&oacute;rio de destino.'
-                ),
-            'IS_NOT_DIR' => array(
-                'es'    => 'El directorio destino no existe o es un fichero regular.',
-                'en'    => 'The destination directory doesn\'t exist or is a regular file.',
-                'de'    => 'Das angebene Zielverzeichnis existiert nicht oder ist eine Datei.',
-                'nl'    => 'De doeldirectory bestaat niet, of is een gewoon bestand.',
-                'fr'    => 'Le r&eacute;pertoire de destination n\'existe pas ou il s\'agit d\'un fichier r&eacute;gulier.',
-                'it'    => 'La directory di destinazione non esiste o &eacute; un file.',
-                'pt_BR' => 'O diret&oacute;rio de destino n&atilde;o existe ou &eacute; um arquivo.'
-                ),
-            'NO_WRITE_PERMS' => array(
-                'es'    => 'El directorio destino no tiene permisos de escritura.',
-                'en'    => 'The destination directory doesn\'t have write perms.',
-                'de'    => 'Fehlende Schreibrechte f&uuml;r das Zielverzeichnis.',
-                'nl'    => 'Geen toestemming om te schrijven in de doeldirectory.',
-                'fr'    => 'Le r&eacute;pertoire de destination n\'a pas les droits en &eacute;criture.',
-                'it'    => 'Non si hanno i permessi di scrittura sulla directory di destinazione.',
-                'pt_BR' => 'O diret&oacute;rio de destino n&atilde;o possui permiss&atilde;o para escrita.'
-                ),
-            'NO_USER_FILE' => array(
-                'es'    => 'No se ha escogido fichero para el upload.',
-                'en'    => 'You haven\'t selected any file for uploading.',
-                'de'    => 'Es wurde keine Datei f&uuml;r den Upload ausgew&auml;hlt.',
-                'nl'    => 'Er is geen bestand opgegeven om te uploaden.',
-                'fr'    => 'Vous n\'avez pas s&eacute;lectionn&eacute; de fichier &agrave; envoyer.',
-                'it'    => 'Nessun file selezionato per l\'upload.',
-                'pt_BR' => 'Nenhum arquivo selecionado para upload.'
-                ),
-            'BAD_FORM' => array(
-                'es'    => 'El formulario no contiene method="post" enctype="multipart/form-data" requerido.',
-                'en'    => 'The html form doesn\'t contain the required method="post" enctype="multipart/form-data".',
-                'de'    => 'Das HTML-Formular enth&auml;lt nicht die Angabe method="post" enctype="multipart/form-data" '.
-                           'im &gt;form&lt;-Tag.',
-                'nl'    => 'Het HTML-formulier bevat niet de volgende benodigde '.
-                           'eigenschappen: method="post" enctype="multipart/form-data".',
-                'fr'    => 'Le formulaire HTML ne contient pas les attributs requis : '.
-                           ' method="post" enctype="multipart/form-data".',
-                'it'    => 'Il modulo HTML non contiene gli attributi richiesti: "'.
-                           ' method="post" enctype="multipart/form-data".',
-                'pt_BR' => 'O formul&aacute;rio HTML n&atilde;o possui o method="post" enctype="multipart/form-data" requerido.'
-                ),
-            'E_FAIL_COPY' => array(
-                'es'    => 'Fallo al copiar el fichero temporal.',
-                'en'    => 'Failed to copy the temporary file.',
-                'de'    => 'Tempor&auml;re Datei konnte nicht kopiert werden.',
-                'nl'    => 'Het tijdelijke bestand kon niet gekopieerd worden.',
-                'fr'    => 'L\'enregistrement du fichier temporaire a &eacute;chou&eacute;.',
-                'it'    => 'Copia del file temporaneo fallita.',
-                'pt_BR' => 'Falha ao copiar o arquivo tempor&aacute;rio.'
-                ),
-            'E_FAIL_MOVE' => array(
-                'es'    => 'No puedo mover el fichero.',
-                'en'    => 'Impossible to move the file.',
-                'de'    => 'Datei kann nicht verschoben werden.',
-                'nl'    => 'Het bestand kon niet verplaatst worden.',
-                'fr'    => 'Impossible de d&eacute;placer le fichier.',
-                'pt_BR' => 'N&atilde;o foi poss&iacute;vel mover o arquivo.'
-                ),
-            'FILE_EXISTS' => array(
-                'es'    => 'El fichero destino ya existe.',
-                'en'    => 'The destination file already exists.',
-                'de'    => 'Die zu erzeugende Datei existiert bereits.',
-                'nl'    => 'Het doelbestand bestaat al.',
-                'fr'    => 'Le fichier de destination existe d&eacute;j&agrave;.',
-                'it'    => 'File destinazione gi&agrave; esistente.',
-                'pt_BR' => 'O arquivo de destino j&aacute; existe.'
-                ),
-            'CANNOT_OVERWRITE' => array(
-                'es'    => 'El fichero destino ya existe y no se puede sobreescribir.',
-                'en'    => 'The destination file already exists and could not be overwritten.',
-                'de'    => 'Die zu erzeugende Datei existiert bereits und konnte nicht &uuml;berschrieben werden.',
-                'nl'    => 'Het doelbestand bestaat al, en kon niet worden overschreven.',
-                'fr'    => 'Le fichier de destination existe d&eacute;j&agrave; et ne peux pas &ecirc;tre remplac&eacute;.',
-                'it'    => 'File destinazione gi&agrave; esistente e non si pu&ograve; sovrascrivere.',
-                'pt_BR' => 'O arquivo de destino j&aacute; existe e n&atilde;o p&ocirc;de ser sobrescrito.'
-                ),
-            'NOT_ALLOWED_EXTENSION' => array(
-                'es'    => 'Extension de fichero no permitida.',
-                'en'    => 'File extension not permitted.',
-                'de'    => 'Unerlaubte Dateiendung.',
-                'nl'    => 'Niet toegestane bestands-extensie.',
-                'fr'    => 'Le fichier a une extension non autoris&eacute;e.',
-                'it'    => 'Estensione del File non permessa.',
-                'pt_BR' => 'Extens&atilde;o de arquivo n&atilde;o permitida.'
-                ),
-            'PARTIAL' => array(
-                'es'    => 'El fichero fue parcialmente subido',
-                'en'    => 'The file was only partially uploaded.',
-                'de'    => 'Die Datei wurde unvollst&auml;ndig &uuml;bertragen.',
-                'nl'    => 'Het bestand is slechts gedeeltelijk geupload.',
-                'pt_BR' => 'O arquivo não foi enviado por completo.'
-                ),
-            'ERROR' => array(
-                'es'    => 'Error en subida:',
-                'en'    => 'Upload error:',
-                'de'    => 'Fehler beim Upload:',
-                'nl'    => 'Upload fout:',
-                'pt_BR' => 'Erro de upload:'
-                ),
-            'DEV_NO_DEF_FILE' => array(
-                'es'    => 'No está definido en el formulario este nombre de fichero como &lt;input type="file" name=?&gt;.',
-                'en'    => 'This filename is not defined in the form as &lt;input type="file" name=?&gt;.',
-                'de'    => 'Dieser Dateiname ist im Formular nicht als &lt;input type="file" name=?&gt; definiert.',
-                'nl'    => 'Deze bestandsnaam is niett gedefineerd in het formulier als &lt;input type="file" name=?&gt;.'
-                )
-        );
-    }
-
-    /**
-     * returns the error code
-     *
-     * @param    string $e_code  type of error
-     * @return   string          Error message
-     */
-    function errorCode($e_code)
-    {
-        if (!empty($this->error_codes[$e_code][$this->lang])) {
-            $msg = $this->html ?
-                html_entity_decode($this->error_codes[$e_code][$this->lang]) :
-                $this->error_codes[$e_code][$this->lang];
-        } else {
-            $msg = $e_code;
-        }
-
-        if (!empty($this->error_codes['ERROR'][$this->lang])) {
-            $error = $this->error_codes['ERROR'][$this->lang];
-        } else {
-            $error = $this->error_codes['ERROR']['en'];
-        }
-        return $error.' '.$msg;
-    }
-
-    /**
-     * Overwrites the PEAR::raiseError method
-     *
-     * @param    string $e_code      type of error
-     * @return   object PEAR_Error   a PEAR-Error object
-     * @access   public
-     */
-    function raiseError($e_code)
-    {
-        return PEAR::raiseError($this->errorCode($e_code), $e_code);
-    }
-}
-
-/**
- * This class provides an advanced file uploader system
- * for file uploads made from html forms
-
- *
- * @author  Tomas V.V.Cox <cox@idecnet.com>
- * @see http://vulcanonet.com/soft/index.php?pack=uploader
- * @package  HTTP_Upload
- * @category HTTP
- * @access   public
- */
-class HTTP_Upload extends HTTP_Upload_Error
-{
-    /**
-     * Contains an array of "uploaded files" objects
-     * @var array
-     */
-    var $files = array();
-    
-    /**
-     * Contains the desired chmod for uploaded files
-     * @var int
-     * @access private
-     */
-    var $_chmod = HTTP_UPLOAD_DEFAULT_CHMOD;
-
-    /**
-     * Constructor
-     *
-     * @param string $lang Language to use for reporting errors
-     * @see Upload_Error::error_codes
-     * @access public
-     */
-    function HTTP_Upload($lang = null)
-    {
-        $this->HTTP_Upload_Error($lang);
-        if (function_exists('version_compare') &&
-            version_compare(phpversion(), '4.1', 'ge'))
-        {
-            $this->post_files = $_FILES;
-            if (isset($_SERVER['CONTENT_TYPE'])) {
-                $this->content_type = $_SERVER['CONTENT_TYPE'];
-            }
-        } else {
-            global $HTTP_POST_FILES, $HTTP_SERVER_VARS;
-            $this->post_files = $HTTP_POST_FILES;
-            if (isset($HTTP_SERVER_VARS['CONTENT_TYPE'])) {
-                $this->content_type = $HTTP_SERVER_VARS['CONTENT_TYPE'];
-            }
-        }
-    }
-
-    /**
-     * Get files
-     *
-     * @param mixed $file If:
-     *    - not given, function will return array of upload_file objects
-     *    - is int, will return the $file position in upload_file objects array
-     *    - is string, will return the upload_file object corresponding
-     *        to $file name of the form. For ex:
-     *        if form is <input type="file" name="userfile">
-     *        to get this file use: $upload->getFiles('userfile')
-     *
-     * @return mixed array or object (see @param $file above) or Pear_Error
-     * @access public
-     */
-    function &getFiles($file = null)
-    {
-        static $is_built = false;
-        //build only once for multiple calls
-        if (!$is_built) {
-            $files = &$this->_buildFiles();
-            if (PEAR::isError($files)) {
-                // there was an error with the form.
-                // Create a faked upload embedding the error
-                $this->files['_error'] =  &new HTTP_Upload_File(
-                                                       '_error', null,
-                                                       null, null,
-                                                       null, $files->getCode(),
-                                                       $this->lang, $this->_chmod);
-            } else {
-                $this->files = $files;
-            }
-            $is_built = true;
-        }
-        if ($file !== null) {
-            if (is_int($file)) {
-                $pos = 0;
-                foreach ($this->files as $obj) {
-                    if ($pos == $file) {
-                        return $obj;
-                    }
-                    $pos++;
-                }
-            } elseif (is_string($file) && isset($this->files[$file])) {
-                return $this->files[$file];
-            }
-            if (isset($this->files['_error'])) {
-                return $this->files['_error'];
-            } else {
-                // developer didn't specify this name in the form
-                // warn him about it with a faked upload
-                return new HTTP_Upload_File(
-                                           '_error', null,
-                                           null, null,
-                                           null, 'DEV_NO_DEF_FILE',
-                                           $this->lang);
-            }
-        }
-        return $this->files;
-    }
-
-    /**
-     * Creates the list of the uploaded file
-     *
-     * @return array of HTTP_Upload_File objects for every file
-     */
-    function &_buildFiles()
-    {
-        // Form method check
-        if (!isset($this->content_type) ||
-            strpos($this->content_type, 'multipart/form-data') !== 0)
-        {
-            return $this->raiseError('BAD_FORM');
-        }
-        // In 4.1 $_FILES isn't initialized when no uploads
-        // XXX (cox) afaik, in >= 4.1 and <= 4.3 only
-        if (function_exists('version_compare') &&
-            version_compare(phpversion(), '4.1', 'ge'))
-        {
-            $error = $this->isMissing();
-            if (PEAR::isError($error)) {
-                return $error;
-            }
-        }
-
-        // map error codes from 4.2.0 $_FILES['userfile']['error']
-        if (function_exists('version_compare') &&
-            version_compare(phpversion(), '4.2.0', 'ge')) {
-            $uploadError = array(
-                1 => 'TOO_LARGE',
-                2 => 'TOO_LARGE',
-                3 => 'PARTIAL',
-                4 => 'NO_USER_FILE'
-                );
-        }
-
-
-        // Parse $_FILES (or $HTTP_POST_FILES)
-        $files = array();
-        foreach ($this->post_files as $userfile => $value) {
-            if (is_array($value['name'])) {
-                foreach ($value['name'] as $key => $val) {
-                    $err = $value['error'][$key];
-                    if (isset($err) && $err !== 0 && isset($uploadError[$err])) {
-                        $error = $uploadError[$err];
-                    } else {
-                        $error = null;
-                    }
-                    $name = basename($value['name'][$key]);
-                    $tmp_name = $value['tmp_name'][$key];
-                    $size = $value['size'][$key];
-                    $type = $value['type'][$key];
-                    $formname = $userfile . "[$key]";
-                    $files[$formname] = new HTTP_Upload_File($name, $tmp_name,
-                                                             $formname, $type, $size, $error, $this->lang, $this->_chmod);
-                }
-                // One file
-            } else {
-                $err = $value['error'];
-                if (isset($err) && $err !== 0 && isset($uploadError[$err])) {
-                    $error = $uploadError[$err];
-                } else {
-                    $error = null;
-                }
-                $name = basename($value['name']);
-                $tmp_name = $value['tmp_name'];
-                $size = $value['size'];
-                $type = $value['type'];
-                $formname = $userfile;
-                $files[$formname] = new HTTP_Upload_File($name, $tmp_name,
-                                                         $formname, $type, $size, $error, $this->lang, $this->_chmod);
-            }
-        }
-        return $files;
-    }
-
-    /**
-     * Checks if the user submited or not some file
-     *
-     * @return mixed False when are files or PEAR_Error when no files
-     * @access public
-     * @see Read the note in the source code about this function
-     */
-    function isMissing()
-    {
-        if (count($this->post_files) < 1) {
-            return $this->raiseError('NO_USER_FILE');
-        }
-        //we also check if at least one file has more than 0 bytes :)
-        $files = array();
-        $size = 0;
-        foreach ($this->post_files as $userfile => $value) {
-            if (is_array($value['name'])) {
-                foreach ($value['name'] as $key => $val) {
-                    $size += $value['size'][$key];
-                }
-            } else {  //one file
-                $size = $value['size'];
-            }
-        }
-        if ($size == 0) {
-            $this->raiseError('NO_USER_FILE');
-        }
-        return false;
-    }
-
-    /**
-     * Sets the chmod to be used for uploaded files
-     *
-     * @param int Desired mode 
-     */
-    function setChmod($mode)
-    {
-        $this->_chmod = $mode;
-    }
-}
-
-/**
- * This class provides functions to work with the uploaded file
- *
- * @author  Tomas V.V.Cox <cox@idecnet.com>
- * @see http://vulcanonet.com/soft/index.php?pack=uploader
- * @package  HTTP_Upload
- * @category HTTP
- * @access   public
- */
-class HTTP_Upload_File extends HTTP_Upload_Error
-{
-    /**
-     * If the random seed was initialized before or not
-     * @var  boolean;
-     */
-    var $_seeded = 0;
-
-    /**
-     * Assoc array with file properties
-     * @var array
-     */
-    var $upload = array();
-
-    /**
-     * If user haven't selected a mode, by default 'safe' will be used
-     * @var boolean
-     */
-    var $mode_name_selected = false;
-
-    /**
-     * It's a common security risk in pages who has the upload dir
-     * under the document root (remember the hack of the Apache web?)
-     *
-     * @var array
-     * @access private
-     * @see HTTP_Upload_File::setValidExtensions()
-     */
-    var $_extensions_check = array('php', 'phtm', 'phtml', 'php3', 'inc');
-
-    /**
-     * @see HTTP_Upload_File::setValidExtensions()
-     * @var string
-     * @access private
-     */
-    var $_extensions_mode  = 'deny';
-
-    /**
-     * Contains the desired chmod for uploaded files
-     * @var int
-     * @access private
-     */
-    var $_chmod = HTTP_UPLOAD_DEFAULT_CHMOD;
-
-    /**
-     * Constructor
-     *
-     * @param   string  $name       destination file name
-     * @param   string  $tmp        temp file name
-     * @param   string  $formname   name of the form
-     * @param   string  $type       Mime type of the file
-     * @param   string  $size       size of the file
-     * @param   string  $error      error on upload
-     * @param   string  $lang       used language for errormessages
-     * @access  public
-     */
-    function HTTP_Upload_File($name = null, $tmp = null,  $formname = null,
-                              $type = null, $size = null, $error = null, 
-                              $lang = null, $chmod = HTTP_UPLOAD_DEFAULT_CHMOD)
-    {
-        $this->HTTP_Upload_Error($lang);
-        $ext = null;
-
-        if (empty($name) || $size == 0) {
-            $error = 'NO_USER_FILE';
-        } elseif ($tmp == 'none') {
-            $error = 'TOO_LARGE';
-        } else {
-            // strpos needed to detect files without extension
-            if (($pos = strrpos($name, '.')) !== false) {
-                $ext = substr($name, $pos + 1);
-            }
-        }
-
-        if (function_exists('version_compare') &&
-            version_compare(phpversion(), '4.1', 'ge')) {
-            if (isset($_POST['MAX_FILE_SIZE']) &&
-                $size > $_POST['MAX_FILE_SIZE']) {
-                $error = 'TOO_LARGE';
-            }
-        } else {
-            global $HTTP_POST_VARS;
-            if (isset($HTTP_POST_VARS['MAX_FILE_SIZE']) &&
-                $size > $HTTP_POST_VARS['MAX_FILE_SIZE']) {
-                $error = 'TOO_LARGE';
-            }
-        }
-
-        $this->upload = array(
-            'real'      => $name,
-            'name'      => $name,
-            'form_name' => $formname,
-            'ext'       => $ext,
-            'tmp_name'  => $tmp,
-            'size'      => $size,
-            'type'      => $type,
-            'error'     => $error
-        );
-
-        $this->_chmod = $chmod;
-    }
-
-    /**
-     * Sets the name of the destination file
-     *
-     * @param string $mode     A valid mode: 'uniq', 'safe' or 'real' or a file name
-     * @param string $prepend  A string to prepend to the name
-     * @param string $append   A string to append to the name
-     *
-     * @return string The modified name of the destination file
-     * @access public
-     */
-    function setName($mode, $prepend = null, $append = null)
-    {
-        switch ($mode) {
-            case 'uniq':
-                $name = $this->nameToUniq();
-                $this->upload['ext'] = $this->nameToSafe($this->upload['ext'], 10);
-                $name .= '.' . $this->upload['ext'];
-                break;
-            case 'safe':
-                $name = $this->nameToSafe($this->upload['real']);
-                if (($pos = strrpos($name, '.')) !== false) {
-                    $this->upload['ext'] = substr($name, $pos + 1);
-                } else {
-                    $this->upload['ext'] = '';
-                }
-                break;
-            case 'real':
-                $name = $this->upload['real'];
-                break;
-            default:
-                $name = $mode;
-        }
-        $this->upload['name'] = $prepend . $name . $append;
-        $this->mode_name_selected = true;
-        return $this->upload['name'];
-    }
-
-    /**
-     * Unique file names in the form: 9022210413b75410c28bef.html
-     * @see HTTP_Upload_File::setName()
-     */
-    function nameToUniq()
-    {
-        if (! $this->_seeded) {
-            srand((double) microtime() * 1000000);
-            $this->_seeded = 1;
-        }
-        $uniq = uniqid(rand());
-        return $uniq;
-    }
-
-    /**
-     * Format a file name to be safe
-     *
-     * @param    string $file   The string file name
-     * @param    int    $maxlen Maximun permited string lenght
-     * @return   string Formatted file name
-     * @see HTTP_Upload_File::setName()
-     */
-    function nameToSafe($name, $maxlen=250)
-    {
-        $noalpha = 'ÁÉÍÓÚÝáéíóúýÂÊÎÔÛâêîôûÀÈÌÒÙàèìòùÄËÏÖÜäëïöüÿÃãÕõÅåÑñÇç@°ºª';
-        $alpha   = 'AEIOUYaeiouyAEIOUaeiouAEIOUaeiouAEIOUaeiouyAaOoAaNnCcaooa';
-
-        $name = substr($name, 0, $maxlen);
-        $name = strtr($name, $noalpha, $alpha);
-        // not permitted chars are replaced with "_"
-        return preg_replace('/[^a-zA-Z0-9,._\+\()\-]/', '_', $name);
-    }
-
-    /**
-     * The upload was valid
-     *
-     * @return bool If the file was submitted correctly
-     * @access public
-     */
-    function isValid()
-    {
-        if ($this->upload['error'] === null) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * User haven't submit a file
-     *
-     * @return bool If the user submitted a file or not
-     * @access public
-     */
-    function isMissing()
-    {
-        if ($this->upload['error'] == 'NO_USER_FILE') {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Some error occured during upload (most common due a file size problem,
-     * like max size exceeded or 0 bytes long).
-     * @return bool If there were errors submitting the file (probably
-     *              because the file excess the max permitted file size)
-     * @access public
-     */
-    function isError()
-    {
-        if (in_array($this->upload['error'], array('TOO_LARGE', 'BAD_FORM','DEV_NO_DEF_FILE'))) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * Moves the uploaded file to its destination directory.
-     *
-     * @param    string  $dir_dest  Destination directory
-     * @param    bool    $overwrite Overwrite if destination file exists?
-     * @return   mixed   True on success or Pear_Error object on error
-     * @access public
-     */
-    function moveTo($dir_dest, $overwrite = true)
-    {
-        if (!$this->isValid()) {
-            return $this->raiseError($this->upload['error']);
-        }
-
-        //Valid extensions check
-        if (!$this->_evalValidExtensions()) {
-            return $this->raiseError('NOT_ALLOWED_EXTENSION');
-        }
-
-        $err_code = $this->_chk_dir_dest($dir_dest);
-        if ($err_code !== false) {
-            return $this->raiseError($err_code);
-        }
-        // Use 'safe' mode by default if no other was selected
-        if (!$this->mode_name_selected) {
-            $this->setName('safe');
-        }
-
-        $name_dest = $dir_dest . DIRECTORY_SEPARATOR . $this->upload['name'];
-
-        if (@is_file($name_dest)) {
-            if ($overwrite !== true) {
-                return $this->raiseError('FILE_EXISTS');
-            } elseif (!is_writable($name_dest)) {
-                return $this->raiseError('CANNOT_OVERWRITE');
-            }
-        }
-
-        // copy the file and let php clean the tmp
-        if (!@move_uploaded_file($this->upload['tmp_name'], $name_dest)) {
-            return $this->raiseError('E_FAIL_MOVE');
-        }
-        @chmod($name_dest, $this->_chmod);
-        return $this->getProp('name');
-    }
-
-    /**
-     * Check for a valid destination dir
-     *
-     * @param    string  $dir_dest Destination dir
-     * @return   mixed   False on no errors or error code on error
-     */
-    function _chk_dir_dest($dir_dest)
-    {
-        if (!$dir_dest) {
-            return 'MISSING_DIR';
-        }
-        if (!@is_dir ($dir_dest)) {
-            return 'IS_NOT_DIR';
-        }
-        if (!is_writeable ($dir_dest)) {
-            return 'NO_WRITE_PERMS';
-        }
-        return false;
-    }
-    /**
-     * Retrive properties of the uploaded file
-     * @param string $name   The property name. When null an assoc array with
-     *                       all the properties will be returned
-     * @return mixed         A string or array
-     * @see HTTP_Upload_File::HTTP_Upload_File()
-     * @access public
-     */
-    function getProp($name = null)
-    {
-        if ($name === null) {
-            return $this->upload;
-        }
-        return $this->upload[$name];
-    }
-
-    /**
-     * Returns a error message, if a error occured
-     * (deprecated) Use getMessage() instead
-     * @return string    a Error message
-     * @access public
-     */
-    function errorMsg()
-    {
-        return $this->errorCode($this->upload['error']);
-    }
-
-    /**
-     * Returns a error message, if a error occured
-     * @return string    a Error message
-     * @access public
-     */
-    function getMessage()
-    {
-        return $this->errorCode($this->upload['error']);
-    }
-
-    /**
-     * Function to restrict the valid extensions on file uploads
-     *
-     * @param array $exts File extensions to validate
-     * @param string $mode The type of validation:
-     *                       1) 'deny'   Will deny only the supplied extensions
-     *                       2) 'accept' Will accept only the supplied extensions
-     *                                   as valid
-     * @access public
-     */
-    function setValidExtensions($exts, $mode = 'deny')
-    {
-        $this->_extensions_check = $exts;
-        $this->_extensions_mode  = $mode;
-    }
-
-    /**
-     * Evaluates the validity of the extensions set by setValidExtensions
-     *
-     * @return bool False on non valid extension, true if they are valid
-     * @access private
-     */
-    function _evalValidExtensions()
-    {
-        $exts = $this->_extensions_check;
-        settype($exts, 'array');
-        if ($this->_extensions_mode == 'deny') {
-            if (in_array($this->getProp('ext'), $exts)) {
-                return false;
-            }
-        // mode == 'accept'
-        } else {
-            if (!in_array($this->getProp('ext'), $exts)) {
-                return false;
-            }
-        }
-        return true;
-    }
-}
+<?php
+// **********************************************
+//
+// This software is licensed by the LGPL
+// -> http://www.gnu.org/copyleft/lesser.txt
+// (c) 2001-2004 by Tomas Von Veschler Cox
+//
+// **********************************************
+//
+// $Id$
+
+/*
+ * Pear File Uploader class. Easy and secure managment of files
+ * submitted via HTML Forms.
+ *
+ * Leyend:
+ * - you can add error msgs in your language in the HTTP_Upload_Error class
+ *
+ * TODO:
+ * - try to think a way of having all the Error system in other
+ *   file and only include it when an error ocurrs
+ *
+ * -- Notes for users HTTP_Upload >= 0.9.0 --
+ *
+ *  Error detection was enhanced, so you no longer need to
+ *  check for PEAR::isError() in $upload->getFiles() or call
+ *  $upload->isMissing(). Instead you'll
+ *  get the error when do a check for $file->isError().
+ *
+ *  Example:
+ *
+ *  $upload = new HTTP_Upload('en');
+ *  $file = $upload->getFiles('i_dont_exist_in_form_definition');
+ *  if ($file->isError()) {
+ *      die($file->getMessage());
+ *  }
+ *
+ *  --
+ *
+ */
+
+require_once 'PEAR.php';
+
+/**
+ * defines default chmod
+ */
+define('HTTP_UPLOAD_DEFAULT_CHMOD', 0660);
+
+/**
+ * Error Class for HTTP_Upload
+ *
+ * @author  Tomas V.V.Cox <cox@idecnet.com>
+ * @see http://vulcanonet.com/soft/index.php?pack=uploader
+ * @package HTTP_Upload
+ * @category HTTP
+ * @access public
+ */
+class HTTP_Upload_Error extends PEAR
+{
+    /**
+     * Selected language for error messages
+     * @var string
+     */
+    var $lang = 'en';
+
+    /**
+     * Whether HTML entities shall be encoded automatically
+     * @var boolean
+     */
+    var $html = false;
+
+    /**
+     * Constructor
+     *
+     * Creates a new PEAR_Error
+     *
+     * @param string $lang The language selected for error code messages
+     * @access public
+     */
+    function HTTP_Upload_Error($lang = null, $html = false)
+    {
+        $this->lang = ($lang !== null) ? $lang : $this->lang;
+        $this->html = ($html !== false) ? $html : $this->html;
+        $ini_size = preg_replace('/m/i', '000000', ini_get('upload_max_filesize'));
+
+        if (function_exists('version_compare') &&
+            version_compare(phpversion(), '4.1', 'ge')) {
+            $maxsize = (isset($_POST['MAX_FILE_SIZE'])) ?
+                $_POST['MAX_FILE_SIZE'] : null;
+        } else {
+            global $HTTP_POST_VARS;
+            $maxsize = (isset($HTTP_POST_VARS['MAX_FILE_SIZE'])) ?
+                $HTTP_POST_VARS['MAX_FILE_SIZE'] : null;
+        }
+
+        if (empty($maxsize) || ($maxsize > $ini_size)) {
+            $maxsize = $ini_size;
+        }
+        // XXXXX Add here error messages in your language
+        $this->error_codes = array(
+            'TOO_LARGE' => array(
+                'es'    => "Fichero demasiado largo. El maximo permitido es: $maxsize bytes.",
+                'en'    => "File size too large. The maximum permitted size is: $maxsize bytes.",
+                'de'    => "Datei zu gro&szlig;. Die zul&auml;ssige Maximalgr&ouml;&szlig;e ist: $maxsize Bytes.",
+                'nl'    => "Het bestand is te groot, de maximale grootte is: $maxsize bytes.",
+                'fr'    => "Le fichier est trop gros. La taille maximum autoris&eacute;e est: $maxsize bytes.",
+                'it'    => "Il file &eacute; troppo grande. Il massimo permesso &eacute: $maxsize bytes.",
+                'pt_BR' => "Arquivo muito grande. O tamanho m&aacute;ximo permitido &eacute; $maxsize bytes."
+                ),
+            'MISSING_DIR' => array(
+                'es'    => 'Falta directorio destino.',
+                'en'    => 'Missing destination directory.',
+                'de'    => 'Kein Zielverzeichnis definiert.',
+                'nl'    => 'Geen bestemmings directory.',
+                'fr'    => 'Le r&eacute;pertoire de destination n\'est pas d&eacute;fini.',
+                'it'    => 'Manca la directory di destinazione.',
+                'pt_BR' => 'Aus&ecirc;ncia de diret&oacute;rio de destino.'
+                ),
+            'IS_NOT_DIR' => array(
+                'es'    => 'El directorio destino no existe o es un fichero regular.',
+                'en'    => 'The destination directory doesn\'t exist or is a regular file.',
+                'de'    => 'Das angebene Zielverzeichnis existiert nicht oder ist eine Datei.',
+                'nl'    => 'De doeldirectory bestaat niet, of is een gewoon bestand.',
+                'fr'    => 'Le r&eacute;pertoire de destination n\'existe pas ou il s\'agit d\'un fichier r&eacute;gulier.',
+                'it'    => 'La directory di destinazione non esiste o &eacute; un file.',
+                'pt_BR' => 'O diret&oacute;rio de destino n&atilde;o existe ou &eacute; um arquivo.'
+                ),
+            'NO_WRITE_PERMS' => array(
+                'es'    => 'El directorio destino no tiene permisos de escritura.',
+                'en'    => 'The destination directory doesn\'t have write perms.',
+                'de'    => 'Fehlende Schreibrechte f&uuml;r das Zielverzeichnis.',
+                'nl'    => 'Geen toestemming om te schrijven in de doeldirectory.',
+                'fr'    => 'Le r&eacute;pertoire de destination n\'a pas les droits en &eacute;criture.',
+                'it'    => 'Non si hanno i permessi di scrittura sulla directory di destinazione.',
+                'pt_BR' => 'O diret&oacute;rio de destino n&atilde;o possui permiss&atilde;o para escrita.'
+                ),
+            'NO_USER_FILE' => array(
+                'es'    => 'No se ha escogido fichero para el upload.',
+                'en'    => 'You haven\'t selected any file for uploading.',
+                'de'    => 'Es wurde keine Datei f&uuml;r den Upload ausgew&auml;hlt.',
+                'nl'    => 'Er is geen bestand opgegeven om te uploaden.',
+                'fr'    => 'Vous n\'avez pas s&eacute;lectionn&eacute; de fichier &agrave; envoyer.',
+                'it'    => 'Nessun file selezionato per l\'upload.',
+                'pt_BR' => 'Nenhum arquivo selecionado para upload.'
+                ),
+            'BAD_FORM' => array(
+                'es'    => 'El formulario no contiene method="post" enctype="multipart/form-data" requerido.',
+                'en'    => 'The html form doesn\'t contain the required method="post" enctype="multipart/form-data".',
+                'de'    => 'Das HTML-Formular enth&auml;lt nicht die Angabe method="post" enctype="multipart/form-data" '.
+                           'im &gt;form&lt;-Tag.',
+                'nl'    => 'Het HTML-formulier bevat niet de volgende benodigde '.
+                           'eigenschappen: method="post" enctype="multipart/form-data".',
+                'fr'    => 'Le formulaire HTML ne contient pas les attributs requis : '.
+                           ' method="post" enctype="multipart/form-data".',
+                'it'    => 'Il modulo HTML non contiene gli attributi richiesti: "'.
+                           ' method="post" enctype="multipart/form-data".',
+                'pt_BR' => 'O formul&aacute;rio HTML n&atilde;o possui o method="post" enctype="multipart/form-data" requerido.'
+                ),
+            'E_FAIL_COPY' => array(
+                'es'    => 'Fallo al copiar el fichero temporal.',
+                'en'    => 'Failed to copy the temporary file.',
+                'de'    => 'Tempor&auml;re Datei konnte nicht kopiert werden.',
+                'nl'    => 'Het tijdelijke bestand kon niet gekopieerd worden.',
+                'fr'    => 'L\'enregistrement du fichier temporaire a &eacute;chou&eacute;.',
+                'it'    => 'Copia del file temporaneo fallita.',
+                'pt_BR' => 'Falha ao copiar o arquivo tempor&aacute;rio.'
+                ),
+            'E_FAIL_MOVE' => array(
+                'es'    => 'No puedo mover el fichero.',
+                'en'    => 'Impossible to move the file.',
+                'de'    => 'Datei kann nicht verschoben werden.',
+                'nl'    => 'Het bestand kon niet verplaatst worden.',
+                'fr'    => 'Impossible de d&eacute;placer le fichier.',
+                'pt_BR' => 'N&atilde;o foi poss&iacute;vel mover o arquivo.'
+                ),
+            'FILE_EXISTS' => array(
+                'es'    => 'El fichero destino ya existe.',
+                'en'    => 'The destination file already exists.',
+                'de'    => 'Die zu erzeugende Datei existiert bereits.',
+                'nl'    => 'Het doelbestand bestaat al.',
+                'fr'    => 'Le fichier de destination existe d&eacute;j&agrave;.',
+                'it'    => 'File destinazione gi&agrave; esistente.',
+                'pt_BR' => 'O arquivo de destino j&aacute; existe.'
+                ),
+            'CANNOT_OVERWRITE' => array(
+                'es'    => 'El fichero destino ya existe y no se puede sobreescribir.',
+                'en'    => 'The destination file already exists and could not be overwritten.',
+                'de'    => 'Die zu erzeugende Datei existiert bereits und konnte nicht &uuml;berschrieben werden.',
+                'nl'    => 'Het doelbestand bestaat al, en kon niet worden overschreven.',
+                'fr'    => 'Le fichier de destination existe d&eacute;j&agrave; et ne peux pas &ecirc;tre remplac&eacute;.',
+                'it'    => 'File destinazione gi&agrave; esistente e non si pu&ograve; sovrascrivere.',
+                'pt_BR' => 'O arquivo de destino j&aacute; existe e n&atilde;o p&ocirc;de ser sobrescrito.'
+                ),
+            'NOT_ALLOWED_EXTENSION' => array(
+                'es'    => 'Extension de fichero no permitida.',
+                'en'    => 'File extension not permitted.',
+                'de'    => 'Unerlaubte Dateiendung.',
+                'nl'    => 'Niet toegestane bestands-extensie.',
+                'fr'    => 'Le fichier a une extension non autoris&eacute;e.',
+                'it'    => 'Estensione del File non permessa.',
+                'pt_BR' => 'Extens&atilde;o de arquivo n&atilde;o permitida.'
+                ),
+            'PARTIAL' => array(
+                'es'    => 'El fichero fue parcialmente subido',
+                'en'    => 'The file was only partially uploaded.',
+                'de'    => 'Die Datei wurde unvollst&auml;ndig &uuml;bertragen.',
+                'nl'    => 'Het bestand is slechts gedeeltelijk geupload.',
+                'pt_BR' => 'O arquivo não foi enviado por completo.'
+                ),
+            'ERROR' => array(
+                'es'    => 'Error en subida:',
+                'en'    => 'Upload error:',
+                'de'    => 'Fehler beim Upload:',
+                'nl'    => 'Upload fout:',
+                'pt_BR' => 'Erro de upload:'
+                ),
+            'DEV_NO_DEF_FILE' => array(
+                'es'    => 'No está definido en el formulario este nombre de fichero como &lt;input type="file" name=?&gt;.',
+                'en'    => 'This filename is not defined in the form as &lt;input type="file" name=?&gt;.',
+                'de'    => 'Dieser Dateiname ist im Formular nicht als &lt;input type="file" name=?&gt; definiert.',
+                'nl'    => 'Deze bestandsnaam is niett gedefineerd in het formulier als &lt;input type="file" name=?&gt;.'
+                )
+        );
+    }
+
+    /**
+     * returns the error code
+     *
+     * @param    string $e_code  type of error
+     * @return   string          Error message
+     */
+    function errorCode($e_code)
+    {
+        if (!empty($this->error_codes[$e_code][$this->lang])) {
+            $msg = $this->html ?
+                html_entity_decode($this->error_codes[$e_code][$this->lang]) :
+                $this->error_codes[$e_code][$this->lang];
+        } else {
+            $msg = $e_code;
+        }
+
+        if (!empty($this->error_codes['ERROR'][$this->lang])) {
+            $error = $this->error_codes['ERROR'][$this->lang];
+        } else {
+            $error = $this->error_codes['ERROR']['en'];
+        }
+        return $error.' '.$msg;
+    }
+
+    /**
+     * Overwrites the PEAR::raiseError method
+     *
+     * @param    string $e_code      type of error
+     * @return   object PEAR_Error   a PEAR-Error object
+     * @access   public
+     */
+    function raiseError($e_code)
+    {
+        return PEAR::raiseError($this->errorCode($e_code), $e_code);
+    }
+}
+
+/**
+ * This class provides an advanced file uploader system
+ * for file uploads made from html forms
+
+ *
+ * @author  Tomas V.V.Cox <cox@idecnet.com>
+ * @see http://vulcanonet.com/soft/index.php?pack=uploader
+ * @package  HTTP_Upload
+ * @category HTTP
+ * @access   public
+ */
+class HTTP_Upload extends HTTP_Upload_Error
+{
+    /**
+     * Contains an array of "uploaded files" objects
+     * @var array
+     */
+    var $files = array();
+    
+    /**
+     * Contains the desired chmod for uploaded files
+     * @var int
+     * @access private
+     */
+    var $_chmod = HTTP_UPLOAD_DEFAULT_CHMOD;
+
+    /**
+     * Constructor
+     *
+     * @param string $lang Language to use for reporting errors
+     * @see Upload_Error::error_codes
+     * @access public
+     */
+    function HTTP_Upload($lang = null)
+    {
+        $this->HTTP_Upload_Error($lang);
+        if (function_exists('version_compare') &&
+            version_compare(phpversion(), '4.1', 'ge'))
+        {
+            $this->post_files = $_FILES;
+            if (isset($_SERVER['CONTENT_TYPE'])) {
+                $this->content_type = $_SERVER['CONTENT_TYPE'];
+            }
+        } else {
+            global $HTTP_POST_FILES, $HTTP_SERVER_VARS;
+            $this->post_files = $HTTP_POST_FILES;
+            if (isset($HTTP_SERVER_VARS['CONTENT_TYPE'])) {
+                $this->content_type = $HTTP_SERVER_VARS['CONTENT_TYPE'];
+            }
+        }
+    }
+
+    /**
+     * Get files
+     *
+     * @param mixed $file If:
+     *    - not given, function will return array of upload_file objects
+     *    - is int, will return the $file position in upload_file objects array
+     *    - is string, will return the upload_file object corresponding
+     *        to $file name of the form. For ex:
+     *        if form is <input type="file" name="userfile">
+     *        to get this file use: $upload->getFiles('userfile')
+     *
+     * @return mixed array or object (see @param $file above) or Pear_Error
+     * @access public
+     */
+    function &getFiles($file = null)
+    {
+        static $is_built = false;
+        //build only once for multiple calls
+        if (!$is_built) {
+            $files = &$this->_buildFiles();
+            if (PEAR::isError($files)) {
+                // there was an error with the form.
+                // Create a faked upload embedding the error
+                $this->files['_error'] =  &new HTTP_Upload_File(
+                                                       '_error', null,
+                                                       null, null,
+                                                       null, $files->getCode(),
+                                                       $this->lang, $this->_chmod);
+            } else {
+                $this->files = $files;
+            }
+            $is_built = true;
+        }
+        if ($file !== null) {
+            if (is_int($file)) {
+                $pos = 0;
+                foreach ($this->files as $obj) {
+                    if ($pos == $file) {
+                        return $obj;
+                    }
+                    $pos++;
+                }
+            } elseif (is_string($file) && isset($this->files[$file])) {
+                return $this->files[$file];
+            }
+            if (isset($this->files['_error'])) {
+                return $this->files['_error'];
+            } else {
+                // developer didn't specify this name in the form
+                // warn him about it with a faked upload
+                return new HTTP_Upload_File(
+                                           '_error', null,
+                                           null, null,
+                                           null, 'DEV_NO_DEF_FILE',
+                                           $this->lang);
+            }
+        }
+        return $this->files;
+    }
+
+    /**
+     * Creates the list of the uploaded file
+     *
+     * @return array of HTTP_Upload_File objects for every file
+     */
+    function &_buildFiles()
+    {
+        // Form method check
+        if (!isset($this->content_type) ||
+            strpos($this->content_type, 'multipart/form-data') !== 0)
+        {
+            return $this->raiseError('BAD_FORM');
+        }
+        // In 4.1 $_FILES isn't initialized when no uploads
+        // XXX (cox) afaik, in >= 4.1 and <= 4.3 only
+        if (function_exists('version_compare') &&
+            version_compare(phpversion(), '4.1', 'ge'))
+        {
+            $error = $this->isMissing();
+            if (PEAR::isError($error)) {
+                return $error;
+            }
+        }
+
+        // map error codes from 4.2.0 $_FILES['userfile']['error']
+        if (function_exists('version_compare') &&
+            version_compare(phpversion(), '4.2.0', 'ge')) {
+            $uploadError = array(
+                1 => 'TOO_LARGE',
+                2 => 'TOO_LARGE',
+                3 => 'PARTIAL',
+                4 => 'NO_USER_FILE'
+                );
+        }
+
+
+        // Parse $_FILES (or $HTTP_POST_FILES)
+        $files = array();
+        foreach ($this->post_files as $userfile => $value) {
+            if (is_array($value['name'])) {
+                foreach ($value['name'] as $key => $val) {
+                    $err = $value['error'][$key];
+                    if (isset($err) && $err !== 0 && isset($uploadError[$err])) {
+                        $error = $uploadError[$err];
+                    } else {
+                        $error = null;
+                    }
+                    $name = basename($value['name'][$key]);
+                    $tmp_name = $value['tmp_name'][$key];
+                    $size = $value['size'][$key];
+                    $type = $value['type'][$key];
+                    $formname = $userfile . "[$key]";
+                    $files[$formname] = new HTTP_Upload_File($name, $tmp_name,
+                                                             $formname, $type, $size, $error, $this->lang, $this->_chmod);
+                }
+                // One file
+            } else {
+                $err = $value['error'];
+                if (isset($err) && $err !== 0 && isset($uploadError[$err])) {
+                    $error = $uploadError[$err];
+                } else {
+                    $error = null;
+                }
+                $name = basename($value['name']);
+                $tmp_name = $value['tmp_name'];
+                $size = $value['size'];
+                $type = $value['type'];
+                $formname = $userfile;
+                $files[$formname] = new HTTP_Upload_File($name, $tmp_name,
+                                                         $formname, $type, $size, $error, $this->lang, $this->_chmod);
+            }
+        }
+        return $files;
+    }
+
+    /**
+     * Checks if the user submited or not some file
+     *
+     * @return mixed False when are files or PEAR_Error when no files
+     * @access public
+     * @see Read the note in the source code about this function
+     */
+    function isMissing()
+    {
+        if (count($this->post_files) < 1) {
+            return $this->raiseError('NO_USER_FILE');
+        }
+        //we also check if at least one file has more than 0 bytes :)
+        $files = array();
+        $size = 0;
+        foreach ($this->post_files as $userfile => $value) {
+            if (is_array($value['name'])) {
+                foreach ($value['name'] as $key => $val) {
+                    $size += $value['size'][$key];
+                }
+            } else {  //one file
+                $size = $value['size'];
+            }
+        }
+        if ($size == 0) {
+            $this->raiseError('NO_USER_FILE');
+        }
+        return false;
+    }
+
+    /**
+     * Sets the chmod to be used for uploaded files
+     *
+     * @param int Desired mode 
+     */
+    function setChmod($mode)
+    {
+        $this->_chmod = $mode;
+    }
+}
+
+/**
+ * This class provides functions to work with the uploaded file
+ *
+ * @author  Tomas V.V.Cox <cox@idecnet.com>
+ * @see http://vulcanonet.com/soft/index.php?pack=uploader
+ * @package  HTTP_Upload
+ * @category HTTP
+ * @access   public
+ */
+class HTTP_Upload_File extends HTTP_Upload_Error
+{
+    /**
+     * If the random seed was initialized before or not
+     * @var  boolean;
+     */
+    var $_seeded = 0;
+
+    /**
+     * Assoc array with file properties
+     * @var array
+     */
+    var $upload = array();
+
+    /**
+     * If user haven't selected a mode, by default 'safe' will be used
+     * @var boolean
+     */
+    var $mode_name_selected = false;
+
+    /**
+     * It's a common security risk in pages who has the upload dir
+     * under the document root (remember the hack of the Apache web?)
+     *
+     * @var array
+     * @access private
+     * @see HTTP_Upload_File::setValidExtensions()
+     */
+    var $_extensions_check = array('php', 'phtm', 'phtml', 'php3', 'inc');
+
+    /**
+     * @see HTTP_Upload_File::setValidExtensions()
+     * @var string
+     * @access private
+     */
+    var $_extensions_mode  = 'deny';
+
+    /**
+     * Contains the desired chmod for uploaded files
+     * @var int
+     * @access private
+     */
+    var $_chmod = HTTP_UPLOAD_DEFAULT_CHMOD;
+
+    /**
+     * Constructor
+     *
+     * @param   string  $name       destination file name
+     * @param   string  $tmp        temp file name
+     * @param   string  $formname   name of the form
+     * @param   string  $type       Mime type of the file
+     * @param   string  $size       size of the file
+     * @param   string  $error      error on upload
+     * @param   string  $lang       used language for errormessages
+     * @access  public
+     */
+    function HTTP_Upload_File($name = null, $tmp = null,  $formname = null,
+                              $type = null, $size = null, $error = null, 
+                              $lang = null, $chmod = HTTP_UPLOAD_DEFAULT_CHMOD)
+    {
+        $this->HTTP_Upload_Error($lang);
+        $ext = null;
+
+        if (empty($name) || $size == 0) {
+            $error = 'NO_USER_FILE';
+        } elseif ($tmp == 'none') {
+            $error = 'TOO_LARGE';
+        } else {
+            // strpos needed to detect files without extension
+            if (($pos = strrpos($name, '.')) !== false) {
+                $ext = substr($name, $pos + 1);
+            }
+        }
+
+        if (function_exists('version_compare') &&
+            version_compare(phpversion(), '4.1', 'ge')) {
+            if (isset($_POST['MAX_FILE_SIZE']) &&
+                $size > $_POST['MAX_FILE_SIZE']) {
+                $error = 'TOO_LARGE';
+            }
+        } else {
+            global $HTTP_POST_VARS;
+            if (isset($HTTP_POST_VARS['MAX_FILE_SIZE']) &&
+                $size > $HTTP_POST_VARS['MAX_FILE_SIZE']) {
+                $error = 'TOO_LARGE';
+            }
+        }
+
+        $this->upload = array(
+            'real'      => $name,
+            'name'      => $name,
+            'form_name' => $formname,
+            'ext'       => $ext,
+            'tmp_name'  => $tmp,
+            'size'      => $size,
+            'type'      => $type,
+            'error'     => $error
+        );
+
+        $this->_chmod = $chmod;
+    }
+
+    /**
+     * Sets the name of the destination file
+     *
+     * @param string $mode     A valid mode: 'uniq', 'safe' or 'real' or a file name
+     * @param string $prepend  A string to prepend to the name
+     * @param string $append   A string to append to the name
+     *
+     * @return string The modified name of the destination file
+     * @access public
+     */
+    function setName($mode, $prepend = null, $append = null)
+    {
+        switch ($mode) {
+            case 'uniq':
+                $name = $this->nameToUniq();
+                $this->upload['ext'] = $this->nameToSafe($this->upload['ext'], 10);
+                $name .= '.' . $this->upload['ext'];
+                break;
+            case 'safe':
+                $name = $this->nameToSafe($this->upload['real']);
+                if (($pos = strrpos($name, '.')) !== false) {
+                    $this->upload['ext'] = substr($name, $pos + 1);
+                } else {
+                    $this->upload['ext'] = '';
+                }
+                break;
+            case 'real':
+                $name = $this->upload['real'];
+                break;
+            default:
+                $name = $mode;
+        }
+        $this->upload['name'] = $prepend . $name . $append;
+        $this->mode_name_selected = true;
+        return $this->upload['name'];
+    }
+
+    /**
+     * Unique file names in the form: 9022210413b75410c28bef.html
+     * @see HTTP_Upload_File::setName()
+     */
+    function nameToUniq()
+    {
+        if (! $this->_seeded) {
+            srand((double) microtime() * 1000000);
+            $this->_seeded = 1;
+        }
+        $uniq = uniqid(rand());
+        return $uniq;
+    }
+
+    /**
+     * Format a file name to be safe
+     *
+     * @param    string $file   The string file name
+     * @param    int    $maxlen Maximun permited string lenght
+     * @return   string Formatted file name
+     * @see HTTP_Upload_File::setName()
+     */
+    function nameToSafe($name, $maxlen=250)
+    {
+        $noalpha = 'ÁÉÍÓÚÝáéíóúýÂÊÎÔÛâêîôûÀÈÌÒÙàèìòùÄËÏÖÜäëïöüÿÃãÕõÅåÑñÇç@°ºª';
+        $alpha   = 'AEIOUYaeiouyAEIOUaeiouAEIOUaeiouAEIOUaeiouyAaOoAaNnCcaooa';
+
+        $name = substr($name, 0, $maxlen);
+        $name = strtr($name, $noalpha, $alpha);
+        // not permitted chars are replaced with "_"
+        return preg_replace('/[^a-zA-Z0-9,._\+\()\-]/', '_', $name);
+    }
+
+    /**
+     * The upload was valid
+     *
+     * @return bool If the file was submitted correctly
+     * @access public
+     */
+    function isValid()
+    {
+        if ($this->upload['error'] === null) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * User haven't submit a file
+     *
+     * @return bool If the user submitted a file or not
+     * @access public
+     */
+    function isMissing()
+    {
+        if ($this->upload['error'] == 'NO_USER_FILE') {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Some error occured during upload (most common due a file size problem,
+     * like max size exceeded or 0 bytes long).
+     * @return bool If there were errors submitting the file (probably
+     *              because the file excess the max permitted file size)
+     * @access public
+     */
+    function isError()
+    {
+        if (in_array($this->upload['error'], array('TOO_LARGE', 'BAD_FORM','DEV_NO_DEF_FILE'))) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Moves the uploaded file to its destination directory.
+     *
+     * @param    string  $dir_dest  Destination directory
+     * @param    bool    $overwrite Overwrite if destination file exists?
+     * @return   mixed   True on success or Pear_Error object on error
+     * @access public
+     */
+    function moveTo($dir_dest, $overwrite = true)
+    {
+        if (!$this->isValid()) {
+            return $this->raiseError($this->upload['error']);
+        }
+
+        //Valid extensions check
+        if (!$this->_evalValidExtensions()) {
+            return $this->raiseError('NOT_ALLOWED_EXTENSION');
+        }
+
+        $err_code = $this->_chk_dir_dest($dir_dest);
+        if ($err_code !== false) {
+            return $this->raiseError($err_code);
+        }
+        // Use 'safe' mode by default if no other was selected
+        if (!$this->mode_name_selected) {
+            $this->setName('safe');
+        }
+
+        $name_dest = $dir_dest . DIRECTORY_SEPARATOR . $this->upload['name'];
+
+        if (@is_file($name_dest)) {
+            if ($overwrite !== true) {
+                return $this->raiseError('FILE_EXISTS');
+            } elseif (!is_writable($name_dest)) {
+                return $this->raiseError('CANNOT_OVERWRITE');
+            }
+        }
+
+        // copy the file and let php clean the tmp
+        if (!@move_uploaded_file($this->upload['tmp_name'], $name_dest)) {
+            return $this->raiseError('E_FAIL_MOVE');
+        }
+        @chmod($name_dest, $this->_chmod);
+        return $this->getProp('name');
+    }
+
+    /**
+     * Check for a valid destination dir
+     *
+     * @param    string  $dir_dest Destination dir
+     * @return   mixed   False on no errors or error code on error
+     */
+    function _chk_dir_dest($dir_dest)
+    {
+        if (!$dir_dest) {
+            return 'MISSING_DIR';
+        }
+        if (!@is_dir ($dir_dest)) {
+            return 'IS_NOT_DIR';
+        }
+        if (!is_writeable ($dir_dest)) {
+            return 'NO_WRITE_PERMS';
+        }
+        return false;
+    }
+    /**
+     * Retrive properties of the uploaded file
+     * @param string $name   The property name. When null an assoc array with
+     *                       all the properties will be returned
+     * @return mixed         A string or array
+     * @see HTTP_Upload_File::HTTP_Upload_File()
+     * @access public
+     */
+    function getProp($name = null)
+    {
+        if ($name === null) {
+            return $this->upload;
+        }
+        return $this->upload[$name];
+    }
+
+    /**
+     * Returns a error message, if a error occured
+     * (deprecated) Use getMessage() instead
+     * @return string    a Error message
+     * @access public
+     */
+    function errorMsg()
+    {
+        return $this->errorCode($this->upload['error']);
+    }
+
+    /**
+     * Returns a error message, if a error occured
+     * @return string    a Error message
+     * @access public
+     */
+    function getMessage()
+    {
+        return $this->errorCode($this->upload['error']);
+    }
+
+    /**
+     * Function to restrict the valid extensions on file uploads
+     *
+     * @param array $exts File extensions to validate
+     * @param string $mode The type of validation:
+     *                       1) 'deny'   Will deny only the supplied extensions
+     *                       2) 'accept' Will accept only the supplied extensions
+     *                                   as valid
+     * @access public
+     */
+    function setValidExtensions($exts, $mode = 'deny')
+    {
+        $this->_extensions_check = $exts;
+        $this->_extensions_mode  = $mode;
+    }
+
+    /**
+     * Evaluates the validity of the extensions set by setValidExtensions
+     *
+     * @return bool False on non valid extension, true if they are valid
+     * @access private
+     */
+    function _evalValidExtensions()
+    {
+        $exts = $this->_extensions_check;
+        settype($exts, 'array');
+        if ($this->_extensions_mode == 'deny') {
+            if (in_array($this->getProp('ext'), $exts)) {
+                return false;
+            }
+        // mode == 'accept'
+        } else {
+            if (!in_array($this->getProp('ext'), $exts)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
 ?>
 \ No newline at end of file
@@ -17,7 +17,7 @@
 // |          Christian Stocker <chregu@bitflux.ch>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: Server.php,v 1.36 2005/09/24 20:08:57 hholzgra Exp $
+// $Id$
 //
 require_once "HTTP/WebDAV/Tools/_parse_propfind.php";
 require_once "HTTP/WebDAV/Tools/_parse_proppatch.php";
@@ -17,7 +17,7 @@
 // |          Christian Stocker <chregu@bitflux.ch>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: _parse_lockinfo.php,v 1.2 2004/01/05 12:32:40 hholzgra Exp $
+// $Id$
 //
 /**
@@ -17,7 +17,7 @@
 // |          Christian Stocker <chregu@bitflux.ch>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: _parse_propfind.php,v 1.2 2004/01/05 12:33:22 hholzgra Exp $
+// $Id$
 //
 /**
@@ -17,7 +17,7 @@
 // |          Christian Stocker <chregu@bitflux.ch>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: _parse_proppatch.php,v 1.3 2004/01/05 12:41:34 hholzgra Exp $
+// $Id$
 //
 /**
@@ -51,7 +51,7 @@
  * @author      Matt Knapp <mdknapp[at]gmail[dot]com>
  * @author      Brett Stimmerman <brettstimmerman[at]gmail[dot]com>
  * @copyright   2005 Michal Migurski
- * @version     CVS: $Id: JSON.php,v 1.31 2006/06/28 05:54:17 migurski Exp $
+ * @version     CVS: $Id$
  * @license     http://www.opensource.org/licenses/bsd-license.php
  * @link        http://pear.php.net/pepr/pepr-proposal-show.php?id=198
  */
@@ -17,7 +17,7 @@
 // |          Guido Haeger <gh-lists@ecora.de>                            |
 // +----------------------------------------------------------------------+
 //
-// $Id: CheckIP.php,v 1.5 2002/08/17 09:41:24 mj Exp $
+// $Id$
 /**
 * Class to validate the syntax of IPv4 adresses
@@ -18,7 +18,7 @@
  * @author     Joe Stump <joe@joestump.net> 
  * @copyright  1997-2005 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Revision: 1.11 $
+ * @version    CVS: $Revision$
  * @link       http://pear.php.net/package/Net_Curl
  */
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2002 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.02 of the PHP license,      |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Shane Caraveo <shane@caraveo.com>                           |
-// | 		  Ralf Hofmann <ralf.hofmann@verdisoft.com>					  |
-// +----------------------------------------------------------------------+
-//
-// $Id: DIME.php,v 1.5 2002/09/29 01:55:16 shane Exp $
-//
-
-require_once 'PEAR.php';
-/**
- *
- *  DIME Encoding/Decoding
- *
- * What is it?
- *   This class enables you to manipulate and build
- *   a DIME encapsulated message.
- *
- * http://www.ietf.org/internet-drafts/draft-nielsen-dime-02.txt
- *
- * 09/18/02 Ralf -  A huge number of changes to be compliant 
- * 					with the DIME Specification Release 17 June 2002
- * 
- * TODO: lots of stuff needs to be tested.
- *           Definitily have to go through DIME spec and
- *           make things work right, most importantly, sec 3.3
- *           make examples, document
- *
- * see test/dime_mesage_test.php for example of usage
- * 
- * @author  Shane Caraveo <shane@caraveo.com>, 
- *          Ralf Hofmann <ralf.hofmann@verdisoft.com>	 
- * @version $Revision: 1.5 $
- * @package Net_DIME
- */
-define('NET_DIME_TYPE_UNCHANGED',0x00);
-define('NET_DIME_TYPE_MEDIA',0x01);
-define('NET_DIME_TYPE_URI',0x02);
-define('NET_DIME_TYPE_UNKNOWN',0x03);
-define('NET_DIME_TYPE_NONE',0x04);
-
-define('NET_DIME_VERSION',0x0001);
-
-define('NET_DIME_RECORD_HEADER',12);
-
-define('NET_DIME_FLAGS', 0);
-define('NET_DIME_OPTS_LEN', 1);
-define('NET_DIME_ID_LEN', 2);
-define('NET_DIME_TYPE_LEN', 3);
-define('NET_DIME_DATA_LEN', 4);
-define('NET_DIME_OPTS', 5);
-define('NET_DIME_ID', 6);
-define('NET_DIME_TYPE', 7);
-define('NET_DIME_DATA', 8);
-
-class Net_DIME_Record extends PEAR
-{
-    // these are used to hold the padded length
-    var $OPTS_LENGTH = 0;
-    var $ID_LENGTH = 0;
-    var $TYPE_LENGTH = 0; 
-    var $DATA_LENGTH = 0;
-    var $_haveOpts = FALSE;
-    var $_haveID = FALSE;
-    var $_haveType = FALSE;
-    var $_haveData = FALSE;
-    var $debug = FALSE;
-    var $padstr = "\0";
-    /**
-     * Elements
-     * [NET_DIME_FLAGS],    16 bits: VERSION:MB:ME:CF:TYPE_T
-     * [NET_DIME_OPTS_LEN], 16 bits: OPTIONS_LENGTH
-     * [NET_DIME_ID_LEN],   16 bits: ID_LENGTH
-     * [NET_DIME_TYPE_LEN], 16 bits: TYPE_LENGTH
-     * [NET_DIME_DATA_LEN], 32 bits: DATA_LENGTH
-	 * [NET_DIME_OPTS]             : OPTIONS
-	 * [NET_DIME_ID]     		   : ID
-	 * [NET_DIME_TYPE]             : TYPE
-	 * [NET_DIME_DATA]             : DATA
-     */
-    var $Elements = array(NET_DIME_FLAGS => 0,  NET_DIME_OPTS_LEN => 0, 
-	                      NET_DIME_ID_LEN => 0, NET_DIME_TYPE_LEN => 0, 
-     					  NET_DIME_DATA_LEN => 0,
-	 					  NET_DIME_OPTS => '',
-						  NET_DIME_ID => '',
-						  NET_DIME_TYPE => '',
-						  NET_DIME_DATA => '');
-    
-    function Net_DIME_Record($debug = FALSE)
-    {
-        $this->debug = $debug;
-        if ($debug) $this->padstr = '*';
-    }
-
-    function setMB()
-    {
-        $this->Elements[NET_DIME_FLAGS] |= 0x0400;
-    }
-
-    function setME()
-    {
-        $this->Elements[NET_DIME_FLAGS] |= 0x0200;
-    }
-
-    function setCF()
-    {
-        $this->Elements[NET_DIME_FLAGS] |= 0x0100;
-    }
-
-    function isChunk()
-    {
-        return $this->Elements[NET_DIME_FLAGS] & 0x0100;
-    }
-
-    function isEnd()
-    {
-        return $this->Elements[NET_DIME_FLAGS] & 0x0200;
-    }
-    
-    function isStart()
-    {
-        return $this->Elements[NET_DIME_FLAGS] & 0x0400;
-    }
-    
-    function getID()
-    {
-        return $this->Elements[NET_DIME_ID];
-    }
-
-    function getType()
-    {
-        return $this->Elements[NET_DIME_TYPE];
-    }
-
-    function getData()
-    {
-        return $this->Elements[NET_DIME_DATA];
-    }
-    
-    function getDataLength()
-    {
-        return $this->Elements[NET_DIME_DATA_LEN];
-    }
-    
-    function setType($typestring, $type=NET_DIME_TYPE_UNKNOWN)
-    {
-        $typelen = strlen($typestring) & 0xFFFF;
-        $type = $type << 4;
-        $this->Elements[NET_DIME_FLAGS] = ($this->Elements[NET_DIME_FLAGS] & 0xFF0F) | $type;
-        $this->Elements[NET_DIME_TYPE_LEN] = $typelen;
-        $this->TYPE_LENGTH = $this->_getPadLength($typelen);
-        $this->Elements[NET_DIME_TYPE] = $typestring;
-    }
-    
-    function generateID()
-    {
-        $id = md5(time());
-        $this->setID($id);
-        return $id;
-    }
-    
-    function setID($id)
-    {
-        $idlen = strlen($id) & 0xFFFF;
-        $this->Elements[NET_DIME_ID_LEN] = $idlen;
-        $this->ID_LENGTH = $this->_getPadLength($idlen);
-        $this->Elements[NET_DIME_ID] = $id;
-    }
-    
-    function setData($data, $size=0)
-    {
-        $datalen = $size?$size:strlen($data);
-        $this->Elements[NET_DIME_DATA_LEN] = $datalen;
-        $this->DATA_LENGTH = $this->_getPadLength($datalen);
-        $this->Elements[NET_DIME_DATA] = $data;
-    }
-    
-    function encode()
-    {
-		// insert version 
-	    $this->Elements[NET_DIME_FLAGS] = ($this->Elements[NET_DIME_FLAGS] & 0x07FF) | (NET_DIME_VERSION << 11);
-
-        // the real dime encoding
-        $format =   '%c%c%c%c%c%c%c%c%c%c%c%c'.
-                    '%'.$this->OPTS_LENGTH.'s'.
-                    '%'.$this->ID_LENGTH.'s'.
-                    '%'.$this->TYPE_LENGTH.'s'.
-                    '%'.$this->DATA_LENGTH.'s';
-        return sprintf($format,
-	                   ($this->Elements[NET_DIME_FLAGS]&0x0000FF00)>>8,
-    	               ($this->Elements[NET_DIME_FLAGS]&0x000000FF),
-        	           ($this->Elements[NET_DIME_OPTS_LEN]&0x0000FF00)>>8,
-            	       ($this->Elements[NET_DIME_OPTS_LEN]&0x000000FF),
-        	           ($this->Elements[NET_DIME_ID_LEN]&0x0000FF00)>>8,
-            	       ($this->Elements[NET_DIME_ID_LEN]&0x000000FF),
-        	           ($this->Elements[NET_DIME_TYPE_LEN]&0x0000FF00)>>8,
-            	       ($this->Elements[NET_DIME_TYPE_LEN]&0x000000FF),
-                	   ($this->Elements[NET_DIME_DATA_LEN]&0xFF000000)>>24,
-	                   ($this->Elements[NET_DIME_DATA_LEN]&0x00FF0000)>>16,
-    	               ($this->Elements[NET_DIME_DATA_LEN]&0x0000FF00)>>8,
-        	           ($this->Elements[NET_DIME_DATA_LEN]&0x000000FF),
-            	       str_pad($this->Elements[NET_DIME_OPTS], $this->OPTS_LENGTH, $this->padstr),
-            	       str_pad($this->Elements[NET_DIME_ID], $this->ID_LENGTH, $this->padstr),
-                	   str_pad($this->Elements[NET_DIME_TYPE], $this->TYPE_LENGTH, $this->padstr),
-	                   str_pad($this->Elements[NET_DIME_DATA], $this->DATA_LENGTH, $this->padstr));
-    }
-    
-    function _getPadLength($len)
-    {
-        $pad = 0;
-        if ($len) {
-            $pad = $len % 4;
-            if ($pad) $pad = 4 - $pad;
-        }
-        return $len + $pad;
-    }
-    
-    function decode(&$data)
-    {
-        // REAL DIME decoding
-        $this->Elements[NET_DIME_FLAGS]    = (hexdec(bin2hex($data[0]))<<8) + hexdec(bin2hex($data[1]));
-        $this->Elements[NET_DIME_OPTS_LEN] = (hexdec(bin2hex($data[2]))<<8) + hexdec(bin2hex($data[3]));
-        $this->Elements[NET_DIME_ID_LEN]   = (hexdec(bin2hex($data[4]))<<8) + hexdec(bin2hex($data[5]));
-        $this->Elements[NET_DIME_TYPE_LEN] = (hexdec(bin2hex($data[6]))<<8) + hexdec(bin2hex($data[7]));
-        $this->Elements[NET_DIME_DATA_LEN] = (hexdec(bin2hex($data[8]))<<24) +
-		                             (hexdec(bin2hex($data[9]))<<16) +
-                                     (hexdec(bin2hex($data[10]))<<8) +
-                                      hexdec(bin2hex($data[11]));
-        $p = 12;
-		
-		$version = (($this->Elements[NET_DIME_FLAGS]>>11) & 0x001F);
-		
-		if ($version == NET_DIME_VERSION) 
-		{
-	        $this->OPTS_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_OPTS_LEN]);        
-	        $this->ID_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_ID_LEN]);
-	        $this->TYPE_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_TYPE_LEN]);
-	        $this->DATA_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_DATA_LEN]);
-	                
-	        $datalen = strlen($data);
-	        $this->Elements[NET_DIME_OPTS] = substr($data,$p,$this->Elements[NET_DIME_OPTS_LEN]);
-	        $this->_haveOpts = (strlen($this->Elements[NET_DIME_OPTS]) == $this->Elements[NET_DIME_OPTS_LEN]);
-	        if ($this->_haveOpts) {
-	            $p += $this->OPTS_LENGTH;		
-		        $this->Elements[NET_DIME_ID] = substr($data,$p,$this->Elements[NET_DIME_ID_LEN]);
-		        $this->_haveID = (strlen($this->Elements[NET_DIME_ID]) == $this->Elements[NET_DIME_ID_LEN]);
-		        if ($this->_haveID) {
-		            $p += $this->ID_LENGTH;
-		            $this->Elements[NET_DIME_TYPE] = substr($data,$p,$this->Elements[NET_DIME_TYPE_LEN]);
-		            $this->_haveType = (strlen($this->Elements[NET_DIME_TYPE]) == $this->Elements[NET_DIME_TYPE_LEN]);
-		            if ($this->_haveType) {
-		                $p += $this->TYPE_LENGTH;
-		                $this->Elements[NET_DIME_DATA] = substr($data,$p,$this->Elements[NET_DIME_DATA_LEN]);
-		                $this->_haveData = (strlen($this->Elements[NET_DIME_DATA]) == $this->Elements[NET_DIME_DATA_LEN]);
-		                if ($this->_haveData) {
-		                    $p += $this->DATA_LENGTH;
-		                } else {
-		                    $p += strlen($this->Elements[NET_DIME_DATA]);
-		                }
-		            } else {
-		                $p += strlen($this->Elements[NET_DIME_TYPE]);
-					}
-		        } else {
-		            $p += strlen($this->Elements[NET_DIME_ID]);
-				}
-		    } else {
-		    	$p += strlen($this->Elements[NET_DIME_OPTS]);					
-	        }
-		}
-        return substr($data, $p);
-    }
-    
-    function addData(&$data)
-    {
-        $datalen = strlen($data);
-        $p = 0;
-        if (!$this->_haveOpts) {
-            $have = strlen($this->Elements[NET_DIME_OPTS]);
-            $this->Elements[NET_DIME_OPTS] .= substr($data,$p,$this->Elements[NET_DIME_OPTS_LEN]-$have);
-            $this->_haveOpts = (strlen($this->Elements[NET_DIME_OPTS]) == $this->Elements[DIME_OTPS_LEN]);
-            if (!$this->_haveOpts) return NULL;
-            $p += $this->OPTS_LENGTH-$have;
-        }
-        if (!$this->_haveID) {
-            $have = strlen($this->Elements[NET_DIME_ID]);
-            $this->Elements[NET_DIME_ID] .= substr($data,$p,$this->Elements[NET_DIME_ID_LEN]-$have);
-            $this->_haveID = (strlen($this->Elements[NET_DIME_ID]) == $this->Elements[NET_DIME_ID_LEN]);
-            if (!$this->_haveID) return NULL;
-            $p += $this->ID_LENGTH-$have;
-        }
-        if (!$this->_haveType && $p < $datalen) {
-            $have = strlen($this->Elements[NET_DIME_TYPE]);
-            $this->Elements[NET_DIME_TYPE] .= substr($data,$p,$this->Elements[NET_DIME_TYPE_LEN]-$have);
-            $this->_haveType = (strlen($this->Elements[NET_DIME_TYPE]) == $this->Elements[NET_DIME_TYPE_LEN]);
-            if (!$this->_haveType) return NULL;
-            $p += $this->TYPE_LENGTH-$have;
-        }
-        if (!$this->_haveData && $p < $datalen) {
-            $have = strlen($this->Elements[NET_DIME_DATA]);
-            $this->Elements[NET_DIME_DATA] .= substr($data,$p,$this->Elements[NET_DIME_DATA_LEN]-$have);
-            $this->_haveData = (strlen($this->Elements[NET_DIME_DATA]) == $this->Elements[NET_DIME_DATA_LEN]);
-            if (!$this->_haveData) return NULL;
-            $p += $this->DATA_LENGTH-$have;
-        }
-        return substr($data,$p);
-    }   
-}
-
-
-class Net_DIME_Message extends PEAR
-{
-
-    var $record_size = 4096;
-    #var $records =array();
-    var $parts = array();
-    var $currentPart = -1;
-    var $stream = NULL;
-    var $_currentRecord;
-    var $_proc = array();
-    var $type;
-    var $typestr;
-    var $mb = 1;
-    var $me = 0;
-    var $cf = 0;
-    var $id = NULL;
-    var $debug = FALSE;
-    /**
-     * constructor
-     *
-     * this currently takes a file pointer as provided
-     * by fopen
-     *
-     * TODO: integrate with the php streams stuff
-     */
-    function Net_DIME_Message($stream=NULL, $record_size = 4096, $debug = FALSE)
-    {
-        $this->stream = $stream;
-        $this->record_size = $record_size;
-        $this->debug = $debug;
-    }
-    
-    function _makeRecord(&$data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
-    {
-        $record = new Net_DIME_Record($this->debug);
-        if ($this->mb) {
-            $record->setMB();
-            // all subsequent records are not message begin!
-            $this->mb = 0; 
-        }
-        if ($this->me) $record->setME();
-        if ($this->cf) $record->setCF();
-        $record->setData($data);
-        $record->setType($typestr,$type);
-        if ($id) $record->setID($id);
-        #if ($this->debug) {
-        #    print str_replace('\0','*',$record->encode());
-        #}
-        return $record->encode();
-    }
-    
-    function startChunk(&$data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
-    {
-        $this->me = 0;
-        $this->cf = 1;
-        $this->type = $type;
-        $this->typestr = $typestr;
-        if ($id) {
-            $this->id = $id;
-        } else {
-            $this->id = md5(time());
-        }
-        return $this->_makeRecord($data, $this->typestr, $this->id, $this->type);
-    }
-
-    function doChunk(&$data)
-    {
-        $this->me = 0;
-        $this->cf = 1;
-        return $this->_makeRecord($data, NULL, NULL, NET_DIME_TYPE_UNCHANGED);
-    }
-
-    function endChunk()
-    {
-        $this->cf = 0;
-        $data = NULL;
-        $rec = $this->_makeRecord($data, NULL, NULL, NET_DIME_TYPE_UNCHANGED);
-        $this->id = 0;
-        $this->cf = 0;
-        $this->id = 0;
-        $this->type = NET_DIME_TYPE_UNKNOWN;
-        $this->typestr = NULL;
-        return $rec;
-    }
-    
-    function endMessage()
-    {
-        $this->me = 1;
-        $data = NULL;
-        $rec = $this->_makeRecord($data, NULL, NULL, NET_DIME_TYPE_NONE);
-        $this->me = 0;
-        $this->mb = 1;
-        $this->id = 0;
-        return $rec;
-    }
-    
-    /**
-     * sendRecord
-     *
-     * given a chunk of data, it creates DIME records
-     * and writes them to the stream
-     *
-     */
-    function sendData(&$data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
-    {
-        $len = strlen($data);
-        if ($len > $this->record_size) {
-            $chunk = substr($data, 0, $this->record_size);
-            $p = $this->record_size;
-            $rec = $this->startChunk($chunk,$typestr,$id,$type);
-            fwrite($this->stream, $rec);
-            while ($p < $len) {
-                $chunk = substr($data, $p, $this->record_size);
-                $p += $this->record_size;
-                $rec = $this->doChunk($chunk);
-                fwrite($this->stream, $rec);
-            }
-            $rec = $this->endChunk();
-            fwrite($this->stream, $rec);
-            return;
-        }
-        $rec = $this->_makeRecord($data, $typestr,$id,$type);
-        fwrite($this->stream, $rec);
-    }
-    
-    function sendEndMessage()
-    {
-        $rec = $this->endMessage();
-        fwrite($this->stream, $rec);
-    }
-    
-    /**
-     * sendFile
-     *
-     * given a filename, it reads the file,
-     * creates records and writes them to the stream
-     *
-     */
-    function sendFile($filename, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
-    {
-        $f = fopen($filename, "rb");
-        if ($f) {
-            if ($data = fread($f, $this->record_size)) {
-                $this->startChunk($data,$typestr,$id,$type);
-            }
-            while ($data = fread($f, $this->record_size)) {
-                $this->doChunk($data,$typestr,$id,$type);
-            }
-            $this->endChunk();
-            fclose($f);
-        }
-    }
-
-    /**
-     * encodeData
-     *
-     * given data, encode it in DIME
-     *
-     */
-    function encodeData($data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
-    {
-        $len = strlen($data);
-        $resp = '';
-        if ($len > $this->record_size) {
-            $chunk = substr($data, 0, $this->record_size);
-            $p = $this->record_size;
-            $resp .= $this->startChunk($chunk,$typestr,$id,$type);
-            while ($p < $len) {
-                $chunk = substr($data, $p, $this->record_size);
-                $p += $this->record_size;
-                $resp .= $this->doChunk($chunk);
-            }
-            $resp .= $this->endChunk();
-        } else {
-            $resp .= $this->_makeRecord($data, $typestr,$id,$type);
-        }
-        return $resp;
-    }
-
-    /**
-     * sendFile
-     *
-     * given a filename, it reads the file,
-     * creates records and writes them to the stream
-     *
-     */
-    function encodeFile($filename, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
-    {
-        $f = fopen($filename, "rb");
-        if ($f) {
-            if ($data = fread($f, $this->record_size)) {
-                $resp = $this->startChunk($data,$typestr,$id,$type);
-            }
-            while ($data = fread($f, $this->record_size)) {
-                $resp = $this->doChunk($data,$typestr,$id,$type);
-            }
-            $resp = $this->endChunk();
-            fclose($f);
-        }
-        return $resp;
-    }
-    
-    /**
-     * _processData
-     *
-     * creates Net_DIME_Records from provided data
-     *
-     */
-    function _processData(&$data)
-    {
-        $leftover = NULL;
-        if (!$this->_currentRecord) {
-            $this->_currentRecord = new Net_DIME_Record($this->debug);
-            $data = $this->_currentRecord->decode($data);
-        } else {
-            $data = $this->_currentRecord->addData($data);
-        }
-				
-        if ($this->_currentRecord->_haveData) {
-            if (count($this->parts)==0 && !$this->_currentRecord->isStart()) {
-                // raise an error!
-                return PEAR::raiseError('First Message is not a DIME begin record!');
-            }
-
-            if ($this->_currentRecord->isEnd() && $this->_currentRecord->getDataLength()==0) {
-                return NULL;
-            }
-            
-            if ($this->currentPart < 0 && !$this->_currentRecord->isChunk()) {
-                $this->parts[] = array();
-                $this->currentPart = count($this->parts)-1;
-                $this->parts[$this->currentPart]['id']   = $this->_currentRecord->getID();
-                $this->parts[$this->currentPart]['type'] = $this->_currentRecord->getType();
-                $this->parts[$this->currentPart]['data'] = $this->_currentRecord->getData();
-                $this->currentPart = -1;
-            } else {
-                if ($this->currentPart < 0) {
-                    $this->parts[] = array();
-                    $this->currentPart = count($this->parts)-1;
-                    $this->parts[$this->currentPart]['id']   = $this->_currentRecord->getID();
-                    $this->parts[$this->currentPart]['type'] = $this->_currentRecord->getType();
-                    $this->parts[$this->currentPart]['data'] = $this->_currentRecord->getData();
-                } else {
-                    $this->parts[$this->currentPart]['data'] .= $this->_currentRecord->getData();
-                    if (!$this->_currentRecord->isChunk()) {
-                        // we reached the end of the chunk
-                        $this->currentPart = -1;
-                    }
-                }
-            }
-            #$this->records[] = $this->_currentRecord;
-            if (!$this->_currentRecord->isEnd()) $this->_currentRecord = NULL;
-        }
-        return NULL;
-    }
-    
-    /**
-     * decodeData
-     *
-     * decodes a DIME encrypted string of data
-     *
-     */
-    function decodeData(&$data) {
-        while (strlen($data) >= NET_DIME_RECORD_HEADER) {
-            $err = $this->_processData($data);
-            if (PEAR::isError($err)) {
-                return $err;
-            }
-        }
-    }
-    
-    /**
-     * read
-     *
-     * reads the stream and creates
-     * an array of records
-     *
-     * it can accept the start of a previously read buffer
-     * this is usefull in situations where you need to read
-     * headers before discovering that the data is DIME encoded
-     * such as in the case of reading an HTTP response.
-     */
-    function read($buf=NULL)
-    {
-        while ($data = fread($this->stream, 8192)) {
-            if ($buf) {
-                $data = $buf.$data;
-                $buf = NULL;
-            }
-            if ($this->debug)
-                echo "read: ".strlen($data)." bytes\n";
-            $err = $this->decodeData($data);
-            if (PEAR::isError($err)) {
-                return $err;
-            }
-            
-            // store any leftover data to be used again
-            // should be < NET_DIME_RECORD_HEADER bytes
-            $buf = $data;
-        }
-        if (!$this->_currentRecord || !$this->_currentRecord->isEnd()) {
-            return PEAR::raiseError('reached stream end without end record');
-        }
-        return NULL;
-    }
-}
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2002 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.02 of the PHP license,      |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Shane Caraveo <shane@caraveo.com>                           |
+// | 		  Ralf Hofmann <ralf.hofmann@verdisoft.com>					  |
+// +----------------------------------------------------------------------+
+//
+// $Id$
+//
+
+require_once 'PEAR.php';
+/**
+ *
+ *  DIME Encoding/Decoding
+ *
+ * What is it?
+ *   This class enables you to manipulate and build
+ *   a DIME encapsulated message.
+ *
+ * http://www.ietf.org/internet-drafts/draft-nielsen-dime-02.txt
+ *
+ * 09/18/02 Ralf -  A huge number of changes to be compliant 
+ * 					with the DIME Specification Release 17 June 2002
+ * 
+ * TODO: lots of stuff needs to be tested.
+ *           Definitily have to go through DIME spec and
+ *           make things work right, most importantly, sec 3.3
+ *           make examples, document
+ *
+ * see test/dime_mesage_test.php for example of usage
+ * 
+ * @author  Shane Caraveo <shane@caraveo.com>, 
+ *          Ralf Hofmann <ralf.hofmann@verdisoft.com>	 
+ * @version $Revision$
+ * @package Net_DIME
+ */
+define('NET_DIME_TYPE_UNCHANGED',0x00);
+define('NET_DIME_TYPE_MEDIA',0x01);
+define('NET_DIME_TYPE_URI',0x02);
+define('NET_DIME_TYPE_UNKNOWN',0x03);
+define('NET_DIME_TYPE_NONE',0x04);
+
+define('NET_DIME_VERSION',0x0001);
+
+define('NET_DIME_RECORD_HEADER',12);
+
+define('NET_DIME_FLAGS', 0);
+define('NET_DIME_OPTS_LEN', 1);
+define('NET_DIME_ID_LEN', 2);
+define('NET_DIME_TYPE_LEN', 3);
+define('NET_DIME_DATA_LEN', 4);
+define('NET_DIME_OPTS', 5);
+define('NET_DIME_ID', 6);
+define('NET_DIME_TYPE', 7);
+define('NET_DIME_DATA', 8);
+
+class Net_DIME_Record extends PEAR
+{
+    // these are used to hold the padded length
+    var $OPTS_LENGTH = 0;
+    var $ID_LENGTH = 0;
+    var $TYPE_LENGTH = 0; 
+    var $DATA_LENGTH = 0;
+    var $_haveOpts = FALSE;
+    var $_haveID = FALSE;
+    var $_haveType = FALSE;
+    var $_haveData = FALSE;
+    var $debug = FALSE;
+    var $padstr = "\0";
+    /**
+     * Elements
+     * [NET_DIME_FLAGS],    16 bits: VERSION:MB:ME:CF:TYPE_T
+     * [NET_DIME_OPTS_LEN], 16 bits: OPTIONS_LENGTH
+     * [NET_DIME_ID_LEN],   16 bits: ID_LENGTH
+     * [NET_DIME_TYPE_LEN], 16 bits: TYPE_LENGTH
+     * [NET_DIME_DATA_LEN], 32 bits: DATA_LENGTH
+	 * [NET_DIME_OPTS]             : OPTIONS
+	 * [NET_DIME_ID]     		   : ID
+	 * [NET_DIME_TYPE]             : TYPE
+	 * [NET_DIME_DATA]             : DATA
+     */
+    var $Elements = array(NET_DIME_FLAGS => 0,  NET_DIME_OPTS_LEN => 0, 
+	                      NET_DIME_ID_LEN => 0, NET_DIME_TYPE_LEN => 0, 
+     					  NET_DIME_DATA_LEN => 0,
+	 					  NET_DIME_OPTS => '',
+						  NET_DIME_ID => '',
+						  NET_DIME_TYPE => '',
+						  NET_DIME_DATA => '');
+    
+    function Net_DIME_Record($debug = FALSE)
+    {
+        $this->debug = $debug;
+        if ($debug) $this->padstr = '*';
+    }
+
+    function setMB()
+    {
+        $this->Elements[NET_DIME_FLAGS] |= 0x0400;
+    }
+
+    function setME()
+    {
+        $this->Elements[NET_DIME_FLAGS] |= 0x0200;
+    }
+
+    function setCF()
+    {
+        $this->Elements[NET_DIME_FLAGS] |= 0x0100;
+    }
+
+    function isChunk()
+    {
+        return $this->Elements[NET_DIME_FLAGS] & 0x0100;
+    }
+
+    function isEnd()
+    {
+        return $this->Elements[NET_DIME_FLAGS] & 0x0200;
+    }
+    
+    function isStart()
+    {
+        return $this->Elements[NET_DIME_FLAGS] & 0x0400;
+    }
+    
+    function getID()
+    {
+        return $this->Elements[NET_DIME_ID];
+    }
+
+    function getType()
+    {
+        return $this->Elements[NET_DIME_TYPE];
+    }
+
+    function getData()
+    {
+        return $this->Elements[NET_DIME_DATA];
+    }
+    
+    function getDataLength()
+    {
+        return $this->Elements[NET_DIME_DATA_LEN];
+    }
+    
+    function setType($typestring, $type=NET_DIME_TYPE_UNKNOWN)
+    {
+        $typelen = strlen($typestring) & 0xFFFF;
+        $type = $type << 4;
+        $this->Elements[NET_DIME_FLAGS] = ($this->Elements[NET_DIME_FLAGS] & 0xFF0F) | $type;
+        $this->Elements[NET_DIME_TYPE_LEN] = $typelen;
+        $this->TYPE_LENGTH = $this->_getPadLength($typelen);
+        $this->Elements[NET_DIME_TYPE] = $typestring;
+    }
+    
+    function generateID()
+    {
+        $id = md5(time());
+        $this->setID($id);
+        return $id;
+    }
+    
+    function setID($id)
+    {
+        $idlen = strlen($id) & 0xFFFF;
+        $this->Elements[NET_DIME_ID_LEN] = $idlen;
+        $this->ID_LENGTH = $this->_getPadLength($idlen);
+        $this->Elements[NET_DIME_ID] = $id;
+    }
+    
+    function setData($data, $size=0)
+    {
+        $datalen = $size?$size:strlen($data);
+        $this->Elements[NET_DIME_DATA_LEN] = $datalen;
+        $this->DATA_LENGTH = $this->_getPadLength($datalen);
+        $this->Elements[NET_DIME_DATA] = $data;
+    }
+    
+    function encode()
+    {
+		// insert version 
+	    $this->Elements[NET_DIME_FLAGS] = ($this->Elements[NET_DIME_FLAGS] & 0x07FF) | (NET_DIME_VERSION << 11);
+
+        // the real dime encoding
+        $format =   '%c%c%c%c%c%c%c%c%c%c%c%c'.
+                    '%'.$this->OPTS_LENGTH.'s'.
+                    '%'.$this->ID_LENGTH.'s'.
+                    '%'.$this->TYPE_LENGTH.'s'.
+                    '%'.$this->DATA_LENGTH.'s';
+        return sprintf($format,
+	                   ($this->Elements[NET_DIME_FLAGS]&0x0000FF00)>>8,
+    	               ($this->Elements[NET_DIME_FLAGS]&0x000000FF),
+        	           ($this->Elements[NET_DIME_OPTS_LEN]&0x0000FF00)>>8,
+            	       ($this->Elements[NET_DIME_OPTS_LEN]&0x000000FF),
+        	           ($this->Elements[NET_DIME_ID_LEN]&0x0000FF00)>>8,
+            	       ($this->Elements[NET_DIME_ID_LEN]&0x000000FF),
+        	           ($this->Elements[NET_DIME_TYPE_LEN]&0x0000FF00)>>8,
+            	       ($this->Elements[NET_DIME_TYPE_LEN]&0x000000FF),
+                	   ($this->Elements[NET_DIME_DATA_LEN]&0xFF000000)>>24,
+	                   ($this->Elements[NET_DIME_DATA_LEN]&0x00FF0000)>>16,
+    	               ($this->Elements[NET_DIME_DATA_LEN]&0x0000FF00)>>8,
+        	           ($this->Elements[NET_DIME_DATA_LEN]&0x000000FF),
+            	       str_pad($this->Elements[NET_DIME_OPTS], $this->OPTS_LENGTH, $this->padstr),
+            	       str_pad($this->Elements[NET_DIME_ID], $this->ID_LENGTH, $this->padstr),
+                	   str_pad($this->Elements[NET_DIME_TYPE], $this->TYPE_LENGTH, $this->padstr),
+	                   str_pad($this->Elements[NET_DIME_DATA], $this->DATA_LENGTH, $this->padstr));
+    }
+    
+    function _getPadLength($len)
+    {
+        $pad = 0;
+        if ($len) {
+            $pad = $len % 4;
+            if ($pad) $pad = 4 - $pad;
+        }
+        return $len + $pad;
+    }
+    
+    function decode(&$data)
+    {
+        // REAL DIME decoding
+        $this->Elements[NET_DIME_FLAGS]    = (hexdec(bin2hex($data[0]))<<8) + hexdec(bin2hex($data[1]));
+        $this->Elements[NET_DIME_OPTS_LEN] = (hexdec(bin2hex($data[2]))<<8) + hexdec(bin2hex($data[3]));
+        $this->Elements[NET_DIME_ID_LEN]   = (hexdec(bin2hex($data[4]))<<8) + hexdec(bin2hex($data[5]));
+        $this->Elements[NET_DIME_TYPE_LEN] = (hexdec(bin2hex($data[6]))<<8) + hexdec(bin2hex($data[7]));
+        $this->Elements[NET_DIME_DATA_LEN] = (hexdec(bin2hex($data[8]))<<24) +
+		                             (hexdec(bin2hex($data[9]))<<16) +
+                                     (hexdec(bin2hex($data[10]))<<8) +
+                                      hexdec(bin2hex($data[11]));
+        $p = 12;
+		
+		$version = (($this->Elements[NET_DIME_FLAGS]>>11) & 0x001F);
+		
+		if ($version == NET_DIME_VERSION) 
+		{
+	        $this->OPTS_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_OPTS_LEN]);        
+	        $this->ID_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_ID_LEN]);
+	        $this->TYPE_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_TYPE_LEN]);
+	        $this->DATA_LENGTH = $this->_getPadLength($this->Elements[NET_DIME_DATA_LEN]);
+	                
+	        $datalen = strlen($data);
+	        $this->Elements[NET_DIME_OPTS] = substr($data,$p,$this->Elements[NET_DIME_OPTS_LEN]);
+	        $this->_haveOpts = (strlen($this->Elements[NET_DIME_OPTS]) == $this->Elements[NET_DIME_OPTS_LEN]);
+	        if ($this->_haveOpts) {
+	            $p += $this->OPTS_LENGTH;		
+		        $this->Elements[NET_DIME_ID] = substr($data,$p,$this->Elements[NET_DIME_ID_LEN]);
+		        $this->_haveID = (strlen($this->Elements[NET_DIME_ID]) == $this->Elements[NET_DIME_ID_LEN]);
+		        if ($this->_haveID) {
+		            $p += $this->ID_LENGTH;
+		            $this->Elements[NET_DIME_TYPE] = substr($data,$p,$this->Elements[NET_DIME_TYPE_LEN]);
+		            $this->_haveType = (strlen($this->Elements[NET_DIME_TYPE]) == $this->Elements[NET_DIME_TYPE_LEN]);
+		            if ($this->_haveType) {
+		                $p += $this->TYPE_LENGTH;
+		                $this->Elements[NET_DIME_DATA] = substr($data,$p,$this->Elements[NET_DIME_DATA_LEN]);
+		                $this->_haveData = (strlen($this->Elements[NET_DIME_DATA]) == $this->Elements[NET_DIME_DATA_LEN]);
+		                if ($this->_haveData) {
+		                    $p += $this->DATA_LENGTH;
+		                } else {
+		                    $p += strlen($this->Elements[NET_DIME_DATA]);
+		                }
+		            } else {
+		                $p += strlen($this->Elements[NET_DIME_TYPE]);
+					}
+		        } else {
+		            $p += strlen($this->Elements[NET_DIME_ID]);
+				}
+		    } else {
+		    	$p += strlen($this->Elements[NET_DIME_OPTS]);					
+	        }
+		}
+        return substr($data, $p);
+    }
+    
+    function addData(&$data)
+    {
+        $datalen = strlen($data);
+        $p = 0;
+        if (!$this->_haveOpts) {
+            $have = strlen($this->Elements[NET_DIME_OPTS]);
+            $this->Elements[NET_DIME_OPTS] .= substr($data,$p,$this->Elements[NET_DIME_OPTS_LEN]-$have);
+            $this->_haveOpts = (strlen($this->Elements[NET_DIME_OPTS]) == $this->Elements[DIME_OTPS_LEN]);
+            if (!$this->_haveOpts) return NULL;
+            $p += $this->OPTS_LENGTH-$have;
+        }
+        if (!$this->_haveID) {
+            $have = strlen($this->Elements[NET_DIME_ID]);
+            $this->Elements[NET_DIME_ID] .= substr($data,$p,$this->Elements[NET_DIME_ID_LEN]-$have);
+            $this->_haveID = (strlen($this->Elements[NET_DIME_ID]) == $this->Elements[NET_DIME_ID_LEN]);
+            if (!$this->_haveID) return NULL;
+            $p += $this->ID_LENGTH-$have;
+        }
+        if (!$this->_haveType && $p < $datalen) {
+            $have = strlen($this->Elements[NET_DIME_TYPE]);
+            $this->Elements[NET_DIME_TYPE] .= substr($data,$p,$this->Elements[NET_DIME_TYPE_LEN]-$have);
+            $this->_haveType = (strlen($this->Elements[NET_DIME_TYPE]) == $this->Elements[NET_DIME_TYPE_LEN]);
+            if (!$this->_haveType) return NULL;
+            $p += $this->TYPE_LENGTH-$have;
+        }
+        if (!$this->_haveData && $p < $datalen) {
+            $have = strlen($this->Elements[NET_DIME_DATA]);
+            $this->Elements[NET_DIME_DATA] .= substr($data,$p,$this->Elements[NET_DIME_DATA_LEN]-$have);
+            $this->_haveData = (strlen($this->Elements[NET_DIME_DATA]) == $this->Elements[NET_DIME_DATA_LEN]);
+            if (!$this->_haveData) return NULL;
+            $p += $this->DATA_LENGTH-$have;
+        }
+        return substr($data,$p);
+    }   
+}
+
+
+class Net_DIME_Message extends PEAR
+{
+
+    var $record_size = 4096;
+    #var $records =array();
+    var $parts = array();
+    var $currentPart = -1;
+    var $stream = NULL;
+    var $_currentRecord;
+    var $_proc = array();
+    var $type;
+    var $typestr;
+    var $mb = 1;
+    var $me = 0;
+    var $cf = 0;
+    var $id = NULL;
+    var $debug = FALSE;
+    /**
+     * constructor
+     *
+     * this currently takes a file pointer as provided
+     * by fopen
+     *
+     * TODO: integrate with the php streams stuff
+     */
+    function Net_DIME_Message($stream=NULL, $record_size = 4096, $debug = FALSE)
+    {
+        $this->stream = $stream;
+        $this->record_size = $record_size;
+        $this->debug = $debug;
+    }
+    
+    function _makeRecord(&$data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
+    {
+        $record = new Net_DIME_Record($this->debug);
+        if ($this->mb) {
+            $record->setMB();
+            // all subsequent records are not message begin!
+            $this->mb = 0; 
+        }
+        if ($this->me) $record->setME();
+        if ($this->cf) $record->setCF();
+        $record->setData($data);
+        $record->setType($typestr,$type);
+        if ($id) $record->setID($id);
+        #if ($this->debug) {
+        #    print str_replace('\0','*',$record->encode());
+        #}
+        return $record->encode();
+    }
+    
+    function startChunk(&$data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
+    {
+        $this->me = 0;
+        $this->cf = 1;
+        $this->type = $type;
+        $this->typestr = $typestr;
+        if ($id) {
+            $this->id = $id;
+        } else {
+            $this->id = md5(time());
+        }
+        return $this->_makeRecord($data, $this->typestr, $this->id, $this->type);
+    }
+
+    function doChunk(&$data)
+    {
+        $this->me = 0;
+        $this->cf = 1;
+        return $this->_makeRecord($data, NULL, NULL, NET_DIME_TYPE_UNCHANGED);
+    }
+
+    function endChunk()
+    {
+        $this->cf = 0;
+        $data = NULL;
+        $rec = $this->_makeRecord($data, NULL, NULL, NET_DIME_TYPE_UNCHANGED);
+        $this->id = 0;
+        $this->cf = 0;
+        $this->id = 0;
+        $this->type = NET_DIME_TYPE_UNKNOWN;
+        $this->typestr = NULL;
+        return $rec;
+    }
+    
+    function endMessage()
+    {
+        $this->me = 1;
+        $data = NULL;
+        $rec = $this->_makeRecord($data, NULL, NULL, NET_DIME_TYPE_NONE);
+        $this->me = 0;
+        $this->mb = 1;
+        $this->id = 0;
+        return $rec;
+    }
+    
+    /**
+     * sendRecord
+     *
+     * given a chunk of data, it creates DIME records
+     * and writes them to the stream
+     *
+     */
+    function sendData(&$data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
+    {
+        $len = strlen($data);
+        if ($len > $this->record_size) {
+            $chunk = substr($data, 0, $this->record_size);
+            $p = $this->record_size;
+            $rec = $this->startChunk($chunk,$typestr,$id,$type);
+            fwrite($this->stream, $rec);
+            while ($p < $len) {
+                $chunk = substr($data, $p, $this->record_size);
+                $p += $this->record_size;
+                $rec = $this->doChunk($chunk);
+                fwrite($this->stream, $rec);
+            }
+            $rec = $this->endChunk();
+            fwrite($this->stream, $rec);
+            return;
+        }
+        $rec = $this->_makeRecord($data, $typestr,$id,$type);
+        fwrite($this->stream, $rec);
+    }
+    
+    function sendEndMessage()
+    {
+        $rec = $this->endMessage();
+        fwrite($this->stream, $rec);
+    }
+    
+    /**
+     * sendFile
+     *
+     * given a filename, it reads the file,
+     * creates records and writes them to the stream
+     *
+     */
+    function sendFile($filename, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
+    {
+        $f = fopen($filename, "rb");
+        if ($f) {
+            if ($data = fread($f, $this->record_size)) {
+                $this->startChunk($data,$typestr,$id,$type);
+            }
+            while ($data = fread($f, $this->record_size)) {
+                $this->doChunk($data,$typestr,$id,$type);
+            }
+            $this->endChunk();
+            fclose($f);
+        }
+    }
+
+    /**
+     * encodeData
+     *
+     * given data, encode it in DIME
+     *
+     */
+    function encodeData($data, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
+    {
+        $len = strlen($data);
+        $resp = '';
+        if ($len > $this->record_size) {
+            $chunk = substr($data, 0, $this->record_size);
+            $p = $this->record_size;
+            $resp .= $this->startChunk($chunk,$typestr,$id,$type);
+            while ($p < $len) {
+                $chunk = substr($data, $p, $this->record_size);
+                $p += $this->record_size;
+                $resp .= $this->doChunk($chunk);
+            }
+            $resp .= $this->endChunk();
+        } else {
+            $resp .= $this->_makeRecord($data, $typestr,$id,$type);
+        }
+        return $resp;
+    }
+
+    /**
+     * sendFile
+     *
+     * given a filename, it reads the file,
+     * creates records and writes them to the stream
+     *
+     */
+    function encodeFile($filename, $typestr='', $id=NULL, $type=NET_DIME_TYPE_UNKNOWN)
+    {
+        $f = fopen($filename, "rb");
+        if ($f) {
+            if ($data = fread($f, $this->record_size)) {
+                $resp = $this->startChunk($data,$typestr,$id,$type);
+            }
+            while ($data = fread($f, $this->record_size)) {
+                $resp = $this->doChunk($data,$typestr,$id,$type);
+            }
+            $resp = $this->endChunk();
+            fclose($f);
+        }
+        return $resp;
+    }
+    
+    /**
+     * _processData
+     *
+     * creates Net_DIME_Records from provided data
+     *
+     */
+    function _processData(&$data)
+    {
+        $leftover = NULL;
+        if (!$this->_currentRecord) {
+            $this->_currentRecord = new Net_DIME_Record($this->debug);
+            $data = $this->_currentRecord->decode($data);
+        } else {
+            $data = $this->_currentRecord->addData($data);
+        }
+				
+        if ($this->_currentRecord->_haveData) {
+            if (count($this->parts)==0 && !$this->_currentRecord->isStart()) {
+                // raise an error!
+                return PEAR::raiseError('First Message is not a DIME begin record!');
+            }
+
+            if ($this->_currentRecord->isEnd() && $this->_currentRecord->getDataLength()==0) {
+                return NULL;
+            }
+            
+            if ($this->currentPart < 0 && !$this->_currentRecord->isChunk()) {
+                $this->parts[] = array();
+                $this->currentPart = count($this->parts)-1;
+                $this->parts[$this->currentPart]['id']   = $this->_currentRecord->getID();
+                $this->parts[$this->currentPart]['type'] = $this->_currentRecord->getType();
+                $this->parts[$this->currentPart]['data'] = $this->_currentRecord->getData();
+                $this->currentPart = -1;
+            } else {
+                if ($this->currentPart < 0) {
+                    $this->parts[] = array();
+                    $this->currentPart = count($this->parts)-1;
+                    $this->parts[$this->currentPart]['id']   = $this->_currentRecord->getID();
+                    $this->parts[$this->currentPart]['type'] = $this->_currentRecord->getType();
+                    $this->parts[$this->currentPart]['data'] = $this->_currentRecord->getData();
+                } else {
+                    $this->parts[$this->currentPart]['data'] .= $this->_currentRecord->getData();
+                    if (!$this->_currentRecord->isChunk()) {
+                        // we reached the end of the chunk
+                        $this->currentPart = -1;
+                    }
+                }
+            }
+            #$this->records[] = $this->_currentRecord;
+            if (!$this->_currentRecord->isEnd()) $this->_currentRecord = NULL;
+        }
+        return NULL;
+    }
+    
+    /**
+     * decodeData
+     *
+     * decodes a DIME encrypted string of data
+     *
+     */
+    function decodeData(&$data) {
+        while (strlen($data) >= NET_DIME_RECORD_HEADER) {
+            $err = $this->_processData($data);
+            if (PEAR::isError($err)) {
+                return $err;
+            }
+        }
+    }
+    
+    /**
+     * read
+     *
+     * reads the stream and creates
+     * an array of records
+     *
+     * it can accept the start of a previously read buffer
+     * this is usefull in situations where you need to read
+     * headers before discovering that the data is DIME encoded
+     * such as in the case of reading an HTTP response.
+     */
+    function read($buf=NULL)
+    {
+        while ($data = fread($this->stream, 8192)) {
+            if ($buf) {
+                $data = $buf.$data;
+                $buf = NULL;
+            }
+            if ($this->debug)
+                echo "read: ".strlen($data)." bytes\n";
+            $err = $this->decodeData($data);
+            if (PEAR::isError($err)) {
+                return $err;
+            }
+            
+            // store any leftover data to be used again
+            // should be < NET_DIME_RECORD_HEADER bytes
+            $buf = $data;
+        }
+        if (!$this->_currentRecord || !$this->_currentRecord->isEnd()) {
+            return PEAR::raiseError('reached stream end without end record');
+        }
+        return NULL;
+    }
+}
 ?>
 \ No newline at end of file
@@ -20,7 +20,7 @@
 // | Authors: Chandrashekhar Bhosle <cnb@php.net>                         |
 // +----------------------------------------------------------------------+
 //
-// $Id: Dict.php,v 1.3 2002/10/06 04:55:33 cnb Exp $
+// $Id$
 // }}}
 // {{{ includes
@@ -16,7 +16,7 @@
 // | Author: Colin Viebrock <colin@easyDNS.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: Dig.php,v 1.1 2002/04/25 14:57:23 cmv Exp $
+// $Id$
 //
 // A nice friendly OO interface to dig
 //
@@ -16,7 +16,7 @@
 // | Authors: Sebastian Nohn <sebastian@nohn.net>                         |
 // +----------------------------------------------------------------------+
 //
-// $Id: Finger.php,v 1.5 2003/01/04 11:55:46 mj Exp $
+// $Id$
 //
 require_once 'PEAR.php';
@@ -27,7 +27,7 @@ require_once &#39;Net/Socket.php&#39;;
  *
  * Provides functions useful for Finger-Queries.
  *
- * @version $Revision: 1.5 $
+ * @version $Revision$
  * @author Sebastian Nohn <sebastian@nohn.net>
  * @package Net
  */
@@ -17,7 +17,7 @@
 // |                                                                      |
 // +----------------------------------------------------------------------+
 //
-// $Id: Geo.php,v 1.7 2004/02/18 22:59:20 lsmith Exp $
+// $Id$
 require_once 'PEAR.php';
 require_once 'Cache/Function.php';
@@ -17,7 +17,7 @@
 * @author     Florian Anderiasch <fa@php.net>
 * @copyright  1997-2005 The PHP Group
 * @license    http://www.php.net/license/3_01.txt  PHP License 3.01
-* @version    CVS: $Id: IPv4.php,v 1.11 2005/11/29 12:56:35 fa Exp $
+* @version    CVS: $Id$
 * @link       http://pear.php.net/package/Net_IPv4
 */
-<?php
-//
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997-2003 The PHP Group                                |
-// +----------------------------------------------------------------------+
-// | This source file is subject to version 2.0 of the PHP license,       |
-// | that is bundled with this package in the file LICENSE, and is        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Authors: Alexander Merz <alexander.merz@web.de>				  |
-// +----------------------------------------------------------------------+
-//
-// $Id: IPv6.php,v 1.12 2005/09/01 12:42:00 alexmerz Exp $
-
-/**
-* Class to validate and to work with IPv6
-*
-* @author  Alexander Merz <alexander.merz@t-online.de>
-* @author elfrink at introweb dot nl
-* @package Net_IPv6
-* @version $Id: IPv6.php,v 1.12 2005/09/01 12:42:00 alexmerz Exp $
-* @access  public
-*/
-class Net_IPv6 {
-
-    // {{{ Uncompress()
-
-    /**
-     * Uncompresses an IPv6 adress
-     *
-     * RFC 2373 allows you to compress zeros in an adress to '::'. This
-     * function expects an valid IPv6 adress and expands the '::' to
-     * the required zeros.
-     *
-     * Example:  FF01::101	->  FF01:0:0:0:0:0:0:101
-     *           ::1        ->  0:0:0:0:0:0:0:1
-     *
-     * @access public
-     * @see Compress()
-     * @static
-     * @param string $ip	a valid IPv6-adress (hex format)
-     * @return string	the uncompressed IPv6-adress (hex format)
-	 */
-    function Uncompress($ip) {
-        $uip = $ip;
-        $c1 = -1;
-        $c2 = -1;
-        if (false !== strpos($ip, '::') ) {
-            list($ip1, $ip2) = explode('::', $ip);
-            if(""==$ip1) {
-                $c1 = -1;
-            } else {
-               	$pos = 0;
-                if(0 < ($pos = substr_count($ip1, ':'))) {
-                    $c1 = $pos;
-                } else {
-                    $c1 = 0;
-                }
-            }
-            if(""==$ip2) {
-                $c2 = -1;
-            } else {
-                $pos = 0;
-                if(0 < ($pos = substr_count($ip2, ':'))) {
-                    $c2 = $pos;
-                } else {
-                    $c2 = 0;
-                }
-            }
-            if(strstr($ip2, '.')) {
-                $c2++;
-            }
-            if(-1 == $c1 && -1 == $c2) { // ::
-                $uip = "0:0:0:0:0:0:0:0";
-            } else if(-1==$c1) {              // ::xxx
-                $fill = str_repeat('0:', 7-$c2);
-                $uip =  str_replace('::', $fill, $uip);
-            } else if(-1==$c2) {              // xxx::
-                $fill = str_repeat(':0', 7-$c1);
-                $uip =  str_replace('::', $fill, $uip);
-            } else {                          // xxx::xxx
-                $fill = str_repeat(':0:', 6-$c2-$c1);
-                $uip =  str_replace('::', $fill, $uip);
-                $uip =  str_replace('::', ':', $uip);
-            }
-        }
-        return $uip;
-    }
-
-    // }}}
-    // {{{ Compress()
-
-    /**
-     * Compresses an IPv6 adress
-     *
-     * RFC 2373 allows you to compress zeros in an adress to '::'. This
-     * function expects an valid IPv6 adress and compresses successive zeros
-     * to '::'
-     *
-     * Example:  FF01:0:0:0:0:0:0:101 	-> FF01::101
-     *           0:0:0:0:0:0:0:1        -> ::1
-     *
-     * @access public
-     * @see Uncompress()
-     * @static
-     * @param string $ip	a valid IPv6-adress (hex format)     
-     * @return string	the compressed IPv6-adress (hex format)
-     * @author elfrink at introweb dot nl
-     */
-    function Compress($ip)	{
-        $cip = $ip;
-
-        if (!strstr($ip, '::')) {
-             $ipp = explode(':',$ip);
-             for($i=0; $i<count($ipp); $i++) {
-                 $ipp[$i] = dechex(hexdec($ipp[$i]));
-             }
-            $cip = ':' . join(':',$ipp) . ':';
-			preg_match_all("/(:0)+/", $cip, $zeros);
-    		if (count($zeros[0])>0) {
-				$match = '';
-				foreach($zeros[0] as $zero) {
-    				if (strlen($zero) > strlen($match))
-						$match = $zero;
-				}
-				$cip = preg_replace('/' . $match . '/', ':', $cip, 1);
-			}
-			$cip = preg_replace('/((^:)|(:$))/', '' ,$cip);
-            $cip = preg_replace('/((^:)|(:$))/', '::' ,$cip);
-         }
-         return $cip;
-    }
-
-    // }}}
-    // {{{ SplitV64()
-
-    /**
-     * Splits an IPv6 adress into the IPv6 and a possible IPv4 part
-     *
-     * RFC 2373 allows you to note the last two parts of an IPv6 adress as
-     * an IPv4 compatible adress
-     *
-     * Example:  0:0:0:0:0:0:13.1.68.3
-     *           0:0:0:0:0:FFFF:129.144.52.38
-     *
-     * @access public
-     * @static
-     * @param string $ip	a valid IPv6-adress (hex format)
-     * @return array		[0] contains the IPv6 part, [1] the IPv4 part (hex format)
-     */
-    function SplitV64($ip) {
-        $ip = Net_IPv6::Uncompress($ip);
-        if (strstr($ip, '.')) {
-            $pos = strrpos($ip, ':');
-            $ip{$pos} = '_';
-            $ipPart = explode('_', $ip);
-            return $ipPart;
-        } else {
-            return array($ip, "");
-        }
-    }
-
-    // }}}
-    // {{{ checkIPv6
-
-    /**
-     * Checks an IPv6 adress
-     *
-     * Checks if the given IP is IPv6-compatible
-     *
-     * @access public
-     * @static
-     * @param string $ip	a valid IPv6-adress
-     * @return boolean	true if $ip is an IPv6 adress
-     */
-    function checkIPv6($ip) {
-
-        $ipPart = Net_IPv6::SplitV64($ip);
-        $count = 0;
-        if (!empty($ipPart[0])) {
-            $ipv6 =explode(':', $ipPart[0]);
-            for ($i = 0; $i < count($ipv6); $i++) {
-                $dec = hexdec($ipv6[$i]);
-                $hex = strtoupper(preg_replace("/^[0]{1,3}(.*[0-9a-fA-F])$/", "\\1", $ipv6[$i]));
-                if ($ipv6[$i] >= 0 && $dec <= 65535 && $hex == strtoupper(dechex($dec))) {
-                    $count++;
-                }
-            }
-            if (8 == $count) {
-                return true;
-            } elseif (6 == $count and !empty($ipPart[1])) {
-                $ipv4 = explode('.',$ipPart[1]);
-                $count = 0;
-                for ($i = 0; $i < count($ipv4); $i++) {
-                    if ($ipv4[$i] >= 0 && (integer)$ipv4[$i] <= 255 && preg_match("/^\d{1,3}$/", $ipv4[$i])) {
-                        $count++;
-                    }
-                }
-                if (4 == $count) {
-                    return true;
-                }
-            } else {
-                return false;
-            }
-
-        } else {
-            return false;
-        }
-    }
-    // }}}
-}
-?>
+<?php
+//
+// +----------------------------------------------------------------------+
+// | PHP Version 4                                                        |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1997-2003 The PHP Group                                |
+// +----------------------------------------------------------------------+
+// | This source file is subject to version 2.0 of the PHP license,       |
+// | that is bundled with this package in the file LICENSE, and is        |
+// | available at through the world-wide-web at                           |
+// | http://www.php.net/license/2_02.txt.                                 |
+// | If you did not receive a copy of the PHP license and are unable to   |
+// | obtain it through the world-wide-web, please send a note to          |
+// | license@php.net so we can mail you a copy immediately.               |
+// +----------------------------------------------------------------------+
+// | Authors: Alexander Merz <alexander.merz@web.de>				  |
+// +----------------------------------------------------------------------+
+//
+// $Id$
+
+/**
+* Class to validate and to work with IPv6
+*
+* @author  Alexander Merz <alexander.merz@t-online.de>
+* @author elfrink at introweb dot nl
+* @package Net_IPv6
+* @version $Id$
+* @access  public
+*/
+class Net_IPv6 {
+
+    // {{{ Uncompress()
+
+    /**
+     * Uncompresses an IPv6 adress
+     *
+     * RFC 2373 allows you to compress zeros in an adress to '::'. This
+     * function expects an valid IPv6 adress and expands the '::' to
+     * the required zeros.
+     *
+     * Example:  FF01::101	->  FF01:0:0:0:0:0:0:101
+     *           ::1        ->  0:0:0:0:0:0:0:1
+     *
+     * @access public
+     * @see Compress()
+     * @static
+     * @param string $ip	a valid IPv6-adress (hex format)
+     * @return string	the uncompressed IPv6-adress (hex format)
+	 */
+    function Uncompress($ip) {
+        $uip = $ip;
+        $c1 = -1;
+        $c2 = -1;
+        if (false !== strpos($ip, '::') ) {
+            list($ip1, $ip2) = explode('::', $ip);
+            if(""==$ip1) {
+                $c1 = -1;
+            } else {
+               	$pos = 0;
+                if(0 < ($pos = substr_count($ip1, ':'))) {
+                    $c1 = $pos;
+                } else {
+                    $c1 = 0;
+                }
+            }
+            if(""==$ip2) {
+                $c2 = -1;
+            } else {
+                $pos = 0;
+                if(0 < ($pos = substr_count($ip2, ':'))) {
+                    $c2 = $pos;
+                } else {
+                    $c2 = 0;
+                }
+            }
+            if(strstr($ip2, '.')) {
+                $c2++;
+            }
+            if(-1 == $c1 && -1 == $c2) { // ::
+                $uip = "0:0:0:0:0:0:0:0";
+            } else if(-1==$c1) {              // ::xxx
+                $fill = str_repeat('0:', 7-$c2);
+                $uip =  str_replace('::', $fill, $uip);
+            } else if(-1==$c2) {              // xxx::
+                $fill = str_repeat(':0', 7-$c1);
+                $uip =  str_replace('::', $fill, $uip);
+            } else {                          // xxx::xxx
+                $fill = str_repeat(':0:', 6-$c2-$c1);
+                $uip =  str_replace('::', $fill, $uip);
+                $uip =  str_replace('::', ':', $uip);
+            }
+        }
+        return $uip;
+    }
+
+    // }}}
+    // {{{ Compress()
+
+    /**
+     * Compresses an IPv6 adress
+     *
+     * RFC 2373 allows you to compress zeros in an adress to '::'. This
+     * function expects an valid IPv6 adress and compresses successive zeros
+     * to '::'
+     *
+     * Example:  FF01:0:0:0:0:0:0:101 	-> FF01::101
+     *           0:0:0:0:0:0:0:1        -> ::1
+     *
+     * @access public
+     * @see Uncompress()
+     * @static
+     * @param string $ip	a valid IPv6-adress (hex format)     
+     * @return string	the compressed IPv6-adress (hex format)
+     * @author elfrink at introweb dot nl
+     */
+    function Compress($ip)	{
+        $cip = $ip;
+
+        if (!strstr($ip, '::')) {
+             $ipp = explode(':',$ip);
+             for($i=0; $i<count($ipp); $i++) {
+                 $ipp[$i] = dechex(hexdec($ipp[$i]));
+             }
+            $cip = ':' . join(':',$ipp) . ':';
+			preg_match_all("/(:0)+/", $cip, $zeros);
+    		if (count($zeros[0])>0) {
+				$match = '';
+				foreach($zeros[0] as $zero) {
+    				if (strlen($zero) > strlen($match))
+						$match = $zero;
+				}
+				$cip = preg_replace('/' . $match . '/', ':', $cip, 1);
+			}
+			$cip = preg_replace('/((^:)|(:$))/', '' ,$cip);
+            $cip = preg_replace('/((^:)|(:$))/', '::' ,$cip);
+         }
+         return $cip;
+    }
+
+    // }}}
+    // {{{ SplitV64()
+
+    /**
+     * Splits an IPv6 adress into the IPv6 and a possible IPv4 part
+     *
+     * RFC 2373 allows you to note the last two parts of an IPv6 adress as
+     * an IPv4 compatible adress
+     *
+     * Example:  0:0:0:0:0:0:13.1.68.3
+     *           0:0:0:0:0:FFFF:129.144.52.38
+     *
+     * @access public
+     * @static
+     * @param string $ip	a valid IPv6-adress (hex format)
+     * @return array		[0] contains the IPv6 part, [1] the IPv4 part (hex format)
+     */
+    function SplitV64($ip) {
+        $ip = Net_IPv6::Uncompress($ip);
+        if (strstr($ip, '.')) {
+            $pos = strrpos($ip, ':');
+            $ip{$pos} = '_';
+            $ipPart = explode('_', $ip);
+            return $ipPart;
+        } else {
+            return array($ip, "");
+        }
+    }
+
+    // }}}
+    // {{{ checkIPv6
+
+    /**
+     * Checks an IPv6 adress
+     *
+     * Checks if the given IP is IPv6-compatible
+     *
+     * @access public
+     * @static
+     * @param string $ip	a valid IPv6-adress
+     * @return boolean	true if $ip is an IPv6 adress
+     */
+    function checkIPv6($ip) {
+
+        $ipPart = Net_IPv6::SplitV64($ip);
+        $count = 0;
+        if (!empty($ipPart[0])) {
+            $ipv6 =explode(':', $ipPart[0]);
+            for ($i = 0; $i < count($ipv6); $i++) {
+                $dec = hexdec($ipv6[$i]);
+                $hex = strtoupper(preg_replace("/^[0]{1,3}(.*[0-9a-fA-F])$/", "\\1", $ipv6[$i]));
+                if ($ipv6[$i] >= 0 && $dec <= 65535 && $hex == strtoupper(dechex($dec))) {
+                    $count++;
+                }
+            }
+            if (8 == $count) {
+                return true;
+            } elseif (6 == $count and !empty($ipPart[1])) {
+                $ipv4 = explode('.',$ipPart[1]);
+                $count = 0;
+                for ($i = 0; $i < count($ipv4); $i++) {
+                    if ($ipv4[$i] >= 0 && (integer)$ipv4[$i] <= 255 && preg_match("/^\d{1,3}$/", $ipv4[$i])) {
+                        $count++;
+                    }
+                }
+                if (4 == $count) {
+                    return true;
+                }
+            } else {
+                return false;
+            }
+
+        } else {
+            return false;
+        }
+    }
+    // }}}
+}
+?>
@@ -18,7 +18,7 @@
 // | Original author: Gavin Brown <gavin.brown@uk.com>                    |
 // +----------------------------------------------------------------------+
 //
-// $Id: Ident.php,v 1.7 2005/03/07 11:23:26 nepto Exp $
+// $Id$
 //
 // Identification Protocol implementation
 //
@@ -33,7 +33,7 @@
 // | Co-Author: Damian Fernandez Sosa <damlists@cnba.uba.ar>               |
 // +-----------------------------------------------------------------------+
 //
-// $Id: POP3.php,v 1.2 2004/12/05 16:34:39 damian Exp $
+// $Id$
 require_once('Net/Socket.php');
@@ -19,7 +19,7 @@
 // |          Kai Schröder <k.schroeder@php.net>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: Ping.php,v 1.36 2004/02/08 23:17:22 jan Exp $
+// $Id$
 require_once "PEAR.php";
 require_once "OS/Guess.php";
@@ -65,7 +65,7 @@ define(&#39;NET_PING_RESULT_UNSUPPORTED_BACKEND&#39;, 4);
 * ?>
 *
 * @author   Jan Lehnardt <jan@php.net>
-* @version  $Revision: 1.36 $
+* @version  $Revision$
 * @package  Net
 * @access   public
 */
@@ -524,7 +524,7 @@ class Net_Ping
 * Container class for Net_Ping results
 *
 * @author   Jan Lehnardt <jan@php.net>
-* @version  $Revision: 1.36 $
+* @version  $Revision$
 * @package  Net
 * @access   private
 */
@@ -18,7 +18,7 @@
 // |          Damian Alejandro Fernandez Sosa <damlists@cnba.uba.ar>      |
 // +----------------------------------------------------------------------+
 //
-// $Id: SMTP.php,v 1.54 2005/08/16 03:44:15 jon Exp $
+// $Id$
 require_once 'PEAR.php';
 require_once 'Net/Socket.php';
 <?php
 /**
- * $Id: SmartIRC.php,v 1.54.2.14 2005/05/27 23:40:09 meebey Exp $
- * $Revision: 1.54.2.14 $
- * $Author: meebey $
- * $Date: 2005/05/27 23:40:09 $
+ * $Id$
+ * $Revision$
+ * $Author$
+ * $Date$
  *
  * Net_SmartIRC
  * This is a PHP class for communication with IRC networks,
@@ -46,7 +46,7 @@
 include_once('SmartIRC/defines.php');
 include_once('SmartIRC/irccommands.php');
 include_once('SmartIRC/messagehandler.php');
-define('SMARTIRC_VERSION', '1.0.0 ($Revision: 1.54.2.14 $)');
+define('SMARTIRC_VERSION', '1.0.0 ($Revision$)');
 define('SMARTIRC_VERSIONSTRING', 'Net_SmartIRC '.SMARTIRC_VERSION);
 /**
@@ -17,7 +17,7 @@
 // |          Chuck Hagenbuch <chuck@horde.org>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: Socket.php,v 1.24 2005/02/03 20:40:16 chagenbu Exp $
+// $Id$
 require_once 'PEAR.php';
@@ -18,7 +18,7 @@
 // | Author: Seamus Venasse <seamus.venasse@polaris.ca>                   |
 // +----------------------------------------------------------------------+
 //
-// $Id: Whois.php,v 1.11 2003/01/04 11:55:54 mj Exp $
+// $Id$
 //
 // Whois Class
 //
@@ -17,7 +17,7 @@
 // | Authors: Dietrich Ayala <dietrich@ganx4.com> Original Author         |
 // +----------------------------------------------------------------------+
 //
-// $Id: hexBinary.php,v 1.6 2005/03/10 23:16:39 yunosh Exp $
+// $Id$
 //
 class SOAP_Type_hexBinary
 {
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: com_client.php,v 1.3 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 // SOAPStruct is defined in the following file
 require_once 'example_types.php';
@@ -16,7 +16,7 @@
 // | Author: Dmitri Vinogradov <dimitri@vinogradov.de>                    |
 // +----------------------------------------------------------------------+
 //
-// $Id: disco_server.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 /*
   This example shows how to mark up a server object so that
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>   Port to PEAR and more   |
 // +----------------------------------------------------------------------+
 //
-// $Id: email_client.php,v 1.4 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 /*
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>   Port to PEAR and more   |
 // +----------------------------------------------------------------------+
 //
-// $Id: email_gateway.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 /*
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>   Port to PEAR and more   |
 // +----------------------------------------------------------------------+
 //
-// $Id: email_pop_gateway.php,v 1.6 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 /* include the Email server class, which knows how to
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>   Port to PEAR and more   |
 // +----------------------------------------------------------------------+
 //
-// $Id: email_pop_server.php,v 1.6 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 /* include the Email server class, which knows how to
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>   Port to PEAR and more   |
 // +----------------------------------------------------------------------+
 //
-// $Id: email_server.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 /*
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: example_server.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 // first, include the SOAP/Server class
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: server.php,v 1.10 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 // first, include the SOAP/Server class
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: server2.php,v 1.3 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 // first, include the SOAP/Server class
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: smtp.php,v 1.5 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 // include soap client class
 include("SOAP/Client.php");
@@ -18,7 +18,7 @@
 // | Authors: Dietrich Ayala <dietrich@ganx4.com> Original Author         |
 // +----------------------------------------------------------------------+
 //
-// $Id: stockquote.php,v 1.7 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 // include soap client class
 include("SOAP/Client.php");
@@ -16,7 +16,7 @@
 // | Authors: Shane Hanna <iordy_at_iordy_dot_com>                        |
 // +----------------------------------------------------------------------+
 //
-// $Id: tcp_client.php,v 1.3 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 require_once('SOAP/Client.php');
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: tcp_server.php,v 1.4 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 // first, include the SOAP/Server class
@@ -16,7 +16,7 @@
 // | Authors: Shane Caraveo <Shane@Caraveo.com>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: wsdl_client.php,v 1.3 2005/03/10 23:16:40 yunosh Exp $
+// $Id$
 //
 include("SOAP/Client.php");
@@ -16,7 +16,7 @@
 // | Authors: Tomas V.V.Cox <cox@idecnet.com>                             |
 // +----------------------------------------------------------------------+
 //
-// $Id: System.php,v 1.36 2004/06/15 16:33:46 pajoye Exp $
+// $Id$
 //
 require_once 'PEAR.php';
@@ -48,7 +48,7 @@ $GLOBALS[&#39;_System_temp_files&#39;] = array();
 *
 * @package  System
 * @author   Tomas V.V.Cox <cox@idecnet.com>
-* @version  $Revision: 1.36 $
+* @version  $Revision$
 * @access   public
 * @see      http://pear.php.net/manual/
 */
@@ -3,7 +3,7 @@
      *	base include file for SimpleTest
      *	@package	SimpleTest
      *	@subpackage	UnitTester
-     *	@version	$Id: exceptions.php,v 1.12 2006/11/09 23:14:48 lastcraft Exp $
+     *	@version	$Id$
      */
     /**#@+
-		  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
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
+		  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
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
 That's all there is to it!
 \ No newline at end of file
-Animation Release Notes
-
-*** version 0.12.0 ***
-
-* added boolean finish argument to Anim.stop()
-
-*** version 0.11.3 ***
-
-* no changes
-
-*** version 0.11.1 ***
-
-* changed "prototype" shorthand to "proto" (workaround firefox < 1.5 scoping
-bug)
-
-*** version 0.11.0 ***
-
-* ColorAnim subclass added
-* Motion and Scroll now inherit from ColorAnim
-* getDefaultUnit method added
-* defaultUnit and defaultUnits deprecated
-* getDefault and setDefault methods deprecated
-
-*** version 0.10.0 ***
-
-* Scroll now handles relative ("by") animation correctly
-
-* Now converts "auto" values of "from" to appropriate initial values
-
-*** version 0.9.0 ***
-
-* Initial release
-
-
+Animation Release Notes
+
+*** version 0.12.0 ***
+
+* added boolean finish argument to Anim.stop()
+
+*** version 0.11.3 ***
+
+* no changes
+
+*** version 0.11.1 ***
+
+* changed "prototype" shorthand to "proto" (workaround firefox < 1.5 scoping
+bug)
+
+*** version 0.11.0 ***
+
+* ColorAnim subclass added
+* Motion and Scroll now inherit from ColorAnim
+* getDefaultUnit method added
+* defaultUnit and defaultUnits deprecated
+* getDefault and setDefault methods deprecated
+
+*** version 0.10.0 ***
+
+* Scroll now handles relative ("by") animation correctly
+
+* Now converts "auto" values of "from" to appropriate initial values
+
+*** version 0.9.0 ***
+
+* Initial release
+
+