Completed
Branch BUG-10381-asset-loading (7390a7)
by
unknown
39:00 queued 27:53
created
core/db_classes/EE_Venue.class.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -48,7 +48,7 @@
 block discarded – undo
48 48
 	 * @param array $props_n_values  incoming values from the database
49 49
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
50 50
 	 *                          		the website will be used.
51
-	 * @return EE_Attendee
51
+	 * @return EE_Venue
52 52
 	 */
53 53
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
54 54
 		return new self( $props_n_values, TRUE, $timezone );
Please login to merge, or discard this patch.
Spacing   +81 added lines, -81 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
  * Event Espresso
@@ -37,9 +37,9 @@  discard block
 block discarded – undo
37 37
 	 *                             		    date_format and the second value is the time format
38 38
 	 * @return EE_Attendee
39 39
 	 */
40
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
41
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__, $timezone, $date_formats );
42
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
40
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
41
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
42
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
43 43
 	}
44 44
 
45 45
 
@@ -50,8 +50,8 @@  discard block
 block discarded – undo
50 50
 	 *                          		the website will be used.
51 51
 	 * @return EE_Attendee
52 52
 	 */
53
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
54
-		return new self( $props_n_values, TRUE, $timezone );
53
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
54
+		return new self($props_n_values, TRUE, $timezone);
55 55
 	}
56 56
 
57 57
 
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 	 * @return string
62 62
 	 */
63 63
 	function name() {
64
-		return $this->get( 'VNU_name' );
64
+		return $this->get('VNU_name');
65 65
 	}
66 66
 
67 67
 
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	 * @return string
71 71
 	 */
72 72
 	function phone() {
73
-		return $this->get( 'VNU_phone' );
73
+		return $this->get('VNU_phone');
74 74
 	}
75 75
 
76 76
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	 * @return string
81 81
 	 */
82 82
 	function venue_url() {
83
-		return $this->get( 'VNU_url' );
83
+		return $this->get('VNU_url');
84 84
 	}
85 85
 
86 86
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * @return string
90 90
 	 */
91 91
 	function description() {
92
-		return $this->get( 'VNU_desc' );
92
+		return $this->get('VNU_desc');
93 93
 	}
94 94
 
95 95
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 * @return string
100 100
 	 */
101 101
 	function excerpt() {
102
-		return $this->get( 'VNU_short_desc' );
102
+		return $this->get('VNU_short_desc');
103 103
 	}
104 104
 
105 105
 
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @return string
110 110
 	 */
111 111
 	function identifier() {
112
-		return $this->get( 'VNU_identifier' );
112
+		return $this->get('VNU_identifier');
113 113
 	}
114 114
 
115 115
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 * @return string
120 120
 	 */
121 121
 	function address() {
122
-		return $this->get( 'VNU_address' );
122
+		return $this->get('VNU_address');
123 123
 	}
124 124
 
125 125
 
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	 * @return string
130 130
 	 */
131 131
 	function address2() {
132
-		return $this->get( 'VNU_address2' );
132
+		return $this->get('VNU_address2');
133 133
 	}
134 134
 
135 135
 
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 	 * @return string
141 141
 	 */
142 142
 	function city() {
143
-		return $this->get( 'VNU_city' );
143
+		return $this->get('VNU_city');
144 144
 	}
145 145
 
146 146
 	/**
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
148 148
 	 * @return int
149 149
 	 */
150 150
 	function state_ID() {
151
-		return $this->get( 'STA_ID' );
151
+		return $this->get('STA_ID');
152 152
 	}
153 153
 
154 154
 
@@ -166,7 +166,7 @@  discard block
 block discarded – undo
166 166
 	 * @return string
167 167
 	 */
168 168
 	public function state_name() {
169
-		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() :  '';
169
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->name() : '';
170 170
 	}
171 171
 
172 172
 
@@ -176,7 +176,7 @@  discard block
 block discarded – undo
176 176
 	 * @return EE_State
177 177
 	 */
178 178
 	function state_obj() {
179
-		return $this->get_first_related( 'State' );
179
+		return $this->get_first_related('State');
180 180
 	}
181 181
 
182 182
 
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
 	 * @return string
189 189
 	 */
190 190
 	public function state() {
191
-		if ( apply_filters( 'FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj() ) ) {
191
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
192 192
 			return $this->state_abbrev();
193 193
 		} else {
194 194
 			return $this->state_name();
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	 * @return string
203 203
 	 */
204 204
 	function country_ID() {
205
-		return $this->get( 'CNT_ISO' );
205
+		return $this->get('CNT_ISO');
206 206
 	}
207 207
 
208 208
 
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	 * @return string
212 212
 	 */
213 213
 	public function country_name() {
214
-		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() :  '';
214
+		return $this->country_obj() instanceof EE_Country ? $this->country_obj()->name() : '';
215 215
 	}
216 216
 
217 217
 
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 	 * @return EE_Country
222 222
 	 */
223 223
 	function country_obj() {
224
-		return $this->get_first_related( 'Country' );
224
+		return $this->get_first_related('Country');
225 225
 	}
226 226
 
227 227
 
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
233 233
 	 * @return string
234 234
 	 */
235 235
 	public function country() {
236
-		if ( apply_filters( 'FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj() ) ) {
236
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
237 237
 			return $this->country_ID();
238 238
 		} else {
239 239
 			return $this->country_name();
@@ -247,7 +247,7 @@  discard block
 block discarded – undo
247 247
 	 * @return string
248 248
 	 */
249 249
 	function zip() {
250
-		return $this->get( 'VNU_zip' );
250
+		return $this->get('VNU_zip');
251 251
 	}
252 252
 
253 253
 
@@ -257,7 +257,7 @@  discard block
 block discarded – undo
257 257
 	 * @return int
258 258
 	 */
259 259
 	function capacity() {
260
-		return $this->get_pretty( 'VNU_capacity', 'symbol' );
260
+		return $this->get_pretty('VNU_capacity', 'symbol');
261 261
 	}
262 262
 
263 263
 
@@ -267,7 +267,7 @@  discard block
 block discarded – undo
267 267
 	 * @return string
268 268
 	 */
269 269
 	function created() {
270
-		return $this->get( 'VNU_created' );
270
+		return $this->get('VNU_created');
271 271
 	}
272 272
 
273 273
 
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 	 * @return string
278 278
 	 */
279 279
 	function modified() {
280
-		return $this->get( 'VNU_modified' );
280
+		return $this->get('VNU_modified');
281 281
 	}
282 282
 
283 283
 
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 	 * @return int
288 288
 	 */
289 289
 	function order() {
290
-		return $this->get( 'VNU_order' );
290
+		return $this->get('VNU_order');
291 291
 	}
292 292
 
293 293
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
 	 * @return int
298 298
 	 */
299 299
 	function wp_user() {
300
-		return $this->get( 'VNU_wp_user' );
300
+		return $this->get('VNU_wp_user');
301 301
 	}
302 302
 
303 303
 
@@ -306,7 +306,7 @@  discard block
 block discarded – undo
306 306
 	 * @return string
307 307
 	 */
308 308
 	function virtual_phone() {
309
-		return $this->get( 'VNU_virtual_phone' );
309
+		return $this->get('VNU_virtual_phone');
310 310
 	}
311 311
 
312 312
 
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 	 * @return string
316 316
 	 */
317 317
 	function virtual_url() {
318
-		return $this->get( 'VNU_virtual_url' );
318
+		return $this->get('VNU_virtual_url');
319 319
 	}
320 320
 
321 321
 
@@ -324,7 +324,7 @@  discard block
 block discarded – undo
324 324
 	 * @return bool
325 325
 	 */
326 326
 	function enable_for_gmap() {
327
-		return $this->get( 'VNU_enable_for_gmap' );
327
+		return $this->get('VNU_enable_for_gmap');
328 328
 	}
329 329
 
330 330
 
@@ -333,7 +333,7 @@  discard block
 block discarded – undo
333 333
 	 * @return string
334 334
 	 */
335 335
 	function google_map_link() {
336
-		return $this->get( 'VNU_google_map_link' );
336
+		return $this->get('VNU_google_map_link');
337 337
 	}
338 338
 
339 339
 
@@ -345,16 +345,16 @@  discard block
 block discarded – undo
345 345
 	 * @param bool  $upcoming
346 346
 	 * @return EE_Event[]
347 347
 	 */
348
-	function events( $query_params = array(), $upcoming = FALSE ) {
349
-		if ( $upcoming ) {
348
+	function events($query_params = array(), $upcoming = FALSE) {
349
+		if ($upcoming) {
350 350
 			$query_params = array(
351 351
 				array(
352 352
 					'status' => 'publish',
353
-					'Datetime.DTT_EVT_start' => array( '>',  EEM_Datetime::instance()->current_time_for_query( 'DTT_EVT_start' ) )
353
+					'Datetime.DTT_EVT_start' => array('>', EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'))
354 354
 				)
355 355
 			);
356 356
 		}
357
-		return $this->get_many_related( 'Event', $query_params );
357
+		return $this->get_many_related('Event', $query_params);
358 358
 	}
359 359
 
360 360
 
@@ -372,8 +372,8 @@  discard block
 block discarded – undo
372 372
 	/**
373 373
 	 * Sets address
374 374
 	 */
375
-	function set_address( $address = '' ) {
376
-		$this->set( 'VNU_address', $address );
375
+	function set_address($address = '') {
376
+		$this->set('VNU_address', $address);
377 377
 	}
378 378
 
379 379
 
@@ -381,8 +381,8 @@  discard block
 block discarded – undo
381 381
 	/**
382 382
 	 * @param string $address2
383 383
 	 */
384
-	function set_address2( $address2 = '' ) {
385
-		$this->set( 'VNU_address2', $address2 );
384
+	function set_address2($address2 = '') {
385
+		$this->set('VNU_address2', $address2);
386 386
 	}
387 387
 
388 388
 
@@ -390,8 +390,8 @@  discard block
 block discarded – undo
390 390
 	/**
391 391
 	 * @param string $city
392 392
 	 */
393
-	function set_city( $city = '' ) {
394
-		$this->set( 'VNU_city', $city );
393
+	function set_city($city = '') {
394
+		$this->set('VNU_city', $city);
395 395
 	}
396 396
 
397 397
 
@@ -399,8 +399,8 @@  discard block
 block discarded – undo
399 399
 	/**
400 400
 	 * @param int $state
401 401
 	 */
402
-	function set_state_ID( $state = 0 ) {
403
-		$this->set( 'STA_ID', $state );
402
+	function set_state_ID($state = 0) {
403
+		$this->set('STA_ID', $state);
404 404
 	}
405 405
 
406 406
 
@@ -411,8 +411,8 @@  discard block
 block discarded – undo
411 411
 	 * @param EE_State /int $state_id_or_obj
412 412
 	 * @return EE_State
413 413
 	 */
414
-	function set_state_obj( $state_id_or_obj ) {
415
-		return $this->_add_relation_to( $state_id_or_obj, 'State' );
414
+	function set_state_obj($state_id_or_obj) {
415
+		return $this->_add_relation_to($state_id_or_obj, 'State');
416 416
 	}
417 417
 
418 418
 
@@ -420,8 +420,8 @@  discard block
 block discarded – undo
420 420
 	/**
421 421
 	 * @param int $country_ID
422 422
 	 */
423
-	function set_country_ID( $country_ID = 0 ) {
424
-		$this->set( 'CNT_ISO', $country_ID );
423
+	function set_country_ID($country_ID = 0) {
424
+		$this->set('CNT_ISO', $country_ID);
425 425
 	}
426 426
 
427 427
 
@@ -430,7 +430,7 @@  discard block
 block discarded – undo
430 430
 	 * @param EE_Country /string $country_id_or_obj
431 431
 	 * @return EE_Country
432 432
 	 */
433
-	function set_country_obj( $country_id_or_obj ) {
433
+	function set_country_obj($country_id_or_obj) {
434 434
 		return $this->_add_relation_to($country_id_or_obj, 'Country');
435 435
 	}
436 436
 
@@ -439,8 +439,8 @@  discard block
 block discarded – undo
439 439
 	/**
440 440
 	 * @param string $zip
441 441
 	 */
442
-	function set_zip( $zip = '' ) {
443
-		$this->set( 'VNU_zip', $zip );
442
+	function set_zip($zip = '') {
443
+		$this->set('VNU_zip', $zip);
444 444
 	}
445 445
 
446 446
 
@@ -448,8 +448,8 @@  discard block
 block discarded – undo
448 448
 	/**
449 449
 	 * @param int $capacity
450 450
 	 */
451
-	function set_capacity( $capacity = 0 ) {
452
-		$this->set( 'VNU_capacity', $capacity );
451
+	function set_capacity($capacity = 0) {
452
+		$this->set('VNU_capacity', $capacity);
453 453
 	}
454 454
 
455 455
 
@@ -457,8 +457,8 @@  discard block
 block discarded – undo
457 457
 	/**
458 458
 	 * @param string $created
459 459
 	 */
460
-	function set_created( $created = '' ) {
461
-		$this->set( 'VNU_created', $created );
460
+	function set_created($created = '') {
461
+		$this->set('VNU_created', $created);
462 462
 	}
463 463
 
464 464
 
@@ -466,8 +466,8 @@  discard block
 block discarded – undo
466 466
 	/**
467 467
 	 * @param string $desc
468 468
 	 */
469
-	function set_description( $desc = '' ) {
470
-		$this->set( 'VNU_desc', $desc );
469
+	function set_description($desc = '') {
470
+		$this->set('VNU_desc', $desc);
471 471
 	}
472 472
 
473 473
 
@@ -475,8 +475,8 @@  discard block
 block discarded – undo
475 475
 	/**
476 476
 	 * @param string $identifier
477 477
 	 */
478
-	function set_identifier( $identifier = '' ) {
479
-		$this->set( 'VNU_identifier', $identifier );
478
+	function set_identifier($identifier = '') {
479
+		$this->set('VNU_identifier', $identifier);
480 480
 	}
481 481
 
482 482
 
@@ -484,8 +484,8 @@  discard block
 block discarded – undo
484 484
 	/**
485 485
 	 * @param string $modified
486 486
 	 */
487
-	function set_modified( $modified = '' ) {
488
-		$this->set( 'VNU_modified', $modified );
487
+	function set_modified($modified = '') {
488
+		$this->set('VNU_modified', $modified);
489 489
 	}
490 490
 
491 491
 
@@ -493,8 +493,8 @@  discard block
 block discarded – undo
493 493
 	/**
494 494
 	 * @param string $name
495 495
 	 */
496
-	function set_name( $name = '' ) {
497
-		$this->set( 'VNU_name', $name );
496
+	function set_name($name = '') {
497
+		$this->set('VNU_name', $name);
498 498
 	}
499 499
 
500 500
 
@@ -502,8 +502,8 @@  discard block
 block discarded – undo
502 502
 	/**
503 503
 	 * @param int $order
504 504
 	 */
505
-	function set_order( $order = 0 ) {
506
-		$this->set( 'VNU_order', $order );
505
+	function set_order($order = 0) {
506
+		$this->set('VNU_order', $order);
507 507
 	}
508 508
 
509 509
 
@@ -511,8 +511,8 @@  discard block
 block discarded – undo
511 511
 	/**
512 512
 	 * @param string $phone
513 513
 	 */
514
-	function set_phone( $phone = '' ) {
515
-		$this->set( 'VNU_phone', $phone );
514
+	function set_phone($phone = '') {
515
+		$this->set('VNU_phone', $phone);
516 516
 	}
517 517
 
518 518
 
@@ -520,8 +520,8 @@  discard block
 block discarded – undo
520 520
 	/**
521 521
 	 * @param int $wp_user
522 522
 	 */
523
-	function set_wp_user( $wp_user = 1 ) {
524
-		$this->set( 'VNU_wp_user', $wp_user );
523
+	function set_wp_user($wp_user = 1) {
524
+		$this->set('VNU_wp_user', $wp_user);
525 525
 	}
526 526
 
527 527
 
@@ -529,8 +529,8 @@  discard block
 block discarded – undo
529 529
 	/**
530 530
 	 * @param string $url
531 531
 	 */
532
-	function set_venue_url( $url = '' ) {
533
-		$this->set( 'VNU_url', $url );
532
+	function set_venue_url($url = '') {
533
+		$this->set('VNU_url', $url);
534 534
 	}
535 535
 
536 536
 
@@ -538,8 +538,8 @@  discard block
 block discarded – undo
538 538
 	/**
539 539
 	 * @param string $phone
540 540
 	 */
541
-	function set_virtual_phone( $phone = '' ) {
542
-		$this->set( 'VNU_virtual_phone', $phone );
541
+	function set_virtual_phone($phone = '') {
542
+		$this->set('VNU_virtual_phone', $phone);
543 543
 	}
544 544
 
545 545
 
@@ -547,8 +547,8 @@  discard block
 block discarded – undo
547 547
 	/**
548 548
 	 * @param string $url
549 549
 	 */
550
-	function set_virtual_url( $url = '' ) {
551
-		$this->set( 'VNU_virtual_url', $url );
550
+	function set_virtual_url($url = '') {
551
+		$this->set('VNU_virtual_url', $url);
552 552
 	}
553 553
 
554 554
 
@@ -556,8 +556,8 @@  discard block
 block discarded – undo
556 556
 	/**
557 557
 	 * @param string $enable
558 558
 	 */
559
-	function set_enable_for_gmap( $enable = '' ) {
560
-		$this->set( 'VNU_enable_for_gmap', $enable );
559
+	function set_enable_for_gmap($enable = '') {
560
+		$this->set('VNU_enable_for_gmap', $enable);
561 561
 	}
562 562
 
563 563
 
@@ -565,8 +565,8 @@  discard block
 block discarded – undo
565 565
 	/**
566 566
 	 * @param string $google_map_link
567 567
 	 */
568
-	function set_google_map_link( $google_map_link = '' ) {
569
-		$this->set( 'VNU_google_map_link', $google_map_link );
568
+	function set_google_map_link($google_map_link = '') {
569
+		$this->set('VNU_google_map_link', $google_map_link);
570 570
 	}
571 571
 
572 572
 
Please login to merge, or discard this patch.
payment_methods/Paypal_Standard/EE_PMT_Paypal_Standard.pm.php 2 patches
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  * @since 				$VID:$
11 11
  *
12 12
  */
13
-class EE_PMT_Paypal_Standard extends EE_PMT_Base{
13
+class EE_PMT_Paypal_Standard extends EE_PMT_Base {
14 14
 
15 15
 	const shipping_info_none = 1;
16 16
 	const shipping_info_optional = 0;
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 * @param \EE_Transaction $transaction
47 47
 	 * @return NULL
48 48
 	 */
49
-	public function generate_new_billing_form( EE_Transaction $transaction = NULL ) {
49
+	public function generate_new_billing_form(EE_Transaction $transaction = NULL) {
50 50
 		return NULL;
51 51
 	}
52 52
 
@@ -59,13 +59,13 @@  discard block
 block discarded – undo
59 59
 	 * @throws \EE_Error
60 60
 	 */
61 61
 	public function generate_new_settings_form() {
62
-		require_once( $this->file_folder() . 'EE_Paypal_Standard_Form.form.php' );
63
-		$form =  new EE_Paypal_Standard_Form( $this );
64
-		$form->get_input( 'PMD_debug_mode' )->set_html_label_text(
65
-			sprintf( __( "Use PayPal Sandbox %s", 'event_espresso' ), $this->get_help_tab_link() )
62
+		require_once($this->file_folder().'EE_Paypal_Standard_Form.form.php');
63
+		$form = new EE_Paypal_Standard_Form($this);
64
+		$form->get_input('PMD_debug_mode')->set_html_label_text(
65
+			sprintf(__("Use PayPal Sandbox %s", 'event_espresso'), $this->get_help_tab_link())
66 66
 		);
67
-		$form->get_input( 'shipping_details' )->set_html_label_text(
68
-			sprintf( __( "Shipping Address Options %s", "event_espresso" ), $this->get_help_tab_link() )
67
+		$form->get_input('shipping_details')->set_html_label_text(
68
+			sprintf(__("Shipping Address Options %s", "event_espresso"), $this->get_help_tab_link())
69 69
 		);
70 70
 		return $form;
71 71
 	}
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
 	 * @see EE_PMT_Base::help_tabs_config()
78 78
 	 * @return array
79 79
 	 */
80
-	public function help_tabs_config(){
80
+	public function help_tabs_config() {
81 81
 		return array(
82 82
 			$this->get_help_tab_name() => array(
83 83
 				'title'=>  __("PayPal Standard Settings", 'event_espresso'),
@@ -99,13 +99,13 @@  discard block
 block discarded – undo
99 99
 	 * @return EE_Payment
100 100
 	 * @throws \EE_Error
101 101
 	 */
102
-	public function finalize_payment_for($transaction){
102
+	public function finalize_payment_for($transaction) {
103 103
 		// PayPal standard actually sends the IPN info along with the user when they return to our site
104 104
 		// so in case the IPN is arriving later, let's try to process an IPN!
105
-		if( $_SERVER['REQUEST_METHOD'] === 'POST' ){
106
-			return $this->handle_ipn($_POST, $transaction );
107
-		}else{
108
-			return parent::finalize_payment_for( $transaction );
105
+		if ($_SERVER['REQUEST_METHOD'] === 'POST') {
106
+			return $this->handle_ipn($_POST, $transaction);
107
+		} else {
108
+			return parent::finalize_payment_for($transaction);
109 109
 		}
110 110
 	}
111 111
 
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -104,7 +104,7 @@
 block discarded – undo
104 104
 		// so in case the IPN is arriving later, let's try to process an IPN!
105 105
 		if( $_SERVER['REQUEST_METHOD'] === 'POST' ){
106 106
 			return $this->handle_ipn($_POST, $transaction );
107
-		}else{
107
+		} else{
108 108
 			return parent::finalize_payment_for( $transaction );
109 109
 		}
110 110
 	}
Please login to merge, or discard this patch.
core/helpers/EEH_Formatter.helper.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -74,6 +74,7 @@
 block discarded – undo
74 74
 	 * [ee_tep_not_null description]
75 75
 	 *
76 76
 	 * @param  string | array $value [description]
77
+	 * @param string $value
77 78
 	 * @return bool       [description]
78 79
 	 */
79 80
 	static public function ee_tep_not_null( $value ) {
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 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,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 * @param  string $content content to format
27 27
 	 * @return string          formatted content
28 28
 	 */
29
-	static public function admin_format_content( $content = '' ) {
30
-		return wpautop( stripslashes_deep( html_entity_decode( $content, ENT_QUOTES, "UTF-8" ) ) );
29
+	static public function admin_format_content($content = '') {
30
+		return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
31 31
 	}
32 32
 
33 33
 
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
 	 * @param  boolean $protected true then we run htmlspecialchars and return
44 44
 	 * @return string
45 45
 	 */
46
-	static public function ee_tep_output_string( $string, $translate = false, $protected = false ) {
47
-		if ( $protected === true ) {
48
-			return htmlspecialchars( $string );
46
+	static public function ee_tep_output_string($string, $translate = false, $protected = false) {
47
+		if ($protected === true) {
48
+			return htmlspecialchars($string);
49 49
 		} else {
50
-			if ( $translate === false ) {
51
-				return self::ee_tep_parse_input_field_data( $string, array( '"' => '&quot;' ) );
50
+			if ($translate === false) {
51
+				return self::ee_tep_parse_input_field_data($string, array('"' => '&quot;'));
52 52
 			} else {
53
-				return self::ee_tep_parse_input_field_data( $string, $translate );
53
+				return self::ee_tep_parse_input_field_data($string, $translate);
54 54
 			}
55 55
 		}
56 56
 	}
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 	 * @param         array ] $parse array in the form array( 'from' => 'to', ... )
65 65
 	 * @return string
66 66
 	 */
67
-	static public function ee_tep_parse_input_field_data( $data, $parse ) {
68
-		return strtr( trim( $data ), $parse );
67
+	static public function ee_tep_parse_input_field_data($data, $parse) {
68
+		return strtr(trim($data), $parse);
69 69
 	}
70 70
 
71 71
 
@@ -76,15 +76,15 @@  discard block
 block discarded – undo
76 76
 	 * @param  string | array $value [description]
77 77
 	 * @return bool       [description]
78 78
 	 */
79
-	static public function ee_tep_not_null( $value ) {
80
-		if ( is_array( $value ) ) {
81
-			if ( count( $value ) > 0 ) {
79
+	static public function ee_tep_not_null($value) {
80
+		if (is_array($value)) {
81
+			if (count($value) > 0) {
82 82
 				return true;
83 83
 			} else {
84 84
 				return false;
85 85
 			}
86 86
 		} else {
87
-			if ( ( $value !== '' ) && ( strtolower( $value ) !== 'null' ) && ( strlen( trim( $value ) ) > 0 ) ) {
87
+			if (($value !== '') && (strtolower($value) !== 'null') && (strlen(trim($value)) > 0)) {
88 88
 				return true;
89 89
 			} else {
90 90
 				return false;
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	 * @return string
105 105
 	 * @deprecated v4.6.21
106 106
 	 */
107
-	static public function event_date_display( $date, $format = '' ) {
107
+	static public function event_date_display($date, $format = '') {
108 108
 		EE_Error::doing_it_wrong(
109 109
 			__METHOD__,
110 110
 			__(
Please login to merge, or discard this patch.
event_single_caff/templates/admin-event-single-settings.template.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
2
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
3 3
 $values = EEH_Form_Fields::prep_answer_options(
4 4
 	array(
5
-		array( 'id' => 1, 'text' => __( 'Yes', 'event_espresso' ) ),
6
-		array( 'id' => 0, 'text' => __( 'No', 'event_espresso' ) )
5
+		array('id' => 1, 'text' => __('Yes', 'event_espresso')),
6
+		array('id' => 0, 'text' => __('No', 'event_espresso'))
7 7
 	)
8 8
 );
9 9
 ?>
@@ -22,27 +22,27 @@  discard block
 block discarded – undo
22 22
 					</label>
23 23
 				</th>
24 24
 				<td>
25
-					<?php echo EEH_Form_Fields::select( 'display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single' ); ?>
26
-					<p class="description"><?php _e( 'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso' ); ?></p>
25
+					<?php echo EEH_Form_Fields::select('display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single'); ?>
26
+					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso'); ?></p>
27 27
 				</td>
28 28
 			</tr>
29 29
 
30 30
 			<tr>
31 31
 				<th>
32 32
 					<label for="display_venue">
33
-						<?php _e( 'Display Venue Details', 'event_espresso' ); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
33
+						<?php _e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
34 34
 					</label>
35 35
 				</th>
36 36
 				<td>
37
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'display_venue', 'display_venue' ); ?>
38
-					<p class="description"><?php _e( 'Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso' ); ?></p>
37
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'display_venue', 'display_venue'); ?>
38
+					<p class="description"><?php _e('Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso'); ?></p>
39 39
 				</td>
40 40
 			</tr>
41 41
 
42 42
 			<tr>
43 43
 				<th>
44 44
 					<label for="EED_Events_Single_use_sortable_display_order">
45
-						<?php _e( 'Use Custom Display Order?', 'event_espresso' ); ?>
45
+						<?php _e('Use Custom Display Order?', 'event_espresso'); ?>
46 46
 					</label>
47 47
 				</th>
48 48
 				<td>
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 					<p class="description ">
59 59
 						<?php
60 60
 						echo sprintf(
61
-							__( '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso' ),
61
+							__('%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso'),
62 62
 							'<span class="important-notice">',
63 63
 							'</span>',
64 64
 							'<br />'
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 
71 71
 			<tr>
72 72
 				<th>
73
-					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
73
+					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
74 74
 				</th>
75 75
 				<td>
76 76
 
77
-					<?php wp_nonce_field( 'espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false ); ?>
77
+					<?php wp_nonce_field('espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false); ?>
78 78
 					<?php echo $event_single_display_order; ?>
79 79
 
80 80
 					<p class="description"><?php _e('Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.', 'event_espresso'); ?></p>
Please login to merge, or discard this patch.
events_archive_caff/templates/admin-event-list-settings.template.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
2
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
3 3
 
4
-$values = EEH_Form_Fields::prep_answer_options( array(
5
-	array( 'id' => 1, 'text' => __('Yes', 'event_espresso')),
6
-	array( 'id' => 0, 'text' => __('No', 'event_espresso'))
4
+$values = EEH_Form_Fields::prep_answer_options(array(
5
+	array('id' => 1, 'text' => __('Yes', 'event_espresso')),
6
+	array('id' => 0, 'text' => __('No', 'event_espresso'))
7 7
 ));
8 8
 
9
-$description = EEH_Form_Fields::prep_answer_options( array(
10
-	array( 'id' => 0, 'text' => __('none', 'event_espresso')),
11
-	array( 'id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
12
-	array( 'id' => 2, 'text' => __('full description', 'event_espresso'))
9
+$description = EEH_Form_Fields::prep_answer_options(array(
10
+	array('id' => 0, 'text' => __('none', 'event_espresso')),
11
+	array('id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
12
+	array('id' => 2, 'text' => __('full description', 'event_espresso'))
13 13
 ));
14 14
 
15 15
 ?>
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 			<tr>
28 28
 				<th>
29 29
 					<label for="event_listings_url">
30
-						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info');?>
30
+						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info'); ?>
31 31
 					</label>
32 32
 				</th>
33 33
 				<td>
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
 					</label>
43 43
 				</th>
44 44
 				<td>
45
-					<p><?php echo site_url() . '/ ' . EEH_Form_Fields::text( 'not_used', EE_Registry::instance()->CFG->core->event_cpt_slug, 'event_cpt_slug', 'event_cpt_slug', 'regular' ); ?></p>
45
+					<p><?php echo site_url().'/ '.EEH_Form_Fields::text('not_used', EE_Registry::instance()->CFG->core->event_cpt_slug, 'event_cpt_slug', 'event_cpt_slug', 'regular'); ?></p>
46 46
 					<p class="description"><?php _e('This allows you to configure what slug is used for the url of all event pages.', 'event_espresso'); ?></p>
47
-					<?php if ( has_filter( 'FHEE__EE_Register_CPTs__register_CPT__rewrite' ) ) : ?>
47
+					<?php if (has_filter('FHEE__EE_Register_CPTs__register_CPT__rewrite')) : ?>
48 48
 						<p class="important-notice">
49 49
 							<?php
50 50
 							sprintf(
51
-								__( 'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.', 'event_espresso' ),
51
+								__('Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.', 'event_espresso'),
52 52
 								'<code>',
53 53
 								'</code>'
54 54
 							);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 					</label>
66 66
 				</th>
67 67
 				<td>
68
-				<?php echo EEH_Form_Fields::select( 'display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner' );?>
68
+				<?php echo EEH_Form_Fields::select('display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner'); ?>
69 69
 					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.', 'event_espresso'); ?></p>
70 70
 				</td>
71 71
 			</tr>
@@ -73,55 +73,55 @@  discard block
 block discarded – undo
73 73
 			<tr>
74 74
 				<th>
75 75
 					<label for="EED_Events_Archive_display_description">
76
-						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info');?>
76
+						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info'); ?>
77 77
 					</label>
78 78
 				</th>
79 79
 				<td>
80
-					<?php echo EEH_Form_Fields::select( 'description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description' );?>
80
+					<?php echo EEH_Form_Fields::select('description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description'); ?>
81 81
 				</td>
82 82
 			</tr>
83 83
 
84 84
 			<tr>
85 85
 				<th>
86 86
 					<label for="EED_Events_Archive_display_ticket_selector">
87
-						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info');?>
87
+						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info'); ?>
88 88
 					</label>
89 89
 				</th>
90 90
 				<td>
91
-					<?php echo EEH_Form_Fields::select( 'ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector' );?>
91
+					<?php echo EEH_Form_Fields::select('ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector'); ?>
92 92
 				</td>
93 93
 			</tr>
94 94
 
95 95
 			<tr>
96 96
 				<th>
97 97
 					<label for="EED_Events_Archive_display_datetimes">
98
-						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info');?>
98
+						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info'); ?>
99 99
 					</label>
100 100
 				</th>
101 101
 				<td>
102
-					<?php echo EEH_Form_Fields::select( 'venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes' );?>
102
+					<?php echo EEH_Form_Fields::select('venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes'); ?>
103 103
 				</td>
104 104
 			</tr>
105 105
 
106 106
 			<tr>
107 107
 				<th>
108 108
 					<label for="EED_Events_Archive_display_venue">
109
-						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info');?>
109
+						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info'); ?>
110 110
 					</label>
111 111
 				</th>
112 112
 				<td>
113
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue' );?>
113
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue'); ?>
114 114
 				</td>
115 115
 			</tr>
116 116
 
117 117
 			<tr>
118 118
 				<th>
119 119
 					<label for="EED_Events_Archive_display_expired_events">
120
-						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info');?>
120
+						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info'); ?>
121 121
 					</label>
122 122
 				</th>
123 123
 				<td>
124
-					<?php echo EEH_Form_Fields::select( 'expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events' );?>
124
+					<?php echo EEH_Form_Fields::select('expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events'); ?>
125 125
 				</td>
126 126
 			</tr>
127 127
 
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 					</label>
133 133
 				</th>
134 134
 				<td>
135
-					<?php echo EEH_Form_Fields::select( 'use_sortable_display_order', $use_sortable_display_order, $values, 'EED_Events_Archive_use_sortable_display_order', 'EED_Events_Archive_use_sortable_display_order' );?>
135
+					<?php echo EEH_Form_Fields::select('use_sortable_display_order', $use_sortable_display_order, $values, 'EED_Events_Archive_use_sortable_display_order', 'EED_Events_Archive_use_sortable_display_order'); ?>
136 136
 					<p class="description ">
137 137
 						<?php
138 138
 						echo sprintf(
139
-							__( '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Archive listings, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso' ),
139
+							__('%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Archive listings, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso'),
140 140
 							'<span class="important-notice">',
141 141
 							'</span>',
142 142
 							'<br />'
@@ -148,14 +148,14 @@  discard block
 block discarded – undo
148 148
 
149 149
 			<tr>
150 150
 				<th>
151
-					<?php _e( 'Display Order', 'event_espresso' ); ?><?php //echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
151
+					<?php _e('Display Order', 'event_espresso'); ?><?php //echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
152 152
 				</th>
153 153
 				<td>
154 154
 
155
-					<?php wp_nonce_field( 'espresso_update_event_archive_order', 'espresso_update_event_archive_order_nonce', false ); ?>
155
+					<?php wp_nonce_field('espresso_update_event_archive_order', 'espresso_update_event_archive_order_nonce', false); ?>
156 156
 					<?php echo $event_archive_display_order; ?>
157 157
 
158
-					<p class="description"><?php _e( 'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.', 'event_espresso' ); ?></p>
158
+					<p class="description"><?php _e('Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.', 'event_espresso'); ?></p>
159 159
 
160 160
 				</td>
161 161
 			</tr>
@@ -163,11 +163,11 @@  discard block
 block discarded – undo
163 163
 			<tr>
164 164
 				<th>
165 165
 					<label for="EED_Events_Archive_reset_event_list_settings">
166
-						<?php _e( 'Reset Event List Settings', 'event_espresso' ); ?>
166
+						<?php _e('Reset Event List Settings', 'event_espresso'); ?>
167 167
 					</label>
168 168
 				</th>
169 169
 				<td>
170
-					<?php echo EEH_Form_Fields::select( 'reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings' ); ?>
170
+					<?php echo EEH_Form_Fields::select('reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings'); ?>
171 171
 				</td>
172 172
 			</tr>
173 173
 
Please login to merge, or discard this patch.
4_6_0_stages/EE_DMS_4_6_0_invoice_settings.dmsstage.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 * Just initializes the status of the migration
28 28
 	 */
29 29
 	public function __construct() {
30
-		$this->_pretty_name = __( 'Update Invoice Settings', 'event_espresso' );
30
+		$this->_pretty_name = __('Update Invoice Settings', 'event_espresso');
31 31
 		parent::__construct();
32 32
 	}
33 33
 
@@ -54,13 +54,13 @@  discard block
 block discarded – undo
54 54
 	 * @throws EE_Error
55 55
 	 * @return int number of items ACTUALLY migrated
56 56
 	 */
57
-	protected function _migration_step( $num_items = 1 ){
57
+	protected function _migration_step($num_items = 1) {
58 58
 
59 59
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
60
-		$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
61
-		$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
62
-		if( $overridden_invoice_body || $overridden_receipt_body ) {
63
-			EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
60
+		$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
61
+		$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
62
+		if ($overridden_invoice_body || $overridden_receipt_body) {
63
+			EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
64 64
 		}
65 65
 
66 66
 		//regardless of whether it worked or not, we ought to continue the migration
Please login to merge, or discard this patch.
libraries/form_sections/strategies/layout/EE_Template_Layout.strategy.php 2 patches
Spacing   +34 added lines, -34 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  *
22 22
  * ------------------------------------------------------------------------
23 23
  */
24
-class EE_Template_Layout extends EE_Div_Per_Section_Layout{
24
+class EE_Template_Layout extends EE_Div_Per_Section_Layout {
25 25
 
26 26
 	protected $_layout_template_file = NULL;
27 27
 	protected $_layout_begin_template_file = NULL;
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
 	 * 		@type array 	$_template_args
43 43
 	 * 	}
44 44
 	 */
45
-	public function __construct( $template_options = array() ) {
45
+	public function __construct($template_options = array()) {
46 46
 		// loop thru incoming options
47
-		foreach( $template_options as $key => $value ) {
47
+		foreach ($template_options as $key => $value) {
48 48
 			// add underscore to $key to match property names
49
-			$_key = '_' . $key;
50
-			if ( property_exists( $this, $_key )) {
49
+			$_key = '_'.$key;
50
+			if (property_exists($this, $_key)) {
51 51
 					$this->{$_key} = $value;
52 52
 			}
53 53
 		}
@@ -65,8 +65,8 @@  discard block
 block discarded – undo
65 65
 	 * @return string
66 66
 	 */
67 67
 	public function layout_form() {
68
-		if ( $this->_layout_template_file ) {
69
-			return EEH_Template::locate_template( $this->_layout_template_file, $this->template_args(), TRUE, TRUE );
68
+		if ($this->_layout_template_file) {
69
+			return EEH_Template::locate_template($this->_layout_template_file, $this->template_args(), TRUE, TRUE);
70 70
 		} else {
71 71
 			return parent::layout_form();
72 72
 		}
@@ -79,9 +79,9 @@  discard block
 block discarded – undo
79 79
 	 * @return string
80 80
 	 */
81 81
 	public function layout_form_begin() {
82
-		if($this->_layout_begin_template_file){
83
-			return EEH_Template::locate_template( $this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE );
84
-		}else{
82
+		if ($this->_layout_begin_template_file) {
83
+			return EEH_Template::locate_template($this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE);
84
+		} else {
85 85
 			return parent::layout_form_begin();
86 86
 		}
87 87
 	}
@@ -94,9 +94,9 @@  discard block
 block discarded – undo
94 94
 	 * @param EE_Form_Input_Base $input
95 95
 	 * @return string
96 96
 	 */
97
-	public function layout_input( $input ) {
98
-		if($this->_input_template_file){
99
-			return EEH_Template::locate_template( $this->_input_template_file, array( 'input' => $input ), TRUE, TRUE );
97
+	public function layout_input($input) {
98
+		if ($this->_input_template_file) {
99
+			return EEH_Template::locate_template($this->_input_template_file, array('input' => $input), TRUE, TRUE);
100 100
 		}
101 101
 		return parent::layout_input($input);
102 102
 	}
@@ -109,11 +109,11 @@  discard block
 block discarded – undo
109 109
 	 * @param EE_Form_Section_Proper $form_section
110 110
 	 * @return string
111 111
 	 */
112
-	public function layout_subsection( $form_section ) {
113
-		if($this->_subsection_template_file){
114
-			return EEH_Template::locate_template( $this->_subsection_template_file, $this->template_args(), TRUE, TRUE );
112
+	public function layout_subsection($form_section) {
113
+		if ($this->_subsection_template_file) {
114
+			return EEH_Template::locate_template($this->_subsection_template_file, $this->template_args(), TRUE, TRUE);
115 115
 		}
116
-		return parent::layout_subsection( $form_section );
116
+		return parent::layout_subsection($form_section);
117 117
 	}
118 118
 
119 119
 
@@ -123,9 +123,9 @@  discard block
 block discarded – undo
123 123
 	 * @return string
124 124
 	 */
125 125
 	public function layout_form_end() {
126
-		if($this->_layout_end_template_file){
127
-			return EEH_Template::locate_template( $this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
128
-		}else{
126
+		if ($this->_layout_end_template_file) {
127
+			return EEH_Template::locate_template($this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
128
+		} else {
129 129
 			return parent::layout_form_end();
130 130
 		}
131 131
 	}
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	/**
136 136
 	 * @param array $template_args
137 137
 	 */
138
-	public function set_template_args( $template_args = array() ) {
138
+	public function set_template_args($template_args = array()) {
139 139
 		$this->_template_args = $template_args;
140 140
 	}
141 141
 
@@ -144,8 +144,8 @@  discard block
 block discarded – undo
144 144
 	/**
145 145
 	 * @param array $template_args
146 146
 	 */
147
-	public function add_template_args( $template_args = array() ) {
148
-		$this->_template_args = array_merge_recursive( $this->_template_args, $template_args );
147
+	public function add_template_args($template_args = array()) {
148
+		$this->_template_args = array_merge_recursive($this->_template_args, $template_args);
149 149
 	}
150 150
 
151 151
 
@@ -154,13 +154,13 @@  discard block
 block discarded – undo
154 154
 	 * @return array
155 155
 	 */
156 156
 	public function template_args() {
157
-		foreach ( $this->form_section()->subsections() as $subsection_name => $subsection ) {
158
-			$subsection_name = self::prep_form_subsection_key_name( $subsection_name );
159
-			if ( strpos( $subsection_name, '[' ) !== FALSE ) {
160
-				$sub_name = explode( '[', $subsection_name );
161
-				$this->_template_args[ $sub_name[0] ][ rtrim( $sub_name[1], ']' ) ] = $this->layout_subsection( $subsection );
157
+		foreach ($this->form_section()->subsections() as $subsection_name => $subsection) {
158
+			$subsection_name = self::prep_form_subsection_key_name($subsection_name);
159
+			if (strpos($subsection_name, '[') !== FALSE) {
160
+				$sub_name = explode('[', $subsection_name);
161
+				$this->_template_args[$sub_name[0]][rtrim($sub_name[1], ']')] = $this->layout_subsection($subsection);
162 162
 			} else {
163
-				$this->_template_args[ $subsection_name ] = $this->layout_subsection( $subsection );
163
+				$this->_template_args[$subsection_name] = $this->layout_subsection($subsection);
164 164
 			}
165 165
 		}
166 166
 //		d( $this->_template_args );
@@ -176,9 +176,9 @@  discard block
 block discarded – undo
176 176
 	 * @param string $subsection_name
177 177
 	 * @return string
178 178
 	 */
179
-	public static function prep_form_subsection_key_name( $subsection_name = '' ) {
180
-		$subsection_name = str_replace( array( '-', ' ' ), array( '', '_' ), $subsection_name );
181
-		return is_numeric( substr( $subsection_name, 0, 1 )) ? 'form_' . $subsection_name : $subsection_name;
179
+	public static function prep_form_subsection_key_name($subsection_name = '') {
180
+		$subsection_name = str_replace(array('-', ' '), array('', '_'), $subsection_name);
181
+		return is_numeric(substr($subsection_name, 0, 1)) ? 'form_'.$subsection_name : $subsection_name;
182 182
 	}
183 183
 
184 184
 
@@ -190,8 +190,8 @@  discard block
 block discarded – undo
190 190
 	 * @param string $subsection_name
191 191
 	 * @return string
192 192
 	 */
193
-	public static function get_subform_name( $subsection_name = '' ) {
194
-		return EE_Template_Layout::prep_form_subsection_key_name( $subsection_name );
193
+	public static function get_subform_name($subsection_name = '') {
194
+		return EE_Template_Layout::prep_form_subsection_key_name($subsection_name);
195 195
 	}
196 196
 
197 197
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	public function layout_form_begin() {
82 82
 		if($this->_layout_begin_template_file){
83 83
 			return EEH_Template::locate_template( $this->_layout_begin_template_file, $this->template_args(), TRUE, TRUE );
84
-		}else{
84
+		} else{
85 85
 			return parent::layout_form_begin();
86 86
 		}
87 87
 	}
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	public function layout_form_end() {
126 126
 		if($this->_layout_end_template_file){
127 127
 			return EEH_Template::locate_template( $this->_layout_end_template_file, $this->template_args(), TRUE, TRUE);
128
-		}else{
128
+		} else{
129 129
 			return parent::layout_form_end();
130 130
 		}
131 131
 	}
Please login to merge, or discard this patch.
libraries/form_sections/base/EE_Form_Section_HTML_From_Template.form.php 2 patches
Spacing   +4 added lines, -4 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
 /**
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML{
29
-	public function __construct($template_file,$args = array(), $options_array = array()) {
30
-		$html = EEH_Template::locate_template( $template_file, $args );
28
+class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML {
29
+	public function __construct($template_file, $args = array(), $options_array = array()) {
30
+		$html = EEH_Template::locate_template($template_file, $args);
31 31
 
32 32
 //		echo " filepath:$template_file html $html";
33 33
 		parent::__construct($html, $options_array);
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
 /**
7 8
  * Event Espresso
Please login to merge, or discard this patch.
core/libraries/form_sections/payment_methods/EE_Billing_Info_Form.form.php 1 patch
Spacing   +10 added lines, -10 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
  *
4 4
  * EE_Billing_Info_Form
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  * @author				Mike Nelson
12 12
  *
13 13
  */
14
-class EE_Billing_Info_Form extends EE_Form_Section_Proper{
14
+class EE_Billing_Info_Form extends EE_Form_Section_Proper {
15 15
 
16 16
 	/**
17 17
 	 * The payment method this billing form is for
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
 	 * @param EE_Payment_Method $payment_method
27 27
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
28 28
 	 */
29
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
29
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
30 30
 		$this->_pm_instance = $payment_method;
31 31
 		$this->_layout_strategy = new EE_Div_Per_Section_Layout();
32
-		parent::__construct( $options_array );
32
+		parent::__construct($options_array);
33 33
 
34 34
 	}
35 35
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param EE_Payment_Method $payment_method
41 41
 	 * @return void
42 42
 	 */
43
-	public function set_payment_method( EE_Payment_Method $payment_method ){
43
+	public function set_payment_method(EE_Payment_Method $payment_method) {
44 44
 		$this->_pm_instance = $payment_method;
45 45
 	}
46 46
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * Returns the instance of the payment method this billing form is for
51 51
 	 * @return EE_Payment_Method
52 52
 	 */
53
-	public function payment_method(){
53
+	public function payment_method() {
54 54
 		return $this->_pm_instance;
55 55
 	}
56 56
 
@@ -60,10 +60,10 @@  discard block
 block discarded – undo
60 60
 	 * payment_fields_autofilled_notice_html
61 61
 	 * @return string
62 62
 	 */
63
-	public function payment_fields_autofilled_notice_html(){
63
+	public function payment_fields_autofilled_notice_html() {
64 64
 		return  new EE_Form_Section_HTML(
65 65
 			EEH_HTML::p(
66
-				apply_filters( 'FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __( 'Payment fields have been autofilled because you are in debug mode', 'event_espresso' )),
66
+				apply_filters('FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __('Payment fields have been autofilled because you are in debug mode', 'event_espresso')),
67 67
 				'',
68 68
 				'important-notice'
69 69
 			)
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	/**
76 76
 	 * @return string
77 77
 	 */
78
-	public function html_class(){
79
-		return ! empty( $this->_html_class ) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
78
+	public function html_class() {
79
+		return ! empty($this->_html_class) ? $this->_html_class.' ee-billing-form' : 'ee-billing-form';
80 80
 	}
81 81
 
82 82
 
Please login to merge, or discard this patch.