Changeset 651785

Timestamp:

01/13/2013 02:02:19 AM (13 years ago)

Author:

fergbrain

Message:

Version 3.0.4

Location:

countdown-timer/trunk

Files:

• . (modified) (1 prop)
• .gitignore (modified) (1 diff)
• fergcorp_countdownTimer.php (modified) (84 diffs)
• js/fergcorp_countdownTimer_java.js (modified) (1 diff)
• js/fergcorp_countdownTimer_java_debug.js (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• tests (added)
• tests/CountDownTimerTest.php (added)

countdown-timer/trunk/.gitignore

@@ -1 +1 @@
 .project
+countdown-timer.sublime-project
+countdown-timer.sublime-workspace
+fergcorp_debug.php
+phpunit.xml
+tests/bootstrap.php
+tests/countdown-timer/CountDownTimerTest.php
+unit_test.php
+assets
+assets/banner-772x250.jpg
+report

countdown-timer/trunk/fergcorp_countdownTimer.php

@@ -4 +4 @@
 Plugin URI: http://www.andrewferguson.net/wordpress-plugins/countdown-timer/
 Description: Use shortcodes and a widget to count down or up to the years, months, weeks, days, hours, minutes, and/or seconds to a particular event.
-Version: 3.0.3
+Version: 3.0.4
 Author: Andrew Ferguson
 Author URI: http://www.andrewferguson.net
 
 Countdown Timer - Use shortcodes and a widget to count down the years, months, weeks, days, hours, and minutes to a particular event
-Copyright (c) 2005-2012 Andrew Ferguson
+Copyright (c) 2005-2013 Andrew Ferguson
 
 This program is free software; you can redistribute it and/or
@@ -33 +33 @@
 @param      type        $varname    Description
 @return     type                    Description
-@todo       
+@todo
 
 */
@@ -39 +39 @@
 /**
  * Main class for Countdown related activities
- * 
+ *
  * @package Countdown_Timer
  * @author Andrew Ferguson
@@ -46 +46 @@
  */
 class Fergcorp_Countdown_Timer{
-        
+
     //Per instance
     private $eventList;
     private $eventsPresent;
     private $jsUID = array();
-    
+
     //Settings
     private $deleteOneTimeEvents;
@@ -66 +66 @@
     private $timeSinceTime;
     private $titleSuffix;
-    private $enabledShortcodeExcerpt;   
-    
+    private $enableShortcodeExcerpt;
+
     private $version;
-    
+
     /**
      * Load settings
-     * 
+     *
      * @since 3.0.4
      * @access public
@@ -78 +78 @@
      */
     public function loadSettings(){
-            
+
         $this->version = get_option("fergcorp_countdownTimer_version");
         $this->deleteOneTimeEvents = get_option("fergcorp_countdownTimer_deleteOneTimeEvents");
@@ -93 +93 @@
         $this->timeSinceTime = get_option("fergcorp_countdownTimer_timeSinceTime");
         $this->titleSuffix = get_option("fergcorp_countdownTimer_titleSuffix");
-        $this->enabledShortcodeExcerpt = get_option("fergcorp_countdownTimer_enableShortcodeExcerpt");
-        
+        $this->enableShortcodeExcerpt = get_option("fergcorp_countdownTimer_enableShortcodeExcerpt");
+
         $this->eventList  = get_option("fergcorp_countdownTimer_oneTimeEvent"); //Get the events from the WPDB to make sure a fresh copy is being used
     }
-    
-    
-    
+
+
+
     /**
      * Default construct to initialize settings required no matter what
-     * 
+     *
      * @since 3.0
      * @access public
@@ -108 +108 @@
      */
     public function __construct(){
-        // Load settings        
+        // Load settings
         $this->loadSettings();
 
-        if(version_compare($this->version, "3.0.2", "<")){
+        if(version_compare($this->version, "3.0.4", "<")){
             add_action('admin_init', array( &$this, 'install' ) );
             add_action('admin_init', array( &$this, 'loadSettings' ) );
-            
+
         }
 
@@ -120 +120 @@
         wp_register_script('webkit_sprintf', plugins_url(dirname(plugin_basename(__FILE__)) . "/js/" . 'webtoolkit.sprintf.js'), FALSE, $this->version);
         wp_register_script('fergcorp_countdowntimer', plugins_url(dirname(plugin_basename(__FILE__)) . "/js/". 'fergcorp_countdownTimer_java.js'), array('jquery','webkit_sprintf'), $this->version, TRUE );
-        
+
         if($this->enableJS) {
             add_action('wp_footer', array ( &$this, 'json' ) );
         }
-    
-
-        if($this->enabledShortcodeExcerpt) {
+
+
+        if($this->enableShortcodeExcerpt) {
             add_filter('the_excerpt', 'do_shortcode');
         }
@@ -132 +132 @@
         //Priority needs to be set to 1 so that the scripts can be enqueued before the scripts are printed, since both actions are hooked into the wp_head action.
         add_action('wp_head', array( &$this, 'print_countdown_scripts' ), 1);
-        
+
         //Admin hooks
         add_action('admin_init', array( &$this, 'register_settings' ) );            //Initialized the options
         add_action('admin_menu', array( &$this, 'register_settings_page' ) );   //Add Action for adding the options page to admin panel
-        
+
         add_shortcode('fergcorp_cdt_single', array ( &$this, 'shortcode_singleTimer' ) );
         add_shortcode('fergcorp_cdt', array ( &$this, 'shortcode_showTimer' ) );
+
+
+
+        $plugin = plugin_basename(__FILE__);
+        add_filter("plugin_action_links_$plugin", array( &$this, 'settings_link' ) );
         
-
-         
-        $plugin = plugin_basename(__FILE__); 
-        add_filter("plugin_action_links_$plugin", array( &$this, 'settings_link' ) );
-    }
-    
+        $tz = get_option('timezone_string');
+        if ( $tz ){ //Get and check if we have a valid time zone...
+            date_default_timezone_set($tz); //...if so, use it
+        }
+    }
+
     /**
      * Add settings link on plugin page
-     * 
+     *
      * @since 3.0
      * @access public
      * @author c.bavota (http://bavotasan.com/2009/a-settings-link-for-your-wordpress-plugins/)
+     * @codeCoverageIgnore
      */
-
-    public function settings_link($links) { 
-          $settings_link = '<a href="options-general.php?page=fergcorp_countdownTimer.php">Settings</a>'; 
-          array_unshift($links, $settings_link); 
-          return $links; 
-    }
-    
+    public function settings_link($links) {
+          $settings_link = '<a href="options-general.php?page=fergcorp_countdownTimer.php">Settings</a>';
+          array_unshift($links, $settings_link);
+          return $links;
+    }
+
     /**
      * Loads the appropriate scripts when in the admin page
@@ -170 +175 @@
         wp_enqueue_script('postbox'); //These appear to be new functions in WP 2.5
     }
-        
+
     /**
      * Loads the appropriate scripts for running the timer
@@ -179 +184 @@
      */
     public function print_countdown_scripts(){
-        if($this->enableJS) {   
+        if($this->enableJS) {
             wp_enqueue_script('fergcorp_countdowntimer');
             wp_enqueue_script('webkit_sprintf');
 
         }
-    }
-    
+        else{
+            wp_dequeue_script('fergcorp_countdowntimer');
+            wp_dequeue_script('webkit_sprintf');
+        }
+    }
+
     /**
      * Adds the management page in the admin menu
@@ -198 +207 @@
         add_action( 'admin_print_scripts-' . $settings_page, array( &$this, 'print_countdown_scripts' ) );
     }
-    
+
     /**
      * Settings page
-     * 
+     *
      * @since 3.0
      * @access private
@@ -207 +216 @@
      */
     public function settings_page(){ ?>
-    
+
         <script type="text/javascript">
-        // <![CDATA[    
+        // <![CDATA[
             jQuery(document).ready( function($) {
                 // close postboxes that should be closed
                 jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
-                
+
                 // postboxes setup
                 postboxes.add_postbox_toggles('fergcorp-countdown-timer'); //For WP2.7 and above
-    
+
             });
-            
+
             function clearField(eventType, fieldNum){ //For deleting events without reloading
                 var agree=confirm('<?php _e('Are you sure you wish to delete', 'fergcorp_countdownTimer'); ?> '+document.getElementsByName(eventType+'['+fieldNum+'][text]').item(0).value+'?');
@@ -248 +257 @@
         // ]]>
         </script>
-        
+
         <div class="wrap" id="fergcorp_countdownTimer_div">
             <h2>Countdown Timer</h2>
             <div id="poststuff">
-                
+
             <?php
-                /**
-                 * Creates and defines the metabox for the resources box
-                 * 
-                 * @package Countdown_Timer
-                 * @author Andrew Ferguson
-                 * @internal 3.0
-                 * @access private
-                 * 
-                 */
-                function resources_meta_box(){
-                    ?>
-                    <table width="90%" border="0" cellspacing="0" cellpadding="0">
-                          <tr>
-                            <td><ul><li><a href="http://andrewferguson.net/wordpress-plugins/countdown-timer/" target="_blank"><?php _e('Plugin Homepage','fergcorp_countdownTimer'); ?></a></li></ul></td>
-                            <td><ul><li><a href="http://wordpress.org/tags/countdown-timer" target="_blank"><?php _e('Support Forum','fergcorp_countdownTimer'); ?></a></li></ul></td>
-                            <td><ul><li><a href="http://www.amazon.com/gp/registry/registry.html?ie=UTF8&amp;type=wishlist&amp;id=E7Q6VO0I8XI4" target="_blank"><?php _e('Amazon Wishlist','fergcorp_countdownTimer'); ?></a></li></ul></td>
-                            <td><ul><li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=38923"><img src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" alt="Donate"/></a></li></ul></td>
-                          </tr>
-                        </table>
-                        <p><?php _e("I've coded and supported this plugin for several years now, however I am a full-time engineer with a real, full-time job and really only do this programming thing on the side for the love of it. If you would like to continue to see updates, please consider donating above.", 'fergcorp_countdownTimer'); ?></p>                            
-                    <?php
-                }
-                add_meta_box("fergcorp_countdownTimer_resources", __('Resources', 'fergcorp_countdownTimer'), "resources_meta_box", "fergcorp-countdown-timer");
+
+                add_meta_box('fergcorp_countdownTimer_resources',               __('Resources', 'fergcorp_countdownTimer'),                     array ( &$this, 'resources_meta_box'),                  'fergcorp-countdown-timer');
                 ?>
-        
+
                 <form method="post" action="options.php">
-            
+
                 <input type="hidden" name="fergcorp_countdownTimer_noncename" id="fergcorp_countdownTimer_noncename" value="<?php wp_create_nonce( plugin_basename(__FILE__) );?>" />
-                
+
                 <?php
-                
+
                 wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
                 wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
                 settings_fields('fergcorp_countdownTimer_options');
-                
-                
-                add_meta_box('fergcorp_countdownTimer_installation',            __('Installation and Usage Notes', 'fergcorp_countdownTimer'),  array ( &$this, 'installation_meta_box' ),              'fergcorp-countdown-timer', 'advanced', 'default');             
+
+
+                add_meta_box('fergcorp_countdownTimer_installation',            __('Installation and Usage Notes', 'fergcorp_countdownTimer'),  array ( &$this, 'installation_meta_box' ),              'fergcorp-countdown-timer', 'advanced', 'default');
                 add_meta_box("fergcorp_countdownTimer_events",                  __('One Time Events', 'fergcorp_countdownTimer'),               array ( &$this, 'events_meta_box' ),                    "fergcorp-countdown-timer");
                 add_meta_box("fergcorp_countdownTimer_management",              __('Management', 'fergcorp_countdownTimer'),                    array ( &$this, "management_meta_box" ),                "fergcorp-countdown-timer");
@@ -298 +286 @@
                 add_meta_box("fergcorp_countdownTimer_example_display",         __('Example Display', 'fergcorp_countdownTimer'),               array ( &$this, "example_display_meta_box" ),           "fergcorp-countdown-timer");
                 do_meta_boxes('fergcorp-countdown-timer','advanced',null);
-                   
+
             ?>
 
@@ -308 +296 @@
             </form>
     </div>
-   
+
         </div>
         <?php
-                    
-    }
-
-        /**
-         * Creates and defines the metabox for the options box
-         * 
+
+    }
+
+        /**
+         * Creates and defines the metabox for the resources box
+         *
          * @package Countdown_Timer
          * @author Andrew Ferguson
          * @internal 3.0
          * @access private
-         * 
+         * @codeCoverageIgnore
+         *
+         */
+        function resources_meta_box(){
+            ?>
+            <table width="90%" border="0" cellspacing="0" cellpadding="0">
+                  <tr>
+                    <td><ul><li><a href="http://andrewferguson.net/wordpress-plugins/countdown-timer/" target="_blank"><?php _e('Plugin Homepage','fergcorp_countdownTimer'); ?></a></li></ul></td>
+                    <td><ul><li><a href="http://wordpress.org/tags/countdown-timer" target="_blank"><?php _e('Support Forum','fergcorp_countdownTimer'); ?></a></li></ul></td>
+                    <td><ul><li><a href="http://www.amazon.com/gp/registry/registry.html?ie=UTF8&amp;type=wishlist&amp;id=E7Q6VO0I8XI4" target="_blank"><?php _e('Amazon Wishlist','fergcorp_countdownTimer'); ?></a></li></ul></td>
+                    <td><ul><li><a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=38923"><img src="https://www.paypal.com/en_US/i/btn/btn_donate_SM.gif" alt="Donate"/></a></li></ul></td>
+                  </tr>
+                </table>
+                <p><?php _e("I've coded and supported this plugin for several years now, however I am a full-time engineer with a real, full-time job and really only do this programming thing on the side for the love of it. If you would like to continue to see updates, please consider donating above.", 'fergcorp_countdownTimer'); ?></p>
+            <?php
+        }
+
+        /**
+         * Creates and defines the metabox for the options box
+         *
+         * @package Countdown_Timer
+         * @author Andrew Ferguson
+         * @internal 3.0
+         * @access private
+         *
          */
         function display_options_meta_box(){
@@ -333 +345 @@
                 <li><?php echo __('Hours:', 'fergcorp_countdownTimer') . $this->build_yes_no("fergcorp_countdownTimer_showHour", $this->showHour); ?></li>
                 <li><?php echo __('Minutes:', 'fergcorp_countdownTimer') . $this->build_yes_no("fergcorp_countdownTimer_showMinute", $this->showMinute); ?></li>
-                <li><?php echo __('Seconds:', 'fergcorp_countdownTimer') . $this->build_yes_no("fergcorp_countdownTimer_showSecond", $this->showSecond); ?></li>                        
+                <li><?php echo __('Seconds:', 'fergcorp_countdownTimer') . $this->build_yes_no("fergcorp_countdownTimer_showSecond", $this->showSecond); ?></li>
                 <li><?php echo __('Strip non-significant zeros:', 'fergcorp_countdownTimer') . $this->build_yes_no("fergcorp_countdownTimer_stripZero", $this->stripZero); ?></li>
             </ul>
@@ -341 +353 @@
         /**
          * Creates and defines the metabox for the events box
-         * 
+         *
          * @package Countdown_Timer
          * @author Andrew Ferguson
          * @internal 3.0
          * @access public
-         * 
-         */         
-        public function events_meta_box(){              
-            
+         *
+         */
+        public function events_meta_box(){
+
         ?>
             <table border="0" cellspacing="0" cellpadding="2">
@@ -360 +372 @@
                 </tr>
                 <?php
-                
-                //We need a time zone to properly guess what dates the user means   
-                $tz = get_option('timezone_string');
-                if ( $tz ){ //Get and check if we have a valid time zone... 
-                    date_default_timezone_set($tz); //...if so, use it
-                }
-                else {  //If there is no time zone...
-                    date_default_timezone_set("Etc/GMT".get_option("gmt_offset")); //...we make fake it by using the ETC/GMT+7 or whatever.
-                }
-                
+
                 $event_count = 0;
-                    if ( is_array( $this->eventList ) ) {   
+                    if ( is_array( $this->eventList ) ) {
                         foreach ( $this->eventList as $thisEvent ) {
                         //If the user wants, cycle through the array to find out if they have already occured, if so: set them to NULL
-                        if ( ( $this->deleteOneTimeEvents ) && ( $thisEvent <= new DateTime() ) && ( !$thisEvent->getTimeSince() ) ) {
+                        if ( ( $this->deleteOneTimeEvents ) && ( $thisEvent->getTimestamp() <= time() ) && ( !$thisEvent->getTimeSince() ) ) {
                             $thisEvent = NULL;
                         }
@@ -386 +389 @@
                                                         "size" => 30,
                                                         "name" => "fergcorp_countdownTimer_oneTimeEvent[{$event_count}][date]",
-                                                        "value" => ($thisEvent->date("D, d M Y H:i:s"))
+                                                        "value" => ($thisEvent->date("D, d M Y H:i:s T"))
                                                         )
                                                     )."</td>";
-                                
+
                             echo "<td>".$this->build_input(array(
                                                         "type" => "text",
@@ -397 +400 @@
                                                         )
                                                     )."</td>";
-                                
+
                             echo "<td>".$this->build_input(array(
                                                         "type" => "text",
@@ -405 +408 @@
                                                         )
                                                     )."</td>";
-        
+
                             echo "<td>".$this->build_input(array(
                                                         "type" => "checkbox",
                                                         "name" => "fergcorp_countdownTimer_oneTimeEvent[{$event_count}][timeSince]",
                                                         "value" => 1,
-                                                        ), 
+                                                        ),
                                                     checked("1", $thisEvent->getTimeSince(), false)
                                                     )."</td>";
@@ -430 +433 @@
                                                 )
                                             )."</td>";
-                        
+
                     echo "<td>".$this->build_input(array(
                                                 "type" => "text",
@@ -437 +440 @@
                                                 )
                                             )."</td>";
-                        
+
                     echo "<td>".$this->build_input(array(
                                                 "type" => "text",
@@ -465 +468 @@
                             );
             _e('Yes', 'fergcorp_countdownTimer');
-            echo " :: "; 
-            //...or No  
+            echo " :: ";
+            //...or No
             echo $this->build_input(array(
                                 "type"  => "radio",
@@ -480 +483 @@
         /**
          * Creates and defines the metabox for the installation box
-         * 
+         *
          * @package Countdown_Timer
          * @author Andrew Ferguson
          * @internal 3.0
          * @access private
-         * 
-         */                         
+         *
+         */
         function installation_meta_box () { ?>
-            
+
         <p><?php printf(__("Countdown timer uses <a %s>PHP's strtotime function</a> and will parse about any English textual datetime description.", 'fergcorp_countdownTimer'), "href='http://us2.php.net/strtotime' target='_blank'"); ?></p>
                     <p><?php _e('Examples of some (but not all) valid dates', 'fergcorp_countdownTimer'); ?>:</p>
@@ -498 +501 @@
                                 <li>last monday</li>
                     </ul>
-      
+
         <p><?php printf(__("To insert the Countdown Timer into your sidebar, you can use the <a %s>Countdown Timer Widget</a>.", 'fergcorp_countdownTimer'), "href='".admin_url('widgets.php')."'"); ?></p>
-                    
+
                     <p><?php printf(__("If you want to insert the Countdown Timer into a page or post, you can use the following <abbr %s %s>shortcodes</abbr> to return all or a limited number of Countdown Timers, respectively:", 'fergcorp_countdownTimer'), "title='".__('A shortcode is a WordPress-specific code that lets you do nifty things with very little effort. Shortcodes can embed files or create objects that would normally require lots of complicated, ugly code in just one line. Shortcode = shortcut.', 'fergcorp_countdownTimer')."'", "style='cursor:pointer; border-bottom:1px black dashed'" ); ?></p>
                     <p>
@@ -508 +511 @@
                         </code>
                     </p>
-                    <p><?php _e("Where <em>##</em> is maximum number of results to be displayed - ordered by date.", 'fergcorp_countdownTimer'); ?></p>   
+                    <p><?php _e("Where <em>##</em> is maximum number of results to be displayed - ordered by date.", 'fergcorp_countdownTimer'); ?></p>
                     <p><?php _e("If you want to insert individual countdown timers, such as in posts or on pages, you can use the following shortcode:", 'fergcorp_countdownTimer'); ?></p>
                     <p>
@@ -515 +518 @@
                         </code>
                     </p>
-                    <p><?php printf(__("Where <em>ENTER_DATE_HERE</em> uses <a %s>PHP's strtotime function</a> and will parse about any English textual datetime description.", 'fergcorp_countdownTimer'), "href='http://us2.php.net/strtotime' target='_blank'"); ?></p>                     
-        <?php       
+                    <p><?php printf(__("Where <em>ENTER_DATE_HERE</em> uses <a %s>PHP's strtotime function</a> and will parse about any English textual datetime description.", 'fergcorp_countdownTimer'), "href='http://us2.php.net/strtotime' target='_blank'"); ?></p>
+        <?php
         }
 
         /**
          * Creates and defines the metabox for the management box
-         * 
+         *
          * @package Countdown_Timer
          * @author Andrew Ferguson
          * @internal 3.0
          * @access private
-         * 
+         *
          */
         function management_meta_box(){
@@ -532 +535 @@
             <p><?php _e("How long the timer remain visable if \"Display 'Time Since'\" is ticked:", 'fergcorp_countdownTimer'); ?><br />
             &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php _e("Seconds:", 'fergcorp_countdownTimer');
-            
+
             echo $this->build_input(array(
                                 "type"  => "text",
@@ -539 +542 @@
                                 "value" => $this->timeSinceTime
                                 ));
-                                
+
             _e("(0 = infinite; 86400 seconds = 1 day; 604800 seconds = 1 week)", "fergcorp_countdownTimer"); ?></p>
 
             <p><?php _e('Enable JavaScript countdown:', 'fergcorp_countdownTimer');
-            
+
             echo $this->build_yes_no("fergcorp_countdownTimer_enableJS", $this->enableJS);
 
             ?>
             </p>
-            
+
             <p><?php _e('By default, WordPress does not parse shortcodes that are in excerpts. If you want to enable this functionality, you can do so here. Note that this will enable the parsing of <em>all</em> shortcodes in the excerpt, not just the ones associated with Countdown Timer.', 'fergcorp_countdownTimer'); ?></p>
             <p><?php _e('Enable shortcodes in the_excerpt:', 'fergcorp_countdownTimer');
-            
-            echo $this->build_yes_no("fergcorp_countdownTimer_enableShortcodeExcerpt", $this->enabledShortcodeExcerpt);
+
+            echo $this->build_yes_no("fergcorp_countdownTimer_enableShortcodeExcerpt", $this->enableShortcodeExcerpt);
 
             ?>
@@ -559 +562 @@
         }
 
-        
+
     /**
      * Creates and defines the metabox for the onHover time format box
-     * 
+     *
      * @package Countdown_Timer
      * @author Andrew Ferguson
      * @internal 3.0
      * @access private
-     * 
-     */                         
+     *
+     */
     function onHover_time_format_meta_box(){
         ?>
@@ -584 +587 @@
                             "value" => $this->timeFormat
                             ));
-            
-            
+
+
         echo "</p>";
-        
-    }
-        
-        
+
+    }
+
+
     /**
      * Creates and defines the metabox for the display format options box
-     * 
+     *
      * @package Countdown_Timer
      * @author Andrew Ferguson
      * {@internal since}
      * @access private
-     * 
-     */                                 
+     *
+     */
     function display_format_options_meta_box(){
         ?>
@@ -609 +612 @@
         </ul>
         <p><?php _e('Title Suffix', 'fergcorp_countdownTimer');
-        
+
         echo $this->build_input(array(
                             "type"  => "text",
@@ -618 +621 @@
         echo "</p>";
     }
-        
-        
+
+
     /**
      * Creates and defines the metabox for the example display box
-     * 
+     *
      * @package Countdown_Timer
      * @author Andrew Ferguson
      * @internal 3.0
      * @access private
-     * 
-     */     
+     *
+     */
     function example_display_meta_box(){
         echo "<ul>";
@@ -637 +640 @@
         }
     }
-        
-        
+
+
     /**
      * Creates a PHP-based one-off time for use outside the loop
@@ -648 +651 @@
     */
     public function singleTimer( $date ){
-        
+
         return $this->formatEvent( new Fergcorp_Countdown_Timer_Event( strtotime( $date ) ) , TRUE );
-        
+
     }
 
@@ -666 +669 @@
         $this->eventsPresent = FALSE;
         $toReturn = "";
-        
+
         //Make sure there's something to count
         if($this->eventList){
             $this->eventsPresent = TRUE;
         }
-        
+
         $eventCount = count($this->eventList);
         if($eventLimit != -1)   //If the eventLimit is set
@@ -688 +691 @@
             }
         }
-        
+
         if(!$this->eventsPresent){
                 $toReturn = __('No dates present', 'fergcorp_countdownTimer');
         }
-        
+
         //Echo or return
         if($output)
             echo $toReturn;
         else
-            return $toReturn;   
+            return $toReturn;
     }
 
@@ -717 +720 @@
      * @return string The content of the post with the appropriate dates inserted (if any)
     */
-    function formatEvent($thisEvent, $standAlone = FALSE){  
+    function formatEvent($thisEvent, $standAlone = FALSE){
         $time_left = $thisEvent->getTimestamp() - time();
-        
+
         $content = '';
-        
+
         if(!$standAlone)
             $content = "<li class = 'fergcorp_countdownTimer_event_li'>";
-            
+
         $eventTitle = "<span class = 'fergcorp_countdownTimer_event_title'>".($thisEvent->getURL()==""?$thisEvent->getTitle():"<a href=\"".$thisEvent->getURL()."\" class = 'fergcorp_countdownTimer_event_linkTitle'>".$thisEvent->getTitle()."</a>").'</span>'.$this->titleSuffix."\n";
-        
+
         if ($this->timeFormat == "") {
             $this->timeFormat = get_option('date_format') . ", " . get_option('time_format');
         }
-        $timePrefix = "<abbr title = \"".date_i18n($this->timeFormat, $thisEvent->getTimestamp(), FALSE)."\" id = '".$thisEvent->getUID()."' class = 'fergcorp_countdownTimer_event_time'>";
-        
-        if (    ( $time_left <= 0 ) && 
-                    ( ( ( $thisEvent->getTimeSince() ) && 
-                        ( ( ( $time_left + $this->timeSinceTime ) > 0 ) || ( 0 == $this->timeSinceTime ) ) )
+        $timePrefix = "<abbr title = \"".date_i18n($this->timeFormat, $thisEvent->getTimestamp()+(3600*(get_option('gmt_offset'))), TRUE)."\" id = '".$thisEvent->getUID()."' class = 'fergcorp_countdownTimer_event_time'>";
+
+        if (    ( $time_left <= 0 ) &&
+                    ( ( ( $thisEvent->getTimeSince() ) &&
+                        ( ( ( $time_left + (int) $this->timeSinceTime ) > 0 ) || ( 0 == (int) $this->timeSinceTime ) ) )
                 || ( $standAlone) ) ) {
-                        
+
                     //If the event has already passed and we still want to display the event
-                
+
             $this->eventsPresent = TRUE; //Set to TRUE so we know there's an event to display
             if ( $thisEvent->getTitle() ) {
@@ -747 +750 @@
         elseif($time_left > 0){ //If the event has not yet happened yet
             $this->eventsPresent = TRUE; //Set to TRUE so we know there's an event to display
-            
+
             if($thisEvent->getTitle()){
                 $content .= $eventTitle;
             }
-            $content .= $timePrefix.sprintf(__("in %s", 'fergcorp_countdownTimer'), $this->fuzzyDate($thisEvent->getTimestamp(), time() ) )."</abbr>";  
-        }           
+            $content .= $timePrefix.sprintf(__("in %s", 'fergcorp_countdownTimer'), $this->fuzzyDate($thisEvent->getTimestamp(), time() ) )."</abbr>";
+        }
         else{
             return NULL;
         }
-        
+
         array_push($this->jsUID, $thisEvent);
-        
+
         if(!$standAlone)
             $content .= "</li>\r\n";
@@ -776 +779 @@
     */
     function fuzzyDate ( $targetTime, $nowTime ) {
-            
+
         $timeDelta = new Fergcorp_DeltaTime($targetTime, $nowTime);
 
@@ -782 +785 @@
         $s = '';
         $sigNumHit = false;
-        
+
         if($timeDelta->s < 0){
             $timeDelta->i--;
@@ -829 +832 @@
         }
         else{
-            //If we don't want to show months, let's just calculate the exact number of seconds left since all other units of time are fixed (i.e. months are not a fixed unit of time) 
+            //If we don't want to show months, let's just calculate the exact number of seconds left since all other units of time are fixed (i.e. months are not a fixed unit of time)
             //If we showed years, but not months, we need to account for those.
             if($this->showYear){
                 $timeDelta->delta = $timeDelta->delta - $timeDelta->y*31536000;
             }
-            
+
             //Re calculate the resultant times
-            $timeDelta->w = intval( $timeDelta->delta/(86400*7) ); 
+            $timeDelta->w = intval( $timeDelta->delta/(86400*7) );
             $timeDelta->d = intval( $timeDelta->delta/86400 );
             $timeDelta->h = intval( ($timeDelta->delta - $timeDelta->d*86400)/3600 );
             $timeDelta->i = intval( ($timeDelta->delta - $timeDelta->d*86400 - $timeDelta->h*3600)/60 );
             $timeDelta->s = intval( ($timeDelta->delta - $timeDelta->d*86400 - $timeDelta->h*3600 - $timeDelta->i*60) );
-            
+
             //and clear any rollover time
             $rollover = 0;
@@ -850 +853 @@
             if($sigNumHit || !$this->stripZero || ( ($timeDelta->d + intval($rollover/86400) )/7)){
                 $timeDelta->w = $timeDelta->w + intval($rollover/86400)/7;
-                $s .= '<span class="fergcorp_countdownTimer_week fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d week,", "%d weeks,", (intval( ($timeDelta->d + intval($rollover/86400) )/7)), "fergcorp_countdownTimer"), (intval( ($timeDelta->d + intval($rollover/86400) )/7)))."</span> ";        
+                $s .= '<span class="fergcorp_countdownTimer_week fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d week,", "%d weeks,", (intval( ($timeDelta->d + intval($rollover/86400) )/7)), "fergcorp_countdownTimer"), (intval( ($timeDelta->d + intval($rollover/86400) )/7)))."</span> ";
                 $rollover = $rollover - intval($rollover/86400)*86400;
                 $timeDelta->d = $timeDelta->d - intval( ($timeDelta->d + intval($rollover/86400) )/7 )*7;
@@ -899 +902 @@
         if($this->showSecond){
             $timeDelta->s = $timeDelta->s + $rollover;
-            $s .= '<span class="fergcorp_countdownTimer_second fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d second,", "%d seconds,", $timeDelta->s, "fergcorp_countdownTimer"), $timeDelta->s)."</span> ";
-        }
-        
+            $s .= '<span class="fergcorp_countdownTimer_second fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d second,", "%d seconds,", $timeDelta->s, "fergcorp_countdownTimer"), $timeDelta->s) . "</span> ";
+        }
+
         //Catch blank statements
         if($s==""){
+             // @codeCoverageIgnoreStart
             if($this->showSecond){
-                $s = sprintf(_n("%d second,", "%d seconds,", "0", "fergcorp_countdownTimer"), "0");
+                $s = '<span class="fergcorp_countdownTimer_second fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d second,", "%d seconds,", "0", "fergcorp_countdownTimer"), "0") . "</span> ";
             }
             elseif($this->showMinute){
-                $s = sprintf(_n("%d minute,", "%d minute,", "0", "fergcorp_countdownTimer"), "0");
+                $s = '<span class="fergcorp_countdownTimer_minute fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d minute,", "%d minutes,", "0", "fergcorp_countdownTimer"), "0") . "</span> ";
             }
             elseif($this->showHour){
-                $s = sprintf(_n("%d hour,", "%d hour,", "0", "fergcorp_countdownTimer"), "0");
-            }   
+                $s = '<span class="fergcorp_countdownTimer_hour fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d hour,", "%d hours,", "0", "fergcorp_countdownTimer"), "0") . "</span> ";
+            }
             elseif($this->showDay){
-                $s = sprintf(_n("%d day,", "%d day,", "0", "fergcorp_countdownTimer"), "0");
-            }   
+                $s = '<span class="fergcorp_countdownTimer_day fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d day,", "%d days,", "0", "fergcorp_countdownTimer"), "0") . "</span> ";
+            }
             elseif($this->showWeek){
-                $s = sprintf(_n("%d week,", "%d week,", "0", "fergcorp_countdownTimer"), "0");
+                $s = '<span class="fergcorp_countdownTimer_week fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d week,", "%d weeks,", "0", "fergcorp_countdownTimer"), "0") . "</span> ";
             }
             elseif($this->showMonth){
-                $s = sprintf(_n("%d month,", "%d month,", "0", "fergcorp_countdownTimer"), "0");
-            }
+                $s = '<span class="fergcorp_countdownTimer_month fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d month,", "%d months,", "0", "fergcorp_countdownTimer"), "0") . "</span> ";
+            }
+             // @codeCoverageIgnoreEnd
             else{
-                $s = sprintf(_n("%d year,", "%d year,", "0", "fergcorp_countdownTimer"), "0");
+                $s = '<span class="fergcorp_countdownTimer_year fergcorp_countdownTimer_timeUnit">' . sprintf(_n("%d year,", "%d years,", "0", "fergcorp_countdownTimer"), "0") . "</span> ";
             }
         }
         return preg_replace("/(, ?<\/span> *)$/is", "</span>", $s);
     }
-    
+
         /**
      * Processes [fergcorp_cdt max=##] shortcode
@@ -937 +942 @@
      * @author Andrew Ferguson
      * @return string countdown timer(s)
-    */  
+    */
     function shortcode_showTimer($atts) {
         extract(shortcode_atts(array(
@@ -943 +948 @@
                                 ),
                                 $atts));
-    
+
         return $this->showTimer($max, FALSE);
     }
-    
+
     /**
      * Processes [fergcorp_cdt_single date="_DATE_"] shortcode
@@ -955 +960 @@
      * @author Andrew Ferguson
      * @return string countdown timer
-    */  
+    */
     function shortcode_singleTimer($atts) {
         extract(shortcode_atts(array(
             'date' => '-1',
         ), $atts));
-    
+
         return $this->singleTimer( $date );
     }
-    
-    
+
+
     /**
      * Initialized the options
@@ -990 +995 @@
     }
 
+    public function compare($adate, $bdate)
+                    {
+                        if($adate < $bdate){
+                            return -1;
+                        }else if($adate == $bdate){
+                            return 0;
+                        }else{
+                            return 1;
+                        }
+                    } 
+
     /**
      * Sanitize the callback
@@ -996 +1012 @@
      * @access public
      * @author Andrew Ferguson
-     */ 
+     */
     public function sanitize($input){
 
                 $event_object_array = array();
-                
-                //We need a time zone to properly guess what dates the user means   
-                $tz = get_option('timezone_string');
-                if ( $tz ){ //Get and check if we have a valid time zone... 
-                    date_default_timezone_set($tz); //...if so, use it
-                }
-                else {  //If there is no time zone...
-                    date_default_timezone_set("Etc/GMT".get_option("gmt_offset")); //...we make fake it by using the ETC/GMT+7 or whatever.
-                }
 
                 foreach($input as $event){
@@ -1018 +1025 @@
                     }
                 }
-    
+
                 /*Begin sorting events by time*/
-                function cmp($adate, $bdate) {
-                    if($adate < $bdate){
-                        return -1;  
-                    }else if($adate == $bdate){
-                        return 0;   
-                    }else{
-                        return 1;   
-                    }
-                }
-                usort($event_object_array, 'cmp');
+                usort($event_object_array, array($this,'compare'));
         return $event_object_array;
     }
@@ -1035 +1033 @@
 
     function json(){
-        $params = array(    
+        $params = array(
                         "showYear"      =>$this->showYear,
                         "showMonth"     =>$this->showMonth,
@@ -1045 +1043 @@
                         "stripZero"     =>$this->stripZero,
                     );
-                    
+
         $js_events = array();
         foreach($this->jsUID as $event){
@@ -1054 +1052 @@
                         "year"  => addslashes( _n( "%d year,", "%d years,", 1, "fergcorp_countdownTimer" )),
                         "years" => addslashes( _n( "%d year,", "%d years,", 2, "fergcorp_countdownTimer" )),
-                        
+
                         "month"     => addslashes( _n( "%d month,", "%d months,", 1, "fergcorp_countdownTimer" )),
                         "months"    => addslashes( _n( "%d month,", "%d months,", 2, "fergcorp_countdownTimer" )),
-                        
+
                         "week"  => addslashes( _n( "%d week,", "%d weeks,", 1, "fergcorp_countdownTimer" )),
                         "weeks" => addslashes( _n( "%d week,", "%d weeks,", 2, "fergcorp_countdownTimer" )),
-                        
+
                         "day"   => addslashes( _n( "%d day,", "%d days,", 1, "fergcorp_countdownTimer" )),
                         "days"  => addslashes( _n( "%d day,", "%d days,", 2, "fergcorp_countdownTimer" )),
-                        
+
                         "hour"  => addslashes( _n( "%d hour,", "%d hours,", 1, "fergcorp_countdownTimer" )),
                         "hours" => addslashes( _n( "%d hour,", "%d hours,", 2, "fergcorp_countdownTimer" )),
-                        
+
                         "minute"    => addslashes( _n( "%d minute,", "%d minutes,", 1, "fergcorp_countdownTimer" )),
                         "minutes"   => addslashes( _n( "%d minute,", "%d minutes,", 2, "fergcorp_countdownTimer" )),
-                        
+
                         "second"    => addslashes( _n( "%d second,", "%d seconds,", 1, "fergcorp_countdownTimer" )),
                         "seconds"   => addslashes( _n( "%d second,", "%d seconds,", 2, "fergcorp_countdownTimer" )),
-                        
+
 
                         "agotime"   => addslashes(__('%s ago', 'fergcorp_countdownTimer')),
@@ -1078 +1076 @@
                     );
         wp_localize_script( 'fergcorp_countdowntimer', 'fergcorp_countdown_timer_js_lang', $js_lang);
-        wp_localize_script( 'fergcorp_countdowntimer', 'fergcorp_countdown_timer_jsEvents', $js_events );                   
+        wp_localize_script( 'fergcorp_countdowntimer', 'fergcorp_countdown_timer_jsEvents', $js_events );
         wp_localize_script( 'fergcorp_countdowntimer', 'fergcorp_countdown_timer_options', $params );
     }
@@ -1092 +1090 @@
         $plugin_data = get_plugin_data(__FILE__);
 
+        //Don't test for now
+        // @codeCoverageIgnoreStart
         //Move widget details from old option to new option only if the new option does not exist
-        if( ( $oldWidget = get_option( "widget_fergcorp_countdown" ) ) && (!get_option( "widget_fergcorp_countdown_timer_widget" ) ) ) {     
+        if( ( $oldWidget = get_option( "widget_fergcorp_countdown" ) ) && (!get_option( "widget_fergcorp_countdown_timer_widget" ) ) ) {
             update_option("widget_fergcorp_countdown_timer_widget",  array( "title"         => $oldWidget["title"],
                                                                             "countLimit"    => $oldWidget["count"],
                                                                             )
-            ); 
+            );
             delete_option("widget_fergcorp_countdown");
-            
+
             global $sidebars_widgets;
             //check to see if the old widget is being used
@@ -1108 +1108 @@
                 if( 'wp_inactive_widgets' == $sidebar )
                     continue;
-                    
+
                 if ( is_array($widgets) ) {
                     foreach ( $widgets as $widget ) {
@@ -1120 +1120 @@
         wp_set_sidebars_widgets($sidebars_widgets);
         wp_get_sidebars_widgets();
-        
-        
-        
+
+
+
         }
         //If the old option exist and the new option exists (becuase of the above logic test), don't update the new option and just remove the old option
@@ -1128 +1128 @@
             delete_option("widget_fergcorp_countdown");
         }
-        
+        // @codeCoverageIgnoreEnd
+
+        // @codeCoverageIgnoreStart
         //Move timeFormat data from old option to new option only if the new option does not exist
-        if( ( $timeOffset = get_option( "fergcorp_countdownTimer_timeOffset" ) ) && (!get_option( "fergcorp_countdownTimer_timeFormat" ) ) ) {   
+        if( ( $timeOffset = get_option( "fergcorp_countdownTimer_timeOffset" ) ) && (!get_option( "fergcorp_countdownTimer_timeFormat" ) ) ) {
             update_option( 'fergcorp_countdownTimer_timeFormat', $timeOffset);
-            delete_option("fergcorp_countdownTimer_timeOffset");            
+            delete_option("fergcorp_countdownTimer_timeOffset");
         }
         //If the old option exist and the new option exists (becuase of the above logic test), don't update the new option and just remove the old option
-        elseif( $timeOffset ){ 
+        elseif( $timeOffset ){
             delete_option("fergcorp_countdownTimer_timeOffset");
         }
-        
+        // @codeCoverageIgnoreEnd
+
+        // @codeCoverageIgnoreStart
         $oneTimeEvent = get_option("fergcorp_countdownTimer_oneTimeEvent");
         if( ( $oneTimeEvent )  && ( gettype($oneTimeEvent[0]) == "array") ) {
@@ -1144 +1148 @@
             foreach( $oneTimeEvent as $event ) {
                 array_push($event_object_array, new Fergcorp_Countdown_Timer_Event($event["date"], $event["text"], $event["link"], $event["timeSince"]));
-            } 
+            }
             update_option("fergcorp_countdownTimer_oneTimeEvent", $event_object_array);
         }
+        // @codeCoverageIgnoreEnd
+
+        //Install the defaults
+        $this->install_option('fergcorp_countdownTimer_', 'deleteOneTimeEvents', '0');
+        $this->install_option('fergcorp_countdownTimer_', 'timeFormat', 'F jS, Y, g:i a');
+        $this->install_option('fergcorp_countdownTimer_', 'showYear', '1');
+        $this->install_option('fergcorp_countdownTimer_', 'showMonth', '1');
+        $this->install_option('fergcorp_countdownTimer_', 'showWeek', '0');
+        $this->install_option('fergcorp_countdownTimer_', 'showDay', '1');
+        $this->install_option('fergcorp_countdownTimer_', 'showHour', '1');
+        $this->install_option('fergcorp_countdownTimer_', 'showMinute', '1');
+        $this->install_option('fergcorp_countdownTimer_', 'showSecond', '0');
+        $this->install_option('fergcorp_countdownTimer_', 'stripZero', '1');
+        $this->install_option('fergcorp_countdownTimer_', 'enableJS', '1');
+        $this->install_option('fergcorp_countdownTimer_', 'timeSinceTime', '0');
+        $this->install_option('fergcorp_countdownTimer_', 'titleSuffix', ':<br />');
+        $this->install_option('fergcorp_countdownTimer_', 'enableShortcodeExcerpt', '0');
+        $this->install_option('fergcorp_countdownTimer_', 'oneTimeEvent', '0');
+
+        //Update version number...last thing
+        update_option("fergcorp_countdownTimer_version", $plugin_data["Version"]);
+    }
 
         /**
@@ -1160 +1186 @@
         */
         function install_option($prefix, $option, $default){
-            if(get_option($prefix.$option) != NULL){    
+            if(get_option($prefix.$option) != NULL){
                 return false;
             }
@@ -1168 +1194 @@
             }
         }
-        //Install the defaults
-        install_option('fergcorp_countdownTimer_', 'deleteOneTimeEvents', '0');
-        install_option('fergcorp_countdownTimer_', 'timeFormat', 'F jS, Y, g:i a');
-        install_option('fergcorp_countdownTimer_', 'showYear', '1');
-        install_option('fergcorp_countdownTimer_', 'showMonth', '1');
-        install_option('fergcorp_countdownTimer_', 'showWeek', '0');
-        install_option('fergcorp_countdownTimer_', 'showDay', '1');
-        install_option('fergcorp_countdownTimer_', 'showHour', '1');
-        install_option('fergcorp_countdownTimer_', 'showMinute', '1');
-        install_option('fergcorp_countdownTimer_', 'showSecond', '0');
-        install_option('fergcorp_countdownTimer_', 'stripZero', '1');
-        install_option('fergcorp_countdownTimer_', 'enableJS', '1');
-        install_option('fergcorp_countdownTimer_', 'timeSinceTime', '0');
-        install_option('fergcorp_countdownTimer_', 'titleSuffix', ':<br />');
-        install_option('fergcorp_countdownTimer_', 'enableShortcodeExcerpt', '0');
-        install_option('fergcorp_countdownTimer_', 'oneTimeEvent', '0');
-        
-        //Update version number...last thing
-        update_option("fergcorp_countdownTimer_version", $plugin_data["Version"]);
-    }
 
         /**
          * Builds <input> HTML
-         * 
+         *
          * @package Countdown_Timer
          * @author Andrew Ferguson
@@ -1199 +1205 @@
          * @param string    $inputString
          * $return string HMTL code
-         */     
+         */
         public function build_input($inputArray, $inputString=''){
             $attributes = "";
@@ -1209 +1215 @@
         /**
          * Builds Yes/No <input> HTML
-         * 
+         *
          * @package Countdown_Timer
          * @author Andrew Ferguson
@@ -1217 +1223 @@
          * @param string    $option
          * $return string HMTL code
-         */     
+         */
         public function build_yes_no($name, $option){
             //Yes
@@ -1226 +1232 @@
                                 ),
                             checked("1", $option, false)
-                            ); 
+                            );
             $output .= __('Yes', 'fergcorp_countdownTimer');
             $output .= " :: ";
@@ -1236 +1242 @@
                                 ),
                             checked("0", $option, false)
-                            ); 
+                            );
             $output .= __('No', 'fergcorp_countdownTimer');
-            
+
             return $output;
-        }   
+        }
 }
 
@@ -1249 +1255 @@
     private $timeSince;
     private $UID;
-    
+
     public function __construct ($time, $title = NULL, $url = NULL, $timeSince = NULL){
         $this->setTitle($title);
@@ -1258 +1264 @@
         parent::__construct("@".$time);
     }
-    
-    public function getTimestamp() {
+
+    /*public function getTimestamp() {
          return method_exists('DateTime', 'getTimestamp') ? parent::getTimestamp() : $this->time;
-    }
-    
+    }*/
+
     public function setTitle ( $title ) {
         $this->title = (string)$title;
     }
-    
+
     public function setTime ( $time ) {
         $this->time = $time;
     }
-    
+
     public function setURL ( $url ) {
         $this->url = $url;
     }
-    
+
     public function setTimeSince ( $timeSince ) {
         $this->timeSince = $timeSince;
     }
-    
+
     public function getTitle () {
         return $this->title;
     }
-    
+
     public function getTime () {
         return $this->time;
     }
-    
+
     public function getURL () {
         return $this->url;
     }
-    
+
     public function getTimeSince () {
         return $this->timeSince;
     }
-    
+
     public function getUID () {
         return $this->UID;
     }
-    
+
     public function date ( $format ) {
         return date($format, $this->getTimestamp());
-    }   
-}
-    
-if(!function_exists("cal_days_in_month")){
-    /**
-     * Returns the number of days in a given month and year, taking into account leap years.
-     * The is a replacement function should cal_days_in_month not be availible
-     *
-     * @param $calendar int ignored
-     * @param $month int month (integers 1-12) 
-     * @param $year int year (any integer)
-     * @since 2.3
-     * @access private
-     * @author David Bindel (dbindel at austin dot rr dot com) (http://us.php.net/manual/en/function.cal-days-in-month.php#38666)
-     * @author ben at sparkyb dot net
-     * @return int The content of the post with the appropriate dates inserted (if any)
-    */
-    function cal_days_in_month($calendar, $month, $year){
-        // calculate number of days in a month 
-        return $month == 2 ? ($year % 4 ? 28 : ($year % 100 ? 29 : ($year % 400 ? 28 : 29))) : (($month - 1) % 7 % 2 ? 30 : 31);
     }
 }
 /**
  * Widget class for Countdown Timer
- * 
+ *
  * @since 3.0
  * @access public
@@ -1331 +1317 @@
  */
 class Fergcorp_Countdown_Timer_Widget extends WP_Widget{
-    
+
     public function __construct(){
         global $fergcorp_countdownTimer_init;
@@ -1340 +1326 @@
         );
     }
-    
+
     public function form( $instance){
-        
+
         if ( $instance ) {
             $title = esc_attr( $instance['title'] );
@@ -1351 +1337 @@
             $countLimit = -1;
         }
-        
+
         ?>
         <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' , 'fergcorp_countdownTimer'); ?></label>
@@ -1360 +1346 @@
                         <?php
     }
-    
+
     public function update( $new_instance, $old_instance ){
         $instance['title'] = strip_tags( $new_instance['title'] );
         $instance['countLimit'] = intval($new_instance['countLimit']);
         return $instance;
-        
-    }
-        
+
+    }
+
     public function widget( $args, $instance ){
-        global $fergcorp_countdownTimer_init;   
+        global $fergcorp_countdownTimer_init;
         echo $args['before_widget'];
         if ( ! empty( $instance['title'] ) ) {
@@ -1379 +1365 @@
         $fergcorp_countdownTimer_init->showTimer($instance['countLimit']);
         echo "</ul>";
-    
+
         echo $args['after_widget'];
-    
+
     }
 }
 
 class Fergcorp_DeltaTime{
-        
+
     public $nowYear;
     public $nowMonth;
@@ -1393 +1379 @@
     public $nowMinute;
     public $nowSecond;
-    
+
     public $targetYear;
     public $targetMonth;
@@ -1400 +1386 @@
     public $targetMinute;
     public $targetSecond;
-    
+
     public $y;
     public $m;
@@ -1407 +1393 @@
     public $i;
     public $s;
-    
+
     public $w;
-    
+
     public $delta;
-    
+
     public function __construct($targetTime, $nowTime){
         $this->nowYear = date("Y", $nowTime);
@@ -1419 +1405 @@
         $this->nowMinute = date("i", $nowTime);
         $this->nowSecond = date("s", $nowTime);
-        
+
         $this->targetYear = date("Y", $targetTime);
         $this->targetMonth = date("m", $targetTime);
@@ -1426 +1412 @@
         $this->targetMinute = date("i", $targetTime);
         $this->targetSecond = date("s", $targetTime);
-        
+
         $this->y = $this->targetYear - $this->nowYear;
         $this->m  = $this->targetMonth - $this->nowMonth;
@@ -1433 +1419 @@
         $this->i = $this->targetMinute - $this->nowMinute;
         $this->s = $this->targetSecond - $this->nowSecond;
-        
+
         $this->delta = $targetTime - $nowTime;
     }
@@ -1443 +1429 @@
 
 function fergcorp_countdownTimer($countLimit = -1) {
-    global $fergcorp_countdownTimer_init;   
+    global $fergcorp_countdownTimer_init;
     $fergcorp_countdownTimer_init->showTimer($countLimit, TRUE);
 }
@@ -1451 +1437 @@
             // Load localization domain
     load_plugin_textdomain( 'fergcorp_countdownTimer', false, dirname( plugin_basename( __FILE__ ) ) . '/lang/' );
-                        
+
     $fergcorp_countdownTimer_init = new Fergcorp_Countdown_Timer();
 }

countdown-timer/trunk/js/fergcorp_countdownTimer_java.js

@@ -7 +7 @@
 c-=7*parseInt((c+parseInt(a/86400))/7),i=!0;if(parseInt(b.showDay)){if(i||!parseInt(b.stripZero)||c+parseInt(a/86400))c+=parseInt(a/86400),f=f+'<span class="fergcorp_countdownTimer_day fergcorp_countdownTimer_timeUnit">'+sprintf(_n(fergcorp_countdown_timer_js_lang.day,fergcorp_countdown_timer_js_lang.days,c),c)+"</span> ",a-=86400*parseInt(a/86400),i=!0}else a+=86400*c;if(parseInt(b.showHour)){if(i||!parseInt(b.stripZero)||g+parseInt(a/3600))g+=parseInt(a/3600),f=f+'<span class="fergcorp_countdownTimer_hour fergcorp_countdownTimer_timeUnit">'+
 sprintf(_n(fergcorp_countdown_timer_js_lang.hour,fergcorp_countdown_timer_js_lang.hours,g),g)+"<span> ",a-=3600*parseInt(a/3600),i=!0}else a+=3600*g;if(parseInt(b.showMinute)){if(i||!parseInt(b.stripZero)||h+parseInt(a/60))h+=parseInt(a/60),f=f+'<span class="fergcorp_countdownTimer_minute fergcorp_countdownTimer_timeUnit">'+sprintf(_n(fergcorp_countdown_timer_js_lang.minute,fergcorp_countdown_timer_js_lang.minutes,h),h)+"</span> ",a-=60*parseInt(a/60)}else a+=60*h;parseInt(b.showSecond)&&(l+=a,f=
-f+'<span class="fergcorp_countdownTimer_second fergcorp_countdownTimer_timeUnit">'+sprintf(_n(fergcorp_countdown_timer_js_lang.second,fergcorp_countdown_timer_js_lang.seconds,l),l)+"</span> ");""==f&&(f=parseInt(b.showSecond)?sprintf(fergcorp_countdown_timer_js_lang.seconds,0):parseInt(b.showMinute)?sprintf(fergcorp_countdown_timer_js_lang.minutes,0):parseInt(b.showHour)?sprintf(fergcorp_countdown_timer_js_lang.hours,0):parseInt(b.showDay)?sprintf(fergcorp_countdown_timer_js_lang.days,0):parseInt(b.showWeek)?
-sprintf(fergcorp_countdown_timer_js_lang.weeks,0):parseInt(b.showMonth)?sprintf(fergcorp_countdown_timer_js_lang.months,0):sprintf(fergcorp_countdown_timer_js_lang.years,0));return f.replace(/(, ?<\/span> *)$/,"</span>")}fergcorp_countdownTimer_js();
+f+'<span class="fergcorp_countdownTimer_second fergcorp_countdownTimer_timeUnit">'+sprintf(_n(fergcorp_countdown_timer_js_lang.second,fergcorp_countdown_timer_js_lang.seconds,l),l)+"</span> ");""==f&&(f=parseInt(b.showSecond)?'<span class="fergcorp_countdownTimer_second fergcorp_countdownTimer_timeUnit">'+sprintf(fergcorp_countdown_timer_js_lang.seconds,0)+"</span> ":parseInt(b.showMinute)?'<span class="fergcorp_countdownTimer_minute fergcorp_countdownTimer_timeUnit">'+sprintf(fergcorp_countdown_timer_js_lang.minutes,
+0)+"</span> ":parseInt(b.showHour)?'<span class="fergcorp_countdownTimer_hour fergcorp_countdownTimer_timeUnit">'+sprintf(fergcorp_countdown_timer_js_lang.hours,0)+"</span> ":parseInt(b.showDay)?'<span class="fergcorp_countdownTimer_day fergcorp_countdownTimer_timeUnit">'+sprintf(fergcorp_countdown_timer_js_lang.days,0)+"</span> ":parseInt(b.showWeek)?'<span class="fergcorp_countdownTimer_week fergcorp_countdownTimer_timeUnit">'+sprintf(fergcorp_countdown_timer_js_lang.weeks,0)+"</span> ":parseInt(b.showMonth)?
+'<span class="fergcorp_countdownTimer_month fergcorp_countdownTimer_timeUnit">'+sprintf(fergcorp_countdown_timer_js_lang.months,0)+"</span> ":'<span class="fergcorp_countdownTimer_year fergcorp_countdownTimer_timeUnit">'+sprintf(fergcorp_countdown_timer_js_lang.years,0)+"</span> ");return f.replace(/(, ?<\/span> *)$/,"</span>")}fergcorp_countdownTimer_js();

countdown-timer/trunk/js/fergcorp_countdownTimer_java_debug.js

@@ -222 +222 @@
     if(s==''){
         if(parseInt( getOptions['showSecond'] )){
-            s = sprintf(fergcorp_countdown_timer_js_lang.seconds, 0);
+            s = '<span class="fergcorp_countdownTimer_second fergcorp_countdownTimer_timeUnit">' + sprintf(fergcorp_countdown_timer_js_lang.seconds, 0) + '</span> ';
         }
         else if(parseInt( getOptions['showMinute'] )){
-            s = sprintf(fergcorp_countdown_timer_js_lang.minutes, 0);
+            s = '<span class="fergcorp_countdownTimer_minute fergcorp_countdownTimer_timeUnit">' + sprintf(fergcorp_countdown_timer_js_lang.minutes, 0) + '</span> ';
         }
         else if(parseInt( getOptions['showHour'] )){
-            s = sprintf(fergcorp_countdown_timer_js_lang.hours, 0);
+            s = '<span class="fergcorp_countdownTimer_hour fergcorp_countdownTimer_timeUnit">' + sprintf(fergcorp_countdown_timer_js_lang.hours, 0) + '</span> ';
         }   
         else if(parseInt( getOptions['showDay'] )){
-            s = sprintf(fergcorp_countdown_timer_js_lang.days, 0);
+            s = '<span class="fergcorp_countdownTimer_day fergcorp_countdownTimer_timeUnit">' + sprintf(fergcorp_countdown_timer_js_lang.days, 0) + '</span> ';
         }
         else if(parseInt( getOptions['showWeek'] )){
-            s = sprintf(fergcorp_countdown_timer_js_lang.weeks, 0);
+            s = '<span class="fergcorp_countdownTimer_week fergcorp_countdownTimer_timeUnit">' + sprintf(fergcorp_countdown_timer_js_lang.weeks, 0) + '</span> ';
         }
         else if(parseInt( getOptions['showMonth'] )){
-            s = sprintf(fergcorp_countdown_timer_js_lang.months, 0);
+            s = '<span class="fergcorp_countdownTimer_month fergcorp_countdownTimer_timeUnit">' + sprintf(fergcorp_countdown_timer_js_lang.months, 0) + '</span> ';
         }
         else{
-            s = sprintf(fergcorp_countdown_timer_js_lang.years, 0);
+            s = '<span class="fergcorp_countdownTimer_year fergcorp_countdownTimer_timeUnit">' + sprintf(fergcorp_countdown_timer_js_lang.years, 0) + '</span> ';
         }
     }

countdown-timer/trunk/readme.txt

@@ -3 +3 @@
 Donate link: http://www.andrewferguson.net/2007/03/08/general-note/
 Tags: countdown, timer, count, date, event, widget, countup, age, fun, time, international, i18n, countdown timer, wedding, localization, i18n
-Requires at least: 3.4
+Requires at least: 3.5
 Tested up to: 3.5
-Stable tag: 3.0.3
+Stable tag: 3.0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -175 +175 @@
 2. Example on Blog
 
+== Upgrade Notice ==
+= 3.0.4 =
+A couple of major bug fixes
+
 == Changelog ==
+
+
+= 3.0.4 =
+Release date: 1/12/2013
+
+ * Bug fix: Least Common Unit will now display correctly
+ * Bug fix: Solve issues with admin page not loading
+ * Removed "cal_days_in_month" as everyone should be at the PHP level that supports this now
+ * Wrote unit test suite
 
 = 3.0.3 =
@@ -499 +512 @@
 
 Initial public release
-
-== Upgrade Notice ==
-= 2.4.2 =
- Fixes bug where using fergcorp_countdownTimer function with event limits argument would limit events incorrectly. Fixed issue with translations not working.