Completed
Branch BUG-5580-mike-implementation (468206)
by
unknown
13:55 queued 10s
created
payment_methods/Paypal_Pro/templates/paypal_pro_debug_info.template.php 3 patches
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -3,30 +3,30 @@
 block discarded – undo
3 3
 if (!defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6
- * Event Espresso
7
- *
8
- * Event Registration and Management Plugin for WordPress
9
- *
10
- * @ package			Event Espresso
11
- * @ author			Seth Shoultes
12
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
- * @ link					http://www.eventespresso.com
15
- * @ version		 	4.3
16
- *
17
- * ------------------------------------------------------------------------
18
- *
19
- * paypal_pro_billing_form
20
- *
21
- * @package			Event Espresso
22
- * @subpackage
23
- * @author				Mike Nelson
24
- *
25
- * ------------------------------------------------------------------------
26
- */
6
+	 * Event Espresso
7
+	 *
8
+	 * Event Registration and Management Plugin for WordPress
9
+	 *
10
+	 * @ package			Event Espresso
11
+	 * @ author			Seth Shoultes
12
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
+	 * @ link					http://www.eventespresso.com
15
+	 * @ version		 	4.3
16
+	 *
17
+	 * ------------------------------------------------------------------------
18
+	 *
19
+	 * paypal_pro_billing_form
20
+	 *
21
+	 * @package			Event Espresso
22
+	 * @subpackage
23
+	 * @author				Mike Nelson
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 /**
28
- * @var $form_section EE_Billing_Attendee_Info_Form
29
- */
28
+	 * @var $form_section EE_Billing_Attendee_Info_Form
29
+	 */
30 30
 ?><div class="sandbox-panel">
31 31
 					<h2 class="section-title"><?php _e('PayPal Sandbox Mode', 'event_espresso'); ?></h2>
32 32
 					<h3 style="color:#ff0000;"><?php _e('Debug Mode Is Turned On. Payments will not be processed', 'event_espresso'); ?></h3>
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6 6
  * Event Espresso
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 					<ul style="margin:1em 2em 1.5em; line-height:1.2em;">
38 38
 						<li><?php _e('While testing, use the credit card number listed below. Other numbers will produce an error.', 'event_espresso'); ?></li>
39 39
 						<li><?php _e('Expiry Date can be any valid date in the future', 'event_espresso'); ?></li>
40
-						<li><?php printf(__('CVV2 should be 115 (see %s paypals documentation for other special codes %s)', 'event_espresso'),'<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">','</a>'); ?></li>
40
+						<li><?php printf(__('CVV2 should be 115 (see %s paypals documentation for other special codes %s)', 'event_espresso'), '<a href="https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions#id108HH0RJ0TS" target="_blank">', '</a>'); ?></li>
41 41
 					</ul>
42 42
 
43 43
 					<p class="test-credit-cards-info-pg">
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 
65 65
 					<p class="test-credit-cards-info-pg">
66 66
 						<strong><?php _e('Testing Result Code Responses', 'event_espresso'); ?></strong><br/>
67
-						<span class="small-text"><?php printf(__('You can use the amount of the transaction to generate a particular result code (see %s Paypal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox paypal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this paypal doc %s', 'event_espresso'),"<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>","</a>", "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>","</a>","<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>","</a>"); ?></span>
67
+						<span class="small-text"><?php printf(__('You can use the amount of the transaction to generate a particular result code (see %s Paypal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox paypal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this paypal doc %s', 'event_espresso'), "<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>", "</a>", "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>", "</a>", "<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>", "</a>"); ?></span>
68 68
 					</p>
69 69
 
70 70
 					<div class="tbl-wrap">
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
core/CPTs/EE_CPT_Attendee_Strategy.core.php 2 patches
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 	 * @param 	array 	$arguments
40 40
 	 * @return \EE_CPT_Attendee_Strategy
41 41
 	 */
42
-	public function __construct( $arguments = array() ) {
43
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
44
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
42
+	public function __construct($arguments = array()) {
43
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
44
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
45 45
 //		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
46 46
 	}
47 47
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 	 * @param WP_Query $wp_query
56 56
 	 * @return    void
57 57
 	 */
58
-	public function the_posts( $posts, WP_Query $wp_query) {
58
+	public function the_posts($posts, WP_Query $wp_query) {
59 59
 		//$EVT = EE_Registry::instance()->load_model( 'Event' );
60 60
 //		EEH_Debug_Tools::printr( $EVT, '$EVT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
61 61
 //		$EVT_IDs = array();
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.
core/CPTs/EE_CPT_Strategy.core.php 3 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -24,10 +24,10 @@
 block discarded – undo
24 24
 class EE_CPT_Strategy extends EE_BASE {
25 25
 
26 26
    /**
27
-     * 	EE_CPT_Strategy Object
28
-     * 	@private _instance
29
-	 * 	@private 	protected
30
-     */
27
+    * 	EE_CPT_Strategy Object
28
+    * 	@private _instance
29
+    * 	@private 	protected
30
+    */
31 31
 	private static $_instance = NULL;
32 32
 
33 33
 
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.
Spacing   +103 added lines, -103 removed lines patch added patch discarded remove patch
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 */
79 79
 	public static function instance() {
80 80
 		// check if class object is instantiated
81
-		if ( ! self::$_instance instanceof EE_CPT_Strategy ) {
81
+		if ( ! self::$_instance instanceof EE_CPT_Strategy) {
82 82
 			self::$_instance = new self();
83 83
 		}
84 84
 		return self::$_instance;
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 //		d( $this->_CPT_endpoints );
102 102
 //		d( $this->_CPT_taxonomies );
103 103
 
104
-		add_action( 'pre_get_posts', array( $this, 'pre_get_posts' ), 5 );
104
+		add_action('pre_get_posts', array($this, 'pre_get_posts'), 5);
105 105
 	}
106 106
 
107 107
 
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	private function _set_CPT_endpoints() {
116 116
 		$_CPT_endpoints = array();
117
-		if ( is_array( $this->_CPTs )) {
118
-			foreach ( $this->_CPTs as $CPT_type => $CPT ) {
119
-				$_CPT_endpoints [ $CPT['plural_slug'] ] = $CPT_type;
117
+		if (is_array($this->_CPTs)) {
118
+			foreach ($this->_CPTs as $CPT_type => $CPT) {
119
+				$_CPT_endpoints [$CPT['plural_slug']] = $CPT_type;
120 120
 			}
121 121
 		}
122 122
 		return $_CPT_endpoints;
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 * @param WP_Query $WP_Query
132 132
 	 * @return void
133 133
 	 */
134
-	private function _set_EE_tags_on_WP_Query( WP_Query $WP_Query) {
134
+	private function _set_EE_tags_on_WP_Query(WP_Query $WP_Query) {
135 135
 		$WP_Query->is_espresso_event_single = FALSE;
136 136
 		$WP_Query->is_espresso_event_archive = FALSE;
137 137
 		$WP_Query->is_espresso_event_taxonomy = FALSE;
@@ -158,16 +158,16 @@  discard block
 block discarded – undo
158 158
 	 */
159 159
 	private function _set_CPT_taxonomies() {
160 160
 		// check if taxonomies have already been set
161
-		if ( empty( $this->_CPT_taxonomies )) {
161
+		if (empty($this->_CPT_taxonomies)) {
162 162
 			// and that this CPT has taxonomies registered for it
163
-			if ( isset( $this->CPT['args'] ) && isset( $this->CPT['args']['taxonomies'] )) {
163
+			if (isset($this->CPT['args']) && isset($this->CPT['args']['taxonomies'])) {
164 164
 				// if so then grab them, but we want the taxonomy name as the key
165
-				$taxonomies = array_flip( $this->CPT['args']['taxonomies'] );
165
+				$taxonomies = array_flip($this->CPT['args']['taxonomies']);
166 166
 				// then grab the list of ALL taxonomies
167 167
 				$all_taxonomies = EE_Register_CPTs::get_taxonomies();
168
-				foreach ( $taxonomies as $taxonomy => $details ) {
168
+				foreach ($taxonomies as $taxonomy => $details) {
169 169
 					// add details to our taxonomies if they exist
170
-					$taxonomies[ $taxonomy ] = isset( $all_taxonomies[ $taxonomy ] ) ? $all_taxonomies[ $taxonomy ] : NULL;
170
+					$taxonomies[$taxonomy] = isset($all_taxonomies[$taxonomy]) ? $all_taxonomies[$taxonomy] : NULL;
171 171
 				}
172 172
 				$this->_CPT_taxonomies = $taxonomies;
173 173
 			}
@@ -192,10 +192,10 @@  discard block
 block discarded – undo
192 192
 	 * @return void
193 193
 	 */
194 194
 	private function _set_CPT_terms() {
195
-		if ( empty( $this->_CPT_terms )) {
195
+		if (empty($this->_CPT_terms)) {
196 196
 			$terms = EEM_Term::instance()->get_all_CPT_post_tags();
197
-			foreach ( $terms as $term ) {
198
-				$this->_CPT_terms[ $term->slug() ] = $term;
197
+			foreach ($terms as $term) {
198
+				$this->_CPT_terms[$term->slug()] = $term;
199 199
 			}
200 200
 		}
201 201
 	}
@@ -209,24 +209,24 @@  discard block
 block discarded – undo
209 209
 	 * @param $WP_Query
210 210
 	 * @return void
211 211
 	 */
212
-	private function _set_post_type_for_terms( WP_Query $WP_Query ) {
212
+	private function _set_post_type_for_terms(WP_Query $WP_Query) {
213 213
 		// is a tag set ?
214
-		if ( isset( $WP_Query->query['tag'] )) {
214
+		if (isset($WP_Query->query['tag'])) {
215 215
 			// set post_tags
216 216
 			$this->_set_CPT_terms();
217 217
 			// is this tag archive term in the list of terms used by our CPTs ?
218
-			$term = isset ( $this->_CPT_terms[ $WP_Query->query['tag'] ] ) ? $this->_CPT_terms[ $WP_Query->query['tag'] ] : NULL;
218
+			$term = isset ($this->_CPT_terms[$WP_Query->query['tag']]) ? $this->_CPT_terms[$WP_Query->query['tag']] : NULL;
219 219
 			// verify the term
220
-			if ( $term instanceof EE_Term ) {
221
-				$term->post_type  = array_merge( array( 'post', 'page' ), (array)$term->post_type );
222
-				$term->post_type = apply_filters( 'FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term );
220
+			if ($term instanceof EE_Term) {
221
+				$term->post_type = array_merge(array('post', 'page'), (array) $term->post_type);
222
+				$term->post_type = apply_filters('FHEE__EE_CPT_Strategy___set_post_type_for_terms__term_post_type', $term->post_type, $term);
223 223
 				// if a post type is already set
224
-				if ( isset( $WP_Query->query_vars['post_type'] )) {
224
+				if (isset($WP_Query->query_vars['post_type'])) {
225 225
 						// add to existing array
226
-						$term->post_type = array_merge ( (array)$WP_Query->query_vars['post_type'], $term->post_type );
226
+						$term->post_type = array_merge((array) $WP_Query->query_vars['post_type'], $term->post_type);
227 227
 				}
228 228
 				// just set post_type to our CPT
229
-				$WP_Query->set( 'post_type', $term->post_type );
229
+				$WP_Query->set('post_type', $term->post_type);
230 230
 			}
231 231
 		}
232 232
 	}
@@ -241,17 +241,17 @@  discard block
 block discarded – undo
241 241
 	 * in order for is_archive() and is_single() methods to work properly.
242 242
 	 * @return void
243 243
 	 */
244
-	public function _possibly_set_ee_request_var(){
244
+	public function _possibly_set_ee_request_var() {
245 245
 		// check if ee action var has been set
246
-		if ( ! EE_Registry::instance()->REQ->is_set( 'ee' )) {
246
+		if ( ! EE_Registry::instance()->REQ->is_set('ee')) {
247 247
 			// check that route exists for CPT archive slug
248
-			if ( is_archive() && EE_Config::get_route( $this->CPT['plural_slug'] )) {
248
+			if (is_archive() && EE_Config::get_route($this->CPT['plural_slug'])) {
249 249
 				// ie: set "ee" to "events"
250
-				EE_Registry::instance()->REQ->set( 'ee', $this->CPT['plural_slug'] );
250
+				EE_Registry::instance()->REQ->set('ee', $this->CPT['plural_slug']);
251 251
 			// or does it match a single page CPT like /event/
252
-			} else if ( is_single() && EE_Config::get_route( $this->CPT['singular_slug'] )) {
252
+			} else if (is_single() && EE_Config::get_route($this->CPT['singular_slug'])) {
253 253
 				// ie: set "ee" to "event"
254
-				EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] );
254
+				EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']);
255 255
 			}
256 256
 		}
257 257
 	}
@@ -265,11 +265,11 @@  discard block
 block discarded – undo
265 265
 	 * @param WP_Query $WP_Query
266 266
 	 * @return void
267 267
 	 */
268
-	public function _set_paging( $WP_Query ) {
269
-		if ( $WP_Query->is_main_query() && apply_filters( 'FHEE__EE_CPT_Strategy___set_paging', TRUE )) {
270
-			$page = ( get_query_var('page') ) ? get_query_var('page') : NULL;
271
-			$paged = ( get_query_var('paged') ) ? get_query_var('paged') : $page;
272
-			$WP_Query->set( 'paged', $paged );
268
+	public function _set_paging($WP_Query) {
269
+		if ($WP_Query->is_main_query() && apply_filters('FHEE__EE_CPT_Strategy___set_paging', TRUE)) {
270
+			$page = (get_query_var('page')) ? get_query_var('page') : NULL;
271
+			$paged = (get_query_var('paged')) ? get_query_var('paged') : $page;
272
+			$WP_Query->set('paged', $paged);
273 273
 		}
274 274
 	}
275 275
 
@@ -286,35 +286,35 @@  discard block
 block discarded – undo
286 286
 	 * @param WP_Query $WP_Query
287 287
 	 * @return void
288 288
 	 */
289
-	public function pre_get_posts( $WP_Query ) {
289
+	public function pre_get_posts($WP_Query) {
290 290
 		// check that post-type is set
291
-		if ( ! $WP_Query instanceof WP_Query ) {
291
+		if ( ! $WP_Query instanceof WP_Query) {
292 292
 			return;
293 293
 		}
294 294
 
295 295
 		// add our conditionals
296
-		$this->_set_EE_tags_on_WP_Query( $WP_Query );
296
+		$this->_set_EE_tags_on_WP_Query($WP_Query);
297 297
 		// check for terms
298
-		$this->_set_post_type_for_terms( $WP_Query );
298
+		$this->_set_post_type_for_terms($WP_Query);
299 299
 		// make sure paging is always set
300
-		$this->_set_paging( $WP_Query );
300
+		$this->_set_paging($WP_Query);
301 301
 
302 302
 		// is a taxonomy set ?
303
-		if ( $WP_Query->is_tax ) {
303
+		if ($WP_Query->is_tax) {
304 304
 			// loop thru our taxonomies
305
-			foreach ( $this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details ) {
305
+			foreach ($this->_CPT_taxonomies as $CPT_taxonomy => $CPT_taxonomy_details) {
306 306
 				// check if one of our taxonomies is set as a query var
307
-				if ( isset( $WP_Query->query[ $CPT_taxonomy ] )) {
307
+				if (isset($WP_Query->query[$CPT_taxonomy])) {
308 308
 					// but which CPT does that correspond to??? hmmm... guess we gotta go looping
309
-					foreach ( $this->_CPTs as $post_type => $CPT ) {
309
+					foreach ($this->_CPTs as $post_type => $CPT) {
310 310
 						// verify our CPT has args, is public and has taxonomies set
311
-						if ( isset( $CPT['args'] ) && $CPT['args']['public'] && ! empty( $CPT['args']['taxonomies'] )) {
311
+						if (isset($CPT['args']) && $CPT['args']['public'] && ! empty($CPT['args']['taxonomies'])) {
312 312
 							// does the captured taxonomy belong to this CPT ?
313
-							if ( in_array( $CPT_taxonomy, $CPT['args']['taxonomies'] )) {
313
+							if (in_array($CPT_taxonomy, $CPT['args']['taxonomies'])) {
314 314
 								// if so, then add this CPT post_type to the current query's array of post_types'
315
-								$WP_Query->query_vars['post_type'] = isset( $WP_Query->query_vars['post_type'] ) ? (array)$WP_Query->query_vars['post_type'] : array();
315
+								$WP_Query->query_vars['post_type'] = isset($WP_Query->query_vars['post_type']) ? (array) $WP_Query->query_vars['post_type'] : array();
316 316
 								$WP_Query->query_vars['post_type'][] = $post_type;
317
-								switch( $post_type ) {
317
+								switch ($post_type) {
318 318
 									case 'espresso_events' :
319 319
 										$WP_Query->is_espresso_event_taxonomy = TRUE;
320 320
 										break;
@@ -335,24 +335,24 @@  discard block
 block discarded – undo
335 335
 //		d( $CPT_taxonomy );
336 336
 //		d( $WP_Query );
337 337
 
338
-		if ( isset( $WP_Query->query_vars['post_type'] )) {
338
+		if (isset($WP_Query->query_vars['post_type'])) {
339 339
 			// loop thru post_types as array
340
-			foreach ( (array)$WP_Query->query_vars['post_type'] as $post_type ) {
340
+			foreach ((array) $WP_Query->query_vars['post_type'] as $post_type) {
341 341
 
342 342
 				// is current query for an EE CPT ?
343
-				if ( isset( $this->_CPTs[ $post_type ] )) {
343
+				if (isset($this->_CPTs[$post_type])) {
344 344
 					// is EE on or off ?
345
-					if ( EE_Maintenance_Mode::instance()->level() ) {
345
+					if (EE_Maintenance_Mode::instance()->level()) {
346 346
 						// reroute CPT template view to maintenance_mode.template.php
347
-						if( ! has_filter( 'template_include',array( 'EE_Maintenance_Mode', 'template_include' ))){
348
-							add_filter( 'template_include', array( 'EE_Maintenance_Mode', 'template_include' ), 99999 );
347
+						if ( ! has_filter('template_include', array('EE_Maintenance_Mode', 'template_include'))) {
348
+							add_filter('template_include', array('EE_Maintenance_Mode', 'template_include'), 99999);
349 349
 						}
350 350
 						return;
351 351
 					}
352 352
 					// load EE_Request_Handler (this was added as a result of https://events.codebasehq.com/projects/event-espresso/tickets/9037
353
-					EE_Registry::instance()->load_core( 'Request_Handler' );						
353
+					EE_Registry::instance()->load_core('Request_Handler');						
354 354
 					// grab details for the CPT the current query is for
355
-					$this->CPT = $this->_CPTs[ $post_type ];
355
+					$this->CPT = $this->_CPTs[$post_type];
356 356
 					// set post type
357 357
 					$this->CPT['post_type'] = $post_type;
358 358
 					// set taxonomies
@@ -360,27 +360,27 @@  discard block
 block discarded – undo
360 360
 					// the post or category or term that is triggering EE
361 361
 					$this->CPT['espresso_page'] = EE_Registry::instance()->REQ->is_espresso_page();
362 362
 					// requested post name
363
-					$this->CPT['post_name'] = EE_Registry::instance()->REQ->get( 'post_name' );
363
+					$this->CPT['post_name'] = EE_Registry::instance()->REQ->get('post_name');
364 364
 					//d( $this->CPT );
365 365
 					// add support for viewing 'private', 'draft', or 'pending' posts
366
-					if ( is_user_logged_in() && isset( $WP_Query->query_vars['p'] ) && $WP_Query->query_vars['p'] != 0 && current_user_can( 'edit_post', $WP_Query->query_vars['p'] )) {
366
+					if (is_user_logged_in() && isset($WP_Query->query_vars['p']) && $WP_Query->query_vars['p'] != 0 && current_user_can('edit_post', $WP_Query->query_vars['p'])) {
367 367
 						// we can just inject directly into the WP_Query object
368
-						$WP_Query->query['post_status'] = array( 'publish', 'private', 'draft', 'pending' );
368
+						$WP_Query->query['post_status'] = array('publish', 'private', 'draft', 'pending');
369 369
 						// now set the main 'ee' request var so that the appropriate module can load the appropriate template(s)
370
-						EE_Registry::instance()->REQ->set( 'ee', $this->CPT['singular_slug'] );
370
+						EE_Registry::instance()->REQ->set('ee', $this->CPT['singular_slug']);
371 371
 					}
372
-					$this->_possibly_set_ee_request_var( $post_type );
372
+					$this->_possibly_set_ee_request_var($post_type);
373 373
 					// convert post_type to model name
374
-					$model_name = str_replace( 'EE_', '', $this->CPT['class_name'] );
374
+					$model_name = str_replace('EE_', '', $this->CPT['class_name']);
375 375
 					// get CPT table data via CPT Model
376
-					$this->CPT_model = EE_Registry::instance()->load_model( $model_name );
376
+					$this->CPT_model = EE_Registry::instance()->load_model($model_name);
377 377
 					$this->CPT['tables'] = $this->CPT_model->get_tables();
378 378
 					// is there a Meta Table for this CPT?
379
-					$this->CPT['meta_table'] = isset( $this->CPT['tables'][ $model_name . '_Meta' ] ) ? $this->CPT['tables'][ $model_name . '_Meta' ] : FALSE;
379
+					$this->CPT['meta_table'] = isset($this->CPT['tables'][$model_name.'_Meta']) ? $this->CPT['tables'][$model_name.'_Meta'] : FALSE;
380 380
 					// creates classname like:  CPT_Event_Strategy
381
-					$CPT_Strategy_class_name = 'CPT_' . $model_name . '_Strategy';
381
+					$CPT_Strategy_class_name = 'CPT_'.$model_name.'_Strategy';
382 382
 					// load and instantiate
383
-					 $CPT_Strategy = EE_Registry::instance()->load_core ( $CPT_Strategy_class_name, array( 'WP_Query' => $WP_Query, 'CPT' => $this->CPT ));
383
+					 $CPT_Strategy = EE_Registry::instance()->load_core($CPT_Strategy_class_name, array('WP_Query' => $WP_Query, 'CPT' => $this->CPT));
384 384
 
385 385
 					// !!!!!!!!!!  IMPORTANT !!!!!!!!!!!!
386 386
 					// here's the list of available filters in the WP_Query object
@@ -392,13 +392,13 @@  discard block
 block discarded – undo
392 392
 					// 'post_limits'
393 393
 					// 'posts_fields'
394 394
 					// 'posts_join'
395
-					add_filter( 'posts_fields', array( $this, 'posts_fields' ));
396
-					add_filter( 'posts_join',	array( $this, 'posts_join' ));
397
-					add_filter( 'get_' . $this->CPT['post_type'] . '_metadata', array( $CPT_Strategy, 'get_EE_post_type_metadata' ), 1, 4 );
398
-					add_filter( 'the_posts',	array( $this, 'the_posts' ), 1, 1 );
399
-					add_filter( 'get_edit_post_link', array( $this, 'get_edit_post_link' ), 10, 2 );
395
+					add_filter('posts_fields', array($this, 'posts_fields'));
396
+					add_filter('posts_join', array($this, 'posts_join'));
397
+					add_filter('get_'.$this->CPT['post_type'].'_metadata', array($CPT_Strategy, 'get_EE_post_type_metadata'), 1, 4);
398
+					add_filter('the_posts', array($this, 'the_posts'), 1, 1);
399
+					add_filter('get_edit_post_link', array($this, 'get_edit_post_link'), 10, 2);
400 400
 
401
-					$this->_do_template_filters( $WP_Query );
401
+					$this->_do_template_filters($WP_Query);
402 402
 				}
403 403
 			}
404 404
 		}
@@ -413,13 +413,13 @@  discard block
 block discarded – undo
413 413
 	 * @param $SQL
414 414
 	 * @return    string
415 415
 	 */
416
-	public function posts_fields( $SQL ) {
416
+	public function posts_fields($SQL) {
417 417
 		// does this CPT have a meta table ?
418
-		if ( ! empty( $this->CPT['meta_table'] )) {
418
+		if ( ! empty($this->CPT['meta_table'])) {
419 419
 			// adds something like ", wp_esp_event_meta.* " to WP Query SELECT statement
420
-			$SQL .= ', ' . $this->CPT['meta_table']->get_table_name() . '.* ' ;
420
+			$SQL .= ', '.$this->CPT['meta_table']->get_table_name().'.* ';
421 421
 		}
422
-		remove_filter( 'posts_fields', array( $this, 'posts_fields' ));
422
+		remove_filter('posts_fields', array($this, 'posts_fields'));
423 423
 		return $SQL;
424 424
 	}
425 425
 
@@ -432,14 +432,14 @@  discard block
 block discarded – undo
432 432
 	 * @param $SQL
433 433
 	 * @return    string
434 434
 	 */
435
-	public function posts_join( $SQL ) {
435
+	public function posts_join($SQL) {
436 436
 		// does this CPT have a meta table ?
437
-		if ( ! empty( $this->CPT['meta_table'] )) {
437
+		if ( ! empty($this->CPT['meta_table'])) {
438 438
 			global $wpdb;
439 439
 			// adds something like " LEFT JOIN wp_esp_event_meta ON ( wp_esp_event_meta.EVT_ID = wp_posts.ID ) " to WP Query JOIN statement
440
-			$SQL .= ' LEFT JOIN ' . $this->CPT['meta_table']->get_table_name() . ' ON ( ' . $this->CPT['meta_table']->get_table_name() . '.' . $this->CPT['meta_table']->get_fk_on_table() . ' = ' . $wpdb->posts . '.ID ) ';
440
+			$SQL .= ' LEFT JOIN '.$this->CPT['meta_table']->get_table_name().' ON ( '.$this->CPT['meta_table']->get_table_name().'.'.$this->CPT['meta_table']->get_fk_on_table().' = '.$wpdb->posts.'.ID ) ';
441 441
 		}
442
-		remove_filter( 'posts_join',	array( $this, 'posts_join' ));
442
+		remove_filter('posts_join', array($this, 'posts_join'));
443 443
 		return $SQL;
444 444
 	}
445 445
 
@@ -452,18 +452,18 @@  discard block
 block discarded – undo
452 452
 	 * @param 	\WP_Post[] 	$posts
453 453
 	 * @return 	\WP_Post[]
454 454
 	 */
455
-	public function the_posts( $posts ) {
455
+	public function the_posts($posts) {
456 456
 //		d( $posts );
457 457
 		$CPT_class = $this->CPT['class_name'];
458 458
 		// loop thru posts
459
-		if ( is_array( $posts )) {
460
-			foreach( $posts as $key => $post ) {
461
-				if ( isset( $this->_CPTs[ $post->post_type ] )) {
462
-					$post->$CPT_class = $this->CPT_model->instantiate_class_from_post_object( $post );
459
+		if (is_array($posts)) {
460
+			foreach ($posts as $key => $post) {
461
+				if (isset($this->_CPTs[$post->post_type])) {
462
+					$post->$CPT_class = $this->CPT_model->instantiate_class_from_post_object($post);
463 463
 				}
464 464
 			}
465 465
 		}
466
-		remove_filter( 'the_posts',	array( $this, 'the_posts' ), 1, 1 );
466
+		remove_filter('the_posts', array($this, 'the_posts'), 1, 1);
467 467
 		return $posts;
468 468
 	}
469 469
 
@@ -474,17 +474,17 @@  discard block
 block discarded – undo
474 474
 	 * @param $ID
475 475
 	 * @return string
476 476
 	 */
477
-	function get_edit_post_link( $url, $ID ) {
477
+	function get_edit_post_link($url, $ID) {
478 478
 		//need to make sure we only edit links if our cpt
479 479
 		global $post;
480
-		if ( ! isset( $this->_CPTs[ $post->post_type ] )) {
480
+		if ( ! isset($this->_CPTs[$post->post_type])) {
481 481
 			return $url;
482 482
 		}
483 483
 		//k made it here so all is good.
484 484
 		$scheme = is_ssl() ? 'https' : 'http';
485
-		$url = get_admin_url( EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme );
485
+		$url = get_admin_url(EE_Config::instance()->core->current_blog_id, 'admin.php', $scheme);
486 486
 		// http://example.com/wp-admin/admin.php?page=espresso_events&action=edit&post=205&edit_nonce=0d403530d6
487
-		return wp_nonce_url( add_query_arg( array( 'page' => $this->CPT['post_type'], 'post' =>$ID, 'action' =>'edit' ), $url ), 'edit', 'edit_nonce' );
487
+		return wp_nonce_url(add_query_arg(array('page' => $this->CPT['post_type'], 'post' =>$ID, 'action' =>'edit'), $url), 'edit', 'edit_nonce');
488 488
 	}
489 489
 
490 490
 
@@ -498,11 +498,11 @@  discard block
 block discarded – undo
498 498
 	 * @param WP_Query $WP_Query
499 499
 	 * @return void
500 500
 	 */
501
-	protected function _do_template_filters( WP_Query $WP_Query ) {
501
+	protected function _do_template_filters(WP_Query $WP_Query) {
502 502
 		// if it's the main query  and requested cpt supports page_templates,
503
-		if ( $WP_Query->is_main_query() && ! empty( $this->CPT['args']['page_templates'] ) ) {
503
+		if ($WP_Query->is_main_query() && ! empty($this->CPT['args']['page_templates'])) {
504 504
 			// then let's hook into the appropriate query_template hook
505
-			add_filter( 'single_template', array( $this, 'single_cpt_template' ) );
505
+			add_filter('single_template', array($this, 'single_cpt_template'));
506 506
 		}
507 507
 	}
508 508
 
@@ -516,17 +516,17 @@  discard block
 block discarded – undo
516 516
 	 * @param string $current_template Existing default template path derived for this page call.
517 517
 	 * @return string the path to the full template file.
518 518
 	 */
519
-	public function single_cpt_template( $current_template ) {
519
+	public function single_cpt_template($current_template) {
520 520
 		$object = get_queried_object();
521 521
 		//does this called object HAVE a page template set that is something other than the default.
522
-		$template = get_post_meta( $object->ID, '_wp_page_template', true );
522
+		$template = get_post_meta($object->ID, '_wp_page_template', true);
523 523
 
524 524
 		//exit early if default or not set or invalid path (accounts for theme changes)
525
-		if ( $template == 'default' || empty( $template ) || ! is_readable( get_stylesheet_directory() . '/' . $template ) ) {
525
+		if ($template == 'default' || empty($template) || ! is_readable(get_stylesheet_directory().'/'.$template)) {
526 526
 			return $current_template;
527 527
 		}
528 528
 		//made it here so we SHOULD be able to just locate the template and then return it.
529
-		$template = locate_template( array($template)  );
529
+		$template = locate_template(array($template));
530 530
 
531 531
 		return $template;
532 532
 	}
@@ -574,9 +574,9 @@  discard block
 block discarded – undo
574 574
 	 * @param 	array 	$arguments
575 575
 	 * @return 	\EE_CPT_Default_Strategy
576 576
 	 */
577
-	public function __construct( $arguments = array() ) {
578
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
579
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
577
+	public function __construct($arguments = array()) {
578
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
579
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
580 580
 		//EEH_Debug_Tools::printr( $this->CPT, '$this->CPT  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
581 581
 //		add_filter( 'pre_get_posts', array( $this, 'pre_get_posts' ), 999 );
582 582
 //		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
@@ -591,9 +591,9 @@  discard block
 block discarded – undo
591 591
 	 * @param 	\WP_Query $WP_Query
592 592
 	 * @return 	\WP_Query
593 593
 	 */
594
-	public function pre_get_posts(  WP_Query $WP_Query  ) {
594
+	public function pre_get_posts(WP_Query $WP_Query) {
595 595
 		//EEH_Debug_Tools::printr( $WP_Query, '$WP_Query  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
596
-		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive() ) {
596
+		if ( ! $WP_Query->is_main_query() && ! $WP_Query->is_archive()) {
597 597
 			return $WP_Query;
598 598
 		}
599 599
 //		$WP_Query->set( 'post_type', array( $this->CPT['post_type'] ));
@@ -611,7 +611,7 @@  discard block
 block discarded – undo
611 611
 	 * @param 	\WP_Query $WP_Query
612 612
 	 * @return 	\WP_Post[]
613 613
 	 */
614
-	public function the_posts(  $posts, WP_Query $WP_Query ) {
614
+	public function the_posts($posts, WP_Query $WP_Query) {
615 615
 		return $posts;
616 616
 	}
617 617
 
@@ -627,7 +627,7 @@  discard block
 block discarded – undo
627 627
 	 * @param 	string 	$single
628 628
 	 * @return 	mixed
629 629
 	 */
630
-	public function get_EE_post_type_metadata( $meta_value = NULL, $post_id, $meta_key, $single ) {
630
+	public function get_EE_post_type_metadata($meta_value = NULL, $post_id, $meta_key, $single) {
631 631
 		return $meta_value;
632 632
 	}
633 633
 
Please login to merge, or discard this patch.
core/CPTs/EE_CPT_Venue_Strategy.core.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -39,15 +39,15 @@  discard block
 block discarded – undo
39 39
 	 * @param 	array 	$arguments
40 40
 	 * @return \EE_CPT_Venue_Strategy
41 41
 	 */
42
-	public function __construct( $arguments = array() ) {
43
-		$this->CPT = isset( $arguments['CPT'] ) ? $arguments['CPT'] : NULL;
44
-		$WP_Query = isset( $arguments['WP_Query'] ) ? $arguments['WP_Query'] : NULL;
45
-		if ( $WP_Query instanceof WP_Query && ! $WP_Query->is_tag ) {
46
-			$WP_Query->is_espresso_venue_single = is_singular() && isset( $WP_Query->query->post_type ) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
42
+	public function __construct($arguments = array()) {
43
+		$this->CPT = isset($arguments['CPT']) ? $arguments['CPT'] : NULL;
44
+		$WP_Query = isset($arguments['WP_Query']) ? $arguments['WP_Query'] : NULL;
45
+		if ($WP_Query instanceof WP_Query && ! $WP_Query->is_tag) {
46
+			$WP_Query->is_espresso_venue_single = is_singular() && isset($WP_Query->query->post_type) && $WP_Query->query->post_type == 'espresso_venues' ? TRUE : FALSE;
47 47
 			$WP_Query->is_espresso_venue_archive = is_post_type_archive('espresso_venues') ? TRUE : FALSE;
48
-			$WP_Query->is_espresso_venue_taxonomy = is_tax( 'espresso_venue_categories' ) ? TRUE : FALSE;
48
+			$WP_Query->is_espresso_venue_taxonomy = is_tax('espresso_venue_categories') ? TRUE : FALSE;
49 49
 		}
50
-		add_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
50
+		add_filter('the_posts', array($this, 'the_posts'), 1, 2);
51 51
 	}
52 52
 
53 53
 
@@ -60,14 +60,14 @@  discard block
 block discarded – undo
60 60
 	 * @param WP_Query $wp_query
61 61
 	 * @return    void
62 62
 	 */
63
-	public function the_posts( $posts, WP_Query $wp_query) {
63
+	public function the_posts($posts, WP_Query $wp_query) {
64 64
 		// automagically load the EEH_Venue_View helper so that it's functions are available
65 65
 		EE_Registry::instance()->load_helper('Venue_View');
66
-		if ( isset( EE_Registry::instance()->CFG->map_settings->use_google_maps ) && EE_Registry::instance()->CFG->map_settings->use_google_maps ) {
67
-			EE_Registry::instance()->load_helper( 'Maps' );
66
+		if (isset(EE_Registry::instance()->CFG->map_settings->use_google_maps) && EE_Registry::instance()->CFG->map_settings->use_google_maps) {
67
+			EE_Registry::instance()->load_helper('Maps');
68 68
 			EEH_Maps::espresso_google_map_js();
69 69
 		}
70
-		remove_filter( 'the_posts', array( $this, 'the_posts' ), 1, 2 );
70
+		remove_filter('the_posts', array($this, 'the_posts'), 1, 2);
71 71
 		return $posts;
72 72
 	}
73 73
 
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.
core/CPTs/EE_Register_CPTs.core.php 2 patches
Spacing   +94 added lines, -94 removed lines patch added patch discarded remove patch
@@ -23,37 +23,37 @@  discard block
 block discarded – undo
23 23
 	 * 	constructor
24 24
 	 * instantiated at init priority 5
25 25
 	 */
26
-	function __construct(){
26
+	function __construct() {
27 27
 		// register taxonomies
28 28
 		$taxonomies = self::get_taxonomies();
29
-		foreach ( $taxonomies as $taxonomy =>  $tax ) {
30
-			$this->register_taxonomy( $taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args'] );
29
+		foreach ($taxonomies as $taxonomy =>  $tax) {
30
+			$this->register_taxonomy($taxonomy, $tax['singular_name'], $tax['plural_name'], $tax['args']);
31 31
 		}
32 32
 		// register CPTs
33
-		$CPTs =self::get_CPTs();
34
-		foreach ( $CPTs as $CPT_name =>  $CPT ) {
35
-			$this->register_CPT( $CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'], $CPT['singular_slug'], $CPT['plural_slug'] );
33
+		$CPTs = self::get_CPTs();
34
+		foreach ($CPTs as $CPT_name =>  $CPT) {
35
+			$this->register_CPT($CPT_name, $CPT['singular_name'], $CPT['plural_name'], $CPT['args'], $CPT['singular_slug'], $CPT['plural_slug']);
36 36
 		}
37 37
 		// setup default terms in any of our taxonomies (but only if we're in admin).
38 38
 		// Why not added via register_activation_hook?
39 39
 		// Because it's possible that in future iterations of EE we may add new defaults for specialized taxonomies (think event_types) and register_activation_hook only reliably runs when a user manually activates the plugin.
40 40
 		// Keep in mind that this will READ these terms if they are deleted by the user.  Hence MUST use terms.
41
-		if ( is_admin() ) {
41
+		if (is_admin()) {
42 42
 			$this->set_must_use_event_types();
43 43
 		}
44 44
 		//set default terms
45
-		$this->set_default_term( 'espresso_event_type', 'single-event', array('espresso_events') );
45
+		$this->set_default_term('espresso_event_type', 'single-event', array('espresso_events'));
46 46
 
47 47
 
48
-		add_action( 'AHEE__EE_System__initialize_last', array( __CLASS__,  'maybe_flush_rewrite_rules' ), 10 );
48
+		add_action('AHEE__EE_System__initialize_last', array(__CLASS__, 'maybe_flush_rewrite_rules'), 10);
49 49
 
50 50
 		//hook into save_post so that we can make sure that the default terms get saved on publish of registered cpts IF they don't have a term for that taxonomy set.
51
-		add_action('save_post', array( $this, 'save_default_term' ), 100, 2 );
51
+		add_action('save_post', array($this, 'save_default_term'), 100, 2);
52 52
 
53 53
 		//remove no html restrictions from core wp saving of term descriptions.  Note. this will affect only registered EE taxonomies.
54 54
 		$this->_allow_html_descriptions_for_ee_taxonomies();
55 55
 
56
-		do_action( 'AHEE__EE_Register_CPTs__construct_end', $this );
56
+		do_action('AHEE__EE_Register_CPTs__construct_end', $this);
57 57
 	}
58 58
 
59 59
 
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
66 66
 	 * @return void
67 67
 	 */
68 68
 	public static function  maybe_flush_rewrite_rules() {
69
-		if ( get_option( 'ee_flush_rewrite_rules', TRUE )) {
69
+		if (get_option('ee_flush_rewrite_rules', TRUE)) {
70 70
 			flush_rewrite_rules();
71
-			update_option( 'ee_flush_rewrite_rules', FALSE );
71
+			update_option('ee_flush_rewrite_rules', FALSE);
72 72
 		}
73 73
 	}
74 74
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	protected function _allow_html_descriptions_for_ee_taxonomies() {
84 84
 		//first remove default filter for term description but we have to do this earlier before wp sets their own filter
85 85
 		//because they just set a global filter on all term descriptions before the custom term description filter. Really sux.
86
-		add_filter( 'pre_term_description', array( $this, 'ee_filter_ee_term_description_not_wp' ), 1, 2 );
86
+		add_filter('pre_term_description', array($this, 'ee_filter_ee_term_description_not_wp'), 1, 2);
87 87
 	}
88 88
 
89 89
 
@@ -93,16 +93,16 @@  discard block
 block discarded – undo
93 93
 	 * @param string $taxonomy      The taxonomy name for the taxonomy being filtered.
94 94
 	 * @return string
95 95
 	 */
96
-	public function ee_filter_ee_term_description_not_wp( $description, $taxonomy ) {
96
+	public function ee_filter_ee_term_description_not_wp($description, $taxonomy) {
97 97
 		//get a list of EE taxonomies
98
-		$ee_taxonomies = array_keys( self::get_taxonomies() );
98
+		$ee_taxonomies = array_keys(self::get_taxonomies());
99 99
 
100 100
 		//only do our own thing if the taxonomy listed is an ee taxonomy.
101
-		if ( in_array( $taxonomy, $ee_taxonomies ) ) {
101
+		if (in_array($taxonomy, $ee_taxonomies)) {
102 102
 			//remove default wp filter
103
-			remove_filter( 'pre_term_description', 'wp_filter_kses' );
103
+			remove_filter('pre_term_description', 'wp_filter_kses');
104 104
 			//sanitize THIS content.
105
-			$description = wp_kses( $description, wp_kses_allowed_html( 'post' ) );
105
+			$description = wp_kses($description, wp_kses_allowed_html('post'));
106 106
 		}
107 107
 		return $description;
108 108
 	}
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 	 *  @access 	public
117 117
 	 *  @return 	array
118 118
 	 */
119
-	public static function get_taxonomies(){
119
+	public static function get_taxonomies() {
120 120
 		// define taxonomies
121
-		return apply_filters( 'FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
121
+		return apply_filters('FHEE__EE_Register_CPTs__get_taxonomies__taxonomies', array(
122 122
 			'espresso_event_categories' => array(
123 123
 				'singular_name' => __("Event Category", "event_espresso"),
124 124
 				'plural_name' => __("Event Categories", "event_espresso"),
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 						'delete_terms' => 'ee_delete_event_category',
132 132
 						'assign_terms' => 'ee_assign_event_category'
133 133
 						),
134
-					'rewrite' => array( 'slug' => __( 'event-category', 'event_espresso' ))
134
+					'rewrite' => array('slug' => __('event-category', 'event_espresso'))
135 135
 				)),
136 136
 			'espresso_venue_categories' => array(
137 137
 				'singular_name' => __("Venue Category", "event_espresso"),
@@ -145,7 +145,7 @@  discard block
 block discarded – undo
145 145
 						'delete_terms' => 'ee_delete_venue_category',
146 146
 						'assign_terms' => 'ee_assign_venue_category'
147 147
 						),
148
-					'rewrite' => array( 'slug' => __( 'venue-category', 'event_espresso' ))
148
+					'rewrite' => array('slug' => __('venue-category', 'event_espresso'))
149 149
 				)),
150 150
 			'espresso_event_type' => array(
151 151
 				'singular_name' => __("Event Type", "event_espresso"),
@@ -159,10 +159,10 @@  discard block
 block discarded – undo
159 159
 						'delete_terms' => 'ee_delete_event_type',
160 160
 						'assign_terms' => 'ee_assign_event_type'
161 161
 						),
162
-					'rewrite' => array( 'slug' => __( 'event-type', 'event_espresso' )),
162
+					'rewrite' => array('slug' => __('event-type', 'event_espresso')),
163 163
 					'hierarchical'=>true
164 164
 				))
165
-			) );
165
+			));
166 166
 	}
167 167
 
168 168
 
@@ -180,26 +180,26 @@  discard block
 block discarded – undo
180 180
 	 * @return array 	       Empty array if no matching model names for the given slug or an array of model
181 181
 	 *                                         names indexed by post type slug.
182 182
 	 */
183
-	public static function get_cpt_model_names( $post_type_slug = '' ) {
183
+	public static function get_cpt_model_names($post_type_slug = '') {
184 184
 		$cpts = self::get_CPTs();
185 185
 
186 186
 		//first if slug passed in...
187
-		if ( ! empty( $post_type_slug )  ) {
187
+		if ( ! empty($post_type_slug)) {
188 188
 			//match?
189
-			if ( ! isset( $cpts[$post_type_slug] ) || ( isset( $cpts[$post_type_slug] ) && empty( $cpts[$post_type_slug]['class_name'] ) ) ) {
189
+			if ( ! isset($cpts[$post_type_slug]) || (isset($cpts[$post_type_slug]) && empty($cpts[$post_type_slug]['class_name']))) {
190 190
 				return array();
191 191
 			}
192 192
 
193 193
 			//k let's get the model name for this cpt.
194
-			return array( $post_type_slug => str_replace( 'EE', 'EEM', $cpts[$post_type_slug]['class_name'] ) );
194
+			return array($post_type_slug => str_replace('EE', 'EEM', $cpts[$post_type_slug]['class_name']));
195 195
 		}
196 196
 
197 197
 
198 198
 		//if we made it here then we're returning an array of cpt model names indexed by post_type_slug.
199 199
 		$cpt_models = array();
200
-		foreach ( $cpts as $slug => $args ) {
201
-			if ( ! empty( $args['class_name'] ) ) {
202
-				$cpt_models[$slug] = str_replace( 'EE', 'EEM', $args['class_name'] );
200
+		foreach ($cpts as $slug => $args) {
201
+			if ( ! empty($args['class_name'])) {
202
+				$cpt_models[$slug] = str_replace('EE', 'EEM', $args['class_name']);
203 203
 			}
204 204
 		}
205 205
 		return $cpt_models;
@@ -220,12 +220,12 @@  discard block
 block discarded – undo
220 220
 	 * @return EEM_CPT_Base[]   successful instantiation will return an array of successfully instantiated EEM
221 221
 	 *                                     	  models  indexed by post slug.
222 222
 	 */
223
-	public static function instantiate_cpt_models( $post_type_slug = '' ) {
224
-		$cpt_model_names = self::get_cpt_model_names( $post_type_slug );
223
+	public static function instantiate_cpt_models($post_type_slug = '') {
224
+		$cpt_model_names = self::get_cpt_model_names($post_type_slug);
225 225
 		$instantiated = array();
226
-		foreach ( $cpt_model_names as $slug => $model_name ) {
227
-			$instance = EE_Registry::instance()->load_model( str_replace( 'EEM_', '', $model_name ) );
228
-			if ( $instance instanceof EEM_CPT_Base ) {
226
+		foreach ($cpt_model_names as $slug => $model_name) {
227
+			$instance = EE_Registry::instance()->load_model(str_replace('EEM_', '', $model_name));
228
+			if ($instance instanceof EEM_CPT_Base) {
229 229
 				$instantiated[$slug] = $instance;
230 230
 			}
231 231
 		}
@@ -242,10 +242,10 @@  discard block
 block discarded – undo
242 242
 	 *  @access 	public
243 243
 	 *  @return 	array
244 244
 	 */
245
-	public static function get_CPTs(){
245
+	public static function get_CPTs() {
246 246
 		// define CPTs
247 247
 		// NOTE the ['args']['page_templates'] array index is something specific to our CPTs and not part of the WP custom post type api.
248
-		return apply_filters( 'FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
248
+		return apply_filters('FHEE__EE_Register_CPTs__get_CPTs__cpts', array(
249 249
 			'espresso_events' => array(
250 250
 				'singular_name' => __("Event", "event_espresso"),
251 251
 				'plural_name' => __("Events", "event_espresso"),
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
 					'publicly_queryable'=> FALSE,
321 321
 					'hierarchical'=> FALSE,
322 322
 					'has_archive' => FALSE,
323
-					'taxonomies' => array( 'post_tag' ),
323
+					'taxonomies' => array('post_tag'),
324 324
 					'capability_type' => 'contact',
325 325
 					'capabilities' => array(
326 326
 						'edit_post' => 'ee_edit_contact',
@@ -337,9 +337,9 @@  discard block
 block discarded – undo
337 337
 						'edit_private_posts' => 'ee_edit_contacts',
338 338
 						'edit_published_posts' => 'ee_edit_contacts'
339 339
 						),
340
-					'supports' => array( 'editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments' ),
340
+					'supports' => array('editor', 'thumbnail', 'excerpt', 'custom-fields', 'comments'),
341 341
 				))
342
-			) );
342
+			));
343 343
 	}
344 344
 
345 345
 
@@ -352,9 +352,9 @@  discard block
 block discarded – undo
352 352
 	public static function get_private_CPTs() {
353 353
 		$CPTs = self::get_CPTs();
354 354
 		$private_CPTs = array();
355
-		foreach ( $CPTs as $CPT => $details ) {
356
-			if ( empty( $details['args']['public'] ) )
357
-				$private_CPTs[ $CPT ] = $details;
355
+		foreach ($CPTs as $CPT => $details) {
356
+			if (empty($details['args']['public']))
357
+				$private_CPTs[$CPT] = $details;
358 358
 		}
359 359
 		return $private_CPTs;
360 360
 	}
@@ -372,7 +372,7 @@  discard block
 block discarded – undo
372 372
 	 * @param string $plural_name internationalized plural name
373 373
 	 * @param array $override_args like $args on http://codex.wordpress.org/Function_Reference/register_taxonomy
374 374
 	 */
375
-	function register_taxonomy( $taxonomy_name, $singular_name, $plural_name, $override_args = array() ){
375
+	function register_taxonomy($taxonomy_name, $singular_name, $plural_name, $override_args = array()) {
376 376
 
377 377
 		$args = array(
378 378
 		'hierarchical'      => true,
@@ -388,15 +388,15 @@  discard block
 block discarded – undo
388 388
 		//'rewrite'           => array( 'slug' => 'genre' ),
389 389
 	);
390 390
 
391
-	  if($override_args){
392
-		  if(isset($override_args['labels'])){
393
-			  $labels = array_merge($args['labels'],$override_args['labels']);
391
+	  if ($override_args) {
392
+		  if (isset($override_args['labels'])) {
393
+			  $labels = array_merge($args['labels'], $override_args['labels']);
394 394
 			  $args['labels'] = $labels;
395 395
 		  }
396
-		  $args = array_merge($args,$override_args);
396
+		  $args = array_merge($args, $override_args);
397 397
 
398 398
 	  }
399
-		register_taxonomy($taxonomy_name,null, $args);
399
+		register_taxonomy($taxonomy_name, null, $args);
400 400
 	}
401 401
 
402 402
 
@@ -410,27 +410,27 @@  discard block
 block discarded – undo
410 410
 	 * The default values set in this function will be overridden by whatever you set in $override_args
411 411
 	 * @return void, but registers the custom post type
412 412
 	 */
413
-	function register_CPT($post_type, $singular_name,$plural_name,$override_args = array(), $singular_slug = '', $plural_slug = '' ) {
413
+	function register_CPT($post_type, $singular_name, $plural_name, $override_args = array(), $singular_slug = '', $plural_slug = '') {
414 414
 
415 415
 	  $labels = array(
416 416
 		'name' => $plural_name,
417 417
 		'singular_name' => $singular_name,
418
-		'add_new' => sprintf(__("Add %s", "event_espresso"),$singular_name),
419
-		'add_new_item' => sprintf(__("Add New %s", "event_espresso"),$singular_name),
420
-		'edit_item' => sprintf(__("Edit %s", "event_espresso"),$singular_name),
421
-		'new_item' => sprintf(__("New %s", "event_espresso"),$singular_name),
422
-		'all_items' => sprintf(__("All %s", "event_espresso"),$plural_name),
423
-		'view_item' => sprintf(__("View %s", "event_espresso"),$singular_name),
424
-		'search_items' => sprintf(__("Search %s", "event_espresso"),$plural_name),
425
-		'not_found' => sprintf(__("No %s found", "event_espresso"),$plural_name),
426
-		'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"),$plural_name),
418
+		'add_new' => sprintf(__("Add %s", "event_espresso"), $singular_name),
419
+		'add_new_item' => sprintf(__("Add New %s", "event_espresso"), $singular_name),
420
+		'edit_item' => sprintf(__("Edit %s", "event_espresso"), $singular_name),
421
+		'new_item' => sprintf(__("New %s", "event_espresso"), $singular_name),
422
+		'all_items' => sprintf(__("All %s", "event_espresso"), $plural_name),
423
+		'view_item' => sprintf(__("View %s", "event_espresso"), $singular_name),
424
+		'search_items' => sprintf(__("Search %s", "event_espresso"), $plural_name),
425
+		'not_found' => sprintf(__("No %s found", "event_espresso"), $plural_name),
426
+		'not_found_in_trash' => sprintf(__("No %s found in Trash", "event_espresso"), $plural_name),
427 427
 		'parent_item_colon' => '',
428
-		'menu_name' => sprintf(__("%s", "event_espresso"),$plural_name)
428
+		'menu_name' => sprintf(__("%s", "event_espresso"), $plural_name)
429 429
 	  );
430 430
 
431 431
 	  //verify plural slug and singular slug, if they aren't we'll use $singular_name and $plural_name
432
-	  $singular_slug = ! empty( $singular_slug ) ? $singular_slug : $singular_name;
433
-	  $plural_slug = ! empty( $plural_slug ) ? $plural_slug : $plural_name;
432
+	  $singular_slug = ! empty($singular_slug) ? $singular_slug : $singular_name;
433
+	  $plural_slug = ! empty($plural_slug) ? $plural_slug : $plural_name;
434 434
 
435 435
 
436 436
 	  //note the page_templates arg in the supports index is something specific to EE.  WordPress doesn't actually have that in their register_post_type api.
@@ -442,24 +442,24 @@  discard block
 block discarded – undo
442 442
 		'show_in_menu' => false,
443 443
 		'show_in_nav_menus' => false,
444 444
 		'query_var' => true,
445
-		'rewrite' => apply_filters( 'FHEE__EE_Register_CPTs__register_CPT__rewrite', array( 'slug' => $plural_slug ), $post_type ),
445
+		'rewrite' => apply_filters('FHEE__EE_Register_CPTs__register_CPT__rewrite', array('slug' => $plural_slug), $post_type),
446 446
 		'capability_type' => 'post',
447 447
 		'map_meta_cap' => true,
448 448
 		'has_archive' => true,
449 449
 		'hierarchical' => true,
450 450
 		'menu_position' => null,
451
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments' )
451
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments')
452 452
 	  );
453 453
 
454
-	  if($override_args){
455
-		  if(isset($override_args['labels'])){
456
-			  $labels = array_merge($args['labels'],$override_args['labels']);
454
+	  if ($override_args) {
455
+		  if (isset($override_args['labels'])) {
456
+			  $labels = array_merge($args['labels'], $override_args['labels']);
457 457
 		  }
458
-		  $args = array_merge($args,$override_args);
458
+		  $args = array_merge($args, $override_args);
459 459
 		  $args['labels'] = $labels;
460 460
 	  }
461 461
 
462
-	  register_post_type( $post_type, $args );
462
+	  register_post_type($post_type, $args);
463 463
 	}
464 464
 
465 465
 
@@ -467,15 +467,15 @@  discard block
 block discarded – undo
467 467
 
468 468
 	function set_must_use_event_types() {
469 469
 		$term_details = array(
470
-			'single-event' => array( __('Single Event', 'event_espresso'), __('A single event that spans one or more consecutive days. Attendee\'s register for the first date-time only', 'event_espresso') ), //example: a party or two-day long workshop
470
+			'single-event' => array(__('Single Event', 'event_espresso'), __('A single event that spans one or more consecutive days. Attendee\'s register for the first date-time only', 'event_espresso')), //example: a party or two-day long workshop
471 471
 
472
-			'multi-event' => array( __('Multi Event', 'event_espresso'), __('Multiple, separate, but related events that occur on consecutive days. Attendee\'s can register for any of the date-times', 'event_espresso') ), //example: a three day music festival or week long conference
472
+			'multi-event' => array(__('Multi Event', 'event_espresso'), __('Multiple, separate, but related events that occur on consecutive days. Attendee\'s can register for any of the date-times', 'event_espresso')), //example: a three day music festival or week long conference
473 473
 
474
-			'event-series' => array( __('Event Series', 'event_espresso'), __(' Multiple events that occur over multiple non-consecutive days. Attendee\'s register for the first date-time only', 'event_espresso') ), //example: an 8 week introduction to basket weaving course
474
+			'event-series' => array(__('Event Series', 'event_espresso'), __(' Multiple events that occur over multiple non-consecutive days. Attendee\'s register for the first date-time only', 'event_espresso')), //example: an 8 week introduction to basket weaving course
475 475
 
476
-			'recurring-event' => array( __('Recurring Event', 'event_espresso'), __('Multiple events that occur over multiple non-consecutive days. Attendee\'s can register for any of the date-times.', 'event_espresso') ), //example: a yoga class
476
+			'recurring-event' => array(__('Recurring Event', 'event_espresso'), __('Multiple events that occur over multiple non-consecutive days. Attendee\'s can register for any of the date-times.', 'event_espresso')), //example: a yoga class
477 477
 
478
-			'ongoing' => array( __('Ongoing Event', 'event_espresso'), __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event', 'event_espresso') ) //example: access to a museum
478
+			'ongoing' => array(__('Ongoing Event', 'event_espresso'), __('An "event" that people can purchase tickets to gain access for anytime for this event regardless of date times on the event', 'event_espresso')) //example: access to a museum
479 479
 
480 480
 			//'walk-in' => array( __('Walk In', 'event_espresso'), __('Single datetime and single entry recurring events. Attendees register for one or multiple datetimes individually.', 'event_espresso') ),
481 481
 			//'reservation' => array( __('Reservation', 'event_espresso'), __('Reservations are created by specifying available datetimes and quantities. Attendees choose from the available datetimes and specify the quantity available (if the maximum is greater than 1)') ), //@TODO to avoid confusion we'll implement this in a later iteration > EE4.1
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
 			//'appointment' => array( __('Appointments', 'event_espresso'), __('Time slotted events where datetimes are generally in hours or minutes. For example, attendees can register for a single 15 minute or 1 hour time slot and this type of availability frequently reoccurs.', 'event_espresso') )
484 484
 
485 485
 			);
486
-		$this->set_must_use_terms( 'espresso_event_type', $term_details );
486
+		$this->set_must_use_terms('espresso_event_type', $term_details);
487 487
 	}
488 488
 
489 489
 
@@ -497,16 +497,16 @@  discard block
 block discarded – undo
497 497
 	 *
498 498
 	 * @return void
499 499
 	 */
500
-	function set_must_use_terms( $taxonomy, $term_details ) {
500
+	function set_must_use_terms($taxonomy, $term_details) {
501 501
 		$term_details = (array) $term_details;
502 502
 
503
-		foreach ( $term_details as $slug => $details ) {
504
-			if ( !term_exists( $slug, $taxonomy ) ) {
503
+		foreach ($term_details as $slug => $details) {
504
+			if ( ! term_exists($slug, $taxonomy)) {
505 505
 				$insert_arr = array(
506 506
 					'slug' => $slug,
507 507
 					'description' => $details[1]
508 508
 					);
509
-				wp_insert_term( $details[0], $taxonomy, $insert_arr );
509
+				wp_insert_term($details[0], $taxonomy, $insert_arr);
510 510
 			}
511 511
 		}
512 512
 	}
@@ -520,8 +520,8 @@  discard block
 block discarded – undo
520 520
 	 * @param string $term_slug The slug of the term that will be the default.
521 521
 	 * @param array $cpt_slugs  An array of custom post types we want the default assigned to
522 522
 	 */
523
-	function set_default_term( $taxonomy, $term_slug, $cpt_slugs = array() ) {
524
-		$this->_default_terms[][$term_slug] = new EE_Default_Term( $taxonomy, $term_slug, $cpt_slugs );
523
+	function set_default_term($taxonomy, $term_slug, $cpt_slugs = array()) {
524
+		$this->_default_terms[][$term_slug] = new EE_Default_Term($taxonomy, $term_slug, $cpt_slugs);
525 525
 	}
526 526
 
527 527
 
@@ -533,20 +533,20 @@  discard block
 block discarded – undo
533 533
 	 * @param  object $post    Post object
534 534
 	 * @return void
535 535
 	 */
536
-	function save_default_term( $post_id, $post ) {
537
-		if ( empty( $this->_default_terms ) )
536
+	function save_default_term($post_id, $post) {
537
+		if (empty($this->_default_terms))
538 538
 			return; //no default terms set so lets just exit.
539 539
 
540
-		foreach ( $this->_default_terms as $defaults ) {
541
-			foreach ( $defaults as $default_obj ) {
542
-				if ( $post->post_status == 'publish' && in_array( $post->post_type, $default_obj->cpt_slugs ) ) {
540
+		foreach ($this->_default_terms as $defaults) {
541
+			foreach ($defaults as $default_obj) {
542
+				if ($post->post_status == 'publish' && in_array($post->post_type, $default_obj->cpt_slugs)) {
543 543
 
544 544
 					//note some error proofing going on here to save unnecessary db queries
545
-					$taxonomies = get_object_taxonomies( $post->post_type );
546
-					foreach ( (array) $taxonomies as $taxonomy ) {
547
-						$terms = wp_get_post_terms( $post_id, $taxonomy);
548
-						if ( empty( $terms ) && $taxonomy == $default_obj->taxonomy ) {
549
-							wp_set_object_terms( $post_id, array( $default_obj->term_slug ), $taxonomy );
545
+					$taxonomies = get_object_taxonomies($post->post_type);
546
+					foreach ((array) $taxonomies as $taxonomy) {
547
+						$terms = wp_get_post_terms($post_id, $taxonomy);
548
+						if (empty($terms) && $taxonomy == $default_obj->taxonomy) {
549
+							wp_set_object_terms($post_id, array($default_obj->term_slug), $taxonomy);
550 550
 						}
551 551
 					}
552 552
 				}
@@ -578,7 +578,7 @@  discard block
 block discarded – undo
578 578
 	 * @param string $term_slug The slug of the term that will be the default.
579 579
 	 * @param array $cpt_slugs  The custom post type the default term gets saved with
580 580
 	 */
581
-	public function __construct( $taxonomy, $term_slug, $cpt_slugs = array() ) {
581
+	public function __construct($taxonomy, $term_slug, $cpt_slugs = array()) {
582 582
 		$this->taxonomy = $taxonomy;
583 583
 		$this->cpt_slugs = (array) $cpt_slugs;
584 584
 		$this->term_slug = $term_slug;
Please login to merge, or discard this patch.
Braces   +10 added lines, -5 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
  *
4 6
  * EE_Register_CPTs
@@ -353,8 +355,9 @@  discard block
 block discarded – undo
353 355
 		$CPTs = self::get_CPTs();
354 356
 		$private_CPTs = array();
355 357
 		foreach ( $CPTs as $CPT => $details ) {
356
-			if ( empty( $details['args']['public'] ) )
357
-				$private_CPTs[ $CPT ] = $details;
358
+			if ( empty( $details['args']['public'] ) ) {
359
+							$private_CPTs[ $CPT ] = $details;
360
+			}
358 361
 		}
359 362
 		return $private_CPTs;
360 363
 	}
@@ -534,8 +537,10 @@  discard block
 block discarded – undo
534 537
 	 * @return void
535 538
 	 */
536 539
 	function save_default_term( $post_id, $post ) {
537
-		if ( empty( $this->_default_terms ) )
538
-			return; //no default terms set so lets just exit.
540
+		if ( empty( $this->_default_terms ) ) {
541
+					return;
542
+		}
543
+		//no default terms set so lets just exit.
539 544
 
540 545
 		foreach ( $this->_default_terms as $defaults ) {
541 546
 			foreach ( $defaults as $default_obj ) {
Please login to merge, or discard this patch.
core/EED_Module.module.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 	 *  @var 			WP $WP
74 74
 	 *  @return 	void
75 75
 	 */
76
-	public abstract function run( $WP );
76
+	public abstract function run($WP);
77 77
 
78 78
 
79 79
 
@@ -96,12 +96,12 @@  discard block
 block discarded – undo
96 96
 	 * @param $module_name
97 97
 	 * @return EED_Module
98 98
 	 */
99
-	protected static function get_instance( $module_name = '' ) {
100
-		$module_name = ! empty( $module_name ) ? $module_name : get_called_class();
101
-		if ( ! isset(  EE_Registry::instance()->modules->{$module_name} ) || ! EE_Registry::instance()->modules->{$module_name} instanceof EED_Module ) {
102
-			EE_Registry::instance()->add_module( $module_name );
99
+	protected static function get_instance($module_name = '') {
100
+		$module_name = ! empty($module_name) ? $module_name : get_called_class();
101
+		if ( ! isset(EE_Registry::instance()->modules->{$module_name} ) || ! EE_Registry::instance()->modules->{$module_name} instanceof EED_Module) {
102
+			EE_Registry::instance()->add_module($module_name);
103 103
 		}
104
-		return EE_Registry::instance()->get_module( $module_name );
104
+		return EE_Registry::instance()->get_module($module_name);
105 105
 	}
106 106
 
107 107
 
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 	 * @return    string
114 114
 	 */
115 115
 	public function module_name() {
116
-		return get_class( $this );
116
+		return get_class($this);
117 117
 	}
118 118
 
119 119
 
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.
core/EES_Shortcode.shortcode.php 2 patches
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
 	 * @param WP $WP
38 38
 	 * @return    void
39 39
 	 */
40
-	public abstract function run( WP $WP );
40
+	public abstract function run(WP $WP);
41 41
 
42 42
 
43 43
 
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	 *  @param		array 	$attributes
50 50
 	 *  @return 	mixed
51 51
 	 */
52
-	public abstract function process_shortcode( $attributes = array() );
52
+	public abstract function process_shortcode($attributes = array());
53 53
 
54 54
 
55 55
 
@@ -60,13 +60,13 @@  discard block
 block discarded – undo
60 60
 	 * @param 	string $shortcode_class
61 61
 	 * @return 	\EES_Shortcode
62 62
 	 */
63
-	final public static function instance( $shortcode_class = NULL ) {
64
-		$shortcode_class = ! empty( $shortcode_class ) ? $shortcode_class : get_called_class();
65
-		if ( $shortcode_class == 'EES_Shortcode' || empty( $shortcode_class )) {
63
+	final public static function instance($shortcode_class = NULL) {
64
+		$shortcode_class = ! empty($shortcode_class) ? $shortcode_class : get_called_class();
65
+		if ($shortcode_class == 'EES_Shortcode' || empty($shortcode_class)) {
66 66
 			return NULL;
67 67
 		}
68
-		$shortcode = str_replace( 'EES_', '', strtoupper( $shortcode_class ));
69
-		$shortcode_obj = isset( EE_Registry::instance()->shortcodes->$shortcode ) ? EE_Registry::instance()->shortcodes->$shortcode : NULL;
68
+		$shortcode = str_replace('EES_', '', strtoupper($shortcode_class));
69
+		$shortcode_obj = isset(EE_Registry::instance()->shortcodes->$shortcode) ? EE_Registry::instance()->shortcodes->$shortcode : NULL;
70 70
 		return $shortcode_obj instanceof $shortcode_class || $shortcode_class == 'self' ? $shortcode_obj : new $shortcode_class();
71 71
 	}
72 72
 
@@ -81,20 +81,20 @@  discard block
 block discarded – undo
81 81
 	 * @param 	$attributes
82 82
 	 * @return 	mixed
83 83
 	 */
84
-	final public static function fallback_shortcode_processor( $attributes ) {
84
+	final public static function fallback_shortcode_processor($attributes) {
85 85
 		// what shortcode was actually parsed ?
86 86
 		$shortcode_class = get_called_class();
87 87
 		// notify rest of system that fallback processor was triggered
88
-		add_filter( 'FHEE__fallback_shortcode_processor__' . $shortcode_class, '__return_true' );
88
+		add_filter('FHEE__fallback_shortcode_processor__'.$shortcode_class, '__return_true');
89 89
 		// get instance of actual shortcode
90
-		$shortcode_obj = self::instance( $shortcode_class );
90
+		$shortcode_obj = self::instance($shortcode_class);
91 91
 		// verify class
92
-		if ( $shortcode_obj instanceof EES_Shortcode ) {
92
+		if ($shortcode_obj instanceof EES_Shortcode) {
93 93
 			global $wp;
94
-			$shortcode_obj->run( $wp );
94
+			$shortcode_obj->run($wp);
95 95
 			// set attributes and run the shortcode
96
-			$shortcode_obj->_attributes = (array)$attributes;
97
-			return $shortcode_obj->process_shortcode( $shortcode_obj->_attributes );
96
+			$shortcode_obj->_attributes = (array) $attributes;
97
+			return $shortcode_obj->process_shortcode($shortcode_obj->_attributes);
98 98
 		} else {
99 99
 			return NULL;
100 100
 		}
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 	 * @param 	$attributes
111 111
 	 * @return 	string
112 112
 	 */
113
-	final public static function invalid_shortcode_processor( $attributes ) {
113
+	final public static function invalid_shortcode_processor($attributes) {
114 114
 		return '';
115 115
 	}
116 116
 
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
124 124
 	 */
125 125
 	final public function __construct() {
126 126
 		// get classname, remove EES_prefix, and convert to UPPERCASE
127
-		$shortcode = strtoupper( str_replace( 'EES_', '', get_class( $this )));
127
+		$shortcode = strtoupper(str_replace('EES_', '', get_class($this)));
128 128
 		// assign shortcode to the preferred callback, which overwrites the "fallback shortcode processor" assigned earlier
129
-		add_shortcode( $shortcode, array( $this, 'process_shortcode' ));
129
+		add_shortcode($shortcode, array($this, 'process_shortcode'));
130 130
 		// make sure system knows this is an EE page
131
-		EE_Registry::instance()->REQ->set_espresso_page( TRUE );
131
+		EE_Registry::instance()->REQ->set_espresso_page(TRUE);
132 132
 	}
133 133
 
134 134
 
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.
core/EE_Base_Class_Repository.core.php 1 patch
Spacing   +12 added lines, -12 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_Base_Class_Repository
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 	 * @param array $arguments	arrays of arguments that will be passed to the object's save method
40 40
 	 * @return bool | int
41 41
 	 */
42
-	public function save( $arguments = array() ) {
43
-		return $this->persist( 'save', $arguments );
42
+	public function save($arguments = array()) {
43
+		return $this->persist('save', $arguments);
44 44
 	}
45 45
 
46 46
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * @return bool | int
55 55
 	 */
56 56
 	public function save_all() {
57
-		return $this->persist_all( 'save' );
57
+		return $this->persist_all('save');
58 58
 	}
59 59
 
60 60
 
@@ -68,8 +68,8 @@  discard block
 block discarded – undo
68 68
 	 * @return bool
69 69
 	 */
70 70
 	public function delete() {
71
-		$success = $this->_call_user_func_array_on_current( 'delete' );
72
-		$this->remove( $this->current() );
71
+		$success = $this->_call_user_func_array_on_current('delete');
72
+		$this->remove($this->current());
73 73
 		return $success;
74 74
 	}
75 75
 
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 	public function delete_all() {
87 87
 		$success = true;
88 88
 		$this->rewind();
89
-		while ( $this->valid() ) {
89
+		while ($this->valid()) {
90 90
 			// any db error will result in false being returned
91
-			$success = $this->_call_user_func_array_on_current( 'delete' ) !== false ? $success : false;
91
+			$success = $this->_call_user_func_array_on_current('delete') !== false ? $success : false;
92 92
 			// can't remove current object because valid() requires it
93 93
 			// so just capture current object temporarily
94 94
 			$object = $this->current();
95 95
 			// advance the pointer
96 96
 			$this->next();
97 97
 			// THEN remove the object from the repository
98
-			$this->remove( $object );
98
+			$this->remove($object);
99 99
 		}
100 100
 		return $success;
101 101
 	}
@@ -113,8 +113,8 @@  discard block
 block discarded – undo
113 113
 	 * @param string $previous_value
114 114
 	 * @return bool | int
115 115
 	 */
116
-	public function update_extra_meta( $meta_key, $meta_value, $previous_value = null ) {
117
-		return $this->_call_user_func_array_on_current( 'update_extra_meta', array( $meta_key, $meta_value, $previous_value ) );
116
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = null) {
117
+		return $this->_call_user_func_array_on_current('update_extra_meta', array($meta_key, $meta_value, $previous_value));
118 118
 	}
119 119
 
120 120
 
Please login to merge, or discard this patch.
core/EE_Configurable.core.php 2 patches
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
 	/**
53 53
 	 * @param string $config_section
54 54
 	 */
55
-	public function set_config_section( $config_section = '' ) {
56
-		$this->_config_section = ! empty( $config_section ) ? $config_section : 'modules';
55
+	public function set_config_section($config_section = '') {
56
+		$this->_config_section = ! empty($config_section) ? $config_section : 'modules';
57 57
 	}
58 58
 
59 59
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	/**
71 71
 	 * @param string $config_class
72 72
 	 */
73
-	public function set_config_class( $config_class = '' ) {
73
+	public function set_config_class($config_class = '') {
74 74
 		$this->_config_class = $config_class;
75 75
 	}
76 76
 
@@ -88,8 +88,8 @@  discard block
 block discarded – undo
88 88
 	/**
89 89
 	 * @param mixed $config_name
90 90
 	 */
91
-	public function set_config_name( $config_name ) {
92
-		$this->_config_name = ! empty( $config_name ) ? $config_name : get_called_class();
91
+	public function set_config_name($config_name) {
92
+		$this->_config_name = ! empty($config_name) ? $config_name : get_called_class();
93 93
 	}
94 94
 
95 95
 
@@ -112,8 +112,8 @@  discard block
 block discarded – undo
112 112
 	 * @param 	EE_Config_Base 	$config_obj
113 113
 	 * @return 	mixed 	EE_Config_Base | NULL
114 114
 	 */
115
-	protected function _set_config( EE_Config_Base $config_obj = NULL ) {
116
-		return EE_Config::instance()->set_config( $this->config_section(), $this->config_name(), $this->config_class(), $config_obj );
115
+	protected function _set_config(EE_Config_Base $config_obj = NULL) {
116
+		return EE_Config::instance()->set_config($this->config_section(), $this->config_name(), $this->config_class(), $config_obj);
117 117
 	}
118 118
 
119 119
 
@@ -127,12 +127,12 @@  discard block
 block discarded – undo
127 127
 	 * @throws \EE_Error
128 128
 	 * @return    mixed    EE_Config_Base | NULL
129 129
 	 */
130
-	public function _update_config( EE_Config_Base $config_obj = NULL ) {
130
+	public function _update_config(EE_Config_Base $config_obj = NULL) {
131 131
 		$config_class = $this->config_class();
132
-		if ( ! $config_obj instanceof $config_class ) {
133
-			throw new EE_Error( sprintf( __( 'The "%1$s" class is not an instance of %2$s.', 'event_espresso' ), print_r( $config_obj, TRUE ), $config_class ));
132
+		if ( ! $config_obj instanceof $config_class) {
133
+			throw new EE_Error(sprintf(__('The "%1$s" class is not an instance of %2$s.', 'event_espresso'), print_r($config_obj, TRUE), $config_class));
134 134
 		}
135
-		return EE_Config::instance()->update_config( $this->config_section(), $this->config_name(), $config_obj );
135
+		return EE_Config::instance()->update_config($this->config_section(), $this->config_name(), $config_obj);
136 136
 	}
137 137
 
138 138
 
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
 	 * @return EE_Config_Base
144 144
 	 */
145 145
 	public function config() {
146
-		if ( empty( $this->_config )) {
147
-			$this->_config = EE_Config::instance()->get_config( $this->config_section(), $this->config_name(), $this->config_class() );
146
+		if (empty($this->_config)) {
147
+			$this->_config = EE_Config::instance()->get_config($this->config_section(), $this->config_name(), $this->config_class());
148 148
 		}
149 149
 		return $this->_config;
150 150
 	}
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.