Changeset 527331

Timestamp:

04/04/2012 01:48:29 PM (14 years ago)

Author:

rxn

Message:

Added Timezone in display. Refactored Code

Location:

sunrise-sunset/trunk

Files:

• functions.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• sunrisesunset.php (modified) (6 diffs)
• utils.php (added)

sunrise-sunset/trunk/functions.php

@@ -2 +2 @@
 
 
+
+

sunrise-sunset/trunk/readme.txt

@@ -7 +7 @@
 License: GPLv2
 
-Displays sunrise and sunset times for the capital cities of the America (including miscellaneous cities).
-Times displayed are local time.
+Displays sunrise and sunset times for the capital cities in America (including miscellaneous cities).
+Local times are displayed.
 
 == Description ==

sunrise-sunset/trunk/sunrisesunset.php

@@ -27 +27 @@
 
 require_once "city.php";
-require_once "functions.php";
+require_once "utils.php";
 
 add_action("widgets_init", "register_sunrise_sunset");
@@ -39 +39 @@
     private $_cities;
 
-    private function populateCities()
-    {
-        $lines = file(dirname(__FILE__) . '/cities.txt');
-        foreach ($lines as $line) {
-            $pieces = explode(":", $line);
-            if ($pieces[0] == 'city') continue;
-            $this->_cities[$pieces[0]] = new City($pieces[0], $pieces[1], $pieces[2], $pieces[3], $pieces[4]);
-        }
-    }
-
-
     function sunrise_sunset()
     {
@@ -57 +46 @@
         $this->WP_Widget('ss_widget_bio', 'Sunrise Sunset', $widget_ops);
 
-        $this->populateCities();
+        $this->_cities = SSUtils::getCities();
     }
 
@@ -118 +107 @@
     <p>
         <br/>
-
     </p>
     <?php
@@ -149 +137 @@
         }
 
-
-        $result = $this->ss_get_times($instance);
+        $result = SSUtils::getTimes($instance, $this->_cities);
 
         echo $today . "<br/>";
@@ -163 +150 @@
         echo $after_widget;
     }
-
-    private function convertTimezone($timestamp, $city)
-    {
-        $newTimestamp = 0;
-        $time_format = 'Y-m-d';
-        $currentTimezone = $city->getTimezone();
-
-        $dstStart = '2012-03-11';
-        $dstEnd = '2012-11-04';
-        $today = date($time_format, $timestamp);
-
-        if ((($today >= $dstStart) && ($today <= $dstEnd))) {
-            $currentTimezone = $city->getSummerTimezone();
-        }
-
-        switch ($currentTimezone) {
-            case 'EST':
-                $newTimestamp = $timestamp - (5 * 60 * 60);
-                break;
-            case 'EDT':
-                $newTimestamp = $timestamp - (4 * 60 * 60);
-                break;
-            case 'MST':
-                $newTimestamp = $timestamp - (7 * 60 * 60);
-                break;
-            case 'MDT':
-                $newTimestamp = $timestamp - (6 * 60 * 60);
-                break;
-            case 'CST':
-                $newTimestamp = $timestamp - (6 * 60 * 60);
-                break;
-            case 'CDT':
-                $newTimestamp = $timestamp - (5 * 60 * 60);
-                break;
-            case 'PST':
-                $newTimestamp = $timestamp - (8 * 60 * 60);
-                break;
-            case 'PDT':
-                $newTimestamp = $timestamp - (7 * 60 * 60);
-                break;
-            case 'AKST':
-                $newTimestamp = $timestamp - (9 * 60 * 60);
-                break;
-            case 'AKDT':
-                $newTimestamp = $timestamp - (8 * 60 * 60);
-                break;
-            case 'HAST':
-                $newTimestamp = $timestamp - (10 * 60 * 60);
-                break;
-        }
-
-
-        return $newTimestamp;
-    }
-
-
-    function ss_get_times($instance)
-    {
-        $time_format = 'h:i A';
-        $targetCity = $this->_cities[$instance['city']];
-
-        $lat = $targetCity->getLatitude();
-        $long = $targetCity->getLongitude();
-
-        $suninfo = date_sun_info(time(), $lat, $long);
-
-        $sunrise_time = date($time_format, $this->convertTimezone($suninfo['sunrise'], $targetCity));
-        $sunset_time = date($time_format, $this->convertTimezone($suninfo['sunset'], $targetCity));
-
-        return array('sunrise' => $sunrise_time, 'sunset' => $sunset_time);
-    }
 }