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/TicketSelectorRowStandard.php

Doc Comments +1 added lines, -1 removed lines

@@ -239,7 +239,7 @@
      * setTicketMinAndMax
      *
      * @param int $remaining
-     * @return array
+     * @return integer[]
      */
     protected function setTicketMinAndMax($remaining)
     {

Indentation +455 added lines, -455 removed lines

@@ -16,461 +16,461 @@
 class TicketSelectorRowStandard extends TicketSelectorRow
 {
 
-    /**
-     * @var TicketDetails $ticket_details
-     */
-    protected $ticket_details;
-
-    /**
-     * @var \EE_Ticket_Selector_Config $template_settings
-     */
-    protected $template_settings;
-
-    /**
-     * @var \EE_Tax_Config $tax_settings
-     */
-    protected $tax_settings;
-
-    /**
-     * @var boolean $required_ticket_sold_out
-     */
-    protected $required_ticket_sold_out;
-
-    /**
-     * @var boolean $prices_displayed_including_taxes
-     */
-    protected $prices_displayed_including_taxes;
-
-    /**
-     * @var string $event_status
-     */
-    protected $event_status;
-
-    /**
-     * @var int $row
-     */
-    protected $row;
-
-    /**
-     * @var int $cols
-     */
-    protected $cols;
-
-    /**
-     * @var boolean $hidden_input_qty
-     */
-    protected $hidden_input_qty;
-
-    /**
-     * @var string $ticket_datetime_classes
-     */
-    protected $ticket_datetime_classes;
-
-
-
-    /**
-     * TicketDetails constructor.
-     *
-     * @param \EE_Ticket $ticket
-     * @param TicketDetails              $ticket_details
-     * @param \EE_Ticket_Selector_Config $template_settings
-     * @param \EE_Tax_Config             $tax_settings
-     * @param int                        $max_atndz
-     * @param int                        $row
-     * @param int                        $cols
-     * @param boolean                    $required_ticket_sold_out
-     * @param string                     $event_status
-     * @param string                     $date_format
-     * @param string                     $ticket_datetime_classes
-     */
-    public function __construct(
-        \EE_Ticket $ticket,
-        TicketDetails $ticket_details,
-        \EE_Ticket_Selector_Config $template_settings,
-        \EE_Tax_Config $tax_settings,
-        $max_atndz,
-        $row,
-        $cols,
-        $required_ticket_sold_out,
-        $event_status,
-        $date_format,
-        $ticket_datetime_classes
-    ) {
-        $this->ticket = $ticket;
-        $this->ticket_details = $ticket_details;
-        $this->template_settings = $template_settings;
-        $this->tax_settings = $tax_settings;
-        $this->max_atndz = $max_atndz;
-        $this->row = $row;
-        $this->cols = $cols;
-        $this->required_ticket_sold_out = $required_ticket_sold_out;
-        $this->event_status = $event_status;
-        $this->date_format = $date_format;
-        $this->ticket_datetime_classes = $ticket_datetime_classes;
-        parent::__construct($ticket, $max_atndz, $date_format);
-    }
-
-
-
-    /**
-     * other ticket rows will need to know if a required ticket is sold out,
-     * so that they are not offered for sale
-     *
-     * @return boolean
-     */
-    public function getRequiredTicketSoldOut()
-    {
-        return $this->required_ticket_sold_out;
-    }
-
-
-
-    /**
-     * @return int
-     */
-    public function getCols()
-    {
-        return $this->cols;
-    }
-
-
-
-    /**
-     * getHtml
-     *
-     * @return string
-     * @throws \EE_Error
-     */
-    public function getHtml()
-    {
-        $min = 0;
-        $max = $this->ticket->max();
-        $remaining = $this->ticket->remaining();
-        if ($this->ticket->is_on_sale() && $this->ticket->is_remaining()) {
-            list($min, $max) = $this->setTicketMinAndMax($remaining);
-        } else {
-            // set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
-            $this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
-                ? $this->ticket->start_date()
-                : $this->required_ticket_sold_out;
-        }
-        list($ticket_price, $ticket_bundle) = $this->getTicketPriceDetails();
-        list($tkt_status, $ticket_status, $status_class) = $this->getTicketStatusClasses($remaining);
-        /**
-         * Allow plugins to hook in and abort the generation and display of this row to do
-         * something else if they want.
-         * For an addon to abort things, all they have to do is register a filter with this hook, and
-         * return a value that is NOT false.  Whatever is returned gets echoed instead of the
-         * current row.
-         *
-         * @var string|bool
-         */
-        $ticket_selector_row_html = apply_filters(
-            'FHEE__ticket_selector_chart_template__do_ticket_entire_row',
-            false,
-            $this->ticket,
-            $max,
-            $min,
-            $this->required_ticket_sold_out,
-            $ticket_price,
-            $ticket_bundle,
-            $ticket_status,
-            $status_class
-        );
-        if ($ticket_selector_row_html !== false) {
-            return $ticket_selector_row_html;
-        }
-        $ticket_selector_row_html = \EEH_HTML::tr(
-            '', '',
-            "tckt-slctr-tbl-tr {$status_class}{$this->ticket_datetime_classes} " . espresso_get_object_css_class($this->ticket)
-        );
-        /**
-         * Allow plugins to hook in and abort the generation and display of the contents of this
-         * row to do something else if they want.
-         * For an addon to abort things, all they have to do is register a filter with this hook, and
-         * return a value that is NOT false.  Whatever is returned gets echoed instead of the
-         * current row.
-         *
-         * @var string|bool
-         */
-        $new_row_cells_content = apply_filters(
-            'FHEE__ticket_selector_chart_template__do_ticket_inside_row',
-            false,
-            $this->ticket,
-            $max,
-            $min,
-            $this->required_ticket_sold_out,
-            $ticket_price,
-            $ticket_bundle,
-            $ticket_status,
-            $status_class
-        );
-        if ($new_row_cells_content !== false) {
-            return $ticket_selector_row_html
-                   . $new_row_cells_content
-                   . $this->ticketQtyAndIdHiddenInputs()
-                   . \EEH_HTML::trx();
-        }
-        $this->hidden_input_qty = $this->max_atndz > 1 ? true : false;
-
-        $ticket_selector_row_html .= $this->ticketNameTableCell();
-        $ticket_selector_row_html .= $this->ticketPriceTableCell($ticket_price, $ticket_bundle);
-        $ticket_selector_row_html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-qty cntr');
-        $this->setTicketStatusDisplay($tkt_status, $ticket_status, $remaining);
-        if (empty($this->ticket_status_display)) {
-            if ($this->max_atndz === 1) {
-                // only ONE attendee is allowed to register at a time
-                $ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
-            } else if ($max > 0) {
-                $ticket_selector_row_html .= $this->ticketQuantitySelector($min, $max);
-            }
-        }
-        $ticket_selector_row_html .= $this->ticket_status_display;
-        $ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
-        $ticket_selector_row_html .= $this->ticket_details->display($ticket_price, $remaining, $this->cols);
-        $ticket_selector_row_html .= \EEH_HTML::tdx();
-        $ticket_selector_row_html .= \EEH_HTML::trx();
-
-
-        $this->row++;
-        return $ticket_selector_row_html;
-    }
-
-
-
-    /**
-     * setTicketMinAndMax
-     *
-     * @param int $remaining
-     * @return array
-     */
-    protected function setTicketMinAndMax($remaining)
-    {
-        // offer the number of $tickets_remaining or $this->max_atndz, whichever is smaller
-        $max = min($remaining, $this->max_atndz);
-        // but... we also want to restrict the number of tickets by the ticket max setting,
-        // however, the max still can't be higher than what was just set above
-        $max = $this->ticket->max() > 0 ? min($this->ticket->max(), $max) : $max;
-        // and we also want to restrict the minimum number of tickets by the ticket min setting
-        $min = $this->ticket->min() > 0 ? $this->ticket->min() : 0;
-        // and if the ticket is required, then make sure that min qty is at least 1
-        $min = $this->ticket->required() ? max($min, 1) : $min;
-        return array($min, $max);
-    }
-
-
-    /**
-     * getTicketPriceDetails
-     *
-     * @return array
-     */
-    protected function getTicketPriceDetails()
-    {
-        $ticket_price = $this->tax_settings->prices_displayed_including_taxes
-            ? $this->ticket->get_ticket_total_with_taxes()
-            : $this->ticket->get_ticket_subtotal();
-        $ticket_bundle = false;
-        $ticket_min = $this->ticket->min();
-        // for ticket bundles, set min and max qty the same
-        if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
-            $ticket_price *= $ticket_min;
-            $ticket_bundle = true;
-        }
-        $ticket_price = apply_filters(
-            'FHEE__ticket_selector_chart_template__ticket_price',
-            $ticket_price,
-            $this->ticket
-        );
-        return array($ticket_price, $ticket_bundle);
-    }
-
-
-
-    /**
-     * getTicketStatusClasses
-     *
-     * @param int $remaining
-     * @return array
-     * @throws \EE_Error
-     */
-    protected function getTicketStatusClasses($remaining = 0)
-    {
-        // if a previous required ticket with the same sale start date is sold out,
-        // then mark this ticket as sold out as well.
-        // tickets that go on sale at a later date than the required ticket  will NOT be affected
-        $tkt_status = $this->required_ticket_sold_out !== false
-                      && $this->required_ticket_sold_out === $this->ticket->start_date()
-            ? \EE_Ticket::sold_out
-            : $this->ticket->ticket_status();
-        $tkt_status = $this->event_status === \EE_Datetime::sold_out
-            ? \EE_Ticket::sold_out
-            : $tkt_status;
-        // check ticket status
-        switch ($tkt_status) {
-            // sold_out
-            case \EE_Ticket::sold_out :
-                $ticket_status = 'ticket-sales-sold-out';
-                $status_class = 'ticket-sales-sold-out lt-grey-text';
-                break;
-            // expired
-            case \EE_Ticket::expired :
-                $ticket_status = 'ticket-sales-expired';
-                $status_class = 'ticket-sales-expired lt-grey-text';
-                break;
-            // archived
-            case \EE_Ticket::archived :
-                $ticket_status = 'archived-ticket';
-                $status_class = 'archived-ticket hidden';
-                break;
-            // pending
-            case \EE_Ticket::pending :
-                $ticket_status = 'ticket-pending';
-                $status_class = 'ticket-pending';
-                break;
-            // onsale
-            case \EE_Ticket::onsale :
-            default :
-                $ticket_status = 'ticket-on-sale';
-                $status_class = 'ticket-on-sale';
-                break;
-        }
-        $ticket_status = \EEH_HTML::span($this->ticket->ticket_status(true, ($remaining > 0)), '', $ticket_status);
-        return array($tkt_status, $ticket_status, $status_class);
-    }
-
-
-
-    /**
-     * ticketNameTableCell
-     *
-     * @return string
-     * @throws \EE_Error
-     */
-    protected function ticketNameTableCell()
-    {
-        $html = \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-name');
-        $html .= \EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
-        $html .= $this->ticket_details->getShowHideLinks();
-        if ($this->ticket->required()) {
-            $html .= \EEH_HTML::p(
-                    apply_filters(
-                            'FHEE__ticket_selector_chart_template__ticket_required_message',
-                            esc_html__('This ticket is required and must be purchased.', 'event_espresso')
-                    ),
-                    '', 'ticket-required-pg'
-            );
-        }
-        $html .= \EEH_HTML::tdx();
-        return $html;
-    }
-
-
-
-    /**
-     * ticketPriceTableCell
-     *
-     * @param float $ticket_price
-     * @param bool  $ticket_bundle
-     * @return string
-     * @throws \EE_Error
-     */
-    protected function ticketPriceTableCell($ticket_price, $ticket_bundle)
-    {
-        $html = '';
-        if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
-            $html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-price jst-rght');
-            $html .= \EEH_Template::format_currency($ticket_price);
-            $html .= $this->ticket->taxable()
-                ? \EEH_HTML::span( '*', '', 'taxable-tickets-asterisk grey-text' )
-                : '';
-            $html .= ' ';
-            $html .= \EEH_HTML::span(
-                $ticket_bundle
-                    ? apply_filters(
-                        'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
-                        __(' / bundle', 'event_espresso')
-                    )
-                    : apply_filters(
-                        'FHEE__ticket_selector_chart_template__per_ticket_text',
-                        __('', 'event_espresso')
-                    ),
-                '', 'smaller-text no-bold'
-            );
-            $html .= ' ';
-            $html .= \EEH_HTML::tdx();
-            $this->cols++;
-        }
-        return $html;
-    }
-
-
-
-    /**
-     * onlyOneAttendeeCanRegister
-     *
-     * @return string
-     */
-    protected function onlyOneAttendeeCanRegister()
-    {
-        // display submit button since we have tickets available
-        add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-        $this->hidden_input_qty = false;
-        $html = '<input type="radio" name="tkt-slctr-qty-' . $this->EVT_ID . '"';
-        $html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
-        $html .= ' class="ticket-selector-tbl-qty-slct" value="' . $this->row . '-1"';
-        $html .= $this->row === 1 ? ' checked="checked"' : '';
-        $html .= ' title=""/>';
-        return $html;
-    }
-
-
-
-    /**
-     * ticketQuantitySelector
-     *
-     * @param int $min
-     * @param int $max
-     * @return string
-     */
-    protected function ticketQuantitySelector($min = 0, $max = 0)
-    {
-        // display submit button since we have tickets available
-        add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
-        $this->hidden_input_qty = false;
-        $html = '<select name="tkt-slctr-qty-' . $this->EVT_ID . '[]"';
-        $html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
-        $html .= ' class="ticket-selector-tbl-qty-slct">';
-        // this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
-        if ($min !== 0 && ! $this->ticket->required()) {
-            $html .= '<option value="0">&nbsp;0&nbsp;</option>';
-        }
-        // offer ticket quantities from the min to the max
-        for ($i = $min; $i <= $max; $i++) {
-            $html .= '<option value="' . $i . '">&nbsp;' . $i . '&nbsp;</option>';
-        }
-        $html .= '</select>';
-        return $html;
-    }
-
-
-
-    /**
-     * getHiddenInputs
-     *
-     * @return string
-     * @throws \EE_Error
-     */
-    protected function ticketQtyAndIdHiddenInputs()
-    {
-        $html = '';
-        // depending on group reg we need to change the format for qty
-        if ($this->hidden_input_qty) {
-            $html .= '<input type="hidden" name="tkt-slctr-qty-' . $this->EVT_ID . '[]" value="0"/>';
-        }
-        $html .= '<input type="hidden" name="tkt-slctr-ticket-id-' . $this->EVT_ID . '[]"';
-        $html .= ' value="' . $this->ticket->ID() . '"/>';
-        return $html;
-    }
+	/**
+	 * @var TicketDetails $ticket_details
+	 */
+	protected $ticket_details;
+
+	/**
+	 * @var \EE_Ticket_Selector_Config $template_settings
+	 */
+	protected $template_settings;
+
+	/**
+	 * @var \EE_Tax_Config $tax_settings
+	 */
+	protected $tax_settings;
+
+	/**
+	 * @var boolean $required_ticket_sold_out
+	 */
+	protected $required_ticket_sold_out;
+
+	/**
+	 * @var boolean $prices_displayed_including_taxes
+	 */
+	protected $prices_displayed_including_taxes;
+
+	/**
+	 * @var string $event_status
+	 */
+	protected $event_status;
+
+	/**
+	 * @var int $row
+	 */
+	protected $row;
+
+	/**
+	 * @var int $cols
+	 */
+	protected $cols;
+
+	/**
+	 * @var boolean $hidden_input_qty
+	 */
+	protected $hidden_input_qty;
+
+	/**
+	 * @var string $ticket_datetime_classes
+	 */
+	protected $ticket_datetime_classes;
+
+
+
+	/**
+	 * TicketDetails constructor.
+	 *
+	 * @param \EE_Ticket $ticket
+	 * @param TicketDetails              $ticket_details
+	 * @param \EE_Ticket_Selector_Config $template_settings
+	 * @param \EE_Tax_Config             $tax_settings
+	 * @param int                        $max_atndz
+	 * @param int                        $row
+	 * @param int                        $cols
+	 * @param boolean                    $required_ticket_sold_out
+	 * @param string                     $event_status
+	 * @param string                     $date_format
+	 * @param string                     $ticket_datetime_classes
+	 */
+	public function __construct(
+		\EE_Ticket $ticket,
+		TicketDetails $ticket_details,
+		\EE_Ticket_Selector_Config $template_settings,
+		\EE_Tax_Config $tax_settings,
+		$max_atndz,
+		$row,
+		$cols,
+		$required_ticket_sold_out,
+		$event_status,
+		$date_format,
+		$ticket_datetime_classes
+	) {
+		$this->ticket = $ticket;
+		$this->ticket_details = $ticket_details;
+		$this->template_settings = $template_settings;
+		$this->tax_settings = $tax_settings;
+		$this->max_atndz = $max_atndz;
+		$this->row = $row;
+		$this->cols = $cols;
+		$this->required_ticket_sold_out = $required_ticket_sold_out;
+		$this->event_status = $event_status;
+		$this->date_format = $date_format;
+		$this->ticket_datetime_classes = $ticket_datetime_classes;
+		parent::__construct($ticket, $max_atndz, $date_format);
+	}
+
+
+
+	/**
+	 * other ticket rows will need to know if a required ticket is sold out,
+	 * so that they are not offered for sale
+	 *
+	 * @return boolean
+	 */
+	public function getRequiredTicketSoldOut()
+	{
+		return $this->required_ticket_sold_out;
+	}
+
+
+
+	/**
+	 * @return int
+	 */
+	public function getCols()
+	{
+		return $this->cols;
+	}
+
+
+
+	/**
+	 * getHtml
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function getHtml()
+	{
+		$min = 0;
+		$max = $this->ticket->max();
+		$remaining = $this->ticket->remaining();
+		if ($this->ticket->is_on_sale() && $this->ticket->is_remaining()) {
+			list($min, $max) = $this->setTicketMinAndMax($remaining);
+		} else {
+			// set flag if ticket is required (flag is set to start date so that future tickets are not blocked)
+			$this->required_ticket_sold_out = $this->ticket->required() && ! $remaining
+				? $this->ticket->start_date()
+				: $this->required_ticket_sold_out;
+		}
+		list($ticket_price, $ticket_bundle) = $this->getTicketPriceDetails();
+		list($tkt_status, $ticket_status, $status_class) = $this->getTicketStatusClasses($remaining);
+		/**
+		 * Allow plugins to hook in and abort the generation and display of this row to do
+		 * something else if they want.
+		 * For an addon to abort things, all they have to do is register a filter with this hook, and
+		 * return a value that is NOT false.  Whatever is returned gets echoed instead of the
+		 * current row.
+		 *
+		 * @var string|bool
+		 */
+		$ticket_selector_row_html = apply_filters(
+			'FHEE__ticket_selector_chart_template__do_ticket_entire_row',
+			false,
+			$this->ticket,
+			$max,
+			$min,
+			$this->required_ticket_sold_out,
+			$ticket_price,
+			$ticket_bundle,
+			$ticket_status,
+			$status_class
+		);
+		if ($ticket_selector_row_html !== false) {
+			return $ticket_selector_row_html;
+		}
+		$ticket_selector_row_html = \EEH_HTML::tr(
+			'', '',
+			"tckt-slctr-tbl-tr {$status_class}{$this->ticket_datetime_classes} " . espresso_get_object_css_class($this->ticket)
+		);
+		/**
+		 * Allow plugins to hook in and abort the generation and display of the contents of this
+		 * row to do something else if they want.
+		 * For an addon to abort things, all they have to do is register a filter with this hook, and
+		 * return a value that is NOT false.  Whatever is returned gets echoed instead of the
+		 * current row.
+		 *
+		 * @var string|bool
+		 */
+		$new_row_cells_content = apply_filters(
+			'FHEE__ticket_selector_chart_template__do_ticket_inside_row',
+			false,
+			$this->ticket,
+			$max,
+			$min,
+			$this->required_ticket_sold_out,
+			$ticket_price,
+			$ticket_bundle,
+			$ticket_status,
+			$status_class
+		);
+		if ($new_row_cells_content !== false) {
+			return $ticket_selector_row_html
+				   . $new_row_cells_content
+				   . $this->ticketQtyAndIdHiddenInputs()
+				   . \EEH_HTML::trx();
+		}
+		$this->hidden_input_qty = $this->max_atndz > 1 ? true : false;
+
+		$ticket_selector_row_html .= $this->ticketNameTableCell();
+		$ticket_selector_row_html .= $this->ticketPriceTableCell($ticket_price, $ticket_bundle);
+		$ticket_selector_row_html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-qty cntr');
+		$this->setTicketStatusDisplay($tkt_status, $ticket_status, $remaining);
+		if (empty($this->ticket_status_display)) {
+			if ($this->max_atndz === 1) {
+				// only ONE attendee is allowed to register at a time
+				$ticket_selector_row_html .= $this->onlyOneAttendeeCanRegister();
+			} else if ($max > 0) {
+				$ticket_selector_row_html .= $this->ticketQuantitySelector($min, $max);
+			}
+		}
+		$ticket_selector_row_html .= $this->ticket_status_display;
+		$ticket_selector_row_html .= $this->ticketQtyAndIdHiddenInputs();
+		$ticket_selector_row_html .= $this->ticket_details->display($ticket_price, $remaining, $this->cols);
+		$ticket_selector_row_html .= \EEH_HTML::tdx();
+		$ticket_selector_row_html .= \EEH_HTML::trx();
+
+
+		$this->row++;
+		return $ticket_selector_row_html;
+	}
+
+
+
+	/**
+	 * setTicketMinAndMax
+	 *
+	 * @param int $remaining
+	 * @return array
+	 */
+	protected function setTicketMinAndMax($remaining)
+	{
+		// offer the number of $tickets_remaining or $this->max_atndz, whichever is smaller
+		$max = min($remaining, $this->max_atndz);
+		// but... we also want to restrict the number of tickets by the ticket max setting,
+		// however, the max still can't be higher than what was just set above
+		$max = $this->ticket->max() > 0 ? min($this->ticket->max(), $max) : $max;
+		// and we also want to restrict the minimum number of tickets by the ticket min setting
+		$min = $this->ticket->min() > 0 ? $this->ticket->min() : 0;
+		// and if the ticket is required, then make sure that min qty is at least 1
+		$min = $this->ticket->required() ? max($min, 1) : $min;
+		return array($min, $max);
+	}
+
+
+	/**
+	 * getTicketPriceDetails
+	 *
+	 * @return array
+	 */
+	protected function getTicketPriceDetails()
+	{
+		$ticket_price = $this->tax_settings->prices_displayed_including_taxes
+			? $this->ticket->get_ticket_total_with_taxes()
+			: $this->ticket->get_ticket_subtotal();
+		$ticket_bundle = false;
+		$ticket_min = $this->ticket->min();
+		// for ticket bundles, set min and max qty the same
+		if ($ticket_min !== 0 && $ticket_min === $this->ticket->max()) {
+			$ticket_price *= $ticket_min;
+			$ticket_bundle = true;
+		}
+		$ticket_price = apply_filters(
+			'FHEE__ticket_selector_chart_template__ticket_price',
+			$ticket_price,
+			$this->ticket
+		);
+		return array($ticket_price, $ticket_bundle);
+	}
+
+
+
+	/**
+	 * getTicketStatusClasses
+	 *
+	 * @param int $remaining
+	 * @return array
+	 * @throws \EE_Error
+	 */
+	protected function getTicketStatusClasses($remaining = 0)
+	{
+		// if a previous required ticket with the same sale start date is sold out,
+		// then mark this ticket as sold out as well.
+		// tickets that go on sale at a later date than the required ticket  will NOT be affected
+		$tkt_status = $this->required_ticket_sold_out !== false
+					  && $this->required_ticket_sold_out === $this->ticket->start_date()
+			? \EE_Ticket::sold_out
+			: $this->ticket->ticket_status();
+		$tkt_status = $this->event_status === \EE_Datetime::sold_out
+			? \EE_Ticket::sold_out
+			: $tkt_status;
+		// check ticket status
+		switch ($tkt_status) {
+			// sold_out
+			case \EE_Ticket::sold_out :
+				$ticket_status = 'ticket-sales-sold-out';
+				$status_class = 'ticket-sales-sold-out lt-grey-text';
+				break;
+			// expired
+			case \EE_Ticket::expired :
+				$ticket_status = 'ticket-sales-expired';
+				$status_class = 'ticket-sales-expired lt-grey-text';
+				break;
+			// archived
+			case \EE_Ticket::archived :
+				$ticket_status = 'archived-ticket';
+				$status_class = 'archived-ticket hidden';
+				break;
+			// pending
+			case \EE_Ticket::pending :
+				$ticket_status = 'ticket-pending';
+				$status_class = 'ticket-pending';
+				break;
+			// onsale
+			case \EE_Ticket::onsale :
+			default :
+				$ticket_status = 'ticket-on-sale';
+				$status_class = 'ticket-on-sale';
+				break;
+		}
+		$ticket_status = \EEH_HTML::span($this->ticket->ticket_status(true, ($remaining > 0)), '', $ticket_status);
+		return array($tkt_status, $ticket_status, $status_class);
+	}
+
+
+
+	/**
+	 * ticketNameTableCell
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	protected function ticketNameTableCell()
+	{
+		$html = \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-name');
+		$html .= \EEH_HTML::strong($this->ticket->get_pretty('TKT_name'));
+		$html .= $this->ticket_details->getShowHideLinks();
+		if ($this->ticket->required()) {
+			$html .= \EEH_HTML::p(
+					apply_filters(
+							'FHEE__ticket_selector_chart_template__ticket_required_message',
+							esc_html__('This ticket is required and must be purchased.', 'event_espresso')
+					),
+					'', 'ticket-required-pg'
+			);
+		}
+		$html .= \EEH_HTML::tdx();
+		return $html;
+	}
+
+
+
+	/**
+	 * ticketPriceTableCell
+	 *
+	 * @param float $ticket_price
+	 * @param bool  $ticket_bundle
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	protected function ticketPriceTableCell($ticket_price, $ticket_bundle)
+	{
+		$html = '';
+		if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
+			$html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-price jst-rght');
+			$html .= \EEH_Template::format_currency($ticket_price);
+			$html .= $this->ticket->taxable()
+				? \EEH_HTML::span( '*', '', 'taxable-tickets-asterisk grey-text' )
+				: '';
+			$html .= '&nbsp;';
+			$html .= \EEH_HTML::span(
+				$ticket_bundle
+					? apply_filters(
+						'FHEE__ticket_selector_chart_template__per_ticket_bundle_text',
+						__(' / bundle', 'event_espresso')
+					)
+					: apply_filters(
+						'FHEE__ticket_selector_chart_template__per_ticket_text',
+						__('', 'event_espresso')
+					),
+				'', 'smaller-text no-bold'
+			);
+			$html .= '&nbsp;';
+			$html .= \EEH_HTML::tdx();
+			$this->cols++;
+		}
+		return $html;
+	}
+
+
+
+	/**
+	 * onlyOneAttendeeCanRegister
+	 *
+	 * @return string
+	 */
+	protected function onlyOneAttendeeCanRegister()
+	{
+		// display submit button since we have tickets available
+		add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+		$this->hidden_input_qty = false;
+		$html = '<input type="radio" name="tkt-slctr-qty-' . $this->EVT_ID . '"';
+		$html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
+		$html .= ' class="ticket-selector-tbl-qty-slct" value="' . $this->row . '-1"';
+		$html .= $this->row === 1 ? ' checked="checked"' : '';
+		$html .= ' title=""/>';
+		return $html;
+	}
+
+
+
+	/**
+	 * ticketQuantitySelector
+	 *
+	 * @param int $min
+	 * @param int $max
+	 * @return string
+	 */
+	protected function ticketQuantitySelector($min = 0, $max = 0)
+	{
+		// display submit button since we have tickets available
+		add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
+		$this->hidden_input_qty = false;
+		$html = '<select name="tkt-slctr-qty-' . $this->EVT_ID . '[]"';
+		$html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
+		$html .= ' class="ticket-selector-tbl-qty-slct">';
+		// this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
+		if ($min !== 0 && ! $this->ticket->required()) {
+			$html .= '<option value="0">&nbsp;0&nbsp;</option>';
+		}
+		// offer ticket quantities from the min to the max
+		for ($i = $min; $i <= $max; $i++) {
+			$html .= '<option value="' . $i . '">&nbsp;' . $i . '&nbsp;</option>';
+		}
+		$html .= '</select>';
+		return $html;
+	}
+
+
+
+	/**
+	 * getHiddenInputs
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	protected function ticketQtyAndIdHiddenInputs()
+	{
+		$html = '';
+		// depending on group reg we need to change the format for qty
+		if ($this->hidden_input_qty) {
+			$html .= '<input type="hidden" name="tkt-slctr-qty-' . $this->EVT_ID . '[]" value="0"/>';
+		}
+		$html .= '<input type="hidden" name="tkt-slctr-ticket-id-' . $this->EVT_ID . '[]"';
+		$html .= ' value="' . $this->ticket->ID() . '"/>';
+		return $html;
+	}
 
 }
 // End of file TicketSelectorRowStandard.php

Spacing +11 added lines, -11 removed lines

@@ -182,7 +182,7 @@ 
         }
         $ticket_selector_row_html = \EEH_HTML::tr(
             '', '',
-            "tckt-slctr-tbl-tr {$status_class}{$this->ticket_datetime_classes} " . espresso_get_object_css_class($this->ticket)
+            "tckt-slctr-tbl-tr {$status_class}{$this->ticket_datetime_classes} ".espresso_get_object_css_class($this->ticket)
         );
         /**
          * Allow plugins to hook in and abort the generation and display of the contents of this
@@ -381,7 +381,7 @@ 
             $html .= \EEH_HTML::td('', '', 'tckt-slctr-tbl-td-price jst-rght');
             $html .= \EEH_Template::format_currency($ticket_price);
             $html .= $this->ticket->taxable()
-                ? \EEH_HTML::span( '*', '', 'taxable-tickets-asterisk grey-text' )
+                ? \EEH_HTML::span('*', '', 'taxable-tickets-asterisk grey-text')
                 : '';
             $html .= ' ';
             $html .= \EEH_HTML::span(
@@ -415,9 +415,9 @@ 
         // display submit button since we have tickets available
         add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
         $this->hidden_input_qty = false;
-        $html = '<input type="radio" name="tkt-slctr-qty-' . $this->EVT_ID . '"';
-        $html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
-        $html .= ' class="ticket-selector-tbl-qty-slct" value="' . $this->row . '-1"';
+        $html = '<input type="radio" name="tkt-slctr-qty-'.$this->EVT_ID.'"';
+        $html .= ' id="ticket-selector-tbl-qty-slct-'.$this->EVT_ID.'-'.$this->row.'"';
+        $html .= ' class="ticket-selector-tbl-qty-slct" value="'.$this->row.'-1"';
         $html .= $this->row === 1 ? ' checked="checked"' : '';
         $html .= ' title=""/>';
         return $html;
@@ -437,8 +437,8 @@ 
         // display submit button since we have tickets available
         add_filter('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', '__return_true');
         $this->hidden_input_qty = false;
-        $html = '<select name="tkt-slctr-qty-' . $this->EVT_ID . '[]"';
-        $html .= ' id="ticket-selector-tbl-qty-slct-' . $this->EVT_ID . '-' . $this->row . '"';
+        $html = '<select name="tkt-slctr-qty-'.$this->EVT_ID.'[]"';
+        $html .= ' id="ticket-selector-tbl-qty-slct-'.$this->EVT_ID.'-'.$this->row.'"';
         $html .= ' class="ticket-selector-tbl-qty-slct">';
         // this ensures that non-required tickets with non-zero MIN QTYs don't HAVE to be purchased
         if ($min !== 0 && ! $this->ticket->required()) {
@@ -446,7 +446,7 @@ 
         }
         // offer ticket quantities from the min to the max
         for ($i = $min; $i <= $max; $i++) {
-            $html .= '<option value="' . $i . '">&nbsp;' . $i . '&nbsp;</option>';
+            $html .= '<option value="'.$i.'">&nbsp;'.$i.'&nbsp;</option>';
         }
         $html .= '</select>';
         return $html;
@@ -465,10 +465,10 @@ 
         $html = '';
         // depending on group reg we need to change the format for qty
         if ($this->hidden_input_qty) {
-            $html .= '<input type="hidden" name="tkt-slctr-qty-' . $this->EVT_ID . '[]" value="0"/>';
+            $html .= '<input type="hidden" name="tkt-slctr-qty-'.$this->EVT_ID.'[]" value="0"/>';
         }
-        $html .= '<input type="hidden" name="tkt-slctr-ticket-id-' . $this->EVT_ID . '[]"';
-        $html .= ' value="' . $this->ticket->ID() . '"/>';
+        $html .= '<input type="hidden" name="tkt-slctr-ticket-id-'.$this->EVT_ID.'[]"';
+        $html .= ' value="'.$this->ticket->ID().'"/>';
         return $html;
     }
 

modules/ticket_selector/TicketDetails.php

Indentation +152 added lines, -152 removed lines

@@ -17,158 +17,158 @@
 {
 
 
-    /**
-     * @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 bool
-     */
-    public function showTicketDetails()
-    {
-        return $this->template_settings->show_ticket_details;
-    }
-
-
-
-    /**
-     * @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 bool
+	 */
+	public function showTicketDetails()
+	{
+		return $this->template_settings->show_ticket_details;
+	}
+
+
+
+	/**
+	 * @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

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

modules/single_page_checkout/inc/EE_SPCO_Reg_Step.class.php

Indentation +35 added lines, -35 removed lines

@@ -1,16 +1,16 @@ 
 <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
  /**
- *
- * Class EE_SPCO_Reg_Step
- *
- * Description
- *
- * @package 			Event Espresso
- * @subpackage 	core
- * @author 				Brent Christensen
- * @since 				4.5.0
- *
- */
+  *
+  * Class EE_SPCO_Reg_Step
+  *
+  * Description
+  *
+  * @package 			Event Espresso
+  * @subpackage 	core
+  * @author 				Brent Christensen
+  * @since 				4.5.0
+  *
+  */
 abstract class EE_SPCO_Reg_Step {
 
 	/**
@@ -385,12 +385,12 @@ 
 
 
 
-    /**
-     * creates the default hidden inputs section
-     *
-     * @return EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
+	/**
+	 * creates the default hidden inputs section
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
 	public function reg_step_hidden_inputs() {
 		// hidden inputs for admin registrations
 		if ( $this->checkout->admin_request ) {
@@ -465,10 +465,10 @@ 
 
 
 
-    /**
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function display_reg_form() {
 		$html = '';
 		if ( $this->reg_form instanceof EE_Form_Section_Proper ) {
@@ -477,8 +477,8 @@ 
 				$this->reg_form->localize_validation_rules();
 				$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
 			}
-            $html .= $this->reg_form->get_html();
-            $html .= ! $this->checkout->admin_request ? $this->reg_step_submit_button() : '';
+			$html .= $this->reg_form->get_html();
+			$html .= ! $this->checkout->admin_request ? $this->reg_step_submit_button() : '';
 			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_close() : '';
 		}
 		return $html;
@@ -486,12 +486,12 @@ 
 
 
 
-    /**
-     * div_class - returns nothing for current step, but a css class of "hidden" for others
-     *
-     * @return string
-     * @throws \EE_Error
-     */
+	/**
+	 * div_class - returns nothing for current step, but a css class of "hidden" for others
+	 *
+	 * @return string
+	 * @throws \EE_Error
+	 */
 	public function reg_step_submit_button() {
 		if ( ! $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
 			return '';
@@ -550,12 +550,12 @@ 
 
 
 
-    /**
-     * update_checkout with changes that have been made to the cart
-     *
-     * @return void
-     * @throws \EE_Error
-     */
+	/**
+	 * update_checkout with changes that have been made to the cart
+	 *
+	 * @return void
+	 * @throws \EE_Error
+	 */
 	public function update_checkout() {
 		// grab the cart grand total and reset TXN total
 		$this->checkout->transaction->set_total( $this->checkout->cart->get_cart_grand_total() );

Spacing +52 added lines, -52 removed lines

@@ -153,7 +153,7 @@ 
 	public function set_completed() {
 		// DEBUG LOG
 		//$this->checkout->log( __CLASS__, __FUNCTION__, __LINE__ );
-		$this->_completed = apply_filters( 'FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this );
+		$this->_completed = apply_filters('FHEE__EE_SPCO_Reg_Step__set_completed___completed', true, $this);
 	}
 
 
@@ -201,18 +201,18 @@ 
 	 * sets the text that appears on the reg step form submit button
 	 * @param string $submit_button_text
 	 */
-	public function set_submit_button_text( $submit_button_text = '' ) {
-		if ( ! empty( $submit_button_text )) {
+	public function set_submit_button_text($submit_button_text = '') {
+		if ( ! empty($submit_button_text)) {
 			$this->_submit_button_text = $submit_button_text;
-		} else if ( $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
-			if ( $this->checkout->revisit ) {
-				$this->_submit_button_text = sprintf( __( 'Update %s', 'event_espresso' ), $this->checkout->current_step->name() );
+		} else if ($this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
+			if ($this->checkout->revisit) {
+				$this->_submit_button_text = sprintf(__('Update %s', 'event_espresso'), $this->checkout->current_step->name());
 			} else {
-				$this->_submit_button_text = sprintf( __( 'Proceed to %s', 'event_espresso' ), $this->checkout->next_step->name() );
+				$this->_submit_button_text = sprintf(__('Proceed to %s', 'event_espresso'), $this->checkout->next_step->name());
 			}
 		}
 		// filters the submit button text
-		$this->_submit_button_text = apply_filters( 'FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', $this->_submit_button_text, $this->checkout );
+		$this->_submit_button_text = apply_filters('FHEE__EE_SPCO_Reg_Step__set_submit_button_text___submit_button_text', $this->_submit_button_text, $this->checkout);
 	}
 
 
@@ -220,7 +220,7 @@ 
 	/**
 	 * @param boolean $is_current_step
 	 */
-	public function set_is_current_step( $is_current_step ) {
+	public function set_is_current_step($is_current_step) {
 		$this->_is_current_step = $is_current_step;
 	}
 
@@ -247,7 +247,7 @@ 
 	/**
 	 * @param int $order
 	 */
-	public function set_order( $order ) {
+	public function set_order($order) {
 		$this->_order = $order;
 	}
 
@@ -285,7 +285,7 @@ 
 	 * _set_success_message
 	 * @param string $success_message
 	 */
-	protected function _set_success_message( $success_message ) {
+	protected function _set_success_message($success_message) {
 		$this->_success_message = $success_message;
 	}
 
@@ -313,8 +313,8 @@ 
 	/**
 	 * @param string $instructions
 	 */
-	public function set_instructions( $instructions ) {
-		$this->_instructions = apply_filters( 'FHEE__EE_SPCO_Reg_Step__set_instructions__instructions', $instructions, $this );
+	public function set_instructions($instructions) {
+		$this->_instructions = apply_filters('FHEE__EE_SPCO_Reg_Step__set_instructions__instructions', $instructions, $this);
 	}
 
 
@@ -322,7 +322,7 @@ 
 	/**
 	 * @param array $valid_data
 	 */
-	public function set_valid_data( $valid_data ) {
+	public function set_valid_data($valid_data) {
 		$this->_valid_data = $valid_data;
 	}
 
@@ -332,7 +332,7 @@ 
 	 * @return array
 	 */
 	public function valid_data() {
-		if ( empty( $this->_valid_data )) {
+		if (empty($this->_valid_data)) {
 			$this->_valid_data = $this->reg_form->valid_data();
 		}
 		return $this->_valid_data;
@@ -343,8 +343,8 @@ 
 	 * @return string
 	 */
 	public function reg_form_name() {
-		if ( empty( $this->_reg_form_name )) {
-			$this->set_reg_form_name( 'ee-spco-' . $this->slug() . '-reg-step-form' );
+		if (empty($this->_reg_form_name)) {
+			$this->set_reg_form_name('ee-spco-'.$this->slug().'-reg-step-form');
 		}
 		return $this->_reg_form_name;
 	}
@@ -354,7 +354,7 @@ 
 	/**
 	 * @param string $reg_form_name
 	 */
-	protected function set_reg_form_name( $reg_form_name ) {
+	protected function set_reg_form_name($reg_form_name) {
 		$this->_reg_form_name = $reg_form_name;
 	}
 
@@ -365,22 +365,22 @@ 
 	 * @param string $action
 	 * @return string
 	 */
-	public function reg_step_url( $action = '' ) {
-		$query_args = array( 'step' => $this->slug() );
-		if( ! empty( $action )) {
+	public function reg_step_url($action = '') {
+		$query_args = array('step' => $this->slug());
+		if ( ! empty($action)) {
 			$query_args['action'] = $action;
 		}
 		// final step has no display
-		if ( $this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action === 'display_spco_reg_step' ) {
-			$query_args[ 'action' ] = 'process_reg_step';
+		if ($this instanceof EE_SPCO_Reg_Step_Finalize_Registration && $action === 'display_spco_reg_step') {
+			$query_args['action'] = 'process_reg_step';
 		}
-		if( $this->checkout->revisit ) {
+		if ($this->checkout->revisit) {
 			$query_args['revisit'] = TRUE;
 		}
-		if( $this->checkout->reg_url_link ) {
+		if ($this->checkout->reg_url_link) {
 			$query_args['e_reg_url_link'] = $this->checkout->reg_url_link;
 		}
-		return add_query_arg( $query_args, $this->checkout->reg_page_base_url );
+		return add_query_arg($query_args, $this->checkout->reg_page_base_url);
 	}
 
 
@@ -393,16 +393,16 @@ 
      */
 	public function reg_step_hidden_inputs() {
 		// hidden inputs for admin registrations
-		if ( $this->checkout->admin_request ) {
+		if ($this->checkout->admin_request) {
 			return new EE_Form_Section_Proper(
 				array(
 					'layout_strategy' 	=> new EE_Div_Per_Section_Layout(),
-					'html_id' 					=> 'ee-' . $this->slug() . '-hidden-inputs',
+					'html_id' 					=> 'ee-'.$this->slug().'-hidden-inputs',
 					'subsections' 			=> array(
 						'next_step' 			=> new EE_Fixed_Hidden_Input(
 							array(
 								'html_name' 	=> 'next_step',
-								'html_id' 			=> 'spco-' . $this->slug() . '-next-step',
+								'html_id' 			=> 'spco-'.$this->slug().'-next-step',
 								'default' 			=> $this->checkout->next_step instanceof EE_SPCO_Reg_Step ? $this->checkout->next_step->slug() : ''
 							)
 						)
@@ -414,19 +414,19 @@ 
 			return new EE_Form_Section_Proper(
 				array(
 					'layout_strategy' 	=> new EE_Div_Per_Section_Layout(),
-					'html_id' 					=> 'ee-' . $this->slug() . '-hidden-inputs',
+					'html_id' 					=> 'ee-'.$this->slug().'-hidden-inputs',
 					'subsections' 			=> array(
 						'action' 				=> new EE_Fixed_Hidden_Input(
 								array(
 									'html_name' 	=> 'action',
-									'html_id' 			=> 'spco-' . $this->slug() . '-action',
-									'default' 			=> empty( $this->checkout->reg_url_link ) ? 'process_reg_step' : 'update_reg_step'
+									'html_id' 			=> 'spco-'.$this->slug().'-action',
+									'default' 			=> empty($this->checkout->reg_url_link) ? 'process_reg_step' : 'update_reg_step'
 								)
 							),
 						'next_step' 			=> new EE_Fixed_Hidden_Input(
 								array(
 									'html_name' 	=> 'next_step',
-									'html_id' 			=> 'spco-' . $this->slug() . '-next-step',
+									'html_id' 			=> 'spco-'.$this->slug().'-next-step',
 									'default' 			=> $this->checkout->next_step instanceof EE_SPCO_Reg_Step ? $this->checkout->next_step->slug() : ''
 								)
 							),
@@ -458,9 +458,9 @@ 
 	 * @param array $actions
 	 * @return void
 	 */
-	public function generate_reg_form_for_actions( $actions = array() ) {
-		$actions = array_merge( array( 'generate_reg_form', 'display_spco_reg_step', 'process_reg_step', 'update_reg_step' ), $actions );
-		$this->checkout->generate_reg_form = in_array( $this->checkout->action, $actions ) ? TRUE : FALSE;
+	public function generate_reg_form_for_actions($actions = array()) {
+		$actions = array_merge(array('generate_reg_form', 'display_spco_reg_step', 'process_reg_step', 'update_reg_step'), $actions);
+		$this->checkout->generate_reg_form = in_array($this->checkout->action, $actions) ? TRUE : FALSE;
 	}
 
 
@@ -471,11 +471,11 @@ 
      */
 	public function display_reg_form() {
 		$html = '';
-		if ( $this->reg_form instanceof EE_Form_Section_Proper ) {
-			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_open( $this->reg_step_url() ) : '';
-			if ( EE_Registry::instance()->REQ->ajax ) {
+		if ($this->reg_form instanceof EE_Form_Section_Proper) {
+			$html .= ! $this->checkout->admin_request ? $this->reg_form->form_open($this->reg_step_url()) : '';
+			if (EE_Registry::instance()->REQ->ajax) {
 				$this->reg_form->localize_validation_rules();
-				$this->checkout->json_response->add_validation_rules( EE_Form_Section_Proper::js_localization() );
+				$this->checkout->json_response->add_validation_rules(EE_Form_Section_Proper::js_localization());
 			}
             $html .= $this->reg_form->get_html();
             $html .= ! $this->checkout->admin_request ? $this->reg_step_submit_button() : '';
@@ -493,25 +493,25 @@ 
      * @throws \EE_Error
      */
 	public function reg_step_submit_button() {
-		if ( ! $this->checkout->next_step instanceof EE_SPCO_Reg_Step ) {
+		if ( ! $this->checkout->next_step instanceof EE_SPCO_Reg_Step) {
 			return '';
 		}
 		ob_start();
-		do_action( 'AHEE__before_spco_whats_next_buttons', $this->slug(), $this->checkout->next_step->slug(), $this->checkout );
+		do_action('AHEE__before_spco_whats_next_buttons', $this->slug(), $this->checkout->next_step->slug(), $this->checkout);
 		$html = ob_get_clean();
 		// generate submit button
-		$sbmt_btn = new EE_Submit_Input( array(
-			'html_name' 					=> 'spco-go-to-step-' . $this->checkout->next_step->slug(),
-			'html_id' 							=> 'spco-go-to-step-' . $this->checkout->next_step->slug(),
+		$sbmt_btn = new EE_Submit_Input(array(
+			'html_name' 					=> 'spco-go-to-step-'.$this->checkout->next_step->slug(),
+			'html_id' 							=> 'spco-go-to-step-'.$this->checkout->next_step->slug(),
 			'html_class' 					=> 'spco-next-step-btn',
-			'other_html_attributes' 	=> ' rel="' . $this->slug() . '"',
+			'other_html_attributes' 	=> ' rel="'.$this->slug().'"',
 			'default'							=> $this->submit_button_text()
 		));
-		$sbmt_btn->set_button_css_attributes( TRUE, 'large' );
+		$sbmt_btn->set_button_css_attributes(TRUE, 'large');
 		$sbmt_btn_html = $sbmt_btn->get_html_for_input();
 		$html .= EEH_HTML::div(
-			apply_filters( 'FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $sbmt_btn_html, $this ),
-			'spco-' . $this->slug() . '-whats-next-buttons-dv',
+			apply_filters('FHEE__EE_SPCO_Reg_Step__reg_step_submit_button__sbmt_btn_html', $sbmt_btn_html, $this),
+			'spco-'.$this->slug().'-whats-next-buttons-dv',
 			'spco-whats-next-buttons'
 		);
 		return $html;
@@ -534,7 +534,7 @@ 
 	 * @return string
 	 */
 	public function edit_lnk_url() {
-		return 	add_query_arg( array( 'step' => $this->slug() ), $this->checkout->reg_page_base_url );
+		return 	add_query_arg(array('step' => $this->slug()), $this->checkout->reg_page_base_url);
 
 	}
 
@@ -558,7 +558,7 @@ 
      */
 	public function update_checkout() {
 		// grab the cart grand total and reset TXN total
-		$this->checkout->transaction->set_total( $this->checkout->cart->get_cart_grand_total() );
+		$this->checkout->transaction->set_total($this->checkout->cart->get_cart_grand_total());
 		$this->checkout->stash_transaction_and_checkout();
 	}
 
@@ -573,7 +573,7 @@ 
 	 */
 	public function __sleep() {
 		// remove the reg form and the checkout
-		return array_diff( array_keys( get_object_vars( $this )), array( 'reg_form', 'checkout' ));
+		return array_diff(array_keys(get_object_vars($this)), array('reg_form', 'checkout'));
 	}
 }
 

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