From 1e3dbd208d41384a81f3a1d60b030b2d4d02c029 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Thu, 25 Mar 2010 18:48:29 -0700
Subject: [PATCH] Parse out those silly timezone names better.

---
 inc/RRule-v2.php | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/inc/RRule-v2.php b/inc/RRule-v2.php
index 774a43e1..041674c7 100644
--- a/inc/RRule-v2.php
+++ b/inc/RRule-v2.php
@@ -46,8 +46,10 @@ class RepeatRuleDateTime extends DateTime {
         $tzid = 'UTC';
       }
       else if ( isset($matches[1]) && $matches[1] != '' ) {
-        $dtz = new DateTimeZone($matches[1]);
-        if ( !isset($dtz) ) {
+        try {
+          $dtz = new DateTimeZone($matches[1]);
+        }
+        catch (Exception $e) {
           /** @TODO: need to try and parse a timezone from all the crap we could receive */
           dbg_error_log( 'ERROR', 'Could not create timezone for "%s"', $matches[1] );
         }
@@ -57,7 +59,25 @@ class RepeatRuleDateTime extends DateTime {
       }
     }
     if ( is_string($dtz) ) {
-      $dtz = new DateTimeZone($dtz);
+      try {
+        $dtz = new DateTimeZone($dtz);
+      }
+      catch (Exception $e) {
+        $original = $dtz;
+        if ( preg_match( '{((([^/]+)/)?[^/]+)$}', $dtz, $matches ) ) {
+          $dtz = $matches[1];
+          $tzid = $dtz;
+          dbg_error_log( 'RRule', 'Found timezone "%s", will process as "%s"', $original, $dtz );
+        }
+        try {
+          $dtz = new DateTimeZone($dtz);
+        }
+        catch (Exception $e) {
+          dbg_error_log( 'ERROR', 'Could not parse timezone "%s" - will use floating time', $original );
+          $dtz = new DateTimeZone('UTC');
+          $tzid = null;
+        }
+      }
     }
     if($dtz === null) {
       if ( preg_match('/\d{8}T\d{6}Z/', $date) ) {
@@ -569,4 +589,4 @@ class RepeatRule {
   }
 
 
-}
\ No newline at end of file
+}