Completed
Branch BUG-10666-add-check-for-iconv (fb844e)
by
unknown
110:35 queued 98:22
created
modules/venues_archive/EED_Venues_Archive.module.php 2 patches
Spacing   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 * @return EED_Venues_Archive
28 28
 	 */
29 29
 	public static function instance() {
30
-		return parent::get_instance( __CLASS__ );
30
+		return parent::get_instance(__CLASS__);
31 31
 	}
32 32
 
33 33
 	/**
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	 *  @return 	void
38 38
 	 */
39 39
 	public static function set_hooks() {
40
-		EE_Config::register_route( 'venues', 'Venues_Archive', 'run' );
40
+		EE_Config::register_route('venues', 'Venues_Archive', 'run');
41 41
 //		EE_Config::register_view( 'venues', 0, EE_TEMPLATES . EE_Config::get_current_theme() . DS . 'archive-espresso_venues.php' );
42 42
 	}
43 43
 
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
 	 * @access    public
59 59
 	 * @param \WP $WP
60 60
 	 */
61
-	public function run( $WP ) {
61
+	public function run($WP) {
62 62
 		// check what template is loaded
63
-		add_filter( 'template_include',  array( $this, 'template_include' ), 999, 1 );
64
-		add_action('wp_enqueue_scripts', array( $this, 'wp_enqueue_scripts' ), 10 );
63
+		add_filter('template_include', array($this, 'template_include'), 999, 1);
64
+		add_action('wp_enqueue_scripts', array($this, 'wp_enqueue_scripts'), 10);
65 65
 	}
66 66
 
67 67
 
@@ -73,18 +73,18 @@  discard block
 block discarded – undo
73 73
 	 * @param  string $template
74 74
 	 * @return string
75 75
 	 */
76
-	public function template_include( $template ) {
76
+	public function template_include($template) {
77 77
 		// not a custom template?
78
-		if ( EE_Registry::instance()->load_core( 'Front_Controller', array(), false, true )->get_selected_template() != 'archive-espresso_venues.php' ) {
78
+		if (EE_Registry::instance()->load_core('Front_Controller', array(), false, true)->get_selected_template() != 'archive-espresso_venues.php') {
79 79
 			EEH_Template::load_espresso_theme_functions();
80 80
 			// then add extra event data via hooks
81
-			add_filter( 'the_title', array( $this, 'the_title' ), 100, 1 );
81
+			add_filter('the_title', array($this, 'the_title'), 100, 1);
82 82
 			// don't know if theme uses the_excerpt
83
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
83
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
84 84
 			// or the_content
85
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
85
+			add_filter('the_content', array($this, 'venue_details'), 100);
86 86
 			// don't display entry meta because the existing theme will take care of that
87
-			add_filter( 'FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false' );
87
+			add_filter('FHEE__content_espresso_venues_details_template__display_entry_meta', '__return_false');
88 88
 		}
89 89
 		return $template;
90 90
 	}
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @param  string $title
99 99
 	 * @return string
100 100
 	 */
101
-	public function the_title( $title = '' ) {
101
+	public function the_title($title = '') {
102 102
 		return $title;
103 103
 	}
104 104
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 * @param  string $content
111 111
 	 * @return string
112 112
 	 */
113
-	public function venue_details( $content ) {
113
+	public function venue_details($content) {
114 114
 		global $post;
115 115
 		if (
116 116
 			$post->post_type == 'espresso_venues'
@@ -120,22 +120,22 @@  discard block
 block discarded – undo
120 120
 			// it uses the_content() for displaying the $post->post_content
121 121
 			// so in order to load a template that uses the_content() from within a callback being used to filter the_content(),
122 122
 			// we need to first remove this callback from being applied to the_content() (otherwise it will recurse and blow up the interweb)
123
-			remove_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
124
-			remove_filter( 'the_content', array( $this, 'venue_details' ), 100 );
123
+			remove_filter('the_excerpt', array($this, 'venue_details'), 100);
124
+			remove_filter('the_content', array($this, 'venue_details'), 100);
125 125
 			// add filters we want
126
-			add_filter( 'the_content', array( $this, 'venue_location' ), 110 );
127
-			add_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
126
+			add_filter('the_content', array($this, 'venue_location'), 110);
127
+			add_filter('the_excerpt', array($this, 'venue_location'), 110);
128 128
 			// now load our template
129
-			$template = EEH_Template::locate_template( 'content-espresso_venues-details.php' );
129
+			$template = EEH_Template::locate_template('content-espresso_venues-details.php');
130 130
 			//now add our filter back in, plus some others
131
-			add_filter( 'the_excerpt', array( $this, 'venue_details' ), 100 );
132
-			add_filter( 'the_content', array( $this, 'venue_details' ), 100 );
131
+			add_filter('the_excerpt', array($this, 'venue_details'), 100);
132
+			add_filter('the_content', array($this, 'venue_details'), 100);
133 133
 			// remove other filters we added so they won't get applied to the next post
134
-			remove_filter( 'the_content', array( $this, 'venue_location' ), 110 );
135
-			remove_filter( 'the_excerpt', array( $this, 'venue_location' ), 110 );
134
+			remove_filter('the_content', array($this, 'venue_location'), 110);
135
+			remove_filter('the_excerpt', array($this, 'venue_location'), 110);
136 136
 			// we're not returning the $content directly because the template we are loading uses the_content (or the_excerpt)
137 137
 		}
138
-		return ! empty( $template ) ? $template : $content;
138
+		return ! empty($template) ? $template : $content;
139 139
 	}
140 140
 
141 141
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 	 * @param  string $content
148 148
 	 * @return string
149 149
 	 */
150
-	public function venue_location( $content ) {
151
-		return $content . EEH_Template::locate_template( 'content-espresso_venues-location.php' );
150
+	public function venue_location($content) {
151
+		return $content.EEH_Template::locate_template('content-espresso_venues-location.php');
152 152
 	}
153 153
 
154 154
 
@@ -162,14 +162,14 @@  discard block
 block discarded – undo
162 162
 	 */
163 163
 	public function wp_enqueue_scripts() {
164 164
 		// get some style
165
-		if ( apply_filters( 'FHEE_enable_default_espresso_css', TRUE ) && is_archive() ) {
165
+		if (apply_filters('FHEE_enable_default_espresso_css', TRUE) && is_archive()) {
166 166
 			// first check theme folder
167
-			if ( is_readable( get_stylesheet_directory() . $this->theme . DS . 'style.css' )) {
168
-				wp_register_style( $this->theme, get_stylesheet_directory_uri() . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
169
-			} else if ( is_readable( EE_TEMPLATES . $this->theme . DS . 'style.css' )) {
170
-				wp_register_style( $this->theme, EE_TEMPLATES_URL . $this->theme . DS . 'style.css', array( 'dashicons', 'espresso_default' ) );
167
+			if (is_readable(get_stylesheet_directory().$this->theme.DS.'style.css')) {
168
+				wp_register_style($this->theme, get_stylesheet_directory_uri().$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
169
+			} else if (is_readable(EE_TEMPLATES.$this->theme.DS.'style.css')) {
170
+				wp_register_style($this->theme, EE_TEMPLATES_URL.$this->theme.DS.'style.css', array('dashicons', 'espresso_default'));
171 171
 			}
172
-			wp_enqueue_style( $this->theme );
172
+			wp_enqueue_style($this->theme);
173 173
 		}
174 174
 	}
175 175
 
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
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
payment_methods/Aim/help_tabs/payment_methods_overview_aim.help_tab.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 <?php _e('Adjust the settings for the Authorize.net AIM payment gateway.', 'event_espresso'); ?>
4 4
 </p>
5 5
 <p>
6
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso' ), "<a href='http://www.authorize.net/international/'  target='_blank'>","</a>" ); ?>
6
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Authorize.net AIM.', 'event_espresso'), "<a href='http://www.authorize.net/international/'  target='_blank'>", "</a>"); ?>
7 7
 </p>
8 8
 <p><strong><?php _e('Authorize.net AIM Settings', 'event_espresso'); ?></strong></p>
9 9
 <ul>
@@ -28,16 +28,16 @@  discard block
 block discarded – undo
28 28
 <?php _e('By logging into Authorize.net, you can change which payment fields are required by Authorize.net when processing payments. These settings affect both the Advanced Integration Method (AIM, this) and the Simple Integration Method (SIM, different). The payment method settings "Excluded Payment Form Fields" and "Required Payment Form Fields" allow you to change the billing form in Event Espresso to reflect your payment form settings in Authorize.net.', 'event_espresso'); ?>
29 29
 <br>
30 30
 <?php printf( 
31
-		__( 'To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
31
+		__('To change your payment form settings in Authorize.net, %1$slog in to authorize.net%2$s, go to %3$sAccount then Payment Form%2$s, then %4$sForm Fields%2$s. It will look similar to %5$sthis%2$s. If you make a field required in Authorize.net, you should also make it required in Event Espresso. If it isn\'t required in Authorize.net, and you want to simplify the billing form in Event Espresso, you can exclude it from the Event Espresso Form too.'),
32 32
 		'<a href="http://authorize.net" target="_blank">',
33 33
 		'</a>',
34 34
 		'<a href="https://monosnap.com/file/nebVteOkEXcdDIos88SojStWOifP23" target="_blank">',
35 35
 		'<a href="https://monosnap.com/file/WyxGJtev87TcDmdGBEZ2oi1xaBIQAm" target="_blank">',
36
-		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">');?>
36
+		'<a href="https://monosnap.com/image/DbCJNfEesWXeSNUs1wLIpGYODFw52m" target="_blank">'); ?>
37 37
 </li>
38 38
 <li>
39
-	<strong><?php _e( 'Server', 'event_espresso');?></strong>
40
-	<?php _e( 'Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso' );?>
39
+	<strong><?php _e('Server', 'event_espresso'); ?></strong>
40
+	<?php _e('Use this setting to change the server where Authorize.net AIM requests are sent. Change this to "Authorize.net/Akamai" before June 30th 2016 to verify your server wil work with Authorize.net\'s servers which will be in use after that date.', 'event_espresso'); ?>
41 41
 </li>
42 42
 <li>
43 43
 <strong><?php _e('Button Image URL', 'event_espresso'); ?></strong><br />
Please login to merge, or discard this patch.
core/CPTs/EE_CPT_Default_Strategy.core.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 
@@ -35,8 +35,8 @@  discard block
 block discarded – undo
35 35
 	 * @param    array $arguments
36 36
 	 * @return    \EE_CPT_Default_Strategy
37 37
 	 */
38
-	public function __construct( $arguments = array() ) {
39
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : null;
38
+	public function __construct($arguments = array()) {
39
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : null;
40 40
 		// $WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : null;
41 41
 		//EEH_Debug_Tools::printr( $this->CPT, '$this->CPT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
42 42
 //		add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 );
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 	 * @param    \WP_Query $WP_Query
53 53
 	 * @return    \WP_Query
54 54
 	 */
55
-	public function pre_get_posts( WP_Query $WP_Query ) {
55
+	public function pre_get_posts(WP_Query $WP_Query) {
56 56
 		//EEH_Debug_Tools::printr( $WP_Query, '$WP_Query  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
57
-		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) {
57
+		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
58 58
 			return $WP_Query;
59 59
 		}
60 60
 //		$WP_Query->set( 'post_type', array( $this->CPT['post_type'] ));
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @param    \WP_Query  $WP_Query
73 73
 	 * @return    \WP_Post[]
74 74
 	 */
75
-	public function the_posts( $posts, WP_Query $WP_Query ) {
75
+	public function the_posts($posts, WP_Query $WP_Query) {
76 76
 		return $posts;
77 77
 	}
78 78
 
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 	 * @param    string $single
89 89
 	 * @return    mixed
90 90
 	 */
91
-	public function get_EE_post_type_metadata( $meta_value = null, $post_id, $meta_key, $single ) {
91
+	public function get_EE_post_type_metadata($meta_value = null, $post_id, $meta_key, $single) {
92 92
 		return $meta_value;
93 93
 	}
94 94
 
Please login to merge, or discard this patch.
core/CPTs/CptQueryModifier.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -447,14 +447,14 @@
 block discarded – undo
447 447
 			global $wpdb;
448 448
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
449 449
 			$SQL .= ' LEFT JOIN '
450
-			        . $this->meta_table->get_table_name()
451
-			        . ' ON ( '
452
-			        . $this->meta_table->get_table_name()
453
-			        . '.'
454
-			        . $this->meta_table->get_fk_on_table()
455
-			        . ' = '
456
-			        . $wpdb->posts
457
-			        . '.ID ) ';
450
+					. $this->meta_table->get_table_name()
451
+					. ' ON ( '
452
+					. $this->meta_table->get_table_name()
453
+					. '.'
454
+					. $this->meta_table->get_fk_on_table()
455
+					. ' = '
456
+					. $wpdb->posts
457
+					. '.ID ) ';
458 458
 		}
459 459
 		remove_filter( 'posts_join', array( $this, 'postsJoin' ) );
460 460
 		return $SQL;
Please login to merge, or discard this patch.
Spacing   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace EventEspresso\core\CPTs;
3 3
 
4
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
5
-	exit( 'No direct script access allowed' );
4
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
5
+	exit('No direct script access allowed');
6 6
 }
7 7
 
8 8
 
@@ -80,10 +80,10 @@  discard block
 block discarded – undo
80 80
 		\WP_Query $WP_Query,
81 81
 		\EE_Request_Handler $request
82 82
 	) {
83
-		$this->setRequest( $request );
84
-		$this->setWpQuery( $WP_Query );
85
-		$this->setPostType( $post_type );
86
-		$this->setCptDetails( $cpt_details );
83
+		$this->setRequest($request);
84
+		$this->setWpQuery($WP_Query);
85
+		$this->setPostType($post_type);
86
+		$this->setCptDetails($cpt_details);
87 87
 		$this->init();
88 88
 	}
89 89
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	/**
102 102
 	 * @param string $post_type
103 103
 	 */
104
-	protected function setPostType( $post_type ) {
104
+	protected function setPostType($post_type) {
105 105
 		$this->post_type = $post_type;
106 106
 	}
107 107
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	/**
120 120
 	 * @param array $cpt_details
121 121
 	 */
122
-	protected function setCptDetails( $cpt_details ) {
122
+	protected function setCptDetails($cpt_details) {
123 123
 		$this->cpt_details = $cpt_details;
124 124
 	}
125 125
 
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	/**
138 138
 	 * @param \EE_Table_Base[] $model_tables
139 139
 	 */
140
-	protected function setModelTables( $model_tables ) {
140
+	protected function setModelTables($model_tables) {
141 141
 		$this->model_tables = $model_tables;
142 142
 	}
143 143
 
@@ -147,7 +147,7 @@  discard block
 block discarded – undo
147 147
 	 * @return array
148 148
 	 */
149 149
 	public function taxonomies() {
150
-		if ( empty( $this->taxonomies ) ) {
150
+		if (empty($this->taxonomies)) {
151 151
 			$this->initializeTaxonomies();
152 152
 		}
153 153
 		return $this->taxonomies;
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	/**
159 159
 	 * @param array $taxonomies
160 160
 	 */
161
-	protected function setTaxonomies( array $taxonomies ) {
161
+	protected function setTaxonomies(array $taxonomies) {
162 162
 		$this->taxonomies = $taxonomies;
163 163
 	}
164 164
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	/**
177 177
 	 * @param \EE_Secondary_Table $meta_table
178 178
 	 */
179
-	public function setMetaTable( \EE_Secondary_Table $meta_table ) {
179
+	public function setMetaTable(\EE_Secondary_Table $meta_table) {
180 180
 		$this->meta_table = $meta_table;
181 181
 	}
182 182
 
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 	/**
195 195
 	 * @param \EEM_Base $CPT_model
196 196
 	 */
197
-	protected function setModel( \EEM_Base $CPT_model ) {
197
+	protected function setModel(\EEM_Base $CPT_model) {
198 198
 		$this->model = $CPT_model;
199 199
 	}
200 200
 
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
 	/**
213 213
 	 * @param \EE_Request_Handler $request
214 214
 	 */
215
-	protected function setRequest( \EE_Request_Handler $request ) {
215
+	protected function setRequest(\EE_Request_Handler $request) {
216 216
 		$this->request = $request;
217 217
 	}
218 218
 
@@ -230,7 +230,7 @@  discard block
 block discarded – undo
230 230
 	/**
231 231
 	 * @param \WP_Query $wp_query
232 232
 	 */
233
-	public function setWpQuery( \WP_Query $wp_query ) {
233
+	public function setWpQuery(\WP_Query $wp_query) {
234 234
 		$this->wp_query = $wp_query;
235 235
 	}
236 236
 
@@ -245,22 +245,22 @@  discard block
 block discarded – undo
245 245
 	protected function initializeTaxonomies() {
246 246
 		// check if taxonomies have already been set and that this CPT has taxonomies registered for it
247 247
 		if (
248
-			empty( $this->taxonomies )
249
-			&& isset( $this->cpt_details['args'], $this->cpt_details['args']['taxonomies'] )
248
+			empty($this->taxonomies)
249
+			&& isset($this->cpt_details['args'], $this->cpt_details['args']['taxonomies'])
250 250
 		) {
251 251
 			// if so then grab them, but we want the taxonomy name as the key
252
-			$taxonomies = array_flip( $this->cpt_details['args']['taxonomies'] );
252
+			$taxonomies = array_flip($this->cpt_details['args']['taxonomies']);
253 253
 			// then grab the list of ALL taxonomies
254 254
 			$all_taxonomies = \EE_Register_CPTs::get_taxonomies();
255
-			foreach ( $taxonomies as $taxonomy => &$details ) {
255
+			foreach ($taxonomies as $taxonomy => &$details) {
256 256
 				// add details to our taxonomies if they exist
257
-				$details = isset( $all_taxonomies[ $taxonomy ] )
258
-					? $all_taxonomies[ $taxonomy ]
257
+				$details = isset($all_taxonomies[$taxonomy])
258
+					? $all_taxonomies[$taxonomy]
259 259
 					: array();
260 260
 			}
261 261
 			// ALWAYS unset() variables that were passed by reference
262
-			unset( $details );
263
-			$this->setTaxonomies( $taxonomies );
262
+			unset($details);
263
+			$this->setTaxonomies($taxonomies);
264 264
 		}
265 265
 	}
266 266
 
@@ -270,11 +270,11 @@  discard block
 block discarded – undo
270 270
 		$this->setAdditionalCptDetails();
271 271
 		$this->setRequestVarsIfCpt();
272 272
 		// convert post_type to model name
273
-		$model_name = str_replace( 'EE_', '', $this->cpt_details['class_name'] );
273
+		$model_name = str_replace('EE_', '', $this->cpt_details['class_name']);
274 274
 		// load all tables related to CPT
275
-		$this->setupModelsAndTables( $model_name );
275
+		$this->setupModelsAndTables($model_name);
276 276
 		// load and instantiate CPT_*_Strategy
277
-		$CPT_Strategy = $this->cptStrategyClass( $model_name );
277
+		$CPT_Strategy = $this->cptStrategyClass($model_name);
278 278
 		// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
279 279
 		// here's the list of available filters in the WP_Query object
280 280
 		// 'posts_where_paged'
@@ -285,17 +285,17 @@  discard block
 block discarded – undo
285 285
 		// 'post_limits'
286 286
 		// 'posts_fields'
287 287
 		// 'posts_join'
288
-		add_filter( 'posts_fields', array( $this, 'postsFields' ) );
289
-		add_filter( 'posts_join', array( $this, 'postsJoin' ) );
288
+		add_filter('posts_fields', array($this, 'postsFields'));
289
+		add_filter('posts_join', array($this, 'postsJoin'));
290 290
 		add_filter(
291
-			'get_' . $this->post_type . '_metadata',
292
-			array( $CPT_Strategy, 'get_EE_post_type_metadata' ),
291
+			'get_'.$this->post_type.'_metadata',
292
+			array($CPT_Strategy, 'get_EE_post_type_metadata'),
293 293
 			1,
294 294
 			4
295 295
 		);
296
-		add_filter( 'the_posts', array( $this, 'thePosts' ), 1, 1 );
297
-		if ( $this->wp_query->is_main_query() ) {
298
-			add_filter( 'get_edit_post_link', array( $this, 'getEditPostLink' ), 10, 2 );
296
+		add_filter('the_posts', array($this, 'thePosts'), 1, 1);
297
+		if ($this->wp_query->is_main_query()) {
298
+			add_filter('get_edit_post_link', array($this, 'getEditPostLink'), 10, 2);
299 299
 			$this->addTemplateFilters();
300 300
 		}
301 301
 	}
@@ -312,18 +312,18 @@  discard block
 block discarded – undo
312 312
 		// the post or category or term that is triggering EE
313 313
 		$this->cpt_details['espresso_page'] = $this->request->is_espresso_page();
314 314
 		// requested post name
315
-		$this->cpt_details['post_name'] = $this->request->get( 'post_name' );
315
+		$this->cpt_details['post_name'] = $this->request->get('post_name');
316 316
 		// add support for viewing 'private', 'draft', or 'pending' posts
317 317
 		if (
318
-			isset( $this->wp_query->query_vars['p'] )
318
+			isset($this->wp_query->query_vars['p'])
319 319
 			&& $this->wp_query->query_vars['p'] !== 0
320 320
 			&& is_user_logged_in()
321
-			&& current_user_can( 'edit_post', $this->wp_query->query_vars['p'] )
321
+			&& current_user_can('edit_post', $this->wp_query->query_vars['p'])
322 322
 		) {
323 323
 			// we can just inject directly into the WP_Query object
324
-			$this->wp_query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' );
324
+			$this->wp_query->query['post_status'] = array('publish', 'private', 'draft', 'pending');
325 325
 			// now set the main 'ee' request var so that the appropriate module can load the appropriate template(s)
326
-			$this->request->set( 'ee', $this->cpt_details['singular_slug'] );
326
+			$this->request->set('ee', $this->cpt_details['singular_slug']);
327 327
 		}
328 328
 	}
329 329
 
@@ -340,15 +340,15 @@  discard block
 block discarded – undo
340 340
 	 */
341 341
 	public function setRequestVarsIfCpt() {
342 342
 		// check if ee action var has been set
343
-		if ( ! $this->request->is_set( 'ee' ) ) {
343
+		if ( ! $this->request->is_set('ee')) {
344 344
 			// check that route exists for CPT archive slug
345
-			if ( is_archive() && \EE_Config::get_route( $this->cpt_details['plural_slug'] ) ) {
345
+			if (is_archive() && \EE_Config::get_route($this->cpt_details['plural_slug'])) {
346 346
 				// ie: set "ee" to "events"
347
-				$this->request->set( 'ee', $this->cpt_details['plural_slug'] );
347
+				$this->request->set('ee', $this->cpt_details['plural_slug']);
348 348
 				// or does it match a single page CPT like /event/
349
-			} else if ( is_single() && \EE_Config::get_route( $this->cpt_details['singular_slug'] ) ) {
349
+			} else if (is_single() && \EE_Config::get_route($this->cpt_details['singular_slug'])) {
350 350
 				// ie: set "ee" to "event"
351
-				$this->request->set( 'ee', $this->cpt_details['singular_slug'] );
351
+				$this->request->set('ee', $this->cpt_details['singular_slug']);
352 352
 			}
353 353
 		}
354 354
 	}
@@ -362,11 +362,11 @@  discard block
 block discarded – undo
362 362
 	 * @param string $model_name
363 363
 	 * @throws \EE_Error
364 364
 	 */
365
-	protected function setupModelsAndTables( $model_name ) {
365
+	protected function setupModelsAndTables($model_name) {
366 366
 		// get CPT table data via CPT Model
367
-		$model = \EE_Registry::instance()->load_model( $model_name );
368
-		if ( ! $model instanceof \EEM_Base ) {
369
-			throw new \EE_Error (
367
+		$model = \EE_Registry::instance()->load_model($model_name);
368
+		if ( ! $model instanceof \EEM_Base) {
369
+			throw new \EE_Error(
370 370
 				sprintf(
371 371
 					__(
372 372
 						'The "%1$s" model could not be loaded.',
@@ -376,14 +376,14 @@  discard block
 block discarded – undo
376 376
 				)
377 377
 			);
378 378
 		}
379
-		$this->setModel( $model );
380
-		$this->setModelTables( $this->model->get_tables() );
379
+		$this->setModel($model);
380
+		$this->setModelTables($this->model->get_tables());
381 381
 		// is there a Meta Table for this CPT?
382 382
 		if (
383
-			isset( $this->cpt_details['tables'][ $model_name . '_Meta' ] )
384
-			&& $this->cpt_details['tables'][ $model_name . '_Meta' ] instanceof \EE_Secondary_Table
383
+			isset($this->cpt_details['tables'][$model_name.'_Meta'])
384
+			&& $this->cpt_details['tables'][$model_name.'_Meta'] instanceof \EE_Secondary_Table
385 385
 		) {
386
-			$this->setMetaTable( $this->cpt_details['tables'][ $model_name . '_Meta' ] );
386
+			$this->setMetaTable($this->cpt_details['tables'][$model_name.'_Meta']);
387 387
 		}
388 388
 	}
389 389
 
@@ -396,18 +396,18 @@  discard block
 block discarded – undo
396 396
 	 * @param  string $model_name
397 397
 	 * @return string
398 398
 	 */
399
-	protected function cptStrategyClass( $model_name ) {
399
+	protected function cptStrategyClass($model_name) {
400 400
 		// creates classname like:  CPT_Event_Strategy
401
-		$CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy';
401
+		$CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy';
402 402
 		// load and instantiate
403 403
 		$CPT_Strategy = \EE_Registry::instance()->load_core(
404 404
 			$CPT_Strategy_class_name,
405
-			array( 'WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details )
405
+			array('WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details)
406 406
 		);
407
-		if ( $CPT_Strategy === null ) {
407
+		if ($CPT_Strategy === null) {
408 408
 			$CPT_Strategy = \EE_Registry::instance()->load_core(
409 409
 				'CPT_Default_Strategy',
410
-				array( 'WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details )
410
+				array('WP_Query' => $this->wp_query, 'CPT' => $this->cpt_details)
411 411
 			);
412 412
 		}
413 413
 		return $CPT_Strategy;
@@ -422,13 +422,13 @@  discard block
 block discarded – undo
422 422
 	 * @param  $SQL
423 423
 	 * @return string
424 424
 	 */
425
-	public function postsFields( $SQL ) {
425
+	public function postsFields($SQL) {
426 426
 		// does this CPT have a meta table ?
427
-		if ( $this->meta_table instanceof \EE_Secondary_Table ) {
427
+		if ($this->meta_table instanceof \EE_Secondary_Table) {
428 428
 			// adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement
429
-			$SQL .= ', ' . $this->meta_table->get_table_name() . '.* ';
429
+			$SQL .= ', '.$this->meta_table->get_table_name().'.* ';
430 430
 		}
431
-		remove_filter( 'posts_fields', array( $this, 'postsFields' ) );
431
+		remove_filter('posts_fields', array($this, 'postsFields'));
432 432
 		return $SQL;
433 433
 	}
434 434
 
@@ -441,9 +441,9 @@  discard block
 block discarded – undo
441 441
 	 * @param  $SQL
442 442
 	 * @return string
443 443
 	 */
444
-	public function postsJoin( $SQL ) {
444
+	public function postsJoin($SQL) {
445 445
 		// does this CPT have a meta table ?
446
-		if ( $this->meta_table instanceof \EE_Secondary_Table ) {
446
+		if ($this->meta_table instanceof \EE_Secondary_Table) {
447 447
 			global $wpdb;
448 448
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
449 449
 			$SQL .= ' LEFT JOIN '
@@ -456,7 +456,7 @@  discard block
 block discarded – undo
456 456
 			        . $wpdb->posts
457 457
 			        . '.ID ) ';
458 458
 		}
459
-		remove_filter( 'posts_join', array( $this, 'postsJoin' ) );
459
+		remove_filter('posts_join', array($this, 'postsJoin'));
460 460
 		return $SQL;
461 461
 	}
462 462
 
@@ -469,17 +469,17 @@  discard block
 block discarded – undo
469 469
 	 * @param  \WP_Post[] $posts
470 470
 	 * @return \WP_Post[]
471 471
 	 */
472
-	public function thePosts( $posts ) {
472
+	public function thePosts($posts) {
473 473
 		$CPT_class = $this->cpt_details['class_name'];
474 474
 		// loop thru posts
475
-		if ( is_array( $posts ) && $this->model instanceof \EEM_CPT_Base ) {
476
-			foreach ( $posts as $key => $post ) {
477
-				if ( $post->post_type === $this->post_type ) {
478
-					$post->{$CPT_class} = $this->model->instantiate_class_from_post_object( $post );
475
+		if (is_array($posts) && $this->model instanceof \EEM_CPT_Base) {
476
+			foreach ($posts as $key => $post) {
477
+				if ($post->post_type === $this->post_type) {
478
+					$post->{$CPT_class} = $this->model->instantiate_class_from_post_object($post);
479 479
 				}
480 480
 			}
481 481
 		}
482
-		remove_filter( 'the_posts', array( $this, 'thePosts' ), 1 );
482
+		remove_filter('the_posts', array($this, 'thePosts'), 1);
483 483
 		return $posts;
484 484
 	}
485 485
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
 	 * @param $ID
491 491
 	 * @return string
492 492
 	 */
493
-	public function getEditPostLink( $url, $ID ) {
493
+	public function getEditPostLink($url, $ID) {
494 494
 		// need to make sure we only edit links if our cpt
495 495
 		global $post;
496 496
 		//notice if the cpt is registered with `show_ee_ui` set to false, we take that to mean that the WordPress core ui
@@ -499,7 +499,7 @@  discard block
 block discarded – undo
499 499
 			! $post instanceof \WP_Post
500 500
 			|| $post->post_type !== $this->post_type
501 501
 			|| (
502
-				isset( $this->cpt_details['args']['show_ee_ui'] )
502
+				isset($this->cpt_details['args']['show_ee_ui'])
503 503
 				&& ! $this->cpt_details['args']['show_ee_ui']
504 504
 			)
505 505
 		) {
@@ -508,8 +508,8 @@  discard block
 block discarded – undo
508 508
 		//k made it here so all is good.
509 509
 		return wp_nonce_url(
510 510
 			add_query_arg(
511
-				array( 'page' => $this->post_type, 'post' => $ID, 'action' => 'edit' ),
512
-				admin_url( 'admin.php' )
511
+				array('page' => $this->post_type, 'post' => $ID, 'action' => 'edit'),
512
+				admin_url('admin.php')
513 513
 			),
514 514
 			'edit',
515 515
 			'edit_nonce'
@@ -526,9 +526,9 @@  discard block
 block discarded – undo
526 526
 	 */
527 527
 	public function addTemplateFilters() {
528 528
 		// if requested cpt supports page_templates and it's the main query
529
-		if ( ! empty( $this->cpt_details['args']['page_templates'] ) && $this->wp_query->is_main_query() ) {
529
+		if ( ! empty($this->cpt_details['args']['page_templates']) && $this->wp_query->is_main_query()) {
530 530
 			// then let's hook into the appropriate query_template hook
531
-			add_filter( 'single_template', array( $this, 'singleCptTemplate' ) );
531
+			add_filter('single_template', array($this, 'singleCptTemplate'));
532 532
 		}
533 533
 	}
534 534
 
@@ -542,20 +542,20 @@  discard block
 block discarded – undo
542 542
 	 * @param string $current_template Existing default template path derived for this page call.
543 543
 	 * @return string the path to the full template file.
544 544
 	 */
545
-	public function singleCptTemplate( $current_template ) {
545
+	public function singleCptTemplate($current_template) {
546 546
 		$object = get_queried_object();
547 547
 		//does this called object HAVE a page template set that is something other than the default.
548
-		$template = get_post_meta( $object->ID, '_wp_page_template', true );
548
+		$template = get_post_meta($object->ID, '_wp_page_template', true);
549 549
 		//exit early if default or not set or invalid path (accounts for theme changes)
550 550
 		if (
551 551
 			$template === 'default'
552
-			|| empty( $template )
553
-			|| ! is_readable( get_stylesheet_directory() . '/' . $template )
552
+			|| empty($template)
553
+			|| ! is_readable(get_stylesheet_directory().'/'.$template)
554 554
 		) {
555 555
 			return $current_template;
556 556
 		}
557 557
 		//made it here so we SHOULD be able to just locate the template and then return it.
558
-		return locate_template( array( $template ) );
558
+		return locate_template(array($template));
559 559
 	}
560 560
 
561 561
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Select_Reveal_Input.input.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  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')) { exit('No direct script access allowed'); }
2 2
 /**
3 3
  * Class EE_Select_Reveal_Input
4 4
  *
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  * @since 				4.6
12 12
  *
13 13
  */
14
-class EE_Select_Reveal_Input extends EE_Select_Input{
14
+class EE_Select_Reveal_Input extends EE_Select_Input {
15 15
 
16 16
 	/**
17 17
 	 * @param array $answer_options Array keys which match a sibling section's name
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 *
27 27
 	 * @param array $input_settings
28 28
 	 */
29
-	public function __construct( $answer_options, $input_settings = array() ){
30
-		parent::__construct( $answer_options, $input_settings );
29
+	public function __construct($answer_options, $input_settings = array()) {
30
+		parent::__construct($answer_options, $input_settings);
31 31
 	}
32 32
 
33 33
 	/**
@@ -36,17 +36,17 @@  discard block
 block discarded – undo
36 36
 	 */
37 37
 	public function sibling_sections_controlled() {
38 38
 		$sibling_sections = array();
39
-		foreach( $this->options() as $sibling_section_name => $sibling_section ) {
39
+		foreach ($this->options() as $sibling_section_name => $sibling_section) {
40 40
 			//if it's an empty string just leave it alone
41
-			if( empty( $sibling_section_name ) ) {
41
+			if (empty($sibling_section_name)) {
42 42
 				continue;
43 43
 			}
44
-			$sibling_section = $this->find_section_from_path( '../' . $sibling_section_name );
45
-			if(
44
+			$sibling_section = $this->find_section_from_path('../'.$sibling_section_name);
45
+			if (
46 46
 				$sibling_section instanceof EE_Form_Section_Base
47
-				&& ! empty( $sibling_section_name ) 
47
+				&& ! empty($sibling_section_name) 
48 48
 			) {
49
-				$sibling_sections[ $sibling_section_name ] = $sibling_section;
49
+				$sibling_sections[$sibling_section_name] = $sibling_section;
50 50
 			}
51 51
 		}
52 52
 		return $sibling_sections;
@@ -59,16 +59,16 @@  discard block
 block discarded – undo
59 59
 	 * @param array $form_other_js_data
60 60
 	 * @return array
61 61
 	 */
62
-	public function get_other_js_data( $form_other_js_data = array() ) {
63
-		$form_other_js_data = parent::get_other_js_data( $form_other_js_data );
64
-		if( ! isset($form_other_js_data[ 'select_reveal_inputs' ] ) ) {
65
-			$form_other_js_data[ 'select_reveal_inputs' ] = array();
62
+	public function get_other_js_data($form_other_js_data = array()) {
63
+		$form_other_js_data = parent::get_other_js_data($form_other_js_data);
64
+		if ( ! isset($form_other_js_data['select_reveal_inputs'])) {
65
+			$form_other_js_data['select_reveal_inputs'] = array();
66 66
 		}
67 67
 		$sibling_input_to_html_id_map = array();
68
-		foreach( $this->sibling_sections_controlled() as $sibling_section_path => $sibling_section ) {
69
-			$sibling_input_to_html_id_map[ $sibling_section_path ] = $sibling_section->html_id();
68
+		foreach ($this->sibling_sections_controlled() as $sibling_section_path => $sibling_section) {
69
+			$sibling_input_to_html_id_map[$sibling_section_path] = $sibling_section->html_id();
70 70
 		}
71
-		$form_other_js_data[ 'select_reveal_inputs' ][ $this->html_id() ] = $sibling_input_to_html_id_map;
71
+		$form_other_js_data['select_reveal_inputs'][$this->html_id()] = $sibling_input_to_html_id_map;
72 72
 		return $form_other_js_data;
73 73
 	}
74 74
 
Please login to merge, or discard this patch.
libraries/form_sections/strategies/layout/EE_Two_Column_Layout.strategy.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base{
3
+class EE_Two_Column_Layout extends EE_Form_Section_Layout_Base {
4 4
 
5 5
 	/**
6 6
 	 * Should be used to start teh form section (Eg a table tag, or a div tag, etc.)
7 7
 	 * @param array $additional_args
8 8
 	 * @return string
9 9
 	 */
10
-	public function layout_form_begin( $additional_args = array() ) {
11
-		return EEH_HTML::table( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style()  ) . EEH_HTML::tbody();
10
+	public function layout_form_begin($additional_args = array()) {
11
+		return EEH_HTML::table('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style()).EEH_HTML::tbody();
12 12
 	}
13 13
 
14 14
 
@@ -18,8 +18,8 @@  discard block
 block discarded – undo
18 18
 	 * @param array $additional_args
19 19
 	 * @return string
20 20
 	 */
21
-	public function layout_form_end( $additional_args = array() ) {
22
-		return EEH_HTML::tbodyx() . EEH_HTML::tablex( $this->_form_section->html_id() );
21
+	public function layout_form_end($additional_args = array()) {
22
+		return EEH_HTML::tbodyx().EEH_HTML::tablex($this->_form_section->html_id());
23 23
 	}
24 24
 
25 25
 
@@ -29,17 +29,17 @@  discard block
 block discarded – undo
29 29
 	 * @param EE_Form_Input_Base $input
30 30
 	 * @return string
31 31
 	 */
32
-	public function layout_input( $input ) {
32
+	public function layout_input($input) {
33 33
 		$html = '';
34
-		if ( $input instanceof EE_Hidden_Input ) {
34
+		if ($input instanceof EE_Hidden_Input) {
35 35
 			$html .= $input->get_html_for_input();
36 36
 		} else {
37 37
 			$html_for_input = $input->get_html_for_input();
38
-			$html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl() . $input->get_html_for_errors() : '';
39
-			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl() . $input->get_html_for_help() : '';
38
+			$html_for_input .= $input->get_html_for_errors() != '' ? EEH_HTML::nl().$input->get_html_for_errors() : '';
39
+			$html_for_input .= $input->get_html_for_help() != '' ? EEH_HTML::nl().$input->get_html_for_help() : '';
40 40
 			$html .= EEH_HTML::tr(
41
-				EEH_HTML::th(  $input->get_html_for_label()  ) .
42
-				EEH_HTML::td( $html_for_input )
41
+				EEH_HTML::th($input->get_html_for_label()).
42
+				EEH_HTML::td($html_for_input)
43 43
 			);
44 44
 		}
45 45
 		return $html;
@@ -52,13 +52,13 @@  discard block
 block discarded – undo
52 52
 	 * @param EE_Form_Section_Proper $form_section
53 53
 	 * @return string
54 54
 	 */
55
-	public function layout_subsection( $form_section ){
55
+	public function layout_subsection($form_section) {
56 56
 		$html = '';
57
-		if ( $form_section instanceof EE_Form_Section_HTML ) {
57
+		if ($form_section instanceof EE_Form_Section_HTML) {
58 58
 			$html .= $form_section->get_html();
59 59
 		} else {
60 60
 			$html .= EEH_HTML::tr(
61
-				EEH_HTML::td( $form_section->get_html(), '', '', '', 'colspan="2"' )
61
+				EEH_HTML::td($form_section->get_html(), '', '', '', 'colspan="2"')
62 62
 			);
63 63
 		}
64 64
 		return $html;
Please login to merge, or discard this patch.
form_sections/strategies/layout/EE_Div_Per_Section_Layout.strategy.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -10,14 +10,14 @@  discard block
 block discarded – undo
10 10
  * @since 				4.6.0
11 11
  *
12 12
  */
13
-class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base{
13
+class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base {
14 14
 
15 15
 	/**
16 16
 	 * opening div tag for a form
17 17
 	 * @return string
18 18
 	 */
19 19
 	public function layout_form_begin() {
20
-		return EEH_HTML::div( '', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style() );
20
+		return EEH_HTML::div('', $this->_form_section->html_id(), $this->_form_section->html_class(), $this->_form_section->html_style());
21 21
 	}
22 22
 
23 23
 
@@ -26,38 +26,38 @@  discard block
 block discarded – undo
26 26
 	 * @param EE_Form_Input_Base $input
27 27
 	 * @return string
28 28
 	 */
29
-	public function layout_input( $input ) {
29
+	public function layout_input($input) {
30 30
 		$html = '';
31
-		if ( $input instanceof EE_Hidden_Input  ) {
32
-			$html .= EEH_HTML::nl() . $input->get_html_for_input();
33
-		} else if ( $input instanceof EE_Submit_Input  ) {
34
-			$html .= EEH_HTML::div( $input->get_html_for_input(), $input->html_id() . '-submit-dv', $input->html_class() . '-submit-dv' );
35
-		} else if ( $input instanceof EE_Select_Input  ) {
31
+		if ($input instanceof EE_Hidden_Input) {
32
+			$html .= EEH_HTML::nl().$input->get_html_for_input();
33
+		} else if ($input instanceof EE_Submit_Input) {
34
+			$html .= EEH_HTML::div($input->get_html_for_input(), $input->html_id().'-submit-dv', $input->html_class().'-submit-dv');
35
+		} else if ($input instanceof EE_Select_Input) {
36 36
 			$html .= EEH_HTML::div(
37
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
38
-				EEH_HTML::nl() . $input->get_html_for_errors() .
39
-				EEH_HTML::nl() . $input->get_html_for_input() .
40
-				EEH_HTML::nl() . $input->get_html_for_help(),
41
-				$input->html_id() . '-input-dv',
42
-				$input->html_class() . '-input-dv'
37
+				EEH_HTML::nl(1).$input->get_html_for_label().
38
+				EEH_HTML::nl().$input->get_html_for_errors().
39
+				EEH_HTML::nl().$input->get_html_for_input().
40
+				EEH_HTML::nl().$input->get_html_for_help(),
41
+				$input->html_id().'-input-dv',
42
+				$input->html_class().'-input-dv'
43 43
 			);
44
-		} else if ( $input instanceof EE_Form_Input_With_Options_Base  ) {
44
+		} else if ($input instanceof EE_Form_Input_With_Options_Base) {
45 45
 			$html .= EEH_HTML::div(
46
-				EEH_HTML::nl() . $this->_display_label_for_option_type_question( $input ) .
47
-				EEH_HTML::nl() . $input->get_html_for_errors() .
48
-				EEH_HTML::nl() . $input->get_html_for_input() .
49
-				EEH_HTML::nl() . $input->get_html_for_help(),
50
-				$input->html_id() . '-input-dv',
51
-				$input->html_class() . '-input-dv'
46
+				EEH_HTML::nl().$this->_display_label_for_option_type_question($input).
47
+				EEH_HTML::nl().$input->get_html_for_errors().
48
+				EEH_HTML::nl().$input->get_html_for_input().
49
+				EEH_HTML::nl().$input->get_html_for_help(),
50
+				$input->html_id().'-input-dv',
51
+				$input->html_class().'-input-dv'
52 52
 			);
53 53
 		} else {
54 54
 			$html .= EEH_HTML::div(
55
-				EEH_HTML::nl(1) . $input->get_html_for_label() .
56
-				EEH_HTML::nl() . $input->get_html_for_errors() .
57
-				EEH_HTML::nl() . $input->get_html_for_input() .
58
-				EEH_HTML::nl() . $input->get_html_for_help(),
59
-				$input->html_id() . '-input-dv',
60
-				$input->html_class() . '-input-dv'
55
+				EEH_HTML::nl(1).$input->get_html_for_label().
56
+				EEH_HTML::nl().$input->get_html_for_errors().
57
+				EEH_HTML::nl().$input->get_html_for_input().
58
+				EEH_HTML::nl().$input->get_html_for_help(),
59
+				$input->html_id().'-input-dv',
60
+				$input->html_class().'-input-dv'
61 61
 			);
62 62
 		}
63 63
 		return $html;
@@ -74,14 +74,14 @@  discard block
 block discarded – undo
74 74
 	 * @param EE_Form_Input_With_Options_Base $input
75 75
 	 * @return string
76 76
 	 */
77
-	protected function _display_label_for_option_type_question( EE_Form_Input_With_Options_Base $input ){
78
-		if ( $input->display_html_label_text() != '' ) {
79
-			$class = $input->required() ? 'ee-required-label ' . $input->html_label_class() : $input->html_label_class();
80
-			$label_text = $input->required() ? $input->html_label_text() . '<span class="ee-asterisk">*</span>' : $input->html_label_text();
81
-			$html = '<div id="' . $input->html_label_id() . '"';
82
-			$html .= ' class="' . $class . '"';
83
-			$html .= ' style="' . $input->html_label_style() . '">';
84
-			$html .= $label_text . '</div>';
77
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input) {
78
+		if ($input->display_html_label_text() != '') {
79
+			$class = $input->required() ? 'ee-required-label '.$input->html_label_class() : $input->html_label_class();
80
+			$label_text = $input->required() ? $input->html_label_text().'<span class="ee-asterisk">*</span>' : $input->html_label_text();
81
+			$html = '<div id="'.$input->html_label_id().'"';
82
+			$html .= ' class="'.$class.'"';
83
+			$html .= ' style="'.$input->html_label_style().'">';
84
+			$html .= $label_text.'</div>';
85 85
 			return $html;
86 86
 		} else {
87 87
 			return '';
@@ -95,9 +95,9 @@  discard block
 block discarded – undo
95 95
 	 * @param EE_Form_Section_Proper $form_section
96 96
 	 * @return string
97 97
 	 */
98
-	public function layout_subsection( $form_section ){
98
+	public function layout_subsection($form_section) {
99 99
 //		d( $form_section );
100
-		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
100
+		return EEH_HTML::nl(1).$form_section->get_html().EEH_HTML::nl(-1);
101 101
 	}
102 102
 
103 103
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 * closing div tag for a form
106 106
 	 * @return string
107 107
 	 */
108
-	public function layout_form_end(){
109
-		return EEH_HTML::divx( $this->_form_section->html_id(), $this->_form_section->html_class() );
108
+	public function layout_form_end() {
109
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
110 110
 	}
111 111
 }
112 112
\ No newline at end of file
Please login to merge, or discard this patch.
core/middleware/EE_Detect_Login.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 
@@ -26,20 +26,20 @@  discard block
 block discarded – undo
26 26
 	 * @param    EE_Response $response
27 27
 	 * @return    EE_Response
28 28
 	 */
29
-	public function handle_request( EE_Request $request, EE_Response $response ) {
29
+	public function handle_request(EE_Request $request, EE_Response $response) {
30 30
 		$this->_request = $request;
31 31
 		$this->_response = $response;
32 32
 		global $pagenow;
33 33
 		if (
34 34
 			in_array(
35 35
 				$pagenow,
36
-				array( 'wp-login.php', 'wp-register.php' )
36
+				array('wp-login.php', 'wp-register.php')
37 37
 			)
38
-			&& ! $request->get( 'ee_load_on_login' )
38
+			&& ! $request->get('ee_load_on_login')
39 39
 		) {
40 40
 			$this->_response->terminate_request();
41 41
 		}
42
-		$this->_response = $this->process_request_stack( $this->_request, $this->_response );
42
+		$this->_response = $this->process_request_stack($this->_request, $this->_response);
43 43
 		return $this->_response;
44 44
 	}
45 45
 
Please login to merge, or discard this patch.
core/EE_Object_Collection.core.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -84,6 +84,7 @@
 block discarded – undo
84 84
 	 *
85 85
 	 * @access public
86 86
 	 * @param mixed
87
+	 * @param string $info
87 88
 	 * @return null | object
88 89
 	 */
89 90
 	public function get_by_info( $info ) {
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Class EE_Object_Collection
@@ -37,14 +37,14 @@  discard block
 block discarded – undo
37 37
 	 * @param mixed $info
38 38
 	 * @return bool
39 39
 	 */
40
-	public function add( $object, $info = null ) {
40
+	public function add($object, $info = null) {
41 41
 		$class = $this->interface;
42
-		if ( ! $object instanceof $class ) {
42
+		if ( ! $object instanceof $class) {
43 43
 			return false;
44 44
 		}
45
-		$this->attach( $object );
46
-		$this->set_info( $object, $info );
47
-		return $this->contains( $object );
45
+		$this->attach($object);
46
+		$this->set_info($object, $info);
47
+		return $this->contains($object);
48 48
 	}
49 49
 
50 50
 
@@ -60,12 +60,12 @@  discard block
 block discarded – undo
60 60
 	 * @param mixed $info
61 61
 	 * @return bool
62 62
 	 */
63
-	public function set_info( $object, $info = null ) {
64
-		$info = ! empty( $info ) ? $info : spl_object_hash( $object );
63
+	public function set_info($object, $info = null) {
64
+		$info = ! empty($info) ? $info : spl_object_hash($object);
65 65
 		$this->rewind();
66
-		while ( $this->valid() ) {
67
-			if ( $object == $this->current() ) {
68
-				$this->setInfo( $info );
66
+		while ($this->valid()) {
67
+			if ($object == $this->current()) {
68
+				$this->setInfo($info);
69 69
 				$this->rewind();
70 70
 				return true;
71 71
 			}
@@ -86,10 +86,10 @@  discard block
 block discarded – undo
86 86
 	 * @param mixed
87 87
 	 * @return null | object
88 88
 	 */
89
-	public function get_by_info( $info ) {
89
+	public function get_by_info($info) {
90 90
 		$this->rewind();
91
-		while ( $this->valid() ) {
92
-			if ( $info === $this->getInfo() ) {
91
+		while ($this->valid()) {
92
+			if ($info === $this->getInfo()) {
93 93
 				$object = $this->current();
94 94
 				$this->rewind();
95 95
 				return $object;
@@ -110,8 +110,8 @@  discard block
 block discarded – undo
110 110
 	 * @param object $object
111 111
 	 * @return bool
112 112
 	 */
113
-	public function has( $object ) {
114
-		return $this->contains( $object );
113
+	public function has($object) {
114
+		return $this->contains($object);
115 115
 	}
116 116
 
117 117
 
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 	 * @param $object
126 126
 	 * @return bool
127 127
 	 */
128
-	public function remove( $object ) {
129
-		$this->detach( $object );
128
+	public function remove($object) {
129
+		$this->detach($object);
130 130
 		return true;
131 131
 	}
132 132
 
@@ -141,10 +141,10 @@  discard block
 block discarded – undo
141 141
 	 * @param $object
142 142
 	 * @return void
143 143
 	 */
144
-	public function set_current( $object ) {
144
+	public function set_current($object) {
145 145
 		$this->rewind();
146
-		while ( $this->valid() ) {
147
-			if ( $this->current() === $object ) {
146
+		while ($this->valid()) {
147
+			if ($this->current() === $object) {
148 148
 				break;
149 149
 			}
150 150
 			$this->next();
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
162 162
 	 * @param $info
163 163
 	 * @return void
164 164
 	 */
165
-	public function set_current_by_info( $info ) {
165
+	public function set_current_by_info($info) {
166 166
 		$this->rewind();
167
-		while ( $this->valid() ) {
168
-			if ( $info === $this->getInfo() ) {
167
+		while ($this->valid()) {
168
+			if ($info === $this->getInfo()) {
169 169
 				break;
170 170
 			}
171 171
 			$this->next();
Please login to merge, or discard this patch.