From: Steve Sutton Date: Tue, 13 Feb 2018 16:39:10 +0000 (-0500) Subject: Update for the Event Management import X-Git-Tag: v1.6.77^2~11 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=4a7dcac4dab59b002f0c3f3184ab83ac2f83b4a5;p=WP-Plugins%2Fglm-member-db-events.git Update for the Event Management import Fix the image processing part. Need to get the actual path to the image to pass to our image upload call. For some reason the url doesn't work anymore. --- diff --git a/models/admin/management/events.php b/models/admin/management/events.php index 7c536d5..7c8216e 100644 --- a/models/admin/management/events.php +++ b/models/admin/management/events.php @@ -71,6 +71,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement */ public $events = array(); public $image_owner; + public $next_url = ''; /** * Constructor @@ -121,7 +122,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX. "events WHERE image != '' AND image IS NOT NULL"; $results = $this->wpdb->get_results($sql, ARRAY_A); - $out = '
$results: ' . print_r($results, true) . '
'; + // $out = '
$results: ' . print_r($results, true) . '
'; $imgUrl = 'http://is0.gaslightmedia.com/' . $this->image_owner . '/original/'; foreach ( $results as $event ) { $imageFullUrl = $imgUrl . $event['image']; @@ -151,7 +152,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement WHERE file1 != '' AND file1 IS NOT NULL"; $results = $this->wpdb->get_results($sql, ARRAY_A); $fileUrl = 'http://is0.gaslightmedia.com/' . $this->image_owner . '/original/'; - $out = '
$results: ' . print_r($results, true) . '
'; + // $out = '
$results: ' . print_r($results, true) . '
'; foreach ( $results as $event ) { if ( $event['image']) { $fileFullUrl = $fileUrl . $event['image']; @@ -399,6 +400,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement // Compile template data $template_data = array( + 'next_url' => $this->next_url, 'import_feeds' => $import_feeds, 'option' => $option, 'testResult' => $test_result, @@ -1742,7 +1744,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement return $return_string; } public function importFromEventsManager() { - $limit = 100; + $limit = 10; $debug = false; if ( isset( $_REQUEST['start'] ) ) { $start = filter_var( $_REQUEST['start'], FILTER_VALIDATE_INT ); @@ -1757,6 +1759,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement } else { $this->oldCatMap = $this->getOldCatMap(); } + // $this->oldCatMap = $this->getOldCatMap(); $yearly_events = $daily_events = @@ -1769,6 +1772,19 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement require_once GLM_MEMBERS_PLUGIN_PATH.'/models/admin/ajax/imageUpload.php'; $image_upload = new GlmMembersAdmin_ajax_imageUpload($this->wpdb, $this->config); + $total_events = $this->wpdb->get_var( + " + SELECT count(ID) + FROM " . $this->wpdb->prefix . "posts + WHERE post_type = 'event' + AND post_status = 'publish' + AND ID IN ( + SELECT distinct post_id + FROM " . $this->wpdb->prefix . "em_events + WHERE event_end_date >= '2018-02-01' + )" + ); + $sql = " SELECT * FROM " . $this->wpdb->prefix . "posts @@ -1777,14 +1793,14 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement AND ID IN ( SELECT distinct post_id FROM " . $this->wpdb->prefix . "em_events - -- WHERE event_end_date >= '2017-06-01' - WHERE event_end_date >= '2018-01-26' + WHERE event_end_date >= '2018-02-01' )"; $sql .= " LIMIT $limit OFFSET $start"; $results = $this->wpdb->get_results( $sql, ARRAY_A ); //'
$results: ' . print_r( $results, true ) . '
'; $event_counter = 0; + $domain = get_site_url(); if ( !empty( $results ) ) { foreach ( $results as $post ) { @@ -1804,11 +1820,20 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement $cost = $att_data['Event Cost']; // use the posts table data - $image = wp_get_attachment_image_src( $thumbnail_id, 'large' ); - if ( $image ) { - //echo '
$thumb_src: ' . print_r($thumb_src, true) . '
'; - $res = $image_upload->storeImage($thumb_src[0]); - //echo '
$res: ' . print_r($res, true) . '
'; + $image = ''; + if ( has_post_thumbnail( $post['ID'] ) ) { + $thumbnail_id = get_post_thumbnail_id( $post['ID'] ); + $thumb_src = wp_get_attachment_image_src( $thumbnail_id, 'large' ); + $relative_url = str_replace( $domain, '', $thumb_src[0] ); + $relative_url = substr( $relative_url, 1 ); + // echo '
$relative_url: ' . print_r( $relative_url, true ) . '
'; + $home_path = get_home_path(); + // echo '
$home_path: ' . print_r( $home_path, true ) . '
'; + // echo '
$thumb_src: ' . print_r( $thumb_src, true ) . '
'; + $old_image_path = $home_path . $relative_url; + // echo '
$old_image_path: ' . print_r( $old_image_path, true ) . '
'; + $res = $image_upload->storeImage($old_image_path); + // echo '
$res: ' . print_r($res, true) . '
'; if ( $res['newFileName'] ) { $image = $res['newFileName']; } @@ -1861,6 +1886,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement 'hide_address' => null, 'use_member_location' => 0, ); + // echo '
$event_import_data: ' . print_r( $event_import_data, true ) . '
'; $event_data_format = array( '%d', // Status '%s', // Created @@ -2120,7 +2146,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement } $return_string .= "

Adding $event_counter Events

"; } - echo $this->config['states']; + // echo $this->config['states']; $return_string .= "
             Start: $start
         
"; @@ -2129,6 +2155,14 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement . GLM_MEMBERS_PLUGIN_CURRENT_URL . "?page=glm-members-admin-menu-management&glm_action=events&option=eventsManagerImport&import=true" . "&start=$start\">Next

"; + if ( $start < $total_events ) { + $this->next_url = GLM_MEMBERS_PLUGIN_CURRENT_URL + . "?page=glm-members-admin-menu-management&glm_action=events&option=eventsManagerImport&import=true" + . "&start=$start"; + // $return_string .= ""; + } return $return_string; } } diff --git a/views/admin/management/events.html b/views/admin/management/events.html index 509e52c..42555f8 100644 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@ -400,5 +400,9 @@ } else { $("#calendar-view").val("agenda"); } + + {if $next_url} + window.location.href = '{$next_url}'; + {/if} });