Changeset 519692

Timestamp:

03/16/2012 06:01:08 AM (14 years ago)

Author:

rxn

Message:

put city info on file

Location:

sunrise-sunset/trunk

Files:

• cities.txt (added)
• city.php (added)
• functions.php (modified) (1 diff)
• sunrisesunset.php (modified) (6 diffs)

sunrise-sunset/trunk/functions.php

@@ -1 +1 @@
 <?php
 
-//place holder functions.php
 
-?>
+
+function populateLatitude()
+{
+    //    $latitude = array('America/Chicago' => 41.51, 'America/Los_Angeles' => 34.30, 'America/New_York' => 40.47, 'US/Arizona' => 33.29);
+
+    $latitude = array();
+
+    global $CITIES;
+    foreach ($CITIES as $city) {
+        $latitude[$city->getTimezone] = $city->getLatitude();
+    }
+    return $latitude;
+
+}
+

sunrise-sunset/trunk/sunrisesunset.php

@@ -25 +25 @@
 */
 
+
+require_once "city.php";
+require_once "functions.php";
+
 add_action("widgets_init", "register_sunrise_sunset");
-function register_sunrise_sunset() {
+function register_sunrise_sunset()
+{
     register_widget('sunrise_sunset');
 }
 
+class sunrise_sunset extends WP_Widget
+{
 
-class sunrise_sunset extends WP_Widget {
+    private $_cities;
+    private $_latitude;
+    private $_longitude;
+
+    private function populateCities()
+    {
+        $lines = file(dirname(__FILE__) . '/cities.txt');
+        foreach ($lines as $line) {
+            $pieces = explode(":", $line);
+            $this->_cities[] = new City($pieces[0], $pieces[1], $pieces[2], $pieces[3]);
+        }
+    }
 
 
-    function sunrise_sunset() {
+    private function populateLatLong()
+    {
 
+//        $longitude = array('America/Chicago' => -87.39, 'America/Los_Angeles' => -118.15, 'America/New_York' => -73.58, 'US/Arizona' => -122.04);
+
+        foreach ($this->_cities as $city) {
+            $this->_latitude[$city->getTimezone()] = $city->getLatitude();
+            $this->_longitude[$city->getTimezone()] = $city->getLongitude();
+        }
+
+    }
+
+    function sunrise_sunset()
+    {
         $widget_ops = array('classname' => 'sunrise_sunset_widget'
         , 'description' => 'Displays Sunrise and Sunset Times');
 
         $this->WP_Widget('ss_widget_bio', 'Sunrise Sunset', $widget_ops);
+
+        $this->populateCities();
+        $this->populateLatLong();
     }
 
-    function form($instance) {
+    function form($instance)
+    {
         $defaults = array(
             'title' => 'Sunrise Sunset Times',
             'timezone' => 'Time Zone', 'ss-plugin');
 
-        $instance = wp_parse_args((array) $instance, $defaults);
+        $instance = wp_parse_args((array)$instance, $defaults);
         $title = strip_tags($instance['title']);
         $timezone = strip_tags($instance['timezone']);
 
         ?>
-        <p><?php echo 'Title' ?>:
-            <input class="widefat" name="<?php echo $this->get_field_name('title'); ?>"
-                   type="text" value="<?php echo esc_attr($title); ?>"/>
-        </p>
+    <p><?php echo 'Title' ?>:
+        <input class="widefat" name="<?php echo $this->get_field_name('title'); ?>"
+               type="text" value="<?php echo esc_attr($title); ?>"/>
+    </p>
 
-        <p><?php echo 'Time Zone'; ?>:
+        <p><?php echo 'Cities'; ?>:
 
         <?php
@@ -63 +97 @@
         $select_box = sprintf('<select name="%s">', $this->get_field_name('timezone'));
 
-        if ($instance['timezone'] == 'America/Chicago') {
-            $select_box .= sprintf('<option value="%s" selected="yes">%s</option>', 'America/Chicago', 'Chicago');
-        } else {
-            $select_box .= sprintf('<option value="%s">%s</option>', 'America/Chicago', 'Chicago');
+        foreach ($this->_cities as $city) {
+            if ($instance['timezone'] == $city->getTimezone()) {
+                $select_box .= sprintf('<option value="%s" selected="yes">%s</option>', $city->getTimezone(), $city->getName());
+            } else {
+                $select_box .= sprintf('<option value="%s">%s</option>', $city->getTimezone(), $city->getName());
+            }
         }
-
-        if ($instance['timezone'] == 'America/New_York') {
-            $select_box .= sprintf('<option value="%s" selected="yes">%s</option>', 'America/New_York', 'New_York');
-        } else {
-            $select_box .= sprintf('<option value="%s">%s</option>', 'America/New_York', 'New_York');
-        }
-
-        if ($instance['timezone'] == 'America/Los_Angeles') {
-            $select_box .= sprintf('<option value="%s" selected="yes">%s</option>', 'America/Los_Angeles', 'Los_Angeles');
-        } else {
-            $select_box .= sprintf('<option value="%s">%s</option>', 'America/Los_Angeles', 'Los_Angeles');
-        }
-
-        if ($instance['timezone'] == 'US/Arizona') {
-            $select_box .= sprintf('<option value="%s" selected="yes">%s</option>', 'US/Arizona', 'Arizona');
-        } else {
-            $select_box .= sprintf('<option value="%s">%s</option>', 'US/Arizona', 'Arizona');
-        }
-        // add arizona here
 
         $select_box .= '</select>';
@@ -93 +110 @@
 
     // save our widget
-    function update($new_instance, $old_instance) {
+    function update($new_instance, $old_instance)
+    {
         $instance = $old_instance;
         $instance['title'] = strip_tags($new_instance['title']);
@@ -101 +119 @@
 
     // display our widget
-    function widget($args, $instance) {
+    function widget($args, $instance)
+    {
         extract($args);
 
@@ -124 +143 @@
 
 
-    function ss_get_sunset($instance) {
+    function ss_get_sunset($instance)
+    {
 
-//        add arizona here
-        $latitude = array('America/Chicago' => 41.51, 'America/Los_Angeles' => 34.30, 'America/New_York' => 40.47, 'US/Arizona' => 33.29);
-        $longitude = array('America/Chicago' => -87.39, 'America/Los_Angeles' => -118.15, 'America/New_York' => -73.58, 'US/Arizona' => -122.04);
-
-
+//        $latitude = populateLatitude();
+//
+//        $longitude = array('America/Chicago' => -87.39, 'America/Los_Angeles' => -118.15, 'America/New_York' => -73.58, 'US/Arizona' => -122.04);
 
         $target_time_zone = $instance['timezone'];
@@ -148 +166 @@
 
         // determine sunrise time
-        $sunrise = date_sunrise(time(), SUNFUNCS_RET_STRING, $latitude[$target_time_zone], $longitude[$target_time_zone], $zenith, $tzoffset);
+        $sunrise = date_sunrise(time(), SUNFUNCS_RET_STRING, $this->_latitude[$target_time_zone], $this->_longitude[$target_time_zone], $zenith, $tzoffset);
         $sunrise_time = date($time_format, strtotime(date("Y-m-d") . ' ' . $sunrise));
 
 
         // determine sunset time
-        $sunset = date_sunset(time(), SUNFUNCS_RET_STRING, $latitude[$target_time_zone], $longitude[$target_time_zone], $zenith, $tzoffset);
+        $sunset = date_sunset(time(), SUNFUNCS_RET_STRING, $this->_latitude[$target_time_zone], $this->_longitude[$target_time_zone], $zenith, $tzoffset);
         $sunset_time = date($time_format, strtotime(date("Y-m-d") . ' ' . $sunset));