From a46bf12768e61fa416bbc779bcb081b5f29b555b Mon Sep 17 00:00:00 2001
From: ahmedre <ahmedre@gmail.com>
Date: Thu, 12 May 2011 17:36:28 +0200
Subject: [PATCH] fix problem when no dst rule falling back to geonames to fix
 egypt issue.

---
 calculate.php   |  3 ---
 index.php       |  1 -
 prayertimes.inc | 11 ++++++++---
 3 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 calculate.php

diff --git a/calculate.php b/calculate.php
deleted file mode 100644
index 6121e3e..0000000
--- a/calculate.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-// calculate.php is now deprecated really
-include 'index.php';
diff --git a/index.php b/index.php
index 1376a0c..a671290 100644
--- a/index.php
+++ b/index.php
@@ -4,7 +4,6 @@
    return;
 }
 
-// $ajax is set automagically from calculate.php for legacy purposes
 // $_GET['ajax'] should be set by the javascript in an ajax call.
 $ajax = isset($ajax)? true : (isset($_GET['ajax'])? true : false);
 $format = (isset($_GET['rss'])? 'rss' : 
diff --git a/prayertimes.inc b/prayertimes.inc
index ba48ffd..aabb744 100644
--- a/prayertimes.inc
+++ b/prayertimes.inc
@@ -113,9 +113,14 @@ class PrayerTimes {
          while (true){
             // i make no guarantees about this code after october 2037.
             // if it gets to that point, fallback to geonames.
-            if ($i >= $max) throw new Exception('date exception');
-            if (!isset($transitions[$i+1]))
-               throw new Exception('date exception');
+
+            // means we reach the end with no applicable switch rule.
+            // in this case, use the cur offset and assume no dst. 
+            if (!isset($transitions[$i+1])){
+               $dst = 0;
+               $gmt_offset = $cur_offset;
+               break;
+            }
 
             if (($now >= $transitions[$i]['ts']) &&
                 ($now < $transitions[$i+1]['ts'])){