eventespresso / event-espresso-core

admin_pages/venues/help_tabs/venues_overview_table_column_headings.help_tab.php

Indentation +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@ 
 <li>
 <strong><?php esc_html_e('ID', 'event_espresso'); ?></strong><br />
 <?php printf(
-    esc_html__('This is the numerical ID for a venue. This value is used internally for %s.', 'event_espresso'),
-    Domain::brandName()
+	esc_html__('This is the numerical ID for a venue. This value is used internally for %s.', 'event_espresso'),
+	Domain::brandName()
 ); ?>
 </li>
 <li>
@@ -25,8 +25,8 @@ 
 <li>
 <strong><?php esc_html_e('Capacity', 'event_espresso'); ?></strong><br />
 <?php printf(
-    esc_html__('This is the capacity of the venue. If no limit is set, then the capacity will be set to infinity (%s).', 'event_espresso'),
-    '&#8734'
+	esc_html__('This is the capacity of the venue. If no limit is set, then the capacity will be set to infinity (%s).', 'event_espresso'),
+	'&#8734'
 ); ?>
 </li>
 </ul>

admin_pages/registrations/help_tabs/registrations_event_checkin_table_column_headings.help_tab.php

Indentation +7 added lines, -7 removed lines

@@ -3,13 +3,13 @@
 <li>
 <strong><?php esc_html_e('Check-In', 'event_espresso'); ?></strong><br />
 <?php printf(
-    esc_html__(
-        'Shows the Check-In status for an registrant. Available statuses are checked in %1$s, checked out %2$s, or no check-in record is available %3$s.',
-        'event_espresso'
-    ),
-    '<span class="ee-icon ee-icon-check-in"></span>',
-    '<span class="ee-icon ee-icon-check-out"></span>',
-    '<span class="dashicons dashicons-no"></span>'
+	esc_html__(
+		'Shows the Check-In status for an registrant. Available statuses are checked in %1$s, checked out %2$s, or no check-in record is available %3$s.',
+		'event_espresso'
+	),
+	'<span class="ee-icon ee-icon-check-in"></span>',
+	'<span class="ee-icon ee-icon-check-out"></span>',
+	'<span class="dashicons dashicons-no"></span>'
 ); ?>
 </li>
 <li>

admin_pages/registrations/help_tabs/registrations_overview_table_column_headings.help_tab.php

Indentation +13 added lines, -13 removed lines

@@ -6,11 +6,11 @@ 
 <li>
 <strong><?php esc_html_e('ID', 'event_espresso'); ?></strong><br />
 <?php printf(
-    esc_html__(
-        'The is the numerical ID of an registration. This value is used internally for %s.',
-        'event_espresso'
-    ),
-    Domain::brandName()
+	esc_html__(
+		'The is the numerical ID of an registration. This value is used internally for %s.',
+		'event_espresso'
+	),
+	Domain::brandName()
 ); ?>
 </li>
 <li>
@@ -40,14 +40,14 @@ 
 <li>
 <strong><?php esc_html_e('Actions', 'event_espresso'); ?></strong><br />
 <?php printf(
-    esc_html__(
-        'Using the action buttons you can View Registration Details %1$s, Edit Contact Details %2$s, Resend Registration Details %3$s, and View Transaction Details %4$s.',
-        'event_espresso'
-    ),
-    '<span class="dashicons dashicons-search"></span>',
-    '<span class="dashicons dashicons-businessman"></span>',
-    '<span class="ee-icon ee-icon-email-send"></span>',
-    '<span class="ee-icon ee-icon-cash"></span>'
+	esc_html__(
+		'Using the action buttons you can View Registration Details %1$s, Edit Contact Details %2$s, Resend Registration Details %3$s, and View Transaction Details %4$s.',
+		'event_espresso'
+	),
+	'<span class="dashicons dashicons-search"></span>',
+	'<span class="dashicons dashicons-businessman"></span>',
+	'<span class="ee-icon ee-icon-email-send"></span>',
+	'<span class="ee-icon ee-icon-cash"></span>'
 ); ?>
 </li>
 </ul>
\ No newline at end of file

admin_pages/events/help_tabs/event_editor_save_new_event.help_tab.php

Indentation +6 added lines, -6 removed lines

@@ -4,12 +4,12 @@
 </p>
 <p class="ee-attention">
 <?php printf(
-    esc_html__(
-        'Notice: Due to a %1$scurrent bug in the WordPress core%2$s, your event should always have at least a title or description or excerpt. Saving an event without at least one of these fields filled out with information will result in your event not saving correctly. You will then need to recreate your event by clicking on the Add Event button.',
-        'event_espresso'
-    ),
-    '<a href="https://core.trac.wordpress.org/ticket/17115#comment:15">',
-    '</a>'
+	esc_html__(
+		'Notice: Due to a %1$scurrent bug in the WordPress core%2$s, your event should always have at least a title or description or excerpt. Saving an event without at least one of these fields filled out with information will result in your event not saving correctly. You will then need to recreate your event by clicking on the Add Event button.',
+		'event_espresso'
+	),
+	'<a href="https://core.trac.wordpress.org/ticket/17115#comment:15">',
+	'</a>'
 ); ?>
 </p>
 <ul>

admin_pages/registrations/form_sections/EE_Registration_Custom_Questions_Form.form.php

Indentation +155 added lines, -155 removed lines

@@ -15,173 +15,173 @@
  */
 class EE_Registration_Custom_Questions_Form extends EE_Form_Section_Proper
 {
-    /**
-     *
-     * @var EE_Registration
-     */
-    protected $_registration = null;
+	/**
+	 *
+	 * @var EE_Registration
+	 */
+	protected $_registration = null;
 
-    /**
-     *
-     * @param EE_Registration $reg
-     * @param array $options
-     */
-    public function __construct(EE_Registration $reg, $options = array())
-    {
-        $this->_registration = $reg;
-        if (! isset($options['layout_strategy'])) {
-            $options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
-        }
-        if (! isset($options['html_id'])) {
-            $options['html_id'] = 'reg-admin-attendee-questions-frm';
-        }
-        $this->build_form_from_registration();
-        parent::__construct($options);
-    }
+	/**
+	 *
+	 * @param EE_Registration $reg
+	 * @param array $options
+	 */
+	public function __construct(EE_Registration $reg, $options = array())
+	{
+		$this->_registration = $reg;
+		if (! isset($options['layout_strategy'])) {
+			$options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
+		}
+		if (! isset($options['html_id'])) {
+			$options['html_id'] = 'reg-admin-attendee-questions-frm';
+		}
+		$this->build_form_from_registration();
+		parent::__construct($options);
+	}
 
 
-    /**
-     * Gets the registration object this form is about
-     * @return EE_Registration
-     */
-    public function get_registration()
-    {
-        return $this->_registration;
-    }
+	/**
+	 * Gets the registration object this form is about
+	 * @return EE_Registration
+	 */
+	public function get_registration()
+	{
+		return $this->_registration;
+	}
 
-    public function build_form_from_registration()
-    {
-        $reg = $this->get_registration();
-        if (! $reg instanceof EE_Registration) {
-            throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
-        }
-        // we want to get all their question groups
-        $question_groups = EEM_Question_Group::instance()->get_all(
-            array(
-                array(
-                    'Event_Question_Group.EVT_ID' => $reg->event_ID(),
-                    'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? true : false,
-                    'OR' => array(
-                        'Question.QST_system*blank' =>  '',
-                        'Question.QST_system*null' => array( 'IS_NULL' )
-                    )
-                ),
-                'order_by' => array( 'QSG_order' => 'ASC' )
-            )
-        );
-        // get each question groups questions
-        foreach ($question_groups as $question_group) {
-            if ($question_group instanceof EE_Question_Group) {
-                $this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
-                    $question_group,
-                    $reg
-                );
-            }
-        }
-    }
+	public function build_form_from_registration()
+	{
+		$reg = $this->get_registration();
+		if (! $reg instanceof EE_Registration) {
+			throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
+		}
+		// we want to get all their question groups
+		$question_groups = EEM_Question_Group::instance()->get_all(
+			array(
+				array(
+					'Event_Question_Group.EVT_ID' => $reg->event_ID(),
+					'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? true : false,
+					'OR' => array(
+						'Question.QST_system*blank' =>  '',
+						'Question.QST_system*null' => array( 'IS_NULL' )
+					)
+				),
+				'order_by' => array( 'QSG_order' => 'ASC' )
+			)
+		);
+		// get each question groups questions
+		foreach ($question_groups as $question_group) {
+			if ($question_group instanceof EE_Question_Group) {
+				$this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
+					$question_group,
+					$reg
+				);
+			}
+		}
+	}
 
 
 
-    /**
-     *
-     * @param EE_Question_Group $question_group
-     * @param EE_Registration   $registration
-     * @return \EE_Form_Section_Proper
-     * @throws \EE_Error
-     */
-    public function build_subform_from_question_group($question_group, $registration)
-    {
-        if (! $question_group instanceof EE_Question_Group ||
-            ! $registration instanceof EE_Registration) {
-            throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
-        }
-        $parts_of_subsection = array(
-            'title' => new EE_Form_Section_HTML(
-                EEH_HTML::h5(
-                    $question_group->name(),
-                    $question_group->identifier(),
-                    'espresso-question-group-title-h5 section-title'
-                )
-            )
-        );
-        $questions = $question_group->questions(
-            array(
-                array(
-                    'OR' => array(
-                        'QST_system*blank' => '',
-                        'QST_system*null' => array( 'IS_NULL' )
-                    )
-                )
-            )
-        );
-        foreach ($questions as $question) {
-            $parts_of_subsection[ $question->ID() ] = $question->generate_form_input($registration);
-        }
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_registration',
-            'edit-reg-questions-mbox',
-            $this->_registration->ID()
-        )) {
-            $parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
-                EEH_HTML::table(
-                    EEH_HTML::tr(
-                        '<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="' . esc_attr__('click to edit question', 'event_espresso') . '">
+	/**
+	 *
+	 * @param EE_Question_Group $question_group
+	 * @param EE_Registration   $registration
+	 * @return \EE_Form_Section_Proper
+	 * @throws \EE_Error
+	 */
+	public function build_subform_from_question_group($question_group, $registration)
+	{
+		if (! $question_group instanceof EE_Question_Group ||
+			! $registration instanceof EE_Registration) {
+			throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
+		}
+		$parts_of_subsection = array(
+			'title' => new EE_Form_Section_HTML(
+				EEH_HTML::h5(
+					$question_group->name(),
+					$question_group->identifier(),
+					'espresso-question-group-title-h5 section-title'
+				)
+			)
+		);
+		$questions = $question_group->questions(
+			array(
+				array(
+					'OR' => array(
+						'QST_system*blank' => '',
+						'QST_system*null' => array( 'IS_NULL' )
+					)
+				)
+			)
+		);
+		foreach ($questions as $question) {
+			$parts_of_subsection[ $question->ID() ] = $question->generate_form_input($registration);
+		}
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_registration',
+			'edit-reg-questions-mbox',
+			$this->_registration->ID()
+		)) {
+			$parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
+				EEH_HTML::table(
+					EEH_HTML::tr(
+						'<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="' . esc_attr__('click to edit question', 'event_espresso') . '">
 		  			<span class="reg-admin-edit-question-group-spn">' . __('edit the above question group', 'event_espresso') . '</span>
 		  			<div class="dashicons dashicons-edit"></div>
 		  		</a></td>'
-                    ) .
-                    EEH_HTML::no_row('', 2)
-                )
-            );
-        }
-        return new EE_Form_Section_Proper(
-            array(
-                'subsections' => $parts_of_subsection,
-                'html_class' => 'question-group-questions',
-            )
-        );
-    }
+					) .
+					EEH_HTML::no_row('', 2)
+				)
+			);
+		}
+		return new EE_Form_Section_Proper(
+			array(
+				'subsections' => $parts_of_subsection,
+				'html_class' => 'question-group-questions',
+			)
+		);
+	}
 
-    /**
-     * Overrides parent so if inputs were disabled, we leave those with their defaults
-     * from the answers in the DB
-     * @param array $req_data like $_POST
-     * @return void
-     */
-    protected function _normalize($req_data)
-    {
-        $this->_received_submission = true;
-        $this->_validation_errors = array();
-        foreach ($this->get_validatable_subsections() as $subsection) {
-            if ($subsection->form_data_present_in($req_data)) {
-                try {
-                    $subsection->_normalize($req_data);
-                } catch (EE_Validation_Error $e) {
-                    $subsection->add_validation_error($e);
-                }
-            }
-        }
-    }
+	/**
+	 * Overrides parent so if inputs were disabled, we leave those with their defaults
+	 * from the answers in the DB
+	 * @param array $req_data like $_POST
+	 * @return void
+	 */
+	protected function _normalize($req_data)
+	{
+		$this->_received_submission = true;
+		$this->_validation_errors = array();
+		foreach ($this->get_validatable_subsections() as $subsection) {
+			if ($subsection->form_data_present_in($req_data)) {
+				try {
+					$subsection->_normalize($req_data);
+				} catch (EE_Validation_Error $e) {
+					$subsection->add_validation_error($e);
+				}
+			}
+		}
+	}
 
 
 
-    /**
-     * Performs validation on this form section and its subsections. For each subsection,
-     * calls _validate_{subsection_name} on THIS form (if the function exists) and passes it the subsection, then calls _validate on that subsection.
-     * If you need to perform validation on the form as a whole (considering multiple) you would be best to override this _validate method,
-     * calling parent::_validate() first.
-     */
-    protected function _validate()
-    {
-        foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
-            if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) {
-                if (method_exists($this, '_validate_'.$subsection_name)) {
-                    call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
-                }
-                $subsection->_validate();
-            } elseif ($subsection instanceof EE_Form_Section_Proper) {
-                $subsection->_received_submission = true;
-            }
-        }
-    }
+	/**
+	 * Performs validation on this form section and its subsections. For each subsection,
+	 * calls _validate_{subsection_name} on THIS form (if the function exists) and passes it the subsection, then calls _validate on that subsection.
+	 * If you need to perform validation on the form as a whole (considering multiple) you would be best to override this _validate method,
+	 * calling parent::_validate() first.
+	 */
+	protected function _validate()
+	{
+		foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
+			if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) {
+				if (method_exists($this, '_validate_'.$subsection_name)) {
+					call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+				}
+				$subsection->_validate();
+			} elseif ($subsection instanceof EE_Form_Section_Proper) {
+				$subsection->_received_submission = true;
+			}
+		}
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -29,10 +29,10 @@ 
     public function __construct(EE_Registration $reg, $options = array())
     {
         $this->_registration = $reg;
-        if (! isset($options['layout_strategy'])) {
+        if ( ! isset($options['layout_strategy'])) {
             $options['layout_strategy'] = new EE_Admin_Two_Column_Layout();
         }
-        if (! isset($options['html_id'])) {
+        if ( ! isset($options['html_id'])) {
             $options['html_id'] = 'reg-admin-attendee-questions-frm';
         }
         $this->build_form_from_registration();
@@ -52,7 +52,7 @@ 
     public function build_form_from_registration()
     {
         $reg = $this->get_registration();
-        if (! $reg instanceof EE_Registration) {
+        if ( ! $reg instanceof EE_Registration) {
             throw new EE_Error(__('We cannot build the registration custom questions form because there is no registration set on it yet', 'event_espresso'));
         }
         // we want to get all their question groups
@@ -63,16 +63,16 @@ 
                     'Event_Question_Group.EQG_primary' => $reg->count() == 1 ? true : false,
                     'OR' => array(
                         'Question.QST_system*blank' =>  '',
-                        'Question.QST_system*null' => array( 'IS_NULL' )
+                        'Question.QST_system*null' => array('IS_NULL')
                     )
                 ),
-                'order_by' => array( 'QSG_order' => 'ASC' )
+                'order_by' => array('QSG_order' => 'ASC')
             )
         );
         // get each question groups questions
         foreach ($question_groups as $question_group) {
             if ($question_group instanceof EE_Question_Group) {
-                $this->_subsections[ $question_group->ID() ] = $this->build_subform_from_question_group(
+                $this->_subsections[$question_group->ID()] = $this->build_subform_from_question_group(
                     $question_group,
                     $reg
                 );
@@ -91,7 +91,7 @@ 
      */
     public function build_subform_from_question_group($question_group, $registration)
     {
-        if (! $question_group instanceof EE_Question_Group ||
+        if ( ! $question_group instanceof EE_Question_Group ||
             ! $registration instanceof EE_Registration) {
             throw new EE_Error(__('A valid question group and registration must be passed to EE_Registration_Custom_Question_Form', 'event_espresso'));
         }
@@ -109,13 +109,13 @@ 
                 array(
                     'OR' => array(
                         'QST_system*blank' => '',
-                        'QST_system*null' => array( 'IS_NULL' )
+                        'QST_system*null' => array('IS_NULL')
                     )
                 )
             )
         );
         foreach ($questions as $question) {
-            $parts_of_subsection[ $question->ID() ] = $question->generate_form_input($registration);
+            $parts_of_subsection[$question->ID()] = $question->generate_form_input($registration);
         }
         if (EE_Registry::instance()->CAP->current_user_can(
             'ee_edit_registration',
@@ -125,11 +125,11 @@ 
             $parts_of_subsection['edit_link'] = new EE_Form_Section_HTML(
                 EEH_HTML::table(
                     EEH_HTML::tr(
-                        '<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="' . esc_attr__('click to edit question', 'event_espresso') . '">
-		  			<span class="reg-admin-edit-question-group-spn">' . __('edit the above question group', 'event_espresso') . '</span>
+                        '<th/><td class="reg-admin-edit-attendee-question-td"><a class="reg-admin-edit-attendee-question-lnk" href="#" aria-label="'.esc_attr__('click to edit question', 'event_espresso').'">
+		  			<span class="reg-admin-edit-question-group-spn">' . __('edit the above question group', 'event_espresso').'</span>
 		  			<div class="dashicons dashicons-edit"></div>
 		  		</a></td>'
-                    ) .
+                    ).
                     EEH_HTML::no_row('', 2)
                 )
             );
@@ -176,7 +176,7 @@ 
         foreach ($this->get_validatable_subsections() as $subsection_name => $subsection) {
             if ($subsection->form_data_present_in(array_merge($_GET, $_POST))) {
                 if (method_exists($this, '_validate_'.$subsection_name)) {
-                    call_user_func_array(array($this,'_validate_'.$subsection_name), array($subsection));
+                    call_user_func_array(array($this, '_validate_'.$subsection_name), array($subsection));
                 }
                 $subsection->_validate();
             } elseif ($subsection instanceof EE_Form_Section_Proper) {

core/libraries/form_sections/form_handlers/SequentialStepFormManager.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use EE_Error;
 use EE_Request;
-use EventEspresso\core\exceptions\ExceptionStackTraceDisplay;
 use EventEspresso\core\exceptions\InvalidClassException;
 use EventEspresso\core\exceptions\InvalidDataTypeException;
 use EventEspresso\core\exceptions\InvalidEntityException;

Indentation +580 added lines, -580 removed lines

@@ -29,584 +29,584 @@
 abstract class SequentialStepFormManager
 {
 
-    /**
-     * a simplified URL with no form related parameters
-     * that will be used to build the form's redirect URLs
-     *
-     * @var string $base_url
-     */
-    private $base_url = '';
-
-    /**
-     * the key used for the URL param that denotes the current form step
-     * defaults to 'ee-form-step'
-     *
-     * @var string $form_step_url_key
-     */
-    private $form_step_url_key = '';
-
-    /**
-     * @var string $default_form_step
-     */
-    private $default_form_step = '';
-
-    /**
-     * @var string $form_action
-     */
-    private $form_action;
-
-    /**
-     * value of one of the string constant above
-     *
-     * @var string $form_config
-     */
-    private $form_config;
-
-    /**
-     * @var string $progress_step_style
-     */
-    private $progress_step_style = '';
-
-    /**
-     * @var EE_Request $request
-     */
-    private $request;
-
-    /**
-     * @var Collection $form_steps
-     */
-    protected $form_steps;
-
-    /**
-     * @var ProgressStepManager $progress_step_manager
-     */
-    protected $progress_step_manager;
-
-
-    /**
-     * @return Collection|null
-     */
-    abstract protected function getFormStepsCollection();
-
-    // phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
-    /**
-     * StepsManager constructor
-     *
-     * @param string     $base_url
-     * @param string     $default_form_step
-     * @param string     $form_action
-     * @param string     $form_config
-     * @param EE_Request $request
-     * @param string     $progress_step_style
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    public function __construct(
-        $base_url,
-        $default_form_step,
-        $form_action = '',
-        $form_config = FormHandler::ADD_FORM_TAGS_AND_SUBMIT,
-        $progress_step_style = 'number_bubbles',
-        EE_Request $request
-    ) {
-        $this->setBaseUrl($base_url);
-        $this->setDefaultFormStep($default_form_step);
-        $this->setFormAction($form_action);
-        $this->setFormConfig($form_config);
-        $this->setProgressStepStyle($progress_step_style);
-        $this->request = $request;
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function baseUrl()
-    {
-        if (strpos($this->base_url, $this->getCurrentStep()->slug()) === false) {
-            add_query_arg(
-                array($this->form_step_url_key => $this->getCurrentStep()->slug()),
-                $this->base_url
-            );
-        }
-        return $this->base_url;
-    }
-
-
-    /**
-     * @param string $base_url
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    protected function setBaseUrl($base_url)
-    {
-        if (! is_string($base_url)) {
-            throw new InvalidDataTypeException('$base_url', $base_url, 'string');
-        }
-        if (empty($base_url)) {
-            throw new InvalidArgumentException(
-                esc_html__('The base URL can not be an empty string.', 'event_espresso')
-            );
-        }
-        $this->base_url = $base_url;
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidDataTypeException
-     */
-    public function formStepUrlKey()
-    {
-        if (empty($this->form_step_url_key)) {
-            $this->setFormStepUrlKey();
-        }
-        return $this->form_step_url_key;
-    }
-
-
-    /**
-     * @param string $form_step_url_key
-     * @throws InvalidDataTypeException
-     */
-    public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
-    {
-        if (! is_string($form_step_url_key)) {
-            throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
-        }
-        $this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function defaultFormStep()
-    {
-        return $this->default_form_step;
-    }
-
-
-    /**
-     * @param $default_form_step
-     * @throws InvalidDataTypeException
-     */
-    protected function setDefaultFormStep($default_form_step)
-    {
-        if (! is_string($default_form_step)) {
-            throw new InvalidDataTypeException('$default_form_step', $default_form_step, 'string');
-        }
-        $this->default_form_step = $default_form_step;
-    }
-
-
-    /**
-     * @return void
-     * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
-     * @throws InvalidDataTypeException
-     */
-    protected function setCurrentStepFromRequest()
-    {
-        $current_step_slug = $this->request()->get($this->formStepUrlKey(), $this->defaultFormStep());
-        if (! $this->form_steps->setCurrent($current_step_slug)) {
-            throw new InvalidIdentifierException(
-                $current_step_slug,
-                $this->defaultFormStep(),
-                $message = sprintf(
-                    esc_html__(
-                        'The "%1$s" form step could not be set.',
-                        'event_espresso'
-                    ),
-                    $current_step_slug
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @return object|SequentialStepFormInterface
-     * @throws InvalidFormHandlerException
-     */
-    public function getCurrentStep()
-    {
-        if (! $this->form_steps->current() instanceof SequentialStepForm) {
-            throw new InvalidFormHandlerException($this->form_steps->current());
-        }
-        return $this->form_steps->current();
-    }
-
-
-    /**
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function formAction()
-    {
-        if (! is_string($this->form_action) || empty($this->form_action)) {
-            $this->form_action = $this->baseUrl();
-        }
-        return $this->form_action;
-    }
-
-
-    /**
-     * @param string $form_action
-     * @throws InvalidDataTypeException
-     */
-    public function setFormAction($form_action)
-    {
-        if (! is_string($form_action)) {
-            throw new InvalidDataTypeException('$form_action', $form_action, 'string');
-        }
-        $this->form_action = $form_action;
-    }
-
-
-    /**
-     * @param array $form_action_args
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormHandlerException
-     */
-    public function addFormActionArgs($form_action_args = array())
-    {
-        if (! is_array($form_action_args)) {
-            throw new InvalidDataTypeException('$form_action_args', $form_action_args, 'array');
-        }
-        $form_action_args = ! empty($form_action_args)
-            ? $form_action_args
-            : array($this->formStepUrlKey() => $this->form_steps->current()->slug());
-        $this->getCurrentStep()->setFormAction(
-            add_query_arg($form_action_args, $this->formAction())
-        );
-        $this->form_action = $this->getCurrentStep()->formAction();
-    }
-
-
-    /**
-     * @return string
-     */
-    public function formConfig()
-    {
-        return $this->form_config;
-    }
-
-
-    /**
-     * @param string $form_config
-     */
-    public function setFormConfig($form_config)
-    {
-        $this->form_config = $form_config;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function progressStepStyle()
-    {
-        return $this->progress_step_style;
-    }
-
-
-    /**
-     * @param string $progress_step_style
-     */
-    public function setProgressStepStyle($progress_step_style)
-    {
-        $this->progress_step_style = $progress_step_style;
-    }
-
-
-    /**
-     * @return EE_Request
-     */
-    public function request()
-    {
-        return $this->request;
-    }
-
-
-    /**
-     * @return Collection|null
-     * @throws InvalidInterfaceException
-     */
-    protected function getProgressStepsCollection()
-    {
-        static $collection = null;
-        if (! $collection instanceof ProgressStepCollection) {
-            $collection = new ProgressStepCollection();
-        }
-        return $collection;
-    }
-
-
-    /**
-     * @param Collection $progress_steps_collection
-     * @return ProgressStepManager
-     * @throws InvalidInterfaceException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFormHandlerException
-     */
-    protected function generateProgressSteps(Collection $progress_steps_collection)
-    {
-        $current_step = $this->getCurrentStep();
-        /** @var SequentialStepForm $form_step */
-        foreach ($this->form_steps as $form_step) {
-            // is this step active ?
-            if (! $form_step->initialize()) {
-                continue;
-            }
-            $progress_steps_collection->add(
-                new ProgressStep(
-                    $form_step->order(),
-                    $form_step->slug(),
-                    $form_step->slug(),
-                    $form_step->formName()
-                ),
-                $form_step->slug()
-            );
-        }
-        // set collection pointer back to current step
-        $this->form_steps->setCurrentUsingObject($current_step);
-        return new ProgressStepManager(
-            $this->progressStepStyle(),
-            $this->defaultFormStep(),
-            $this->formStepUrlKey(),
-            $progress_steps_collection
-        );
-    }
-
-
-    /**
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws InvalidFormHandlerException
-     */
-    public function buildForm()
-    {
-        $this->buildCurrentStepFormForDisplay();
-    }
-
-
-    /**
-     * @param array $form_data
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFormHandlerException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     */
-    public function processForm($form_data = array())
-    {
-        $this->buildCurrentStepFormForProcessing();
-        $this->processCurrentStepForm($form_data);
-    }
-
-
-    /**
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws InvalidIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidFormHandlerException
-     */
-    public function buildCurrentStepFormForDisplay()
-    {
-        $form_step = $this->buildCurrentStepForm();
-        // no displayable content ? then skip straight to processing
-        if (! $form_step->displayable()) {
-            $this->addFormActionArgs();
-            $form_step->setFormAction($this->formAction());
-            wp_safe_redirect($form_step->formAction());
-        }
-    }
-
-
-    /**
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidInterfaceException
-     * @throws InvalidIdentifierException
-     * @throws InvalidArgumentException
-     * @throws InvalidFormHandlerException
-     */
-    public function buildCurrentStepFormForProcessing()
-    {
-        $this->buildCurrentStepForm(false);
-    }
-
-
-    /**
-     * @param bool $for_display
-     * @return SequentialStepFormInterface
-     * @throws InvalidArgumentException
-     * @throws InvalidClassException
-     * @throws InvalidDataTypeException
-     * @throws InvalidEntityException
-     * @throws InvalidFormHandlerException
-     * @throws InvalidIdentifierException
-     * @throws InvalidInterfaceException
-     */
-    private function buildCurrentStepForm($for_display = true)
-    {
-        $this->form_steps = $this->getFormStepsCollection();
-        $this->setCurrentStepFromRequest();
-        $form_step = $this->getCurrentStep();
-        if ($form_step->submitBtnText() === esc_html__('Submit', 'event_espresso')) {
-            $form_step->setSubmitBtnText(esc_html__('Next Step', 'event_espresso'));
-        }
-        if ($for_display && $form_step->displayable()) {
-            $this->progress_step_manager = $this->generateProgressSteps(
-                $this->getProgressStepsCollection()
-            );
-            $this->progress_step_manager->setCurrentStep(
-                $form_step->slug()
-            );
-            // mark all previous progress steps as completed
-            $this->progress_step_manager->setPreviousStepsCompleted();
-            $this->progress_step_manager->enqueueStylesAndScripts();
-            $this->addFormActionArgs();
-            $form_step->setFormAction($this->formAction());
-        } else {
-            $form_step->setRedirectUrl($this->baseUrl());
-            $form_step->addRedirectArgs(
-                array($this->formStepUrlKey() => $this->form_steps->current()->slug())
-            );
-        }
-        $form_step->generate();
-        if ($for_display) {
-            $form_step->enqueueStylesAndScripts();
-        }
-        return $form_step;
-    }
-
-
-    /**
-     * @param bool $return_as_string
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function displayProgressSteps($return_as_string = true)
-    {
-        $form_step = $this->getCurrentStep();
-        if (! $form_step->displayable()) {
-            return '';
-        }
-        $progress_steps = apply_filters(
-            'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__before_steps',
-            ''
-        );
-        $progress_steps .= $this->progress_step_manager->displaySteps();
-        $progress_steps .= apply_filters(
-            'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__after_steps',
-            ''
-        );
-        if ($return_as_string) {
-            return $progress_steps;
-        }
-        echo $progress_steps;
-        return '';
-    }
-
-
-    /**
-     * @param bool $return_as_string
-     * @return string
-     * @throws InvalidFormHandlerException
-     */
-    public function displayCurrentStepForm($return_as_string = true)
-    {
-        if ($return_as_string) {
-            return $this->getCurrentStep()->display();
-        }
-        echo $this->getCurrentStep()->display();
-        return '';
-    }
-
-
-    /**
-     * @param array $form_data
-     * @return void
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormHandlerException
-     */
-    public function processCurrentStepForm($form_data = array())
-    {
-        // grab instance of current step because after calling next() below,
-        // any calls to getCurrentStep() will return the "next" step because we advanced
-        $current_step = $this->getCurrentStep();
-        try {
-            // form processing should either throw exceptions or return true
-            $current_step->process($form_data);
-        } catch (Exception $e) {
-            // something went wrong, convert the Exception to an EE_Error
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            // prevent redirect to next step or other if exception was thrown
-            if ($current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_NEXT_STEP
-                || $current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_OTHER
-            ) {
-                $current_step->setRedirectTo(SequentialStepForm::REDIRECT_TO_CURRENT_STEP);
-            }
-        }
-        // save notices to a transient so that when we redirect back
-        // to the display portion for this step
-        // those notices can be displayed
-        EE_Error::get_notices(false, true);
-        $this->redirectForm($current_step);
-    }
-
-
-    /**
-     * handles where to go to next
-     *
-     * @param SequentialStepFormInterface $current_step
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormHandlerException
-     */
-    public function redirectForm(SequentialStepFormInterface $current_step)
-    {
-        $redirect_step = $current_step;
-        switch ($current_step->redirectTo()) {
-            case SequentialStepForm::REDIRECT_TO_OTHER:
-                // going somewhere else, so just check out now
-                wp_safe_redirect($redirect_step->redirectUrl());
-                exit();
-                break;
-            case SequentialStepForm::REDIRECT_TO_PREV_STEP:
-                $redirect_step = $this->form_steps->previous();
-                break;
-            case SequentialStepForm::REDIRECT_TO_NEXT_STEP:
-                $this->form_steps->next();
-                if ($this->form_steps->valid()) {
-                    $redirect_step = $this->form_steps->current();
-                }
-                break;
-            case SequentialStepForm::REDIRECT_TO_CURRENT_STEP:
-            default:
-                // $redirect_step is already set
-        }
-        $current_step->setRedirectUrl($this->baseUrl());
-        $current_step->addRedirectArgs(
-            // use the slug for whatever step we are redirecting too
-            array($this->formStepUrlKey() => $redirect_step->slug())
-        );
-        wp_safe_redirect($current_step->redirectUrl());
-        exit();
-    }
+	/**
+	 * a simplified URL with no form related parameters
+	 * that will be used to build the form's redirect URLs
+	 *
+	 * @var string $base_url
+	 */
+	private $base_url = '';
+
+	/**
+	 * the key used for the URL param that denotes the current form step
+	 * defaults to 'ee-form-step'
+	 *
+	 * @var string $form_step_url_key
+	 */
+	private $form_step_url_key = '';
+
+	/**
+	 * @var string $default_form_step
+	 */
+	private $default_form_step = '';
+
+	/**
+	 * @var string $form_action
+	 */
+	private $form_action;
+
+	/**
+	 * value of one of the string constant above
+	 *
+	 * @var string $form_config
+	 */
+	private $form_config;
+
+	/**
+	 * @var string $progress_step_style
+	 */
+	private $progress_step_style = '';
+
+	/**
+	 * @var EE_Request $request
+	 */
+	private $request;
+
+	/**
+	 * @var Collection $form_steps
+	 */
+	protected $form_steps;
+
+	/**
+	 * @var ProgressStepManager $progress_step_manager
+	 */
+	protected $progress_step_manager;
+
+
+	/**
+	 * @return Collection|null
+	 */
+	abstract protected function getFormStepsCollection();
+
+	// phpcs:disable PEAR.Functions.ValidDefaultValue.NotAtEnd
+	/**
+	 * StepsManager constructor
+	 *
+	 * @param string     $base_url
+	 * @param string     $default_form_step
+	 * @param string     $form_action
+	 * @param string     $form_config
+	 * @param EE_Request $request
+	 * @param string     $progress_step_style
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	public function __construct(
+		$base_url,
+		$default_form_step,
+		$form_action = '',
+		$form_config = FormHandler::ADD_FORM_TAGS_AND_SUBMIT,
+		$progress_step_style = 'number_bubbles',
+		EE_Request $request
+	) {
+		$this->setBaseUrl($base_url);
+		$this->setDefaultFormStep($default_form_step);
+		$this->setFormAction($form_action);
+		$this->setFormConfig($form_config);
+		$this->setProgressStepStyle($progress_step_style);
+		$this->request = $request;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function baseUrl()
+	{
+		if (strpos($this->base_url, $this->getCurrentStep()->slug()) === false) {
+			add_query_arg(
+				array($this->form_step_url_key => $this->getCurrentStep()->slug()),
+				$this->base_url
+			);
+		}
+		return $this->base_url;
+	}
+
+
+	/**
+	 * @param string $base_url
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	protected function setBaseUrl($base_url)
+	{
+		if (! is_string($base_url)) {
+			throw new InvalidDataTypeException('$base_url', $base_url, 'string');
+		}
+		if (empty($base_url)) {
+			throw new InvalidArgumentException(
+				esc_html__('The base URL can not be an empty string.', 'event_espresso')
+			);
+		}
+		$this->base_url = $base_url;
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidDataTypeException
+	 */
+	public function formStepUrlKey()
+	{
+		if (empty($this->form_step_url_key)) {
+			$this->setFormStepUrlKey();
+		}
+		return $this->form_step_url_key;
+	}
+
+
+	/**
+	 * @param string $form_step_url_key
+	 * @throws InvalidDataTypeException
+	 */
+	public function setFormStepUrlKey($form_step_url_key = 'ee-form-step')
+	{
+		if (! is_string($form_step_url_key)) {
+			throw new InvalidDataTypeException('$form_step_key', $form_step_url_key, 'string');
+		}
+		$this->form_step_url_key = ! empty($form_step_url_key) ? $form_step_url_key : 'ee-form-step';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function defaultFormStep()
+	{
+		return $this->default_form_step;
+	}
+
+
+	/**
+	 * @param $default_form_step
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setDefaultFormStep($default_form_step)
+	{
+		if (! is_string($default_form_step)) {
+			throw new InvalidDataTypeException('$default_form_step', $default_form_step, 'string');
+		}
+		$this->default_form_step = $default_form_step;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws \EventEspresso\core\exceptions\InvalidIdentifierException
+	 * @throws InvalidDataTypeException
+	 */
+	protected function setCurrentStepFromRequest()
+	{
+		$current_step_slug = $this->request()->get($this->formStepUrlKey(), $this->defaultFormStep());
+		if (! $this->form_steps->setCurrent($current_step_slug)) {
+			throw new InvalidIdentifierException(
+				$current_step_slug,
+				$this->defaultFormStep(),
+				$message = sprintf(
+					esc_html__(
+						'The "%1$s" form step could not be set.',
+						'event_espresso'
+					),
+					$current_step_slug
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @return object|SequentialStepFormInterface
+	 * @throws InvalidFormHandlerException
+	 */
+	public function getCurrentStep()
+	{
+		if (! $this->form_steps->current() instanceof SequentialStepForm) {
+			throw new InvalidFormHandlerException($this->form_steps->current());
+		}
+		return $this->form_steps->current();
+	}
+
+
+	/**
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function formAction()
+	{
+		if (! is_string($this->form_action) || empty($this->form_action)) {
+			$this->form_action = $this->baseUrl();
+		}
+		return $this->form_action;
+	}
+
+
+	/**
+	 * @param string $form_action
+	 * @throws InvalidDataTypeException
+	 */
+	public function setFormAction($form_action)
+	{
+		if (! is_string($form_action)) {
+			throw new InvalidDataTypeException('$form_action', $form_action, 'string');
+		}
+		$this->form_action = $form_action;
+	}
+
+
+	/**
+	 * @param array $form_action_args
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function addFormActionArgs($form_action_args = array())
+	{
+		if (! is_array($form_action_args)) {
+			throw new InvalidDataTypeException('$form_action_args', $form_action_args, 'array');
+		}
+		$form_action_args = ! empty($form_action_args)
+			? $form_action_args
+			: array($this->formStepUrlKey() => $this->form_steps->current()->slug());
+		$this->getCurrentStep()->setFormAction(
+			add_query_arg($form_action_args, $this->formAction())
+		);
+		$this->form_action = $this->getCurrentStep()->formAction();
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function formConfig()
+	{
+		return $this->form_config;
+	}
+
+
+	/**
+	 * @param string $form_config
+	 */
+	public function setFormConfig($form_config)
+	{
+		$this->form_config = $form_config;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function progressStepStyle()
+	{
+		return $this->progress_step_style;
+	}
+
+
+	/**
+	 * @param string $progress_step_style
+	 */
+	public function setProgressStepStyle($progress_step_style)
+	{
+		$this->progress_step_style = $progress_step_style;
+	}
+
+
+	/**
+	 * @return EE_Request
+	 */
+	public function request()
+	{
+		return $this->request;
+	}
+
+
+	/**
+	 * @return Collection|null
+	 * @throws InvalidInterfaceException
+	 */
+	protected function getProgressStepsCollection()
+	{
+		static $collection = null;
+		if (! $collection instanceof ProgressStepCollection) {
+			$collection = new ProgressStepCollection();
+		}
+		return $collection;
+	}
+
+
+	/**
+	 * @param Collection $progress_steps_collection
+	 * @return ProgressStepManager
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFormHandlerException
+	 */
+	protected function generateProgressSteps(Collection $progress_steps_collection)
+	{
+		$current_step = $this->getCurrentStep();
+		/** @var SequentialStepForm $form_step */
+		foreach ($this->form_steps as $form_step) {
+			// is this step active ?
+			if (! $form_step->initialize()) {
+				continue;
+			}
+			$progress_steps_collection->add(
+				new ProgressStep(
+					$form_step->order(),
+					$form_step->slug(),
+					$form_step->slug(),
+					$form_step->formName()
+				),
+				$form_step->slug()
+			);
+		}
+		// set collection pointer back to current step
+		$this->form_steps->setCurrentUsingObject($current_step);
+		return new ProgressStepManager(
+			$this->progressStepStyle(),
+			$this->defaultFormStep(),
+			$this->formStepUrlKey(),
+			$progress_steps_collection
+		);
+	}
+
+
+	/**
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function buildForm()
+	{
+		$this->buildCurrentStepFormForDisplay();
+	}
+
+
+	/**
+	 * @param array $form_data
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFormHandlerException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 */
+	public function processForm($form_data = array())
+	{
+		$this->buildCurrentStepFormForProcessing();
+		$this->processCurrentStepForm($form_data);
+	}
+
+
+	/**
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function buildCurrentStepFormForDisplay()
+	{
+		$form_step = $this->buildCurrentStepForm();
+		// no displayable content ? then skip straight to processing
+		if (! $form_step->displayable()) {
+			$this->addFormActionArgs();
+			$form_step->setFormAction($this->formAction());
+			wp_safe_redirect($form_step->formAction());
+		}
+	}
+
+
+	/**
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function buildCurrentStepFormForProcessing()
+	{
+		$this->buildCurrentStepForm(false);
+	}
+
+
+	/**
+	 * @param bool $for_display
+	 * @return SequentialStepFormInterface
+	 * @throws InvalidArgumentException
+	 * @throws InvalidClassException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidEntityException
+	 * @throws InvalidFormHandlerException
+	 * @throws InvalidIdentifierException
+	 * @throws InvalidInterfaceException
+	 */
+	private function buildCurrentStepForm($for_display = true)
+	{
+		$this->form_steps = $this->getFormStepsCollection();
+		$this->setCurrentStepFromRequest();
+		$form_step = $this->getCurrentStep();
+		if ($form_step->submitBtnText() === esc_html__('Submit', 'event_espresso')) {
+			$form_step->setSubmitBtnText(esc_html__('Next Step', 'event_espresso'));
+		}
+		if ($for_display && $form_step->displayable()) {
+			$this->progress_step_manager = $this->generateProgressSteps(
+				$this->getProgressStepsCollection()
+			);
+			$this->progress_step_manager->setCurrentStep(
+				$form_step->slug()
+			);
+			// mark all previous progress steps as completed
+			$this->progress_step_manager->setPreviousStepsCompleted();
+			$this->progress_step_manager->enqueueStylesAndScripts();
+			$this->addFormActionArgs();
+			$form_step->setFormAction($this->formAction());
+		} else {
+			$form_step->setRedirectUrl($this->baseUrl());
+			$form_step->addRedirectArgs(
+				array($this->formStepUrlKey() => $this->form_steps->current()->slug())
+			);
+		}
+		$form_step->generate();
+		if ($for_display) {
+			$form_step->enqueueStylesAndScripts();
+		}
+		return $form_step;
+	}
+
+
+	/**
+	 * @param bool $return_as_string
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function displayProgressSteps($return_as_string = true)
+	{
+		$form_step = $this->getCurrentStep();
+		if (! $form_step->displayable()) {
+			return '';
+		}
+		$progress_steps = apply_filters(
+			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__before_steps',
+			''
+		);
+		$progress_steps .= $this->progress_step_manager->displaySteps();
+		$progress_steps .= apply_filters(
+			'FHEE__EventEspresso_core_libraries_form_sections_form_handlers_SequentialStepFormManager__displayProgressSteps__after_steps',
+			''
+		);
+		if ($return_as_string) {
+			return $progress_steps;
+		}
+		echo $progress_steps;
+		return '';
+	}
+
+
+	/**
+	 * @param bool $return_as_string
+	 * @return string
+	 * @throws InvalidFormHandlerException
+	 */
+	public function displayCurrentStepForm($return_as_string = true)
+	{
+		if ($return_as_string) {
+			return $this->getCurrentStep()->display();
+		}
+		echo $this->getCurrentStep()->display();
+		return '';
+	}
+
+
+	/**
+	 * @param array $form_data
+	 * @return void
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function processCurrentStepForm($form_data = array())
+	{
+		// grab instance of current step because after calling next() below,
+		// any calls to getCurrentStep() will return the "next" step because we advanced
+		$current_step = $this->getCurrentStep();
+		try {
+			// form processing should either throw exceptions or return true
+			$current_step->process($form_data);
+		} catch (Exception $e) {
+			// something went wrong, convert the Exception to an EE_Error
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			// prevent redirect to next step or other if exception was thrown
+			if ($current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_NEXT_STEP
+				|| $current_step->redirectTo() === SequentialStepForm::REDIRECT_TO_OTHER
+			) {
+				$current_step->setRedirectTo(SequentialStepForm::REDIRECT_TO_CURRENT_STEP);
+			}
+		}
+		// save notices to a transient so that when we redirect back
+		// to the display portion for this step
+		// those notices can be displayed
+		EE_Error::get_notices(false, true);
+		$this->redirectForm($current_step);
+	}
+
+
+	/**
+	 * handles where to go to next
+	 *
+	 * @param SequentialStepFormInterface $current_step
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormHandlerException
+	 */
+	public function redirectForm(SequentialStepFormInterface $current_step)
+	{
+		$redirect_step = $current_step;
+		switch ($current_step->redirectTo()) {
+			case SequentialStepForm::REDIRECT_TO_OTHER:
+				// going somewhere else, so just check out now
+				wp_safe_redirect($redirect_step->redirectUrl());
+				exit();
+				break;
+			case SequentialStepForm::REDIRECT_TO_PREV_STEP:
+				$redirect_step = $this->form_steps->previous();
+				break;
+			case SequentialStepForm::REDIRECT_TO_NEXT_STEP:
+				$this->form_steps->next();
+				if ($this->form_steps->valid()) {
+					$redirect_step = $this->form_steps->current();
+				}
+				break;
+			case SequentialStepForm::REDIRECT_TO_CURRENT_STEP:
+			default:
+				// $redirect_step is already set
+		}
+		$current_step->setRedirectUrl($this->baseUrl());
+		$current_step->addRedirectArgs(
+			// use the slug for whatever step we are redirecting too
+			array($this->formStepUrlKey() => $redirect_step->slug())
+		);
+		wp_safe_redirect($current_step->redirectUrl());
+		exit();
+	}
 }

core/libraries/form_sections/strategies/validation/EE_Credit_Card_Validation_Strategy.strategy.php

Indentation +15 added lines, -15 removed lines

@@ -13,19 +13,19 @@
 class EE_Credit_Card_Validation_Strategy extends EE_Text_Validation_Strategy
 {
 
-    /**
-     * @param null $validation_error_message
-     */
-    public function __construct($validation_error_message = null)
-    {
-        if (! $validation_error_message) {
-            $validation_error_message = __("Please enter a valid credit card number", "event_espresso");
-        }
-        parent::__construct(
-            $validation_error_message,
-            // @codingStandardsIgnoreStart
-            '~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|2[2-7][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~'
-            // @codingStandardsIgnoreEnd
-        );
-    }
+	/**
+	 * @param null $validation_error_message
+	 */
+	public function __construct($validation_error_message = null)
+	{
+		if (! $validation_error_message) {
+			$validation_error_message = __("Please enter a valid credit card number", "event_espresso");
+		}
+		parent::__construct(
+			$validation_error_message,
+			// @codingStandardsIgnoreStart
+			'~^(?:4[0-9]{12}(?:[0-9]{3})?|5[1-5][0-9]{14}|2[2-7][0-9]{14}|6011[0-9]{12}|3(?:0[0-5]|[68][0-9])[0-9]{11}|3[47][0-9]{13})$~'
+			// @codingStandardsIgnoreEnd
+		);
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
      */
     public function __construct($validation_error_message = null)
     {
-        if (! $validation_error_message) {
+        if ( ! $validation_error_message) {
             $validation_error_message = __("Please enter a valid credit card number", "event_espresso");
         }
         parent::__construct(

caffeinated/admin/extend/about/templates/ee4-overview.template.php

Indentation +106 added lines, -106 removed lines

@@ -1,56 +1,56 @@ 
 <div class="headline-feature">
     <h2 class="about-headline-callout"><?php esc_html_e('Welcome to Event Espresso 4!', 'event_espresso'); ?></h2>
     <p><?php
-        echo sprintf(
-            esc_html__(
-                'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.',
-                'event_espresso'
-            ),
-            '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">',
-            '</a>'
-        ); ?></p>
+		echo sprintf(
+			esc_html__(
+				'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Caffeinated/Regular version of Event Espresso, but we also have a hosted version called %sEvent Smart%s for customers that want to cut back on their hosting and security expenses.',
+				'event_espresso'
+			),
+			'<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Caffeinated">',
+			'</a>'
+		); ?></p>
     <h2><?php
-        esc_html_e(
-            'Powering 40,000+ event websites; $100 million in ticket sales per year!',
-            'event_espresso'
-        ); ?></h2>
+		esc_html_e(
+			'Powering 40,000+ event websites; $100 million in ticket sales per year!',
+			'event_espresso'
+		); ?></h2>
     <p><?php
-        echo sprintf(
-            esc_html__(
-                'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.',
-                'event_espresso'
-            ),
-            '<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">',
-            '</a>'
-        ); ?></p>
+		echo sprintf(
+			esc_html__(
+				'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The lite version of the plugin provides everything that you need to manage your event using WordPress.',
+				'event_espresso'
+			),
+			'<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf" rel="nofollow">',
+			'</a>'
+		); ?></p>
 </div>
     <div class="feature-section has-3-columns is-fullwidth three-col">
         <div class="column col">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
             <h3><?php esc_html_e('Optimized aesthetic', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrations-overview.jpg">
             <h3><?php esc_html_e('Integrated management', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/refined-bookkeeping.jpg">
             <h3><?php esc_html_e('Easy bookkeeping', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
+					'event_espresso'
+				); ?></p>
         </div>
     </div>
 
@@ -62,16 +62,16 @@ 
         <div class="column col">
             <h3><?php esc_html_e('Higher customer retention', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
+					'event_espresso'
+				); ?></p>
             <h4><?php esc_html_e('Ticket selection boxes on any post page or post', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature about-colors-img">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrtation-page-large.jpg">
@@ -85,21 +85,21 @@ 
         <div class="column col">
             <h3><?php esc_html_e('Refined event management', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
+					'event_espresso'
+				); ?></p>
             <h4><?php esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
-                    'event_espresso'
-                ); ?>.</p>
+				esc_html_e(
+					'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
+					'event_espresso'
+				); ?>.</p>
             <p><?php
-                esc_html_e(
-                    'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature about-themes-img">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/event-management.jpg">
@@ -109,68 +109,68 @@ 
 <hr>
 
     <h2 class="about-headline-callout"><?php
-        esc_html_e(
-            'People Like You Manage Event Registration with WordPress',
-            'event_espresso'
-        ); ?></h2>
+		esc_html_e(
+			'People Like You Manage Event Registration with WordPress',
+			'event_espresso'
+		); ?></h2>
     <div class="feature-section has-2-columns is-fullwidth two-col">
         <div class="column col">
             <p><?php
-                echo sprintf(
-                    esc_html__(
-                        'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
-                    'event_espresso'
-                ); ?></p>
+				echo sprintf(
+					esc_html__(
+						'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col">
             <p><?php
-                echo sprintf(
-                    esc_html__(
-                        'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
-                    'event_espresso'
-                ); ?></p>
+				echo sprintf(
+					esc_html__(
+						'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
+					'event_espresso'
+				); ?></p>
         </div>
     </div>
 
     <div class="feature-section has-2-columns is-fullwidth two-col">
         <div class="column col">
             <h3><?php
-                esc_html_e(
-                    'Turn your blog into a complete event registration and management system',
-                    'event_espresso'
-                ); ?></h3>
-            <p><?php
-                esc_html_e(
-                    'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
-                    'event_espresso'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
-                    'event_espresso'
-                ); ?></p>
-            <p><?php
-                echo sprintf(
-                    esc_html__('%sLearn more >>%s', 'event_espresso'),
-                    '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
-                    '</a>'
-                ); ?></p>
+				esc_html_e(
+					'Turn your blog into a complete event registration and management system',
+					'event_espresso'
+				); ?></h3>
+            <p><?php
+				esc_html_e(
+					'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
+					'event_espresso'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
+					'event_espresso'
+				); ?></p>
+            <p><?php
+				echo sprintf(
+					esc_html__('%sLearn more >>%s', 'event_espresso'),
+					'<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
+					'</a>'
+				); ?></p>
         </div>
         <div class="column col"><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
     </div>
@@ -183,10 +183,10 @@ 
     <div class="feature-section has-1-column is-fullwidth is-wide one-col">
         <div class="column col">
             <p><?php
-            esc_html_e(
-                'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
-                'event_espresso'
-            ); ?></p>
+			esc_html_e(
+				'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
+				'event_espresso'
+			); ?></p>
             <p><img class="about-overview-img" src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/multiple-themes.jpg"/></p>
         </div>
     </div>

admin_pages/about/templates/ee4-overview.template.php

Indentation +124 added lines, -124 removed lines

@@ -1,24 +1,24 @@ 
 <?php
 // maintenance mode on?
 if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
-    ?>
+	?>
     <div class="ee-attention">
         <h2 class="ee-maintenance-mode-callout">
             <?php esc_html_e(
-                'Event Espresso is in full maintenance mode.',
-                'event_espresso'
-            ); ?></h2>
+				'Event Espresso is in full maintenance mode.',
+				'event_espresso'
+			); ?></h2>
         <p>
             <?php
-            printf(
-                esc_html__(
-                    'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
-                    'event_espresso'
-                ),
-                '<a href="admin.php?page=espresso_maintenance_settings">',
-                '</a>'
-            );
-            ?>
+			printf(
+				esc_html__(
+					'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
+					'event_espresso'
+				),
+				'<a href="admin.php?page=espresso_maintenance_settings">',
+				'</a>'
+			);
+			?>
         </p>
     </div>
     <?php
@@ -27,62 +27,62 @@ 
 <div class="headline-feature">
     <h2 class="about-headline-callout">
         <?php esc_html_e(
-            'Welcome to the Decaf (free) Version of Event Espresso 4!',
-            'event_espresso'
-        ); ?></h2>
+			'Welcome to the Decaf (free) Version of Event Espresso 4!',
+			'event_espresso'
+		); ?></h2>
     <p><?php
-        echo sprintf(
-            esc_html__(
-                'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).',
-                'event_espresso'
-            ),
-            '<a href="?page=espresso_about&action=decafvpro">',
-            '</a>',
-            '<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">',
-            '</a>'
-        ); ?></p>
+		echo sprintf(
+			esc_html__(
+				'Manage your events from your WordPress dashboard. Reduce your admin, reduce your costs, make your life easier! This is the Decaf version of Event Espresso, but we also have a premium version called %sEvent Espreso 4 Regular%s and a hosted version called %sEvent Smart%s (SaaS).',
+				'event_espresso'
+			),
+			'<a href="?page=espresso_about&action=decafvpro">',
+			'</a>',
+			'<a href="https://eventsmart.com//?utm_source=ee4_decaf&amp;utm_medium=link&amp;utm_campaign=espresso_about_tab&amp;utm_content=EE4+Decaf">',
+			'</a>'
+		); ?></p>
     <h2>
         <?php esc_html_e(
-            'Powering 40,000+ event websites; $100 million in ticket sales per year!',
-            'event_espresso'
-        ); ?></h2>
+			'Powering 40,000+ event websites; $100 million in ticket sales per year!',
+			'event_espresso'
+		); ?></h2>
     <p><?php
-        echo sprintf(
-            esc_html__(
-                'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.',
-                'event_espresso'
-            ),
-            '<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">',
-            '</a>'
-        ); ?></p>
+		echo sprintf(
+			esc_html__(
+				'Event Espresso is a %sWordPress event manager%s which makes it easy for you to register attendees for classes, workshops, events, trainings, conferences or concerts, all from your WordPress website. Event Espresso events are created from the WordPress admin area. You can create signup forms to collect information about your attendees, accept payments, and create reports. The Decaf (free) version of the plugin provides everything that you need to manage your event using WordPress.',
+				'event_espresso'
+			),
+			'<a href="http://eventespresso.com/?utm_source=wordpress_org&amp;utm_medium=link&amp;utm_campaign=plugin_description_tab&amp;utm_content=EE4+Decaf">',
+			'</a>'
+		); ?></p>
 </div>
     <div class="feature-section has-3-columns is-fullwidth three-col">
         <div class="column col">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/publish_meta_box.jpg">
             <h3><?php esc_html_e('Optimized aesthetic', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The Event Espresso 4 dashboard has a fresh, uncluttered design that embraces clarity and simplicity.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrations-overview.jpg">
             <h3><?php esc_html_e('Integrated management', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'We’ve made it easier to know who your customers are and how they’ve done business with you over time.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/refined-bookkeeping.jpg">
             <h3><?php esc_html_e('Easy bookkeeping', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Registrations, payment, and transactions have been substantially improved in Event Espresso 4.',
+					'event_espresso'
+				); ?></p>
         </div>
     </div>
 
@@ -92,16 +92,16 @@ 
         <div class="column col">
             <h3><?php esc_html_e('Higher customer retention', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The Event Espresso 4 registration process is faster than ever. With quick ticket selections, single page check-out, and customizable notifications! Registration that can scale to your business needs.',
+					'event_espresso'
+				); ?></p>
             <h4><?php esc_html_e('Ticket selection boxes on any post page or post', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Customers can easily register for classes, events, or conferences, in just a few simple steps. No matter how you use it, Event Espresso 4 will adapt to a multitude of different ticketing and pricing scenarios.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature about-colors-img">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/registrtation-page-large.jpg">
@@ -112,22 +112,22 @@ 
         <div class="column col">
             <h3><?php esc_html_e('Refined event management', 'event_espresso'); ?></h3>
             <p><?php
-                esc_html_e(
-                    'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'The new event management screen lets you survey your events at a glance. Want more information? Click to view more. Quickly add/edit prices, dates, or information in any event.',
+					'event_espresso'
+				); ?></p>
             <h4><?php
-                esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
+				esc_html_e('Smoother price types, taxes, and price modifiers', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
-                    'event_espresso'
-                ); ?>.</p>
+				esc_html_e(
+					'Price Types allow you to create new prices that adjust the default ticket (base) price for your system-default ticket',
+					'event_espresso'
+				); ?>.</p>
             <p><?php
-                esc_html_e(
-                    'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Easily categorize a price modifier and indicate how that price gets applied to the running total when a transaction occurs.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col last-feature about-themes-img">
             <img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/event-management.jpg">
@@ -137,68 +137,68 @@ 
 <hr>
 
     <h2 class="about-headline-callout"><?php
-        esc_html_e(
-            'People Like You Manage Event Registration with WordPress',
-            'event_espresso'
-        ); ?></h2>
+		esc_html_e(
+			'People Like You Manage Event Registration with WordPress',
+			'event_espresso'
+		); ?></h2>
     <div class="feature-section has-2-columns is-fullwidth two-col">
         <div class="column col">
             <p><?php
-                echo sprintf(
-                    esc_html__(
-                        'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
-                    'event_espresso'
-                ); ?></p>
+				echo sprintf(
+					esc_html__(
+						'Trusted by thousands, Event Espresso is the best WordPress event online registration and ticketing manager plugin–and the best supported with full-time support. Turn your existing blog or website into a %sfully-featured event management website%s and a new way to make money. With Event Espresso you get it all; everything from custom registration forms and emails, seating limits, multiple price options, and discount codes to printable tickets.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'Event Espresso works perfectly for classes, workshops, fundraisers, sporting, trainings, conferences, networking, religion, social, non-profit, and nearly any other type of event.',
+					'event_espresso'
+				); ?></p>
         </div>
         <div class="column col">
             <p><?php
-                echo sprintf(
-                    esc_html__(
-                        'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
-                        'event_espresso'
-                    ),
-                    '<strong>',
-                    '</strong>'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
-                    'event_espresso'
-                ); ?></p>
+				echo sprintf(
+					esc_html__(
+						'Our online event registration software can %smake your organization more profitable and efficient%s by helping you save money on registration and ticketing fees, reduce the countless hours of time you spend manually processing registrations, create a “green” and paperless event registration process and you will be open for business to accept registrations and payment 24/7.',
+						'event_espresso'
+					),
+					'<strong>',
+					'</strong>'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'If you\'re doing event registration and ticketing any other way, then you’re wasting time and money. We offer packages and prices to fit any budget, so get started with your online event registration and ticketing management system today.',
+					'event_espresso'
+				); ?></p>
         </div>
     </div>
 
     <div class="feature-section has-2-columns is-fullwidth two-col">
         <div class="column col">
             <h3><?php
-                esc_html_e(
-                    'Turn your blog into a complete event registration and management system',
-                    'event_espresso'
-                ); ?></h3>
-            <p><?php
-                esc_html_e(
-                    'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
-                    'event_espresso'
-                ); ?></p>
-            <p><?php
-                esc_html_e(
-                    'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
-                    'event_espresso'
-                ); ?></p>
-            <p><?php
-                echo sprintf(
-                    esc_html__('%sLearn more >>%s', 'event_espresso'),
-                    '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
-                    '</a>'
-                ); ?></p>
+				esc_html_e(
+					'Turn your blog into a complete event registration and management system',
+					'event_espresso'
+				); ?></h3>
+            <p><?php
+				esc_html_e(
+					'Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!',
+					'event_espresso'
+				); ?></p>
+            <p><?php
+				esc_html_e(
+					'With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.',
+					'event_espresso'
+				); ?></p>
+            <p><?php
+				echo sprintf(
+					esc_html__('%sLearn more >>%s', 'event_espresso'),
+					'<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">',
+					'</a>'
+				); ?></p>
         </div>
         <div class="column col"><img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg"></div>
     </div>
@@ -209,10 +209,10 @@ 
     <div class="feature-section has-1-column is-fullwidth is-wide one-col">
         <div class="column col">
             <p><?php
-            esc_html_e(
-                'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
-                'event_espresso'
-            ); ?></p>
+			esc_html_e(
+				'We’ve made it super easy to integrate Event Espresso with almost any properly coded WordPress theme, including many of the thousands of themes available on WordPress.org. The image below shows the same Event Espresso ticketing page across three diffrent WordPress themes.',
+				'event_espresso'
+			); ?></p>
             <p><img class="about-overview-img" src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/multiple-themes.jpg"/></p>
         </div>
     </div>