eventespresso / event-espresso-core

caffeinated/core/libraries/shortcodes/EE_Question_List_Shortcodes.lib.php

Indentation +62 added lines, -62 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -36,80 +36,80 @@ 
 {
     
     
-    public function __construct()
-    {
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		parent::__construct();
+	}
     
     
-    protected function _init_props()
-    {
-        $this->label       = __('Questions and Answers Shortcodes', 'event_espresso');
-        $this->description = __('All shortcodes related to custom questions and answers', 'event_espresso');
-        $this->_shortcodes = array(
-            '[QUESTION_LIST]' => __('This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
-                'event_espresso')
-        );
-    }
+	protected function _init_props()
+	{
+		$this->label       = __('Questions and Answers Shortcodes', 'event_espresso');
+		$this->description = __('All shortcodes related to custom questions and answers', 'event_espresso');
+		$this->_shortcodes = array(
+			'[QUESTION_LIST]' => __('This is used to indicate where you want the list of questions and answers to show for the registrant.  You place this within the "[attendee_list]" field.',
+				'event_espresso')
+		);
+	}
     
     
-    protected function _parser($shortcode)
-    {
+	protected function _parser($shortcode)
+	{
         
         
-        switch ($shortcode) {
-            case '[QUESTION_LIST]' :
-                return $this->_get_question_list();
-                break;
-        }
+		switch ($shortcode) {
+			case '[QUESTION_LIST]' :
+				return $this->_get_question_list();
+				break;
+		}
         
-        return '';
-    }
+		return '';
+	}
     
     
-    protected function _get_question_list()
-    {
-        $this->_validate_list_requirements();
+	protected function _get_question_list()
+	{
+		$this->_validate_list_requirements();
         
-        //for when [QUESTION_LIST] is used in the [attendee_list] field.
-        if ($this->_data['data'] instanceof EE_Registration) {
-            return $this->_get_question_answer_list_for_attendee();
-        } //for when [QUESTION_LIST] is used in the main content field.
-        else if ($this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration) {
-            return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
-        } else {
-            return '';
-        }
-    }
+		//for when [QUESTION_LIST] is used in the [attendee_list] field.
+		if ($this->_data['data'] instanceof EE_Registration) {
+			return $this->_get_question_answer_list_for_attendee();
+		} //for when [QUESTION_LIST] is used in the main content field.
+		else if ($this->_data['data'] instanceof EE_Messages_Addressee && $this->_data['data']->reg_obj instanceof EE_Registration) {
+			return $this->_get_question_answer_list_for_attendee($this->_data['data']->reg_obj);
+		} else {
+			return '';
+		}
+	}
     
     
-    /**
-     * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
-     * answers for that attendee since that is what we really need (we can derive the questions from the answers);
-     * @return string parsed template.
-     */
-    private function _get_question_answer_list_for_attendee($reg_obj = null)
-    {
-        $valid_shortcodes = array('question');
-        $reg_obj          = $reg_obj instanceof EE_Registration ? $reg_obj : $this->_data['data'];
-        $template         = is_array($this->_data['template']) && isset($this->_data['template']['question_list']) ? $this->_data['template']['question_list'] : '';
-        $template         = empty($template) && isset($this->_extra_data['template']['question_list']) ? $this->_extra_data['template']['question_list'] : $template;
-        $ans_result       = '';
-        $answers          = ! empty($this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs']) ? $this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'] : array();
-        $questions        = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
-        foreach ($answers as $answer) {
-            //first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
-            $question = ! $question instanceof EE_Question ? $answer->question() : $question;
-            if ($question instanceof EE_Question and $question->admin_only()) {
-                continue;
-            }
-            $ans_result .= $this->_shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes,
-                $this->_extra_data);
-        }
+	/**
+	 * Note when we parse the "[question_list]" shortcode for attendees we're actually going to retrieve the list of
+	 * answers for that attendee since that is what we really need (we can derive the questions from the answers);
+	 * @return string parsed template.
+	 */
+	private function _get_question_answer_list_for_attendee($reg_obj = null)
+	{
+		$valid_shortcodes = array('question');
+		$reg_obj          = $reg_obj instanceof EE_Registration ? $reg_obj : $this->_data['data'];
+		$template         = is_array($this->_data['template']) && isset($this->_data['template']['question_list']) ? $this->_data['template']['question_list'] : '';
+		$template         = empty($template) && isset($this->_extra_data['template']['question_list']) ? $this->_extra_data['template']['question_list'] : $template;
+		$ans_result       = '';
+		$answers          = ! empty($this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs']) ? $this->_extra_data['data']->registrations[$reg_obj->ID()]['ans_objs'] : array();
+		$questions        = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
+		foreach ($answers as $answer) {
+			//first see if the question is in our $questions array.  If not then try to get from answer object
+			$question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+			$question = ! $question instanceof EE_Question ? $answer->question() : $question;
+			if ($question instanceof EE_Question and $question->admin_only()) {
+				continue;
+			}
+			$ans_result .= $this->_shortcode_helper->parse_question_list_template($template, $answer, $valid_shortcodes,
+				$this->_extra_data);
+		}
         
-        return $ans_result;
-    }
+		return $ans_result;
+	}
     
     
 } //end EE_Question_List_Shortcodes class

Spacing +1 added lines, -1 removed lines

@@ -99,7 +99,7 @@
         $questions        = ! empty($this->_extra_data['data']->questions) ? $this->_extra_data['data']->questions : array();
         foreach ($answers as $answer) {
             //first see if the question is in our $questions array.  If not then try to get from answer object
-            $question = isset($questions[ $answer->ID() ]) ? $questions[ $answer->ID() ] : null;
+            $question = isset($questions[$answer->ID()]) ? $questions[$answer->ID()] : null;
             $question = ! $question instanceof EE_Question ? $answer->question() : $question;
             if ($question instanceof EE_Question and $question->admin_only()) {
                 continue;

admin_pages/registration_form/help_tours/Registration_Form_Question_Groups_Help_Tour.class.php

Indentation +114 added lines, -114 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -18,130 +18,130 @@ 
 class Registration_Form_Question_Groups_Help_Tour extends EE_Help_Tour
 {
     
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Question Groups Tour', 'event_espresso');
-        $this->_slug  = $this->_is_caf ? 'question-groups-caf-overview-joyride' : 'question-groups-overview-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Question Groups Tour', 'event_espresso');
+		$this->_slug  = $this->_is_caf ? 'question-groups-caf-overview-joyride' : 'question-groups-overview-joyride';
+	}
     
     
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            )
-        );
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			)
+		);
         
-        if ($this->_is_caf) {
-            $this->_stops[20] = array(
-                'id'      => 'name',
-                'content' => $this->_name_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 25
-                )
-            );
-            $this->_stops[30] = array(
-                'id'      => 'description',
-                'content' => $this->_description_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 20
-                )
-            );
-            $this->_stops[40] = array(
-                'id'      => 'show_group_name',
-                'content' => $this->_show_group_name_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 20
-                )
-            );
-            $this->_stops[50] = array(
-                'id'      => 'show_group_desc',
-                'content' => $this->_show_group_description_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => 20
-                )
-            );
-            $this->_stops[60] = array(
-                'class'   => 'bulkactions',
-                'content' => $this->_bulk_actions_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -80
-                )
-            );
-            $this->_stops[70] = array(
-                'id'      => 'add-new-question-group',
-                'content' => $this->_add_new_question_group_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            );
-        }
-    }
+		if ($this->_is_caf) {
+			$this->_stops[20] = array(
+				'id'      => 'name',
+				'content' => $this->_name_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 25
+				)
+			);
+			$this->_stops[30] = array(
+				'id'      => 'description',
+				'content' => $this->_description_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 20
+				)
+			);
+			$this->_stops[40] = array(
+				'id'      => 'show_group_name',
+				'content' => $this->_show_group_name_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 20
+				)
+			);
+			$this->_stops[50] = array(
+				'id'      => 'show_group_desc',
+				'content' => $this->_show_group_description_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => 20
+				)
+			);
+			$this->_stops[60] = array(
+				'class'   => 'bulkactions',
+				'content' => $this->_bulk_actions_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -80
+				)
+			);
+			$this->_stops[70] = array(
+				'id'      => 'add-new-question-group',
+				'content' => $this->_add_new_question_group_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			);
+		}
+	}
     
     
-    protected function _start()
-    {
-        $content = '<h3>' . __('Question Groups', 'event_espresso') . '</h3>';
-        if ($this->_is_caf) {
-            $content .= '<p>' . __('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
-                    'event_espresso') . '</p>';
-        } else {
-            $content .= '<p>' . __('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
-                    'event_espresso') . '</p>';
-        }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Question Groups', 'event_espresso') . '</h3>';
+		if ($this->_is_caf) {
+			$content .= '<p>' . __('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
+					'event_espresso') . '</p>';
+		} else {
+			$content .= '<p>' . __('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
+					'event_espresso') . '</p>';
+		}
         
-        return $content;
-    }
+		return $content;
+	}
     
-    protected function _name_stop()
-    {
-        return '<p>' . __('View available questions groups. You can reorder your questions by dragging and dropping them.',
-            'event_espresso') . '</p>';
-    }
+	protected function _name_stop()
+	{
+		return '<p>' . __('View available questions groups. You can reorder your questions by dragging and dropping them.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _description_stop()
-    {
-        return '<p>' . __('View the question group description.', 'event_espresso') . '</p>';
-    }
+	protected function _description_stop()
+	{
+		return '<p>' . __('View the question group description.', 'event_espresso') . '</p>';
+	}
     
-    protected function _show_group_name_stop()
-    {
-        return '<p>' . __('View if the name of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
-    }
+	protected function _show_group_name_stop()
+	{
+		return '<p>' . __('View if the name of the question group should be shown to customers.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _show_group_description_stop()
-    {
-        return '<p>' . __('View if the description of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
-    }
+	protected function _show_group_description_stop()
+	{
+		return '<p>' . __('View if the description of the question group should be shown to customers.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _bulk_actions_stop()
-    {
-        return '<p>' . __('Perform bulk actions to multiple question groups.', 'event_espresso') . '</p>';
-    }
+	protected function _bulk_actions_stop()
+	{
+		return '<p>' . __('Perform bulk actions to multiple question groups.', 'event_espresso') . '</p>';
+	}
     
-    protected function _search_stop()
-    {
-        return '<p>' . __('Search through questions. The following sources will be searched: question group name and question group description.',
-            'event_espresso') . '</p>';
-    }
+	protected function _search_stop()
+	{
+		return '<p>' . __('Search through questions. The following sources will be searched: question group name and question group description.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _add_new_question_group_stop()
-    {
-        return '<p>' . __('Click here to create a new question group.', 'event_espresso') . '</p>';
-    }
+	protected function _add_new_question_group_stop()
+	{
+		return '<p>' . __('Click here to create a new question group.', 'event_espresso') . '</p>';
+	}
 }
\ No newline at end of file

Spacing +16 added lines, -16 removed lines

@@ -94,13 +94,13 @@ 
     
     protected function _start()
     {
-        $content = '<h3>' . __('Question Groups', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Question Groups', 'event_espresso').'</h3>';
         if ($this->_is_caf) {
-            $content .= '<p>' . __('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
-                    'event_espresso') . '</p>';
+            $content .= '<p>'.__('This tour of the Question Groups page will go over different areas of the screen to help you understand what they are used for.',
+                    'event_espresso').'</p>';
         } else {
-            $content .= '<p>' . __('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
-                    'event_espresso') . '</p>';
+            $content .= '<p>'.__('Sorry, Event Espresso Decaf does not have this feature. Please purchase a support license to get access to this feature.',
+                    'event_espresso').'</p>';
         }
         
         return $content;
@@ -108,40 +108,40 @@ 
     
     protected function _name_stop()
     {
-        return '<p>' . __('View available questions groups. You can reorder your questions by dragging and dropping them.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('View available questions groups. You can reorder your questions by dragging and dropping them.',
+            'event_espresso').'</p>';
     }
     
     protected function _description_stop()
     {
-        return '<p>' . __('View the question group description.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the question group description.', 'event_espresso').'</p>';
     }
     
     protected function _show_group_name_stop()
     {
-        return '<p>' . __('View if the name of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('View if the name of the question group should be shown to customers.',
+            'event_espresso').'</p>';
     }
     
     protected function _show_group_description_stop()
     {
-        return '<p>' . __('View if the description of the question group should be shown to customers.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('View if the description of the question group should be shown to customers.',
+            'event_espresso').'</p>';
     }
     
     protected function _bulk_actions_stop()
     {
-        return '<p>' . __('Perform bulk actions to multiple question groups.', 'event_espresso') . '</p>';
+        return '<p>'.__('Perform bulk actions to multiple question groups.', 'event_espresso').'</p>';
     }
     
     protected function _search_stop()
     {
-        return '<p>' . __('Search through questions. The following sources will be searched: question group name and question group description.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('Search through questions. The following sources will be searched: question group name and question group description.',
+            'event_espresso').'</p>';
     }
     
     protected function _add_new_question_group_stop()
     {
-        return '<p>' . __('Click here to create a new question group.', 'event_espresso') . '</p>';
+        return '<p>'.__('Click here to create a new question group.', 'event_espresso').'</p>';
     }
 }
\ No newline at end of file

admin_pages/general_settings/help_tours/Your_Organization_Help_Tour.class.php

Indentation +106 added lines, -106 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 if ( ! defined('EVENT_ESPRESSO_VERSION')) {
-    exit('NO direct script access allowed');
+	exit('NO direct script access allowed');
 }
 
 /**
@@ -18,121 +18,121 @@ 
 class Your_Organization_Help_Tour extends EE_Help_Tour
 {
     
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Your Organization Tour', 'event_espresso');
-        $this->_slug  = 'your-organization-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Your Organization Tour', 'event_espresso');
+		$this->_slug  = 'your-organization-joyride';
+	}
     
     
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            30 => array(
-                'id'      => 'contact_info_h4',
-                'content' => $this->_contact_information_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            40 => array(
-                'id'      => 'upload_image',
-                'content' => $this->_upload_image_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            50 => array(
-                'id'      => 'organization_facebook',
-                'content' => $this->_organization_facebook_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            60 => array(
-                'id'      => 'ueip_optin',
-                'content' => $this->_ueip_option_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            ),
-            70 => array(
-                'id'      => 'espresso_major_buttons_wrapper',
-                'content' => $this->_end_tour_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 185
-                )
-            )
-        );
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			30 => array(
+				'id'      => 'contact_info_h4',
+				'content' => $this->_contact_information_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			40 => array(
+				'id'      => 'upload_image',
+				'content' => $this->_upload_image_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			50 => array(
+				'id'      => 'organization_facebook',
+				'content' => $this->_organization_facebook_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			60 => array(
+				'id'      => 'ueip_optin',
+				'content' => $this->_ueip_option_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			),
+			70 => array(
+				'id'      => 'espresso_major_buttons_wrapper',
+				'content' => $this->_end_tour_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 185
+				)
+			)
+		);
         
-        if (is_main_site()) {
-            $this->_stops[20] = array(
-                'id' => 'site_license_key',
-                'content' => $this->_site_license_key_stop(),
-                'options' => array(
-                    'tipLocation' => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15
-                )
-            );
-        }
-        ksort( $this->_stops );
-    }
+		if (is_main_site()) {
+			$this->_stops[20] = array(
+				'id' => 'site_license_key',
+				'content' => $this->_site_license_key_stop(),
+				'options' => array(
+					'tipLocation' => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15
+				)
+			);
+		}
+		ksort( $this->_stops );
+	}
     
     
-    protected function _start()
-    {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>' . __('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
-                'event_espresso') . '</p>';
+	protected function _start()
+	{
+		$content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>' . __('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
+				'event_espresso') . '</p>';
         
-        return $content;
-    }
+		return $content;
+	}
     
-    protected function _site_license_key_stop()
-    {
-        return '<p>' . __('Enter your support license key here to enable one-click updates.',
-            'event_espresso') . '</p>';
-    }
+	protected function _site_license_key_stop()
+	{
+		return '<p>' . __('Enter your support license key here to enable one-click updates.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _contact_information_stop()
-    {
-        return '<p>' . __('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
-            'event_espresso') . '</p>';
-    }
+	protected function _contact_information_stop()
+	{
+		return '<p>' . __('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _upload_image_stop()
-    {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
-    }
+	protected function _upload_image_stop()
+	{
+		return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+	}
     
-    protected function _organization_facebook_stop()
-    {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
-    }
+	protected function _organization_facebook_stop()
+	{
+		return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+	}
     
-    protected function _ueip_option_stop()
-    {
-        return '<p>' . __('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
-            'event_espresso') . '</p>';
-    }
+	protected function _ueip_option_stop()
+	{
+		return '<p>' . __('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
+			'event_espresso') . '</p>';
+	}
     
-    protected function _end_tour_stop()
-    {
-        return '<p>' . __('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
-            'event_espresso') . '</p>';
-    }
+	protected function _end_tour_stop()
+	{
+		return '<p>' . __('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
+			'event_espresso') . '</p>';
+	}
 }
\ No newline at end of file

Spacing +14 added lines, -14 removed lines

@@ -89,50 +89,50 @@
                 )
             );
         }
-        ksort( $this->_stops );
+        ksort($this->_stops);
     }
     
     
     protected function _start()
     {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>' . __('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
-                'event_espresso') . '</p>';
+        $content = '<h3>'.__('Organization Settings', 'event_espresso').'</h3>';
+        $content .= '<p>'.__('This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
+                'event_espresso').'</p>';
         
         return $content;
     }
     
     protected function _site_license_key_stop()
     {
-        return '<p>' . __('Enter your support license key here to enable one-click updates.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('Enter your support license key here to enable one-click updates.',
+            'event_espresso').'</p>';
     }
     
     protected function _contact_information_stop()
     {
-        return '<p>' . __('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
+            'event_espresso').'</p>';
     }
     
     protected function _upload_image_stop()
     {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add a logo. This can be used for invoices and tickets.', 'event_espresso').'</p>';
     }
     
     protected function _organization_facebook_stop()
     {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add links to various social media networks.', 'event_espresso').'</p>';
     }
     
     protected function _ueip_option_stop()
     {
-        return '<p>' . __('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
+            'event_espresso').'</p>';
     }
     
     protected function _end_tour_stop()
     {
-        return '<p>' . __('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
-            'event_espresso') . '</p>';
+        return '<p>'.__('You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
+            'event_espresso').'</p>';
     }
 }
\ No newline at end of file

admin_pages/maintenance/templates/migration_options_from_ee4.template.php

Indentation +20 added lines, -20 removed lines

@@ -25,14 +25,14 @@ 
             <tr>
                 <td>
                     <?php
-                    echo apply_filters(
-                            'FHEE__ee_migration_page__option_1_main',
-                            esc_html__('Before updating your database, you should first create a database backup',
-                                    "event_espresso"),
-                            $current_db_state,
-                            $next_db_state
-                    );
-                    ?>
+					echo apply_filters(
+							'FHEE__ee_migration_page__option_1_main',
+							esc_html__('Before updating your database, you should first create a database backup',
+									"event_espresso"),
+							$current_db_state,
+							$next_db_state
+					);
+					?>
                     <a id="display-migration-details"
                        class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
                        rel="migration-details"><?php esc_html_e('How Do I Make a Database Backup?', "event_espresso"); ?>
@@ -41,8 +41,8 @@ 
                 <td>
                     <a id="db-backed-up"
                        class="toggle-migration-monitor button-primary"><?php echo apply_filters('FHEE__ee_migration_page__option_1_button_text',
-                                sprintf(esc_html__("My Database Is Backed Up, Continue", "event_espresso"), $current_db_state,
-                                        $next_db_state), $current_db_state, $next_db_state); ?></a>
+								sprintf(esc_html__("My Database Is Backed Up, Continue", "event_espresso"), $current_db_state,
+										$next_db_state), $current_db_state, $next_db_state); ?></a>
                 </td>
             </tr>
             <tr>
@@ -50,14 +50,14 @@ 
                     <div id="migration-details-dv" style="display: none; padding: 1em;">
                         <p>
                             <?php
-                            printf(
-                                    esc_html__('%1$sClick Here to Learn How To Backup your Database Yourself%2$s. Or have one of our dedicated support technicians help you by %3$spurchasing a Priority Support Token.%2$s',
-                                            "event_espresso"),
-                                    '<a target="_blank" href="http://eventespresso.com/wiki/how-to-back-up-your-site/">',
-                                    "</a>",
-                                    "<a target=\"_blank\" href='http://eventespresso.com/product/priority-support-tokens/'>"
-                            );
-                            ?>
+							printf(
+									esc_html__('%1$sClick Here to Learn How To Backup your Database Yourself%2$s. Or have one of our dedicated support technicians help you by %3$spurchasing a Priority Support Token.%2$s',
+											"event_espresso"),
+									'<a target="_blank" href="http://eventespresso.com/wiki/how-to-back-up-your-site/">',
+									"</a>",
+									"<a target=\"_blank\" href='http://eventespresso.com/product/priority-support-tokens/'>"
+							);
+							?>
                         </p>
                         <?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?>
                     </div>
@@ -67,8 +67,8 @@ 
         </table>
     </div>
     <p><?php esc_html_e('Don\'t want to keep your old Event Espresso data? Alternatively, you can delete it all and start fresh.',
-                'event_espresso'); ?> <a
+				'event_espresso'); ?> <a
                 href=""><?php esc_html_e('Visit the Maintenance Page and Reset Your Event Espresso Data',
-                    'event_espresso'); ?></a></p>
+					'event_espresso'); ?></a></p>
     <?php do_action('AHEE__ee_migration_page__after_migration_options_table'); ?>
 </div>
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -68,7 +68,7 @@
     </div>
     <p><?php esc_html_e('Don\'t want to keep your old Event Espresso data? Alternatively, you can delete it all and start fresh.',
                 'event_espresso'); ?> <a
-                href="<?php echo $data_reset_page;?>"><?php esc_html_e('Visit the Maintenance Page and Reset Your Event Espresso Data',
+                href="<?php echo $data_reset_page; ?>"><?php esc_html_e('Visit the Maintenance Page and Reset Your Event Espresso Data',
                     'event_espresso'); ?></a></p>
     <?php do_action('AHEE__ee_migration_page__after_migration_options_table'); ?>
 </div>
\ No newline at end of file

admin_pages/maintenance/templates/migration_options_from_ee3.template.php

Indentation +48 added lines, -48 removed lines

@@ -26,7 +26,7 @@ 
         <span class="dashicons dashicons-admin-tools"></span>
         <?php esc_html_e("Migration Options", "event_espresso"); ?>
         <span class="tiny-text lt-grey-text"> &nbsp; <?php esc_html_e(' to migrate or not to migrate?',
-                    "event_espresso"); ?></span>
+					"event_espresso"); ?></span>
     </h2>
     <div class="ee-table-wrap">
         <table>
@@ -35,24 +35,24 @@ 
                 <td><h3><?php esc_html_e('1', 'event_espresso'); ?></h3></td>
                 <td>
                     <?php
-                    echo apply_filters(
-                            'FHEE__ee_migration_page__option_1_main',
-                            sprintf(
-                                    esc_html__('%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.',
-                                            "event_espresso"),
-                                    '<strong>',
-                                    '</strong>',
-                                    '<a id="migration-risks" class="" title="'
-                                    . esc_attr__('click for more details', "event_espresso")
-                                    . '">',
-                                    '</a>',
-                                    $current_db_state,
-                                    $next_db_state
-                            ),
-                            $current_db_state,
-                            $next_db_state
-                    );
-                    ?>
+					echo apply_filters(
+							'FHEE__ee_migration_page__option_1_main',
+							sprintf(
+									esc_html__('%1$sYes. I have backed up my database%2$s, %3$sunderstand the risks involved%4$s, and am ready to migrate my existing %5$s data to %6$s.',
+											"event_espresso"),
+									'<strong>',
+									'</strong>',
+									'<a id="migration-risks" class="" title="'
+									. esc_attr__('click for more details', "event_espresso")
+									. '">',
+									'</a>',
+									$current_db_state,
+									$next_db_state
+							),
+							$current_db_state,
+							$next_db_state
+					);
+					?>
                     <a id="display-migration-details"
                        class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
                        rel="migration-details"><?php esc_html_e('click for more details', "event_espresso"); ?>
@@ -61,37 +61,37 @@ 
                        class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"
                        rel="migration-details"
                        style="display:none;"><?php echo sprintf(esc_html__('hide%1$sdetails%1$s-',
-                                'event_espresso'), '&nbsp;'); ?></a>
+								'event_espresso'), '&nbsp;'); ?></a>
                 </td>
                 <td>
                     <a id="db-backed-up"
                        class="toggle-migration-monitor button-primary"><?php echo apply_filters('FHEE__ee_migration_page__option_1_button_text',
-                                sprintf(esc_html__("Migrate My %s Data to %s", "event_espresso"), $current_db_state,
-                                        $next_db_state), $current_db_state, $next_db_state); ?></a>
+								sprintf(esc_html__("Migrate My %s Data to %s", "event_espresso"), $current_db_state,
+										$next_db_state), $current_db_state, $next_db_state); ?></a>
                 </td>
             </tr>
             <tr>
                 <td colspan="3" style="padding: 0">
                     <div id="migration-details-dv" style="display: none; padding: 1em;">
 <span class="reminder-spn"><?php printf(esc_html__("%s Important: %s Before migrating, please back up your database and files.",
-            "event_espresso"), "<b>", "</b>"); ?></span>
+			"event_espresso"), "<b>", "</b>"); ?></span>
                         <p>
                             <?php
-                            printf(
-                                    esc_html__('%1$sNot sure how to backup your existing data?%2$s Here is %3$sWordPress\'s explanation%7$s, and here\'s %6$sour explanation%7$s.%8$sYou can also search the WordPress plugin database for %4$s database backup plugins %7$s,%8$sor have one of our dedicated support technicians help you by purchasing a %5$sPriority Support Token%7$s.',
-                                            "event_espresso"),
-                                    '<b>',
-                                    '</b>',
-                                    "<a href='http://codex.wordpress.org/Backing_Up_Your_Database'>",
-                                    "<a href='"
-                                    . admin_url('plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins')
-                                    . "'>",
-                                    "<a href='http://eventespresso.com/product/priority-support-tokens/'>",
-                                    '<a href="http://eventespresso.com/wiki/how-to-back-up-your-site/">',
-                                    "</a>",
-                                    '<br/>'
-                            );
-                            ?>
+							printf(
+									esc_html__('%1$sNot sure how to backup your existing data?%2$s Here is %3$sWordPress\'s explanation%7$s, and here\'s %6$sour explanation%7$s.%8$sYou can also search the WordPress plugin database for %4$s database backup plugins %7$s,%8$sor have one of our dedicated support technicians help you by purchasing a %5$sPriority Support Token%7$s.',
+											"event_espresso"),
+									'<b>',
+									'</b>',
+									"<a href='http://codex.wordpress.org/Backing_Up_Your_Database'>",
+									"<a href='"
+									. admin_url('plugin-install.php?tab=search&type=term&s=database+backup&plugin-search-input=Search+Plugins')
+									. "'>",
+									"<a href='http://eventespresso.com/product/priority-support-tokens/'>",
+									'<a href="http://eventespresso.com/wiki/how-to-back-up-your-site/">',
+									"</a>",
+									'<br/>'
+							);
+							?>
                         </p>
                         <?php do_action('AHEE__ee_migration_page__option_1_extra_details'); ?>
                     </div>
@@ -101,12 +101,12 @@ 
                 <td><h3><?php esc_html_e('2', 'event_espresso'); ?></h3></td>
                 <td>
                     <?php echo apply_filters('FHEE__ee_migration_page__option_2_main',
-                            sprintf(esc_html__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.',
-                                    "event_espresso"), $current_db_state, $next_db_state,
-                                    $ultimate_db_state), $current_db_state, $next_db_state,
-                            $ultimate_db_state); ?><br/>
+							sprintf(esc_html__('I do NOT want to migrate my %1$s data to %2$s at this time and just want to use %3$s without migrating data.',
+									"event_espresso"), $current_db_state, $next_db_state,
+									$ultimate_db_state), $current_db_state, $next_db_state,
+							$ultimate_db_state); ?><br/>
                     <span class="reminder-spn"><?php esc_html_e('Please Note: In order to avoid errors, any existing Event Espresso data (events, ticket, registrations, etc) in your db will be erased! Regular WP data will NOT be affected.',
-                                'event_espresso'); ?></span>
+								'event_espresso'); ?></span>
                     <a id="display-no-migration-details"
                        class="display-the-hidden lt-grey-text smaller-text hide-if-no-js"
                        rel="no-migration-details"><?php esc_html_e('click for more details', "event_espresso"); ?>
@@ -115,13 +115,13 @@ 
                        class="hide-the-displayed lt-grey-text smaller-text hide-if-no-js"
                        rel="no-migration-details"
                        style="display:none;"><?php echo sprintf(esc_html__('hide%1$sdetails%1$s-',
-                                'event_espresso'), '&nbsp;'); ?></a>
+								'event_espresso'), '&nbsp;'); ?></a>
                 </td>
                 <td>
                     <a id="do-not-migrate" class="do-not-migrate button-primary"
                        href="<?php echo $reset_db_page_link; ?>"><?php echo apply_filters('FHEE__ee_migration_page__option_2_button_text',
-                                sprintf(esc_html__("Just Start %s and Delete Existing Data", "event_espresso"),
-                                        $ultimate_db_state), $ultimate_db_state); ?></a>
+								sprintf(esc_html__("Just Start %s and Delete Existing Data", "event_espresso"),
+										$ultimate_db_state), $ultimate_db_state); ?></a>
                 </td>
             </tr>
             <tr>
@@ -129,8 +129,8 @@ 
                     <div id="no-migration-details-dv" style="display: none; padding: 1em;">
                         <p>
                             <?php echo apply_filters('FHEE__ee_migration_page__option_2_details',
-                                    sprintf(esc_html__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.",
-                                            "event_espresso"), $ultimate_db_state), $ultimate_db_state); ?>
+									sprintf(esc_html__("If your existing Event and Registration Data is no longer relevant nor required, you can just start up %s without performing a data migration.",
+											"event_espresso"), $ultimate_db_state), $ultimate_db_state); ?>
                         </p>
                     </div>
                 </td>

admin_pages/maintenance/templates/ee_confirm_migration_crash_report_sent.template.php

Spacing +24 added lines, -24 removed lines

@@ -5,39 +5,39 @@ 
 /** @type string $reset_db_action_url */
 /** @type EE_Data_Migration_Script_Base $most_recent_migration */
 ?>
-<?php if ( $success ) { ?>
-	<h1><?php _e( "Database Update Crash Report Sent", "event_espresso" ); ?></h1>
-	<p><?php _e( "A crash report email was sent to Event Espresso. You should hear back from us soon.", "event_espresso" ); ?></p>
+<?php if ($success) { ?>
+	<h1><?php _e("Database Update Crash Report Sent", "event_espresso"); ?></h1>
+	<p><?php _e("A crash report email was sent to Event Espresso. You should hear back from us soon.", "event_espresso"); ?></p>
 <?php } else {//didn't send email properly ?>
-	<h1><?php _e( "Migration Report not sent", "event_espresso" ); ?></h1>
-	<p><?php _e( "An error occurred and we were not able to automatically send a report to Event Espresso support.", "event_espresso" ); ?></p>
-	<p><?php printf( esc_html__( "Please copy-and-paste the system information below to %s", "event_espresso" ), '<a href="mailto:' . EE_SUPPORT_EMAIL . '">' .EE_SUPPORT_EMAIL . "</a>" ); ?></p>
+	<h1><?php _e("Migration Report not sent", "event_espresso"); ?></h1>
+	<p><?php _e("An error occurred and we were not able to automatically send a report to Event Espresso support.", "event_espresso"); ?></p>
+	<p><?php printf(esc_html__("Please copy-and-paste the system information below to %s", "event_espresso"), '<a href="mailto:'.EE_SUPPORT_EMAIL.'">'.EE_SUPPORT_EMAIL."</a>"); ?></p>
 	<label>
-		<?php _e( "system status info", "event_espresso" ); ?>
-		<textarea name="system_status_info" class="system_status_info"><?php print_r( EEM_System_Status::instance()->get_system_stati() ); ?></textarea>
+		<?php _e("system status info", "event_espresso"); ?>
+		<textarea name="system_status_info" class="system_status_info"><?php print_r(EEM_System_Status::instance()->get_system_stati()); ?></textarea>
 	</label>
 <?php } ?>
 
 
-<h1><?php _e( "What's next?", 'event_espresso' ); ?></h1>
-<p><?php _e( "Well, it depends on your situation:", 'event_espresso' ); ?></p>
+<h1><?php _e("What's next?", 'event_espresso'); ?></h1>
+<p><?php _e("Well, it depends on your situation:", 'event_espresso'); ?></p>
 <div class='ee-table-wrap'>
 	<table>
 		<thead>
 			<tr>
-				<th><?php _e( "Your Situation", 'event_espresso' ); ?></th>
-				<th><?php _e( "Suggested Action", 'event_espresso' ); ?></th>
+				<th><?php _e("Your Situation", 'event_espresso'); ?></th>
+				<th><?php _e("Suggested Action", 'event_espresso'); ?></th>
 			</tr>
 		</thead>
 		<tbody>
 			<tr>
-				<td><p class='big-text'><?php _e( "I want to retry migrating my data", 'event_espresso' ); ?></p></td>
+				<td><p class='big-text'><?php _e("I want to retry migrating my data", 'event_espresso'); ?></p></td>
 				<td>
 					<p>
 						<?php
 						printf(
-							esc_html__( 'First, %1$s check the forums %2$s to see if there is a solution before re-attempting the Database Update. Often it helps to deactivate other plugins which may have conflicts; or it may help to add %3$s to your %4$s wp-config.php%5$s (which will make the update run slower, but may resolve any memory exhaustion errors.', 'event_espresso' ),
-							"<a href='" . EE_SUPPORT_EMAIL . "' target='_blank'>",
+							esc_html__('First, %1$s check the forums %2$s to see if there is a solution before re-attempting the Database Update. Often it helps to deactivate other plugins which may have conflicts; or it may help to add %3$s to your %4$s wp-config.php%5$s (which will make the update run slower, but may resolve any memory exhaustion errors.', 'event_espresso'),
+							"<a href='".EE_SUPPORT_EMAIL."' target='_blank'>",
 							'</a>',
 							'<pre lang="php">define( EE_MIGRATION_STEP_SIZE, 10 );</pre>',
 							'<b>',
@@ -49,7 +49,7 @@ 
 					<p>
 						<?php
 						printf(
-							esc_html__( 'To retry updating your data: restore to the backup you made before the update and reactivate EE (and any addons you are using) and re-run the Database Update. If you did not make a database backup and are migrating from EE3: delete your EE4 data (use the %1$s Reset/Delete Data tab above%2$s), and then reactivate EE4, and then re-run the migration and updates. If you did not make a database backup, are only updating from a previous install of EE4, have found a solution to the fatal error you received, and are willing to possibly have some data lost, %3$sattempt to continue migrating%2$s.', 'event_espresso' ),
+							esc_html__('To retry updating your data: restore to the backup you made before the update and reactivate EE (and any addons you are using) and re-run the Database Update. If you did not make a database backup and are migrating from EE3: delete your EE4 data (use the %1$s Reset/Delete Data tab above%2$s), and then reactivate EE4, and then re-run the migration and updates. If you did not make a database backup, are only updating from a previous install of EE4, have found a solution to the fatal error you received, and are willing to possibly have some data lost, %3$sattempt to continue migrating%2$s.', 'event_espresso'),
 							"<a href='$reset_db_page_url'>",
 							"</a>",
 							"<a class='button-primary' href='$reattempt_action_url'>"
@@ -60,13 +60,13 @@ 
 			</tr>
 			<tr>
 				<td>
-					<p class='big-text'><?php _e( "I want to hear from Support before proceeding", 'event_espresso' ); ?></p>
+					<p class='big-text'><?php _e("I want to hear from Support before proceeding", 'event_espresso'); ?></p>
 				</td>
 				<td>
 					<?php
 					printf(
-						esc_html__( 'Just make sure you\'ve %1$s checked for a solution in the forums,%2$s and properly contacted Support. We will get back to you as soon as possible', 'event_espresso' ),
-						"<a href='" . EE_SUPPORT_EMAIL . "'>",
+						esc_html__('Just make sure you\'ve %1$s checked for a solution in the forums,%2$s and properly contacted Support. We will get back to you as soon as possible', 'event_espresso'),
+						"<a href='".EE_SUPPORT_EMAIL."'>",
 						"</a>"
 					);
 					?>
@@ -74,12 +74,12 @@ 
 			</tr>
 			<tr>
 				<td>
-					<p class='big-text'><?php printf( esc_html__( 'I don\'t need my old EE %s data', 'event_espresso' ), $most_recent_migration->slug() ); ?></p>
+					<p class='big-text'><?php printf(esc_html__('I don\'t need my old EE %s data', 'event_espresso'), $most_recent_migration->slug()); ?></p>
 				</td>
 				<td>
 					<?php
 					printf(
-						esc_html__( 'If you are ok with losing all the EE %1$s data, you can skip the Database Updates and %2$s use EE4 with only default Data%3$s', 'event_espresso' ),
+						esc_html__('If you are ok with losing all the EE %1$s data, you can skip the Database Updates and %2$s use EE4 with only default Data%3$s', 'event_espresso'),
 						$most_recent_migration->slug(),
 						"<a id='do-not-migrate' class='do-not-migrate button-primary' href='$reset_db_action_url'>",
 						"</a>"
@@ -89,20 +89,20 @@ 
 			</tr>
 			<tr>
 				<td>
-					<p class='big-text'><?php printf( esc_html__( 'I want to go back to my old version of EE %1$s', 'event_espresso' ), $most_recent_migration->slug() ); ?>
+					<p class='big-text'><?php printf(esc_html__('I want to go back to my old version of EE %1$s', 'event_espresso'), $most_recent_migration->slug()); ?>
 				</td>
 				<td>
 					<p>
 					<?php
 					printf(
-						esc_html__( 'Then we suggest you re-activate the old version of EE %3$s and restore your database to the backup you made just before the Database Update . If you didn\'t backup your database and are migrating from EE3, you can also delete your EE4 data (use on the %1$s"Reset/Delete Data" tab above%2$s), and then reactivate EE3 from the plugins page. Note: some of your EE3 shortcodes may have been changed to their EE4 equivalents, so you will need to change them back.', 'event_espresso' ),
+						esc_html__('Then we suggest you re-activate the old version of EE %3$s and restore your database to the backup you made just before the Database Update . If you didn\'t backup your database and are migrating from EE3, you can also delete your EE4 data (use on the %1$s"Reset/Delete Data" tab above%2$s), and then reactivate EE3 from the plugins page. Note: some of your EE3 shortcodes may have been changed to their EE4 equivalents, so you will need to change them back.', 'event_espresso'),
 						"<a href='$reset_db_page_url'>",
 						"</a>",
 						$most_recent_migration->slug()
 					);
 					?>
 					</p>
-					<p><?php _e( "If you ever decide to re-attempt using EE4, you will again be given the option to migrate your EE3 data or not.", 'event_espresso' ); ?></p>
+					<p><?php _e("If you ever decide to re-attempt using EE4, you will again be given the option to migrate your EE3 data or not.", 'event_espresso'); ?></p>
 				</td>
 			</tr>
 

admin_pages/maintenance/templates/ee_upgrade_addons_before_migrating.template.php

Spacing +3 added lines, -3 removed lines

@@ -1,6 +1,6 @@
 <?php
 
 ?>
-<h1><?php esc_html_e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso");?></h1>
-<p><?php printf(esc_html__("Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.", "event_espresso"), "<a href='".admin_url('/plugins.php')."'>","</a>");?></p>
-<p><?php esc_html_e("You can also deactivate the addons, but all of their data will be lost when your database is migrated", "event_espresso");?></p>
\ No newline at end of file
+<h1><?php esc_html_e("You must upgrade your Event Espresso Add-ons before Migrating", "event_espresso"); ?></h1>
+<p><?php printf(esc_html__("Please %s visit the plugins page%s and update all Event Espresso addon plugins before updating your database.", "event_espresso"), "<a href='".admin_url('/plugins.php')."'>", "</a>"); ?></p>
+<p><?php esc_html_e("You can also deactivate the addons, but all of their data will be lost when your database is migrated", "event_espresso"); ?></p>
\ No newline at end of file

admin_pages/maintenance/templates/ee_migration_page.template.php

Indentation +57 added lines, -57 removed lines

@@ -28,29 +28,29 @@ 
             <h3 class="espresso-header">
                 <span class="dashicons dashicons-flag ee-icon-size-22"></span>
                 <?php
-                echo apply_filters(
-                        'FHEE__ee_migration_page__header',
-                        sprintf(
-                                esc_html__("Your Event Espresso data needs to be updated.", "event_espresso"),
-                                $current_db_state,
-                                $next_db_state
-                        ),
-                        $current_db_state,
-                        $next_db_state
-                );
-                ?>
+				echo apply_filters(
+						'FHEE__ee_migration_page__header',
+						sprintf(
+								esc_html__("Your Event Espresso data needs to be updated.", "event_espresso"),
+								$current_db_state,
+								$next_db_state
+						),
+						$current_db_state,
+						$next_db_state
+				);
+				?>
             </h3>
         <?php } elseif ($show_most_recent_migration) { ?>
             <h3 class="espresso-header">
                 <span class="dashicons dashicons-awards ee-icon-size-22"></span>
                 <?php echo apply_filters('FHEE__ee_migration_page__done_migration_header',
-                        sprintf(esc_html__('Congratulations! Your database is "up-to-date" and you are ready to begin using %s',
-                                "event_espresso"), $ultimate_db_state)); ?>
+						sprintf(esc_html__('Congratulations! Your database is "up-to-date" and you are ready to begin using %s',
+								"event_espresso"), $ultimate_db_state)); ?>
             </h3>
             <p>
                 <?php echo apply_filters('FHEE__ee_migration_page__p_after_done_migration_header',
-                        sprintf(esc_html__("Time to find out about all the great new features %s has to offer.",
-                                "event_espresso"), $ultimate_db_state)); ?> &nbsp;
+						sprintf(esc_html__("Time to find out about all the great new features %s has to offer.",
+								"event_espresso"), $ultimate_db_state)); ?> &nbsp;
                 <b><a id="get-started-after-migrate" class="button-primary"
                       href="<?php echo add_query_arg(array('page' => 'espresso_about'), admin_url('admin.php')); ?>">
                         <?php esc_html_e("Let's Get Started", "event_espresso"); ?>&nbsp;<span
@@ -61,34 +61,34 @@ 
 
 
         <?php if ($show_backup_db_text) {
-            echo $migration_options_html;
-        } ?>
+			echo $migration_options_html;
+		} ?>
 
         <?php
-        if ($show_most_recent_migration) {
-            if ($most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base) {
-                if ($most_recent_migration->can_continue()) {
-                    //tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
+		if ($show_most_recent_migration) {
+			if ($most_recent_migration && $most_recent_migration instanceof EE_Data_Migration_Script_Base) {
+				if ($most_recent_migration->can_continue()) {
+					//tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
                     <h3 class="espresso-header">
                         <span class="dashicons dashicons-star-half ee-icon-size-22"></span>
                         <?php printf(esc_html__("It appears that your previous Database Update (%s) is incomplete, and should be resumed",
-                                "event_espresso"), $most_recent_migration->pretty_name()); ?>
+								"event_espresso"), $most_recent_migration->pretty_name()); ?>
                     </h3>
                 <?php } elseif ($most_recent_migration->is_broken()) {
-                    //tell the user the migration failed and they should notify EE?>
+					//tell the user the migration failed and they should notify EE?>
                     <h3 class="espresso-header">
                         <span class="dashicons dashicons-no ee-icon-size-22"></span>
                         <?php echo $most_recent_migration->get_feedback_message() ?>
                     </h3>
                 <?php }
-                //display errors or not of the most recent migration ran
-                if ($most_recent_migration->get_errors()) { ?>
+				//display errors or not of the most recent migration ran
+				if ($most_recent_migration->get_errors()) { ?>
                     <div class="ee-attention">
                         <strong><?php printf(esc_html__("Warnings occurred during your last Database Update (%s):",
-                                    'event_espresso'),
-                                    $most_recent_migration->pretty_name()) ?></strong>
+									'event_espresso'),
+									$most_recent_migration->pretty_name()) ?></strong>
                         <a id="show-hide-migration-warnings" class="display-the-hidden"><?php esc_html_e("Show Warnings",
-                                    'event_espresso'); ?></a>
+									'event_espresso'); ?></a>
                         <ul class="migration-warnings" style="display:none">
                             <?php foreach ($most_recent_migration->get_errors() as $error) { ?>
                                 <li><?php echo htmlentities($error) ?></li>
@@ -96,15 +96,15 @@ 
                         </ul>
                     </div>
                 <?php } else {
-                    //there were no errors during the last migration, just say so?>
+					//there were no errors during the last migration, just say so?>
                     <h2><?php printf(esc_html__("The last Database Update (%s) ran successfully without errors.",
-                                "event_espresso"), $most_recent_migration->pretty_name()) ?></h2>
+								"event_espresso"), $most_recent_migration->pretty_name()) ?></h2>
                 <?php }
-            } else {
-            }
-        }
-        // end of: if ( $show_most_recent_migration )
-        ?>
+			} else {
+			}
+		}
+		// end of: if ( $show_most_recent_migration )
+		?>
 
     </div>
     <!--end of #migration-prep-->
@@ -124,12 +124,12 @@ 
             <div id='progress-area'>
                 <h3 class="espresso-header">
                     <?php
-                    echo sprintf(_n(
-                            "The following task needs to be performed:",
-                            "The following %s tasks need to be performed:",
-                            count($script_names),
-                            "event_espresso"
-                    ), count($script_names)); ?>
+					echo sprintf(_n(
+							"The following task needs to be performed:",
+							"The following %s tasks need to be performed:",
+							count($script_names),
+							"event_espresso"
+					), count($script_names)); ?>
                 </h3>
                 <ul style="list-style: inside;">
                     <?php foreach ($script_names as $script_name) { ?>
@@ -139,7 +139,7 @@ 
                 <br/>
                 <?php if (count($script_names) > 1) { ?>
                     <p><?php esc_html_e("Please note: after each task is completed you will need to continue the Database Update, or report an error to Event Espresso.",
-                                "event_espresso"); ?></p>
+								"event_espresso"); ?></p>
                 <?php } ?>
 
                 <div class="ee-attention">
@@ -149,11 +149,11 @@ 
 					</span>
                         <br/>
                         <?php esc_html_e("Depending on the number of events and the complexity of the information in your database, this could take a few minutes.",
-                                "event_espresso"); ?>
+								"event_espresso"); ?>
                     </p>
                     <p>
                         <?php printf(esc_html__("%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.",
-                                "event_espresso"), '<strong>', '</strong>'); ?>
+								"event_espresso"), '<strong>', '</strong>'); ?>
                     </p>
                     <p>
                         <?php esc_html_e("Click the button below to begin the migration process.", "event_espresso") ?>
@@ -169,8 +169,8 @@ 
 
                 <button id='start-migration' class='button-primary'>
                     <?php echo $show_continue_current_migration_script ? esc_html__("Continue Database Update",
-                            "event_espresso")
-                            : esc_html__("Begin Database Update", "event_espresso"); ?>
+							"event_espresso")
+							: esc_html__("Begin Database Update", "event_espresso"); ?>
                 </button>
                 <br class="clear"/>
 
@@ -186,10 +186,10 @@ 
         </div>
 
     <?php }
-    if ($show_maintenance_switch) {
-        ?>
+	if ($show_maintenance_switch) {
+		?>
         <h2><span class="dashicons dashicons-admin-tools"></span><?php esc_html_e('Set Event Espresso Maintenance Mode',
-                    'event_espresso'); ?></h2>
+					'event_espresso'); ?></h2>
         <form method='post' action='<?php echo $update_migration_script_page_link ?>'>
             <div class="ee-table-wrap">
                 <table>
@@ -197,15 +197,15 @@ 
                         <td width="40px" align="center">
                             <input type="radio" id="maintenance_mode_level_off" name="maintenance_mode_level"
                                    value="0" <?php echo EE_Maintenance_Mode::instance()->level()
-                                                        == EE_Maintenance_Mode::level_0_not_in_maintenance
-                                    ? 'checked="checked"' : '' ?>>
+														== EE_Maintenance_Mode::level_0_not_in_maintenance
+									? 'checked="checked"' : '' ?>>
                         </td>
                         <th align="left">
                             <label for="maintenance_mode_level_off"><?php esc_html_e('Maintenance Mode OFF',
-                                        'event_espresso'); ?></label>
+										'event_espresso'); ?></label>
                             <p class='description' style="font-weight: normal;">
                                 <?php esc_html_e("This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.",
-                                        "event_espresso"); ?>
+										"event_espresso"); ?>
                             </p>
                         </th>
                     </tr>
@@ -213,8 +213,8 @@ 
                         <td width="40px" align="center">
                             <input type="radio" id="maintenance_mode_level_on" name="maintenance_mode_level"
                                    value="1" <?php echo EE_Maintenance_Mode::instance()->level()
-                                                        == EE_Maintenance_Mode::level_1_frontend_only_maintenance
-                                    ? 'checked="checked"' : '' ?>>
+														== EE_Maintenance_Mode::level_1_frontend_only_maintenance
+									? 'checked="checked"' : '' ?>>
                         </td>
                         <th align="left">
                             <label for="maintenance_mode_level_on">
@@ -222,7 +222,7 @@ 
                             </label>
                             <p class='description' style="font-weight: normal;">
                                 <?php esc_html_e("This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.",
-                                        "event_espresso"); ?>
+										"event_espresso"); ?>
                             </p>
                         </th>
                     </tr>
@@ -234,6 +234,6 @@ 
             </p>
         </form>
         <?php
-    } ?>
+	} ?>
 
 </div>

admin_pages/maintenance/templates/ee_migration_was_borked_page.template.php

Spacing +15 added lines, -15 removed lines

@@ -1,26 +1,26 @@
 <?php
 
 ?>
-<h1><?php esc_html_e("Data Migration Error", "event_espresso");?></h1>
-<p class='error'><?php printf(esc_html__("Your last Database Update had a %s FATAL ERROR, and CANNOT be continued%s.", "event_espresso"),"<b>","</b>");?></p>
-<a id="show-hide-migration-warnings" class="display-the-hidden"><?php esc_html_e("Show Errors", 'event_espresso');?></a>
+<h1><?php esc_html_e("Data Migration Error", "event_espresso"); ?></h1>
+<p class='error'><?php printf(esc_html__("Your last Database Update had a %s FATAL ERROR, and CANNOT be continued%s.", "event_espresso"), "<b>", "</b>"); ?></p>
+<a id="show-hide-migration-warnings" class="display-the-hidden"><?php esc_html_e("Show Errors", 'event_espresso'); ?></a>
 <ul class="migration-warnings" style="display:none">
-<?php foreach($most_recent_migration->get_errors() as $error){ ?>
+<?php foreach ($most_recent_migration->get_errors() as $error) { ?>
 	<li style="overflow-y:auto;max-height:100px"><?php echo esc_html($error)?></li>
 <?php }?>
 </ul>
-<h2><?php esc_html_e("Fill out the below form to automatically Send Event Espresso a Crash Report", "event_espresso");?></h2>
-<form action='<?php echo EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_migration_crash_report'), EE_MAINTENANCE_ADMIN_URL);?>' method='post'>
+<h2><?php esc_html_e("Fill out the below form to automatically Send Event Espresso a Crash Report", "event_espresso"); ?></h2>
+<form action='<?php echo EE_Admin_Page::add_query_args_and_nonce(array('action'=>'send_migration_crash_report'), EE_MAINTENANCE_ADMIN_URL); ?>' method='post'>
 	<table class='widefat'>
-		<tr><td><label for='from'><?php esc_html_e("From/Reply-To:", "event_espresso");?></label></td><td><input name='from' id='from' type='text' style="width:200px"value='<?php echo get_bloginfo('admin_email','display'); ?>'></td></tr>
-		<tr><td><label for='from_name'><?php esc_html_e("Your Name", "event_espresso");?></label></td><td><input name='from_name' id='from_name' type='text' style="width:200px"value='<?php printf(esc_html__("Admin of %s", "event_espresso"),get_bloginfo('name','display'));?>'></td></tr>
-		<tr><td><label for='body'><?php esc_html_e("Comments", "event_espresso");?></label></td><td><textarea name="body" id="body" class='system_status_info'><?php esc_html_e("Enter any comments about why you think the error may have occurred", "event_espresso");?></textarea>
-			<p class='description'><?php esc_html_e("Note: the System Information report will also be added to the email's body, which contains information about your Event Espresso, Wordpress, and PHP settings which can be helpful in debugging the problem.", "event_espresso");?></p></td></tr>
-		<tr><td colspan="2"><input type="submit" value="<?php esc_html_e("Mail Crash Report to Event Espresso", "event_espresso");?>"/></td></tr>
+		<tr><td><label for='from'><?php esc_html_e("From/Reply-To:", "event_espresso"); ?></label></td><td><input name='from' id='from' type='text' style="width:200px"value='<?php echo get_bloginfo('admin_email', 'display'); ?>'></td></tr>
+		<tr><td><label for='from_name'><?php esc_html_e("Your Name", "event_espresso"); ?></label></td><td><input name='from_name' id='from_name' type='text' style="width:200px"value='<?php printf(esc_html__("Admin of %s", "event_espresso"), get_bloginfo('name', 'display')); ?>'></td></tr>
+		<tr><td><label for='body'><?php esc_html_e("Comments", "event_espresso"); ?></label></td><td><textarea name="body" id="body" class='system_status_info'><?php esc_html_e("Enter any comments about why you think the error may have occurred", "event_espresso"); ?></textarea>
+			<p class='description'><?php esc_html_e("Note: the System Information report will also be added to the email's body, which contains information about your Event Espresso, Wordpress, and PHP settings which can be helpful in debugging the problem.", "event_espresso"); ?></p></td></tr>
+		<tr><td colspan="2"><input type="submit" value="<?php esc_html_e("Mail Crash Report to Event Espresso", "event_espresso"); ?>"/></td></tr>
 	</table>
 </form>
 <br>
-<p><?php printf(esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"),'<a href="mailto:'.EE_SUPPORT_EMAIL.'">',EE_SUPPORT_EMAIL,"</a>");?></p>
-<textarea class="system_status_info"><?php print_r( EEM_System_Status::instance()->get_system_stati())?></textarea>
-<p><?php printf( esc_html__( '%1$sNext Step%2$s', 'event_espresso' ), "<a href='$next_url'>","</a>");?></p>
-<p><?php printf( esc_html__( '...or %1$sDON\'T send crash report%2$s.', 'event_espresso' ), "<a href='$next_url'>","</a>");?></p>
+<p><?php printf(esc_html__('...or copy-and-paste the below information to %1$s %2$s %3$s', "event_espresso"), '<a href="mailto:'.EE_SUPPORT_EMAIL.'">', EE_SUPPORT_EMAIL, "</a>"); ?></p>
+<textarea class="system_status_info"><?php print_r(EEM_System_Status::instance()->get_system_stati())?></textarea>
+<p><?php printf(esc_html__('%1$sNext Step%2$s', 'event_espresso'), "<a href='$next_url'>", "</a>"); ?></p>
+<p><?php printf(esc_html__('...or %1$sDON\'T send crash report%2$s.', 'event_espresso'), "<a href='$next_url'>", "</a>"); ?></p>