eventespresso / event-espresso-core

caffeinated/admin/extend/support/templates/support_admin_details_faq.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,7 +1,7 @@
 <div class="padding">
-	<h3><?php esc_html_e( 'Frequently Asked Questions about Event Espresso', 'event_espresso' ); ?></h3>
+	<h3><?php esc_html_e('Frequently Asked Questions about Event Espresso', 'event_espresso'); ?></h3>
 	
-	<h4><?php esc_html_e( 'New to Event Espresso?', 'event_espresso' ); ?></h4>
+	<h4><?php esc_html_e('New to Event Espresso?', 'event_espresso'); ?></h4>
 
-	<p><?php printf( esc_html__( 'Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.', 'event_espresso' ), '<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">','</a>','<em>','</em>' ); ?></p>
+	<p><?php printf(esc_html__('Check out the %1$squick start guide for Event Espresso 4%2$s. It has recommendations, tips, and tutorials so you can get your project started %3$squicker%4$s.', 'event_espresso'), '<a href="https://eventespresso.com/wiki/welcome-to-event-espresso/#event-espresso-4" target="_blank">', '</a>', '<em>', '</em>'); ?></p>
 </div>
\ No newline at end of file

public/Espresso_Arabica_2014/content-espresso_events-details.php

Spacing +13 added lines, -13 removed lines

@@ -3,33 +3,33 @@
 global $post;
 ?>
 <div class="event-content">
-<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
+<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
 	<div class="entry-meta">
-		<span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span>
+		<span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span>
 	<?php
-		if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+		if ( ! post_password_required() && (comments_open() || get_comments_number())) :
 	?>
-	<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
+	<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
 	<?php
 		endif;
-		edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
+		edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
 	?>
 	</div>
 <?php endif;
-	$event_phone = espresso_event_phone( $post->ID, FALSE );
-	if ( $event_phone != '' ) : ?>
+	$event_phone = espresso_event_phone($post->ID, FALSE);
+	if ($event_phone != '') : ?>
 	<p>
-		<span class="small-text"><strong><?php _e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?>
+		<span class="small-text"><strong><?php _e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?>
 	</p>
-<?php endif;  ?>
+<?php endif; ?>
 <?php
-	if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) {
-		do_action( 'AHEE_event_details_before_the_content', $post );
+	if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) {
+		do_action('AHEE_event_details_before_the_content', $post);
 		echo apply_filters(
 			'FHEE__content_espresso_events_details_template__the_content',
-			espresso_event_content_or_excerpt( 55, null, false ) 
+			espresso_event_content_or_excerpt(55, null, false) 
 		);
-		do_action( 'AHEE_event_details_after_the_content', $post );
+		do_action('AHEE_event_details_after_the_content', $post);
 	}
  ?>
 </div>

admin_pages/general_settings/AdminOptionsSettings.php

Indentation +218 added lines, -218 removed lines

@@ -30,224 +30,224 @@
 class AdminOptionsSettings extends FormHandler
 {
 
-    protected $template_args = array();
-
-    /**
-     * Form constructor.
-     *
-     * @param \EE_Registry $registry
-     */
-    public function __construct(\EE_Registry $registry) {
-        parent::__construct(
-            esc_html__('Admin Options', 'event_espresso'),
-            esc_html__('Admin Options', 'event_espresso'),
-            'admin_option_settings',
-            '',
-            FormHandler::DO_NOT_SETUP_FORM,
-            $registry
-        );
-    }
-
-
-
-    /**
-     * @param array $template_args
-     */
-    public function setTemplateArgs(array $template_args)
-    {
-        $this->template_args = $template_args;
-    }
-
-
-
-    /**
-     * creates and returns the actual form
-     *
-     * @return EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public function generate()
-    {
-        $form = new \EE_Form_Section_Proper(
-            array(
-                'name'            => 'admin_option_settings',
-                'html_id'         => 'admin_option_settings',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => array(
-                    'help_tour_activation_hdr' => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Help Tour Global Activation', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(
-                                EEH_Template::get_help_tab_link('help_tour_activation_info'),
-                                'help_tour_activation'
-                            ),
-                            '', 'ee-admin-settings-hdr'
-                        )
-                    ),
-                    'help_tour_activation' => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' => esc_html__('Activate Global Help Tours?', 'event_espresso'),
-                            'html_help_text'  => esc_html__(
-                                'This toggles whether the Event Espresso help tours are active globally or not.',
-                                'event_espresso'
-                            ),
-                            'default'         => isset($this->registry->CFG->admin->help_tour_activation)
-                                ? filter_var($this->registry->CFG->admin->help_tour_activation, FILTER_VALIDATE_BOOLEAN)
-                                : true,
-                            'required'        => false
-                        )
-                    ),
-                    'compatibility_hdr'   => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Compatibility Settings', 'event_espresso'),
-                            '', 'ee-admin-settings-hdr'
-                        )
-                    ),
-                    'encode_session_data' => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' => esc_html__('Encode Session Data?', 'event_espresso'),
-                            'html_help_text'  => sprintf(
-                                esc_html__(
-                                    'Some servers and database configurations can cause problems when saving the Event Espresso session data. Setting this option to "Yes" adds an extra layer of encoding to session data to prevent serialization errors, but can be incompatible with some server configurations.%1$sIf you receive "500 internal server" type errors during registration, try turning this option on.%1$sIf you get fatal PHP errors regarding missing base64 functions, then turn this option off.',
-                                    'event_espresso'
-                                ),
-                                '<br>'
-                            ),
-                            'default'         => $this->registry->CFG->admin->encode_session_data(),
-                            'required'        => false
-                        )
-                    ),
-                )
-            )
-        );
-        if (
-            $this->registry->CAP->current_user_can(
-                'manage_options',
-                'display_admin_settings_options_promote_and_affiliate'
-            )
-        ) {
-            $form->add_subsections(
-                array(
-                    'promote_ee_hdr'  => new EE_Form_Section_HTML(
-                        EEH_HTML::h2(
-                            esc_html__('Promote Event Espresso', 'event_espresso')
-                            . ' '
-                            . EEH_HTML::span(
-                                EEH_Template::get_help_tab_link('affiliate_info'),
-                                'affiliate_info'
-                            ),
-                            '', 'ee-admin-settings-hdr'
-                        )
-                    ),
-                    'show_reg_footer' => new EE_Yes_No_Input(
-                        array(
-                            'html_label_text' => esc_html__(
-                                                     'Link to Event Espresso in your Registration Page?',
-                                                     'event_espresso'
-                                                 )
-                                                 . EEH_Template::get_help_tab_link('email_validation_info'),
-                            'html_help_text'  => esc_html__(
-                                'adds an unobtrusive link to Event Espresso\'s website in the footer of your registration form. Get an affiliate link (see below) and make money if people click the link and purchase Event Espresso.',
-                                'event_espresso'
-                            ),
-                            'default'         => isset($this->registry->CFG->admin->show_reg_footer)
-                                ? filter_var($this->registry->CFG->admin->show_reg_footer, FILTER_VALIDATE_BOOLEAN)
-                                : true,
-                            'required'        => false
-                        )
-                    ),
-                    'affiliate_id'    => new EE_Text_Input(
-                        array(
-                            'html_label_text' => sprintf(
-                                esc_html__('Event Espresso %sAffiliate%s ID', 'event_espresso'),
-                                '<a href="http://eventespresso.com/affiliates/" target="_blank">',
-                                '</a>'
-                            ),
-                            'html_help_text'  => esc_html__(
-                                'Earn cash for promoting Event Espresso.',
-                                'event_espresso'
-                            ),
-                            'html_class'      => 'regular-text',
-                            'default'         => isset($this->registry->CFG->admin->affiliate_id)
-                                ? $this->registry->CFG->admin->get_pretty('affiliate_id')
-                                : '',
-                            'required'        => false
-                        )
-                    ),
-                ),
-                'help_tour_activation_hdr'
-            );
-        }
-        return $form;
-    }
-
-
-
-    /**
-     * takes the generated form and displays it along with ony other non-form HTML that may be required
-     * returns a string of HTML that can be directly echoed in a template
-     *
-     * @return string
-     * @throws LogicException
-     * @throws \EE_Error
-     */
-    public function display()
-    {
-        add_filter(
-            'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_FormHandler__display__before_form',
-            array($this, 'handleOldAdminOptionsSettingsAction')
-        );
-        return parent::display();
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function handleOldAdminOptionsSettingsAction()
-    {
-        ob_start();
-        do_action('AHEE__admin_option_settings__template__before', $this->template_args);
-        return ob_get_clean();
-    }
-
-
-
-    /**
-     * handles processing the form submission
-     * returns true or false depending on whether the form was processed successfully or not
-     *
-     * @param array $form_data
-     * @return bool
-     * @throws InvalidFormSubmissionException
-     * @throws EE_Error
-     * @throws LogicException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     */
-    public function process($form_data = array())
-    {
-        // process form
-        $valid_data = (array)parent::process($form_data);
-        if (empty($valid_data)) {
-            return false;
-        }
-        $this->registry->CFG->admin->show_reg_footer = isset( $form_data['show_reg_footer'] )
-            ? absint( $form_data['show_reg_footer'] )
-            : $this->registry->CFG->admin->show_reg_footer;
-        $this->registry->CFG->admin->affiliate_id = isset( $form_data['affiliate_id'] )
-            ? sanitize_text_field( $form_data['affiliate_id'] )
-            : $this->registry->CFG->admin->affiliate_id;
-        $this->registry->CFG->admin->help_tour_activation = isset( $form_data['help_tour_activation'] )
-            ? absint( $form_data['help_tour_activation'])
-            : $this->registry->CFG->admin->help_tour_activation;
-        if (isset($form_data['encode_session_data'])) {
-            $this->registry->CFG->admin->set_encode_session_data($form_data['encode_session_data']);
-        }
-        return false;
-    }
+	protected $template_args = array();
+
+	/**
+	 * Form constructor.
+	 *
+	 * @param \EE_Registry $registry
+	 */
+	public function __construct(\EE_Registry $registry) {
+		parent::__construct(
+			esc_html__('Admin Options', 'event_espresso'),
+			esc_html__('Admin Options', 'event_espresso'),
+			'admin_option_settings',
+			'',
+			FormHandler::DO_NOT_SETUP_FORM,
+			$registry
+		);
+	}
+
+
+
+	/**
+	 * @param array $template_args
+	 */
+	public function setTemplateArgs(array $template_args)
+	{
+		$this->template_args = $template_args;
+	}
+
+
+
+	/**
+	 * creates and returns the actual form
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public function generate()
+	{
+		$form = new \EE_Form_Section_Proper(
+			array(
+				'name'            => 'admin_option_settings',
+				'html_id'         => 'admin_option_settings',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => array(
+					'help_tour_activation_hdr' => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Help Tour Global Activation', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(
+								EEH_Template::get_help_tab_link('help_tour_activation_info'),
+								'help_tour_activation'
+							),
+							'', 'ee-admin-settings-hdr'
+						)
+					),
+					'help_tour_activation' => new EE_Yes_No_Input(
+						array(
+							'html_label_text' => esc_html__('Activate Global Help Tours?', 'event_espresso'),
+							'html_help_text'  => esc_html__(
+								'This toggles whether the Event Espresso help tours are active globally or not.',
+								'event_espresso'
+							),
+							'default'         => isset($this->registry->CFG->admin->help_tour_activation)
+								? filter_var($this->registry->CFG->admin->help_tour_activation, FILTER_VALIDATE_BOOLEAN)
+								: true,
+							'required'        => false
+						)
+					),
+					'compatibility_hdr'   => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Compatibility Settings', 'event_espresso'),
+							'', 'ee-admin-settings-hdr'
+						)
+					),
+					'encode_session_data' => new EE_Yes_No_Input(
+						array(
+							'html_label_text' => esc_html__('Encode Session Data?', 'event_espresso'),
+							'html_help_text'  => sprintf(
+								esc_html__(
+									'Some servers and database configurations can cause problems when saving the Event Espresso session data. Setting this option to "Yes" adds an extra layer of encoding to session data to prevent serialization errors, but can be incompatible with some server configurations.%1$sIf you receive "500 internal server" type errors during registration, try turning this option on.%1$sIf you get fatal PHP errors regarding missing base64 functions, then turn this option off.',
+									'event_espresso'
+								),
+								'<br>'
+							),
+							'default'         => $this->registry->CFG->admin->encode_session_data(),
+							'required'        => false
+						)
+					),
+				)
+			)
+		);
+		if (
+			$this->registry->CAP->current_user_can(
+				'manage_options',
+				'display_admin_settings_options_promote_and_affiliate'
+			)
+		) {
+			$form->add_subsections(
+				array(
+					'promote_ee_hdr'  => new EE_Form_Section_HTML(
+						EEH_HTML::h2(
+							esc_html__('Promote Event Espresso', 'event_espresso')
+							. ' '
+							. EEH_HTML::span(
+								EEH_Template::get_help_tab_link('affiliate_info'),
+								'affiliate_info'
+							),
+							'', 'ee-admin-settings-hdr'
+						)
+					),
+					'show_reg_footer' => new EE_Yes_No_Input(
+						array(
+							'html_label_text' => esc_html__(
+													 'Link to Event Espresso in your Registration Page?',
+													 'event_espresso'
+												 )
+												 . EEH_Template::get_help_tab_link('email_validation_info'),
+							'html_help_text'  => esc_html__(
+								'adds an unobtrusive link to Event Espresso\'s website in the footer of your registration form. Get an affiliate link (see below) and make money if people click the link and purchase Event Espresso.',
+								'event_espresso'
+							),
+							'default'         => isset($this->registry->CFG->admin->show_reg_footer)
+								? filter_var($this->registry->CFG->admin->show_reg_footer, FILTER_VALIDATE_BOOLEAN)
+								: true,
+							'required'        => false
+						)
+					),
+					'affiliate_id'    => new EE_Text_Input(
+						array(
+							'html_label_text' => sprintf(
+								esc_html__('Event Espresso %sAffiliate%s ID', 'event_espresso'),
+								'<a href="http://eventespresso.com/affiliates/" target="_blank">',
+								'</a>'
+							),
+							'html_help_text'  => esc_html__(
+								'Earn cash for promoting Event Espresso.',
+								'event_espresso'
+							),
+							'html_class'      => 'regular-text',
+							'default'         => isset($this->registry->CFG->admin->affiliate_id)
+								? $this->registry->CFG->admin->get_pretty('affiliate_id')
+								: '',
+							'required'        => false
+						)
+					),
+				),
+				'help_tour_activation_hdr'
+			);
+		}
+		return $form;
+	}
+
+
+
+	/**
+	 * takes the generated form and displays it along with ony other non-form HTML that may be required
+	 * returns a string of HTML that can be directly echoed in a template
+	 *
+	 * @return string
+	 * @throws LogicException
+	 * @throws \EE_Error
+	 */
+	public function display()
+	{
+		add_filter(
+			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_FormHandler__display__before_form',
+			array($this, 'handleOldAdminOptionsSettingsAction')
+		);
+		return parent::display();
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function handleOldAdminOptionsSettingsAction()
+	{
+		ob_start();
+		do_action('AHEE__admin_option_settings__template__before', $this->template_args);
+		return ob_get_clean();
+	}
+
+
+
+	/**
+	 * handles processing the form submission
+	 * returns true or false depending on whether the form was processed successfully or not
+	 *
+	 * @param array $form_data
+	 * @return bool
+	 * @throws InvalidFormSubmissionException
+	 * @throws EE_Error
+	 * @throws LogicException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 */
+	public function process($form_data = array())
+	{
+		// process form
+		$valid_data = (array)parent::process($form_data);
+		if (empty($valid_data)) {
+			return false;
+		}
+		$this->registry->CFG->admin->show_reg_footer = isset( $form_data['show_reg_footer'] )
+			? absint( $form_data['show_reg_footer'] )
+			: $this->registry->CFG->admin->show_reg_footer;
+		$this->registry->CFG->admin->affiliate_id = isset( $form_data['affiliate_id'] )
+			? sanitize_text_field( $form_data['affiliate_id'] )
+			: $this->registry->CFG->admin->affiliate_id;
+		$this->registry->CFG->admin->help_tour_activation = isset( $form_data['help_tour_activation'] )
+			? absint( $form_data['help_tour_activation'])
+			: $this->registry->CFG->admin->help_tour_activation;
+		if (isset($form_data['encode_session_data'])) {
+			$this->registry->CFG->admin->set_encode_session_data($form_data['encode_session_data']);
+		}
+		return false;
+	}
 
 }
 // End of file AdminOptionsSettings.php

Spacing +7 added lines, -7 removed lines

@@ -230,18 +230,18 @@
     public function process($form_data = array())
     {
         // process form
-        $valid_data = (array)parent::process($form_data);
+        $valid_data = (array) parent::process($form_data);
         if (empty($valid_data)) {
             return false;
         }
-        $this->registry->CFG->admin->show_reg_footer = isset( $form_data['show_reg_footer'] )
-            ? absint( $form_data['show_reg_footer'] )
+        $this->registry->CFG->admin->show_reg_footer = isset($form_data['show_reg_footer'])
+            ? absint($form_data['show_reg_footer'])
             : $this->registry->CFG->admin->show_reg_footer;
-        $this->registry->CFG->admin->affiliate_id = isset( $form_data['affiliate_id'] )
-            ? sanitize_text_field( $form_data['affiliate_id'] )
+        $this->registry->CFG->admin->affiliate_id = isset($form_data['affiliate_id'])
+            ? sanitize_text_field($form_data['affiliate_id'])
             : $this->registry->CFG->admin->affiliate_id;
-        $this->registry->CFG->admin->help_tour_activation = isset( $form_data['help_tour_activation'] )
-            ? absint( $form_data['help_tour_activation'])
+        $this->registry->CFG->admin->help_tour_activation = isset($form_data['help_tour_activation'])
+            ? absint($form_data['help_tour_activation'])
             : $this->registry->CFG->admin->help_tour_activation;
         if (isset($form_data['encode_session_data'])) {
             $this->registry->CFG->admin->set_encode_session_data($form_data['encode_session_data']);

core/libraries/form_sections/inputs/EE_Text_Input.input.php

Spacing +4 added lines, -4 removed lines

@@ -8,19 +8,19 @@ 
  *
  * This input has a default validation strategy of plaintext (which can be removed after construction)
  */
-class EE_Text_Input extends EE_Form_Input_Base{
+class EE_Text_Input extends EE_Form_Input_Base {
 
 
 	/**
 	 * @param array $options
 	 */
-	public function __construct($options = array()){
+	public function __construct($options = array()) {
 		$this->_set_display_strategy(new EE_Text_Input_Display_Strategy());
 		$this->_set_normalization_strategy(new EE_Text_Normalization());
 		parent::__construct($options);
 		//if the input hasn't specifically mentioned a more lenient validation strategy,
 		//apply plaintext validation strategy
-		if( ! $this->has_validation_strategy(
+		if ( ! $this->has_validation_strategy(
 				array(
 					'EE_Full_HTML_Validation_Strategy',
 					'EE_Simple_HTML_Validation_Strategy'
@@ -29,7 +29,7 @@ 
 		) {
 			//by default we use the plaintext validation. If you want something else,
 			//just remove it after the input is constructed :P using EE_Form_Input_Base::remove_validation_strategy()
-			$this->_add_validation_strategy( new EE_Plaintext_Validation_Strategy() );
+			$this->_add_validation_strategy(new EE_Plaintext_Validation_Strategy());
 		}
 	}
 

admin_pages/transactions/templates/txn_admin_details_side_meta_box_billing_info.template.php

Indentation +2 added lines, -2 removed lines

@@ -8,8 +8,8 @@
 		foreach( $form_section->subsections() as $subsection ) {
 			if( $subsection instanceof EE_Form_Input_Base ) {
 				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal
-                    || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal
-                    || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy ){
+					|| $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal
+					|| $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy ){
 					continue;
 				}
 				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) {

Spacing +16 added lines, -16 removed lines

@@ -1,38 +1,38 @@
 	<div id="admin-side-mbox-billing-info-dv" class="admin-side-mbox-dv">
-<?php if ( empty($billing_form) ) : ?>
+<?php if (empty($billing_form)) : ?>
 		<div class="clearfix">
-			<?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
+			<?php _e('There is no billing info for this transaction.', 'event_espresso'); ?><br/>
 		</div>
 <?php else :
-	function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section, $found_cc_data = false ) {
-		foreach( $form_section->subsections() as $subsection ) {
-			if( $subsection instanceof EE_Form_Input_Base ) {
-				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal
+	function ee_show_billing_info_cleaned(EE_Form_Section_Proper $form_section, $found_cc_data = false) {
+		foreach ($form_section->subsections() as $subsection) {
+			if ($subsection instanceof EE_Form_Input_Base) {
+				if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_All_Sensitive_Data_Removal
                     || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal
-                    || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy ){
+                    || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy) {
 					continue;
 				}
-				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) {
+				if ($subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal) {
 					$found_cc_data = true;
 				}
 				?>
 					<div class="clearfix">
-						<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label();?></span><?php echo $subsection->pretty_value();?>
+						<span class="admin-side-mbox-label-spn lt-grey-txt float-left"><?php echo $subsection->get_html_for_label(); ?></span><?php echo $subsection->pretty_value(); ?>
 					</div><?php
-			} elseif( $subsection instanceof EE_Form_Section_Proper ) {
-				$found_cc_data = ee_show_billing_info_cleaned( $subsection, $found_cc_data);
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
+				$found_cc_data = ee_show_billing_info_cleaned($subsection, $found_cc_data);
 			}
 		}
 		return $found_cc_data;
 	}
-	$found_cc_data = ee_show_billing_info_cleaned( $billing_form );
-	if( apply_filters( 
+	$found_cc_data = ee_show_billing_info_cleaned($billing_form);
+	if (apply_filters( 
 			'FHEE__txn_admin_details_side_meta_box_billing_info__show_default_note', 
 			$found_cc_data,
-			$billing_form ) ) {?>
-		<p class="help"><?php _e( 'Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso' );?></p>
+			$billing_form )) {?>
+		<p class="help"><?php _e('Note: Card expiry dates and CCV are not stored. Only the last 4 digits of card numbers are stored.', 'event_espresso'); ?></p>
 	<?php }
-	do_action( 'AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form );
+	do_action('AHEE__txn_admin_details_side_meta_box_billing_info__billing_form_footer', $billing_form);
 	endif; ?>
 
 	</div>

Braces +3 added lines, -1 removed lines

@@ -3,7 +3,8 @@ 
 		<div class="clearfix">
 			<?php _e( 'There is no billing info for this transaction.', 'event_espresso' );?><br/>
 		</div>
-<?php else :
+<?php else {
+	:
 	function ee_show_billing_info_cleaned( EE_Form_Section_Proper $form_section, $found_cc_data = false ) {
 		foreach( $form_section->subsections() as $subsection ) {
 			if( $subsection instanceof EE_Form_Input_Base ) {
@@ -11,6 +12,7 @@ 
                     || $subsection->get_sensitive_data_removal_strategy() instanceof EE_CCV_Sensitive_Data_Removal
                     || $subsection->get_display_strategy() instanceof EE_Hidden_Display_Strategy ){
 					continue;
+}
 				}
 				if( $subsection->get_sensitive_data_removal_strategy() instanceof EE_Credit_Card_Sensitive_Data_Removal ) {
 					$found_cc_data = true;

modules/ticket_selector/TicketDetails.php

Spacing +4 added lines, -4 removed lines

@@ -96,8 +96,8 @@ 
             "display-{$this->cssId()}",
             'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
             '',
-            'rel="' . $this->cssId() . '"'
-        ) . \EEH_HTML::link(
+            'rel="'.$this->cssId().'"'
+        ).\EEH_HTML::link(
             '',
             sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
             esc_attr(
@@ -109,7 +109,7 @@ 
             "hide-{$this->cssId()}",
             'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
             'display:none;',
-            'rel="' . $this->cssId() . '"'
+            'rel="'.$this->cssId().'"'
         );
     }
 
@@ -163,7 +163,7 @@ 
         return \EEH_Template::locate_template(
             apply_filters(
                 'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
-                TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
+                TICKET_SELECTOR_TEMPLATES_PATH.'ticket_details.template.php',
                 $this->ticket
             ),
             $template_args

Indentation +192 added lines, -192 removed lines

@@ -17,198 +17,198 @@
 {
 
 
-    /**
-     * @var \EE_Ticket $ticket
-     */
-    protected $ticket;
-
-    /**
-     * @var \EE_Ticket_Selector_Config $template_settings
-     */
-    protected $template_settings;
-
-    /**
-     * @var string $date_format
-     */
-    protected $date_format;
-
-    /**
-     * @var string $time_format
-     */
-    protected $time_format;
-
-    /**
-     * @var boolean $event_is_expired
-     */
-    protected $event_is_expired;
-
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param \EE_Ticket                 $ticket
-     * @param \EE_Ticket_Selector_Config $template_settings
-     * @param array                      $template_args
-     */
-    public function __construct(
-        \EE_Ticket $ticket,
-        \EE_Ticket_Selector_Config $template_settings,
-        array $template_args
-    )
-    {
-        $this->ticket            = $ticket;
-        $this->template_settings = $template_settings;
-        $this->date_format       = $template_args['date_format'];
-        $this->time_format       = $template_args['time_format'];
-        $this->event_is_expired  = $template_args['event_is_expired'];
-    }
-
-
-
-    /**
-     * @return \EE_Ticket
-     */
-    public function getTicket()
-    {
-        return $this->ticket;
-    }
-
-
-
-    /**
-     * @return bool
-     */
-    public function showTicketDetails()
-    {
-        return $this->template_settings->show_ticket_details;
-    }
-
-
-
-    /**
-     * @return \EE_Ticket_Selector_Config
-     */
-    public function getTemplateSettings()
-    {
-        return $this->template_settings;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getDateFormat()
-    {
-        return $this->date_format;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getTimeFormat()
-    {
-        return $this->time_format;
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function getShowHideLinks()
-    {
-        if ( ! $this->showTicketDetails()) {
-            return '';
-        }
-        return \EEH_HTML::link(
-            '',
-            sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), ' '),
-            esc_attr(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__show_ticket_details_link_title',
-                    __('click to show additional ticket details', 'event_espresso')
-                )
-            ),
-            "display-{$this->cssId()}",
-            'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
-            '',
-            'rel="' . $this->cssId() . '"'
-        ) . \EEH_HTML::link(
-            '',
-            sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
-            esc_attr(
-                apply_filters(
-                    'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title',
-                    __('click to hide additional ticket details', 'event_espresso')
-                )
-            ),
-            "hide-{$this->cssId()}",
-            'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
-            'display:none;',
-            'rel="' . $this->cssId() . '"'
-        );
-    }
-
-
-
-    /**
-     * @return string
-     */
-    public function cssId()
-    {
-        return apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_details_css_id',
-            "tckt-slctr-tkt-details-{$this->ticket->get_event_ID()}-{$this->ticket->ID()}"
-        );
-    }
-
-
-
-    /**
-     * @param float $ticket_price
-     * @param int   $remaining
-     * @param int   $cols
-     * @return string
-     */
-    public function display(
-        $ticket_price = 0.00,
-        $remaining,
-        $cols = 2
-    ) {
-        $template_args = array();
-        $template_args['ticket'] = $this->ticket;
-        $template_args['ticket_price'] = $ticket_price;
-        $template_args['remaining'] = $remaining;
-        $template_args['cols'] = $cols;
-        $template_args['show_ticket_details'] = $this->template_settings->show_ticket_details;
-        $template_args['show_ticket_sale_columns'] = $this->template_settings->show_ticket_sale_columns;
-        $template_args['ticket_details_row_class'] = espresso_get_object_css_class($this->ticket, '', 'details');
-        $template_args['ticket_details_css_id'] = $this->cssId();
-        $template_args['display_ticket_price'] = $ticket_price !== 0 && apply_filters(
-            'FHEE__ticket_selector_chart_template__display_ticket_price_details',
-            true
-        );
-        $template_args['price_breakdown_heading'] = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
-            esc_html__('Price', 'event_espresso')
-        );
-        $template_args['date_format'] = $this->date_format;
-        $template_args['time_format'] = $this->time_format;
-        $template_args['event_is_expired'] = $this->event_is_expired;
-
-        return \EEH_Template::locate_template(
-            apply_filters(
-                'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
-                TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
-                $this->ticket
-            ),
-            $template_args
-        );
-    }
+	/**
+	 * @var \EE_Ticket $ticket
+	 */
+	protected $ticket;
+
+	/**
+	 * @var \EE_Ticket_Selector_Config $template_settings
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var string $date_format
+	 */
+	protected $date_format;
+
+	/**
+	 * @var string $time_format
+	 */
+	protected $time_format;
+
+	/**
+	 * @var boolean $event_is_expired
+	 */
+	protected $event_is_expired;
+
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param \EE_Ticket                 $ticket
+	 * @param \EE_Ticket_Selector_Config $template_settings
+	 * @param array                      $template_args
+	 */
+	public function __construct(
+		\EE_Ticket $ticket,
+		\EE_Ticket_Selector_Config $template_settings,
+		array $template_args
+	)
+	{
+		$this->ticket            = $ticket;
+		$this->template_settings = $template_settings;
+		$this->date_format       = $template_args['date_format'];
+		$this->time_format       = $template_args['time_format'];
+		$this->event_is_expired  = $template_args['event_is_expired'];
+	}
+
+
+
+	/**
+	 * @return \EE_Ticket
+	 */
+	public function getTicket()
+	{
+		return $this->ticket;
+	}
+
+
+
+	/**
+	 * @return bool
+	 */
+	public function showTicketDetails()
+	{
+		return $this->template_settings->show_ticket_details;
+	}
+
+
+
+	/**
+	 * @return \EE_Ticket_Selector_Config
+	 */
+	public function getTemplateSettings()
+	{
+		return $this->template_settings;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getDateFormat()
+	{
+		return $this->date_format;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getTimeFormat()
+	{
+		return $this->time_format;
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function getShowHideLinks()
+	{
+		if ( ! $this->showTicketDetails()) {
+			return '';
+		}
+		return \EEH_HTML::link(
+			'',
+			sprintf(__('show%1$sdetails%1$s+', 'event_espresso'), ' '),
+			esc_attr(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__show_ticket_details_link_title',
+					__('click to show additional ticket details', 'event_espresso')
+				)
+			),
+			"display-{$this->cssId()}",
+			'display-tckt-slctr-tkt-details display-the-hidden lt-grey-text smaller-text hide-if-no-js',
+			'',
+			'rel="' . $this->cssId() . '"'
+		) . \EEH_HTML::link(
+			'',
+			sprintf(__('hide%1$sdetails%1$s-', 'event_espresso'), ' '),
+			esc_attr(
+				apply_filters(
+					'FHEE__ticket_selector_chart_template__hide_ticket_details_link_title',
+					__('click to hide additional ticket details', 'event_espresso')
+				)
+			),
+			"hide-{$this->cssId()}",
+			'hide-tckt-slctr-tkt-details hide-the-displayed lt-grey-text smaller-text hide-if-no-js',
+			'display:none;',
+			'rel="' . $this->cssId() . '"'
+		);
+	}
+
+
+
+	/**
+	 * @return string
+	 */
+	public function cssId()
+	{
+		return apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_details_css_id',
+			"tckt-slctr-tkt-details-{$this->ticket->get_event_ID()}-{$this->ticket->ID()}"
+		);
+	}
+
+
+
+	/**
+	 * @param float $ticket_price
+	 * @param int   $remaining
+	 * @param int   $cols
+	 * @return string
+	 */
+	public function display(
+		$ticket_price = 0.00,
+		$remaining,
+		$cols = 2
+	) {
+		$template_args = array();
+		$template_args['ticket'] = $this->ticket;
+		$template_args['ticket_price'] = $ticket_price;
+		$template_args['remaining'] = $remaining;
+		$template_args['cols'] = $cols;
+		$template_args['show_ticket_details'] = $this->template_settings->show_ticket_details;
+		$template_args['show_ticket_sale_columns'] = $this->template_settings->show_ticket_sale_columns;
+		$template_args['ticket_details_row_class'] = espresso_get_object_css_class($this->ticket, '', 'details');
+		$template_args['ticket_details_css_id'] = $this->cssId();
+		$template_args['display_ticket_price'] = $ticket_price !== 0 && apply_filters(
+			'FHEE__ticket_selector_chart_template__display_ticket_price_details',
+			true
+		);
+		$template_args['price_breakdown_heading'] = apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_details_price_breakdown_heading',
+			esc_html__('Price', 'event_espresso')
+		);
+		$template_args['date_format'] = $this->date_format;
+		$template_args['time_format'] = $this->time_format;
+		$template_args['event_is_expired'] = $this->event_is_expired;
+
+		return \EEH_Template::locate_template(
+			apply_filters(
+				'FHEE__EventEspresso_modules_ticket_selector_TicketDetails__display__template_path',
+				TICKET_SELECTOR_TEMPLATES_PATH . 'ticket_details.template.php',
+				$this->ticket
+			),
+			$template_args
+		);
+	}
 
 }
 // End of file TicketDetails.php

admin_pages/support/templates/support_admin_details_contact_support.template.php

Spacing +13 added lines, -13 removed lines

@@ -1,29 +1,29 @@
 <div class="padding">
 	<h3><?php esc_html_e('Need help with Event Espresso?', 'event_espresso'); ?></h3>
 	
-	<h4><?php esc_html_e( 'You may be able to find an answer for your question or concern here:', 'event_espresso' ); ?></h4>
+	<h4><?php esc_html_e('You may be able to find an answer for your question or concern here:', 'event_espresso'); ?></h4>
 				<ol>
-					<li><strong><em><?php esc_html_e( 'A known issue.', 'event_espresso' ); ?></em></strong>  <?php printf( esc_html__( 'Some themes and plugins have %1$sknown conflicts%2$s with Event Espresso. (You can also browse the %3$sEvent Espresso support pages%2$s or %4$sEvent Espresso support forums%2$s to see if other members have experienced and solved the problem.)', 'event_espresso' ), '<a href="https://eventespresso.com/wiki/known-third-party-plugin-theme-conflicts/" target="_blank">','</a>', '<a href="https://eventespresso.com/support/documentation/versioned-docs/?doc_ver=ee4" target="_blank">', '<a href="https://eventespresso.com/support/forums/" target="_blank">' ); ?></li>
-					<li><strong><em><?php esc_html_e( 'A plugin conflict.', 'event_espresso' ); ?></em></strong>  <?php esc_html_e( 'You can check to see if there is a plugin conflict by temporarily deactivating all plugins except for Event Espresso. If the problem goes away, then reactivate your plugins one by one until the issue returns. This will help you pinpoint the source of the conflict.', 'event_espresso' ); ?></li>
+					<li><strong><em><?php esc_html_e('A known issue.', 'event_espresso'); ?></em></strong>  <?php printf(esc_html__('Some themes and plugins have %1$sknown conflicts%2$s with Event Espresso. (You can also browse the %3$sEvent Espresso support pages%2$s or %4$sEvent Espresso support forums%2$s to see if other members have experienced and solved the problem.)', 'event_espresso'), '<a href="https://eventespresso.com/wiki/known-third-party-plugin-theme-conflicts/" target="_blank">', '</a>', '<a href="https://eventespresso.com/support/documentation/versioned-docs/?doc_ver=ee4" target="_blank">', '<a href="https://eventespresso.com/support/forums/" target="_blank">'); ?></li>
+					<li><strong><em><?php esc_html_e('A plugin conflict.', 'event_espresso'); ?></em></strong>  <?php esc_html_e('You can check to see if there is a plugin conflict by temporarily deactivating all plugins except for Event Espresso. If the problem goes away, then reactivate your plugins one by one until the issue returns. This will help you pinpoint the source of the conflict.', 'event_espresso'); ?></li>
 					<li>
-						<strong><em><?php esc_html_e( 'A theme conflict.', 'event_espresso' ); ?></em></strong>
+						<strong><em><?php esc_html_e('A theme conflict.', 'event_espresso'); ?></em></strong>
 						<?php
-							$default_theme = wp_get_theme( WP_DEFAULT_THEME );
+							$default_theme = wp_get_theme(WP_DEFAULT_THEME);
 
-							if ( $default_theme->exists() ) {
-								 printf( esc_html__( 'If your problem is not a known issue or caused by a plugin, then try activating %s (the default WordPress theme).', 'event_espresso' ), $default_theme->get( 'Name' ) );
+							if ($default_theme->exists()) {
+								 printf(esc_html__('If your problem is not a known issue or caused by a plugin, then try activating %s (the default WordPress theme).', 'event_espresso'), $default_theme->get('Name'));
 							} else {
-								esc_html_e( 'If your problem is not a known issue or caused by a plugin, then try activating the default WordPress theme.', 'event_espresso' );
+								esc_html_e('If your problem is not a known issue or caused by a plugin, then try activating the default WordPress theme.', 'event_espresso');
 							}
 						?>
-						<?php esc_html_e( 'If this solves the problem for you, then something in your theme is causing this issue. Check to see if an update is available for your WordPress theme or reach out to the theme author.', 'event_espresso' ); ?>
+						<?php esc_html_e('If this solves the problem for you, then something in your theme is causing this issue. Check to see if an update is available for your WordPress theme or reach out to the theme author.', 'event_espresso'); ?>
 					</li>
 				</ol>
 				
-	<p><?php esc_html_e( 'If none of the suggestions above help you find a solution, then feel free to reach out to the support team at Event Espresso.', 'event_espresso' ); ?></p>
-	<p><?php printf( esc_html__( 'Login to your account on EventEspresso.com and %1$screate a support post in our member support forums%2$s. Use a %3$sclear and descriptive title%4$s in your support post, %3$sdescribe the issue to the best of your knowledge%4$s, and %3$snever post any sensitive information such as login details%4$s. Be sure to also include %5$simportant information in the section below%2$s about your WordPress site.', 'event_espresso' ), '<a href="https://eventespresso.com/support/forums/" target="_blank">','</a>','<strong>','</strong>','<a href="#espresso_important_information_settings">' ); ?></p>
+	<p><?php esc_html_e('If none of the suggestions above help you find a solution, then feel free to reach out to the support team at Event Espresso.', 'event_espresso'); ?></p>
+	<p><?php printf(esc_html__('Login to your account on EventEspresso.com and %1$screate a support post in our member support forums%2$s. Use a %3$sclear and descriptive title%4$s in your support post, %3$sdescribe the issue to the best of your knowledge%4$s, and %3$snever post any sensitive information such as login details%4$s. Be sure to also include %5$simportant information in the section below%2$s about your WordPress site.', 'event_espresso'), '<a href="https://eventespresso.com/support/forums/" target="_blank">', '</a>', '<strong>', '</strong>', '<a href="#espresso_important_information_settings">'); ?></p>
 
-	<h4><?php esc_html_e( 'Have an emergency?', 'event_espresso' ); ?></h4>
+	<h4><?php esc_html_e('Have an emergency?', 'event_espresso'); ?></h4>
 
-	<p><?php printf( esc_html__( 'We offer support tokens to members that need help with a time-sensitive issue. A support token will provide you with up to 30 minutes of one-on-one time with a team member at Event Espresso. If you have an emergency and need help quickly, then please %1$spurchase a support token%2$s.', 'event_espresso' ), '<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">','</a>' ); ?></p>
+	<p><?php printf(esc_html__('We offer support tokens to members that need help with a time-sensitive issue. A support token will provide you with up to 30 minutes of one-on-one time with a team member at Event Espresso. If you have an emergency and need help quickly, then please %1$spurchase a support token%2$s.', 'event_espresso'), '<a href="https://eventespresso.com/product/premium-support-token/?utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=help_support_tab&utm_content=support_token" target="_blank">', '</a>'); ?></p>
 </div>
\ No newline at end of file

admin_pages/support/templates/developers_admin_details.template.php

Spacing +16 added lines, -16 removed lines

@@ -1,26 +1,26 @@
 <div class="padding">
-	<?php esc_html_e( 'If you want to integrate with Event Espresso or participate in building code, then you are in the right place. The following resources can help you get started.', 'event_espresso' ); ?>
-	<h2><?php esc_html_e( 'Developer Resources', 'event_espresso' ); ?></h2>
+	<?php esc_html_e('If you want to integrate with Event Espresso or participate in building code, then you are in the right place. The following resources can help you get started.', 'event_espresso'); ?>
+	<h2><?php esc_html_e('Developer Resources', 'event_espresso'); ?></h2>
 	<ul>
-		<li><?php printf( esc_html__( '%1$sEvent Espresso 4 Developer Documentation%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/tree/master/docs#getting-started-with-the-ee-developer-docs" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sEvent Espresso 4 Developer News%2$s', 'event_espresso' ), '<a href="http://developer.eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sApply%2$s to be listed as an %3$sEvent Espresso Professional%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/developers/event-espresso-pros-application/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>','<a href="https://eventespresso.com/developers/event-espresso-pros/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">' ); ?></li>
+		<li><?php printf(esc_html__('%1$sEvent Espresso 4 Developer Documentation%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/tree/master/docs#getting-started-with-the-ee-developer-docs" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sEvent Espresso 4 Developer News%2$s', 'event_espresso'), '<a href="http://developer.eventespresso.com/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sApply%2$s to be listed as an %3$sEvent Espresso Professional%2$s', 'event_espresso'), '<a href="https://eventespresso.com/developers/event-espresso-pros-application/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>', '<a href="https://eventespresso.com/developers/event-espresso-pros/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">'); ?></li>
 	</ul>
 
-	<h2><?php esc_html_e( 'Event Espresso 4 Articles for Developers', 'event_espresso' ); ?></h2>
+	<h2><?php esc_html_e('Event Espresso 4 Articles for Developers', 'event_espresso'); ?></h2>
 	<ul>
-		<li><?php printf( esc_html__( '%1$sCustom Post Types Usage%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/2014/02/epsresso-brewery-custom-post-types-event-espresso/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sTheme Development%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/2014/02/developers-corner-theming-event-espresso-4/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sCapability System%2$s', 'event_espresso' ), '<a href="http://developer.eventespresso.com/docs/ee-capability-system-overview/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sPayment Method Development%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/L--Payment-Methods-and-Gateways/creating-a-payment-method.md" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sMessages System in Event Espresso 4%2$s', 'event_espresso' ), '<a href="https://eventespresso.com/2014/03/messages-systemyour-tool-getting-word/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sDatabase Model System%2$s (used for interfacing with EE4 data via WordPress plugins and server side querying)', 'event_espresso' ), '<a href="http://developer.eventespresso.com/docs/using-ee4-model-objects/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">','</a>' ); ?></li>
+		<li><?php printf(esc_html__('%1$sCustom Post Types Usage%2$s', 'event_espresso'), '<a href="https://eventespresso.com/2014/02/epsresso-brewery-custom-post-types-event-espresso/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sTheme Development%2$s', 'event_espresso'), '<a href="https://eventespresso.com/2014/02/developers-corner-theming-event-espresso-4/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sCapability System%2$s', 'event_espresso'), '<a href="http://developer.eventespresso.com/docs/ee-capability-system-overview/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sPayment Method Development%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/L--Payment-Methods-and-Gateways/creating-a-payment-method.md" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sMessages System in Event Espresso 4%2$s', 'event_espresso'), '<a href="https://eventespresso.com/2014/03/messages-systemyour-tool-getting-word/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sDatabase Model System%2$s (used for interfacing with EE4 data via WordPress plugins and server side querying)', 'event_espresso'), '<a href="http://developer.eventespresso.com/docs/using-ee4-model-objects/?ee_ver=ee4&utm_source=ee4_plugin_admin&utm_medium=link&utm_campaign=ee_support_page&utm_content=developers_tab" target="_blank">', '</a>'); ?></li>
 	</ul>
 	
-	<h2><?php esc_html_e( 'REST API Resources', 'event_espresso' ); ?></h2>
+	<h2><?php esc_html_e('REST API Resources', 'event_espresso'); ?></h2>
 	<ul>
-		<li><?php printf( esc_html__( '%1$sREST API: Introduction%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-introduction.md" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sREST API: Reading Data%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-reading-data.md" target="_blank">','</a>' ); ?></li>
-		<li><?php printf( esc_html__( '%1$sBuilding an EE4 Add-on Using the REST API%2$s', 'event_espresso' ), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/T--Tutorials/building-an-ee4-addon-that-uses-angular-js-and-the-ee4-json-rest-api.md" target="_blank">','</a>' ); ?></li>
+		<li><?php printf(esc_html__('%1$sREST API: Introduction%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-introduction.md" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sREST API: Reading Data%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/C--REST-API/ee4-rest-api-reading-data.md" target="_blank">', '</a>'); ?></li>
+		<li><?php printf(esc_html__('%1$sBuilding an EE4 Add-on Using the REST API%2$s', 'event_espresso'), '<a href="https://github.com/eventespresso/event-espresso-core/blob/master/docs/T--Tutorials/building-an-ee4-addon-that-uses-angular-js-and-the-ee4-json-rest-api.md" target="_blank">', '</a>'); ?></li>
 	</ul>
 </div>
\ No newline at end of file

core/db_classes/EE_Attendee.class.php

Doc Comments +2 added lines, -2 removed lines

@@ -579,7 +579,7 @@ 
     /**
      * returns any events attached to this attendee ($_Event property);
      *
-     * @return array
+     * @return EE_Base_Class[]
      */
     public function events()
     {
@@ -594,7 +594,7 @@ 
      * used to save the billing info
      *
      * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-     * @return EE_Form_Section_Proper|null
+     * @return null|EE_Billing_Info_Form
      */
     public function billing_info_for_payment_method($payment_method)
     {

Spacing +16 added lines, -16 removed lines

@@ -1,4 +1,4 @@ 
-<?php if (! defined('EVENT_ESPRESSO_VERSION')) {
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
     exit('No direct script access allowed');
 }
 /**
@@ -33,16 +33,16 @@ 
      */
     protected function __construct($fieldValues = null, $bydb = false, $timezone = null, $date_formats = array())
     {
-        if (! isset($fieldValues['ATT_full_name'])) {
-            $fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'] . ' ' : '';
+        if ( ! isset($fieldValues['ATT_full_name'])) {
+            $fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'].' ' : '';
             $lname                        = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
-            $fieldValues['ATT_full_name'] = $fname . $lname;
+            $fieldValues['ATT_full_name'] = $fname.$lname;
         }
-        if (! isset($fieldValues['ATT_slug'])) {
+        if ( ! isset($fieldValues['ATT_slug'])) {
             //			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
             $fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
         }
-        if (! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+        if ( ! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
             $fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
         }
         parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
@@ -251,7 +251,7 @@ 
      */
     public function full_name($apply_html_entities = false)
     {
-        $full_name = $this->fname() . ' ' . $this->lname();
+        $full_name = $this->fname().' '.$this->lname();
         return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
     }
 
@@ -282,22 +282,22 @@ 
         $initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
         foreach ($initial_address_fields as $address_field_name) {
             $address_fields_value = $this->get($address_field_name);
-            if (! empty($address_fields_value)) {
+            if ( ! empty($address_fields_value)) {
                 $full_address_array[] = $address_fields_value;
             }
         }
         //now handle state and country
         $state_obj = $this->state_obj();
-        if (! empty($state_obj)) {
+        if ( ! empty($state_obj)) {
             $full_address_array[] = $state_obj->name();
         }
         $country_obj = $this->country_obj();
-        if (! empty($country_obj)) {
+        if ( ! empty($country_obj)) {
             $full_address_array[] = $country_obj->name();
         }
         //lastly get the xip
         $zip_value = $this->zip();
-        if (! empty($zip_value)) {
+        if ( ! empty($zip_value)) {
             $full_address_array[] = $zip_value;
         }
         return $full_address_array;
@@ -531,7 +531,7 @@ 
     public function get_most_recent_registration_for_event($event_id)
     {
         return $this->get_first_related('Registration',
-            array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+            array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC'))); //, '=', 'OBJECT_K' );
     }
 
 
@@ -557,11 +557,11 @@ 
     public function billing_info_for_payment_method($payment_method)
     {
         $pm_type = $payment_method->type_obj();
-        if (! $pm_type instanceof EE_PMT_Base) {
+        if ( ! $pm_type instanceof EE_PMT_Base) {
             return null;
         }
         $billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
-        if (! $billing_info) {
+        if ( ! $billing_info) {
             return null;
         }
         $billing_form = $pm_type->billing_form();
@@ -582,7 +582,7 @@ 
     public function get_billing_info_postmeta_name($payment_method)
     {
         if ($payment_method->type_obj() instanceof EE_PMT_Base) {
-            return 'billing_info_' . $payment_method->type_obj()->system_name();
+            return 'billing_info_'.$payment_method->type_obj()->system_name();
         } else {
             return null;
         }
@@ -599,7 +599,7 @@ 
      */
     public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method)
     {
-        if (! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+        if ( ! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
             EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
             return false;
         }

Indentation +660 added lines, -660 removed lines

@@ -1,5 +1,5 @@ 
 <?php if (! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('No direct script access allowed');
+	exit('No direct script access allowed');
 }
 /**
  * Event Espresso
@@ -23,665 +23,665 @@ 
 class EE_Attendee extends EE_CPT_Base implements EEI_Contact, EEI_Address, EEI_Admin_Links, EEI_Attendee
 {
 
-    /**
-     * Sets some dynamic defaults
-     *
-     * @param array  $fieldValues
-     * @param bool   $bydb
-     * @param string $timezone
-     * @param array  $date_formats
-     */
-    protected function __construct($fieldValues = null, $bydb = false, $timezone = null, $date_formats = array())
-    {
-        if (! isset($fieldValues['ATT_full_name'])) {
-            $fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'] . ' ' : '';
-            $lname                        = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
-            $fieldValues['ATT_full_name'] = $fname . $lname;
-        }
-        if (! isset($fieldValues['ATT_slug'])) {
-            //			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
-            $fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
-        }
-        if (! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
-            $fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
-        }
-        parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
-    }
-
-
-    /**
-     * @param array  $props_n_values          incoming values
-     * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
-     *                                        used.)
-     * @param array  $date_formats            incoming date_formats in an array where the first value is the
-     *                                        date_format and the second value is the time format
-     * @return EE_Attendee
-     */
-    public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
-    {
-        $has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
-        return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
-    }
-
-
-    /**
-     * @param array  $props_n_values  incoming values from the database
-     * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
-     *                                the website will be used.
-     * @return EE_Attendee
-     */
-    public static function new_instance_from_db($props_n_values = array(), $timezone = null)
-    {
-        return new self($props_n_values, true, $timezone);
-    }
-
-
-    /**
-     *        Set Attendee First Name
-     *
-     * @access        public
-     * @param string $fname
-     */
-    public function set_fname($fname = '')
-    {
-        $this->set('ATT_fname', $fname);
-    }
-
-
-    /**
-     *        Set Attendee Last Name
-     *
-     * @access        public
-     * @param string $lname
-     */
-    public function set_lname($lname = '')
-    {
-        $this->set('ATT_lname', $lname);
-    }
-
-
-    /**
-     *        Set Attendee Address
-     *
-     * @access        public
-     * @param string $address
-     */
-    public function set_address($address = '')
-    {
-        $this->set('ATT_address', $address);
-    }
-
-
-    /**
-     *        Set Attendee Address2
-     *
-     * @access        public
-     * @param        string $address2
-     */
-    public function set_address2($address2 = '')
-    {
-        $this->set('ATT_address2', $address2);
-    }
-
-
-    /**
-     *        Set Attendee City
-     *
-     * @access        public
-     * @param        string $city
-     */
-    public function set_city($city = '')
-    {
-        $this->set('ATT_city', $city);
-    }
-
-
-    /**
-     *        Set Attendee State ID
-     *
-     * @access        public
-     * @param        int $STA_ID
-     */
-    public function set_state($STA_ID = 0)
-    {
-        $this->set('STA_ID', $STA_ID);
-    }
-
-
-    /**
-     *        Set Attendee Country ISO Code
-     *
-     * @access        public
-     * @param        string $CNT_ISO
-     */
-    public function set_country($CNT_ISO = '')
-    {
-        $this->set('CNT_ISO', $CNT_ISO);
-    }
-
-
-    /**
-     *        Set Attendee Zip/Postal Code
-     *
-     * @access        public
-     * @param        string $zip
-     */
-    public function set_zip($zip = '')
-    {
-        $this->set('ATT_zip', $zip);
-    }
-
-
-    /**
-     *        Set Attendee Email Address
-     *
-     * @access        public
-     * @param        string $email
-     */
-    public function set_email($email = '')
-    {
-        $this->set('ATT_email', $email);
-    }
-
-
-    /**
-     *        Set Attendee Phone
-     *
-     * @access        public
-     * @param        string $phone
-     */
-    public function set_phone($phone = '')
-    {
-        $this->set('ATT_phone', $phone);
-    }
-
-
-    /**
-     *        set deleted
-     *
-     * @access        public
-     * @param        bool $ATT_deleted
-     */
-    public function set_deleted($ATT_deleted = false)
-    {
-        $this->set('ATT_deleted', $ATT_deleted);
-    }
-
-
-    /**
-     * Returns the value for the post_author id saved with the cpt
-     *
-     * @since 4.5.0
-     * @return int
-     */
-    public function wp_user()
-    {
-        return $this->get('ATT_author');
-    }
-
-
-    /**
-     *        get Attendee First Name
-     *
-     * @access        public
-     * @return string
-     */
-    public function fname()
-    {
-        return $this->get('ATT_fname');
-    }
-
-
-    /**
-     * echoes out the attendee's first name
-     *
-     * @return void
-     */
-    public function e_full_name()
-    {
-        echo $this->full_name();
-    }
-
-
-    /**
-     * Returns the first and last name concatenated together with a space.
-     *
-     * @param bool $apply_html_entities
-     * @return string
-     */
-    public function full_name($apply_html_entities = false)
-    {
-        $full_name = $this->fname() . ' ' . $this->lname();
-        return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
-    }
-
-
-    /**
-     * This returns the value of the `ATT_full_name` field which is usually equivalent to calling `full_name()` unless
-     * the post_title field has been directly modified in the db for the post (espresso_attendees post type) for this
-     * attendee.
-     *
-     * @param bool $apply_html_entities
-     * @return string
-     */
-    public function ATT_full_name($apply_html_entities = false)
-    {
-        return $apply_html_entities
-            ? htmlentities($this->get('ATT_full_name'), ENT_QUOTES, 'UTF-8')
-            : $this->get('ATT_full_name');
-    }
-
-
-    /**
-     *        get Attendee Last Name
-     *
-     * @access        public
-     * @return string
-     */
-    public function lname()
-    {
-        return $this->get('ATT_lname');
-    }
-
-
-    /**
-     * Gets the attendee's full address as an array so client code can decide hwo to display it
-     *
-     * @return array numerically indexed, with each part of the address that is known.
-     * Eg, if the user only responded to state and country,
-     * it would be array(0=>'Alabama',1=>'USA')
-     * @return array
-     */
-    public function full_address_as_array()
-    {
-        $full_address_array     = array();
-        $initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
-        foreach ($initial_address_fields as $address_field_name) {
-            $address_fields_value = $this->get($address_field_name);
-            if (! empty($address_fields_value)) {
-                $full_address_array[] = $address_fields_value;
-            }
-        }
-        //now handle state and country
-        $state_obj = $this->state_obj();
-        if (! empty($state_obj)) {
-            $full_address_array[] = $state_obj->name();
-        }
-        $country_obj = $this->country_obj();
-        if (! empty($country_obj)) {
-            $full_address_array[] = $country_obj->name();
-        }
-        //lastly get the xip
-        $zip_value = $this->zip();
-        if (! empty($zip_value)) {
-            $full_address_array[] = $zip_value;
-        }
-        return $full_address_array;
-    }
-
-
-    /**
-     *        get Attendee Address
-     *
-     * @return string
-     */
-    public function address()
-    {
-        return $this->get('ATT_address');
-    }
-
-
-    /**
-     *        get Attendee Address2
-     *
-     * @return string
-     */
-    public function address2()
-    {
-        return $this->get('ATT_address2');
-    }
-
-
-    /**
-     *        get Attendee City
-     *
-     * @return string
-     */
-    public function city()
-    {
-        return $this->get('ATT_city');
-    }
-
-
-    /**
-     *        get Attendee State ID
-     *
-     * @return string
-     */
-    public function state_ID()
-    {
-        return $this->get('STA_ID');
-    }
-
-
-    /**
-     * @return string
-     */
-    public function state_abbrev()
-    {
-        return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : '';
-    }
-
-
-    /**
-     * Gets the state set to this attendee
-     *
-     * @return EE_State
-     */
-    public function state_obj()
-    {
-        return $this->get_first_related('State');
-    }
-
-
-    /**
-     * Returns the state's name, otherwise 'Unknown'
-     *
-     * @return string
-     */
-    public function state_name()
-    {
-        if ($this->state_obj()) {
-            return $this->state_obj()->name();
-        } else {
-            return '';
-        }
-    }
-
-
-    /**
-     * either displays the state abbreviation or the state name, as determined
-     * by the "FHEE__EEI_Address__state__use_abbreviation" filter.
-     * defaults to abbreviation
-     *
-     * @return string
-     */
-    public function state()
-    {
-        if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
-            return $this->state_abbrev();
-        } else {
-            return $this->state_name();
-        }
-    }
-
-
-    /**
-     *    get Attendee Country ISO Code
-     *
-     * @return string
-     */
-    public function country_ID()
-    {
-        return $this->get('CNT_ISO');
-    }
-
-
-    /**
-     * Gets country set for this attendee
-     *
-     * @return EE_Country
-     */
-    public function country_obj()
-    {
-        return $this->get_first_related('Country');
-    }
-
-
-    /**
-     * Returns the country's name if known, otherwise 'Unknown'
-     *
-     * @return string
-     */
-    public function country_name()
-    {
-        if ($this->country_obj()) {
-            return $this->country_obj()->name();
-        } else {
-            return '';
-        }
-    }
-
-
-    /**
-     * either displays the country ISO2 code or the country name, as determined
-     * by the "FHEE__EEI_Address__country__use_abbreviation" filter.
-     * defaults to abbreviation
-     *
-     * @return string
-     */
-    public function country()
-    {
-        if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
-            return $this->country_ID();
-        } else {
-            return $this->country_name();
-        }
-    }
-
-
-    /**
-     *        get Attendee Zip/Postal Code
-     *
-     * @return string
-     */
-    public function zip()
-    {
-        return $this->get('ATT_zip');
-    }
-
-
-    /**
-     *        get Attendee Email Address
-     *
-     * @return string
-     */
-    public function email()
-    {
-        return $this->get('ATT_email');
-    }
-
-
-    /**
-     *        get Attendee Phone #
-     *
-     * @return string
-     */
-    public function phone()
-    {
-        return $this->get('ATT_phone');
-    }
-
-
-    /**
-     *    get deleted
-     *
-     * @return        bool
-     */
-    public function deleted()
-    {
-        return $this->get('ATT_deleted');
-    }
-
-
-    /**
-     * Gets registrations of this attendee
-     *
-     * @param array $query_params
-     * @return EE_Registration[]
-     */
-    public function get_registrations($query_params = array())
-    {
-        return $this->get_many_related('Registration', $query_params);
-    }
-
-
-    /**
-     * Gets the most recent registration of this attendee
-     *
-     * @return EE_Registration
-     */
-    public function get_most_recent_registration()
-    {
-        return $this->get_first_related('Registration',
-            array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
-    }
-
-
-    /**
-     * Gets the most recent registration for this attend at this event
-     *
-     * @param int $event_id
-     * @return EE_Registration
-     */
-    public function get_most_recent_registration_for_event($event_id)
-    {
-        return $this->get_first_related('Registration',
-            array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
-    }
-
-
-    /**
-     * returns any events attached to this attendee ($_Event property);
-     *
-     * @return array
-     */
-    public function events()
-    {
-        return $this->get_many_related('Event');
-    }
-
-
-    /**
-     * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
-     * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was
-     * used to save the billing info
-     *
-     * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
-     * @return EE_Form_Section_Proper|null
-     */
-    public function billing_info_for_payment_method($payment_method)
-    {
-        $pm_type = $payment_method->type_obj();
-        if (! $pm_type instanceof EE_PMT_Base) {
-            return null;
-        }
-        $billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
-        if (! $billing_info) {
-            return null;
-        }
-        $billing_form = $pm_type->billing_form();
-        if ($billing_form instanceof EE_Form_Section_Proper) {
-            $billing_form->receive_form_submission(array($billing_form->name() => $billing_info), false);
-        }
-        return $billing_form;
-    }
-
-
-    /**
-     * Gets the postmeta key that holds this attendee's billing info for the
-     * specified payment method
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return string
-     */
-    public function get_billing_info_postmeta_name($payment_method)
-    {
-        if ($payment_method->type_obj() instanceof EE_PMT_Base) {
-            return 'billing_info_' . $payment_method->type_obj()->system_name();
-        } else {
-            return null;
-        }
-    }
-
-
-    /**
-     * Saves the billing info to the attendee. @see EE_Attendee::billing_info_for_payment_method() which is used to
-     * retrieve it
-     *
-     * @param EE_Billing_Attendee_Info_Form $billing_form
-     * @param EE_Payment_Method             $payment_method
-     * @return boolean
-     */
-    public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method)
-    {
-        if (! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
-            EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
-            return false;
-        }
-        $billing_form->clean_sensitive_data();
-        return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method),
-            $billing_form->input_values(true));
-    }
-
-
-    /**
-     * Return the link to the admin details for the object.
-     *
-     * @return string
-     */
-    public function get_admin_details_link()
-    {
-        return $this->get_admin_edit_link();
-    }
-
-
-    /**
-     * Returns the link to the editor for the object.  Sometimes this is the same as the details.
-     *
-     * @return string
-     */
-    public function get_admin_edit_link()
-    {
-        EE_Registry::instance()->load_helper('URL');
-        return EEH_URL::add_query_args_and_nonce(
-            array(
-                'page'   => 'espresso_registrations',
-                'action' => 'edit_attendee',
-                'post'   => $this->ID(),
-            ),
-            admin_url('admin.php')
-        );
-    }
-
-
-    /**
-     * Returns the link to a settings page for the object.
-     *
-     * @return string
-     */
-    public function get_admin_settings_link()
-    {
-        return $this->get_admin_edit_link();
-    }
-
-
-    /**
-     * Returns the link to the "overview" for the object (typically the "list table" view).
-     *
-     * @return string
-     */
-    public function get_admin_overview_link()
-    {
-        EE_Registry::instance()->load_helper('URL');
-        return EEH_URL::add_query_args_and_nonce(
-            array(
-                'page'   => 'espresso_registrations',
-                'action' => 'contact_list',
-            ),
-            admin_url('admin.php')
-        );
-    }
+	/**
+	 * Sets some dynamic defaults
+	 *
+	 * @param array  $fieldValues
+	 * @param bool   $bydb
+	 * @param string $timezone
+	 * @param array  $date_formats
+	 */
+	protected function __construct($fieldValues = null, $bydb = false, $timezone = null, $date_formats = array())
+	{
+		if (! isset($fieldValues['ATT_full_name'])) {
+			$fname                        = isset($fieldValues['ATT_fname']) ? $fieldValues['ATT_fname'] . ' ' : '';
+			$lname                        = isset($fieldValues['ATT_lname']) ? $fieldValues['ATT_lname'] : '';
+			$fieldValues['ATT_full_name'] = $fname . $lname;
+		}
+		if (! isset($fieldValues['ATT_slug'])) {
+			//			$fieldValues['ATT_slug'] = sanitize_key(wp_generate_password(20));
+			$fieldValues['ATT_slug'] = sanitize_title($fieldValues['ATT_full_name']);
+		}
+		if (! isset($fieldValues['ATT_short_bio']) && isset($fieldValues['ATT_bio'])) {
+			$fieldValues['ATT_short_bio'] = substr($fieldValues['ATT_bio'], 0, 50);
+		}
+		parent::__construct($fieldValues, $bydb, $timezone, $date_formats);
+	}
+
+
+	/**
+	 * @param array  $props_n_values          incoming values
+	 * @param string $timezone                incoming timezone (if not set the timezone set for the website will be
+	 *                                        used.)
+	 * @param array  $date_formats            incoming date_formats in an array where the first value is the
+	 *                                        date_format and the second value is the time format
+	 * @return EE_Attendee
+	 */
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array())
+	{
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__, $timezone, $date_formats);
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
+	}
+
+
+	/**
+	 * @param array  $props_n_values  incoming values from the database
+	 * @param string $timezone        incoming timezone as set by the model.  If not set the timezone for
+	 *                                the website will be used.
+	 * @return EE_Attendee
+	 */
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null)
+	{
+		return new self($props_n_values, true, $timezone);
+	}
+
+
+	/**
+	 *        Set Attendee First Name
+	 *
+	 * @access        public
+	 * @param string $fname
+	 */
+	public function set_fname($fname = '')
+	{
+		$this->set('ATT_fname', $fname);
+	}
+
+
+	/**
+	 *        Set Attendee Last Name
+	 *
+	 * @access        public
+	 * @param string $lname
+	 */
+	public function set_lname($lname = '')
+	{
+		$this->set('ATT_lname', $lname);
+	}
+
+
+	/**
+	 *        Set Attendee Address
+	 *
+	 * @access        public
+	 * @param string $address
+	 */
+	public function set_address($address = '')
+	{
+		$this->set('ATT_address', $address);
+	}
+
+
+	/**
+	 *        Set Attendee Address2
+	 *
+	 * @access        public
+	 * @param        string $address2
+	 */
+	public function set_address2($address2 = '')
+	{
+		$this->set('ATT_address2', $address2);
+	}
+
+
+	/**
+	 *        Set Attendee City
+	 *
+	 * @access        public
+	 * @param        string $city
+	 */
+	public function set_city($city = '')
+	{
+		$this->set('ATT_city', $city);
+	}
+
+
+	/**
+	 *        Set Attendee State ID
+	 *
+	 * @access        public
+	 * @param        int $STA_ID
+	 */
+	public function set_state($STA_ID = 0)
+	{
+		$this->set('STA_ID', $STA_ID);
+	}
+
+
+	/**
+	 *        Set Attendee Country ISO Code
+	 *
+	 * @access        public
+	 * @param        string $CNT_ISO
+	 */
+	public function set_country($CNT_ISO = '')
+	{
+		$this->set('CNT_ISO', $CNT_ISO);
+	}
+
+
+	/**
+	 *        Set Attendee Zip/Postal Code
+	 *
+	 * @access        public
+	 * @param        string $zip
+	 */
+	public function set_zip($zip = '')
+	{
+		$this->set('ATT_zip', $zip);
+	}
+
+
+	/**
+	 *        Set Attendee Email Address
+	 *
+	 * @access        public
+	 * @param        string $email
+	 */
+	public function set_email($email = '')
+	{
+		$this->set('ATT_email', $email);
+	}
+
+
+	/**
+	 *        Set Attendee Phone
+	 *
+	 * @access        public
+	 * @param        string $phone
+	 */
+	public function set_phone($phone = '')
+	{
+		$this->set('ATT_phone', $phone);
+	}
+
+
+	/**
+	 *        set deleted
+	 *
+	 * @access        public
+	 * @param        bool $ATT_deleted
+	 */
+	public function set_deleted($ATT_deleted = false)
+	{
+		$this->set('ATT_deleted', $ATT_deleted);
+	}
+
+
+	/**
+	 * Returns the value for the post_author id saved with the cpt
+	 *
+	 * @since 4.5.0
+	 * @return int
+	 */
+	public function wp_user()
+	{
+		return $this->get('ATT_author');
+	}
+
+
+	/**
+	 *        get Attendee First Name
+	 *
+	 * @access        public
+	 * @return string
+	 */
+	public function fname()
+	{
+		return $this->get('ATT_fname');
+	}
+
+
+	/**
+	 * echoes out the attendee's first name
+	 *
+	 * @return void
+	 */
+	public function e_full_name()
+	{
+		echo $this->full_name();
+	}
+
+
+	/**
+	 * Returns the first and last name concatenated together with a space.
+	 *
+	 * @param bool $apply_html_entities
+	 * @return string
+	 */
+	public function full_name($apply_html_entities = false)
+	{
+		$full_name = $this->fname() . ' ' . $this->lname();
+		return $apply_html_entities ? htmlentities($full_name, ENT_QUOTES, 'UTF-8') : $full_name;
+	}
+
+
+	/**
+	 * This returns the value of the `ATT_full_name` field which is usually equivalent to calling `full_name()` unless
+	 * the post_title field has been directly modified in the db for the post (espresso_attendees post type) for this
+	 * attendee.
+	 *
+	 * @param bool $apply_html_entities
+	 * @return string
+	 */
+	public function ATT_full_name($apply_html_entities = false)
+	{
+		return $apply_html_entities
+			? htmlentities($this->get('ATT_full_name'), ENT_QUOTES, 'UTF-8')
+			: $this->get('ATT_full_name');
+	}
+
+
+	/**
+	 *        get Attendee Last Name
+	 *
+	 * @access        public
+	 * @return string
+	 */
+	public function lname()
+	{
+		return $this->get('ATT_lname');
+	}
+
+
+	/**
+	 * Gets the attendee's full address as an array so client code can decide hwo to display it
+	 *
+	 * @return array numerically indexed, with each part of the address that is known.
+	 * Eg, if the user only responded to state and country,
+	 * it would be array(0=>'Alabama',1=>'USA')
+	 * @return array
+	 */
+	public function full_address_as_array()
+	{
+		$full_address_array     = array();
+		$initial_address_fields = array('ATT_address', 'ATT_address2', 'ATT_city',);
+		foreach ($initial_address_fields as $address_field_name) {
+			$address_fields_value = $this->get($address_field_name);
+			if (! empty($address_fields_value)) {
+				$full_address_array[] = $address_fields_value;
+			}
+		}
+		//now handle state and country
+		$state_obj = $this->state_obj();
+		if (! empty($state_obj)) {
+			$full_address_array[] = $state_obj->name();
+		}
+		$country_obj = $this->country_obj();
+		if (! empty($country_obj)) {
+			$full_address_array[] = $country_obj->name();
+		}
+		//lastly get the xip
+		$zip_value = $this->zip();
+		if (! empty($zip_value)) {
+			$full_address_array[] = $zip_value;
+		}
+		return $full_address_array;
+	}
+
+
+	/**
+	 *        get Attendee Address
+	 *
+	 * @return string
+	 */
+	public function address()
+	{
+		return $this->get('ATT_address');
+	}
+
+
+	/**
+	 *        get Attendee Address2
+	 *
+	 * @return string
+	 */
+	public function address2()
+	{
+		return $this->get('ATT_address2');
+	}
+
+
+	/**
+	 *        get Attendee City
+	 *
+	 * @return string
+	 */
+	public function city()
+	{
+		return $this->get('ATT_city');
+	}
+
+
+	/**
+	 *        get Attendee State ID
+	 *
+	 * @return string
+	 */
+	public function state_ID()
+	{
+		return $this->get('STA_ID');
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function state_abbrev()
+	{
+		return $this->state_obj() instanceof EE_State ? $this->state_obj()->abbrev() : '';
+	}
+
+
+	/**
+	 * Gets the state set to this attendee
+	 *
+	 * @return EE_State
+	 */
+	public function state_obj()
+	{
+		return $this->get_first_related('State');
+	}
+
+
+	/**
+	 * Returns the state's name, otherwise 'Unknown'
+	 *
+	 * @return string
+	 */
+	public function state_name()
+	{
+		if ($this->state_obj()) {
+			return $this->state_obj()->name();
+		} else {
+			return '';
+		}
+	}
+
+
+	/**
+	 * either displays the state abbreviation or the state name, as determined
+	 * by the "FHEE__EEI_Address__state__use_abbreviation" filter.
+	 * defaults to abbreviation
+	 *
+	 * @return string
+	 */
+	public function state()
+	{
+		if (apply_filters('FHEE__EEI_Address__state__use_abbreviation', true, $this->state_obj())) {
+			return $this->state_abbrev();
+		} else {
+			return $this->state_name();
+		}
+	}
+
+
+	/**
+	 *    get Attendee Country ISO Code
+	 *
+	 * @return string
+	 */
+	public function country_ID()
+	{
+		return $this->get('CNT_ISO');
+	}
+
+
+	/**
+	 * Gets country set for this attendee
+	 *
+	 * @return EE_Country
+	 */
+	public function country_obj()
+	{
+		return $this->get_first_related('Country');
+	}
+
+
+	/**
+	 * Returns the country's name if known, otherwise 'Unknown'
+	 *
+	 * @return string
+	 */
+	public function country_name()
+	{
+		if ($this->country_obj()) {
+			return $this->country_obj()->name();
+		} else {
+			return '';
+		}
+	}
+
+
+	/**
+	 * either displays the country ISO2 code or the country name, as determined
+	 * by the "FHEE__EEI_Address__country__use_abbreviation" filter.
+	 * defaults to abbreviation
+	 *
+	 * @return string
+	 */
+	public function country()
+	{
+		if (apply_filters('FHEE__EEI_Address__country__use_abbreviation', true, $this->country_obj())) {
+			return $this->country_ID();
+		} else {
+			return $this->country_name();
+		}
+	}
+
+
+	/**
+	 *        get Attendee Zip/Postal Code
+	 *
+	 * @return string
+	 */
+	public function zip()
+	{
+		return $this->get('ATT_zip');
+	}
+
+
+	/**
+	 *        get Attendee Email Address
+	 *
+	 * @return string
+	 */
+	public function email()
+	{
+		return $this->get('ATT_email');
+	}
+
+
+	/**
+	 *        get Attendee Phone #
+	 *
+	 * @return string
+	 */
+	public function phone()
+	{
+		return $this->get('ATT_phone');
+	}
+
+
+	/**
+	 *    get deleted
+	 *
+	 * @return        bool
+	 */
+	public function deleted()
+	{
+		return $this->get('ATT_deleted');
+	}
+
+
+	/**
+	 * Gets registrations of this attendee
+	 *
+	 * @param array $query_params
+	 * @return EE_Registration[]
+	 */
+	public function get_registrations($query_params = array())
+	{
+		return $this->get_many_related('Registration', $query_params);
+	}
+
+
+	/**
+	 * Gets the most recent registration of this attendee
+	 *
+	 * @return EE_Registration
+	 */
+	public function get_most_recent_registration()
+	{
+		return $this->get_first_related('Registration',
+			array('order_by' => array('REG_date' => 'DESC'))); //null, 'REG_date', 'DESC', '=', 'OBJECT_K');
+	}
+
+
+	/**
+	 * Gets the most recent registration for this attend at this event
+	 *
+	 * @param int $event_id
+	 * @return EE_Registration
+	 */
+	public function get_most_recent_registration_for_event($event_id)
+	{
+		return $this->get_first_related('Registration',
+			array(array('EVT_ID' => $event_id), 'order_by' => array('REG_date' => 'DESC')));//, '=', 'OBJECT_K' );
+	}
+
+
+	/**
+	 * returns any events attached to this attendee ($_Event property);
+	 *
+	 * @return array
+	 */
+	public function events()
+	{
+		return $this->get_many_related('Event');
+	}
+
+
+	/**
+	 * Gets the billing info array where keys match espresso_reg_page_billing_inputs(),
+	 * and keys are their cleaned values. @see EE_Attendee::save_and_clean_billing_info_for_payment_method() which was
+	 * used to save the billing info
+	 *
+	 * @param EE_Payment_Method $payment_method the _gateway_name property on the gateway class
+	 * @return EE_Form_Section_Proper|null
+	 */
+	public function billing_info_for_payment_method($payment_method)
+	{
+		$pm_type = $payment_method->type_obj();
+		if (! $pm_type instanceof EE_PMT_Base) {
+			return null;
+		}
+		$billing_info = $this->get_post_meta($this->get_billing_info_postmeta_name($payment_method), true);
+		if (! $billing_info) {
+			return null;
+		}
+		$billing_form = $pm_type->billing_form();
+		if ($billing_form instanceof EE_Form_Section_Proper) {
+			$billing_form->receive_form_submission(array($billing_form->name() => $billing_info), false);
+		}
+		return $billing_form;
+	}
+
+
+	/**
+	 * Gets the postmeta key that holds this attendee's billing info for the
+	 * specified payment method
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return string
+	 */
+	public function get_billing_info_postmeta_name($payment_method)
+	{
+		if ($payment_method->type_obj() instanceof EE_PMT_Base) {
+			return 'billing_info_' . $payment_method->type_obj()->system_name();
+		} else {
+			return null;
+		}
+	}
+
+
+	/**
+	 * Saves the billing info to the attendee. @see EE_Attendee::billing_info_for_payment_method() which is used to
+	 * retrieve it
+	 *
+	 * @param EE_Billing_Attendee_Info_Form $billing_form
+	 * @param EE_Payment_Method             $payment_method
+	 * @return boolean
+	 */
+	public function save_and_clean_billing_info_for_payment_method($billing_form, $payment_method)
+	{
+		if (! $billing_form instanceof EE_Billing_Attendee_Info_Form) {
+			EE_Error::add_error(__('Cannot save billing info because there is none.', 'event_espresso'));
+			return false;
+		}
+		$billing_form->clean_sensitive_data();
+		return update_post_meta($this->ID(), $this->get_billing_info_postmeta_name($payment_method),
+			$billing_form->input_values(true));
+	}
+
+
+	/**
+	 * Return the link to the admin details for the object.
+	 *
+	 * @return string
+	 */
+	public function get_admin_details_link()
+	{
+		return $this->get_admin_edit_link();
+	}
+
+
+	/**
+	 * Returns the link to the editor for the object.  Sometimes this is the same as the details.
+	 *
+	 * @return string
+	 */
+	public function get_admin_edit_link()
+	{
+		EE_Registry::instance()->load_helper('URL');
+		return EEH_URL::add_query_args_and_nonce(
+			array(
+				'page'   => 'espresso_registrations',
+				'action' => 'edit_attendee',
+				'post'   => $this->ID(),
+			),
+			admin_url('admin.php')
+		);
+	}
+
+
+	/**
+	 * Returns the link to a settings page for the object.
+	 *
+	 * @return string
+	 */
+	public function get_admin_settings_link()
+	{
+		return $this->get_admin_edit_link();
+	}
+
+
+	/**
+	 * Returns the link to the "overview" for the object (typically the "list table" view).
+	 *
+	 * @return string
+	 */
+	public function get_admin_overview_link()
+	{
+		EE_Registry::instance()->load_helper('URL');
+		return EEH_URL::add_query_args_and_nonce(
+			array(
+				'page'   => 'espresso_registrations',
+				'action' => 'contact_list',
+			),
+			admin_url('admin.php')
+		);
+	}
 
 
 }