Completed
Branch BUG/11220/admin-page-routes (c5a0e9)
by
unknown
57:44 queued 46:14
created
reg_steps/payment_options/events_requiring_pre_approval.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 /** @type string $events_requiring_pre_approval_msg */
4 4
 ?>
5 5
 
6
-<h4><span class="orange-text"><?php _e('Important Notice: Events Requiring Pre-Approval', 'event_espresso');?></span></h4>
6
+<h4><span class="orange-text"><?php _e('Important Notice: Events Requiring Pre-Approval', 'event_espresso'); ?></span></h4>
7 7
 	<p id="events-requiring-pre-approval-pg" class="small-text drk-grey-text">
8 8
 		<?php echo $events_requiring_pre_approval_msg; ?>
9 9
 	</p>
Please login to merge, or discard this patch.
single_page_checkout/reg_steps/payment_options/sold_out_events.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@
 block discarded – undo
3 3
 /** @type string $sold_out_events_msg */
4 4
 ?>
5 5
 
6
-<h4 class="ee-status sold-out"><b><?php _e('Sold Out', 'event_espresso');?></b></h4>
6
+<h4 class="ee-status sold-out"><b><?php _e('Sold Out', 'event_espresso'); ?></b></h4>
7 7
 	<ul id="spco-sold-out-events-ul"><?php echo $sold_out_events; ?></ul>
8
-	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso');?></h6>
8
+	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso'); ?></h6>
9 9
 	<p id="events-requiring-pre-approval-pg" class="small-text drk-grey-text">
10 10
 		<?php echo $sold_out_events_msg; ?>
11 11
 	</p>
Please login to merge, or discard this patch.
reg_steps/payment_options/sold_out_tickets.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 /** @type string $sold_out_tickets_msg */
4 4
 ?>
5 5
 
6
-	<h4 ><b><?php _e('Sold Out', 'event_espresso');?></b></h4>
7
-	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso');?></h6>
6
+	<h4 ><b><?php _e('Sold Out', 'event_espresso'); ?></b></h4>
7
+	<h6 class="pink-text"><?php _e("We're Sorry", 'event_espresso'); ?></h6>
8 8
 	<p id="tickets-requiring-pre-approval-pg" class="small-text drk-grey-text">
9 9
 		<?php echo $sold_out_tickets_msg; ?>
10 10
 	</p>
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-shortcode.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -21,22 +21,22 @@  discard block
 block discarded – undo
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__ . ' &nbsp; <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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -18,52 +18,52 @@
 block discarded – undo
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__ . ' &nbsp; <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
 
Please login to merge, or discard this patch.
admin_pages/support/Support_Admin_Page_Init.core.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -32,11 +32,11 @@  discard block
 block discarded – undo
32 32
 
33 33
 	public function __construct() {
34 34
 		//define some help/support page related constants
35
-		define( 'EE_SUPPORT_PG_SLUG', 'espresso_support' );
36
-		define( 'EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page=' . EE_SUPPORT_PG_SLUG ));
37
-		define( 'EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES . 'support/templates/');
38
-		define( 'EE_SUPPORT_ADMIN', EE_ADMIN_PAGES . 'support/' );
39
-		define( 'EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'support/assets/' );
35
+		define('EE_SUPPORT_PG_SLUG', 'espresso_support');
36
+		define('EE_SUPPORT_ADMIN_URL', admin_url('admin.php?page='.EE_SUPPORT_PG_SLUG));
37
+		define('EE_SUPPORT_ADMIN_TEMPLATE_PATH', EE_ADMIN_PAGES.'support/templates/');
38
+		define('EE_SUPPORT_ADMIN', EE_ADMIN_PAGES.'support/');
39
+		define('EE_SUPPORT_ASSETS_URL', EE_ADMIN_PAGES_URL.'support/assets/');
40 40
 		parent::__construct();
41 41
 	}
42 42
 
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	}
46 46
 
47 47
 	protected function _set_menu_map() {
48
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
48
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
49 49
 			'menu_group' => 'extras',
50 50
 			'menu_order' => 30,
51 51
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
admin/extend/registrations/Extend_EE_Attendee_Contact_List_Table.class.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 				'route' => 'contact_list_report',
37 37
 				'extra_request' =>  
38 38
 						array( 
39
-							'return_url' => urlencode( "//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}" ) ) 
39
+							'return_url' => urlencode("//{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}") ) 
40 40
 			),
41 41
 //			'contact_list_export'=> array(
42 42
 //				'route' => 'contact_list_export'
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
core/helpers/EEH_Export.helper.php 3 patches
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 	 * @return string
32 32
 	 */
33 33
 	public static function get_column_name_for_field(EE_Model_Field_Base $field){
34
-	    return wp_specialchars_decode($field->get_nicename(), ENT_QUOTES)
35
-               . "[" . wp_specialchars_decode($field->get_name(), ENT_QUOTES)
36
-               . "]";
34
+		return wp_specialchars_decode($field->get_nicename(), ENT_QUOTES)
35
+			   . "[" . wp_specialchars_decode($field->get_name(), ENT_QUOTES)
36
+			   . "]";
37 37
 	}
38 38
 
39 39
 	/**
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
88 88
 
89 89
 	 /**
90 90
 	  *
91
-	 *	Writes a row to the csv file
92
-	 *	@param array $row - individual row of csv data
93
-	 *	@param string $delimiter - csv delimiter
94
-	 *	@param string $enclosure - csv enclosure
95
-	 *	@param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
96
-	 *	@return string of text for teh csv file
97
-	 */
91
+	  *	Writes a row to the csv file
92
+	  *	@param array $row - individual row of csv data
93
+	  *	@param string $delimiter - csv delimiter
94
+	  *	@param string $enclosure - csv enclosure
95
+	  *	@param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
96
+	  *	@return string of text for teh csv file
97
+	  */
98 98
 	public static function get_csv_row ( array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false ) {
99 99
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
100 100
 		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
Please login to merge, or discard this patch.
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
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 wp_specialchars_decode($field->get_nicename(), ENT_QUOTES)
35
-               . "[" . wp_specialchars_decode($field->get_name(), ENT_QUOTES)
35
+               . "[".wp_specialchars_decode($field->get_name(), ENT_QUOTES)
36 36
                . "]";
37 37
 	}
38 38
 
@@ -54,31 +54,31 @@  discard block
 block discarded – undo
54 54
 	 * 						we consider that a success (because we wrote everything there was...nothing)
55 55
 	 * @throws EE_Error
56 56
 	 */
57
-	public static function write_data_array_to_csv( $filepath, $data, $write_column_headers = true ){
57
+	public static function write_data_array_to_csv($filepath, $data, $write_column_headers = true) {
58 58
 
59 59
 		$new_file_contents = '';
60 60
 		//determine if $data is actually a 2d array
61
-		if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){
61
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
62 62
 			//make sure top level is numerically indexed,
63 63
 
64
-			if( EEH_Array::is_associative_array($data)){
65
-				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))));
64
+			if (EEH_Array::is_associative_array($data)) {
65
+				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))));
66 66
 			}
67 67
 			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
68 68
 			//now, is the last item in the top-level array of $data an associative or numeric array?
69
-			if( $write_column_headers &&
70
-					EEH_Array::is_associative_array($item_in_top_level_array)){
69
+			if ($write_column_headers &&
70
+					EEH_Array::is_associative_array($item_in_top_level_array)) {
71 71
 				//its associative, so we want to output its keys as column headers
72 72
 				$keys = array_keys($item_in_top_level_array);
73
-				$new_file_contents .=  EEH_Export::get_csv_row( $keys );
73
+				$new_file_contents .= EEH_Export::get_csv_row($keys);
74 74
 
75 75
 			}
76 76
 			//start writing data
77
-			foreach($data as $data_row){
78
-				$new_file_contents .= EEH_Export::get_csv_row( $data_row);
77
+			foreach ($data as $data_row) {
78
+				$new_file_contents .= EEH_Export::get_csv_row($data_row);
79 79
 			}
80
-			return EEH_File::write_to_file( $filepath, EEH_File::get_file_contents( $filepath ) . $new_file_contents );
81
-		}else{
80
+			return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath).$new_file_contents);
81
+		} else {
82 82
 			//no data TO write... so we can assume that's a success
83 83
 			return true;
84 84
 		}
@@ -95,29 +95,29 @@  discard block
 block discarded – undo
95 95
 	 *	@param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
96 96
 	 *	@return string of text for teh csv file
97 97
 	 */
98
-	public static function get_csv_row ( array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false ) {
98
+	public static function get_csv_row(array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false) {
99 99
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
100
-		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
101
-		$enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure );
100
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
101
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
102 102
 
103 103
 		$delimiter_esc = preg_quote($delimiter, '/');
104 104
 		$enclosure_esc = preg_quote($enclosure, '/');
105 105
 
106 106
 		$output = array();
107 107
 		foreach ($row as $field_value) {
108
-			if(is_object($field_value) || is_array($field_value)){
108
+			if (is_object($field_value) || is_array($field_value)) {
109 109
 				$field_value = serialize($field_value);
110 110
 			}
111
-			if ($field_value === null && $mysql_null ) {
111
+			if ($field_value === null && $mysql_null) {
112 112
 				$output[] = 'NULL';
113 113
 				continue;
114 114
 			}
115 115
 
116 116
 			$output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ?
117
-				( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value;
117
+				($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value;
118 118
 		}
119 119
 
120
-		return  implode($delimiter, $output) . PHP_EOL;
120
+		return  implode($delimiter, $output).PHP_EOL;
121 121
 	}
122 122
 
123 123
 
@@ -130,19 +130,19 @@  discard block
 block discarded – undo
130 130
 	 * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
131 131
 	 * @return string
132 132
 	 */
133
-	public static function prepare_value_from_db_for_display( $model, $field_name,  $raw_db_value, $pretty_schema = true ) {
134
-		$field_obj = $model->field_settings_for( $field_name );
135
-		$value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value );
136
-		if( $field_obj instanceof EE_Datetime_Field ) {
137
-			$field_obj->set_date_format( EEH_Export::get_date_format_for_export( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema );
138
-			$field_obj->set_time_format( EEH_Export::get_time_format_for_export( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema );
133
+	public static function prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) {
134
+		$field_obj = $model->field_settings_for($field_name);
135
+		$value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
136
+		if ($field_obj instanceof EE_Datetime_Field) {
137
+			$field_obj->set_date_format(EEH_Export::get_date_format_for_export($field_obj->get_date_format($pretty_schema)), $pretty_schema);
138
+			$field_obj->set_time_format(EEH_Export::get_time_format_for_export($field_obj->get_time_format($pretty_schema)), $pretty_schema);
139 139
 		}
140
-		if( $pretty_schema === true){
141
-			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
142
-		}elseif( is_string( $pretty_schema ) ) {
143
-			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
144
-		}else{
145
-			return $field_obj->prepare_for_get( $value_on_model_obj );
140
+		if ($pretty_schema === true) {
141
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
142
+		}elseif (is_string($pretty_schema)) {
143
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
144
+		} else {
145
+			return $field_obj->prepare_for_get($value_on_model_obj);
146 146
 		}
147 147
 	}
148 148
 
@@ -153,8 +153,8 @@  discard block
 block discarded – undo
153 153
 	 * @param string $current_format
154 154
 	 * @return string
155 155
 	 */
156
-	public static function get_date_format_for_export( $current_format = null ) {
157
-		return apply_filters( 'FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format );
156
+	public static function get_date_format_for_export($current_format = null) {
157
+		return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format);
158 158
 	}
159 159
 
160 160
 
@@ -164,8 +164,8 @@  discard block
 block discarded – undo
164 164
 	 * @param string $current_format
165 165
 	 * @return string
166 166
 	 */
167
-	public static function get_time_format_for_export( $current_format = null ) {
168
-		return apply_filters( 'FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format );
167
+	public static function get_time_format_for_export($current_format = null) {
168
+		return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format);
169 169
 	}
170 170
 
171 171
 
Please login to merge, or discard this patch.
core/libraries/batch/BatchRequestProcessor.php 2 patches
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 			)
Please login to merge, or discard this patch.
Indentation   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,21 +1,21 @@
 block discarded – undo
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;
Please login to merge, or discard this patch.