From ed8e1148a1363d0b8140802f6148edce315e2f77 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 24 Jun 2016 14:12:14 -0400 Subject: [PATCH] Update for some yearly issues. Need to initialize the serialized date to null on each loop through the events pulled from time.ly. --- models/admin/management/events.php | 65 +++++++++++++++++------------- 1 file changed, 37 insertions(+), 28 deletions(-) diff --git a/models/admin/management/events.php b/models/admin/management/events.php index acca69c..4c2ddd6 100644 --- a/models/admin/management/events.php +++ b/models/admin/management/events.php @@ -1101,6 +1101,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement AND post_status = 'publish'"; //$sql .= " AND ID IN ( SELECT post_id FROM " . $this->wpdb->prefix . "ai1ec_events //WHERE end >= " . time() . " )"; + //$sql .= " AND ID IN ( 2469, 1640 )"; $sql .= " LIMIT $limit OFFSET $start"; $results = $this->wpdb->get_results( $sql, ARRAY_A ); @@ -1109,6 +1110,8 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement if ( !empty( $results ) ) { foreach ( $results as $post ) { + // Initialize some variables + $serialized_custom_times = null; if ( $debug ) { echo '
'; } @@ -1138,34 +1141,34 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement } // Insert the event data $event_import_data = array( - 'status' => $this->config['status_numb']['Active'], - 'created' => $post['post_date'], - 'updated' => $post['post_modified'], - 'approved' => $post['post_modified'], - 'name' => $post['post_title'], - 'name_slug' => $post['post_name'], - 'intro' => mb_substr( strip_tags( $post['post_content'] ), 0, 80 ), - 'descr' => $post['post_content'], - 'image' => $image, - 'file1' => null, - 'file1_descr' => null, - 'cost' => $cost, - 'free' => $is_free, - 'url' => $event_data['contact_url'], - 'old_event_id' => $post['ID'], -// 'ref_type' => null, - 'ref_type' => 10, - 'ref_dest' => null, - 'admin_name' => $event_data['contact_name'], - 'admin_org' => null, - 'admin_email' => $event_data['contact_email'], - 'admin_phone' => $event_data['contact_phone'], - 'contact_email' => $event_data['contact_email'], - 'contact_name' => $event_data['contact_name'], - 'contact_phone' => $event_data['contact_phone'], - 'notes' => null, - 'hide_address' => null, - 'use_member_location' => 0, + 'status' => $this->config['status_numb']['Active'], + 'created' => $post['post_date'], + 'updated' => $post['post_modified'], + 'approved' => $post['post_modified'], + 'name' => $post['post_title'], + 'name_slug' => $post['post_name'], + 'intro' => mb_substr( strip_tags( $post['post_content'] ), 0, 80 ), + 'descr' => $post['post_content'], + 'image' => $image, + 'file1' => null, + 'file1_descr' => null, + 'cost' => $cost, + 'free' => $is_free, + 'url' => $event_data['contact_url'], + 'old_event_id' => $post['ID'], +// 'ref_type' => null, + 'ref_type' => 10, + 'ref_dest' => null, + 'admin_name' => $event_data['contact_name'], + 'admin_org' => null, + 'admin_email' => $event_data['contact_email'], + 'admin_phone' => $event_data['contact_phone'], + 'contact_email' => $event_data['contact_email'], + 'contact_name' => $event_data['contact_name'], + 'contact_phone' => $event_data['contact_phone'], + 'notes' => null, + 'hide_address' => null, + 'use_member_location' => 0, ); $event_data_format = array( '%d', @@ -1349,7 +1352,10 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement break; case "YEARLY": + $month_ints = $ints = $month_num = null; if ( $recurrence_rules[1] ) { + $ints = 0; + $day_of_month = 0; $yearly_events++; $selected_from_date = substr($from_date, -2); $selected_from_date--; @@ -1412,6 +1418,9 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement $by_day_of_month = 1; } } + $ending_datetime = new DateTime( $to_date ); + $ending_date = $ending_datetime->modify('2 years'); + $to_date = $ending_date->format( 'Y-m-d' ); break; case "MONTHLY": $monthly_events++; -- 2.17.1