Completed
Branch TASK-10784-decaf-about-page (d55fb3)
by
unknown
130:57 queued 118:59
created
core/request_stack/EE_Response.core.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 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
  * class EE_Response
4 6
  *
Please login to merge, or discard this patch.
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
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -87,13 +87,13 @@
 block discarded – undo
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 );
Please login to merge, or discard this patch.
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.
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  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 $field->get_nicename()."[".$field->get_name()."]";
35 35
 	}
36 36
 
@@ -52,31 +52,31 @@  discard block
 block discarded – undo
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
 
57 57
 		$new_file_contents = '';
58 58
 		//determine if $data is actually a 2d array
59
-		if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){
59
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
60 60
 			//make sure top level is numerically indexed,
61 61
 
62
-			if( EEH_Array::is_associative_array($data)){
63
-				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))));
62
+			if (EEH_Array::is_associative_array($data)) {
63
+				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 64
 			}
65 65
 			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
66 66
 			//now, is the last item in the top-level array of $data an associative or numeric array?
67
-			if( $write_column_headers &&
68
-					EEH_Array::is_associative_array($item_in_top_level_array)){
67
+			if ($write_column_headers &&
68
+					EEH_Array::is_associative_array($item_in_top_level_array)) {
69 69
 				//its associative, so we want to output its keys as column headers
70 70
 				$keys = array_keys($item_in_top_level_array);
71
-				$new_file_contents .=  EEH_Export::get_csv_row( $keys );
71
+				$new_file_contents .= EEH_Export::get_csv_row($keys);
72 72
 
73 73
 			}
74 74
 			//start writing data
75
-			foreach($data as $data_row){
76
-				$new_file_contents .= EEH_Export::get_csv_row( $data_row);
75
+			foreach ($data as $data_row) {
76
+				$new_file_contents .= EEH_Export::get_csv_row($data_row);
77 77
 			}
78
-			return EEH_File::write_to_file( $filepath, EEH_File::get_file_contents( $filepath ) . $new_file_contents );
79
-		}else{
78
+			return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath).$new_file_contents);
79
+		} else {
80 80
 			//no data TO write... so we can assume that's a success
81 81
 			return true;
82 82
 		}
@@ -93,29 +93,29 @@  discard block
 block discarded – undo
93 93
 	 *	@param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
94 94
 	 *	@return string of text for teh csv file
95 95
 	 */
96
-	public static function get_csv_row ( array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false ) {
96
+	public static function get_csv_row(array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false) {
97 97
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
98
-		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
99
-		$enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure );
98
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
99
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
100 100
 
101 101
 		$delimiter_esc = preg_quote($delimiter, '/');
102 102
 		$enclosure_esc = preg_quote($enclosure, '/');
103 103
 
104 104
 		$output = array();
105 105
 		foreach ($row as $field_value) {
106
-			if(is_object($field_value) || is_array($field_value)){
106
+			if (is_object($field_value) || is_array($field_value)) {
107 107
 				$field_value = serialize($field_value);
108 108
 			}
109
-			if ($field_value === null && $mysql_null ) {
109
+			if ($field_value === null && $mysql_null) {
110 110
 				$output[] = 'NULL';
111 111
 				continue;
112 112
 			}
113 113
 
114 114
 			$output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ?
115
-				( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value;
115
+				($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value;
116 116
 		}
117 117
 
118
-		return  implode($delimiter, $output) . PHP_EOL;
118
+		return  implode($delimiter, $output).PHP_EOL;
119 119
 	}
120 120
 
121 121
 
@@ -128,19 +128,19 @@  discard block
 block discarded – undo
128 128
 	 * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
129 129
 	 * @return string
130 130
 	 */
131
-	public static function prepare_value_from_db_for_display( $model, $field_name,  $raw_db_value, $pretty_schema = true ) {
132
-		$field_obj = $model->field_settings_for( $field_name );
133
-		$value_on_model_obj = $field_obj->prepare_for_set_from_db( $raw_db_value );
134
-		if( $field_obj instanceof EE_Datetime_Field ) {
135
-			$field_obj->set_date_format( EEH_Export::get_date_format_for_export( $field_obj->get_date_format( $pretty_schema ) ), $pretty_schema );
136
-			$field_obj->set_time_format( EEH_Export::get_time_format_for_export( $field_obj->get_time_format( $pretty_schema ) ), $pretty_schema );
131
+	public static function prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true) {
132
+		$field_obj = $model->field_settings_for($field_name);
133
+		$value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
134
+		if ($field_obj instanceof EE_Datetime_Field) {
135
+			$field_obj->set_date_format(EEH_Export::get_date_format_for_export($field_obj->get_date_format($pretty_schema)), $pretty_schema);
136
+			$field_obj->set_time_format(EEH_Export::get_time_format_for_export($field_obj->get_time_format($pretty_schema)), $pretty_schema);
137 137
 		}
138
-		if( $pretty_schema === true){
139
-			return $field_obj->prepare_for_pretty_echoing( $value_on_model_obj );
140
-		}elseif( is_string( $pretty_schema ) ) {
141
-			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema );
142
-		}else{
143
-			return $field_obj->prepare_for_get( $value_on_model_obj );
138
+		if ($pretty_schema === true) {
139
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
140
+		}elseif (is_string($pretty_schema)) {
141
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
142
+		} else {
143
+			return $field_obj->prepare_for_get($value_on_model_obj);
144 144
 		}
145 145
 	}
146 146
 
@@ -151,8 +151,8 @@  discard block
 block discarded – undo
151 151
 	 * @param string $current_format
152 152
 	 * @return string
153 153
 	 */
154
-	public static function get_date_format_for_export( $current_format = null ) {
155
-		return apply_filters( 'FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format );
154
+	public static function get_date_format_for_export($current_format = null) {
155
+		return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format);
156 156
 	}
157 157
 
158 158
 
@@ -162,8 +162,8 @@  discard block
 block discarded – undo
162 162
 	 * @param string $current_format
163 163
 	 * @return string
164 164
 	 */
165
-	public static function get_time_format_for_export( $current_format = null ) {
166
-		return apply_filters( 'FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format );
165
+	public static function get_time_format_for_export($current_format = null) {
166
+		return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format);
167 167
 	}
168 168
 
169 169
 
Please login to merge, or discard this patch.