Revision: 18636
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18636
Author: johang
Date: 2008-07-04 14:59:04 +0000 (Fri, 04 Jul 2008)
Log Message:
-----------
Three patches to fix minor things in libawl.
Added Paths:
-----------
trunk/phpgwapi/inc/libawl/patches/
trunk/phpgwapi/inc/libawl/patches/001-unset-type-key.patch
trunk/phpgwapi/inc/libawl/patches/002-parsing_vtimezone_property.patch
trunk/phpgwapi/inc/libawl/patches/003-remove-notice.patch
Added: trunk/phpgwapi/inc/libawl/patches/001-unset-type-key.patch
===================================================================
--- trunk/phpgwapi/inc/libawl/patches/001-unset-type-key.patch
(rev 0)
+++ trunk/phpgwapi/inc/libawl/patches/001-unset-type-key.patch 2008-07-04
14:59:04 UTC (rev 18636)
@@ -0,0 +1,12 @@
+Index: inc/iCalendar.php
+===================================================================
+--- inc/iCalendar.php (revision 18635)
++++ inc/iCalendar.php (working copy)
+@@ -647,6 +647,7 @@
+ }
+ if ( isset($args['type'] ) ) {
+ $this->type = $args['type'];
++ unset($args['type']);
+ }
+ else {
+ $this->type = 'VEVENT'; // Default to event
Added: trunk/phpgwapi/inc/libawl/patches/002-parsing_vtimezone_property.patch
===================================================================
--- trunk/phpgwapi/inc/libawl/patches/002-parsing_vtimezone_property.patch
(rev 0)
+++ trunk/phpgwapi/inc/libawl/patches/002-parsing_vtimezone_property.patch
2008-07-04 14:59:04 UTC (rev 18636)
@@ -0,0 +1,17 @@
+Index: inc/iCalendar.php
+===================================================================
+--- inc/iCalendar.php (revision 18634)
++++ inc/iCalendar.php (working copy)
+@@ -618,6 +618,12 @@
+ */
+ var $type;
+
++ /**
++ * ...
++ * @var type bool
++ */
++ var $parsing_vtimezone;
++
+ /[EMAIL PROTECTED]/
+
+ /**
Added: trunk/phpgwapi/inc/libawl/patches/003-remove-notice.patch
===================================================================
--- trunk/phpgwapi/inc/libawl/patches/003-remove-notice.patch
(rev 0)
+++ trunk/phpgwapi/inc/libawl/patches/003-remove-notice.patch 2008-07-04
14:59:04 UTC (rev 18636)
@@ -0,0 +1,23 @@
+Index: inc/iCalendar.php
+===================================================================
+--- inc/iCalendar.php (revision 18635)
++++ inc/iCalendar.php (working copy)
+@@ -841,7 +841,8 @@
+ }
+ else {
+ // Parse the property
+- @list( $property, $value ) = preg_split('/:/', $line, 2 );
++ $x = preg_split('/:/', $line, 2 );
++ @list( $property, $value ) = isset($x[1]) ? $x : array($x[0], NULL);
+ if ( strpos( $property, ';' ) > 0 ) {
+ $parameterlist = preg_split('/;/', $property );
+ $property = array_shift($parameterlist);
+@@ -850,7 +851,7 @@
+ $value .= 'T000000';
+ }
+ elseif ( preg_match('/^([^;:=]+)=([^;:=]+)$/', $pv, $matches) ) {
+- switch( $matches[1] ) {
++ switch( isset( $matches[1] ) ? $matches[1] : NULL ) {
+ case 'TZID': $properties['TZID'] = $matches[2]; break;
+ default:
+ dbg_error_log( "icalendar", " FYI: Ignoring Resource '%s',
Property '%s', Parameter '%s', Value '%s'", $type, $property, $matches[1],
$matches[2] );
_______________________________________________
phpGroupWare-cvs mailing list
phpGroupWare-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/phpgroupware-cvs
