From 897ac952212c8f1d8276a39d16ff736110017c74 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Tue, 16 Jun 2009 22:44:57 +1200
Subject: [PATCH] Fix bug in duration handling.  Allow wider input
 possibilities.

---
 inc/RRule.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/inc/RRule.php b/inc/RRule.php
index 3bfa6a5f..ffbd19d6 100644
--- a/inc/RRule.php
+++ b/inc/RRule.php
@@ -62,13 +62,14 @@ class iCalDate {
     }
 
     $this->_wkst = 1; // Monday
-    if ( preg_match( '/^\d{8}T\d{6}$/', $input ) ) {
+    if ( preg_match( '/^\d{8}[T ]\d{6}$/', $input ) ) {
       $this->SetLocalDate($input);
     }
-    else if ( preg_match( '/^\d{8}T\d{6}Z$/', $input ) ) {
+    else if ( preg_match( '/^\d{8}[T ]\d{6}Z$/', $input ) ) {
       $this->SetGMTDate($input);
     }
     else if ( intval($input) == 0 ) {
+      $this->SetLocalDate(strtotime($input));
       return;
     }
     else {
@@ -290,10 +291,11 @@ class iCalDate {
   * Add duration
   */
   function AddDuration( $duration ) {
+    if ( strstr($duration,'T') === false ) $duration .= 'T';
     list( $sign, $days, $time ) = preg_split( '/[PT]/', $duration );
     $sign = ( $sign == "-" ? -1 : 1);
     dbg_error_log( "RRule", " Adding duration to '%s' of sign: %d,  days: %s,  time: %s", $this->_text, $sign, $days, $time );
-    if ( preg_match( '/(\d)+(D|W)/', $days, $matches ) ) {
+    if ( preg_match( '/(\d+)(D|W)/', $days, $matches ) ) {
       $days = intval($matches[1]);
       if ( $matches[2] == 'W' ) $days *= 7;
       $this->AddDays( $days * $sign );