Completed
Branch FET-10840-domain-class (74341b)
by
unknown
106:40 queued 94:08
created
core/libraries/messages/data_class/EE_Messages_Addressee.class.php 1 patch
Spacing   +7 added lines, -7 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
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
 	 * @param array $addressee_data We're expecting an incoming array of data that will be used to fill the properties
261 261
 	 *                              for the object.
262 262
 	 */
263
-	public function __construct( $addressee_data ) {
263
+	public function __construct($addressee_data) {
264 264
 		$this->_data = $addressee_data;
265 265
 		$this->_set_properties();
266 266
 	}
@@ -275,15 +275,15 @@  discard block
 block discarded – undo
275 275
 	 * @return void.
276 276
 	 */
277 277
 	protected function _set_properties() {
278
-		foreach ( $this->_data as $prop => $value ) {
279
-			if ( property_exists( $this, $prop ) ) {
278
+		foreach ($this->_data as $prop => $value) {
279
+			if (property_exists($this, $prop)) {
280 280
 				$this->{$prop} = $value;
281 281
 			}
282 282
 		}
283 283
 		//if user_id present we'll use this to set the fname and lname and admin_email.
284
-		if ( ! empty( $this->user_id ) ) {
284
+		if ( ! empty($this->user_id)) {
285 285
 			$this->user_id = (int) $this->user_id;
286
-			$user = get_userdata( $this->user_id );
286
+			$user = get_userdata($this->user_id);
287 287
 			$this->fname = $user->user_firstname;
288 288
 			$this->lname = $user->user_lastname;
289 289
 			$this->admin_email = $user->user_email;
Please login to merge, or discard this patch.
core/db_models/EEM_Checkin.model.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
  *
24 24
  * ------------------------------------------------------------------------
25 25
  */
26
-require_once ( EE_MODELS . 'EEM_Base.model.php' );
27
-require_once ( EE_CLASSES . 'EE_Checkin.class.php' );
26
+require_once (EE_MODELS.'EEM_Base.model.php');
27
+require_once (EE_CLASSES.'EE_Checkin.class.php');
28 28
 
29 29
 class EEM_Checkin extends EEM_Base {
30 30
 
@@ -40,12 +40,12 @@  discard block
 block discarded – undo
40 40
 	 * 		@param string $timezone string representing the timezone we want to set for returned Date Time Strings (and any incoming timezone data that gets saved).  Note this just sends the timezone info to the date time model field objects.  Default is NULL (and will be assumed using the set timezone in the 'timezone_string' wp option)
41 41
 	 * 		@return void
42 42
 	 */
43
-	protected function __construct( $timezone = NULL ) {
44
-		$this->singular_item = __('Check-In','event_espresso');
45
-		$this->plural_item = __('Check-Ins','event_espresso');
43
+	protected function __construct($timezone = NULL) {
44
+		$this->singular_item = __('Check-In', 'event_espresso');
45
+		$this->plural_item = __('Check-Ins', 'event_espresso');
46 46
 
47 47
 		$this->_tables = array(
48
-			'Checkin'=>new EE_Primary_Table('esp_checkin','CHK_ID')
48
+			'Checkin'=>new EE_Primary_Table('esp_checkin', 'CHK_ID')
49 49
 		);
50 50
 		$this->_fields = array(
51 51
 			'Checkin'=> array(
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 				'REG_ID'=>new EE_Foreign_Key_Int_Field('REG_ID', 'Registration Id', false, 0, 'Registration'),
54 54
 				'DTT_ID'=>new EE_Foreign_Key_Int_Field('DTT_ID', 'Datetime Id', false, 0, 'Datetime'),
55 55
 				'CHK_in'=>new EE_Boolean_Field('CHK_in', 'Whether a person has checked in or checked out', false, true),
56
-				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified','event_espresso'), false, EE_Datetime_Field::now, $timezone )
56
+				'CHK_timestamp'=>new EE_Datetime_Field('CHK_timestamp', __('When the row was modified', 'event_espresso'), false, EE_Datetime_Field::now, $timezone)
57 57
 			)
58 58
 		);
59 59
 		$this->_model_relations = array(
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 			'Datetime'=>new EE_Belongs_To_Relation()
62 62
 		);
63 63
 		$this->_model_chain_to_wp_user = 'Registration.Event';
64
-		parent::__construct( $timezone );
64
+		parent::__construct($timezone);
65 65
 
66 66
 	}
67 67
 
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.
form_sections/strategies/display/EE_Select2_Display_Strategy.strategy.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  * @since 				$VID:$
13 13
  *
14 14
  */
15
-class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy{
15
+class EE_Select2_Display_Strategy extends EE_Select_Display_Strategy {
16 16
 
17 17
 	/**
18 18
 	 * Arguments that will be passed into the select2 javascript constructor
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
 	 * @param array $select2_js_args pass in the EXACT array of JS arguments you want
26 26
 	 * to pass into the select2 js/html input. See https://select2.github.io
27 27
 	 */
28
-	public function __construct( $select2_js_args = array() ) {
28
+	public function __construct($select2_js_args = array()) {
29 29
 		$this->_select2_js_args = $select2_js_args;
30 30
 		parent::__construct();
31 31
 	}
@@ -37,12 +37,12 @@  discard block
 block discarded – undo
37 37
 	public function enqueue_js() {
38 38
 		// need to first deregister the select2 script in case some other plugin **cough cough Toolset Types cough**
39 39
 		// is carelessly registering an older version of Select2 on admin pages that don't even belong to them
40
-		wp_deregister_script( 'select2' );
41
-		wp_deregister_style( 'select2' );
42
-		wp_register_script( 'select2', EE_GLOBAL_ASSETS_URL . 'scripts/select2.min.js', array(), '4.0.2', true );
43
-		wp_register_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
44
-		wp_enqueue_script( 'form_section_select2_init', EE_GLOBAL_ASSETS_URL . 'scripts/form_section_select2_init.js', array( 'select2' ), '1.0.0', true );
45
-		wp_enqueue_style( 'select2', EE_GLOBAL_ASSETS_URL . 'css/select2.min.css', array(), '4.0.2', 'all' );
40
+		wp_deregister_script('select2');
41
+		wp_deregister_style('select2');
42
+		wp_register_script('select2', EE_GLOBAL_ASSETS_URL.'scripts/select2.min.js', array(), '4.0.2', true);
43
+		wp_register_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
44
+		wp_enqueue_script('form_section_select2_init', EE_GLOBAL_ASSETS_URL.'scripts/form_section_select2_init.js', array('select2'), '1.0.0', true);
45
+		wp_enqueue_style('select2', EE_GLOBAL_ASSETS_URL.'css/select2.min.css', array(), '4.0.2', 'all');
46 46
 	}
47 47
 
48 48
 	/**
@@ -57,7 +57,7 @@  discard block
 block discarded – undo
57 57
 	 * Sets the exact js args which will be passed into the select2 js/html input
58 58
 	 * @param array $js_args
59 59
 	 */
60
-	public function set_js_args( $js_args ) {
60
+	public function set_js_args($js_args) {
61 61
 		$this->_select2_js_args = $js_args;
62 62
 	}
63 63
 
@@ -66,12 +66,12 @@  discard block
 block discarded – undo
66 66
 	 * @param array $other_js_data
67 67
 	 * @return array
68 68
 	 */
69
-	public function get_other_js_data( $other_js_data = array() ) {
70
-		$other_js_data = parent::get_other_js_data( $other_js_data );
71
-		if( ! isset( $other_js_data[ 'select2s' ] ) ) {
69
+	public function get_other_js_data($other_js_data = array()) {
70
+		$other_js_data = parent::get_other_js_data($other_js_data);
71
+		if ( ! isset($other_js_data['select2s'])) {
72 72
 			$other_js_data['select2s'] = array();
73 73
 		}
74
-		$other_js_data[ 'select2s' ][ $this->_input->html_id() ] = $this->get_js_args();
74
+		$other_js_data['select2s'][$this->_input->html_id()] = $this->get_js_args();
75 75
 		return $other_js_data;
76 76
 	}
77 77
 }
78 78
\ No newline at end of file
Please login to merge, or discard this patch.
core/services/commands/CommandHandler.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@
 block discarded – undo
2 2
 namespace EventEspresso\core\services\commands;
3 3
 
4 4
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
5
-    exit('No direct script access allowed');
5
+	exit('No direct script access allowed');
6 6
 }
7 7
 
8 8
 
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_Country_Select_Input.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php  if ( ! defined( 'EVENT_ESPRESSO_VERSION' )) { exit( 'No direct script access allowed' ); }
1
+<?php  if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3 3
  * Class EE_Country_Select_Input
4 4
  *
@@ -11,23 +11,23 @@  discard block
 block discarded – undo
11 11
  * @since 				$VID:$
12 12
  *
13 13
  */
14
-class EE_Country_Select_Input extends EE_Select_Input{
14
+class EE_Country_Select_Input extends EE_Select_Input {
15 15
 
16 16
 	/**
17 17
 	 * @param array $country_options
18 18
 	 * @param array $input_settings
19 19
 	 * @return EE_Country_Select_Input
20 20
 	 */
21
-	public function __construct( $country_options = NULL, $input_settings = array() ){
21
+	public function __construct($country_options = NULL, $input_settings = array()) {
22 22
 		$country_options = apply_filters(
23 23
 			'FHEE__EE_Country_Select_Input____construct__country_options',
24
-			$this->get_country_answer_options( $country_options ),
24
+			$this->get_country_answer_options($country_options),
25 25
 			$this
26 26
 		);
27
-		$input_settings['html_class'] = isset( $input_settings['html_class'] )
28
-			? $input_settings['html_class'] . ' ee-country-select-js'
27
+		$input_settings['html_class'] = isset($input_settings['html_class'])
28
+			? $input_settings['html_class'].' ee-country-select-js'
29 29
 			: 'ee-country-select-js';
30
-		parent::__construct( $country_options, $input_settings );
30
+		parent::__construct($country_options, $input_settings);
31 31
 	}
32 32
 
33 33
 
@@ -38,16 +38,16 @@  discard block
 block discarded – undo
38 38
 	 * @param array $country_options
39 39
 	 * @return array
40 40
 	 */
41
-	public function get_country_answer_options( $country_options = NULL ){
41
+	public function get_country_answer_options($country_options = NULL) {
42 42
 		// if passed something that is NOT an array
43
-		if ( ! is_array( $country_options )) {
43
+		if ( ! is_array($country_options)) {
44 44
 			// get possibly cached list of countries
45 45
 			$countries = EEM_Country::instance()->get_all_active_countries();
46
-			if ( ! empty( $countries )) {
47
-				$country_options[ '' ] = '';
48
-				foreach( $countries as $country ){
49
-					if ( $country instanceof EE_Country ) {
50
-						$country_options[ $country->ID() ] = $country->name();
46
+			if ( ! empty($countries)) {
47
+				$country_options[''] = '';
48
+				foreach ($countries as $country) {
49
+					if ($country instanceof EE_Country) {
50
+						$country_options[$country->ID()] = $country->name();
51 51
 					}
52 52
 				}
53 53
 			} else {
Please login to merge, or discard this patch.
core/libraries/form_sections/inputs/EE_State_Select_Input.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -6,22 +6,22 @@  discard block
 block discarded – undo
6 6
  * @subpackage
7 7
  * @author				Mike Nelson
8 8
  */
9
-class EE_State_Select_Input extends EE_Select_Input{
9
+class EE_State_Select_Input extends EE_Select_Input {
10 10
 
11 11
 	/**
12 12
 	 * @param array $state_options
13 13
 	 * @param array $input_settings
14 14
 	 */
15
-	function __construct( $state_options, $input_settings = array() ){
15
+	function __construct($state_options, $input_settings = array()) {
16 16
 		$state_options = apply_filters(
17 17
 			'FHEE__EE_State_Select_Input____construct__state_options',
18
-			$this->get_state_answer_options( $state_options ),
18
+			$this->get_state_answer_options($state_options),
19 19
 			$this
20 20
 		);
21
-		$input_settings['html_class'] = isset( $input_settings['html_class'] )
22
-			? $input_settings['html_class'] . ' ee-state-select-js'
21
+		$input_settings['html_class'] = isset($input_settings['html_class'])
22
+			? $input_settings['html_class'].' ee-state-select-js'
23 23
 			: 'ee-state-select-js';
24
-		parent::__construct( $state_options, $input_settings );
24
+		parent::__construct($state_options, $input_settings);
25 25
 	}
26 26
 
27 27
 
@@ -32,17 +32,17 @@  discard block
 block discarded – undo
32 32
 	 * @param array $state_options
33 33
 	 * @return array
34 34
 	 */
35
-	public function get_state_answer_options( $state_options = NULL ){
35
+	public function get_state_answer_options($state_options = NULL) {
36 36
 		// if passed something that is NOT an array
37
-		if ( ! is_array( $state_options )) {
37
+		if ( ! is_array($state_options)) {
38 38
 			// get possibly cached list of states
39 39
 			$states = EEM_State::instance()->get_all_active_states();
40
-			if ( ! empty( $states )) {
40
+			if ( ! empty($states)) {
41 41
 				//set the default
42 42
 				$state_options[''][''] = '';
43
-				foreach( $states as $state ){
44
-					if ( $state instanceof EE_State ) {
45
-						$state_options[ $state->country()->name() ][ $state->ID() ] = $state->name();
43
+				foreach ($states as $state) {
44
+					if ($state instanceof EE_State) {
45
+						$state_options[$state->country()->name()][$state->ID()] = $state->name();
46 46
 					}
47 47
 				}
48 48
 			} else {
Please login to merge, or discard this patch.
core/admin/templates/espresso_ratings_request_content.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <div class="padding">
2
-	<p><?php _e( 'We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso' ); ?></p>
3
-	<p><?php _e( 'Rate it five stars today!', 'event_espresso' ); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
4
-	<p><a class="button button-primary" href="https://events.codebasehq.com/redirect?https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fsupport%2Fview%2Fplugin-reviews%2Fevent-espresso-decaf%3Frate%3D5%23postform"><?php _e( 'Rate It!', 'event_espresso' ); ?></a></p>
2
+	<p><?php _e('We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso'); ?></p>
3
+	<p><?php _e('Rate it five stars today!', 'event_espresso'); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
4
+	<p><a class="button button-primary" href="https://events.codebasehq.com/redirect?https://login.wordpress.org/?redirect_to=https%3A%2F%2Fwordpress.org%2Fsupport%2Fview%2Fplugin-reviews%2Fevent-espresso-decaf%3Frate%3D5%23postform"><?php _e('Rate It!', 'event_espresso'); ?></a></p>
5 5
 </div>
6 6
\ No newline at end of file
Please login to merge, or discard this patch.
payment_methods/Paypal_Express/templates/paypal_express_intro.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,1 +1,1 @@
 block discarded – undo
1
-<?php printf( __('PayPal Express (Express Checkout) is an off-site payment method for accepting payments via PayPal and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalexpress/" target="_blank">','</a>' ); ?> 
2 1
\ No newline at end of file
2
+<?php printf(__('PayPal Express (Express Checkout) is an off-site payment method for accepting payments via PayPal and is available to event organizers in many countries. A PayPal premier or business account is needed to accept payments. Need a PayPal account? Call 1-855-456-1338 or %1$sclick here to sign up for a merchant account%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/go/paypalexpress/" target="_blank">', '</a>'); ?> 
3 3
\ No newline at end of file
Please login to merge, or discard this patch.
Paypal_Express/templates/paypal_express_debug_info.template.php 1 patch
Spacing   +4 added lines, -4 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
 <div id="ppexpress-sandbox-panel" class="sandbox-panel">
4 4
 
@@ -6,13 +6,13 @@  discard block
 block discarded – undo
6 6
 
7 7
 	<h4><?php _e('How do I test specific error codes?', 'event_espresso'); ?></h4>
8 8
 	<p>
9
-		<?php _e( 'To trigger an error condition on an amount-related field, 
9
+		<?php _e('To trigger an error condition on an amount-related field, 
10 10
 			specify a error code value as a number with two digits to the right of the decimal point. 
11 11
 			For example, specify a value of 107.55 to trigger the 10755 error.', 
12
-		'event_espresso');?>
12
+		'event_espresso'); ?>
13 13
 	</p>
14 14
 	<p>
15
-		<?php printf( __( 'More details can be found here: %1$s Testing Error Conditions %2$s.', 'event_espresso'), '<a href="https://developer.paypal.com/docs/classic/lifecycle/sb_error-conditions">', '</a>');?>
15
+		<?php printf(__('More details can be found here: %1$s Testing Error Conditions %2$s.', 'event_espresso'), '<a href="https://developer.paypal.com/docs/classic/lifecycle/sb_error-conditions">', '</a>'); ?>
16 16
 	</p>
17 17
 
18 18
 </div>
19 19
\ No newline at end of file
Please login to merge, or discard this patch.