From: Michael J. Rubinsky Date: Sun, 15 Aug 2010 19:35:18 +0000 (-0400) Subject: Fix various issues with package.xml parsing X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=890fb2cab418a76e1722a789b9a924c4e3c1cd5b;p=horde.git Fix various issues with package.xml parsing --- diff --git a/framework/Cli/package.xml b/framework/Cli/package.xml index 0574bca4a..97894fc50 100644 --- a/framework/Cli/package.xml +++ b/framework/Cli/package.xml @@ -1,13 +1,9 @@ - + Cli pear.horde.org Horde Command Line Interface API - Horde_Cli:: API for basic command-line functionality/checks - + Horde_Cli:: API for basic command-line functionality/checks Chuck Hagenbuch chuck @@ -20,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> jan@horde.org yes - 2009-06-10 + 2010-08-15 + 0.2.0 0.2.0 @@ -30,11 +27,12 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Horde_CLI:: -> Horde_Cli:: + +* Horde_CLI:: -> Horde_Cli:: * Initial Horde 4 package. - + @@ -57,33 +55,35 @@ http://pear.php.net/dtd/package-2.0.xsd"> 1.5.4 - - gettext - Support pear.horde.org + + gettext + - + + - 2006-12-31 - 0.1.0 - 0.1.0 + 0.0.1 + 0.0.1 alpha alpha + 2003-07-04 LGPL - Add 'default' parameter to Horde_CLI::prompt(). + +Initial release as a PEAR package @@ -97,21 +97,39 @@ http://pear.php.net/dtd/package-2.0.xsd"> 2006-05-08 LGPL - Converted to package.xml 2.0 for pear.horde.org + +Converted to package.xml 2.0 for pear.horde.org + 2006-12-31 - 0.0.1 - 0.0.1 + 0.1.0 + 0.1.0 alpha alpha - 2003-07-04 LGPL - Initial release as a PEAR package + +Add 'default' parameter to Horde_CLI::prompt(). + + + + + 0.2.0 + 0.2.0 + + + beta + beta + + 2010-08-15 + LGPL + +* Horde_CLI:: -> Horde_Cli:: + * Initial Horde 4 package. diff --git a/framework/Group/package.xml b/framework/Group/package.xml index faa8e20bd..98271381d 100644 --- a/framework/Group/package.xml +++ b/framework/Group/package.xml @@ -1,13 +1,9 @@ - + Group pear.horde.org Horde User Groups System - Package for managing and accessing the Horde groups system. - + Package for managing and accessing the Horde groups system. Chuck Hagenbuch chuck @@ -20,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> jan@horde.org yes - 2010-06-01 + 2010-08-15 + 0.2.0 0.2.0 @@ -30,11 +27,12 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Throw exceptions, not PEAR_Errors. + +* Throw exceptions, not PEAR_Errors. * Initial Horde 4 release. - + @@ -50,10 +48,10 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + - - + + @@ -65,7 +63,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> 1.7.0 - Core + Core pear.horde.org @@ -76,11 +74,11 @@ http://pear.php.net/dtd/package-2.0.xsd"> Exception pear.horde.org - Util pear.horde.org + Auth @@ -98,23 +96,55 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - - - - - - - + + + + + + + + + + + + + + + 0.0.1 + 0.0.1 + + + alpha + alpha + + 2003-07-05 + LGPL + +Initial release as a PEAR package + + + + + 0.0.2 + 0.0.2 + + + alpha + alpha + + 2006-05-08 + + LGPL + +* Added ldap driver. +* Converted to package.xml 2.0 for pear.horde.org. + + + 2008-09-16 0.1.0 @@ -125,7 +155,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Added a mock driver for installations that don't need groups (Request #6157). + +* Added a mock driver for installations that don't need groups (Request #6157). * Added a beta SQL Group driver (Request #6175). * Removed unused renameGroup() function. * Fixed loading subclasses before unserializing session objects (Bug #4650) @@ -143,32 +174,18 @@ http://pear.php.net/dtd/package-2.0.xsd"> - 0.0.2 - 0.0.2 - - - alpha - alpha - - 2006-05-08 - - LGPL - * Added ldap driver. -* Converted to package.xml 2.0 for pear.horde.org. - - - - - 0.0.1 - 0.0.1 + 0.2.0 + 0.2.0 - alpha - alpha + beta + beta - 2003-07-05 + 2010-08-15 LGPL - Initial release as a PEAR package + +* Throw exceptions, not PEAR_Errors. + * Initial Horde 4 release. diff --git a/framework/Icalendar/test/Horde/Icalendar/patch.txt b/framework/Icalendar/test/Horde/Icalendar/patch.txt new file mode 100644 index 000000000..722f4c0c7 --- /dev/null +++ b/framework/Icalendar/test/Horde/Icalendar/patch.txt @@ -0,0 +1,58 @@ +diff --git a/framework/Icalendar/lib/Horde/Icalendar.php b/framework/Icalendar/lib/Horde/Icalendar.php +index 8ee462f..a92b436 100644 +--- a/framework/Icalendar/lib/Horde/Icalendar.php ++++ b/framework/Icalendar/lib/Horde/Icalendar.php +@@ -1282,31 +1282,21 @@ class Horde_Icalendar + * @todo A bunch of code calls this function outside this class, so it + * needs to be marked public for now. + * +- * @param $value TODO ++ * @param integer|object|array $value The time value to export (either a ++ * Horde_Date, array, or timestamp). + * +- * @return TODO ++ * @return string The string representation of the datetime value. + */ + public function _exportDateTime($value) + { + $temp = array(); +- if (!is_object($value) && !is_array($value)) { +- $tz = date('O', $value); +- $TZOffset = (3600 * substr($tz, 0, 3)) + (60 * substr(date('O', $value), 3, 2)); +- $value -= $TZOffset; +- +- $temp['zone'] = 'UTC'; +- $temp['year'] = date('Y', $value); +- $temp['month'] = date('n', $value); +- $temp['mday'] = date('j', $value); +- $temp['hour'] = date('G', $value); +- $temp['minute'] = date('i', $value); +- $temp['second'] = date('s', $value); +- } else { +- $dateOb = new Horde_Date($value); +- return $this->_exportDateTime($dateOb->timestamp()); +- } +- +- return $this->_exportDate($temp) . 'T' . $this->_exportTime($temp); ++ $date = new Horde_Date($value); ++ $date->setTimezone('UTC'); ++ $time = array('hour' => $date->hour, ++ 'minute' => $date->min, ++ 'second' => $date->sec, ++ 'zone' => 'UTC'); ++ return $this->_exportDate($date) . 'T' . $this->_exportTime($time); + } + + /** +@@ -1333,9 +1323,9 @@ class Horde_Icalendar + /** + * Exports a Time field. + * +- * @param $value TODO ++ * @param array $value An array of time parts. + * +- * @return TODO ++ * @return string hhmmss[Z] representation of the time + */ + protected function _exportTime($value) + { diff --git a/framework/Kolab_Format/package.xml b/framework/Kolab_Format/package.xml index 8eb7617b4..f3fc615e4 100644 --- a/framework/Kolab_Format/package.xml +++ b/framework/Kolab_Format/package.xml @@ -1,5 +1,5 @@ - + Kolab_Format pear.horde.org A package for reading/writing Kolab data formats @@ -29,8 +29,8 @@ jan@horde.org yes - 2010-06-23 - + 2010-08-15 + 1.0.2 1.0.0 @@ -93,25 +93,31 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - + + @@ -163,23 +169,25 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -315,10 +323,11 @@ stable stable - 2010-06-23 + 2010-08-15 LGPL -* Remove dependency on the Kolab package within the task handler. +* Removed dependency on Horde_Exception. +* Removed dependency on the Kolab package within the task handler. * Converted to Horde4/PHP5 * Removed Horde_DOM dependency. diff --git a/framework/Kolab_Resource/package.xml b/framework/Kolab_Resource/package.xml index a2e6e0c88..a38c2a861 100644 --- a/framework/Kolab_Resource/package.xml +++ b/framework/Kolab_Resource/package.xml @@ -1,5 +1,5 @@ - + Kolab_Resource pear.horde.org Resource management for the Kolab server @@ -22,8 +22,8 @@ jan@horde.org yes - 2010-07-15 - + 2010-08-15 + 0.1.0 0.1.0 @@ -63,8 +63,6 @@ - - @@ -127,8 +125,6 @@ - - @@ -144,7 +140,7 @@ alpha alpha - 2010-07-14 + 2010-08-15 LGPL * Extracted package from Kolab_Filter. diff --git a/framework/Text_Filter/package.xml b/framework/Text_Filter/package.xml index 62a4fd8d8..a1f1e07ea 100644 --- a/framework/Text_Filter/package.xml +++ b/framework/Text_Filter/package.xml @@ -1,14 +1,10 @@ - + Text_Filter pear.horde.org Horde Text Filter API The Horde_Text_Filter:: class provides common methods for - fitering and converting text. - + fitering and converting text. Chuck Hagenbuch chuck @@ -27,7 +23,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> slusarz@horde.org yes - 2009-06-10 + 2010-08-15 + 0.1.0 0.1.0 @@ -37,12 +34,13 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * XSS filter now uses PHP DOM parser to process incoming text. + +* XSS filter now uses PHP DOM parser to process incoming text. * Remove Horde/Core dependency. * Add Horde_Text_Filter_Exception::. * Html2text converter now uses XML parser to generate output. * Add ability to define filters to use with preg_replace_callback(). - * Add 'noprefetch' parameter to XSS filter (Ticket #8836). + * Add 'noprefetch' parameter to XSS filter (Ticket #8836). * Add XSS filtering for data URLs in A HREF parameters (Bug #8715). * Add support for Google Closure Compiler in javascript minfiy filter. * Fix dimming signatures when mixed with quoted text (Bug #4299). @@ -51,11 +49,14 @@ http://pear.php.net/dtd/package-2.0.xsd"> * Initial Horde 4 package. - + + + + @@ -68,9 +69,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - @@ -89,13 +87,13 @@ http://pear.php.net/dtd/package-2.0.xsd"> - + + - @@ -134,30 +132,55 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0.0.1 + 0.0.1 + + + alpha + alpha + + 2004-10-12 + LGPL + +Initial release as a PEAR package + + + 2006-05-08 @@ -169,26 +192,39 @@ http://pear.php.net/dtd/package-2.0.xsd"> alpha LGPL - * Don't strip BASE tags when 'strip_styles' is false. + +* Don't strip BASE tags when 'strip_styles' is false. * Added ability to link <test@example.com> e-mail addresses in plain text. * Removed dependency on external javascript file when toggling quoted lines. * Converted to package.xml 2.0 for pear.horde.org - * Allow the bad words filter to leave the first character of a matching word and replace the rest with '*' (duck@obala.net). + * Allow the bad words filter to leave the first character of a matching word and replace the rest with '*' (duck@obala.net). * Improved efficiency of the linkurls filter when searching long lines - 0.0.1 - 0.0.1 + 0.1.0 + 0.1.0 - alpha - alpha + beta + beta - 2004-10-12 + 2010-08-15 LGPL - Initial release as a PEAR package + +* XSS filter now uses PHP DOM parser to process incoming text. + * Remove Horde/Core dependency. + * Add Horde_Text_Filter_Exception::. + * Html2text converter now uses XML parser to generate output. + * Add ability to define filters to use with preg_replace_callback(). + * Add 'noprefetch' parameter to XSS filter (Ticket #8836). + * Add XSS filtering for data URLs in A HREF parameters (Bug #8715). + * Add support for Google Closure Compiler in javascript minfiy filter. + * Fix dimming signatures when mixed with quoted text (Bug #4299). + * Added javscript minify filter. + * Add support for using the tidy extension when filtering HTML data. + * Initial Horde 4 package. diff --git a/framework/Util/package.xml b/framework/Util/package.xml index 3b2ff07d0..e56a3c7f5 100644 --- a/framework/Util/package.xml +++ b/framework/Util/package.xml @@ -1,8 +1,5 @@ - + Util pear.horde.org Horde Utility Libraries @@ -19,7 +16,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> jan@horde.org yes - 2009-06-09 + 2010-08-15 + 0.2.0 0.2.0 @@ -29,7 +27,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Removed Horde_Util::assertDriverConfig(). + +* Removed Horde_Util::assertDriverConfig(). * Removed Horde_Util::bufferOutput(). * Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode(). * Removed Horde_Util::strftime2date() and Horde_Util::date2strftime(). @@ -40,7 +39,7 @@ http://pear.php.net/dtd/package-2.0.xsd"> * Initial Horde 4 package. - + @@ -57,15 +56,11 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - - - - - - - + + + + + @@ -85,6 +80,10 @@ http://pear.php.net/dtd/package-2.0.xsd"> + + Imap_Client + pear.horde.org + iconv @@ -94,24 +93,55 @@ http://pear.php.net/dtd/package-2.0.xsd"> xml - - Imap_Client - pear.horde.org - - - - - - + + + + + + + + + + + 0.0.1 + 0.0.1 + + + alpha + alpha + + 2003-10-28 + LGPL + +Initial release as a PEAR package + + + + + 0.0.2 + 0.0.2 + + + alpha + alpha + + 2006-05-08 + LGPL + +Converted to package.xml 2.0 for pear.horde.org + + + + 0.1.0 0.1.0 @@ -121,7 +151,8 @@ http://pear.php.net/dtd/package-2.0.xsd"> beta LGPL - * Added magic PHP5 methods to the Variables class. + +* Added magic PHP5 methods to the Variables class. * Added array_merge_recursive_overwrite() to Horde_Array(). * Fixed a bug in Horde_Array::arraySort where auto-detecting the first key failed. * Added sorter functions for array keys. @@ -141,36 +172,31 @@ http://pear.php.net/dtd/package-2.0.xsd"> * Added multibyte-safe String::wordwrap() method. * Added parameter to use wordwrap() for line folding. * Use C as the portable locale (Bug #6194). -* Don't use utf8_encode/decode on very large strings if other options are available. (Bug #6660) +* Don't use utf8_encode/decode on very large strings if other options are available. (Bug #6660) * Fixed order of checks in String::convertCharset (Bug #6794). - 0.0.2 - 0.0.2 + 0.2.0 + 0.2.0 - alpha - alpha - - 2006-05-08 - LGPL - Converted to package.xml 2.0 for pear.horde.org - - - - - 0.0.1 - 0.0.1 - - - alpha - alpha + beta + beta - 2003-10-28 + 2010-08-15 LGPL - Initial release as a PEAR package + +* Removed Horde_Util::assertDriverConfig(). + * Removed Horde_Util::bufferOutput(). + * Removed Horde_Util::uriB64Encode() and Horde_Util::uriB64Decode(). + * Removed Horde_Util::strftime2date() and Horde_Util::date2strftime(). + * Removed Horde_Util::closeWindowJs() and Horde_Util::nocacheUrl(). + * Added Horde_String::convertToUtf8(). + * Added Horde_Util::abbreviate(). + * Removed Horde_Array::combine() and Horde_Util::hmac(). + * Initial Horde 4 package.