eventespresso /
event-espresso-core
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * @return \EE_Response |
| 41 | 41 | */ |
| 42 | 42 | public function __construct() { |
| 43 | - $this->terminate_request( false ); |
|
| 43 | + $this->terminate_request(false); |
|
| 44 | 44 | } |
| 45 | 45 | |
| 46 | 46 | |
@@ -53,8 +53,8 @@ discard block |
||
| 53 | 53 | * @param $value |
| 54 | 54 | * @return void |
| 55 | 55 | */ |
| 56 | - public function set_notice( $key, $value ) { |
|
| 57 | - $this->_notice[ $key ] = $value; |
|
| 56 | + public function set_notice($key, $value) { |
|
| 57 | + $this->_notice[$key] = $value; |
|
| 58 | 58 | } |
| 59 | 59 | |
| 60 | 60 | |
@@ -66,8 +66,8 @@ discard block |
||
| 66 | 66 | * @param $key |
| 67 | 67 | * @return mixed |
| 68 | 68 | */ |
| 69 | - public function get_notice( $key ) { |
|
| 70 | - return isset( $this->_notice[ $key ] ) ? $this->_notice[ $key ] : NULL; |
|
| 69 | + public function get_notice($key) { |
|
| 70 | + return isset($this->_notice[$key]) ? $this->_notice[$key] : NULL; |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | |
@@ -91,8 +91,8 @@ discard block |
||
| 91 | 91 | * @param $string |
| 92 | 92 | * @param bool $append |
| 93 | 93 | */ |
| 94 | - public function add_output( $string, $append = true ) { |
|
| 95 | - $this->_output = $append ? $this->_output . $string : $string . $this->_output; |
|
| 94 | + public function add_output($string, $append = true) { |
|
| 95 | + $this->_output = $append ? $this->_output.$string : $string.$this->_output; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
@@ -121,8 +121,8 @@ discard block |
||
| 121 | 121 | /** |
| 122 | 122 | * @param boolean $request_terminated |
| 123 | 123 | */ |
| 124 | - public function terminate_request( $request_terminated = true ) { |
|
| 125 | - $this->request_terminated = filter_var( $request_terminated, FILTER_VALIDATE_BOOLEAN ); |
|
| 124 | + public function terminate_request($request_terminated = true) { |
|
| 125 | + $this->request_terminated = filter_var($request_terminated, FILTER_VALIDATE_BOOLEAN); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | 128 | |
@@ -1,4 +1,6 @@ |
||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | +} |
|
| 2 | 4 | /** |
| 3 | 5 | * Event Espresso |
| 4 | 6 | * |
@@ -19,13 +19,13 @@ |
||
| 19 | 19 | <html> |
| 20 | 20 | <head> |
| 21 | 21 | <title><?php _e('Ticket Selector', 'event_espresso'); ?></title> |
| 22 | - <?php foreach ( $css as $url ) : ?> |
|
| 23 | - <link rel="stylesheet" type="text/css" href="<?php echo $url;?>"> |
|
| 22 | + <?php foreach ($css as $url) : ?> |
|
| 23 | + <link rel="stylesheet" type="text/css" href="<?php echo $url; ?>"> |
|
| 24 | 24 | <?php endforeach; ?> |
| 25 | 25 | <script type="text/javascript"> |
| 26 | 26 | <?php echo $eei18n; ?> |
| 27 | 27 | </script> |
| 28 | - <?php foreach ( $js as $jsurl ) : ?> |
|
| 28 | + <?php foreach ($js as $jsurl) : ?> |
|
| 29 | 29 | <script type="text/javascript" src="<?php echo $jsurl; ?>"></script> |
| 30 | 30 | <?php endforeach; ?> |
| 31 | 31 | </head> |
@@ -3,30 +3,30 @@ |
||
| 3 | 3 | global $post; |
| 4 | 4 | ?> |
| 5 | 5 | <div class="event-content"> |
| 6 | -<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?> |
|
| 6 | +<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?> |
|
| 7 | 7 | <div class="entry-meta"> |
| 8 | - <span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span> |
|
| 8 | + <span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span> |
|
| 9 | 9 | <?php |
| 10 | - if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : |
|
| 10 | + if ( ! post_password_required() && (comments_open() || get_comments_number())) : |
|
| 11 | 11 | ?> |
| 12 | - <span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span> |
|
| 12 | + <span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span> |
|
| 13 | 13 | <?php |
| 14 | 14 | endif; |
| 15 | - edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' ); |
|
| 15 | + edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>'); |
|
| 16 | 16 | ?> |
| 17 | 17 | </div> |
| 18 | 18 | <?php endif; |
| 19 | - $event_phone = espresso_event_phone( $post->ID, FALSE ); |
|
| 20 | - if ( $event_phone != '' ) : ?> |
|
| 19 | + $event_phone = espresso_event_phone($post->ID, FALSE); |
|
| 20 | + if ($event_phone != '') : ?> |
|
| 21 | 21 | <p> |
| 22 | - <span class="small-text"><strong><?php _e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?> |
|
| 22 | + <span class="small-text"><strong><?php _e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?> |
|
| 23 | 23 | </p> |
| 24 | -<?php endif; ?> |
|
| 24 | +<?php endif; ?> |
|
| 25 | 25 | <?php |
| 26 | - if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) { |
|
| 27 | - do_action( 'AHEE_event_details_before_the_content', $post ); |
|
| 28 | - apply_filters( 'FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt() ); |
|
| 29 | - do_action( 'AHEE_event_details_after_the_content', $post ); |
|
| 26 | + if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) { |
|
| 27 | + do_action('AHEE_event_details_before_the_content', $post); |
|
| 28 | + apply_filters('FHEE__content_espresso_events_details_template__the_content', espresso_event_content_or_excerpt()); |
|
| 29 | + do_action('AHEE_event_details_after_the_content', $post); |
|
| 30 | 30 | } |
| 31 | 31 | ?> |
| 32 | 32 | </div> |
@@ -21,22 +21,22 @@ discard block |
||
| 21 | 21 | * and/or use any of the template tags functions found in: |
| 22 | 22 | * \wp-content\plugins\event-espresso-core\public\template_tags.php |
| 23 | 23 | ************************** IMPORTANT **************************/ |
| 24 | -add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_false' ); |
|
| 24 | +add_filter('FHEE__content_espresso_events__template_loaded', '__return_false'); |
|
| 25 | 25 | |
| 26 | 26 | //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>'; |
| 27 | 27 | |
| 28 | 28 | global $post; |
| 29 | -$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : ''; |
|
| 30 | -$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class ); |
|
| 29 | +$event_class = has_excerpt($post->ID) ? ' has-excerpt' : ''; |
|
| 30 | +$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class); |
|
| 31 | 31 | ?> |
| 32 | -<?php do_action( 'AHEE_event_details_before_post', $post ); ?> |
|
| 33 | -<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>> |
|
| 32 | +<?php do_action('AHEE_event_details_before_post', $post); ?> |
|
| 33 | +<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>> |
|
| 34 | 34 | |
| 35 | -<?php if ( is_single() ) : ?> |
|
| 35 | +<?php if (is_single()) : ?> |
|
| 36 | 36 | |
| 37 | - <div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv"> |
|
| 38 | - <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?> |
|
| 39 | - <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?> |
|
| 37 | + <div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv"> |
|
| 38 | + <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?> |
|
| 39 | + <?php espresso_get_template_part('content', 'espresso_events-header'); ?> |
|
| 40 | 40 | </div> |
| 41 | 41 | |
| 42 | 42 | <div class="espresso-event-wrapper-dv"> |
@@ -46,16 +46,16 @@ discard block |
||
| 46 | 46 | <?php //espresso_get_template_part( 'content', 'espresso_events-details' ); ?> |
| 47 | 47 | <?php //espresso_get_template_part( 'content', 'espresso_events-venues' ); ?> |
| 48 | 48 | <footer class="event-meta"> |
| 49 | - <?php do_action( 'AHEE_event_details_footer_top', $post ); ?> |
|
| 50 | - <?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?> |
|
| 49 | + <?php do_action('AHEE_event_details_footer_top', $post); ?> |
|
| 50 | + <?php do_action('AHEE_event_details_footer_bottom', $post); ?> |
|
| 51 | 51 | </footer> |
| 52 | 52 | </div> |
| 53 | 53 | |
| 54 | -<?php elseif ( is_archive() ) : ?> |
|
| 54 | +<?php elseif (is_archive()) : ?> |
|
| 55 | 55 | |
| 56 | - <div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv"> |
|
| 57 | - <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?> |
|
| 58 | - <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?> |
|
| 56 | + <div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv"> |
|
| 57 | + <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?> |
|
| 58 | + <?php espresso_get_template_part('content', 'espresso_events-header'); ?> |
|
| 59 | 59 | </div> |
| 60 | 60 | |
| 61 | 61 | <div class="espresso-event-list-wrapper-dv"> |
@@ -70,5 +70,5 @@ discard block |
||
| 70 | 70 | |
| 71 | 71 | </article> |
| 72 | 72 | <!-- #post --> |
| 73 | -<?php do_action( 'AHEE_event_details_after_post', $post ); |
|
| 73 | +<?php do_action('AHEE_event_details_after_post', $post); |
|
| 74 | 74 | |
@@ -18,52 +18,52 @@ |
||
| 18 | 18 | * and/or use any of the template tags functions found in: |
| 19 | 19 | * \wp-content\plugins\event-espresso-core\public\template_tags.php |
| 20 | 20 | ************************** IMPORTANT **************************/ |
| 21 | -add_filter( 'FHEE__content_espresso_events__template_loaded', '__return_true' ); |
|
| 21 | +add_filter('FHEE__content_espresso_events__template_loaded', '__return_true'); |
|
| 22 | 22 | |
| 23 | 23 | //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>'; |
| 24 | 24 | |
| 25 | 25 | global $post; |
| 26 | -$event_class = has_excerpt( $post->ID ) ? ' has-excerpt' : ''; |
|
| 27 | -$event_class = apply_filters( 'FHEE__content_espresso_events__event_class', $event_class ); |
|
| 26 | +$event_class = has_excerpt($post->ID) ? ' has-excerpt' : ''; |
|
| 27 | +$event_class = apply_filters('FHEE__content_espresso_events__event_class', $event_class); |
|
| 28 | 28 | ?> |
| 29 | -<?php do_action( 'AHEE_event_details_before_post', $post ); ?> |
|
| 30 | -<article id="post-<?php the_ID(); ?>" <?php post_class( $event_class ); ?>> |
|
| 29 | +<?php do_action('AHEE_event_details_before_post', $post); ?> |
|
| 30 | +<article id="post-<?php the_ID(); ?>" <?php post_class($event_class); ?>> |
|
| 31 | 31 | |
| 32 | -<?php if ( is_single() ) : ?> |
|
| 32 | +<?php if (is_single()) : ?> |
|
| 33 | 33 | |
| 34 | - <div id="espresso-event-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv"> |
|
| 35 | - <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?> |
|
| 36 | - <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?> |
|
| 34 | + <div id="espresso-event-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv"> |
|
| 35 | + <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?> |
|
| 36 | + <?php espresso_get_template_part('content', 'espresso_events-header'); ?> |
|
| 37 | 37 | </div> |
| 38 | 38 | |
| 39 | 39 | <div class="espresso-event-wrapper-dv"> |
| 40 | - <?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?> |
|
| 41 | - <?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?> |
|
| 42 | - <?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?> |
|
| 43 | - <?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?> |
|
| 40 | + <?php espresso_get_template_part('content', 'espresso_events-tickets'); ?> |
|
| 41 | + <?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?> |
|
| 42 | + <?php espresso_get_template_part('content', 'espresso_events-details'); ?> |
|
| 43 | + <?php espresso_get_template_part('content', 'espresso_events-venues'); ?> |
|
| 44 | 44 | <footer class="event-meta"> |
| 45 | - <?php do_action( 'AHEE_event_details_footer_top', $post ); ?> |
|
| 46 | - <?php do_action( 'AHEE_event_details_footer_bottom', $post ); ?> |
|
| 45 | + <?php do_action('AHEE_event_details_footer_top', $post); ?> |
|
| 46 | + <?php do_action('AHEE_event_details_footer_bottom', $post); ?> |
|
| 47 | 47 | </footer> |
| 48 | 48 | </div> |
| 49 | 49 | |
| 50 | -<?php elseif ( is_archive() ) : ?> |
|
| 50 | +<?php elseif (is_archive()) : ?> |
|
| 51 | 51 | |
| 52 | - <div id="espresso-event-list-header-dv-<?php echo $post->ID;?>" class="espresso-event-header-dv"> |
|
| 53 | - <?php espresso_get_template_part( 'content', 'espresso_events-thumbnail' ); ?> |
|
| 54 | - <?php espresso_get_template_part( 'content', 'espresso_events-header' ); ?> |
|
| 52 | + <div id="espresso-event-list-header-dv-<?php echo $post->ID; ?>" class="espresso-event-header-dv"> |
|
| 53 | + <?php espresso_get_template_part('content', 'espresso_events-thumbnail'); ?> |
|
| 54 | + <?php espresso_get_template_part('content', 'espresso_events-header'); ?> |
|
| 55 | 55 | </div> |
| 56 | 56 | |
| 57 | 57 | <div class="espresso-event-list-wrapper-dv"> |
| 58 | - <?php espresso_get_template_part( 'content', 'espresso_events-tickets' ); ?> |
|
| 59 | - <?php espresso_get_template_part( 'content', 'espresso_events-datetimes' ); ?> |
|
| 60 | - <?php espresso_get_template_part( 'content', 'espresso_events-details' ); ?> |
|
| 61 | - <?php espresso_get_template_part( 'content', 'espresso_events-venues' ); ?> |
|
| 58 | + <?php espresso_get_template_part('content', 'espresso_events-tickets'); ?> |
|
| 59 | + <?php espresso_get_template_part('content', 'espresso_events-datetimes'); ?> |
|
| 60 | + <?php espresso_get_template_part('content', 'espresso_events-details'); ?> |
|
| 61 | + <?php espresso_get_template_part('content', 'espresso_events-venues'); ?> |
|
| 62 | 62 | </div> |
| 63 | 63 | |
| 64 | 64 | <?php endif; ?> |
| 65 | 65 | |
| 66 | 66 | </article> |
| 67 | 67 | <!-- #post --> |
| 68 | -<?php do_action( 'AHEE_event_details_after_post', $post ); |
|
| 68 | +<?php do_action('AHEE_event_details_after_post', $post); |
|
| 69 | 69 | |
@@ -87,6 +87,11 @@ |
||
| 87 | 87 | public function count_units_to_process() { |
| 88 | 88 | return \EEM_Attendee::instance()->count(); |
| 89 | 89 | } |
| 90 | + |
|
| 91 | + /** |
|
| 92 | + * @param integer $offset |
|
| 93 | + * @param integer $limit |
|
| 94 | + */ |
|
| 90 | 95 | public function get_csv_data( $offset, $limit ) { |
| 91 | 96 | $attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( |
| 92 | 97 | array( |
@@ -99,10 +99,10 @@ |
||
| 99 | 99 | if( $field_name == 'STA_ID' ){ |
| 100 | 100 | $state_name_field = \EEM_State::instance()->field_settings_for( 'STA_name' ); |
| 101 | 101 | $csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ]; |
| 102 | - }elseif( $field_name == 'CNT_ISO' ){ |
|
| 102 | + } elseif( $field_name == 'CNT_ISO' ){ |
|
| 103 | 103 | $country_name_field = \EEM_Country::instance()->field_settings_for( 'CNT_name' ); |
| 104 | 104 | $csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ]; |
| 105 | - }else{ |
|
| 105 | + } else{ |
|
| 106 | 106 | $csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ]; |
| 107 | 107 | } |
| 108 | 108 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | use EventEspressoBatchRequest\Helpers\JobParameters; |
| 19 | 19 | use EventEspressoBatchRequest\Helpers\JobStepResponse; |
| 20 | 20 | |
| 21 | -if (!defined('EVENT_ESPRESSO_VERSION')) { |
|
| 21 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 22 | 22 | exit('No direct script access allowed'); |
| 23 | 23 | } |
| 24 | 24 | |
@@ -27,84 +27,84 @@ discard block |
||
| 27 | 27 | |
| 28 | 28 | |
| 29 | 29 | public function create_job(JobParameters $job_parameters) { |
| 30 | - if( ! \EE_Capabilities::instance()->current_user_can( 'ee_read_contacts', 'generating_report' ) ) { |
|
| 30 | + if ( ! \EE_Capabilities::instance()->current_user_can('ee_read_contacts', 'generating_report')) { |
|
| 31 | 31 | throw new BatchRequestException( |
| 32 | - __( 'You do not have permission to view contacts', 'event_espresso') |
|
| 32 | + __('You do not have permission to view contacts', 'event_espresso') |
|
| 33 | 33 | ); |
| 34 | 34 | } |
| 35 | 35 | $filepath = $this->create_file_from_job_with_name( |
| 36 | 36 | $job_parameters->job_id(), |
| 37 | 37 | __('contact-list-report.csv', 'event_espresso') |
| 38 | 38 | ); |
| 39 | - $job_parameters->add_extra_data( 'filepath', $filepath ); |
|
| 40 | - $job_parameters->set_job_size( $this->count_units_to_process() ); |
|
| 39 | + $job_parameters->add_extra_data('filepath', $filepath); |
|
| 40 | + $job_parameters->set_job_size($this->count_units_to_process()); |
|
| 41 | 41 | //we should also set the header columns |
| 42 | - $csv_data_for_row = $this->get_csv_data( 0, 1 ); |
|
| 43 | - \EEH_Export::write_data_array_to_csv( $filepath, $csv_data_for_row, true ); |
|
| 42 | + $csv_data_for_row = $this->get_csv_data(0, 1); |
|
| 43 | + \EEH_Export::write_data_array_to_csv($filepath, $csv_data_for_row, true); |
|
| 44 | 44 | //if we actually processed a row there, record it |
| 45 | - if( $job_parameters->job_size() ) { |
|
| 46 | - $job_parameters->mark_processed( 1 ); |
|
| 45 | + if ($job_parameters->job_size()) { |
|
| 46 | + $job_parameters->mark_processed(1); |
|
| 47 | 47 | } |
| 48 | 48 | return new JobStepResponse( |
| 49 | 49 | $job_parameters, |
| 50 | - __( 'Contacts report started successfully...', 'event_espresso' ) |
|
| 50 | + __('Contacts report started successfully...', 'event_espresso') |
|
| 51 | 51 | ); |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | |
| 55 | 55 | public function continue_job(JobParameters $job_parameters, $batch_size = 50) { |
| 56 | - $csv_data = $this->get_csv_data( $job_parameters->units_processed(), $batch_size ); |
|
| 57 | - \EEH_Export::write_data_array_to_csv( $job_parameters->extra_datum( 'filepath' ), $csv_data, false ); |
|
| 58 | - $units_processed = count( $csv_data ); |
|
| 59 | - $job_parameters->mark_processed( $units_processed ); |
|
| 56 | + $csv_data = $this->get_csv_data($job_parameters->units_processed(), $batch_size); |
|
| 57 | + \EEH_Export::write_data_array_to_csv($job_parameters->extra_datum('filepath'), $csv_data, false); |
|
| 58 | + $units_processed = count($csv_data); |
|
| 59 | + $job_parameters->mark_processed($units_processed); |
|
| 60 | 60 | $extra_response_data = array( |
| 61 | 61 | 'file_url' => '' |
| 62 | 62 | ); |
| 63 | - if( $units_processed < $batch_size ) { |
|
| 64 | - $job_parameters->set_status( JobParameters::status_complete ); |
|
| 65 | - $extra_response_data[ 'file_url' ] = $this->get_url_to_file( $job_parameters->extra_datum( 'filepath' ) ); |
|
| 63 | + if ($units_processed < $batch_size) { |
|
| 64 | + $job_parameters->set_status(JobParameters::status_complete); |
|
| 65 | + $extra_response_data['file_url'] = $this->get_url_to_file($job_parameters->extra_datum('filepath')); |
|
| 66 | 66 | } |
| 67 | 67 | return new JobStepResponse( |
| 68 | 68 | $job_parameters, |
| 69 | 69 | sprintf( |
| 70 | - __( 'Wrote %1$s rows to report CSV file...', 'event_espresso' ), |
|
| 71 | - count( $csv_data ) ), |
|
| 70 | + __('Wrote %1$s rows to report CSV file...', 'event_espresso'), |
|
| 71 | + count($csv_data) ), |
|
| 72 | 72 | $extra_response_data ); |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | |
| 76 | 76 | public function cleanup_job(JobParameters $job_parameters) { |
| 77 | 77 | $this->_file_helper->delete( |
| 78 | - \EEH_File::remove_filename_from_filepath( $job_parameters->extra_datum( 'filepath' ) ), |
|
| 78 | + \EEH_File::remove_filename_from_filepath($job_parameters->extra_datum('filepath')), |
|
| 79 | 79 | true, |
| 80 | 80 | 'd' |
| 81 | 81 | ); |
| 82 | - return new JobStepResponse( $job_parameters, __( 'Cleaned up temporary file', 'event_espresso' ) ); |
|
| 82 | + return new JobStepResponse($job_parameters, __('Cleaned up temporary file', 'event_espresso')); |
|
| 83 | 83 | } |
| 84 | 84 | |
| 85 | 85 | public function count_units_to_process() { |
| 86 | - return \EEM_Attendee::instance()->count( array( 'caps' => \EEM_Base::caps_read_admin )); |
|
| 86 | + return \EEM_Attendee::instance()->count(array('caps' => \EEM_Base::caps_read_admin)); |
|
| 87 | 87 | } |
| 88 | - public function get_csv_data( $offset, $limit ) { |
|
| 88 | + public function get_csv_data($offset, $limit) { |
|
| 89 | 89 | $attendee_rows = \EEM_Attendee::instance()->get_all_wpdb_results( |
| 90 | 90 | array( |
| 91 | - 'limit' => array( $offset, $limit ), |
|
| 92 | - 'force_join' => array( 'State', 'Country' ), |
|
| 91 | + 'limit' => array($offset, $limit), |
|
| 92 | + 'force_join' => array('State', 'Country'), |
|
| 93 | 93 | 'caps' => \EEM_Base::caps_read_admin |
| 94 | 94 | ) |
| 95 | 95 | ); |
| 96 | 96 | $csv_data = array(); |
| 97 | - foreach( $attendee_rows as $attendee_row ){ |
|
| 97 | + foreach ($attendee_rows as $attendee_row) { |
|
| 98 | 98 | $csv_row = array(); |
| 99 | - foreach( \EEM_Attendee::instance()->field_settings() as $field_name => $field_obj ){ |
|
| 100 | - if( $field_name == 'STA_ID' ){ |
|
| 101 | - $state_name_field = \EEM_State::instance()->field_settings_for( 'STA_name' ); |
|
| 102 | - $csv_row[ __( 'State', 'event_espresso' ) ] = $attendee_row[ $state_name_field->get_qualified_column() ]; |
|
| 103 | - }elseif( $field_name == 'CNT_ISO' ){ |
|
| 104 | - $country_name_field = \EEM_Country::instance()->field_settings_for( 'CNT_name' ); |
|
| 105 | - $csv_row[ __( 'Country', 'event_espresso' ) ] = $attendee_row[ $country_name_field->get_qualified_column() ]; |
|
| 106 | - }else{ |
|
| 107 | - $csv_row[ $field_obj->get_nicename() ] = $attendee_row[ $field_obj->get_qualified_column() ]; |
|
| 99 | + foreach (\EEM_Attendee::instance()->field_settings() as $field_name => $field_obj) { |
|
| 100 | + if ($field_name == 'STA_ID') { |
|
| 101 | + $state_name_field = \EEM_State::instance()->field_settings_for('STA_name'); |
|
| 102 | + $csv_row[__('State', 'event_espresso')] = $attendee_row[$state_name_field->get_qualified_column()]; |
|
| 103 | + }elseif ($field_name == 'CNT_ISO') { |
|
| 104 | + $country_name_field = \EEM_Country::instance()->field_settings_for('CNT_name'); |
|
| 105 | + $csv_row[__('Country', 'event_espresso')] = $attendee_row[$country_name_field->get_qualified_column()]; |
|
| 106 | + } else { |
|
| 107 | + $csv_row[$field_obj->get_nicename()] = $attendee_row[$field_obj->get_qualified_column()]; |
|
| 108 | 108 | } |
| 109 | 109 | } |
| 110 | 110 | $csv_data[] = $csv_row; |
@@ -24,15 +24,15 @@ |
||
| 24 | 24 | */ |
| 25 | 25 | public function __construct() { |
| 26 | 26 | static $initialized = false; |
| 27 | - if ( ! $initialized ) { |
|
| 27 | + if ( ! $initialized) { |
|
| 28 | 28 | // instantiate PSR4 autoloader |
| 29 | - espresso_load_required( 'Psr4Autoloader', EE_CORE . 'Psr4Autoloader.php' ); |
|
| 29 | + espresso_load_required('Psr4Autoloader', EE_CORE.'Psr4Autoloader.php'); |
|
| 30 | 30 | EE_Psr4AutoloaderInit::$psr4_loader = new \EventEspresso\Core\Psr4Autoloader(); |
| 31 | 31 | // register the autoloader |
| 32 | 32 | EE_Psr4AutoloaderInit::$psr4_loader->register(); |
| 33 | 33 | // register the base directories for the namespace prefix |
| 34 | - EE_Psr4AutoloaderInit::$psr4_loader->addNamespace( 'EventEspresso', EE_PLUGIN_DIR_PATH ); |
|
| 35 | - EE_Psr4AutoloaderInit::$psr4_loader->addNamespace( 'EventEspressoBatchRequest', EE_LIBRARIES . 'batch' ); |
|
| 34 | + EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspresso', EE_PLUGIN_DIR_PATH); |
|
| 35 | + EE_Psr4AutoloaderInit::$psr4_loader->addNamespace('EventEspressoBatchRequest', EE_LIBRARIES.'batch'); |
|
| 36 | 36 | $initialized = true; |
| 37 | 37 | } |
| 38 | 38 | } |
@@ -87,13 +87,13 @@ |
||
| 87 | 87 | |
| 88 | 88 | /** |
| 89 | 89 | * |
| 90 | - * Writes a row to the csv file |
|
| 91 | - * @param array $row - individual row of csv data |
|
| 92 | - * @param string $delimiter - csv delimiter |
|
| 93 | - * @param string $enclosure - csv enclosure |
|
| 94 | - * @param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value |
|
| 95 | - * @return string of text for teh csv file |
|
| 96 | - */ |
|
| 90 | + * Writes a row to the csv file |
|
| 91 | + * @param array $row - individual row of csv data |
|
| 92 | + * @param string $delimiter - csv delimiter |
|
| 93 | + * @param string $enclosure - csv enclosure |
|
| 94 | + * @param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value |
|
| 95 | + * @return string of text for teh csv file |
|
| 96 | + */ |
|
| 97 | 97 | public static function get_csv_row ( array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false ) { |
| 98 | 98 | //Allow user to filter the csv delimiter and enclosure for other countries csv standards |
| 99 | 99 | $delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter ); |
@@ -30,7 +30,7 @@ discard block |
||
| 30 | 30 | * @param EE_Model_Field_Base $field |
| 31 | 31 | * @return string |
| 32 | 32 | */ |
| 33 | - public static function get_column_name_for_field(EE_Model_Field_Base $field){ |
|
| 33 | + public static function get_column_name_for_field(EE_Model_Field_Base $field) { |
|
| 34 | 34 | return $field->get_nicename()."[".$field->get_name()."]"; |
| 35 | 35 | } |
| 36 | 36 | |
@@ -52,32 +52,32 @@ discard block |
||
| 52 | 52 | * we consider that a success (because we wrote everything there was...nothing) |
| 53 | 53 | * @throws EE_Error |
| 54 | 54 | */ |
| 55 | - public static function write_data_array_to_csv( $filepath, $data, $write_column_headers = true ){ |
|
| 55 | + public static function write_data_array_to_csv($filepath, $data, $write_column_headers = true) { |
|
| 56 | 56 | EE_Registry::instance()->load_helper('Array'); |
| 57 | 57 | |
| 58 | 58 | $new_file_contents = ''; |
| 59 | 59 | //determine if $data is actually a 2d array |
| 60 | - if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){ |
|
| 60 | + if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) { |
|
| 61 | 61 | //make sure top level is numerically indexed, |
| 62 | 62 | |
| 63 | - if( EEH_Array::is_associative_array($data)){ |
|
| 64 | - throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s","event_espresso"),implode(",",array_keys($data)))); |
|
| 63 | + if (EEH_Array::is_associative_array($data)) { |
|
| 64 | + throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data)))); |
|
| 65 | 65 | } |
| 66 | 66 | $item_in_top_level_array = EEH_Array::get_one_item_from_array($data); |
| 67 | 67 | //now, is the last item in the top-level array of $data an associative or numeric array? |
| 68 | - if( $write_column_headers && |
|
| 69 | - EEH_Array::is_associative_array($item_in_top_level_array)){ |
|
| 68 | + if ($write_column_headers && |
|
| 69 | + EEH_Array::is_associative_array($item_in_top_level_array)) { |
|
| 70 | 70 | //its associative, so we want to output its keys as column headers |
| 71 | 71 | $keys = array_keys($item_in_top_level_array); |
| 72 | - $new_file_contents .= EEH_Export::get_csv_row( $keys ); |
|
| 72 | + $new_file_contents .= EEH_Export::get_csv_row($keys); |
|
| 73 | 73 | |
| 74 | 74 | } |
| 75 | 75 | //start writing data |
| 76 | - foreach($data as $data_row){ |
|
| 77 | - $new_file_contents .= EEH_Export::get_csv_row( $data_row); |
|
| 76 | + foreach ($data as $data_row) { |
|
| 77 | + $new_file_contents .= EEH_Export::get_csv_row($data_row); |
|
| 78 | 78 | } |
| 79 | - return EEH_File::write_to_file( $filepath, EEH_File::get_file_contents( $filepath ) . $new_file_contents ); |
|
| 80 | - }else{ |
|
| 79 | + return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath).$new_file_contents); |
|
| 80 | + } else { |
|
| 81 | 81 | //no data TO write... so we can assume that's a success |
| 82 | 82 | return true; |
| 83 | 83 | } |
@@ -94,29 +94,29 @@ discard block |
||
| 94 | 94 | * @param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value |
| 95 | 95 | * @return string of text for teh csv file |
| 96 | 96 | */ |
| 97 | - public static function get_csv_row ( array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false ) { |
|
| 97 | + public static function get_csv_row(array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false) { |
|
| 98 | 98 | //Allow user to filter the csv delimiter and enclosure for other countries csv standards |
| 99 | - $delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter ); |
|
| 100 | - $enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure ); |
|
| 99 | + $delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter); |
|
| 100 | + $enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure); |
|
| 101 | 101 | |
| 102 | 102 | $delimiter_esc = preg_quote($delimiter, '/'); |
| 103 | 103 | $enclosure_esc = preg_quote($enclosure, '/'); |
| 104 | 104 | |
| 105 | 105 | $output = array(); |
| 106 | 106 | foreach ($row as $field_value) { |
| 107 | - if(is_object($field_value) || is_array($field_value)){ |
|
| 107 | + if (is_object($field_value) || is_array($field_value)) { |
|
| 108 | 108 | $field_value = serialize($field_value); |
| 109 | 109 | } |
| 110 | - if ($field_value === null && $mysql_null ) { |
|
| 110 | + if ($field_value === null && $mysql_null) { |
|
| 111 | 111 | $output[] = 'NULL'; |
| 112 | 112 | continue; |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | $output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ? |
| 116 | - ( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value; |
|
| 116 | + ($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value; |
|
| 117 | 117 | } |
| 118 | 118 | |
| 119 | - return implode($delimiter, $output) . PHP_EOL; |
|
| 119 | + return implode($delimiter, $output).PHP_EOL; |
|
| 120 | 120 | } |
| 121 | 121 | |
| 122 | 122 | |
@@ -129,19 +129,19 @@ discard block |
||
| 129 | 129 | * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty |
| 130 | 130 | * @return string |
| 131 | 131 | */ |
| 132 | - public static function prepare_value_from_db_for_display( $model, $field_name, $raw_db_value, $pretty_schema = true ) { |
|
| 133 | - $field_obj = $model->field_settings_for( $field_name ); |
|
| 134 | - $value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value ); |
|
| 135 | - if( $field_obj instanceof EE_Datetime_Field ) { |
|
| 136 | - $field_obj->set_date_format( EEH_Export::get_date_format_for_export( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema ); |
|
| 137 | - $field_obj->set_time_format( EEH_Export::get_time_format_for_export( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema ); |
|
| 132 | + public static function prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) { |
|
| 133 | + $field_obj = $model->field_settings_for($field_name); |
|
| 134 | + $value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value); |
|
| 135 | + if ($field_obj instanceof EE_Datetime_Field) { |
|
| 136 | + $field_obj->set_date_format(EEH_Export::get_date_format_for_export($field_obj->get_date_format($pretty_schema)), $pretty_schema); |
|
| 137 | + $field_obj->set_time_format(EEH_Export::get_time_format_for_export($field_obj->get_time_format($pretty_schema)), $pretty_schema); |
|
| 138 | 138 | } |
| 139 | - if( $pretty_schema === true){ |
|
| 140 | - return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj ); |
|
| 141 | - }elseif( is_string( $pretty_schema ) ) { |
|
| 142 | - return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema ); |
|
| 143 | - }else{ |
|
| 144 | - return $field_obj->prepare_for_get( $value_on_model_obj ); |
|
| 139 | + if ($pretty_schema === true) { |
|
| 140 | + return $field_obj->prepare_for_pretty_echoing($value_on_model_obj); |
|
| 141 | + }elseif (is_string($pretty_schema)) { |
|
| 142 | + return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema); |
|
| 143 | + } else { |
|
| 144 | + return $field_obj->prepare_for_get($value_on_model_obj); |
|
| 145 | 145 | } |
| 146 | 146 | } |
| 147 | 147 | |
@@ -152,8 +152,8 @@ discard block |
||
| 152 | 152 | * @param string $current_format |
| 153 | 153 | * @return string |
| 154 | 154 | */ |
| 155 | - public static function get_date_format_for_export( $current_format = null ) { |
|
| 156 | - return apply_filters( 'FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format ); |
|
| 155 | + public static function get_date_format_for_export($current_format = null) { |
|
| 156 | + return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format); |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | |
@@ -163,8 +163,8 @@ discard block |
||
| 163 | 163 | * @param string $current_format |
| 164 | 164 | * @return string |
| 165 | 165 | */ |
| 166 | - public static function get_time_format_for_export( $current_format = null ) { |
|
| 167 | - return apply_filters( 'FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format ); |
|
| 166 | + public static function get_time_format_for_export($current_format = null) { |
|
| 167 | + return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format); |
|
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | |
@@ -1,4 +1,6 @@ discard block |
||
| 1 | -<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
|
| 1 | +<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 2 | + exit('No direct script access allowed'); |
|
| 3 | +} |
|
| 2 | 4 | /** |
| 3 | 5 | * Event Espresso |
| 4 | 6 | * |
@@ -77,7 +79,7 @@ discard block |
||
| 77 | 79 | $new_file_contents .= EEH_Export::get_csv_row( $data_row); |
| 78 | 80 | } |
| 79 | 81 | return EEH_File::write_to_file( $filepath, EEH_File::get_file_contents( $filepath ) . $new_file_contents ); |
| 80 | - }else{ |
|
| 82 | + } else{ |
|
| 81 | 83 | //no data TO write... so we can assume that's a success |
| 82 | 84 | return true; |
| 83 | 85 | } |
@@ -138,9 +140,9 @@ discard block |
||
| 138 | 140 | } |
| 139 | 141 | if( $pretty_schema === true){ |
| 140 | 142 | return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj ); |
| 141 | - }elseif( is_string( $pretty_schema ) ) { |
|
| 143 | + } elseif( is_string( $pretty_schema ) ) { |
|
| 142 | 144 | return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema ); |
| 143 | - }else{ |
|
| 145 | + } else{ |
|
| 144 | 146 | return $field_obj->prepare_for_get( $value_on_model_obj ); |
| 145 | 147 | } |
| 146 | 148 | } |
@@ -23,8 +23,8 @@ discard block |
||
| 23 | 23 | use EventEspressoBatchRequest\Helpers\JobParameters; |
| 24 | 24 | use EventEspressoBatchRequest\Helpers\JobStepResponse; |
| 25 | 25 | |
| 26 | -if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) { |
|
| 27 | - exit( 'No direct script access allowed' ); |
|
| 26 | +if ( ! defined('EVENT_ESPRESSO_VERSION')) { |
|
| 27 | + exit('No direct script access allowed'); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | |
@@ -50,32 +50,32 @@ discard block |
||
| 50 | 50 | * @param array $request_data to be used by the batch job handler |
| 51 | 51 | * @return JobStepResponse |
| 52 | 52 | */ |
| 53 | - public function create_job( $batch_job_handler_class, $request_data ) { |
|
| 53 | + public function create_job($batch_job_handler_class, $request_data) { |
|
| 54 | 54 | try { |
| 55 | - $this->_job_id = wp_generate_password( 15, false ); |
|
| 56 | - $obj = $this->instantiate_batch_job_handler_from_classname( $batch_job_handler_class ); |
|
| 57 | - $this->_job_parameters = new JobParameters( $this->_job_id, $batch_job_handler_class, $request_data ); |
|
| 58 | - $response = $obj->create_job( $this->_job_parameters ); |
|
| 59 | - if( ! $response instanceof JobStepResponse ) { |
|
| 55 | + $this->_job_id = wp_generate_password(15, false); |
|
| 56 | + $obj = $this->instantiate_batch_job_handler_from_classname($batch_job_handler_class); |
|
| 57 | + $this->_job_parameters = new JobParameters($this->_job_id, $batch_job_handler_class, $request_data); |
|
| 58 | + $response = $obj->create_job($this->_job_parameters); |
|
| 59 | + if ( ! $response instanceof JobStepResponse) { |
|
| 60 | 60 | throw new BatchRequestException( |
| 61 | 61 | sprintf( |
| 62 | - __( 'The class implementing JobHandlerInterface did not return a JobStepResponse when create_job was called with %1$s. It needs to return one or throw an Exception', 'event_espresso' ), |
|
| 63 | - wp_json_encode( $request_data ) |
|
| 62 | + __('The class implementing JobHandlerInterface did not return a JobStepResponse when create_job was called with %1$s. It needs to return one or throw an Exception', 'event_espresso'), |
|
| 63 | + wp_json_encode($request_data) |
|
| 64 | 64 | ) |
| 65 | 65 | ); |
| 66 | 66 | } |
| 67 | - $success = $this->_job_parameters->save( true ); |
|
| 68 | - if( ! $success ) { |
|
| 67 | + $success = $this->_job_parameters->save(true); |
|
| 68 | + if ( ! $success) { |
|
| 69 | 69 | throw new BatchRequestException( |
| 70 | 70 | sprintf( |
| 71 | 71 | __('Could not save job %1$s to the Wordpress Options table. These were the arguments used: %2$s', 'event_espresso'), |
| 72 | 72 | $this->_job_id, |
| 73 | - wp_json_encode( $request_data ) |
|
| 73 | + wp_json_encode($request_data) |
|
| 74 | 74 | ) |
| 75 | 75 | ); |
| 76 | 76 | } |
| 77 | - } catch( \Exception $e ) { |
|
| 78 | - $response = $this->_get_error_response( $e, 'create_job' ); |
|
| 77 | + } catch (\Exception $e) { |
|
| 78 | + $response = $this->_get_error_response($e, 'create_job'); |
|
| 79 | 79 | } |
| 80 | 80 | return $response; |
| 81 | 81 | } |
@@ -88,26 +88,26 @@ discard block |
||
| 88 | 88 | * @param int $batch_size |
| 89 | 89 | * @return JobStepResponse |
| 90 | 90 | */ |
| 91 | - public function continue_job( $job_id, $batch_size = 50 ) { |
|
| 91 | + public function continue_job($job_id, $batch_size = 50) { |
|
| 92 | 92 | try { |
| 93 | 93 | $this->_job_id = $job_id; |
| 94 | - $batch_size = defined( 'EE_BATCHRUNNER_BATCH_SIZE' ) ? EE_BATCHRUNNER_BATCH_SIZE : $batch_size; |
|
| 94 | + $batch_size = defined('EE_BATCHRUNNER_BATCH_SIZE') ? EE_BATCHRUNNER_BATCH_SIZE : $batch_size; |
|
| 95 | 95 | //get the corresponding WordPress option for the job |
| 96 | - $this->_job_parameters = JobParameters::load( $this->_job_id ); |
|
| 97 | - $handler_obj = $this->instantiate_batch_job_handler_from_classname( $this->_job_parameters->classname() ); |
|
| 96 | + $this->_job_parameters = JobParameters::load($this->_job_id); |
|
| 97 | + $handler_obj = $this->instantiate_batch_job_handler_from_classname($this->_job_parameters->classname()); |
|
| 98 | 98 | //continue it |
| 99 | - $response = $handler_obj->continue_job( $this->_job_parameters, $batch_size ); |
|
| 100 | - if( ! $response instanceof JobStepResponse ) { |
|
| 99 | + $response = $handler_obj->continue_job($this->_job_parameters, $batch_size); |
|
| 100 | + if ( ! $response instanceof JobStepResponse) { |
|
| 101 | 101 | throw new BatchRequestException( |
| 102 | 102 | sprintf( |
| 103 | - __( 'The class implementing JobHandlerInterface did not return a JobStepResponse when continue_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso' ), |
|
| 103 | + __('The class implementing JobHandlerInterface did not return a JobStepResponse when continue_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso'), |
|
| 104 | 104 | $this->_job_id |
| 105 | 105 | ) |
| 106 | 106 | ); |
| 107 | 107 | } |
| 108 | 108 | $this->_job_parameters->save(); |
| 109 | - } catch( \Exception $e ) { |
|
| 110 | - $response = $this->_get_error_response( $e, 'continue_job' ); |
|
| 109 | + } catch (\Exception $e) { |
|
| 110 | + $response = $this->_get_error_response($e, 'continue_job'); |
|
| 111 | 111 | } |
| 112 | 112 | return $response; |
| 113 | 113 | } |
@@ -122,8 +122,8 @@ discard block |
||
| 122 | 122 | * @return JobHandlerInterface |
| 123 | 123 | * @throws BatchRequestException |
| 124 | 124 | */ |
| 125 | - public function instantiate_batch_job_handler_from_classname( $classname ) { |
|
| 126 | - if( ! class_exists( $classname ) ) { |
|
| 125 | + public function instantiate_batch_job_handler_from_classname($classname) { |
|
| 126 | + if ( ! class_exists($classname)) { |
|
| 127 | 127 | throw new BatchRequestException( |
| 128 | 128 | sprintf( |
| 129 | 129 | __('The class %1$s does not exist, and so could not be used for running a job. It should implement JobHandlerInterface.', 'event_espresso'), |
@@ -132,7 +132,7 @@ discard block |
||
| 132 | 132 | ); |
| 133 | 133 | } |
| 134 | 134 | $obj = new $classname; |
| 135 | - if( ! $obj instanceof JobHandlerInterface ) { |
|
| 135 | + if ( ! $obj instanceof JobHandlerInterface) { |
|
| 136 | 136 | throw new BatchRequestException( |
| 137 | 137 | sprintf( |
| 138 | 138 | __('The class %1$s does not implement JobHandlerInterface and so could not be used for running a job', 'event_espresso'), |
@@ -152,26 +152,26 @@ discard block |
||
| 152 | 152 | * @return JobStepResponse |
| 153 | 153 | * @throws BatchRequestException |
| 154 | 154 | */ |
| 155 | - public function cleanup_job( $job_id ) { |
|
| 156 | - try{ |
|
| 155 | + public function cleanup_job($job_id) { |
|
| 156 | + try { |
|
| 157 | 157 | $this->_job_id = $job_id; |
| 158 | - $job_parameters = JobParameters::load( $this->_job_id ); |
|
| 159 | - $handler_obj = $this->instantiate_batch_job_handler_from_classname( $job_parameters->classname() ); |
|
| 158 | + $job_parameters = JobParameters::load($this->_job_id); |
|
| 159 | + $handler_obj = $this->instantiate_batch_job_handler_from_classname($job_parameters->classname()); |
|
| 160 | 160 | //continue it |
| 161 | - $response = $handler_obj->cleanup_job( $job_parameters ); |
|
| 162 | - if( ! $response instanceof JobStepResponse ) { |
|
| 161 | + $response = $handler_obj->cleanup_job($job_parameters); |
|
| 162 | + if ( ! $response instanceof JobStepResponse) { |
|
| 163 | 163 | throw new BatchRequestException( |
| 164 | 164 | sprintf( |
| 165 | - __( 'The class implementing JobHandlerInterface did not return a JobStepResponse when cleanup_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso' ), |
|
| 165 | + __('The class implementing JobHandlerInterface did not return a JobStepResponse when cleanup_job was called with job %1$s. It needs to return one or throw an Exception', 'event_espresso'), |
|
| 166 | 166 | $this->_job_id |
| 167 | 167 | ) |
| 168 | 168 | ); |
| 169 | 169 | } |
| 170 | - $job_parameters->set_status( JobParameters::status_cleaned_up ); |
|
| 170 | + $job_parameters->set_status(JobParameters::status_cleaned_up); |
|
| 171 | 171 | $job_parameters->delete(); |
| 172 | 172 | return $response; |
| 173 | - } catch( \Exception $e ) { |
|
| 174 | - $response = $this->_get_error_response( $e, 'cleanup_job' ); |
|
| 173 | + } catch (\Exception $e) { |
|
| 174 | + $response = $this->_get_error_response($e, 'cleanup_job'); |
|
| 175 | 175 | } |
| 176 | 176 | return $response; |
| 177 | 177 | } |
@@ -184,17 +184,17 @@ discard block |
||
| 184 | 184 | * @param string $method_name |
| 185 | 185 | * @return JobStepResponse |
| 186 | 186 | */ |
| 187 | - protected function _get_error_response( \Exception $exception, $method_name ) { |
|
| 188 | - if( ! $this->_job_parameters instanceof JobParameters ) { |
|
| 189 | - $this->_job_parameters = new JobParameters( $this->_job_id, __( '__Unknown__', 'event_espresso' ), array() ); |
|
| 187 | + protected function _get_error_response(\Exception $exception, $method_name) { |
|
| 188 | + if ( ! $this->_job_parameters instanceof JobParameters) { |
|
| 189 | + $this->_job_parameters = new JobParameters($this->_job_id, __('__Unknown__', 'event_espresso'), array()); |
|
| 190 | 190 | } |
| 191 | - $this->_job_parameters->set_status( JobParameters::status_error ); |
|
| 191 | + $this->_job_parameters->set_status(JobParameters::status_error); |
|
| 192 | 192 | return new JobStepResponse( |
| 193 | 193 | $this->_job_parameters, |
| 194 | 194 | sprintf( |
| 195 | 195 | __('An exception of type %1$s occurred while running %2$s. Its message was %3$s and had trace %4$s', 'event_espresso'), |
| 196 | - get_class( $exception ), |
|
| 197 | - 'BatchRunner::' . $method_name . '()', |
|
| 196 | + get_class($exception), |
|
| 197 | + 'BatchRunner::'.$method_name.'()', |
|
| 198 | 198 | $exception->getMessage(), |
| 199 | 199 | $exception->getTraceAsString() |
| 200 | 200 | ) |
@@ -1,21 +1,21 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | /** |
| 3 | - * |
|
| 4 | - * Class BatchRequetProcessor |
|
| 3 | + * |
|
| 4 | + * Class BatchRequetProcessor |
|
| 5 | 5 | * |
| 6 | - * Responsible for receiving a request to start a job and assign it a job Id. |
|
| 7 | - * Then when subsequent requests come in to continue that job, dispatches |
|
| 8 | - * the request to the appropriate JobHandler, which processes a step of the batch, |
|
| 9 | - * and then returns the job's new status. |
|
| 10 | - * This class is used by controller code, and the controller code is sent HTTP |
|
| 11 | - * requests from the batch_runner.js library |
|
| 12 | - * |
|
| 13 | - * @package Event Espresso |
|
| 14 | - * @subpackage batch |
|
| 15 | - * @author Mike Nelson |
|
| 16 | - * @since 4.8.26 |
|
| 17 | - * |
|
| 18 | - */ |
|
| 6 | + * Responsible for receiving a request to start a job and assign it a job Id. |
|
| 7 | + * Then when subsequent requests come in to continue that job, dispatches |
|
| 8 | + * the request to the appropriate JobHandler, which processes a step of the batch, |
|
| 9 | + * and then returns the job's new status. |
|
| 10 | + * This class is used by controller code, and the controller code is sent HTTP |
|
| 11 | + * requests from the batch_runner.js library |
|
| 12 | + * |
|
| 13 | + * @package Event Espresso |
|
| 14 | + * @subpackage batch |
|
| 15 | + * @author Mike Nelson |
|
| 16 | + * @since 4.8.26 |
|
| 17 | + * |
|
| 18 | + */ |
|
| 19 | 19 | namespace EventEspressoBatchRequest; |
| 20 | 20 | |
| 21 | 21 | use EventEspressoBatchRequest\JobHandlerBaseClasses\JobHandlerInterface; |
