Changeset 2316491

Timestamp:

06/02/2020 10:27:26 AM (6 years ago)

Author:

arena

Message:

fixing bugs on week and month schedulers and processors

Location:

mailpress/trunk

Files:

• mp-content/add-ons/MailPress_newsletter.php (modified) (1 diff)
• mp-includes/class/options/newsletter/processors/month-1.php (modified) (1 diff)
• mp-includes/class/options/newsletter/processors/week-1.php (modified) (1 diff)
• mp-includes/class/options/newsletter/schedulers/month.php (modified) (2 diffs)
• mp-includes/class/options/newsletter/schedulers/week.php (modified) (1 diff)

mailpress/trunk/mp-content/add-ons/MailPress_newsletter.php

@@ -381 +381 @@
         wp_schedule_single_event( $now4cron - 1, 'mp_schedule_newsletters', array( 'args' => array( 'event' => '** Install **' ) ) );
 
-        $twicedaily = gmmktime( 0, 0, 50, gmdate( 'n', $now4cron ), gmdate( 'j', $now4cron ), gmdate( 'Y', $now4cron ) ) - get_option( 'gmt_offset' ) * 3600;
+        $twicedaily = gmmktime( 0, 0, 0, gmdate( 'n', $now4cron ), gmdate( 'j', $now4cron ), gmdate( 'Y', $now4cron ) ) - get_option( 'gmt_offset' ) * 3600;
         wp_schedule_event( $twicedaily, 'twicedaily', 'mp_schedule_newsletters', array( 'args' => array( 'event' => '** Twice daily **' ) ) );
     }

mailpress/trunk/mp-includes/class/options/newsletter/processors/month-1.php

@@ -8 +8 @@
         $y = $this->year;
         $m = $this->month;
-        $d = $this->day;
+        $d = $this->get_day( $y, $m );
 
         $h = $this->get_hour();
         $i = $this->get_minute();
 
-        $first_day = $this->get_day( $y, $m );
-
-        if ( $d < $first_day )
-        {
-            $m--; 
-            if ( !$m ) {$m = 12; $y--;}
-            $d = $this->get_day( $y, $m );
-        }
+        if ( $this->day < $d ) $m--;
+        if ( !$m ) {$m = 12; $y--;}
+        $d = $this->get_day( $y, $m );
 
         $this->upper_bound = $this->format_timestamp( $y, $m, $d, $h, $i, 0 );

mailpress/trunk/mp-includes/class/options/newsletter/processors/week-1.php

@@ -19 +19 @@
         {
             $time -= WEEK_IN_SECONDS;
-            $this->upper_bound = date( $format, $time );
+            $this->upper_bound = wp_date( $format, $time );
         }
 

mailpress/trunk/mp-includes/class/options/newsletter/schedulers/month.php

@@ -10 +10 @@
         $y = $this->year;
         $m = $this->month;
-        $d = $this->day;
+        $d = $this->get_day( $y, $m );
 
         $h = $this->get_hour();
         $i = $this->get_minute();
 
-        $first_day = $this->get_day( $y, $m );
-
-        if ( $d > $first_day )
+        if ( $this->day > $d )
         {
             $m++;
@@ -26 +24 @@
         $timestamp = $this->format_timestamp( $y, $m, $d, $h, $i, 0 );
 
-        if ( $timestamp < $this->date )
-        {
-            $m++;
-            if ( $m > 12 ) { $m = 1; $y++; }
-            $d = $this->get_day( $y, $m );
-
-            $timestamp = $this->format_timestamp( $y, $m, $d, $h, $i, 0 );
-        }
-
         return $this->schedule_single_event( $timestamp );
     }

mailpress/trunk/mp-includes/class/options/newsletter/schedulers/week.php

@@ -12 +12 @@
         $format = 'Y-m-d ' . zeroise( $this->get_hour(), 2 ) . ':' . zeroise( $this->get_minute(), 2 ) . ':00';
 
-        $first_wday = $this->get_wday();
-
-        while ( wp_date( 'w', $time ) != $first_wday ) $time += DAY_IN_SECONDS;
+        $wdiff  = $this->get_wday() - $this->wday;
+        if ( $wdiff < 0 ) $wdiff += 7;
+        $time += $wdiff * DAY_IN_SECONDS; 
 
         $timestamp = wp_date( $format, $time );
-
-        if ( $timestamp < $this->date )
-        {
-            $time += WEEK_IN_SECONDS;
-            $timestamp = wp_date( $format, $time );
-        }
 
         return $this->schedule_single_event( $timestamp );