eventespresso / event-espresso-core

admin_pages/messages/templates/ee_msg_editor_active_context_element.template.php

Indentation +14 added lines, -14 removed lines

@@ -15,22 +15,22 @@
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 $active_message   = sprintf(
-    esc_html__(
-        'The template for %1$s is currently %2$sactive%3$s.',
-        'event_espresso'
-    ),
-    $context_label,
-    '<strong>',
-    '</strong>'
+	esc_html__(
+		'The template for %1$s is currently %2$sactive%3$s.',
+		'event_espresso'
+	),
+	$context_label,
+	'<strong>',
+	'</strong>'
 );
 $inactive_message = sprintf(
-    esc_html__(
-        'The template for %1$s is currently %2$sinactive%3$s.',
-        'event_espresso'
-    ),
-    $context_label,
-    '<strong>',
-    '</strong>'
+	esc_html__(
+		'The template for %1$s is currently %2$sinactive%3$s.',
+		'event_espresso'
+	),
+	$context_label,
+	'<strong>',
+	'</strong>'
 );
 
 $context = esc_attr($context);

core/data_migration_scripts/EE_DMS_Core_4_1_0.dms.php

Spacing +76 added lines, -76 removed lines

@@ -11,13 +11,13 @@ 
 // unfortunately, this needs to be done upon INCLUSION of this file,
 // instead of construction, because it only gets constructed on first page load
 // (all other times it gets resurrected from a wordpress option)
-$stages = glob(EE_CORE . 'data_migration_scripts/4_1_0_stages/*');
+$stages = glob(EE_CORE.'data_migration_scripts/4_1_0_stages/*');
 $class_to_filepath = array();
-if (! empty($stages)) {
+if ( ! empty($stages)) {
     foreach ($stages as $filepath) {
         $matches = array();
         preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-        $class_to_filepath[ $matches[1] ] = $filepath;
+        $class_to_filepath[$matches[1]] = $filepath;
     }
 }
 // give addons a chance to autoload their stages too
@@ -89,7 +89,7 @@ 
     private function _checkin_table_exists()
     {
         global $wpdb;
-        $results = $wpdb->get_results("SHOW TABLES LIKE '" . $wpdb->prefix . "events_attendee_checkin" . "'");
+        $results = $wpdb->get_results("SHOW TABLES LIKE '".$wpdb->prefix."events_attendee_checkin"."'");
         if ($results) {
             return true;
         } else {
@@ -105,11 +105,11 @@ 
         if (version_compare($version_string, '4.0.0.decaf', '<') && version_compare($version_string, '3.1.26', '>=')) {
 //          echo "$version_string can be migrated fro";
             return true;
-        } elseif (! $version_string) {
+        } elseif ( ! $version_string) {
 //          echo "no version string provided: $version_string";
             // no version string provided... this must be pre 4.1
             // because since 4.1 we're
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
+            return false; // changed mind. dont want people thinking they should migrate yet because they cant
         } else {
 //          echo "$version_string doesnt apply";
             return false;
@@ -121,7 +121,7 @@ 
     public function schema_changes_before_migration()
     {
         // relies on 4.1's EEH_Activation::create_table
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+        require_once(EE_HELPERS.'EEH_Activation.helper.php');
         $table_name = 'esp_answer';
         $sql = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
@@ -505,12 +505,12 @@ 
     public function insert_default_states()
     {
         global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
+        $state_table = $wpdb->prefix."esp_state";
         if ($this->_get_table_analysis()->tableExists($state_table)) {
-            $SQL = "SELECT COUNT('STA_ID') FROM " . $state_table;
+            $SQL = "SELECT COUNT('STA_ID') FROM ".$state_table;
             $states = $wpdb->get_var($SQL);
-            if (! $states) {
-                $SQL = "INSERT INTO " . $state_table . "
+            if ( ! $states) {
+                $SQL = "INSERT INTO ".$state_table."
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -601,12 +601,12 @@ 
     public function insert_default_countries()
     {
         global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
+        $country_table = $wpdb->prefix."esp_country";
         if ($this->_get_table_analysis()->tableExists($country_table)) {
-            $SQL = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+            $SQL = "SELECT COUNT('CNT_ISO') FROM ".$country_table;
             $countries = $wpdb->get_var($SQL);
-            if (! $countries) {
-                $SQL = "INSERT INTO " . $country_table . "
+            if ( ! $countries) {
+                $SQL = "INSERT INTO ".$country_table."
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -851,17 +851,17 @@ 
     public function insert_default_price_types()
     {
         global $wpdb;
-        $price_type_table = $wpdb->prefix . "esp_price_type";
+        $price_type_table = $wpdb->prefix."esp_price_type";
         if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
+            $SQL = 'SELECT COUNT(PRT_ID) FROM '.$price_type_table;
             $price_types_exist = $wpdb->get_var($SQL);
-            if (! $price_types_exist) {
+            if ( ! $price_types_exist) {
                 $SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
-							(1, '" . esc_html__('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
-							(2, '" . esc_html__('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
-							(3, '" . esc_html__('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
-							(4, '" . esc_html__('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
-							(5, '" . esc_html__('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
+							(1, '".esc_html__('Base Price', 'event_espresso')."', 1,  0, 0, 0),
+							(2, '" . esc_html__('Percent Discount', 'event_espresso')."', 2,  1, 20, 0),
+							(3, '" . esc_html__('Fixed Discount', 'event_espresso')."', 2,  0, 30, 0),
+							(4, '" . esc_html__('Percent Surcharge', 'event_espresso')."', 3,  1, 40, 0),
+							(5, '" . esc_html__('Fixed Surcharge', 'event_espresso')."', 3,  0, 50, 0);";
                 $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
                 $wpdb->query($SQL);
             }
@@ -883,11 +883,11 @@ 
     public function insert_default_prices()
     {
         global $wpdb;
-        $price_table = $wpdb->prefix . "esp_price";
+        $price_table = $wpdb->prefix."esp_price";
         if ($this->_get_table_analysis()->tableExists($price_table)) {
-            $SQL = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
+            $SQL = 'SELECT COUNT(PRC_ID) FROM '.$price_table;
             $prices_exist = $wpdb->get_var($SQL);
-            if (! $prices_exist) {
+            if ( ! $prices_exist) {
                 $SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Admission', '', 1, null, 0, 0, 0);";
@@ -909,11 +909,11 @@ 
     public function insert_default_tickets()
     {
         global $wpdb;
-        $ticket_table = $wpdb->prefix . "esp_ticket";
+        $ticket_table = $wpdb->prefix."esp_ticket";
         if ($this->_get_table_analysis()->tableExists($ticket_table)) {
-            $SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+            $SQL = 'SELECT COUNT(TKT_ID) FROM '.$ticket_table;
             $tickets_exist = $wpdb->get_var($SQL);
-            if (! $tickets_exist) {
+            if ( ! $tickets_exist) {
                 $SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
 					( 1, 0, '"
@@ -923,11 +923,11 @@ 
                 $wpdb->query($SQL);
             }
         }
-        $ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+        $ticket_price_table = $wpdb->prefix."esp_ticket_price";
         if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
-            $SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+            $SQL = 'SELECT COUNT(TKP_ID) FROM '.$ticket_price_table;
             $ticket_prc_exist = $wpdb->get_var($SQL);
-            if (! $ticket_prc_exist) {
+            if ( ! $ticket_prc_exist) {
                 $SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
@@ -951,11 +951,11 @@ 
      */
     public function get_or_create_country($country_name)
     {
-        if (! $country_name) {
+        if ( ! $country_name) {
             throw new EE_Error(esc_html__("Could not get a country because country name is blank", "event_espresso"));
         }
         global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
+        $country_table = $wpdb->prefix."esp_country";
         if (is_int($country_name)) {
             $country_name = $this->get_iso_from_3_1_country_id($country_name);
         }
@@ -963,7 +963,7 @@ 
 			CNT_ISO LIKE %s OR
 			CNT_ISO3 LIKE %s OR
 			CNT_name LIKE %s LIMIT 1", $country_name, $country_name, $country_name), ARRAY_A);
-        if (! $country) {
+        if ( ! $country) {
             // insert a new one then
             $cols_n_values = array(
                     'CNT_ISO'         => $this->_find_available_country_iso(2),
@@ -983,28 +983,28 @@ 
                     'CNT_active'      => true,
             );
             $data_types = array(
-                    '%s',// CNT_ISO
-                    '%s',// CNT_ISO3
-                    '%d',// RGN_ID
-                    '%s',// CNT_name
-                    '%s',// CNT_cur_code
-                    '%s',// CNT_cur_single
-                    '%s',// CNT_cur_plural
-                    '%s',// CNT_cur_sign
-                    '%d',// CNT_cur_sign_b4
-                    '%d',// CNT_cur_dec_plc
-                    '%s',// CNT_cur_dec_mrk
-                    '%s',// CNT_cur_thsnds
-                    '%s',// CNT_tel_code
-                    '%d',// CNT_is_EU
-                    '%d',// CNT_active
+                    '%s', // CNT_ISO
+                    '%s', // CNT_ISO3
+                    '%d', // RGN_ID
+                    '%s', // CNT_name
+                    '%s', // CNT_cur_code
+                    '%s', // CNT_cur_single
+                    '%s', // CNT_cur_plural
+                    '%s', // CNT_cur_sign
+                    '%d', // CNT_cur_sign_b4
+                    '%d', // CNT_cur_dec_plc
+                    '%s', // CNT_cur_dec_mrk
+                    '%s', // CNT_cur_thsnds
+                    '%s', // CNT_tel_code
+                    '%d', // CNT_is_EU
+                    '%d', // CNT_active
             );
             $success = $wpdb->insert(
                 $country_table,
                 $cols_n_values,
                 $data_types
             );
-            if (! $success) {
+            if ( ! $success) {
                 throw new EE_Error($this->_create_error_message_for_db_insertion(
                     'N/A',
                     array('country_id' => $country_name),
@@ -1029,7 +1029,7 @@ 
     private function _find_available_country_iso($num_letters = 2)
     {
         global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
+        $country_table = $wpdb->prefix."esp_country";
         $attempts = 0;
         do {
             $current_iso = strtoupper(wp_generate_password($num_letters, false));
@@ -1040,7 +1040,7 @@ 
             // keep going until we find an available country code, or we arbitrarily
             // decide we've tried this enough. Somehow they have way too many countries
             // (probably because they're mis-using the EE3 country_id like a custom question)
-        } while (intval($country_with_that_iso) && $attempts < 200);
+        }while (intval($country_with_that_iso) && $attempts < 200);
         return $current_iso;
     }
 
@@ -1056,7 +1056,7 @@ 
      */
     public function get_or_create_state($state_name, $country_name = '')
     {
-        if (! $state_name) {
+        if ( ! $state_name) {
             throw new EE_Error(esc_html__(
                 "Could not get-or-create state because no state name was provided",
                 "event_espresso"
@@ -1069,12 +1069,12 @@ 
             $country_iso = $this->get_default_country_iso();
         }
         global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
+        $state_table = $wpdb->prefix."esp_state";
         $state = $wpdb->get_row($wpdb->prepare("SELECT * FROM $state_table WHERE
 			(STA_abbrev LIKE %s OR
 			STA_name LIKE %s) AND
 			CNT_ISO LIKE %s LIMIT 1", $state_name, $state_name, $country_iso), ARRAY_A);
-        if (! $state) {
+        if ( ! $state) {
             // insert a new one then
             $cols_n_values = array(
                     'CNT_ISO'    => $country_iso,
@@ -1083,13 +1083,13 @@ 
                     'STA_active' => true,
             );
             $data_types = array(
-                    '%s',// CNT_ISO
-                    '%s',// STA_abbrev
-                    '%s',// STA_name
-                    '%d',// STA_active
+                    '%s', // CNT_ISO
+                    '%s', // STA_abbrev
+                    '%s', // STA_name
+                    '%d', // STA_active
             );
             $success = $wpdb->insert($state_table, $cols_n_values, $data_types);
-            if (! $success) {
+            if ( ! $success) {
                 throw new EE_Error($this->_create_error_message_for_db_insertion(
                     'N/A',
                     array('state' => $state_name, 'country_id' => $country_name),
@@ -1118,7 +1118,7 @@ 
     {
         $matches = array();
         preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
-        if (! $matches || count($matches) < 3) {
+        if ( ! $matches || count($matches) < 3) {
             $hour = '00';
             $minutes = '00';
         } else {
@@ -1423,7 +1423,7 @@ 
                     'Declined'         => 'RPP',
             );
         }
-        return isset($mapping[ $payment_status ]) ? $mapping[ $payment_status ] : 'RNA';
+        return isset($mapping[$payment_status]) ? $mapping[$payment_status] : 'RNA';
     }
 
 
@@ -1447,7 +1447,7 @@ 
         if ($guid) {
             // check for an existing attachment post with this guid
             $attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-            if (! $attachment_post_id) {
+            if ( ! $attachment_post_id) {
                 // post thumbnail with that GUID doesn't exist, we should create one
                 $attachment_post_id = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
                 $created_attachment_post = true;
@@ -1482,7 +1482,7 @@ 
         $original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
         // do a head request to verify the file exists
         $head_response = wp_remote_head($original_guid);
-        if (! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
+        if ( ! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
             return $original_guid;
         } else {
             return $guid_in_old_event;
@@ -1502,7 +1502,7 @@ 
      */
     private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage)
     {
-        if (! $guid) {
+        if ( ! $guid) {
             $migration_stage->add_error(sprintf(esc_html__(
                 "Cannot create image attachment for a blank GUID!",
                 "event_espresso"
@@ -1514,7 +1514,7 @@ 
         // if the file is located remotely, download it to our uploads DIR, because wp_genereate_attachmnet_metadata needs the file to be local
         if (strpos($guid, $wp_upload_dir['url']) === false) {
             // image is located remotely. download it and place it in the uploads directory
-            if (! is_readable($guid)) {
+            if ( ! is_readable($guid)) {
                 $migration_stage->add_error(sprintf(esc_html__(
                     "Could not create image attachment from non-existent file: %s",
                     "event_espresso"
@@ -1529,7 +1529,7 @@ 
                 ), $guid));
                 return false;
             }
-            $local_filepath = $wp_upload_dir['path'] . '/' . basename($guid);
+            $local_filepath = $wp_upload_dir['path'].'/'.basename($guid);
             $savefile = fopen($local_filepath, 'w');
             fwrite($savefile, $contents);
             fclose($savefile);
@@ -1545,7 +1545,7 @@ 
                 'post_status'    => 'inherit',
         );
         $attach_id = wp_insert_attachment($attachment, $guid);
-        if (! $attach_id) {
+        if ( ! $attach_id) {
             $migration_stage->add_error(sprintf(esc_html__(
                 "Could not create image attachment post from image '%s'. Attachment data was %s.",
                 "event_espresso"
@@ -1554,9 +1554,9 @@ 
         }
         // you must first include the image.php file
         // for the function wp_generate_attachment_metadata() to work
-        require_once(ABSPATH . 'wp-admin/includes/image.php');
+        require_once(ABSPATH.'wp-admin/includes/image.php');
         $attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
-        if (! $attach_data) {
+        if ( ! $attach_data) {
             $migration_stage->add_error(sprintf(esc_html__(
                 "Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.",
                 "event_espresso"
@@ -1564,7 +1564,7 @@ 
             return $attach_id;
         }
         $metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
-        if (! $metadata_save_result) {
+        if ( ! $metadata_save_result) {
             $migration_stage->add_error(sprintf(esc_html__(
                 "Could not update attachment metadata for attachment %d with data %s",
                 "event_espresso"
@@ -1610,10 +1610,10 @@ 
         $timezone = null
     ) {
         $original_tz = $timezone;
-        if (! $timezone) {
+        if ( ! $timezone) {
             $timezone = $this->_get_wp_timezone();
         }
-        if (! $timezone) {
+        if ( ! $timezone) {
             $stage->add_error(sprintf(
                 esc_html__("Could not find timezone given %s for %s", "event_espresso"),
                 $original_tz,
@@ -1746,7 +1746,7 @@ 
         );
         add_filter(
             'FHEE__ee_migration_page__migration_options_template',
-            array($this,'use_migration_options_from_ee3_template')
+            array($this, 'use_migration_options_from_ee3_template')
         );
     }
 
@@ -1812,6 +1812,6 @@ 
      */
     public function use_migration_options_from_ee3_template($template_filepath)
     {
-        return EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee3.template.php';
+        return EE_MAINTENANCE_TEMPLATE_PATH.'migration_options_from_ee3.template.php';
     }
 }

Indentation +1178 added lines, -1178 removed lines

@@ -14,11 +14,11 @@ 
 $stages = glob(EE_CORE . 'data_migration_scripts/4_1_0_stages/*');
 $class_to_filepath = array();
 if (! empty($stages)) {
-    foreach ($stages as $filepath) {
-        $matches = array();
-        preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
-        $class_to_filepath[ $matches[1] ] = $filepath;
-    }
+	foreach ($stages as $filepath) {
+		$matches = array();
+		preg_match('~4_1_0_stages/(.*).dmsstage.php~', $filepath, $matches);
+		$class_to_filepath[ $matches[1] ] = $filepath;
+	}
 }
 // give addons a chance to autoload their stages too
 $class_to_filepath = apply_filters('FHEE__EE_DMS_4_1_0__autoloaded_stages', $class_to_filepath);
@@ -43,91 +43,91 @@ 
  */
 class EE_DMS_Core_4_1_0 extends EE_Data_Migration_Script_Base
 {
-    /**
-     * EE_DMS_Core_4_1_0 constructor.
-     *
-     * @param TableManager  $table_manager
-     * @param TableAnalysis $table_analysis
-     */
-    public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
-    {
-        $this->_pretty_name = esc_html__("Data Migration from Event Espresso 3 to Event Espresso 4.1.0", "event_espresso");
-        $this->_priority = 10;
-        $this->_migration_stages = array(
-                new EE_DMS_4_1_0_org_options(),
-                new EE_DMS_4_1_0_shortcodes(),
-                new EE_DMS_4_1_0_gateways(),
-                new EE_DMS_4_1_0_events(),
-                new EE_DMS_4_1_0_prices(),
-                new EE_DMS_4_1_0_category_details(),
-                new EE_DMS_4_1_0_event_category(),
-                new EE_DMS_4_1_0_venues(),
-                new EE_DMS_4_1_0_event_venue(),
-                new EE_DMS_4_1_0_question_groups(),
-                new EE_DMS_4_1_0_questions(),
-                new EE_DMS_4_1_0_question_group_question(),
-                new EE_DMS_4_1_0_event_question_group(),
-                new EE_DMS_4_1_0_attendees(),
-                new EE_DMS_4_1_0_line_items(),
-                new EE_DMS_4_1_0_answers(),
-                new EE_DMS_4_1_0_checkins(),
-        );
-        parent::__construct($table_manager, $table_analysis);
-    }
-
-
-
-    /**
-     * Checks if this 3.1 Check-in table exists. If it doesn't we can't migrate Check-ins
-     *
-     * @global wpdb $wpdb
-     * @return boolean
-     */
-    private function _checkin_table_exists()
-    {
-        global $wpdb;
-        $results = $wpdb->get_results("SHOW TABLES LIKE '" . $wpdb->prefix . "events_attendee_checkin" . "'");
-        if ($results) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-
-
-    public function can_migrate_from_version($version_array)
-    {
-        $version_string = $version_array['Core'];
-        if (version_compare($version_string, '4.0.0.decaf', '<') && version_compare($version_string, '3.1.26', '>=')) {
+	/**
+	 * EE_DMS_Core_4_1_0 constructor.
+	 *
+	 * @param TableManager  $table_manager
+	 * @param TableAnalysis $table_analysis
+	 */
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null)
+	{
+		$this->_pretty_name = esc_html__("Data Migration from Event Espresso 3 to Event Espresso 4.1.0", "event_espresso");
+		$this->_priority = 10;
+		$this->_migration_stages = array(
+				new EE_DMS_4_1_0_org_options(),
+				new EE_DMS_4_1_0_shortcodes(),
+				new EE_DMS_4_1_0_gateways(),
+				new EE_DMS_4_1_0_events(),
+				new EE_DMS_4_1_0_prices(),
+				new EE_DMS_4_1_0_category_details(),
+				new EE_DMS_4_1_0_event_category(),
+				new EE_DMS_4_1_0_venues(),
+				new EE_DMS_4_1_0_event_venue(),
+				new EE_DMS_4_1_0_question_groups(),
+				new EE_DMS_4_1_0_questions(),
+				new EE_DMS_4_1_0_question_group_question(),
+				new EE_DMS_4_1_0_event_question_group(),
+				new EE_DMS_4_1_0_attendees(),
+				new EE_DMS_4_1_0_line_items(),
+				new EE_DMS_4_1_0_answers(),
+				new EE_DMS_4_1_0_checkins(),
+		);
+		parent::__construct($table_manager, $table_analysis);
+	}
+
+
+
+	/**
+	 * Checks if this 3.1 Check-in table exists. If it doesn't we can't migrate Check-ins
+	 *
+	 * @global wpdb $wpdb
+	 * @return boolean
+	 */
+	private function _checkin_table_exists()
+	{
+		global $wpdb;
+		$results = $wpdb->get_results("SHOW TABLES LIKE '" . $wpdb->prefix . "events_attendee_checkin" . "'");
+		if ($results) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+
+
+	public function can_migrate_from_version($version_array)
+	{
+		$version_string = $version_array['Core'];
+		if (version_compare($version_string, '4.0.0.decaf', '<') && version_compare($version_string, '3.1.26', '>=')) {
 //          echo "$version_string can be migrated fro";
-            return true;
-        } elseif (! $version_string) {
+			return true;
+		} elseif (! $version_string) {
 //          echo "no version string provided: $version_string";
-            // no version string provided... this must be pre 4.1
-            // because since 4.1 we're
-            return false;// changed mind. dont want people thinking they should migrate yet because they cant
-        } else {
+			// no version string provided... this must be pre 4.1
+			// because since 4.1 we're
+			return false;// changed mind. dont want people thinking they should migrate yet because they cant
+		} else {
 //          echo "$version_string doesnt apply";
-            return false;
-        }
-    }
+			return false;
+		}
+	}
 
 
 
-    public function schema_changes_before_migration()
-    {
-        // relies on 4.1's EEH_Activation::create_table
-        require_once(EE_HELPERS . 'EEH_Activation.helper.php');
-        $table_name = 'esp_answer';
-        $sql = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+	public function schema_changes_before_migration()
+	{
+		// relies on 4.1's EEH_Activation::create_table
+		require_once(EE_HELPERS . 'EEH_Activation.helper.php');
+		$table_name = 'esp_answer';
+		$sql = "ANS_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					ANS_value text NOT NULL,
 					PRIMARY KEY  (ANS_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_attendee_meta';
-        $sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_attendee_meta';
+		$sql = "ATTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 						ATT_ID bigint(20) unsigned NOT NULL,
 						ATT_fname varchar(45) NOT NULL,
 						ATT_lname varchar(45) NOT NULL,
@@ -143,9 +143,9 @@ 
 								KEY ATT_fname (ATT_fname),
 								KEY ATT_lname (ATT_lname),
 								KEY ATT_email (ATT_email(191))";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_country';
-        $sql = "CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_country';
+		$sql = "CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
 					  CNT_ISO3 varchar(3) COLLATE utf8_bin NOT NULL,
 					  RGN_ID tinyint(3) unsigned DEFAULT NULL,
 					  CNT_name varchar(45) COLLATE utf8_bin NOT NULL,
@@ -161,9 +161,9 @@ 
 					  CNT_is_EU tinyint(1) DEFAULT '0',
 					  CNT_active tinyint(1) DEFAULT '0',
 					  PRIMARY KEY  (CNT_ISO)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_datetime';
-        $sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_datetime';
+		$sql = "DTT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 				  EVT_ID bigint(20) unsigned NOT NULL,
 				  DTT_EVT_start datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 				  DTT_EVT_end datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -176,9 +176,9 @@ 
 						PRIMARY KEY  (DTT_ID),
 						KEY EVT_ID (EVT_ID),
 						KEY DTT_is_primary (DTT_is_primary)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_meta';
-        $sql = "
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_meta';
+		$sql = "
 			EVTM_ID int(10) NOT NULL AUTO_INCREMENT,
 			EVT_ID bigint(20) unsigned NOT NULL,
 			EVT_display_desc tinyint(1) unsigned NOT NULL DEFAULT 1,
@@ -193,31 +193,31 @@ 
 			EVT_external_URL varchar(200) NULL,
 			EVT_donations tinyint(1) NULL,
 			PRIMARY KEY  (EVTM_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_question_group';
-        $sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_question_group';
+		$sql = "EQG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned NOT NULL,
 					QSG_ID int(10) unsigned NOT NULL,
 					EQG_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (EQG_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_event_venue';
-        $sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_event_venue';
+		$sql = "EVV_ID int(11) NOT NULL AUTO_INCREMENT,
 				EVT_ID bigint(20) unsigned NOT NULL,
 				VNU_ID bigint(20) unsigned NOT NULL,
 				EVV_primary tinyint(1) unsigned NOT NULL DEFAULT 0,
 				PRIMARY KEY  (EVV_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_extra_meta';
-        $sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_extra_meta';
+		$sql = "EXM_ID int(11) NOT NULL AUTO_INCREMENT,
 				OBJ_ID int(11) DEFAULT NULL,
 				EXM_type varchar(45) DEFAULT NULL,
 				EXM_key varchar(45) DEFAULT NULL,
 				EXM_value text,
 				PRIMARY KEY  (EXM_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_line_item';
-        $sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_line_item';
+		$sql = "LIN_ID int(11) NOT NULL AUTO_INCREMENT,
 				LIN_code varchar(245) NOT NULL DEFAULT '',
 				TXN_ID int(11) DEFAULT NULL,
 				LIN_name varchar(245) NOT NULL DEFAULT '',
@@ -233,18 +233,18 @@ 
 				OBJ_ID int(11) DEFAULT NULL,
 				OBJ_type varchar(45)DEFAULT NULL,
 				PRIMARY KEY  (LIN_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template';
-        $sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template';
+		$sql = "MTP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					GRP_ID int(10) unsigned NOT NULL,
 					MTP_context varchar(50) NOT NULL,
 					MTP_template_field varchar(30) NOT NULL,
 					MTP_content text NOT NULL,
 					PRIMARY KEY  (MTP_ID),
 					KEY GRP_ID (GRP_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_message_template_group';
-        $sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_message_template_group';
+		$sql = "GRP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					EVT_ID bigint(20) unsigned DEFAULT NULL,
 					MTP_user_id int(10) NOT NULL DEFAULT '1',
 					MTP_messenger varchar(30) NOT NULL,
@@ -256,9 +256,9 @@ 
 					PRIMARY KEY  (GRP_ID),
 					KEY EVT_ID (EVT_ID),
 					KEY MTP_user_id (MTP_user_id)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_payment';
-        $sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_payment';
+		$sql = "PAY_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					TXN_ID int(10) unsigned DEFAULT NULL,
 					STS_ID varchar(3) COLLATE utf8_bin DEFAULT NULL,
 					PAY_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
@@ -274,9 +274,9 @@ 
 					PRIMARY KEY  (PAY_ID),
 					KEY TXN_ID (TXN_ID),
 					KEY PAY_timestamp (PAY_timestamp)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = "esp_ticket";
-        $sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = "esp_ticket";
+		$sql = "TKT_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_ID int(10) unsigned NOT NULL,
 					  TKT_name varchar(245) NOT NULL DEFAULT '',
 					  TKT_description text NOT NULL,
@@ -295,28 +295,28 @@ 
 					  TKT_parent int(10) unsigned DEFAULT '0',
 					  TKT_deleted tinyint(1) NOT NULL DEFAULT '0',
 					  PRIMARY KEY  (TKT_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_ticket_price";
-        $sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_ticket_price";
+		$sql = "TKP_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRC_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (TKP_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_datetime_ticket";
-        $sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_datetime_ticket";
+		$sql = "DTK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  DTT_ID int(10) unsigned NOT NULL,
 					  TKT_ID int(10) unsigned NOT NULL,
 					  PRIMARY KEY  (DTK_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_ticket_template";
-        $sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_ticket_template";
+		$sql = "TTM_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TTM_name varchar(45) NOT NULL,
 					  TTM_description text,
 					  TTM_file varchar(45),
 					  PRIMARY KEY  (TTM_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_price";
-        $sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_price";
+		$sql = "PRC_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  PRT_ID tinyint(3) unsigned NOT NULL,
 					  PRC_amount decimal(10,3) NOT NULL DEFAULT '0.00',
 					  PRC_name varchar(245) NOT NULL,
@@ -327,9 +327,9 @@ 
 					  PRC_order tinyint(3) unsigned NOT NULL DEFAULT '0',
 					  PRC_parent int(10) unsigned DEFAULT 0,
 					  PRIMARY KEY  (PRC_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = "esp_price_type";
-        $sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = "esp_price_type";
+		$sql = "PRT_ID tinyint(3) unsigned NOT NULL AUTO_INCREMENT,
 				  PRT_name varchar(45) NOT NULL,
 				  PBT_ID tinyint(3) unsigned NOT NULL DEFAULT '1',
 				  PRT_is_percent tinyint(1) NOT NULL DEFAULT '0',
@@ -337,9 +337,9 @@ 
 				  PRT_deleted tinyint(1) NOT NULL DEFAULT '0',
 				  UNIQUE KEY PRT_name_UNIQUE (PRT_name),
 				  PRIMARY KEY  (PRT_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question';
-        $sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question';
+		$sql = 'QST_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QST_display_text text NOT NULL,
 					QST_admin_label varchar(255) NOT NULL,
 					QST_system varchar(25) DEFAULT NULL,
@@ -351,10 +351,10 @@ 
 					QST_wp_user bigint(20) unsigned NULL,
 					QST_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QST_ID)';
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
-        $table_name = 'esp_question_group';
-        $sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$this->_get_table_manager()->dropIndex('esp_question_group', 'QSG_identifier_UNIQUE');
+		$table_name = 'esp_question_group';
+		$sql = 'QSG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_name varchar(255) NOT NULL,
 					QSG_identifier varchar(100) NOT NULL,
 					QSG_desc text NULL,
@@ -365,23 +365,23 @@ 
 					QSG_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSG_ID),
 					UNIQUE KEY QSG_identifier_UNIQUE (QSG_identifier ASC)';
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_group_question';
-        $sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_group_question';
+		$sql = "QGQ_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSG_ID int(10) unsigned NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					PRIMARY KEY  (QGQ_ID) ";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_question_option';
-        $sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_question_option';
+		$sql = "QSO_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					QSO_value varchar(255) NOT NULL,
 					QSO_desc text NOT NULL,
 					QST_ID int(10) unsigned NOT NULL,
 					QSO_deleted tinyint(1) unsigned NOT NULL DEFAULT 0,
 					PRIMARY KEY  (QSO_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_registration';
-        $sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_registration';
+		$sql = "REG_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  EVT_ID bigint(20) unsigned NOT NULL,
 					  ATT_ID bigint(20) unsigned NOT NULL,
 					  TXN_ID int(10) unsigned NOT NULL,
@@ -404,25 +404,25 @@ 
 					  KEY STS_ID (STS_ID),
 					  KEY REG_url_link (REG_url_link),
 					  KEY REG_code (REG_code)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
-        $table_name = 'esp_checkin';
-        $sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB ');
+		$table_name = 'esp_checkin';
+		$sql = "CHK_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					REG_ID int(10) unsigned NOT NULL,
 					DTT_ID int(10) unsigned NOT NULL,
 					CHK_in tinyint(1) unsigned NOT NULL DEFAULT 1,
 					CHK_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					PRIMARY KEY  (CHK_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_state';
-        $sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_state';
+		$sql = "STA_ID smallint(5) unsigned NOT NULL AUTO_INCREMENT,
 					  CNT_ISO varchar(2) COLLATE utf8_bin NOT NULL,
 					  STA_abbrev varchar(6) COLLATE utf8_bin NOT NULL,
 					  STA_name varchar(100) COLLATE utf8_bin NOT NULL,
 					  STA_active tinyint(1) DEFAULT '1',
 					  PRIMARY KEY  (STA_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_status';
-        $sql = "STS_ID varchar(3) COLLATE utf8_bin NOT NULL,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_status';
+		$sql = "STS_ID varchar(3) COLLATE utf8_bin NOT NULL,
 					  STS_code varchar(45) COLLATE utf8_bin NOT NULL,
 					  STS_type set('event','registration','transaction','payment','email') COLLATE utf8_bin NOT NULL,
 					  STS_can_edit tinyint(1) NOT NULL DEFAULT 0,
@@ -430,9 +430,9 @@ 
 					  STS_open tinyint(1) NOT NULL DEFAULT 1,
 					  UNIQUE KEY STS_ID_UNIQUE (STS_ID),
 					  KEY STS_type (STS_type)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_transaction';
-        $sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_transaction';
+		$sql = "TXN_ID int(10) unsigned NOT NULL AUTO_INCREMENT,
 					  TXN_timestamp datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 					  TXN_total decimal(10,3) DEFAULT '0.00',
 					  TXN_paid decimal(10,3) NOT NULL DEFAULT '0.00',
@@ -442,9 +442,9 @@ 
 					  PRIMARY KEY  (TXN_ID),
 					  KEY TXN_timestamp (TXN_timestamp),
 					  KEY STS_ID (STS_ID)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        $table_name = 'esp_venue_meta';
-        $sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		$table_name = 'esp_venue_meta';
+		$sql = "VNUM_ID int(11) NOT NULL AUTO_INCREMENT,
 			VNU_ID bigint(20) unsigned NOT NULL DEFAULT 0,
 			VNU_address varchar(255) DEFAULT NULL,
 			VNU_address2 varchar(255) DEFAULT NULL,
@@ -462,52 +462,52 @@ 
 			PRIMARY KEY  (VNUM_ID),
 			KEY STA_ID (STA_ID),
 			KEY CNT_ISO (CNT_ISO)";
-        $this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
-        // setting up the default stats and countries is also essential for the data migrations to run
-        // (because many need to convert old string states to foreign keys into the states table)
-        $this->insert_default_states();
-        $this->insert_default_countries();
-        // setting up default prices, price types, and tickets is also essential for the price migrations
-        $this->insert_default_price_types();
-        $this->insert_default_prices();
-        $this->insert_default_tickets();
-        // setting up the config wp option pretty well counts as a 'schema change', or at least should happen ehre
-        EE_Config::instance()->update_espresso_config(false, true);
-        return true;
-    }
-
-
-
-    /**
-     * Yes we could have cleaned up the ee3 tables here. But just in case someone
-     * didn't backup their DB, and decides they want ot keep using EE3, we'll
-     * leave them for now. Mayeb remove them in 4.5 or something.
-     *
-     * @return boolean
-     */
-    public function schema_changes_after_migration()
-    {
-        return true;
-    }
-
-
-
-    /**
-     * insert_default_states
-     *
-     * @access public
-     * @static
-     * @return void
-     */
-    public function insert_default_states()
-    {
-        global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
-        if ($this->_get_table_analysis()->tableExists($state_table)) {
-            $SQL = "SELECT COUNT('STA_ID') FROM " . $state_table;
-            $states = $wpdb->get_var($SQL);
-            if (! $states) {
-                $SQL = "INSERT INTO " . $state_table . "
+		$this->_table_is_new_in_this_version($table_name, $sql, 'ENGINE=InnoDB');
+		// setting up the default stats and countries is also essential for the data migrations to run
+		// (because many need to convert old string states to foreign keys into the states table)
+		$this->insert_default_states();
+		$this->insert_default_countries();
+		// setting up default prices, price types, and tickets is also essential for the price migrations
+		$this->insert_default_price_types();
+		$this->insert_default_prices();
+		$this->insert_default_tickets();
+		// setting up the config wp option pretty well counts as a 'schema change', or at least should happen ehre
+		EE_Config::instance()->update_espresso_config(false, true);
+		return true;
+	}
+
+
+
+	/**
+	 * Yes we could have cleaned up the ee3 tables here. But just in case someone
+	 * didn't backup their DB, and decides they want ot keep using EE3, we'll
+	 * leave them for now. Mayeb remove them in 4.5 or something.
+	 *
+	 * @return boolean
+	 */
+	public function schema_changes_after_migration()
+	{
+		return true;
+	}
+
+
+
+	/**
+	 * insert_default_states
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 */
+	public function insert_default_states()
+	{
+		global $wpdb;
+		$state_table = $wpdb->prefix . "esp_state";
+		if ($this->_get_table_analysis()->tableExists($state_table)) {
+			$SQL = "SELECT COUNT('STA_ID') FROM " . $state_table;
+			$states = $wpdb->get_var($SQL);
+			if (! $states) {
+				$SQL = "INSERT INTO " . $state_table . "
 				(STA_ID, CNT_ISO, STA_abbrev, STA_name, STA_active) VALUES
 				(1, 'US', 'AK', 'Alaska', 1),
 				(2, 'US', 'AL', 'Alabama', 1),
@@ -581,29 +581,29 @@ 
 				(70, 'CA', 'NT', 'Northwest Territories', 1),
 				(71, 'CA', 'NU', 'Nunavut', 1),
 				(72, 'CA', 'YT', 'Yukon', 1);";
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-
-    /**
-     * insert_default_countries
-     *
-     * @access public
-     * @static
-     * @return void
-     */
-    public function insert_default_countries()
-    {
-        global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
-        if ($this->_get_table_analysis()->tableExists($country_table)) {
-            $SQL = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
-            $countries = $wpdb->get_var($SQL);
-            if (! $countries) {
-                $SQL = "INSERT INTO " . $country_table . "
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+
+	/**
+	 * insert_default_countries
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 */
+	public function insert_default_countries()
+	{
+		global $wpdb;
+		$country_table = $wpdb->prefix . "esp_country";
+		if ($this->_get_table_analysis()->tableExists($country_table)) {
+			$SQL = "SELECT COUNT('CNT_ISO') FROM " . $country_table;
+			$countries = $wpdb->get_var($SQL);
+			if (! $countries) {
+				$SQL = "INSERT INTO " . $country_table . "
 				(CNT_ISO, CNT_ISO3, RGN_ID, CNT_name, CNT_cur_code, CNT_cur_single, CNT_cur_plural, CNT_cur_sign, CNT_cur_sign_b4, CNT_cur_dec_plc, CNT_tel_code, CNT_is_EU, CNT_active) VALUES
 				('AD', 'AND', 0, 'Andorra', 'EUR', 'Euro', 'Euros', '€', 1, 2, '+376', 0, 0),
 				('AE', 'ARE', 0, 'United Arab Emirates', 'AED', 'Dirham', 'Dirhams', 'د.إ', 1, 2, '+971', 0, 0),
@@ -831,984 +831,984 @@ 
 				('ZA', 'ZAF', 0, 'South Africa', 'ZAR', 'Rand', 'Rands', 'R', 1, 2, '+27', 0, 0),
 				('ZM', 'ZMB', 0, 'Zambia', 'ZMK', 'Kwacha', 'Kwachas', '', 1, 2, '+260', 0, 0),
 				('ZW', 'ZWE', 0, 'Zimbabwe', 'ZWD', 'Dollar', 'Dollars', 'Z$', 1, 2, '+263', 0, 0);";
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-
-    /**
-     * insert_default_price_types
-     *
-     * @access public
-     * @static
-     * @return void
-     */
-    public function insert_default_price_types()
-    {
-        global $wpdb;
-        $price_type_table = $wpdb->prefix . "esp_price_type";
-        if ($this->_get_table_analysis()->tableExists($price_type_table)) {
-            $SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
-            $price_types_exist = $wpdb->get_var($SQL);
-            if (! $price_types_exist) {
-                $SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+
+	/**
+	 * insert_default_price_types
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 */
+	public function insert_default_price_types()
+	{
+		global $wpdb;
+		$price_type_table = $wpdb->prefix . "esp_price_type";
+		if ($this->_get_table_analysis()->tableExists($price_type_table)) {
+			$SQL = 'SELECT COUNT(PRT_ID) FROM ' . $price_type_table;
+			$price_types_exist = $wpdb->get_var($SQL);
+			if (! $price_types_exist) {
+				$SQL = "INSERT INTO $price_type_table ( PRT_ID, PRT_name, PBT_ID, PRT_is_percent, PRT_order, PRT_deleted ) VALUES
 							(1, '" . esc_html__('Base Price', 'event_espresso') . "', 1,  0, 0, 0),
 							(2, '" . esc_html__('Percent Discount', 'event_espresso') . "', 2,  1, 20, 0),
 							(3, '" . esc_html__('Fixed Discount', 'event_espresso') . "', 2,  0, 30, 0),
 							(4, '" . esc_html__('Percent Surcharge', 'event_espresso') . "', 3,  1, 40, 0),
 							(5, '" . esc_html__('Fixed Surcharge', 'event_espresso') . "', 3,  0, 50, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-
-    /**
-     * insert_default_prices. We assume we're upgrading to regular here.
-     * If we're INSTALLING 4.1 CAF, then we add a few extra default prices
-     * when EEH_Activaion's initialize_db_content is called via  ahook in
-     * EE_BRewing_regular
-     *
-     * @access public
-     * @static
-     * @return void
-     */
-    public function insert_default_prices()
-    {
-        global $wpdb;
-        $price_table = $wpdb->prefix . "esp_price";
-        if ($this->_get_table_analysis()->tableExists($price_table)) {
-            $SQL = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
-            $prices_exist = $wpdb->get_var($SQL);
-            if (! $prices_exist) {
-                $SQL = "INSERT INTO $price_table
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_price_types__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+
+	/**
+	 * insert_default_prices. We assume we're upgrading to regular here.
+	 * If we're INSTALLING 4.1 CAF, then we add a few extra default prices
+	 * when EEH_Activaion's initialize_db_content is called via  ahook in
+	 * EE_BRewing_regular
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 */
+	public function insert_default_prices()
+	{
+		global $wpdb;
+		$price_table = $wpdb->prefix . "esp_price";
+		if ($this->_get_table_analysis()->tableExists($price_table)) {
+			$SQL = 'SELECT COUNT(PRC_ID) FROM ' . $price_table;
+			$prices_exist = $wpdb->get_var($SQL);
+			if (! $prices_exist) {
+				$SQL = "INSERT INTO $price_table
 							(PRC_ID, PRT_ID, PRC_amount, PRC_name, PRC_desc,  PRC_is_default, PRC_overrides, PRC_order, PRC_deleted, PRC_parent ) VALUES
 							(1, 1, '0.00', 'Admission', '', 1, null, 0, 0, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-
-    /**
-     * insert default ticket
-     *
-     * @access public
-     * @static
-     * @return void
-     */
-    public function insert_default_tickets()
-    {
-        global $wpdb;
-        $ticket_table = $wpdb->prefix . "esp_ticket";
-        if ($this->_get_table_analysis()->tableExists($ticket_table)) {
-            $SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
-            $tickets_exist = $wpdb->get_var($SQL);
-            if (! $tickets_exist) {
-                $SQL = "INSERT INTO $ticket_table
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_prices__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+
+	/**
+	 * insert default ticket
+	 *
+	 * @access public
+	 * @static
+	 * @return void
+	 */
+	public function insert_default_tickets()
+	{
+		global $wpdb;
+		$ticket_table = $wpdb->prefix . "esp_ticket";
+		if ($this->_get_table_analysis()->tableExists($ticket_table)) {
+			$SQL = 'SELECT COUNT(TKT_ID) FROM ' . $ticket_table;
+			$tickets_exist = $wpdb->get_var($SQL);
+			if (! $tickets_exist) {
+				$SQL = "INSERT INTO $ticket_table
 					( TKT_ID, TTM_ID, TKT_name, TKT_description, TKT_qty, TKT_sold, TKT_uses, TKT_min, TKT_max, TKT_price, TKT_start_date, TKT_end_date, TKT_taxable, TKT_order, TKT_row, TKT_is_default, TKT_parent, TKT_deleted ) VALUES
 					( 1, 0, '"
-                       . esc_html__("Free Ticket", "event_espresso")
-                       . "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-        $ticket_price_table = $wpdb->prefix . "esp_ticket_price";
-        if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
-            $SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
-            $ticket_prc_exist = $wpdb->get_var($SQL);
-            if (! $ticket_prc_exist) {
-                $SQL = "INSERT INTO $ticket_price_table
+					   . esc_html__("Free Ticket", "event_espresso")
+					   . "', '', 100, 0, -1, 0, -1, 0.00, '0000-00-00 00:00:00', '0000-00-00 00:00:00', 0, 0, 1, 1, 0, 0);";
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+		$ticket_price_table = $wpdb->prefix . "esp_ticket_price";
+		if ($this->_get_table_analysis()->tableExists($ticket_price_table)) {
+			$SQL = 'SELECT COUNT(TKP_ID) FROM ' . $ticket_price_table;
+			$ticket_prc_exist = $wpdb->get_var($SQL);
+			if (! $ticket_prc_exist) {
+				$SQL = "INSERT INTO $ticket_price_table
 				( TKP_ID, TKT_ID, PRC_ID ) VALUES
 				( 1, 1, 1 )
 				";
-                $SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
-                $wpdb->query($SQL);
-            }
-        }
-    }
-
-
-
-    /**
-     * Gets a country entry as an array, or creates one if none is found. Much like EEM_Country::instance()->get_one(),
-     * but is independent of outside code which can change in future versions of EE. Also, $country_name CAN be a 3.1
-     * country ID (int), a 2-letter ISO, 3-letter ISO, or name
-     *
-     * @global type  $wpdb
-     * @param string $country_name
-     * @return array where keys are columns, values are column values
-     */
-    public function get_or_create_country($country_name)
-    {
-        if (! $country_name) {
-            throw new EE_Error(esc_html__("Could not get a country because country name is blank", "event_espresso"));
-        }
-        global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
-        if (is_int($country_name)) {
-            $country_name = $this->get_iso_from_3_1_country_id($country_name);
-        }
-        $country = $wpdb->get_row($wpdb->prepare("SELECT * FROM $country_table WHERE
+				$SQL = apply_filters('FHEE__EE_DMS_4_1_0__insert_default_tickets__SQL__ticket_price', $SQL);
+				$wpdb->query($SQL);
+			}
+		}
+	}
+
+
+
+	/**
+	 * Gets a country entry as an array, or creates one if none is found. Much like EEM_Country::instance()->get_one(),
+	 * but is independent of outside code which can change in future versions of EE. Also, $country_name CAN be a 3.1
+	 * country ID (int), a 2-letter ISO, 3-letter ISO, or name
+	 *
+	 * @global type  $wpdb
+	 * @param string $country_name
+	 * @return array where keys are columns, values are column values
+	 */
+	public function get_or_create_country($country_name)
+	{
+		if (! $country_name) {
+			throw new EE_Error(esc_html__("Could not get a country because country name is blank", "event_espresso"));
+		}
+		global $wpdb;
+		$country_table = $wpdb->prefix . "esp_country";
+		if (is_int($country_name)) {
+			$country_name = $this->get_iso_from_3_1_country_id($country_name);
+		}
+		$country = $wpdb->get_row($wpdb->prepare("SELECT * FROM $country_table WHERE
 			CNT_ISO LIKE %s OR
 			CNT_ISO3 LIKE %s OR
 			CNT_name LIKE %s LIMIT 1", $country_name, $country_name, $country_name), ARRAY_A);
-        if (! $country) {
-            // insert a new one then
-            $cols_n_values = array(
-                    'CNT_ISO'         => $this->_find_available_country_iso(2),
-                    'CNT_ISO3'        => $this->_find_available_country_iso(3),
-                    'RGN_ID'          => 0,
-                    'CNT_name'        => $country_name,
-                    'CNT_cur_code'    => 'USD',
-                    'CNT_cur_single'  => 'Dollar',
-                    'CNT_cur_plural'  => 'Dollars',
-                    'CNT_cur_sign'    => '&#36;',
-                    'CNT_cur_sign_b4' => true,
-                    'CNT_cur_dec_plc' => 2,
-                    'CNT_cur_dec_mrk' => '.',
-                    'CNT_cur_thsnds'  => ',',
-                    'CNT_tel_code'    => '+1',
-                    'CNT_is_EU'       => false,
-                    'CNT_active'      => true,
-            );
-            $data_types = array(
-                    '%s',// CNT_ISO
-                    '%s',// CNT_ISO3
-                    '%d',// RGN_ID
-                    '%s',// CNT_name
-                    '%s',// CNT_cur_code
-                    '%s',// CNT_cur_single
-                    '%s',// CNT_cur_plural
-                    '%s',// CNT_cur_sign
-                    '%d',// CNT_cur_sign_b4
-                    '%d',// CNT_cur_dec_plc
-                    '%s',// CNT_cur_dec_mrk
-                    '%s',// CNT_cur_thsnds
-                    '%s',// CNT_tel_code
-                    '%d',// CNT_is_EU
-                    '%d',// CNT_active
-            );
-            $success = $wpdb->insert(
-                $country_table,
-                $cols_n_values,
-                $data_types
-            );
-            if (! $success) {
-                throw new EE_Error($this->_create_error_message_for_db_insertion(
-                    'N/A',
-                    array('country_id' => $country_name),
-                    $country_table,
-                    $cols_n_values,
-                    $data_types
-                ));
-            }
-            $country = $cols_n_values;
-        }
-        return $country;
-    }
-
-
-
-    /**
-     * finds a country iso which hasnt been used yet
-     *
-     * @global type $wpdb
-     * @return string
-     */
-    private function _find_available_country_iso($num_letters = 2)
-    {
-        global $wpdb;
-        $country_table = $wpdb->prefix . "esp_country";
-        $attempts = 0;
-        do {
-            $current_iso = strtoupper(wp_generate_password($num_letters, false));
-            $country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM "
-                                                                   . $country_table
-                                                                   . " WHERE CNT_ISO=%s", $current_iso));
-            $attempts++;
-            // keep going until we find an available country code, or we arbitrarily
-            // decide we've tried this enough. Somehow they have way too many countries
-            // (probably because they're mis-using the EE3 country_id like a custom question)
-        } while (intval($country_with_that_iso) && $attempts < 200);
-        return $current_iso;
-    }
-
-
-
-    /**
-     * Gets a state entry as an array, or creates one if none is found. Much like EEM_State::instance()->get_one(), but
-     * is independent of outside code which can change in future versions of EE
-     *
-     * @global type  $wpdb
-     * @param string $state_name
-     * @return array where keys are columns, values are column values
-     */
-    public function get_or_create_state($state_name, $country_name = '')
-    {
-        if (! $state_name) {
-            throw new EE_Error(esc_html__(
-                "Could not get-or-create state because no state name was provided",
-                "event_espresso"
-            ));
-        }
-        try {
-            $country = $this->get_or_create_country($country_name);
-            $country_iso = $country['CNT_ISO'];
-        } catch (EE_Error $e) {
-            $country_iso = $this->get_default_country_iso();
-        }
-        global $wpdb;
-        $state_table = $wpdb->prefix . "esp_state";
-        $state = $wpdb->get_row($wpdb->prepare("SELECT * FROM $state_table WHERE
+		if (! $country) {
+			// insert a new one then
+			$cols_n_values = array(
+					'CNT_ISO'         => $this->_find_available_country_iso(2),
+					'CNT_ISO3'        => $this->_find_available_country_iso(3),
+					'RGN_ID'          => 0,
+					'CNT_name'        => $country_name,
+					'CNT_cur_code'    => 'USD',
+					'CNT_cur_single'  => 'Dollar',
+					'CNT_cur_plural'  => 'Dollars',
+					'CNT_cur_sign'    => '&#36;',
+					'CNT_cur_sign_b4' => true,
+					'CNT_cur_dec_plc' => 2,
+					'CNT_cur_dec_mrk' => '.',
+					'CNT_cur_thsnds'  => ',',
+					'CNT_tel_code'    => '+1',
+					'CNT_is_EU'       => false,
+					'CNT_active'      => true,
+			);
+			$data_types = array(
+					'%s',// CNT_ISO
+					'%s',// CNT_ISO3
+					'%d',// RGN_ID
+					'%s',// CNT_name
+					'%s',// CNT_cur_code
+					'%s',// CNT_cur_single
+					'%s',// CNT_cur_plural
+					'%s',// CNT_cur_sign
+					'%d',// CNT_cur_sign_b4
+					'%d',// CNT_cur_dec_plc
+					'%s',// CNT_cur_dec_mrk
+					'%s',// CNT_cur_thsnds
+					'%s',// CNT_tel_code
+					'%d',// CNT_is_EU
+					'%d',// CNT_active
+			);
+			$success = $wpdb->insert(
+				$country_table,
+				$cols_n_values,
+				$data_types
+			);
+			if (! $success) {
+				throw new EE_Error($this->_create_error_message_for_db_insertion(
+					'N/A',
+					array('country_id' => $country_name),
+					$country_table,
+					$cols_n_values,
+					$data_types
+				));
+			}
+			$country = $cols_n_values;
+		}
+		return $country;
+	}
+
+
+
+	/**
+	 * finds a country iso which hasnt been used yet
+	 *
+	 * @global type $wpdb
+	 * @return string
+	 */
+	private function _find_available_country_iso($num_letters = 2)
+	{
+		global $wpdb;
+		$country_table = $wpdb->prefix . "esp_country";
+		$attempts = 0;
+		do {
+			$current_iso = strtoupper(wp_generate_password($num_letters, false));
+			$country_with_that_iso = $wpdb->get_var($wpdb->prepare("SELECT count(CNT_ISO) FROM "
+																   . $country_table
+																   . " WHERE CNT_ISO=%s", $current_iso));
+			$attempts++;
+			// keep going until we find an available country code, or we arbitrarily
+			// decide we've tried this enough. Somehow they have way too many countries
+			// (probably because they're mis-using the EE3 country_id like a custom question)
+		} while (intval($country_with_that_iso) && $attempts < 200);
+		return $current_iso;
+	}
+
+
+
+	/**
+	 * Gets a state entry as an array, or creates one if none is found. Much like EEM_State::instance()->get_one(), but
+	 * is independent of outside code which can change in future versions of EE
+	 *
+	 * @global type  $wpdb
+	 * @param string $state_name
+	 * @return array where keys are columns, values are column values
+	 */
+	public function get_or_create_state($state_name, $country_name = '')
+	{
+		if (! $state_name) {
+			throw new EE_Error(esc_html__(
+				"Could not get-or-create state because no state name was provided",
+				"event_espresso"
+			));
+		}
+		try {
+			$country = $this->get_or_create_country($country_name);
+			$country_iso = $country['CNT_ISO'];
+		} catch (EE_Error $e) {
+			$country_iso = $this->get_default_country_iso();
+		}
+		global $wpdb;
+		$state_table = $wpdb->prefix . "esp_state";
+		$state = $wpdb->get_row($wpdb->prepare("SELECT * FROM $state_table WHERE
 			(STA_abbrev LIKE %s OR
 			STA_name LIKE %s) AND
 			CNT_ISO LIKE %s LIMIT 1", $state_name, $state_name, $country_iso), ARRAY_A);
-        if (! $state) {
-            // insert a new one then
-            $cols_n_values = array(
-                    'CNT_ISO'    => $country_iso,
-                    'STA_abbrev' => substr($state_name, 0, 6),
-                    'STA_name'   => $state_name,
-                    'STA_active' => true,
-            );
-            $data_types = array(
-                    '%s',// CNT_ISO
-                    '%s',// STA_abbrev
-                    '%s',// STA_name
-                    '%d',// STA_active
-            );
-            $success = $wpdb->insert($state_table, $cols_n_values, $data_types);
-            if (! $success) {
-                throw new EE_Error($this->_create_error_message_for_db_insertion(
-                    'N/A',
-                    array('state' => $state_name, 'country_id' => $country_name),
-                    $state_table,
-                    $cols_n_values,
-                    $data_types
-                ));
-            }
-            $state = $cols_n_values;
-            $state['STA_ID'] = $wpdb->insert_id;
-        }
-        return $state;
-    }
-
-
-
-    /**
-     * Fixes times like "5:00 PM" into the expected 24-hour format "17:00".
-     * THis is actually just copied from the 3.1 JSON API because it needed to do the exact same thing
-     *
-     * @param type $timeString
-     * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes
-     *                with leading zeros)
-     */
-    public function convertTimeFromAMPM($timeString)
-    {
-        $matches = array();
-        preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
-        if (! $matches || count($matches) < 3) {
-            $hour = '00';
-            $minutes = '00';
-        } else {
-            $hour = intval($matches[1]);
-            $minutes = $matches[2];
-        }
-        if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
-            $hour = intval($hour) + 12;
-        }
-        $hour = str_pad("$hour", 2, '0', STR_PAD_LEFT);
-        $minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
-        return "$hour:$minutes";
-    }
-
-
-
-    /**
-     * Gets the ISO3 fora country given its 3.1 country ID.
-     *
-     * @param int $country_id
-     * @return string the country's ISO3 code
-     */
-    public function get_iso_from_3_1_country_id($country_id)
-    {
-        $old_countries = array(
-                array(64, 'United States', 'US', 'USA', 1),
-                array(15, 'Australia', 'AU', 'AUS', 1),
-                array(39, 'Canada', 'CA', 'CAN', 1),
-                array(171, 'United Kingdom', 'GB', 'GBR', 1),
-                array(70, 'France', 'FR', 'FRA', 2),
-                array(111, 'Italy', 'IT', 'ITA', 2),
-                array(63, 'Spain', 'ES', 'ESP', 2),
-                array(1, 'Afghanistan', 'AF', 'AFG', 1),
-                array(2, 'Albania', 'AL', 'ALB', 1),
-                array(3, 'Germany', 'DE', 'DEU', 2),
-                array(198, 'Switzerland', 'CH', 'CHE', 1),
-                array(87, 'Netherlands', 'NL', 'NLD', 2),
-                array(197, 'Sweden', 'SE', 'SWE', 1),
-                array(230, 'Akrotiri and Dhekelia', 'CY', 'CYP', 2),
-                array(4, 'Andorra', 'AD', 'AND', 2),
-                array(5, 'Angola', 'AO', 'AGO', 1),
-                array(6, 'Anguilla', 'AI', 'AIA', 1),
-                array(7, 'Antarctica', 'AQ', 'ATA', 1),
-                array(8, 'Antigua and Barbuda', 'AG', 'ATG', 1),
-                array(10, 'Saudi Arabia', 'SA', 'SAU', 1),
-                array(11, 'Algeria', 'DZ', 'DZA', 1),
-                array(12, 'Argentina', 'AR', 'ARG', 1),
-                array(13, 'Armenia', 'AM', 'ARM', 1),
-                array(14, 'Aruba', 'AW', 'ABW', 1),
-                array(16, 'Austria', 'AT', 'AUT', 2),
-                array(17, 'Azerbaijan', 'AZ', 'AZE', 1),
-                array(18, 'Bahamas', 'BS', 'BHS', 1),
-                array(19, 'Bahrain', 'BH', 'BHR', 1),
-                array(20, 'Bangladesh', 'BD', 'BGD', 1),
-                array(21, 'Barbados', 'BB', 'BRB', 1),
-                array(22, 'Belgium ', 'BE', 'BEL', 2),
-                array(23, 'Belize', 'BZ', 'BLZ', 1),
-                array(24, 'Benin', 'BJ', 'BEN', 1),
-                array(25, 'Bermudas', 'BM', 'BMU', 1),
-                array(26, 'Belarus', 'BY', 'BLR', 1),
-                array(27, 'Bolivia', 'BO', 'BOL', 1),
-                array(28, 'Bosnia and Herzegovina', 'BA', 'BIH', 1),
-                array(29, 'Botswana', 'BW', 'BWA', 1),
-                array(96, 'Bouvet Island', 'BV', 'BVT', 1),
-                array(30, 'Brazil', 'BR', 'BRA', 1),
-                array(31, 'Brunei', 'BN', 'BRN', 1),
-                array(32, 'Bulgaria', 'BG', 'BGR', 1),
-                array(33, 'Burkina Faso', 'BF', 'BFA', 1),
-                array(34, 'Burundi', 'BI', 'BDI', 1),
-                array(35, 'Bhutan', 'BT', 'BTN', 1),
-                array(36, 'Cape Verde', 'CV', 'CPV', 1),
-                array(37, 'Cambodia', 'KH', 'KHM', 1),
-                array(38, 'Cameroon', 'CM', 'CMR', 1),
-                array(98, 'Cayman Islands', 'KY', 'CYM', 1),
-                array(172, 'Central African Republic', 'CF', 'CAF', 1),
-                array(40, 'Chad', 'TD', 'TCD', 1),
-                array(41, 'Chile', 'CL', 'CHL', 1),
-                array(42, 'China', 'CN', 'CHN', 1),
-                array(105, 'Christmas Island', 'CX', 'CXR', 1),
-                array(43, 'Cyprus', 'CY', 'CYP', 2),
-                array(99, 'Cocos Island', 'CC', 'CCK', 1),
-                array(100, 'Cook Islands', 'CK', 'COK', 1),
-                array(44, 'Colombia', 'CO', 'COL', 1),
-                array(45, 'Comoros', 'KM', 'COM', 1),
-                array(46, 'Congo', 'CG', 'COG', 1),
-                array(47, 'North Korea', 'KP', 'PRK', 1),
-                array(50, 'Costa Rica', 'CR', 'CRI', 1),
-                array(51, 'Croatia', 'HR', 'HRV', 1),
-                array(52, 'Cuba', 'CU', 'CUB', 1),
-                array(173, 'Czech Republic', 'CZ', 'CZE', 1),
-                array(53, 'Denmark', 'DK', 'DNK', 1),
-                array(54, 'Djibouti', 'DJ', 'DJI', 1),
-                array(55, 'Dominica', 'DM', 'DMA', 1),
-                array(174, 'Dominican Republic', 'DO', 'DOM', 1),
-                array(56, 'Ecuador', 'EC', 'ECU', 1),
-                array(57, 'Egypt', 'EG', 'EGY', 1),
-                array(58, 'El Salvador', 'SV', 'SLV', 1),
-                array(60, 'Eritrea', 'ER', 'ERI', 1),
-                array(61, 'Slovakia', 'SK', 'SVK', 2),
-                array(62, 'Slovenia', 'SI', 'SVN', 2),
-                array(65, 'Estonia', 'EE', 'EST', 2),
-                array(66, 'Ethiopia', 'ET', 'ETH', 1),
-                array(102, 'Faroe islands', 'FO', 'FRO', 1),
-                array(103, 'Falkland Islands', 'FK', 'FLK', 1),
-                array(67, 'Fiji', 'FJ', 'FJI', 1),
-                array(69, 'Finland', 'FI', 'FIN', 2),
-                array(71, 'Gabon', 'GA', 'GAB', 1),
-                array(72, 'Gambia', 'GM', 'GMB', 1),
-                array(73, 'Georgia', 'GE', 'GEO', 1),
-                array(74, 'Ghana', 'GH', 'GHA', 1),
-                array(75, 'Gibraltar', 'GI', 'GIB', 1),
-                array(76, 'Greece', 'GR', 'GRC', 2),
-                array(77, 'Grenada', 'GD', 'GRD', 1),
-                array(78, 'Greenland', 'GL', 'GRL', 1),
-                array(79, 'Guadeloupe', 'GP', 'GLP', 1),
-                array(80, 'Guam', 'GU', 'GUM', 1),
-                array(81, 'Guatemala', 'GT', 'GTM', 1),
-                array(82, 'Guinea', 'GN', 'GIN', 1),
-                array(83, 'Equatorial Guinea', 'GQ', 'GNQ', 1),
-                array(84, 'Guinea-Bissau', 'GW', 'GNB', 1),
-                array(85, 'Guyana', 'GY', 'GUY', 1),
-                array(86, 'Haiti', 'HT', 'HTI', 1),
-                array(88, 'Honduras', 'HN', 'HND', 1),
-                array(89, 'Hong Kong', 'HK', 'HKG', 1),
-                array(90, 'Hungary', 'HU', 'HUN', 1),
-                array(91, 'India', 'IN', 'IND', 1),
-                array(205, 'British Indian Ocean Territory', 'IO', 'IOT', 1),
-                array(92, 'Indonesia', 'ID', 'IDN', 1),
-                array(93, 'Iraq', 'IQ', 'IRQ', 1),
-                array(94, 'Iran', 'IR', 'IRN', 1),
-                array(95, 'Ireland', 'IE', 'IRL', 2),
-                array(97, 'Iceland', 'IS', 'ISL', 1),
-                array(110, 'Israel', 'IL', 'ISR', 1),
-                array(49, 'Ivory Coast ', 'CI', 'CIV', 1),
-                array(112, 'Jamaica', 'JM', 'JAM', 1),
-                array(113, 'Japan', 'JP', 'JPN', 1),
-                array(114, 'Jordan', 'JO', 'JOR', 1),
-                array(115, 'Kazakhstan', 'KZ', 'KAZ', 1),
-                array(116, 'Kenya', 'KE', 'KEN', 1),
-                array(117, 'Kyrgyzstan', 'KG', 'KGZ', 1),
-                array(118, 'Kiribati', 'KI', 'KIR', 1),
-                array(48, 'South Korea', 'KR', 'KOR', 1),
-                array(228, 'Kosovo', 'XK', 'XKV', 2),
-                // there is no official ISO code for Kosovo yet (http://geonames.wordpress.com/2010/03/08/xk-country-code-for-kosovo/) so using a temporary country code and a modified 3 character code for ISO code -- this should be updated if/when Kosovo gets its own ISO code
-                array(119, 'Kuwait', 'KW', 'KWT', 1),
-                array(120, 'Laos', 'LA', 'LAO', 1),
-                array(121, 'Latvia', 'LV', 'LVA', 2),
-                array(122, 'Lesotho', 'LS', 'LSO', 1),
-                array(123, 'Lebanon', 'LB', 'LBN', 1),
-                array(124, 'Liberia', 'LR', 'LBR', 1),
-                array(125, 'Libya', 'LY', 'LBY', 1),
-                array(126, 'Liechtenstein', 'LI', 'LIE', 1),
-                array(127, 'Lithuania', 'LT', 'LTU', 2),
-                array(128, 'Luxemburg', 'LU', 'LUX', 2),
-                array(129, 'Macao', 'MO', 'MAC', 1),
-                array(130, 'Macedonia', 'MK', 'MKD', 1),
-                array(131, 'Madagascar', 'MG', 'MDG', 1),
-                array(132, 'Malaysia', 'MY', 'MYS', 1),
-                array(133, 'Malawi', 'MW', 'MWI', 1),
-                array(134, 'Maldivas', 'MV', 'MDV', 1),
-                array(135, 'Mali', 'ML', 'MLI', 1),
-                array(136, 'Malta', 'MT', 'MLT', 2),
-                array(101, 'Northern Marianas', 'MP', 'MNP', 1),
-                array(137, 'Morocco', 'MA', 'MAR', 1),
-                array(104, 'Marshall islands', 'MH', 'MHL', 1),
-                array(138, 'Martinique', 'MQ', 'MTQ', 1),
-                array(139, 'Mauritius', 'MU', 'MUS', 1),
-                array(140, 'Mauritania', 'MR', 'MRT', 1),
-                array(141, 'Mayote', 'YT', 'MYT', 2),
-                array(142, 'Mexico', 'MX', 'MEX', 1),
-                array(143, 'Micronesia', 'FM', 'FSM', 1),
-                array(144, 'Moldova', 'MD', 'MDA', 1),
-                array(145, 'Monaco', 'MC', 'MCO', 2),
-                array(146, 'Mongolia', 'MN', 'MNG', 1),
-                array(147, 'Montserrat', 'MS', 'MSR', 1),
-                array(227, 'Montenegro', 'ME', 'MNE', 2),
-                array(148, 'Mozambique', 'MZ', 'MOZ', 1),
-                array(149, 'Myanmar', 'MM', 'MMR', 1),
-                array(150, 'Namibia', 'NA', 'NAM', 1),
-                array(151, 'Nauru', 'NR', 'NRU', 1),
-                array(152, 'Nepal', 'NP', 'NPL', 1),
-                array(9, 'Netherlands Antilles', 'AN', 'ANT', 1),
-                array(153, 'Nicaragua', 'NI', 'NIC', 1),
-                array(154, 'Niger', 'NE', 'NER', 1),
-                array(155, 'Nigeria', 'NG', 'NGA', 1),
-                array(156, 'Niue', 'NU', 'NIU', 1),
-                array(157, 'Norway', 'NO', 'NOR', 1),
-                array(158, 'New Caledonia', 'NC', 'NCL', 1),
-                array(159, 'New Zealand', 'NZ', 'NZL', 1),
-                array(160, 'Oman', 'OM', 'OMN', 1),
-                array(161, 'Pakistan', 'PK', 'PAK', 1),
-                array(162, 'Palau', 'PW', 'PLW', 1),
-                array(163, 'Panama', 'PA', 'PAN', 1),
-                array(164, 'Papua New Guinea', 'PG', 'PNG', 1),
-                array(165, 'Paraguay', 'PY', 'PRY', 1),
-                array(166, 'Peru', 'PE', 'PER', 1),
-                array(68, 'Philippines', 'PH', 'PHL', 1),
-                array(167, 'Poland', 'PL', 'POL', 1),
-                array(168, 'Portugal', 'PT', 'PRT', 2),
-                array(169, 'Puerto Rico', 'PR', 'PRI', 1),
-                array(170, 'Qatar', 'QA', 'QAT', 1),
-                array(176, 'Rwanda', 'RW', 'RWA', 1),
-                array(177, 'Romania', 'RO', 'ROM', 2),
-                array(178, 'Russia', 'RU', 'RUS', 1),
-                array(229, 'Saint Pierre and Miquelon', 'PM', 'SPM', 2),
-                array(180, 'Samoa', 'WS', 'WSM', 1),
-                array(181, 'American Samoa', 'AS', 'ASM', 1),
-                array(183, 'San Marino', 'SM', 'SMR', 2),
-                array(184, 'Saint Vincent and the Grenadines', 'VC', 'VCT', 1),
-                array(185, 'Saint Helena', 'SH', 'SHN', 1),
-                array(186, 'Saint Lucia', 'LC', 'LCA', 1),
-                array(188, 'Senegal', 'SN', 'SEN', 1),
-                array(189, 'Seychelles', 'SC', 'SYC', 1),
-                array(190, 'Sierra Leona', 'SL', 'SLE', 1),
-                array(191, 'Singapore', 'SG', 'SGP', 1),
-                array(192, 'Syria', 'SY', 'SYR', 1),
-                array(193, 'Somalia', 'SO', 'SOM', 1),
-                array(194, 'Sri Lanka', 'LK', 'LKA', 1),
-                array(195, 'South Africa', 'ZA', 'ZAF', 1),
-                array(196, 'Sudan', 'SD', 'SDN', 1),
-                array(199, 'Suriname', 'SR', 'SUR', 1),
-                array(200, 'Swaziland', 'SZ', 'SWZ', 1),
-                array(201, 'Thailand', 'TH', 'THA', 1),
-                array(202, 'Taiwan', 'TW', 'TWN', 1),
-                array(203, 'Tanzania', 'TZ', 'TZA', 1),
-                array(204, 'Tajikistan', 'TJ', 'TJK', 1),
-                array(206, 'Timor-Leste', 'TL', 'TLS', 1),
-                array(207, 'Togo', 'TG', 'TGO', 1),
-                array(208, 'Tokelau', 'TK', 'TKL', 1),
-                array(209, 'Tonga', 'TO', 'TON', 1),
-                array(210, 'Trinidad and Tobago', 'TT', 'TTO', 1),
-                array(211, 'Tunisia', 'TN', 'TUN', 1),
-                array(212, 'Turkmenistan', 'TM', 'TKM', 1),
-                array(213, 'Turkey', 'TR', 'TUR', 1),
-                array(214, 'Tuvalu', 'TV', 'TUV', 1),
-                array(215, 'Ukraine', 'UA', 'UKR', 1),
-                array(216, 'Uganda', 'UG', 'UGA', 1),
-                array(59, 'United Arab Emirates', 'AE', 'ARE', 1),
-                array(217, 'Uruguay', 'UY', 'URY', 1),
-                array(218, 'Uzbekistan', 'UZ', 'UZB', 1),
-                array(219, 'Vanuatu', 'VU', 'VUT', 1),
-                array(220, 'Vatican City', 'VA', 'VAT', 2),
-                array(221, 'Venezuela', 'VE', 'VEN', 1),
-                array(222, 'Vietnam', 'VN', 'VNM', 1),
-                array(108, 'Virgin Islands', 'VI', 'VIR', 1),
-                array(223, 'Yemen', 'YE', 'YEM', 1),
-                array(225, 'Zambia', 'ZM', 'ZMB', 1),
-                array(226, 'Zimbabwe', 'ZW', 'ZWE', 1),
-        );
-        $country_iso = 'US';
-        foreach ($old_countries as $country_array) {
-            // note: index 0 is the 3.1 country ID
-            if ($country_array[0] == $country_id) {
-                // note: index 2 is the ISO
-                $country_iso = $country_array[2];
-                break;
-            }
-        }
-        return $country_iso;
-    }
-
-
-
-    /**
-     * Gets the ISO3 for the
-     *
-     * @return string
-     */
-    public function get_default_country_iso()
-    {
-        $old_org_options = get_option('events_organization_settings');
-        $iso = $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
-        return $iso;
-    }
-
-
-
-    /**
-     * Converst a 3.1 payment status to its equivalent 4.1 regisration status
-     *
-     * @param string  $payment_status                   possible value for 3.1's evens_attendee.payment_status
-     * @param boolean $this_thing_required_pre_approval whether the thing we're considering (the general setting's
-     *                                                  default payment status, the event's default payment status, or
-     *                                                  the attendee's payment status) required pre-approval.
-     * @return string STS_ID for use in 4.1
-     */
-    public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false)
-    {
-        // EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
-        if ($this_thing_required_pre_approval) {
-            return 'RNA';
-        } else {
-            $mapping = $default_reg_stati_conversions = array(
-                    'Completed'        => 'RAP',
-                    ''                 => 'RPP',
-                    'Incomplete'       => 'RPP',
-                    'Pending'          => 'RAP',
-                    // stati that only occurred on 3.1 attendees:
-                    'Payment Declined' => 'RPP',
-                    'Not Completed'    => 'RPP',
-                    'Cancelled'        => 'RPP',
-                    'Declined'         => 'RPP',
-            );
-        }
-        return isset($mapping[ $payment_status ]) ? $mapping[ $payment_status ] : 'RNA';
-    }
-
-
-
-    /**
-     * Makes sure the 3.1's image url is converted to an image attachment post to the 4.1 CPT event
-     * and sets it as the featured image on the CPT event
-     *
-     * @param type                            $old_event
-     * @param type                            $new_cpt_id
-     * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
-     * @return boolean whether or not we had to do the big job of creating an image attachment
-     */
-    public function convert_image_url_to_attachment_and_attach_to_post(
-        $guid,
-        $new_cpt_id,
-        EE_Data_Migration_Script_Stage $migration_stage
-    ) {
-        $created_attachment_post = false;
-        $guid = $this->_get_original_guid($guid);
-        if ($guid) {
-            // check for an existing attachment post with this guid
-            $attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
-            if (! $attachment_post_id) {
-                // post thumbnail with that GUID doesn't exist, we should create one
-                $attachment_post_id = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
-                $created_attachment_post = true;
-            }
-            // double-check we actually have an attachment post
-            if ($attachment_post_id) {
-                update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
-            } else {
-                $migration_stage->add_error(sprintf(esc_html__(
-                    "Could not update event image %s for CPT with ID %d, but attachments post ID is %d",
-                    "event_espresso"
-                ), $guid, $new_cpt_id, $attachment_post_id));
-            }
-        }
-        return $created_attachment_post;
-    }
-
-
-
-    /**
-     * In 3.1, the event thumbnail image DOESN'T point to the orignal image, but instead
-     * to a large thumbnail (which has nearly the same GUID, except it adds "-{width}x{height}" before the filetype,
-     * or whatever dimensions it is. Eg 'http://mysite.com/image1-300x400.jpg' instead of
-     * 'http://mysite.com/image1.jpg' ). This function attempts to strip that off and get the original file, if it
-     * exists
-     *
-     * @param string $guid_in_old_event
-     * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
-     */
-    private function _get_original_guid($guid_in_old_event)
-    {
-        $original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
-        // do a head request to verify the file exists
-        $head_response = wp_remote_head($original_guid);
-        if (! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
-            return $original_guid;
-        } else {
-            return $guid_in_old_event;
-        }
-    }
-
-
-
-    /**
-     * Creates an image attachment post for the GUID. If the GUID points to a remote image,
-     * we download it to our uploads directory so that it can be properly processed (eg, creates different sizes of
-     * thumbnails)
-     *
-     * @param type                           $guid
-     * @param EE_Data_Migration_Script_Stage $migration_stage
-     * @return int
-     */
-    private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage)
-    {
-        if (! $guid) {
-            $migration_stage->add_error(sprintf(esc_html__(
-                "Cannot create image attachment for a blank GUID!",
-                "event_espresso"
-            )));
-            return 0;
-        }
-        $wp_filetype = wp_check_filetype(basename($guid), null);
-        $wp_upload_dir = wp_upload_dir();
-        // if the file is located remotely, download it to our uploads DIR, because wp_genereate_attachmnet_metadata needs the file to be local
-        if (strpos($guid, $wp_upload_dir['url']) === false) {
-            // image is located remotely. download it and place it in the uploads directory
-            if (! is_readable($guid)) {
-                $migration_stage->add_error(sprintf(esc_html__(
-                    "Could not create image attachment from non-existent file: %s",
-                    "event_espresso"
-                ), $guid));
-                return 0;
-            }
-            $contents = file_get_contents($guid);
-            if ($contents === false) {
-                $migration_stage->add_error(sprintf(esc_html__(
-                    "Could not read image at %s, and therefore couldnt create an attachment post for it.",
-                    "event_espresso"
-                ), $guid));
-                return false;
-            }
-            $local_filepath = $wp_upload_dir['path'] . '/' . basename($guid);
-            $savefile = fopen($local_filepath, 'w');
-            fwrite($savefile, $contents);
-            fclose($savefile);
-            $guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
-        } else {
-            $local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
-        }
-        $attachment = array(
-                'guid'           => $guid,
-                'post_mime_type' => $wp_filetype['type'],
-                'post_title'     => preg_replace('/\.[^.]+$/', '', basename($guid)),
-                'post_content'   => '',
-                'post_status'    => 'inherit',
-        );
-        $attach_id = wp_insert_attachment($attachment, $guid);
-        if (! $attach_id) {
-            $migration_stage->add_error(sprintf(esc_html__(
-                "Could not create image attachment post from image '%s'. Attachment data was %s.",
-                "event_espresso"
-            ), $guid, $this->_json_encode($attachment)));
-            return $attach_id;
-        }
-        // you must first include the image.php file
-        // for the function wp_generate_attachment_metadata() to work
-        require_once(ABSPATH . 'wp-admin/includes/image.php');
-        $attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
-        if (! $attach_data) {
-            $migration_stage->add_error(sprintf(esc_html__(
-                "Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.",
-                "event_espresso"
-            ), $attach_id, $local_filepath, $guid));
-            return $attach_id;
-        }
-        $metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
-        if (! $metadata_save_result) {
-            $migration_stage->add_error(sprintf(esc_html__(
-                "Could not update attachment metadata for attachment %d with data %s",
-                "event_espresso"
-            ), $attach_id, $this->_json_encode($attach_data)));
-        }
-        return $attach_id;
-    }
-
-
-
-    /**
-     * Finds the attachment post containing info about an image attachment given the GUID (link to the image itself),
-     * and returns its ID.
-     *
-     * @global type  $wpdb
-     * @param string $guid
-     * @return int
-     */
-    private function _get_image_attachment_id_by_GUID($guid)
-    {
-        global $wpdb;
-        $attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
-        return $attachment_id;
-    }
-
-
-
-    /**
-     * Returns a mysql-formatted DATETIME in UTC time, given a $DATETIME_string
-     * (and optionally a timezone; if none is given, the wp default is used)
-     *
-     * @param EE_Data_Migration_Script_base $stage
-     * @param array                         $row_of_data , the row from the DB (as an array) we're trying to find the
-     *                                                   UTC time for
-     * @param string                        $DATETIME_string
-     * @param string                        $timezone
-     * @return string
-     */
-    public function convert_date_string_to_utc(
-        EE_Data_Migration_Script_Stage $stage,
-        $row_of_data,
-        $DATETIME_string,
-        $timezone = null
-    ) {
-        $original_tz = $timezone;
-        if (! $timezone) {
-            $timezone = $this->_get_wp_timezone();
-        }
-        if (! $timezone) {
-            $stage->add_error(sprintf(
-                esc_html__("Could not find timezone given %s for %s", "event_espresso"),
-                $original_tz,
-                $row_of_data
-            ));
-            $timezone = 'UTC';
-        }
-        try {
-            $date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
-            EEH_DTT_Helper::setTimezone($date_obj, new DateTimeZone('UTC'));
-        } catch (Exception $e) {
-            $stage->add_error(sprintf(esc_html__(
-                "Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.",
-                "event_espresso"
-            ), $DATETIME_string, $timezone));
-            $date_obj = new DateTime();
-        }
-        return $date_obj->format('Y-m-d H:i:s');
-    }
-
-
-
-    /**
-     * Gets the default timezone string from wordpress (even if they set a gmt offset)
-     *
-     * @return string
-     */
-    private function _get_wp_timezone()
-    {
-        $timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
-        // if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
-        if (empty($timezone)) {
-            // let's get a the WordPress UTC offset
-            $offset = get_option('gmt_offset');
-            $timezone = $this->timezone_convert_to_string_from_offset($offset);
-        }
-        return $timezone;
-    }
-
-
-
-    /**
-     * Gets the wordpress timezone string from a UTC offset
-     *
-     * @param int $offset
-     * @return boolean
-     */
-    private function timezone_convert_to_string_from_offset($offset)
-    {
-        // shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did not work as expected - its not reliable
-        $offset *= 3600; // convert hour offset to seconds
-        $abbrarray = timezone_abbreviations_list();
-        foreach ($abbrarray as $abbr) {
-            foreach ($abbr as $city) {
-                if ($city['offset'] == $offset) {
-                    return $city['timezone_id'];
-                }
-            }
-        }
-        return false;
-    }
-
-
-
-    public function migration_page_hooks()
-    {
-        add_filter(
-            'FHEE__ee_migration_page__header',
-            array($this, '_migrate_page_hook_simplify_version_strings'),
-            10,
-            3
-        );
-        add_filter(
-            'FHEE__ee_migration_page__p_after_header',
-            array($this, '_migration_page_hook_simplify_next_db_state'),
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_1_main',
-            array($this, '_migrate_page_hook_simplify_version_strings'),
-            10,
-            3
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_1_button_text',
-            array($this, '_migrate_page_hook_simplify_version_strings'),
-            10,
-            3
-        );
-        add_action(
-            'AHEE__ee_migration_page__option_1_extra_details',
-            array($this, '_migration_page_hook_option_1_extra_details'),
-            10,
-            3
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_2_main',
-            array($this, '_migrate_page_hook_simplify_version_strings'),
-            10,
-            4
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_2_button_text',
-            array($this, '_migration_page_hook_simplify_next_db_state'),
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__option_2_details',
-            array($this, '_migration_page_hook_simplify_next_db_state'),
-            10,
-            2
-        );
-        add_action(
-            'AHEE__ee_migration_page__after_migration_options_table',
-            array($this, '_migration_page_hook_after_migration_options_table')
-        );
-        add_filter(
-            'FHEE__ee_migration_page__done_migration_header',
-            array($this, '_migration_page_hook_simplify_next_db_state'),
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__p_after_done_migration_header',
-            array($this, '_migration_page_hook_simplify_next_db_state'),
-            10,
-            2
-        );
-        add_filter(
-            'FHEE__ee_migration_page__migration_options_template',
-            array($this,'use_migration_options_from_ee3_template')
-        );
-    }
-
-
-
-    public function _migrate_page_hook_simplify_version_strings(
-        $old_content,
-        $current_db_state,
-        $next_db_state,
-        $ultimate_db_state = null
-    ) {
-        return str_replace(
-            array($current_db_state, $next_db_state, $ultimate_db_state),
-            array(esc_html__('EE3', 'event_espresso'), esc_html__('EE4', 'event_espresso'), esc_html__("EE4", 'event_espresso')),
-            $old_content
-        );
-    }
-
-
-
-    public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state)
-    {
-        return str_replace($next_db_state, esc_html__("EE4", 'event_espresso'), $old_content);
-    }
-
-
-
-    public function _migration_page_hook_option_1_extra_details()
-    {
-        ?>
+		if (! $state) {
+			// insert a new one then
+			$cols_n_values = array(
+					'CNT_ISO'    => $country_iso,
+					'STA_abbrev' => substr($state_name, 0, 6),
+					'STA_name'   => $state_name,
+					'STA_active' => true,
+			);
+			$data_types = array(
+					'%s',// CNT_ISO
+					'%s',// STA_abbrev
+					'%s',// STA_name
+					'%d',// STA_active
+			);
+			$success = $wpdb->insert($state_table, $cols_n_values, $data_types);
+			if (! $success) {
+				throw new EE_Error($this->_create_error_message_for_db_insertion(
+					'N/A',
+					array('state' => $state_name, 'country_id' => $country_name),
+					$state_table,
+					$cols_n_values,
+					$data_types
+				));
+			}
+			$state = $cols_n_values;
+			$state['STA_ID'] = $wpdb->insert_id;
+		}
+		return $state;
+	}
+
+
+
+	/**
+	 * Fixes times like "5:00 PM" into the expected 24-hour format "17:00".
+	 * THis is actually just copied from the 3.1 JSON API because it needed to do the exact same thing
+	 *
+	 * @param type $timeString
+	 * @return string in the php DATETIME format: "G:i" (24-hour format hour with leading zeros, a colon, and minutes
+	 *                with leading zeros)
+	 */
+	public function convertTimeFromAMPM($timeString)
+	{
+		$matches = array();
+		preg_match("~(\\d*):(\\d*)~", $timeString, $matches);
+		if (! $matches || count($matches) < 3) {
+			$hour = '00';
+			$minutes = '00';
+		} else {
+			$hour = intval($matches[1]);
+			$minutes = $matches[2];
+		}
+		if (strpos($timeString, 'PM') || strpos($timeString, 'pm')) {
+			$hour = intval($hour) + 12;
+		}
+		$hour = str_pad("$hour", 2, '0', STR_PAD_LEFT);
+		$minutes = str_pad("$minutes", 2, '0', STR_PAD_LEFT);
+		return "$hour:$minutes";
+	}
+
+
+
+	/**
+	 * Gets the ISO3 fora country given its 3.1 country ID.
+	 *
+	 * @param int $country_id
+	 * @return string the country's ISO3 code
+	 */
+	public function get_iso_from_3_1_country_id($country_id)
+	{
+		$old_countries = array(
+				array(64, 'United States', 'US', 'USA', 1),
+				array(15, 'Australia', 'AU', 'AUS', 1),
+				array(39, 'Canada', 'CA', 'CAN', 1),
+				array(171, 'United Kingdom', 'GB', 'GBR', 1),
+				array(70, 'France', 'FR', 'FRA', 2),
+				array(111, 'Italy', 'IT', 'ITA', 2),
+				array(63, 'Spain', 'ES', 'ESP', 2),
+				array(1, 'Afghanistan', 'AF', 'AFG', 1),
+				array(2, 'Albania', 'AL', 'ALB', 1),
+				array(3, 'Germany', 'DE', 'DEU', 2),
+				array(198, 'Switzerland', 'CH', 'CHE', 1),
+				array(87, 'Netherlands', 'NL', 'NLD', 2),
+				array(197, 'Sweden', 'SE', 'SWE', 1),
+				array(230, 'Akrotiri and Dhekelia', 'CY', 'CYP', 2),
+				array(4, 'Andorra', 'AD', 'AND', 2),
+				array(5, 'Angola', 'AO', 'AGO', 1),
+				array(6, 'Anguilla', 'AI', 'AIA', 1),
+				array(7, 'Antarctica', 'AQ', 'ATA', 1),
+				array(8, 'Antigua and Barbuda', 'AG', 'ATG', 1),
+				array(10, 'Saudi Arabia', 'SA', 'SAU', 1),
+				array(11, 'Algeria', 'DZ', 'DZA', 1),
+				array(12, 'Argentina', 'AR', 'ARG', 1),
+				array(13, 'Armenia', 'AM', 'ARM', 1),
+				array(14, 'Aruba', 'AW', 'ABW', 1),
+				array(16, 'Austria', 'AT', 'AUT', 2),
+				array(17, 'Azerbaijan', 'AZ', 'AZE', 1),
+				array(18, 'Bahamas', 'BS', 'BHS', 1),
+				array(19, 'Bahrain', 'BH', 'BHR', 1),
+				array(20, 'Bangladesh', 'BD', 'BGD', 1),
+				array(21, 'Barbados', 'BB', 'BRB', 1),
+				array(22, 'Belgium ', 'BE', 'BEL', 2),
+				array(23, 'Belize', 'BZ', 'BLZ', 1),
+				array(24, 'Benin', 'BJ', 'BEN', 1),
+				array(25, 'Bermudas', 'BM', 'BMU', 1),
+				array(26, 'Belarus', 'BY', 'BLR', 1),
+				array(27, 'Bolivia', 'BO', 'BOL', 1),
+				array(28, 'Bosnia and Herzegovina', 'BA', 'BIH', 1),
+				array(29, 'Botswana', 'BW', 'BWA', 1),
+				array(96, 'Bouvet Island', 'BV', 'BVT', 1),
+				array(30, 'Brazil', 'BR', 'BRA', 1),
+				array(31, 'Brunei', 'BN', 'BRN', 1),
+				array(32, 'Bulgaria', 'BG', 'BGR', 1),
+				array(33, 'Burkina Faso', 'BF', 'BFA', 1),
+				array(34, 'Burundi', 'BI', 'BDI', 1),
+				array(35, 'Bhutan', 'BT', 'BTN', 1),
+				array(36, 'Cape Verde', 'CV', 'CPV', 1),
+				array(37, 'Cambodia', 'KH', 'KHM', 1),
+				array(38, 'Cameroon', 'CM', 'CMR', 1),
+				array(98, 'Cayman Islands', 'KY', 'CYM', 1),
+				array(172, 'Central African Republic', 'CF', 'CAF', 1),
+				array(40, 'Chad', 'TD', 'TCD', 1),
+				array(41, 'Chile', 'CL', 'CHL', 1),
+				array(42, 'China', 'CN', 'CHN', 1),
+				array(105, 'Christmas Island', 'CX', 'CXR', 1),
+				array(43, 'Cyprus', 'CY', 'CYP', 2),
+				array(99, 'Cocos Island', 'CC', 'CCK', 1),
+				array(100, 'Cook Islands', 'CK', 'COK', 1),
+				array(44, 'Colombia', 'CO', 'COL', 1),
+				array(45, 'Comoros', 'KM', 'COM', 1),
+				array(46, 'Congo', 'CG', 'COG', 1),
+				array(47, 'North Korea', 'KP', 'PRK', 1),
+				array(50, 'Costa Rica', 'CR', 'CRI', 1),
+				array(51, 'Croatia', 'HR', 'HRV', 1),
+				array(52, 'Cuba', 'CU', 'CUB', 1),
+				array(173, 'Czech Republic', 'CZ', 'CZE', 1),
+				array(53, 'Denmark', 'DK', 'DNK', 1),
+				array(54, 'Djibouti', 'DJ', 'DJI', 1),
+				array(55, 'Dominica', 'DM', 'DMA', 1),
+				array(174, 'Dominican Republic', 'DO', 'DOM', 1),
+				array(56, 'Ecuador', 'EC', 'ECU', 1),
+				array(57, 'Egypt', 'EG', 'EGY', 1),
+				array(58, 'El Salvador', 'SV', 'SLV', 1),
+				array(60, 'Eritrea', 'ER', 'ERI', 1),
+				array(61, 'Slovakia', 'SK', 'SVK', 2),
+				array(62, 'Slovenia', 'SI', 'SVN', 2),
+				array(65, 'Estonia', 'EE', 'EST', 2),
+				array(66, 'Ethiopia', 'ET', 'ETH', 1),
+				array(102, 'Faroe islands', 'FO', 'FRO', 1),
+				array(103, 'Falkland Islands', 'FK', 'FLK', 1),
+				array(67, 'Fiji', 'FJ', 'FJI', 1),
+				array(69, 'Finland', 'FI', 'FIN', 2),
+				array(71, 'Gabon', 'GA', 'GAB', 1),
+				array(72, 'Gambia', 'GM', 'GMB', 1),
+				array(73, 'Georgia', 'GE', 'GEO', 1),
+				array(74, 'Ghana', 'GH', 'GHA', 1),
+				array(75, 'Gibraltar', 'GI', 'GIB', 1),
+				array(76, 'Greece', 'GR', 'GRC', 2),
+				array(77, 'Grenada', 'GD', 'GRD', 1),
+				array(78, 'Greenland', 'GL', 'GRL', 1),
+				array(79, 'Guadeloupe', 'GP', 'GLP', 1),
+				array(80, 'Guam', 'GU', 'GUM', 1),
+				array(81, 'Guatemala', 'GT', 'GTM', 1),
+				array(82, 'Guinea', 'GN', 'GIN', 1),
+				array(83, 'Equatorial Guinea', 'GQ', 'GNQ', 1),
+				array(84, 'Guinea-Bissau', 'GW', 'GNB', 1),
+				array(85, 'Guyana', 'GY', 'GUY', 1),
+				array(86, 'Haiti', 'HT', 'HTI', 1),
+				array(88, 'Honduras', 'HN', 'HND', 1),
+				array(89, 'Hong Kong', 'HK', 'HKG', 1),
+				array(90, 'Hungary', 'HU', 'HUN', 1),
+				array(91, 'India', 'IN', 'IND', 1),
+				array(205, 'British Indian Ocean Territory', 'IO', 'IOT', 1),
+				array(92, 'Indonesia', 'ID', 'IDN', 1),
+				array(93, 'Iraq', 'IQ', 'IRQ', 1),
+				array(94, 'Iran', 'IR', 'IRN', 1),
+				array(95, 'Ireland', 'IE', 'IRL', 2),
+				array(97, 'Iceland', 'IS', 'ISL', 1),
+				array(110, 'Israel', 'IL', 'ISR', 1),
+				array(49, 'Ivory Coast ', 'CI', 'CIV', 1),
+				array(112, 'Jamaica', 'JM', 'JAM', 1),
+				array(113, 'Japan', 'JP', 'JPN', 1),
+				array(114, 'Jordan', 'JO', 'JOR', 1),
+				array(115, 'Kazakhstan', 'KZ', 'KAZ', 1),
+				array(116, 'Kenya', 'KE', 'KEN', 1),
+				array(117, 'Kyrgyzstan', 'KG', 'KGZ', 1),
+				array(118, 'Kiribati', 'KI', 'KIR', 1),
+				array(48, 'South Korea', 'KR', 'KOR', 1),
+				array(228, 'Kosovo', 'XK', 'XKV', 2),
+				// there is no official ISO code for Kosovo yet (http://geonames.wordpress.com/2010/03/08/xk-country-code-for-kosovo/) so using a temporary country code and a modified 3 character code for ISO code -- this should be updated if/when Kosovo gets its own ISO code
+				array(119, 'Kuwait', 'KW', 'KWT', 1),
+				array(120, 'Laos', 'LA', 'LAO', 1),
+				array(121, 'Latvia', 'LV', 'LVA', 2),
+				array(122, 'Lesotho', 'LS', 'LSO', 1),
+				array(123, 'Lebanon', 'LB', 'LBN', 1),
+				array(124, 'Liberia', 'LR', 'LBR', 1),
+				array(125, 'Libya', 'LY', 'LBY', 1),
+				array(126, 'Liechtenstein', 'LI', 'LIE', 1),
+				array(127, 'Lithuania', 'LT', 'LTU', 2),
+				array(128, 'Luxemburg', 'LU', 'LUX', 2),
+				array(129, 'Macao', 'MO', 'MAC', 1),
+				array(130, 'Macedonia', 'MK', 'MKD', 1),
+				array(131, 'Madagascar', 'MG', 'MDG', 1),
+				array(132, 'Malaysia', 'MY', 'MYS', 1),
+				array(133, 'Malawi', 'MW', 'MWI', 1),
+				array(134, 'Maldivas', 'MV', 'MDV', 1),
+				array(135, 'Mali', 'ML', 'MLI', 1),
+				array(136, 'Malta', 'MT', 'MLT', 2),
+				array(101, 'Northern Marianas', 'MP', 'MNP', 1),
+				array(137, 'Morocco', 'MA', 'MAR', 1),
+				array(104, 'Marshall islands', 'MH', 'MHL', 1),
+				array(138, 'Martinique', 'MQ', 'MTQ', 1),
+				array(139, 'Mauritius', 'MU', 'MUS', 1),
+				array(140, 'Mauritania', 'MR', 'MRT', 1),
+				array(141, 'Mayote', 'YT', 'MYT', 2),
+				array(142, 'Mexico', 'MX', 'MEX', 1),
+				array(143, 'Micronesia', 'FM', 'FSM', 1),
+				array(144, 'Moldova', 'MD', 'MDA', 1),
+				array(145, 'Monaco', 'MC', 'MCO', 2),
+				array(146, 'Mongolia', 'MN', 'MNG', 1),
+				array(147, 'Montserrat', 'MS', 'MSR', 1),
+				array(227, 'Montenegro', 'ME', 'MNE', 2),
+				array(148, 'Mozambique', 'MZ', 'MOZ', 1),
+				array(149, 'Myanmar', 'MM', 'MMR', 1),
+				array(150, 'Namibia', 'NA', 'NAM', 1),
+				array(151, 'Nauru', 'NR', 'NRU', 1),
+				array(152, 'Nepal', 'NP', 'NPL', 1),
+				array(9, 'Netherlands Antilles', 'AN', 'ANT', 1),
+				array(153, 'Nicaragua', 'NI', 'NIC', 1),
+				array(154, 'Niger', 'NE', 'NER', 1),
+				array(155, 'Nigeria', 'NG', 'NGA', 1),
+				array(156, 'Niue', 'NU', 'NIU', 1),
+				array(157, 'Norway', 'NO', 'NOR', 1),
+				array(158, 'New Caledonia', 'NC', 'NCL', 1),
+				array(159, 'New Zealand', 'NZ', 'NZL', 1),
+				array(160, 'Oman', 'OM', 'OMN', 1),
+				array(161, 'Pakistan', 'PK', 'PAK', 1),
+				array(162, 'Palau', 'PW', 'PLW', 1),
+				array(163, 'Panama', 'PA', 'PAN', 1),
+				array(164, 'Papua New Guinea', 'PG', 'PNG', 1),
+				array(165, 'Paraguay', 'PY', 'PRY', 1),
+				array(166, 'Peru', 'PE', 'PER', 1),
+				array(68, 'Philippines', 'PH', 'PHL', 1),
+				array(167, 'Poland', 'PL', 'POL', 1),
+				array(168, 'Portugal', 'PT', 'PRT', 2),
+				array(169, 'Puerto Rico', 'PR', 'PRI', 1),
+				array(170, 'Qatar', 'QA', 'QAT', 1),
+				array(176, 'Rwanda', 'RW', 'RWA', 1),
+				array(177, 'Romania', 'RO', 'ROM', 2),
+				array(178, 'Russia', 'RU', 'RUS', 1),
+				array(229, 'Saint Pierre and Miquelon', 'PM', 'SPM', 2),
+				array(180, 'Samoa', 'WS', 'WSM', 1),
+				array(181, 'American Samoa', 'AS', 'ASM', 1),
+				array(183, 'San Marino', 'SM', 'SMR', 2),
+				array(184, 'Saint Vincent and the Grenadines', 'VC', 'VCT', 1),
+				array(185, 'Saint Helena', 'SH', 'SHN', 1),
+				array(186, 'Saint Lucia', 'LC', 'LCA', 1),
+				array(188, 'Senegal', 'SN', 'SEN', 1),
+				array(189, 'Seychelles', 'SC', 'SYC', 1),
+				array(190, 'Sierra Leona', 'SL', 'SLE', 1),
+				array(191, 'Singapore', 'SG', 'SGP', 1),
+				array(192, 'Syria', 'SY', 'SYR', 1),
+				array(193, 'Somalia', 'SO', 'SOM', 1),
+				array(194, 'Sri Lanka', 'LK', 'LKA', 1),
+				array(195, 'South Africa', 'ZA', 'ZAF', 1),
+				array(196, 'Sudan', 'SD', 'SDN', 1),
+				array(199, 'Suriname', 'SR', 'SUR', 1),
+				array(200, 'Swaziland', 'SZ', 'SWZ', 1),
+				array(201, 'Thailand', 'TH', 'THA', 1),
+				array(202, 'Taiwan', 'TW', 'TWN', 1),
+				array(203, 'Tanzania', 'TZ', 'TZA', 1),
+				array(204, 'Tajikistan', 'TJ', 'TJK', 1),
+				array(206, 'Timor-Leste', 'TL', 'TLS', 1),
+				array(207, 'Togo', 'TG', 'TGO', 1),
+				array(208, 'Tokelau', 'TK', 'TKL', 1),
+				array(209, 'Tonga', 'TO', 'TON', 1),
+				array(210, 'Trinidad and Tobago', 'TT', 'TTO', 1),
+				array(211, 'Tunisia', 'TN', 'TUN', 1),
+				array(212, 'Turkmenistan', 'TM', 'TKM', 1),
+				array(213, 'Turkey', 'TR', 'TUR', 1),
+				array(214, 'Tuvalu', 'TV', 'TUV', 1),
+				array(215, 'Ukraine', 'UA', 'UKR', 1),
+				array(216, 'Uganda', 'UG', 'UGA', 1),
+				array(59, 'United Arab Emirates', 'AE', 'ARE', 1),
+				array(217, 'Uruguay', 'UY', 'URY', 1),
+				array(218, 'Uzbekistan', 'UZ', 'UZB', 1),
+				array(219, 'Vanuatu', 'VU', 'VUT', 1),
+				array(220, 'Vatican City', 'VA', 'VAT', 2),
+				array(221, 'Venezuela', 'VE', 'VEN', 1),
+				array(222, 'Vietnam', 'VN', 'VNM', 1),
+				array(108, 'Virgin Islands', 'VI', 'VIR', 1),
+				array(223, 'Yemen', 'YE', 'YEM', 1),
+				array(225, 'Zambia', 'ZM', 'ZMB', 1),
+				array(226, 'Zimbabwe', 'ZW', 'ZWE', 1),
+		);
+		$country_iso = 'US';
+		foreach ($old_countries as $country_array) {
+			// note: index 0 is the 3.1 country ID
+			if ($country_array[0] == $country_id) {
+				// note: index 2 is the ISO
+				$country_iso = $country_array[2];
+				break;
+			}
+		}
+		return $country_iso;
+	}
+
+
+
+	/**
+	 * Gets the ISO3 for the
+	 *
+	 * @return string
+	 */
+	public function get_default_country_iso()
+	{
+		$old_org_options = get_option('events_organization_settings');
+		$iso = $this->get_iso_from_3_1_country_id($old_org_options['organization_country']);
+		return $iso;
+	}
+
+
+
+	/**
+	 * Converst a 3.1 payment status to its equivalent 4.1 regisration status
+	 *
+	 * @param string  $payment_status                   possible value for 3.1's evens_attendee.payment_status
+	 * @param boolean $this_thing_required_pre_approval whether the thing we're considering (the general setting's
+	 *                                                  default payment status, the event's default payment status, or
+	 *                                                  the attendee's payment status) required pre-approval.
+	 * @return string STS_ID for use in 4.1
+	 */
+	public function convert_3_1_payment_status_to_4_1_STS_ID($payment_status, $this_thing_required_pre_approval = false)
+	{
+		// EE team can read the related discussion: https://app.asana.com/0/2400967562914/9418495544455
+		if ($this_thing_required_pre_approval) {
+			return 'RNA';
+		} else {
+			$mapping = $default_reg_stati_conversions = array(
+					'Completed'        => 'RAP',
+					''                 => 'RPP',
+					'Incomplete'       => 'RPP',
+					'Pending'          => 'RAP',
+					// stati that only occurred on 3.1 attendees:
+					'Payment Declined' => 'RPP',
+					'Not Completed'    => 'RPP',
+					'Cancelled'        => 'RPP',
+					'Declined'         => 'RPP',
+			);
+		}
+		return isset($mapping[ $payment_status ]) ? $mapping[ $payment_status ] : 'RNA';
+	}
+
+
+
+	/**
+	 * Makes sure the 3.1's image url is converted to an image attachment post to the 4.1 CPT event
+	 * and sets it as the featured image on the CPT event
+	 *
+	 * @param type                            $old_event
+	 * @param type                            $new_cpt_id
+	 * @param  EE_Data_Migration_Script_Stage $migration_stage the stage which called this, where errors should be added
+	 * @return boolean whether or not we had to do the big job of creating an image attachment
+	 */
+	public function convert_image_url_to_attachment_and_attach_to_post(
+		$guid,
+		$new_cpt_id,
+		EE_Data_Migration_Script_Stage $migration_stage
+	) {
+		$created_attachment_post = false;
+		$guid = $this->_get_original_guid($guid);
+		if ($guid) {
+			// check for an existing attachment post with this guid
+			$attachment_post_id = $this->_get_image_attachment_id_by_GUID($guid);
+			if (! $attachment_post_id) {
+				// post thumbnail with that GUID doesn't exist, we should create one
+				$attachment_post_id = $this->_create_image_attachment_from_GUID($guid, $migration_stage);
+				$created_attachment_post = true;
+			}
+			// double-check we actually have an attachment post
+			if ($attachment_post_id) {
+				update_post_meta($new_cpt_id, '_thumbnail_id', $attachment_post_id);
+			} else {
+				$migration_stage->add_error(sprintf(esc_html__(
+					"Could not update event image %s for CPT with ID %d, but attachments post ID is %d",
+					"event_espresso"
+				), $guid, $new_cpt_id, $attachment_post_id));
+			}
+		}
+		return $created_attachment_post;
+	}
+
+
+
+	/**
+	 * In 3.1, the event thumbnail image DOESN'T point to the orignal image, but instead
+	 * to a large thumbnail (which has nearly the same GUID, except it adds "-{width}x{height}" before the filetype,
+	 * or whatever dimensions it is. Eg 'http://mysite.com/image1-300x400.jpg' instead of
+	 * 'http://mysite.com/image1.jpg' ). This function attempts to strip that off and get the original file, if it
+	 * exists
+	 *
+	 * @param string $guid_in_old_event
+	 * @return string either the original guid, or $guid_in_old_event if we couldn't figure out what the original was
+	 */
+	private function _get_original_guid($guid_in_old_event)
+	{
+		$original_guid = preg_replace('~-\d*x\d*\.~', '.', $guid_in_old_event, 1);
+		// do a head request to verify the file exists
+		$head_response = wp_remote_head($original_guid);
+		if (! $head_response instanceof WP_Error && $head_response['response']['message'] == 'OK') {
+			return $original_guid;
+		} else {
+			return $guid_in_old_event;
+		}
+	}
+
+
+
+	/**
+	 * Creates an image attachment post for the GUID. If the GUID points to a remote image,
+	 * we download it to our uploads directory so that it can be properly processed (eg, creates different sizes of
+	 * thumbnails)
+	 *
+	 * @param type                           $guid
+	 * @param EE_Data_Migration_Script_Stage $migration_stage
+	 * @return int
+	 */
+	private function _create_image_attachment_from_GUID($guid, EE_Data_Migration_Script_Stage $migration_stage)
+	{
+		if (! $guid) {
+			$migration_stage->add_error(sprintf(esc_html__(
+				"Cannot create image attachment for a blank GUID!",
+				"event_espresso"
+			)));
+			return 0;
+		}
+		$wp_filetype = wp_check_filetype(basename($guid), null);
+		$wp_upload_dir = wp_upload_dir();
+		// if the file is located remotely, download it to our uploads DIR, because wp_genereate_attachmnet_metadata needs the file to be local
+		if (strpos($guid, $wp_upload_dir['url']) === false) {
+			// image is located remotely. download it and place it in the uploads directory
+			if (! is_readable($guid)) {
+				$migration_stage->add_error(sprintf(esc_html__(
+					"Could not create image attachment from non-existent file: %s",
+					"event_espresso"
+				), $guid));
+				return 0;
+			}
+			$contents = file_get_contents($guid);
+			if ($contents === false) {
+				$migration_stage->add_error(sprintf(esc_html__(
+					"Could not read image at %s, and therefore couldnt create an attachment post for it.",
+					"event_espresso"
+				), $guid));
+				return false;
+			}
+			$local_filepath = $wp_upload_dir['path'] . '/' . basename($guid);
+			$savefile = fopen($local_filepath, 'w');
+			fwrite($savefile, $contents);
+			fclose($savefile);
+			$guid = str_replace($wp_upload_dir['path'], $wp_upload_dir['url'], $local_filepath);
+		} else {
+			$local_filepath = str_replace($wp_upload_dir['url'], $wp_upload_dir['path'], $guid);
+		}
+		$attachment = array(
+				'guid'           => $guid,
+				'post_mime_type' => $wp_filetype['type'],
+				'post_title'     => preg_replace('/\.[^.]+$/', '', basename($guid)),
+				'post_content'   => '',
+				'post_status'    => 'inherit',
+		);
+		$attach_id = wp_insert_attachment($attachment, $guid);
+		if (! $attach_id) {
+			$migration_stage->add_error(sprintf(esc_html__(
+				"Could not create image attachment post from image '%s'. Attachment data was %s.",
+				"event_espresso"
+			), $guid, $this->_json_encode($attachment)));
+			return $attach_id;
+		}
+		// you must first include the image.php file
+		// for the function wp_generate_attachment_metadata() to work
+		require_once(ABSPATH . 'wp-admin/includes/image.php');
+		$attach_data = wp_generate_attachment_metadata($attach_id, $local_filepath);
+		if (! $attach_data) {
+			$migration_stage->add_error(sprintf(esc_html__(
+				"Coudl not genereate attachment metadata for attachment post %d with filepath %s and GUID %s. Please check the file was downloaded properly.",
+				"event_espresso"
+			), $attach_id, $local_filepath, $guid));
+			return $attach_id;
+		}
+		$metadata_save_result = wp_update_attachment_metadata($attach_id, $attach_data);
+		if (! $metadata_save_result) {
+			$migration_stage->add_error(sprintf(esc_html__(
+				"Could not update attachment metadata for attachment %d with data %s",
+				"event_espresso"
+			), $attach_id, $this->_json_encode($attach_data)));
+		}
+		return $attach_id;
+	}
+
+
+
+	/**
+	 * Finds the attachment post containing info about an image attachment given the GUID (link to the image itself),
+	 * and returns its ID.
+	 *
+	 * @global type  $wpdb
+	 * @param string $guid
+	 * @return int
+	 */
+	private function _get_image_attachment_id_by_GUID($guid)
+	{
+		global $wpdb;
+		$attachment_id = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE guid=%s LIMIT 1", $guid));
+		return $attachment_id;
+	}
+
+
+
+	/**
+	 * Returns a mysql-formatted DATETIME in UTC time, given a $DATETIME_string
+	 * (and optionally a timezone; if none is given, the wp default is used)
+	 *
+	 * @param EE_Data_Migration_Script_base $stage
+	 * @param array                         $row_of_data , the row from the DB (as an array) we're trying to find the
+	 *                                                   UTC time for
+	 * @param string                        $DATETIME_string
+	 * @param string                        $timezone
+	 * @return string
+	 */
+	public function convert_date_string_to_utc(
+		EE_Data_Migration_Script_Stage $stage,
+		$row_of_data,
+		$DATETIME_string,
+		$timezone = null
+	) {
+		$original_tz = $timezone;
+		if (! $timezone) {
+			$timezone = $this->_get_wp_timezone();
+		}
+		if (! $timezone) {
+			$stage->add_error(sprintf(
+				esc_html__("Could not find timezone given %s for %s", "event_espresso"),
+				$original_tz,
+				$row_of_data
+			));
+			$timezone = 'UTC';
+		}
+		try {
+			$date_obj = new DateTime($DATETIME_string, new DateTimeZone($timezone));
+			EEH_DTT_Helper::setTimezone($date_obj, new DateTimeZone('UTC'));
+		} catch (Exception $e) {
+			$stage->add_error(sprintf(esc_html__(
+				"Could not convert time string '%s' using timezone '%s' into a proper DATETIME. Using current time instead.",
+				"event_espresso"
+			), $DATETIME_string, $timezone));
+			$date_obj = new DateTime();
+		}
+		return $date_obj->format('Y-m-d H:i:s');
+	}
+
+
+
+	/**
+	 * Gets the default timezone string from wordpress (even if they set a gmt offset)
+	 *
+	 * @return string
+	 */
+	private function _get_wp_timezone()
+	{
+		$timezone = empty($timezone) ? get_option('timezone_string') : $timezone;
+		// if timezone is STILL empty then let's get the GMT offset and then set the timezone_string using our converter
+		if (empty($timezone)) {
+			// let's get a the WordPress UTC offset
+			$offset = get_option('gmt_offset');
+			$timezone = $this->timezone_convert_to_string_from_offset($offset);
+		}
+		return $timezone;
+	}
+
+
+
+	/**
+	 * Gets the wordpress timezone string from a UTC offset
+	 *
+	 * @param int $offset
+	 * @return boolean
+	 */
+	private function timezone_convert_to_string_from_offset($offset)
+	{
+		// shamelessly taken from bottom comment at http://ca1.php.net/manual/en/function.timezone-name-from-abbr.php because timezone_name_from_abbr() did not work as expected - its not reliable
+		$offset *= 3600; // convert hour offset to seconds
+		$abbrarray = timezone_abbreviations_list();
+		foreach ($abbrarray as $abbr) {
+			foreach ($abbr as $city) {
+				if ($city['offset'] == $offset) {
+					return $city['timezone_id'];
+				}
+			}
+		}
+		return false;
+	}
+
+
+
+	public function migration_page_hooks()
+	{
+		add_filter(
+			'FHEE__ee_migration_page__header',
+			array($this, '_migrate_page_hook_simplify_version_strings'),
+			10,
+			3
+		);
+		add_filter(
+			'FHEE__ee_migration_page__p_after_header',
+			array($this, '_migration_page_hook_simplify_next_db_state'),
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_1_main',
+			array($this, '_migrate_page_hook_simplify_version_strings'),
+			10,
+			3
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_1_button_text',
+			array($this, '_migrate_page_hook_simplify_version_strings'),
+			10,
+			3
+		);
+		add_action(
+			'AHEE__ee_migration_page__option_1_extra_details',
+			array($this, '_migration_page_hook_option_1_extra_details'),
+			10,
+			3
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_2_main',
+			array($this, '_migrate_page_hook_simplify_version_strings'),
+			10,
+			4
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_2_button_text',
+			array($this, '_migration_page_hook_simplify_next_db_state'),
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__option_2_details',
+			array($this, '_migration_page_hook_simplify_next_db_state'),
+			10,
+			2
+		);
+		add_action(
+			'AHEE__ee_migration_page__after_migration_options_table',
+			array($this, '_migration_page_hook_after_migration_options_table')
+		);
+		add_filter(
+			'FHEE__ee_migration_page__done_migration_header',
+			array($this, '_migration_page_hook_simplify_next_db_state'),
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__p_after_done_migration_header',
+			array($this, '_migration_page_hook_simplify_next_db_state'),
+			10,
+			2
+		);
+		add_filter(
+			'FHEE__ee_migration_page__migration_options_template',
+			array($this,'use_migration_options_from_ee3_template')
+		);
+	}
+
+
+
+	public function _migrate_page_hook_simplify_version_strings(
+		$old_content,
+		$current_db_state,
+		$next_db_state,
+		$ultimate_db_state = null
+	) {
+		return str_replace(
+			array($current_db_state, $next_db_state, $ultimate_db_state),
+			array(esc_html__('EE3', 'event_espresso'), esc_html__('EE4', 'event_espresso'), esc_html__("EE4", 'event_espresso')),
+			$old_content
+		);
+	}
+
+
+
+	public function _migration_page_hook_simplify_next_db_state($old_content, $next_db_state)
+	{
+		return str_replace($next_db_state, esc_html__("EE4", 'event_espresso'), $old_content);
+	}
+
+
+
+	public function _migration_page_hook_option_1_extra_details()
+	{
+		?>
         <p><?php printf(esc_html__(
-            "Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents",
-            "event_espresso"
-        )); ?></p><?php
-    }
+			"Note: many of your EE3 shortcodes will be changed to EE4 shortcodes during this migration (among many other things). Should you revert to EE3, then you should restore to your backup or manually change the EE4 shortcodes back to their EE3 equivalents",
+			"event_espresso"
+		)); ?></p><?php
+	}
 
 
 
-    public function _migration_page_hook_after_migration_options_table()
-    {
-        ?><p class="ee-attention">
+	public function _migration_page_hook_after_migration_options_table()
+	{
+		?><p class="ee-attention">
         <strong><span class="reminder-spn">
                 <?php esc_html_e(
-                    "Important note to those using Event Espresso 3 addons: ",
-                    "event_espresso"
-                ); ?></span></strong>
+					"Important note to those using Event Espresso 3 addons: ",
+					"event_espresso"
+				); ?></span></strong>
         <br/>
         <?php esc_html_e(
-            "Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.",
-            "event_espresso"
-        ); ?>
+			"Unless an addon's description on our website explicitly states that it is compatible with EE4, you should consider it incompatible and know that it WILL NOT WORK correctly with this new version of Event Espresso 4 (EE4). As well, any data for incompatible addons will NOT BE MIGRATED until an updated EE4 compatible version of the addon is available. If you want, or need to keep using your EE3 addons, you should simply continue using EE3 until EE4 compatible versions of your addons become available. To continue using EE3 for now, just deactivate EE4 and reactivate EE3.",
+			"event_espresso"
+		); ?>
         </p><?php
-    }
+	}
 
 
 
-    /**
-     * When showing the migration options, show more options and info than normal (ie, give folks the option
-     * to start using EE4 without migrating. From EE3 that's fine, because it doesn't actually remove any data, because
-     * EE4 doesn't have any yet. But when migrating from EE4 it would remove old data, so its not a great idea).
-     * @param $template_filepath
-     * @return string
-     */
-    public function use_migration_options_from_ee3_template($template_filepath)
-    {
-        return EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee3.template.php';
-    }
+	/**
+	 * When showing the migration options, show more options and info than normal (ie, give folks the option
+	 * to start using EE4 without migrating. From EE3 that's fine, because it doesn't actually remove any data, because
+	 * EE4 doesn't have any yet. But when migrating from EE4 it would remove old data, so its not a great idea).
+	 * @param $template_filepath
+	 * @return string
+	 */
+	public function use_migration_options_from_ee3_template($template_filepath)
+	{
+		return EE_MAINTENANCE_TEMPLATE_PATH . 'migration_options_from_ee3.template.php';
+	}
 }

core/libraries/form_sections/strategies/layout/EE_Div_Per_Section_Layout.strategy.php

Indentation +148 added lines, -148 removed lines

@@ -11,166 +11,166 @@
  */
 class EE_Div_Per_Section_Layout extends EE_Form_Section_Layout_Base
 {
-    /**
-     * opening div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_begin()
-    {
-        return EEH_HTML::div(
-            '',
-            $this->_form_section->html_id(),
-            $this->_form_section->html_class(),
-            $this->_form_section->html_style()
-        );
-    }
+	/**
+	 * opening div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_begin()
+	{
+		return EEH_HTML::div(
+			'',
+			$this->_form_section->html_id(),
+			$this->_form_section->html_class(),
+			$this->_form_section->html_style()
+		);
+	}
 
 
 
-    /**
-     * Lays out the row for the input, including label and errors
-     *
-     * @param EE_Form_Input_Base $input
-     * @return string
-     * @throws \EE_Error
-     */
-    public function layout_input($input)
-    {
-        $html = '';
-        // set something unique for the id
-        $html_id = (string) $input->html_id() !== ''
-            ? (string) $input->html_id()
-            : spl_object_hash($input);
-        // and add a generic input type class
-        $html_class = $this->processHtmlClasses(
-            sanitize_key(str_replace('_', '-', get_class($input))),
-            '-dv'
-        );
-        if ($input instanceof EE_Hidden_Input) {
-            $html .= EEH_HTML::nl() . $input->get_html_for_input();
-        } elseif ($input instanceof EE_Submit_Input) {
-            $input_class = $this->processHtmlClasses($input->html_class(), '-submit-dv');
-            $html .= EEH_HTML::div(
-                $input->get_html_for_input(),
-                $html_id . '-submit-dv',
-                "$input_class $html_class"
-            );
-        } elseif ($input instanceof EE_Select_Input) {
-            $input_class = $this->processHtmlClasses($input->html_class(), '-input-dv');
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "$input_class $html_class"
-            );
-        } elseif ($input instanceof EE_Form_Input_With_Options_Base) {
-            $input_class = $this->processHtmlClasses($input->html_class(), '-input-dv');
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "$input_class $html_class"
-            );
-        } else {
-            $input_class = $this->processHtmlClasses($input->html_class(), '-input-dv');
-            $html .= EEH_HTML::div(
-                EEH_HTML::nl(1) . $input->get_html_for_label() .
-                EEH_HTML::nl() . $input->get_html_for_errors() .
-                EEH_HTML::nl() . $input->get_html_for_input() .
-                EEH_HTML::nl() . $input->get_html_for_help(),
-                $html_id . '-input-dv',
-                "$input_class $html_class"
-            );
-        }
-        return $html;
-    }
+	/**
+	 * Lays out the row for the input, including label and errors
+	 *
+	 * @param EE_Form_Input_Base $input
+	 * @return string
+	 * @throws \EE_Error
+	 */
+	public function layout_input($input)
+	{
+		$html = '';
+		// set something unique for the id
+		$html_id = (string) $input->html_id() !== ''
+			? (string) $input->html_id()
+			: spl_object_hash($input);
+		// and add a generic input type class
+		$html_class = $this->processHtmlClasses(
+			sanitize_key(str_replace('_', '-', get_class($input))),
+			'-dv'
+		);
+		if ($input instanceof EE_Hidden_Input) {
+			$html .= EEH_HTML::nl() . $input->get_html_for_input();
+		} elseif ($input instanceof EE_Submit_Input) {
+			$input_class = $this->processHtmlClasses($input->html_class(), '-submit-dv');
+			$html .= EEH_HTML::div(
+				$input->get_html_for_input(),
+				$html_id . '-submit-dv',
+				"$input_class $html_class"
+			);
+		} elseif ($input instanceof EE_Select_Input) {
+			$input_class = $this->processHtmlClasses($input->html_class(), '-input-dv');
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"$input_class $html_class"
+			);
+		} elseif ($input instanceof EE_Form_Input_With_Options_Base) {
+			$input_class = $this->processHtmlClasses($input->html_class(), '-input-dv');
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl() . $this->_display_label_for_option_type_question($input) .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"$input_class $html_class"
+			);
+		} else {
+			$input_class = $this->processHtmlClasses($input->html_class(), '-input-dv');
+			$html .= EEH_HTML::div(
+				EEH_HTML::nl(1) . $input->get_html_for_label() .
+				EEH_HTML::nl() . $input->get_html_for_errors() .
+				EEH_HTML::nl() . $input->get_html_for_input() .
+				EEH_HTML::nl() . $input->get_html_for_help(),
+				$html_id . '-input-dv',
+				"$input_class $html_class"
+			);
+		}
+		return $html;
+	}
 
 
-    /**
-     * appends one or more css classes in a string with the provided suffix
-     *
-     * @param array|string $classes
-     * @param string $suffix
-     * @return string
-     * @since 4.10.31.p
-     */
-    private function processHtmlClasses($classes, string $suffix): string
-    {
-        $html_classes = [];
-        $classes = is_string($classes) ? explode(' ', $classes) : $classes;
-        $classes = (array) $classes;
-        foreach ($classes as $class) {
-            // don't append suffix if class already has "-js" suffix
-            $html_classes[] = strpos($class, '-js') !== strlen($class) - 3
-                ? "$class$suffix"
-                : $class;
-        }
-        return implode(' ', $html_classes);
-    }
+	/**
+	 * appends one or more css classes in a string with the provided suffix
+	 *
+	 * @param array|string $classes
+	 * @param string $suffix
+	 * @return string
+	 * @since 4.10.31.p
+	 */
+	private function processHtmlClasses($classes, string $suffix): string
+	{
+		$html_classes = [];
+		$classes = is_string($classes) ? explode(' ', $classes) : $classes;
+		$classes = (array) $classes;
+		foreach ($classes as $class) {
+			// don't append suffix if class already has "-js" suffix
+			$html_classes[] = strpos($class, '-js') !== strlen($class) - 3
+				? "$class$suffix"
+				: $class;
+		}
+		return implode(' ', $html_classes);
+	}
 
 
 
-    /**
-     *
-     * _display_label_for_option_type_question
-     * Gets the HTML for the 'label', which is just text for this (because labels
-     * should be for each input)
-     *
-     * @param EE_Form_Input_With_Options_Base $input
-     * @return string
-     */
-    protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
-    {
-        if ($input->display_html_label_text()) {
-            $html_label_text = $input->html_label_text();
-            $label_html = EEH_HTML::div(
-                $input->required()
-                    ? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
-                    : $html_label_text,
-                $input->html_label_id(),
-                $input->required()
-                    ? 'ee-required-label ' . $input->html_label_class()
-                    : $input->html_label_class(),
-                $input->html_label_style(),
-                $input->other_html_attributes()
-            );
-            // if no content was provided to EEH_HTML::div() above (ie: an empty label),
-            // then we need to close the div manually
-            if (empty($html_label_text)) {
-                $label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
-            }
-            return $label_html;
-        }
-        return '';
-    }
+	/**
+	 *
+	 * _display_label_for_option_type_question
+	 * Gets the HTML for the 'label', which is just text for this (because labels
+	 * should be for each input)
+	 *
+	 * @param EE_Form_Input_With_Options_Base $input
+	 * @return string
+	 */
+	protected function _display_label_for_option_type_question(EE_Form_Input_With_Options_Base $input)
+	{
+		if ($input->display_html_label_text()) {
+			$html_label_text = $input->html_label_text();
+			$label_html = EEH_HTML::div(
+				$input->required()
+					? $html_label_text . EEH_HTML::span('*', '', 'ee-asterisk')
+					: $html_label_text,
+				$input->html_label_id(),
+				$input->required()
+					? 'ee-required-label ' . $input->html_label_class()
+					: $input->html_label_class(),
+				$input->html_label_style(),
+				$input->other_html_attributes()
+			);
+			// if no content was provided to EEH_HTML::div() above (ie: an empty label),
+			// then we need to close the div manually
+			if (empty($html_label_text)) {
+				$label_html .= EEH_HTML::divx($input->html_label_id(), $input->html_label_class());
+			}
+			return $label_html;
+		}
+		return '';
+	}
 
 
 
-    /**
-     * Lays out a row for the subsection
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @return string
-     */
-    public function layout_subsection($form_section)
-    {
-        return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
-    }
+	/**
+	 * Lays out a row for the subsection
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @return string
+	 */
+	public function layout_subsection($form_section)
+	{
+		return EEH_HTML::nl(1) . $form_section->get_html() . EEH_HTML::nl(-1);
+	}
 
 
 
-    /**
-     * closing div tag for a form
-     *
-     * @return string
-     */
-    public function layout_form_end()
-    {
-        return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
-    }
+	/**
+	 * closing div tag for a form
+	 *
+	 * @return string
+	 */
+	public function layout_form_end()
+	{
+		return EEH_HTML::divx($this->_form_section->html_id(), $this->_form_section->html_class());
+	}
 }

core/services/request/sanitizers/AllowedTags.php

Indentation +248 added lines, -248 removed lines

@@ -12,281 +12,281 @@
  */
 class AllowedTags
 {
-    /**
-     * @var array[]
-     */
-    private static $attributes = [
-        'accept-charset'    => 1,
-        'action'            => 1,
-        'alt'               => 1,
-        'allow'             => 1,
-        'allowfullscreen'   => 1,
-        'align'             => 1,
-        'aria-*'            => 1,
-        'autocomplete'      => 1,
-        'checked'           => 1,
-        'class'             => 1,
-        'cols'              => 1,
-        'content'           => 1,
-        'data-*'            => 1,
-        'dir'               => 1,
-        'disabled'          => 1,
-        'enctype'           => 1,
-        'for'               => 1,
-        'frameborder'       => 1,
-        'height'            => 1,
-        'href'              => 1,
-        'id'                => 1,
-        'itemprop'          => 1,
-        'itemscope'         => 1,
-        'itemtype'          => 1,
-        'label'             => 1,
-        'lang'              => 1,
-        'max'               => 1,
-        'maxlength'         => 1,
-        'method'            => 1,
-        'min'               => 1,
-        'multiple'          => 1,
-        'name'              => 1,
-        'novalidate'        => 1,
-        'placeholder'       => 1,
-        'readonly'          => 1,
-        'rel'               => 1,
-        'required'          => 1,
-        'rows'              => 1,
-        'selected'          => 1,
-        'src'               => 1,
-        'size'              => 1,
-        'style'             => 1,
-        'step'              => 1,
-        'tabindex'          => 1,
-        'target'            => 1,
-        'title'             => 1,
-        'type'              => 1,
-        'value'             => 1,
-        'width'             => 1,
-        'topmargin'         => 1,
-        'leftmargin'        => 1,
-        'marginheight'      => 1,
-        'marginwidth'       => 1,
-        'property'          => 1,
-        'bgcolor'           => 1,
-        'media'             => 1,
-        'cellpadding'       => 1,
-        'cellspacing'       => 1,
-        'border'            => 1,
-    ];
+	/**
+	 * @var array[]
+	 */
+	private static $attributes = [
+		'accept-charset'    => 1,
+		'action'            => 1,
+		'alt'               => 1,
+		'allow'             => 1,
+		'allowfullscreen'   => 1,
+		'align'             => 1,
+		'aria-*'            => 1,
+		'autocomplete'      => 1,
+		'checked'           => 1,
+		'class'             => 1,
+		'cols'              => 1,
+		'content'           => 1,
+		'data-*'            => 1,
+		'dir'               => 1,
+		'disabled'          => 1,
+		'enctype'           => 1,
+		'for'               => 1,
+		'frameborder'       => 1,
+		'height'            => 1,
+		'href'              => 1,
+		'id'                => 1,
+		'itemprop'          => 1,
+		'itemscope'         => 1,
+		'itemtype'          => 1,
+		'label'             => 1,
+		'lang'              => 1,
+		'max'               => 1,
+		'maxlength'         => 1,
+		'method'            => 1,
+		'min'               => 1,
+		'multiple'          => 1,
+		'name'              => 1,
+		'novalidate'        => 1,
+		'placeholder'       => 1,
+		'readonly'          => 1,
+		'rel'               => 1,
+		'required'          => 1,
+		'rows'              => 1,
+		'selected'          => 1,
+		'src'               => 1,
+		'size'              => 1,
+		'style'             => 1,
+		'step'              => 1,
+		'tabindex'          => 1,
+		'target'            => 1,
+		'title'             => 1,
+		'type'              => 1,
+		'value'             => 1,
+		'width'             => 1,
+		'topmargin'         => 1,
+		'leftmargin'        => 1,
+		'marginheight'      => 1,
+		'marginwidth'       => 1,
+		'property'          => 1,
+		'bgcolor'           => 1,
+		'media'             => 1,
+		'cellpadding'       => 1,
+		'cellspacing'       => 1,
+		'border'            => 1,
+	];
 
 
-    /**
-     * @var array
-     */
-    private static $tags = [
-        'a',
-        'abbr',
-        'b',
-        'br',
-        'code',
-        'div',
-        'em',
-        'h1',
-        'h2',
-        'h3',
-        'h4',
-        'h5',
-        'h6',
-        'hr',
-        'i',
-        'img',
-        'li',
-        'ol',
-        'p',
-        'pre',
-        'small',
-        'span',
-        'strong',
-        'table',
-        'td',
-        'tr',
-        'ul',
-    ];
+	/**
+	 * @var array
+	 */
+	private static $tags = [
+		'a',
+		'abbr',
+		'b',
+		'br',
+		'code',
+		'div',
+		'em',
+		'h1',
+		'h2',
+		'h3',
+		'h4',
+		'h5',
+		'h6',
+		'hr',
+		'i',
+		'img',
+		'li',
+		'ol',
+		'p',
+		'pre',
+		'small',
+		'span',
+		'strong',
+		'table',
+		'td',
+		'tr',
+		'ul',
+	];
 
 
-    /**
-     * @var array
-     */
-    private static $allowed_tags;
+	/**
+	 * @var array
+	 */
+	private static $allowed_tags;
 
 
-    /**
-     * @var array
-     */
-    private static $allowed_with_embed_tags;
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_embed_tags;
 
 
-    /**
-     * @var array
-     */
-    private static $allowed_with_form_tags;
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_form_tags;
 
 
-    /**
-     * @var array
-     */
-    private static $allowed_with_script_and_style_tags;
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_script_and_style_tags;
 
-    /**
-     * @var array
-     */
-    private static $allowed_with_full_tags;
+	/**
+	 * @var array
+	 */
+	private static $allowed_with_full_tags;
 
 
-    /**
-     * merges additional tags and attributes into the WP post tags
-     */
-    private static function initializeAllowedTags()
-    {
-        $allowed_post_tags = wp_kses_allowed_html('post');
-        $allowed_tags = [];
-        foreach (AllowedTags::$tags as $tag) {
-            $allowed_tags[ $tag ] = AllowedTags::$attributes;
-        }
-        AllowedTags::$allowed_tags = array_merge_recursive($allowed_post_tags, $allowed_tags);
-    }
+	/**
+	 * merges additional tags and attributes into the WP post tags
+	 */
+	private static function initializeAllowedTags()
+	{
+		$allowed_post_tags = wp_kses_allowed_html('post');
+		$allowed_tags = [];
+		foreach (AllowedTags::$tags as $tag) {
+			$allowed_tags[ $tag ] = AllowedTags::$attributes;
+		}
+		AllowedTags::$allowed_tags = array_merge_recursive($allowed_post_tags, $allowed_tags);
+	}
 
 
-    /**
-     * merges embed tags and attributes into the EE all tags
-     */
-    private static function initializeWithEmbedTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $embed_tags = [
-            'iframe' => AllowedTags::$attributes
-        ];
-        AllowedTags::$allowed_with_embed_tags = array_merge_recursive($all_tags, $embed_tags);
-    }
+	/**
+	 * merges embed tags and attributes into the EE all tags
+	 */
+	private static function initializeWithEmbedTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$embed_tags = [
+			'iframe' => AllowedTags::$attributes
+		];
+		AllowedTags::$allowed_with_embed_tags = array_merge_recursive($all_tags, $embed_tags);
+	}
 
 
-    /**
-     * merges form tags and attributes into the EE all tags
-     */
-    private static function initializeWithFormTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $form_tags = [
-            'form'     => AllowedTags::$attributes,
-            'label'    => AllowedTags::$attributes,
-            'input'    => AllowedTags::$attributes,
-            'select'   => AllowedTags::$attributes,
-            'option'   => AllowedTags::$attributes,
-            'optgroup' => AllowedTags::$attributes,
-            'textarea' => AllowedTags::$attributes,
-            'button'   => AllowedTags::$attributes,
-            'fieldset' => AllowedTags::$attributes,
-            'output'   => AllowedTags::$attributes,
-        ];
-        AllowedTags::$allowed_with_form_tags = array_merge_recursive($all_tags, $form_tags);
-    }
+	/**
+	 * merges form tags and attributes into the EE all tags
+	 */
+	private static function initializeWithFormTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$form_tags = [
+			'form'     => AllowedTags::$attributes,
+			'label'    => AllowedTags::$attributes,
+			'input'    => AllowedTags::$attributes,
+			'select'   => AllowedTags::$attributes,
+			'option'   => AllowedTags::$attributes,
+			'optgroup' => AllowedTags::$attributes,
+			'textarea' => AllowedTags::$attributes,
+			'button'   => AllowedTags::$attributes,
+			'fieldset' => AllowedTags::$attributes,
+			'output'   => AllowedTags::$attributes,
+		];
+		AllowedTags::$allowed_with_form_tags = array_merge_recursive($all_tags, $form_tags);
+	}
 
 
-    /**
-     * merges form script and style tags and attributes into the EE all tags
-     */
-    private static function initializeWithScriptAndStyleTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $script_and_style_tags = [
-            'script' => AllowedTags::$attributes,
-            'style'  => AllowedTags::$attributes,
-            'link'   => AllowedTags::$attributes,
-        ];
-        AllowedTags::$allowed_with_script_and_style_tags = array_merge_recursive($all_tags, $script_and_style_tags);
-    }
+	/**
+	 * merges form script and style tags and attributes into the EE all tags
+	 */
+	private static function initializeWithScriptAndStyleTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$script_and_style_tags = [
+			'script' => AllowedTags::$attributes,
+			'style'  => AllowedTags::$attributes,
+			'link'   => AllowedTags::$attributes,
+		];
+		AllowedTags::$allowed_with_script_and_style_tags = array_merge_recursive($all_tags, $script_and_style_tags);
+	}
 
-    /**
-     * merges all head and body tags and attributes into the EE all tags
-     */
-    private static function initializeWithFullTags()
-    {
-        $all_tags = AllowedTags::getAllowedTags();
-        $full_tags = [
-            'script'    => AllowedTags::$attributes,
-            'style'     => AllowedTags::$attributes,
-            'link'      => AllowedTags::$attributes,
-            'title'     => AllowedTags::$attributes,
-            'meta'      => AllowedTags::$attributes,
-            'iframe'    => AllowedTags::$attributes,
-            'form'      => AllowedTags::$attributes,
-            'label'     => AllowedTags::$attributes,
-            'input'     => AllowedTags::$attributes,
-            'select'    => AllowedTags::$attributes,
-            'option'    => AllowedTags::$attributes,
-            'optgroup'  => AllowedTags::$attributes,
-            'textarea'  => AllowedTags::$attributes,
-            'button'    => AllowedTags::$attributes,
-            'fieldset'  => AllowedTags::$attributes,
-            'output'    => AllowedTags::$attributes,
-        ];
-        AllowedTags::$allowed_with_full_tags = array_merge_recursive($all_tags, $full_tags);
-    }
+	/**
+	 * merges all head and body tags and attributes into the EE all tags
+	 */
+	private static function initializeWithFullTags()
+	{
+		$all_tags = AllowedTags::getAllowedTags();
+		$full_tags = [
+			'script'    => AllowedTags::$attributes,
+			'style'     => AllowedTags::$attributes,
+			'link'      => AllowedTags::$attributes,
+			'title'     => AllowedTags::$attributes,
+			'meta'      => AllowedTags::$attributes,
+			'iframe'    => AllowedTags::$attributes,
+			'form'      => AllowedTags::$attributes,
+			'label'     => AllowedTags::$attributes,
+			'input'     => AllowedTags::$attributes,
+			'select'    => AllowedTags::$attributes,
+			'option'    => AllowedTags::$attributes,
+			'optgroup'  => AllowedTags::$attributes,
+			'textarea'  => AllowedTags::$attributes,
+			'button'    => AllowedTags::$attributes,
+			'fieldset'  => AllowedTags::$attributes,
+			'output'    => AllowedTags::$attributes,
+		];
+		AllowedTags::$allowed_with_full_tags = array_merge_recursive($all_tags, $full_tags);
+	}
 
 
-    /**
-     * @return array[]
-     */
-    public static function getAllowedTags()
-    {
-        if (empty(AllowedTags::$allowed_tags)) {
-            AllowedTags::initializeAllowedTags();
-        }
-        return AllowedTags::$allowed_tags;
-    }
+	/**
+	 * @return array[]
+	 */
+	public static function getAllowedTags()
+	{
+		if (empty(AllowedTags::$allowed_tags)) {
+			AllowedTags::initializeAllowedTags();
+		}
+		return AllowedTags::$allowed_tags;
+	}
 
 
-    /**
-     * @return array[]
-     */
-    public static function getWithEmbedTags()
-    {
-        if (empty(AllowedTags::$allowed_with_embed_tags)) {
-            AllowedTags::initializeWithEmbedTags();
-        }
-        return AllowedTags::$allowed_with_embed_tags;
-    }
+	/**
+	 * @return array[]
+	 */
+	public static function getWithEmbedTags()
+	{
+		if (empty(AllowedTags::$allowed_with_embed_tags)) {
+			AllowedTags::initializeWithEmbedTags();
+		}
+		return AllowedTags::$allowed_with_embed_tags;
+	}
 
 
-    /**
-     * @return array[]
-     */
-    public static function getWithFormTags()
-    {
-        if (empty(AllowedTags::$allowed_with_form_tags)) {
-            AllowedTags::initializeWithFormTags();
-        }
-        return AllowedTags::$allowed_with_form_tags;
-    }
+	/**
+	 * @return array[]
+	 */
+	public static function getWithFormTags()
+	{
+		if (empty(AllowedTags::$allowed_with_form_tags)) {
+			AllowedTags::initializeWithFormTags();
+		}
+		return AllowedTags::$allowed_with_form_tags;
+	}
 
 
-    /**
-     * @return array[]
-     */
-    public static function getWithScriptAndStyleTags()
-    {
-        if (empty(AllowedTags::$allowed_with_script_and_style_tags)) {
-            AllowedTags::initializeWithScriptAndStyleTags();
-        }
-        return AllowedTags::$allowed_with_script_and_style_tags;
-    }
+	/**
+	 * @return array[]
+	 */
+	public static function getWithScriptAndStyleTags()
+	{
+		if (empty(AllowedTags::$allowed_with_script_and_style_tags)) {
+			AllowedTags::initializeWithScriptAndStyleTags();
+		}
+		return AllowedTags::$allowed_with_script_and_style_tags;
+	}
 
-    /**
-     * @return array[]
-     */
-    public static function getWithFullTags()
-    {
-        if (empty(AllowedTags::$allowed_with_full_tags)) {
-            AllowedTags::initializeWithFullTags();
-        }
-        return AllowedTags::$allowed_with_full_tags;
-    }
+	/**
+	 * @return array[]
+	 */
+	public static function getWithFullTags()
+	{
+		if (empty(AllowedTags::$allowed_with_full_tags)) {
+			AllowedTags::initializeWithFullTags();
+		}
+		return AllowedTags::$allowed_with_full_tags;
+	}
 }

modules/single_page_checkout/inc/EE_SPCO_JSON_Response.php

Indentation +397 added lines, -397 removed lines

@@ -14,401 +14,401 @@
  */
 class EE_SPCO_JSON_Response
 {
-    /**
-     * @var string
-     */
-    protected $_errors = '';
-
-    /**
-     * @var string
-     */
-    protected $_unexpected_errors = '';
-
-    /**
-     * @var string
-     */
-    protected $_attention = '';
-
-    /**
-     * @var string
-     */
-    protected $_success = '';
-
-    /**
-     * @var string
-     */
-    protected $_plz_select_method_of_payment = '';
-
-    /**
-     * @var string
-     */
-    protected $_redirect_url = '';
-
-    /**
-     * @var string
-     */
-    protected $_registration_time_limit = '';
-
-    /**
-     * @var string
-     */
-    protected $_redirect_form = '';
-
-    /**
-     * @var string
-     */
-    protected $_reg_step_html = '';
-
-    /**
-     * @var string
-     */
-    protected $_method_of_payment = '';
-
-    /**
-     * @var float
-     */
-    protected $_payment_amount;
-
-    /**
-     * @var array
-     */
-    protected $_return_data = array();
-
-
-    /**
-     * @var array
-     */
-    protected $_validation_rules = array();
-
-
-    /**
-     *    class constructor
-     */
-    public function __construct()
-    {
-    }
-
-
-    /**
-     *    __toString
-     *
-     *        allows you to simply echo or print an EE_SPCO_JSON_Response object to produce a  JSON encoded string
-     *
-     * @access    public
-     * @return    string
-     */
-    public function __toString()
-    {
-        $JSON_response = array();
-        // grab notices
-        $notices = EE_Error::get_notices(false);
-        $this->set_attention(isset($notices['attention']) ? $notices['attention'] : '');
-        $this->set_errors(isset($notices['errors']) ? $notices['errors'] : '');
-        $this->set_success(isset($notices['success']) ? $notices['success'] : '');
-        // add notices to JSON response, but only if they exist
-        if ($this->attention()) {
-            $JSON_response['attention'] = $this->attention();
-        }
-        if ($this->errors()) {
-            $JSON_response['errors'] = $this->errors();
-        }
-        if ($this->unexpected_errors()) {
-            $JSON_response['unexpected_errors'] = $this->unexpected_errors();
-        }
-        if ($this->success()) {
-            $JSON_response['success'] = $this->success();
-        }
-        // but if NO notices are set... at least set the "success" as a key so that the JS knows everything worked
-        if (! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
-            $JSON_response['success'] = null;
-        }
-        // set redirect_url, IF it exists
-        if ($this->redirect_url()) {
-            $JSON_response['redirect_url'] = $this->redirect_url();
-        }
-        // set registration_time_limit, IF it exists
-        if ($this->registration_time_limit()) {
-            $JSON_response['registration_time_limit'] = $this->registration_time_limit();
-        }
-        // set payment_amount, IF it exists
-        if ($this->payment_amount() !== null) {
-            $JSON_response['payment_amount'] = $this->payment_amount();
-        }
-        // grab generic return data
-        $return_data = $this->return_data();
-        // add billing form validation rules
-        if ($this->validation_rules()) {
-            $return_data['validation_rules'] = $this->validation_rules();
-        }
-        // set reg_step_html, IF it exists
-        if ($this->reg_step_html()) {
-            $return_data['reg_step_html'] = $this->reg_step_html();
-        }
-        // set method of payment, IF it exists
-        if ($this->method_of_payment()) {
-            $return_data['method_of_payment'] = $this->method_of_payment();
-        }
-        // set "plz_select_method_of_payment" message, IF it exists
-        if ($this->plz_select_method_of_payment()) {
-            $return_data['plz_select_method_of_payment'] = $this->plz_select_method_of_payment();
-        }
-        // set redirect_form, IF it exists
-        if ($this->redirect_form()) {
-            $return_data['redirect_form'] = $this->redirect_form();
-        }
-        // and finally, add return_data array to main JSON response array, IF it contains anything
-        // why did we add some of the above properties to the return data array?
-        // because it is easier and cleaner in the Javascript to deal with this way
-        if (! empty($return_data)) {
-            $JSON_response['return_data'] = $return_data;
-        }
-        // filter final array
-        $JSON_response = apply_filters('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response);
-        // return encoded array
-        return (string) wp_json_encode($JSON_response);
-    }
-
-
-    /**
-     * @param string $attention
-     */
-    public function set_attention($attention)
-    {
-        $this->_attention = $attention;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function attention()
-    {
-        return $this->_attention;
-    }
-
-
-    /**
-     * @param string $errors
-     */
-    public function set_errors($errors)
-    {
-        $this->_errors = $errors;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function errors()
-    {
-        return $this->_errors;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function unexpected_errors()
-    {
-        return $this->_unexpected_errors;
-    }
-
-
-    /**
-     * @param string $unexpected_errors
-     */
-    public function set_unexpected_errors($unexpected_errors)
-    {
-        $this->_unexpected_errors = $unexpected_errors;
-    }
-
-
-    /**
-     * @param string $success
-     */
-    public function set_success($success)
-    {
-        $this->_success = $success;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function success()
-    {
-        return $this->_success;
-    }
-
-
-    /**
-     * @param string $method_of_payment
-     */
-    public function set_method_of_payment($method_of_payment)
-    {
-        $this->_method_of_payment = $method_of_payment;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function method_of_payment()
-    {
-        return $this->_method_of_payment;
-    }
-
-
-    /**
-     * @return float
-     */
-    public function payment_amount()
-    {
-        return $this->_payment_amount;
-    }
-
-
-    /**
-     * @param float $payment_amount
-     * @throws EE_Error
-     */
-    public function set_payment_amount($payment_amount)
-    {
-        $this->_payment_amount = (float) $payment_amount;
-    }
-
-
-    /**
-     * @param string $next_step_html
-     */
-    public function set_reg_step_html($next_step_html)
-    {
-        $this->_reg_step_html = $next_step_html;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function reg_step_html()
-    {
-        return $this->_reg_step_html;
-    }
-
-
-    /**
-     * @param string $redirect_form
-     */
-    public function set_redirect_form($redirect_form)
-    {
-        $this->_redirect_form = $redirect_form;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function redirect_form()
-    {
-        return ! empty($this->_redirect_form) ? $this->_redirect_form : false;
-    }
-
-
-    /**
-     * @param string $plz_select_method_of_payment
-     */
-    public function set_plz_select_method_of_payment($plz_select_method_of_payment)
-    {
-        $this->_plz_select_method_of_payment = $plz_select_method_of_payment;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function plz_select_method_of_payment()
-    {
-        return $this->_plz_select_method_of_payment;
-    }
-
-
-    /**
-     * @param string $redirect_url
-     */
-    public function set_redirect_url($redirect_url)
-    {
-        $this->_redirect_url = $redirect_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function redirect_url()
-    {
-        return $this->_redirect_url;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function registration_time_limit()
-    {
-        return $this->_registration_time_limit;
-    }
-
-
-    /**
-     * @param string $registration_time_limit
-     */
-    public function set_registration_time_limit($registration_time_limit)
-    {
-        $this->_registration_time_limit = $registration_time_limit;
-    }
-
-
-    /**
-     * @param array $return_data
-     */
-    public function set_return_data($return_data)
-    {
-        $this->_return_data = array_merge($this->_return_data, $return_data);
-    }
-
-
-    /**
-     * @return array
-     */
-    public function return_data()
-    {
-        return $this->_return_data;
-    }
-
-
-    /**
-     * @param array $validation_rules
-     */
-    public function add_validation_rules(array $validation_rules = array())
-    {
-        if (is_array($validation_rules) && ! empty($validation_rules)) {
-            $this->_validation_rules = array_merge($this->_validation_rules, $validation_rules);
-        }
-    }
-
-
-    /**
-     * @return array | bool
-     */
-    public function validation_rules()
-    {
-        return ! empty($this->_validation_rules) ? $this->_validation_rules : false;
-    }
-
-
-    public function echoAndExit()
-    {
-        echo $this;
-        exit();
-    }
+	/**
+	 * @var string
+	 */
+	protected $_errors = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_unexpected_errors = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_attention = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_success = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_plz_select_method_of_payment = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_redirect_url = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_registration_time_limit = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_redirect_form = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_reg_step_html = '';
+
+	/**
+	 * @var string
+	 */
+	protected $_method_of_payment = '';
+
+	/**
+	 * @var float
+	 */
+	protected $_payment_amount;
+
+	/**
+	 * @var array
+	 */
+	protected $_return_data = array();
+
+
+	/**
+	 * @var array
+	 */
+	protected $_validation_rules = array();
+
+
+	/**
+	 *    class constructor
+	 */
+	public function __construct()
+	{
+	}
+
+
+	/**
+	 *    __toString
+	 *
+	 *        allows you to simply echo or print an EE_SPCO_JSON_Response object to produce a  JSON encoded string
+	 *
+	 * @access    public
+	 * @return    string
+	 */
+	public function __toString()
+	{
+		$JSON_response = array();
+		// grab notices
+		$notices = EE_Error::get_notices(false);
+		$this->set_attention(isset($notices['attention']) ? $notices['attention'] : '');
+		$this->set_errors(isset($notices['errors']) ? $notices['errors'] : '');
+		$this->set_success(isset($notices['success']) ? $notices['success'] : '');
+		// add notices to JSON response, but only if they exist
+		if ($this->attention()) {
+			$JSON_response['attention'] = $this->attention();
+		}
+		if ($this->errors()) {
+			$JSON_response['errors'] = $this->errors();
+		}
+		if ($this->unexpected_errors()) {
+			$JSON_response['unexpected_errors'] = $this->unexpected_errors();
+		}
+		if ($this->success()) {
+			$JSON_response['success'] = $this->success();
+		}
+		// but if NO notices are set... at least set the "success" as a key so that the JS knows everything worked
+		if (! isset($JSON_response['attention']) && ! isset($JSON_response['errors']) && ! isset($JSON_response['success'])) {
+			$JSON_response['success'] = null;
+		}
+		// set redirect_url, IF it exists
+		if ($this->redirect_url()) {
+			$JSON_response['redirect_url'] = $this->redirect_url();
+		}
+		// set registration_time_limit, IF it exists
+		if ($this->registration_time_limit()) {
+			$JSON_response['registration_time_limit'] = $this->registration_time_limit();
+		}
+		// set payment_amount, IF it exists
+		if ($this->payment_amount() !== null) {
+			$JSON_response['payment_amount'] = $this->payment_amount();
+		}
+		// grab generic return data
+		$return_data = $this->return_data();
+		// add billing form validation rules
+		if ($this->validation_rules()) {
+			$return_data['validation_rules'] = $this->validation_rules();
+		}
+		// set reg_step_html, IF it exists
+		if ($this->reg_step_html()) {
+			$return_data['reg_step_html'] = $this->reg_step_html();
+		}
+		// set method of payment, IF it exists
+		if ($this->method_of_payment()) {
+			$return_data['method_of_payment'] = $this->method_of_payment();
+		}
+		// set "plz_select_method_of_payment" message, IF it exists
+		if ($this->plz_select_method_of_payment()) {
+			$return_data['plz_select_method_of_payment'] = $this->plz_select_method_of_payment();
+		}
+		// set redirect_form, IF it exists
+		if ($this->redirect_form()) {
+			$return_data['redirect_form'] = $this->redirect_form();
+		}
+		// and finally, add return_data array to main JSON response array, IF it contains anything
+		// why did we add some of the above properties to the return data array?
+		// because it is easier and cleaner in the Javascript to deal with this way
+		if (! empty($return_data)) {
+			$JSON_response['return_data'] = $return_data;
+		}
+		// filter final array
+		$JSON_response = apply_filters('FHEE__EE_SPCO_JSON_Response___toString__JSON_response', $JSON_response);
+		// return encoded array
+		return (string) wp_json_encode($JSON_response);
+	}
+
+
+	/**
+	 * @param string $attention
+	 */
+	public function set_attention($attention)
+	{
+		$this->_attention = $attention;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function attention()
+	{
+		return $this->_attention;
+	}
+
+
+	/**
+	 * @param string $errors
+	 */
+	public function set_errors($errors)
+	{
+		$this->_errors = $errors;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function errors()
+	{
+		return $this->_errors;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function unexpected_errors()
+	{
+		return $this->_unexpected_errors;
+	}
+
+
+	/**
+	 * @param string $unexpected_errors
+	 */
+	public function set_unexpected_errors($unexpected_errors)
+	{
+		$this->_unexpected_errors = $unexpected_errors;
+	}
+
+
+	/**
+	 * @param string $success
+	 */
+	public function set_success($success)
+	{
+		$this->_success = $success;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function success()
+	{
+		return $this->_success;
+	}
+
+
+	/**
+	 * @param string $method_of_payment
+	 */
+	public function set_method_of_payment($method_of_payment)
+	{
+		$this->_method_of_payment = $method_of_payment;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function method_of_payment()
+	{
+		return $this->_method_of_payment;
+	}
+
+
+	/**
+	 * @return float
+	 */
+	public function payment_amount()
+	{
+		return $this->_payment_amount;
+	}
+
+
+	/**
+	 * @param float $payment_amount
+	 * @throws EE_Error
+	 */
+	public function set_payment_amount($payment_amount)
+	{
+		$this->_payment_amount = (float) $payment_amount;
+	}
+
+
+	/**
+	 * @param string $next_step_html
+	 */
+	public function set_reg_step_html($next_step_html)
+	{
+		$this->_reg_step_html = $next_step_html;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function reg_step_html()
+	{
+		return $this->_reg_step_html;
+	}
+
+
+	/**
+	 * @param string $redirect_form
+	 */
+	public function set_redirect_form($redirect_form)
+	{
+		$this->_redirect_form = $redirect_form;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function redirect_form()
+	{
+		return ! empty($this->_redirect_form) ? $this->_redirect_form : false;
+	}
+
+
+	/**
+	 * @param string $plz_select_method_of_payment
+	 */
+	public function set_plz_select_method_of_payment($plz_select_method_of_payment)
+	{
+		$this->_plz_select_method_of_payment = $plz_select_method_of_payment;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function plz_select_method_of_payment()
+	{
+		return $this->_plz_select_method_of_payment;
+	}
+
+
+	/**
+	 * @param string $redirect_url
+	 */
+	public function set_redirect_url($redirect_url)
+	{
+		$this->_redirect_url = $redirect_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function redirect_url()
+	{
+		return $this->_redirect_url;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function registration_time_limit()
+	{
+		return $this->_registration_time_limit;
+	}
+
+
+	/**
+	 * @param string $registration_time_limit
+	 */
+	public function set_registration_time_limit($registration_time_limit)
+	{
+		$this->_registration_time_limit = $registration_time_limit;
+	}
+
+
+	/**
+	 * @param array $return_data
+	 */
+	public function set_return_data($return_data)
+	{
+		$this->_return_data = array_merge($this->_return_data, $return_data);
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function return_data()
+	{
+		return $this->_return_data;
+	}
+
+
+	/**
+	 * @param array $validation_rules
+	 */
+	public function add_validation_rules(array $validation_rules = array())
+	{
+		if (is_array($validation_rules) && ! empty($validation_rules)) {
+			$this->_validation_rules = array_merge($this->_validation_rules, $validation_rules);
+		}
+	}
+
+
+	/**
+	 * @return array | bool
+	 */
+	public function validation_rules()
+	{
+		return ! empty($this->_validation_rules) ? $this->_validation_rules : false;
+	}
+
+
+	public function echoAndExit()
+	{
+		echo $this;
+		exit();
+	}
 }

core/domain/services/admin/registrations/list_table/csv_reports/RegistrationsCsvReportParams.php

Indentation +57 added lines, -57 removed lines

@@ -14,70 +14,70 @@
  */
 class RegistrationsCsvReportParams
 {
-    /**
-     * @param string $return_url
-     * @param array  $request_params
-     * @param int    $EVT_ID
-     * @param int    $DTT_ID
-     * @return array
-     */
-    public static function getRequestParams(
-        $return_url,
-        $request_params = [],
-        $EVT_ID = 0,
-        $DTT_ID = 0
-    ) {
-        if (
-            ! EE_Capabilities::instance()->current_user_can(
-                'ee_read_registrations',
-                'espresso_registrations_registrations_reports',
-                $EVT_ID
-            )
-        ) {
-            return [];
-        }
-        unset($request_params['_wp_http_referer']);
-        add_action(
-            'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons',
-            [RegistrationsCsvReportParams::class, 'csvReportNotice']
-        );
+	/**
+	 * @param string $return_url
+	 * @param array  $request_params
+	 * @param int    $EVT_ID
+	 * @param int    $DTT_ID
+	 * @return array
+	 */
+	public static function getRequestParams(
+		$return_url,
+		$request_params = [],
+		$EVT_ID = 0,
+		$DTT_ID = 0
+	) {
+		if (
+			! EE_Capabilities::instance()->current_user_can(
+				'ee_read_registrations',
+				'espresso_registrations_registrations_reports',
+				$EVT_ID
+			)
+		) {
+			return [];
+		}
+		unset($request_params['_wp_http_referer']);
+		add_action(
+			'AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons',
+			[RegistrationsCsvReportParams::class, 'csvReportNotice']
+		);
 
-        $route_details = [
-            'route'         => 'registrations_report',
-            'extra_request' => [ 'return_url' => $return_url ],
-            'btn_class'     => 'button button--primary',
-        ];
-        if (! empty($EVT_ID)) {
-            $route_details['extra_request']['EVT_ID'] = $EVT_ID;
-        }
-        if ($DTT_ID) {
-            $route_details['extra_request']['DTT_ID'] = $DTT_ID;
-        }
-        if (
-            isset($request_params['use_filters'])
-            && filter_var($request_params['use_filters'], FILTER_VALIDATE_BOOLEAN)
-        ) {
-            $route_details['extra_request']['filters'] = array_diff_key(
-                $request_params,
-                [
-                    'page'          => '',
-                    'action'        => '',
-                    'default_nonce' => '',
-                ]
-            );
-        }
-        return $route_details;
-    }
+		$route_details = [
+			'route'         => 'registrations_report',
+			'extra_request' => [ 'return_url' => $return_url ],
+			'btn_class'     => 'button button--primary',
+		];
+		if (! empty($EVT_ID)) {
+			$route_details['extra_request']['EVT_ID'] = $EVT_ID;
+		}
+		if ($DTT_ID) {
+			$route_details['extra_request']['DTT_ID'] = $DTT_ID;
+		}
+		if (
+			isset($request_params['use_filters'])
+			&& filter_var($request_params['use_filters'], FILTER_VALIDATE_BOOLEAN)
+		) {
+			$route_details['extra_request']['filters'] = array_diff_key(
+				$request_params,
+				[
+					'page'          => '',
+					'action'        => '',
+					'default_nonce' => '',
+				]
+			);
+		}
+		return $route_details;
+	}
 
 
-    public static function csvReportNotice()
-    {
-        echo '
+	public static function csvReportNotice()
+	{
+		echo '
     <span class="csv-report-notice__wrapper">
         <span class="dashicons dashicons-info"></span>
         <span class="csv-report-notice__text">
         ' .  esc_html('All Registration CSV Reports are now triggered by the preceding button') . '
         </span>
     </span>';
-    }
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -44,10 +44,10 @@ 
 
         $route_details = [
             'route'         => 'registrations_report',
-            'extra_request' => [ 'return_url' => $return_url ],
+            'extra_request' => ['return_url' => $return_url],
             'btn_class'     => 'button button--primary',
         ];
-        if (! empty($EVT_ID)) {
+        if ( ! empty($EVT_ID)) {
             $route_details['extra_request']['EVT_ID'] = $EVT_ID;
         }
         if ($DTT_ID) {
@@ -76,7 +76,7 @@ 
     <span class="csv-report-notice__wrapper">
         <span class="dashicons dashicons-info"></span>
         <span class="csv-report-notice__text">
-        ' .  esc_html('All Registration CSV Reports are now triggered by the preceding button') . '
+        ' .  esc_html('All Registration CSV Reports are now triggered by the preceding button').'
         </span>
     </span>';
     }

core/admin/EE_Admin_List_Table.core.php

Spacing +40 added lines, -40 removed lines

@@ -2,8 +2,8 @@ 
 
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
-if (! class_exists('WP_List_Table')) {
-    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+if ( ! class_exists('WP_List_Table')) {
+    require_once ABSPATH.'wp-admin/includes/class-wp-list-table.php';
 }
 
 
@@ -223,13 +223,13 @@ 
         $this->_view         = $this->_admin_page->get_view();
         $this->_views        = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
         $this->_current_page = $this->get_pagenum();
-        $this->_screen       = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
+        $this->_screen       = $this->_admin_page->get_current_page().'_'.$this->_admin_page->get_current_view();
         $this->_yes_no       = [
             esc_html__('No', 'event_espresso'),
             esc_html__('Yes', 'event_espresso')
         ];
 
-        $this->_per_page = $this->get_items_per_page($this->_screen . '_per_page');
+        $this->_per_page = $this->get_items_per_page($this->_screen.'_per_page');
 
         $this->_setup_data();
         $this->_add_view_counts();
@@ -309,14 +309,14 @@ 
         $action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
         // if action is STILL empty, then we set it to default
         $action = empty($action) ? 'default' : $action;
-        $field  = '<input type="hidden" name="page" value="' . esc_attr($this->_req_data['page']) . '" />' . "\n";
-        $field  .= '<input type="hidden" name="route" value="' . esc_attr($action) . '" />' . "\n";
-        $field  .= '<input type="hidden" name="perpage" value="' . esc_attr($this->_per_page) . '" />' . "\n";
+        $field  = '<input type="hidden" name="page" value="'.esc_attr($this->_req_data['page']).'" />'."\n";
+        $field  .= '<input type="hidden" name="route" value="'.esc_attr($action).'" />'."\n";
+        $field  .= '<input type="hidden" name="perpage" value="'.esc_attr($this->_per_page).'" />'."\n";
 
         $bulk_actions = $this->_get_bulk_actions();
         foreach ($bulk_actions as $bulk_action => $label) {
-            $field .= '<input type="hidden" name="' . $bulk_action . '_nonce"'
-                      . ' value="' . wp_create_nonce($bulk_action . '_nonce') . '" />' . "\n";
+            $field .= '<input type="hidden" name="'.$bulk_action.'_nonce"'
+                      . ' value="'.wp_create_nonce($bulk_action.'_nonce').'" />'."\n";
         }
 
         return $field;
@@ -363,11 +363,11 @@ 
 
             $data = (array) $data;
 
-            if (! isset($data[1])) {
+            if ( ! isset($data[1])) {
                 $_data[1] = false;
             }
 
-            $sortable[ $id ] = $_data;
+            $sortable[$id] = $_data;
         }
         $primary               = $this->get_primary_column_name();
         $this->_column_headers = [$columns, $hidden, $sortable, $primary];
@@ -427,7 +427,7 @@ 
                 // for that page route and skip adding the bulk action if no access for the current logged in user.
                 foreach ($args['bulk_action'] as $route => $label) {
                     if ($this->_admin_page->check_user_access($route, true)) {
-                        $actions[ $route ] = $label;
+                        $actions[$route] = $label;
                     }
                 }
             }
@@ -446,7 +446,7 @@ 
     public function display_tablenav($which)
     {
         if ('top' === $which) {
-            wp_nonce_field('bulk-' . $this->_args['plural']);
+            wp_nonce_field('bulk-'.$this->_args['plural']);
         }
         ?>
         <div class="tablenav <?php echo esc_attr($which); ?>">
@@ -579,7 +579,7 @@ 
          */
         ob_start();
         do_action(
-            'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id,
+            'AHEE__EE_Admin_List_Table__column_'.$column_name.'__'.$this->screen->id,
             $item,
             $this->_screen
         );
@@ -608,7 +608,7 @@ 
          *
          * @var array
          */
-        return apply_filters('FHEE_manage_' . $this->screen->id . '_columns', $this->_columns, $this->_screen);
+        return apply_filters('FHEE_manage_'.$this->screen->id.'_columns', $this->_columns, $this->_screen);
     }
 
 
@@ -642,12 +642,12 @@ 
             $count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
             if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) {
                 $filter = "<li";
-                $filter .= $view['class'] ? " class='" . esc_attr($view['class']) . "'" : '';
+                $filter .= $view['class'] ? " class='".esc_attr($view['class'])."'" : '';
                 $filter .= ">";
-                $filter .= '<a href="' . esc_url_raw($view['url']) . '">' . esc_html($view['label']) . '</a>';
-                $filter .= '<span class="count">(' . $count . ')</span>';
+                $filter .= '<a href="'.esc_url_raw($view['url']).'">'.esc_html($view['label']).'</a>';
+                $filter .= '<span class="count">('.$count.')</span>';
                 $filter .= '</li>';
-                $assembled_views[ $view['slug'] ] = $filter;
+                $assembled_views[$view['slug']] = $filter;
             }
         }
 
@@ -668,7 +668,7 @@ 
     public function single_row($item)
     {
         $row_class = $this->_get_row_class($item);
-        echo '<tr class="' . esc_attr($row_class) . '">';
+        echo '<tr class="'.esc_attr($row_class).'">';
         $this->single_row_columns($item); // already escaped
         echo '</tr>';
     }
@@ -688,7 +688,7 @@ 
 
         $new_row_class = $row_class;
 
-        if (! empty($this->_ajax_sorting_callback)) {
+        if ( ! empty($this->_ajax_sorting_callback)) {
             $new_row_class .= ' rowsortable';
         }
 
@@ -720,12 +720,12 @@ 
     public function get_hidden_columns()
     {
         $user_id     = get_current_user_id();
-        $has_default = get_user_option('default' . $this->screen->id . 'columnshidden', $user_id);
+        $has_default = get_user_option('default'.$this->screen->id.'columnshidden', $user_id);
         if (empty($has_default) && ! empty($this->_hidden_columns)) {
-            update_user_option($user_id, 'default' . $this->screen->id . 'columnshidden', true);
-            update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, true);
+            update_user_option($user_id, 'default'.$this->screen->id.'columnshidden', true);
+            update_user_option($user_id, 'manage'.$this->screen->id.'columnshidden', $this->_hidden_columns, true);
         }
-        $ref = 'manage' . $this->screen->id . 'columnshidden';
+        $ref = 'manage'.$this->screen->id.'columnshidden';
         return (array) get_user_option($ref, $user_id);
     }
 
@@ -750,14 +750,14 @@ 
              */
             $hidden_class = in_array($column_name, $hidden) ? ' hidden' : '';
 
-            $classes = $column_name . ' column-' . $column_name . $hidden_class;
+            $classes = $column_name.' column-'.$column_name.$hidden_class;
             if ($primary === $column_name) {
                 $classes .= ' has-row-actions column-primary';
             }
 
-            $data = ' data-colname="' . wp_strip_all_tags($column_display_name) . '"';
+            $data = ' data-colname="'.wp_strip_all_tags($column_display_name).'"';
 
-            $class = 'class="' . esc_attr($classes) . '"';
+            $class = 'class="'.esc_attr($classes).'"';
 
             $attributes = "{$class}{$data}";
 
@@ -770,11 +770,11 @@ 
                     $this
                 );
                 echo '</th>';
-            } elseif (method_exists($this, 'column_' . $column_name)) {
+            } elseif (method_exists($this, 'column_'.$column_name)) {
                 echo "<td $attributes>"; // already escaped
                 echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content',
-                    call_user_func([$this, 'column_' . $column_name], $item),
+                    'FHEE__EE_Admin_List_Table__single_row_columns__column_'.$column_name.'__column_content',
+                    call_user_func([$this, 'column_'.$column_name], $item),
                     $item,
                     $this
                 );
@@ -890,10 +890,10 @@ 
         $action_class = '',
         $action_id = ''
     ) {
-        $action_class = ! empty($action_class) ? ' class="' . esc_attr($action_class) . '"' : '';
-        $action_id    = ! empty($action_id) ? ' id="' . esc_attr($action_id) . '"' : '';
-        $open_tag     = ! empty($action_container) ? '<' . $action_container . $action_class . $action_id . '>' : '';
-        $close_tag    = ! empty($action_container) ? '</' . $action_container . '>' : '';
+        $action_class = ! empty($action_class) ? ' class="'.esc_attr($action_class).'"' : '';
+        $action_id    = ! empty($action_id) ? ' id="'.esc_attr($action_id).'"' : '';
+        $open_tag     = ! empty($action_container) ? '<'.$action_container.$action_class.$action_id.'>' : '';
+        $close_tag    = ! empty($action_container) ? '</'.$action_container.'>' : '';
         try {
             $content = apply_filters(
                 'FHEE__EE_Admin_List_Table___action_string__action_items',
@@ -931,10 +931,10 @@ 
      */
     protected function columnContent($id, $content, $align = 'start')
     {
-        if (! isset($this->_columns[ $id ])) {
+        if ( ! isset($this->_columns[$id])) {
             throw new DomainException('missing column id');
         }
-        $heading = $id !== 'cb' ? $this->_columns[ $id ] : '';
+        $heading = $id !== 'cb' ? $this->_columns[$id] : '';
         $align = in_array($align, ['start', 'center', 'end']) ? $align : 'start';
         $align = "ee-responsive-table-cell--{$align}";
 
@@ -951,13 +951,13 @@ 
         return '
         <div class="ee-modal-menu">
             <button class="ee-modal-menu__button button button--secondary button--icon-only ee-aria-tooltip"
-                    aria-label="' . esc_attr__('list table actions menu', 'event_espresso') . '"
+                    aria-label="' . esc_attr__('list table actions menu', 'event_espresso').'"
             >
                 <span class="dashicons dashicons-menu"></span>
             </button>
             <div class="ee-modal-menu__content ee-admin-container">
                 <span class="ee-modal-menu__close dashicons dashicons-no"></span>
-                ' . $actions . '
+                ' . $actions.'
             </div>
         </div>';
     }
@@ -968,7 +968,7 @@ 
         return '
             <span class="ee-actions-column-header-wrap">
                 <span class="dashicons dashicons-screenoptions"></span>
-                <span class="ee-actions-column-header">' . esc_html__('Actions', 'event_espresso') . '</span>
+                <span class="ee-actions-column-header">' . esc_html__('Actions', 'event_espresso').'</span>
             </span>';
     }
 

Indentation +916 added lines, -916 removed lines

@@ -3,7 +3,7 @@ 
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 if (! class_exists('WP_List_Table')) {
-    require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
+	require_once ABSPATH . 'wp-admin/includes/class-wp-list-table.php';
 }
 
 
@@ -21,481 +21,481 @@ 
  */
 abstract class EE_Admin_List_Table extends WP_List_Table
 {
-    const ACTION_COPY    = 'duplicate';
-
-    const ACTION_DELETE  = 'delete';
-
-    const ACTION_EDIT    = 'edit';
-
-    const ACTION_RESTORE = 'restore';
-
-    const ACTION_TRASH   = 'trash';
-
-    protected static $actions = [
-        self::ACTION_COPY,
-        self::ACTION_DELETE,
-        self::ACTION_EDIT,
-        self::ACTION_RESTORE,
-        self::ACTION_TRASH,
-    ];
-
-    /**
-     * holds the data that will be processed for the table
-     *
-     * @var array $_data
-     */
-    protected $_data;
-
-
-    /**
-     * This holds the value of all the data available for the given view (for all pages).
-     *
-     * @var int $_all_data_count
-     */
-    protected $_all_data_count;
-
-
-    /**
-     * Will contain the count of trashed items for the view label.
-     *
-     * @var int $_trashed_count
-     */
-    protected $_trashed_count;
-
-
-    /**
-     * This is what will be referenced as the slug for the current screen
-     *
-     * @var string $_screen
-     */
-    protected $_screen;
-
-
-    /**
-     * this is the EE_Admin_Page object
-     *
-     * @var EE_Admin_Page $_admin_page
-     */
-    protected $_admin_page;
-
-
-    /**
-     * The current view
-     *
-     * @var string $_view
-     */
-    protected $_view;
-
-
-    /**
-     * array of possible views for this table
-     *
-     * @var array $_views
-     */
-    protected $_views;
-
-
-    /**
-     * An array of key => value pairs containing information about the current table
-     * array(
-     *        'plural' => 'plural label',
-     *        'singular' => 'singular label',
-     *        'ajax' => false, //whether to use ajax or not
-     *        'screen' => null, //string used to reference what screen this is
-     *        (WP_List_table converts to screen object)
-     * )
-     *
-     * @var array $_wp_list_args
-     */
-    protected $_wp_list_args;
-
-    /**
-     * an array of column names
-     * array(
-     *    'internal-name' => 'Title'
-     * )
-     *
-     * @var array $_columns
-     */
-    protected $_columns;
-
-    /**
-     * An array of sortable columns
-     * array(
-     *    'internal-name' => 'orderby' //or
-     *    'internal-name' => array( 'orderby', true )
-     * )
-     *
-     * @var array $_sortable_columns
-     */
-    protected $_sortable_columns;
-
-    /**
-     * callback method used to perform AJAX row reordering
-     *
-     * @var string $_ajax_sorting_callback
-     */
-    protected $_ajax_sorting_callback;
-
-    /**
-     * An array of hidden columns (if needed)
-     * array('internal-name', 'internal-name')
-     *
-     * @var array $_hidden_columns
-     */
-    protected $_hidden_columns;
-
-    /**
-     * holds the per_page value
-     *
-     * @var int $_per_page
-     */
-    protected $_per_page;
-
-    /**
-     * holds what page number is currently being viewed
-     *
-     * @var int $_current_page
-     */
-    protected $_current_page;
-
-    /**
-     * the reference string for the nonce_action
-     *
-     * @var string $_nonce_action_ref
-     */
-    protected $_nonce_action_ref;
-
-    /**
-     * property to hold incoming request data (as set by the admin_page_core)
-     *
-     * @var array $_req_data
-     */
-    protected $_req_data;
-
-
-    /**
-     * yes / no array for admin form fields
-     *
-     * @var array $_yes_no
-     */
-    protected $_yes_no = [];
-
-    /**
-     * Array describing buttons that should appear at the bottom of the page
-     * Keys are strings that represent the button's function (specifically a key in _labels['buttons']),
-     * and the values are another array with the following keys
-     * array(
-     *    'route' => 'page_route',
-     *    'extra_request' => array('evt_id' => 1 ); //extra request vars that need to be included in the button.
-     * )
-     *
-     * @var array $_bottom_buttons
-     */
-    protected $_bottom_buttons = [];
-
-
-    /**
-     * Used to indicate what should be the primary column for the list table.
-     * If not present then falls back to what WP calculates
-     * as the primary column.
-     *
-     * @type string $_primary_column
-     */
-    protected $_primary_column = '';
-
-
-    /**
-     * Used to indicate whether the table has a checkbox column or not.
-     *
-     * @type bool $_has_checkbox_column
-     */
-    protected $_has_checkbox_column = false;
-
-
-    /**
-     * @param EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table
-     */
-    public function __construct(EE_Admin_Page $admin_page)
-    {
-        $this->_admin_page   = $admin_page;
-        $this->_req_data     = $this->_admin_page->get_request_data();
-        $this->_view         = $this->_admin_page->get_view();
-        $this->_views        = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
-        $this->_current_page = $this->get_pagenum();
-        $this->_screen       = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
-        $this->_yes_no       = [
-            esc_html__('No', 'event_espresso'),
-            esc_html__('Yes', 'event_espresso')
-        ];
-
-        $this->_per_page = $this->get_items_per_page($this->_screen . '_per_page');
-
-        $this->_setup_data();
-        $this->_add_view_counts();
-
-        $this->_nonce_action_ref = $this->_view;
-
-        $this->_set_properties();
-
-        // set primary column
-        add_filter('list_table_primary_column', [$this, 'set_primary_column']);
-
-        // set parent defaults
-        parent::__construct($this->_wp_list_args);
-
-        $this->prepare_items();
-    }
-
-
-    /**
-     * _setup_data
-     * this method is used to setup the $_data, $_all_data_count, and _per_page properties
-     *
-     * @return void
-     * @uses $this->_admin_page
-     */
-    abstract protected function _setup_data();
-
-
-    /**
-     * set the properties that this class needs to be able to execute wp_list_table properly
-     * properties set:
-     * _wp_list_args = what the arguments required for the parent _wp_list_table.
-     * _columns = set the columns in an array.
-     * _sortable_columns = columns that are sortable (array).
-     * _hidden_columns = columns that are hidden (array)
-     * _default_orderby = the default orderby for sorting.
-     *
-     * @abstract
-     * @access protected
-     * @return void
-     */
-    abstract protected function _set_properties();
-
-
-    /**
-     * _get_table_filters
-     * We use this to assemble and return any filters that are associated with this table that help further refine what
-     * gets shown in the table.
-     *
-     * @abstract
-     * @access protected
-     * @return string
-     */
-    abstract protected function _get_table_filters();
-
-
-    /**
-     * this is a method that child class will do to add counts to the views array so when views are displayed the
-     * counts of the views is accurate.
-     *
-     * @abstract
-     * @access protected
-     * @return void
-     */
-    abstract protected function _add_view_counts();
-
-
-    /**
-     * _get_hidden_fields
-     * returns a html string of hidden fields so if any table filters are used the current view will be respected.
-     *
-     * @return string
-     */
-    protected function _get_hidden_fields()
-    {
-        $action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
-        $action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
-        // if action is STILL empty, then we set it to default
-        $action = empty($action) ? 'default' : $action;
-        $field  = '<input type="hidden" name="page" value="' . esc_attr($this->_req_data['page']) . '" />' . "\n";
-        $field  .= '<input type="hidden" name="route" value="' . esc_attr($action) . '" />' . "\n";
-        $field  .= '<input type="hidden" name="perpage" value="' . esc_attr($this->_per_page) . '" />' . "\n";
-
-        $bulk_actions = $this->_get_bulk_actions();
-        foreach ($bulk_actions as $bulk_action => $label) {
-            $field .= '<input type="hidden" name="' . $bulk_action . '_nonce"'
-                      . ' value="' . wp_create_nonce($bulk_action . '_nonce') . '" />' . "\n";
-        }
-
-        return $field;
-    }
-
-
-    /**
-     * _set_column_info
-     * we're using this to set the column headers property.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function _set_column_info()
-    {
-        $columns   = $this->get_columns();
-        $hidden    = $this->get_hidden_columns();
-        $_sortable = $this->get_sortable_columns();
-
-        /**
-         * Dynamic hook allowing for adding sortable columns in this list table.
-         * Note that $this->screen->id is in the format
-         * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
-         * table it is: event-espresso_page_espresso_messages.
-         * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
-         * hook prefix ("event-espresso") will be different.
-         *
-         * @var array
-         */
-        $_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
-
-        $sortable = [];
-        foreach ($_sortable as $id => $data) {
-            if (empty($data)) {
-                continue;
-            }
-            // fix for offset errors with WP_List_Table default get_columninfo()
-            if (is_array($data)) {
-                $_data[0] = key($data);
-                $_data[1] = isset($data[1]) ? $data[1] : false;
-            } else {
-                $_data[0] = $data;
-            }
-
-            $data = (array) $data;
-
-            if (! isset($data[1])) {
-                $_data[1] = false;
-            }
-
-            $sortable[ $id ] = $_data;
-        }
-        $primary               = $this->get_primary_column_name();
-        $this->_column_headers = [$columns, $hidden, $sortable, $primary];
-    }
-
-
-    /**
-     * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
-     *
-     * @return string
-     */
-    protected function get_primary_column_name()
-    {
-        foreach (class_parents($this) as $parent) {
-            if ($parent === 'WP_List_Table' && method_exists($parent, 'get_primary_column_name')) {
-                return parent::get_primary_column_name();
-            }
-        }
-        return $this->_primary_column;
-    }
-
-
-    /**
-     * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
-     *
-     * @param EE_Base_Class $item
-     * @param string        $column_name
-     * @param string        $primary
-     * @return string
-     */
-    protected function handle_row_actions($item, $column_name, $primary)
-    {
-        foreach (class_parents($this) as $parent) {
-            if ($parent === 'WP_List_Table' && method_exists($parent, 'handle_row_actions')) {
-                return parent::handle_row_actions($item, $column_name, $primary);
-            }
-        }
-        return '';
-    }
-
-
-    /**
-     * _get_bulk_actions
-     * This is a wrapper called by WP_List_Table::get_bulk_actions()
-     *
-     * @access protected
-     * @return array bulk_actions
-     */
-    protected function _get_bulk_actions(): array
-    {
-        $actions = [];
-        // the _views property should have the bulk_actions, so let's go through and extract them into a properly
-        // formatted array for the wp_list_table();
-        foreach ($this->_views as $view => $args) {
-            if ($this->_view === $view && isset($args['bulk_action']) && is_array($args['bulk_action'])) {
-                // each bulk action will correspond with a admin page route, so we can check whatever the capability is
-                // for that page route and skip adding the bulk action if no access for the current logged in user.
-                foreach ($args['bulk_action'] as $route => $label) {
-                    if ($this->_admin_page->check_user_access($route, true)) {
-                        $actions[ $route ] = $label;
-                    }
-                }
-            }
-        }
-        return $actions;
-    }
-
-
-    /**
-     * Generate the table navigation above or below the table.
-     * Overrides the parent table nav in WP_List_Table so we can hide the bulk action div if there are no bulk actions.
-     *
-     * @throws EE_Error
-     * @since 4.9.44.rc.001
-     */
-    public function display_tablenav($which)
-    {
-        if ('top' === $which) {
-            wp_nonce_field('bulk-' . $this->_args['plural']);
-        }
-        ?>
+	const ACTION_COPY    = 'duplicate';
+
+	const ACTION_DELETE  = 'delete';
+
+	const ACTION_EDIT    = 'edit';
+
+	const ACTION_RESTORE = 'restore';
+
+	const ACTION_TRASH   = 'trash';
+
+	protected static $actions = [
+		self::ACTION_COPY,
+		self::ACTION_DELETE,
+		self::ACTION_EDIT,
+		self::ACTION_RESTORE,
+		self::ACTION_TRASH,
+	];
+
+	/**
+	 * holds the data that will be processed for the table
+	 *
+	 * @var array $_data
+	 */
+	protected $_data;
+
+
+	/**
+	 * This holds the value of all the data available for the given view (for all pages).
+	 *
+	 * @var int $_all_data_count
+	 */
+	protected $_all_data_count;
+
+
+	/**
+	 * Will contain the count of trashed items for the view label.
+	 *
+	 * @var int $_trashed_count
+	 */
+	protected $_trashed_count;
+
+
+	/**
+	 * This is what will be referenced as the slug for the current screen
+	 *
+	 * @var string $_screen
+	 */
+	protected $_screen;
+
+
+	/**
+	 * this is the EE_Admin_Page object
+	 *
+	 * @var EE_Admin_Page $_admin_page
+	 */
+	protected $_admin_page;
+
+
+	/**
+	 * The current view
+	 *
+	 * @var string $_view
+	 */
+	protected $_view;
+
+
+	/**
+	 * array of possible views for this table
+	 *
+	 * @var array $_views
+	 */
+	protected $_views;
+
+
+	/**
+	 * An array of key => value pairs containing information about the current table
+	 * array(
+	 *        'plural' => 'plural label',
+	 *        'singular' => 'singular label',
+	 *        'ajax' => false, //whether to use ajax or not
+	 *        'screen' => null, //string used to reference what screen this is
+	 *        (WP_List_table converts to screen object)
+	 * )
+	 *
+	 * @var array $_wp_list_args
+	 */
+	protected $_wp_list_args;
+
+	/**
+	 * an array of column names
+	 * array(
+	 *    'internal-name' => 'Title'
+	 * )
+	 *
+	 * @var array $_columns
+	 */
+	protected $_columns;
+
+	/**
+	 * An array of sortable columns
+	 * array(
+	 *    'internal-name' => 'orderby' //or
+	 *    'internal-name' => array( 'orderby', true )
+	 * )
+	 *
+	 * @var array $_sortable_columns
+	 */
+	protected $_sortable_columns;
+
+	/**
+	 * callback method used to perform AJAX row reordering
+	 *
+	 * @var string $_ajax_sorting_callback
+	 */
+	protected $_ajax_sorting_callback;
+
+	/**
+	 * An array of hidden columns (if needed)
+	 * array('internal-name', 'internal-name')
+	 *
+	 * @var array $_hidden_columns
+	 */
+	protected $_hidden_columns;
+
+	/**
+	 * holds the per_page value
+	 *
+	 * @var int $_per_page
+	 */
+	protected $_per_page;
+
+	/**
+	 * holds what page number is currently being viewed
+	 *
+	 * @var int $_current_page
+	 */
+	protected $_current_page;
+
+	/**
+	 * the reference string for the nonce_action
+	 *
+	 * @var string $_nonce_action_ref
+	 */
+	protected $_nonce_action_ref;
+
+	/**
+	 * property to hold incoming request data (as set by the admin_page_core)
+	 *
+	 * @var array $_req_data
+	 */
+	protected $_req_data;
+
+
+	/**
+	 * yes / no array for admin form fields
+	 *
+	 * @var array $_yes_no
+	 */
+	protected $_yes_no = [];
+
+	/**
+	 * Array describing buttons that should appear at the bottom of the page
+	 * Keys are strings that represent the button's function (specifically a key in _labels['buttons']),
+	 * and the values are another array with the following keys
+	 * array(
+	 *    'route' => 'page_route',
+	 *    'extra_request' => array('evt_id' => 1 ); //extra request vars that need to be included in the button.
+	 * )
+	 *
+	 * @var array $_bottom_buttons
+	 */
+	protected $_bottom_buttons = [];
+
+
+	/**
+	 * Used to indicate what should be the primary column for the list table.
+	 * If not present then falls back to what WP calculates
+	 * as the primary column.
+	 *
+	 * @type string $_primary_column
+	 */
+	protected $_primary_column = '';
+
+
+	/**
+	 * Used to indicate whether the table has a checkbox column or not.
+	 *
+	 * @type bool $_has_checkbox_column
+	 */
+	protected $_has_checkbox_column = false;
+
+
+	/**
+	 * @param EE_Admin_Page $admin_page we use this for obtaining everything we need in the list table
+	 */
+	public function __construct(EE_Admin_Page $admin_page)
+	{
+		$this->_admin_page   = $admin_page;
+		$this->_req_data     = $this->_admin_page->get_request_data();
+		$this->_view         = $this->_admin_page->get_view();
+		$this->_views        = empty($this->_views) ? $this->_admin_page->get_list_table_view_RLs() : $this->_views;
+		$this->_current_page = $this->get_pagenum();
+		$this->_screen       = $this->_admin_page->get_current_page() . '_' . $this->_admin_page->get_current_view();
+		$this->_yes_no       = [
+			esc_html__('No', 'event_espresso'),
+			esc_html__('Yes', 'event_espresso')
+		];
+
+		$this->_per_page = $this->get_items_per_page($this->_screen . '_per_page');
+
+		$this->_setup_data();
+		$this->_add_view_counts();
+
+		$this->_nonce_action_ref = $this->_view;
+
+		$this->_set_properties();
+
+		// set primary column
+		add_filter('list_table_primary_column', [$this, 'set_primary_column']);
+
+		// set parent defaults
+		parent::__construct($this->_wp_list_args);
+
+		$this->prepare_items();
+	}
+
+
+	/**
+	 * _setup_data
+	 * this method is used to setup the $_data, $_all_data_count, and _per_page properties
+	 *
+	 * @return void
+	 * @uses $this->_admin_page
+	 */
+	abstract protected function _setup_data();
+
+
+	/**
+	 * set the properties that this class needs to be able to execute wp_list_table properly
+	 * properties set:
+	 * _wp_list_args = what the arguments required for the parent _wp_list_table.
+	 * _columns = set the columns in an array.
+	 * _sortable_columns = columns that are sortable (array).
+	 * _hidden_columns = columns that are hidden (array)
+	 * _default_orderby = the default orderby for sorting.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return void
+	 */
+	abstract protected function _set_properties();
+
+
+	/**
+	 * _get_table_filters
+	 * We use this to assemble and return any filters that are associated with this table that help further refine what
+	 * gets shown in the table.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return string
+	 */
+	abstract protected function _get_table_filters();
+
+
+	/**
+	 * this is a method that child class will do to add counts to the views array so when views are displayed the
+	 * counts of the views is accurate.
+	 *
+	 * @abstract
+	 * @access protected
+	 * @return void
+	 */
+	abstract protected function _add_view_counts();
+
+
+	/**
+	 * _get_hidden_fields
+	 * returns a html string of hidden fields so if any table filters are used the current view will be respected.
+	 *
+	 * @return string
+	 */
+	protected function _get_hidden_fields()
+	{
+		$action = isset($this->_req_data['route']) ? $this->_req_data['route'] : '';
+		$action = empty($action) && isset($this->_req_data['action']) ? $this->_req_data['action'] : $action;
+		// if action is STILL empty, then we set it to default
+		$action = empty($action) ? 'default' : $action;
+		$field  = '<input type="hidden" name="page" value="' . esc_attr($this->_req_data['page']) . '" />' . "\n";
+		$field  .= '<input type="hidden" name="route" value="' . esc_attr($action) . '" />' . "\n";
+		$field  .= '<input type="hidden" name="perpage" value="' . esc_attr($this->_per_page) . '" />' . "\n";
+
+		$bulk_actions = $this->_get_bulk_actions();
+		foreach ($bulk_actions as $bulk_action => $label) {
+			$field .= '<input type="hidden" name="' . $bulk_action . '_nonce"'
+					  . ' value="' . wp_create_nonce($bulk_action . '_nonce') . '" />' . "\n";
+		}
+
+		return $field;
+	}
+
+
+	/**
+	 * _set_column_info
+	 * we're using this to set the column headers property.
+	 *
+	 * @access protected
+	 * @return void
+	 */
+	protected function _set_column_info()
+	{
+		$columns   = $this->get_columns();
+		$hidden    = $this->get_hidden_columns();
+		$_sortable = $this->get_sortable_columns();
+
+		/**
+		 * Dynamic hook allowing for adding sortable columns in this list table.
+		 * Note that $this->screen->id is in the format
+		 * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
+		 * table it is: event-espresso_page_espresso_messages.
+		 * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
+		 * hook prefix ("event-espresso") will be different.
+		 *
+		 * @var array
+		 */
+		$_sortable = apply_filters("FHEE_manage_{$this->screen->id}_sortable_columns", $_sortable, $this->_screen);
+
+		$sortable = [];
+		foreach ($_sortable as $id => $data) {
+			if (empty($data)) {
+				continue;
+			}
+			// fix for offset errors with WP_List_Table default get_columninfo()
+			if (is_array($data)) {
+				$_data[0] = key($data);
+				$_data[1] = isset($data[1]) ? $data[1] : false;
+			} else {
+				$_data[0] = $data;
+			}
+
+			$data = (array) $data;
+
+			if (! isset($data[1])) {
+				$_data[1] = false;
+			}
+
+			$sortable[ $id ] = $_data;
+		}
+		$primary               = $this->get_primary_column_name();
+		$this->_column_headers = [$columns, $hidden, $sortable, $primary];
+	}
+
+
+	/**
+	 * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
+	 *
+	 * @return string
+	 */
+	protected function get_primary_column_name()
+	{
+		foreach (class_parents($this) as $parent) {
+			if ($parent === 'WP_List_Table' && method_exists($parent, 'get_primary_column_name')) {
+				return parent::get_primary_column_name();
+			}
+		}
+		return $this->_primary_column;
+	}
+
+
+	/**
+	 * Added for WP4.1 backward compat (@see https://events.codebasehq.com/projects/event-espresso/tickets/8814)
+	 *
+	 * @param EE_Base_Class $item
+	 * @param string        $column_name
+	 * @param string        $primary
+	 * @return string
+	 */
+	protected function handle_row_actions($item, $column_name, $primary)
+	{
+		foreach (class_parents($this) as $parent) {
+			if ($parent === 'WP_List_Table' && method_exists($parent, 'handle_row_actions')) {
+				return parent::handle_row_actions($item, $column_name, $primary);
+			}
+		}
+		return '';
+	}
+
+
+	/**
+	 * _get_bulk_actions
+	 * This is a wrapper called by WP_List_Table::get_bulk_actions()
+	 *
+	 * @access protected
+	 * @return array bulk_actions
+	 */
+	protected function _get_bulk_actions(): array
+	{
+		$actions = [];
+		// the _views property should have the bulk_actions, so let's go through and extract them into a properly
+		// formatted array for the wp_list_table();
+		foreach ($this->_views as $view => $args) {
+			if ($this->_view === $view && isset($args['bulk_action']) && is_array($args['bulk_action'])) {
+				// each bulk action will correspond with a admin page route, so we can check whatever the capability is
+				// for that page route and skip adding the bulk action if no access for the current logged in user.
+				foreach ($args['bulk_action'] as $route => $label) {
+					if ($this->_admin_page->check_user_access($route, true)) {
+						$actions[ $route ] = $label;
+					}
+				}
+			}
+		}
+		return $actions;
+	}
+
+
+	/**
+	 * Generate the table navigation above or below the table.
+	 * Overrides the parent table nav in WP_List_Table so we can hide the bulk action div if there are no bulk actions.
+	 *
+	 * @throws EE_Error
+	 * @since 4.9.44.rc.001
+	 */
+	public function display_tablenav($which)
+	{
+		if ('top' === $which) {
+			wp_nonce_field('bulk-' . $this->_args['plural']);
+		}
+		?>
         <div class="tablenav <?php echo esc_attr($which); ?>">
             <?php if ($this->_get_bulk_actions()) { ?>
                 <div class="alignleft actions bulkactions">
                     <?php $this->bulk_actions(); ?>
                 </div>
             <?php }
-            $this->extra_tablenav($which);
-            $this->pagination($which);
-            ?>
+			$this->extra_tablenav($which);
+			$this->pagination($which);
+			?>
 
             <br class="clear" />
         </div>
         <?php
-    }
-
-
-    /**
-     * _filters
-     * This receives the filters array from children _get_table_filters() and assembles the string including the filter
-     * button.
-     *
-     * @access private
-     * @return void  echos html showing filters
-     */
-    private function _filters()
-    {
-        $classname = get_class($this);
-        $filters   = apply_filters(
-            "FHEE__{$classname}__filters",
-            (array) $this->_get_table_filters(),
-            $this,
-            $this->_screen
-        );
-
-        if (empty($filters)) {
-            return;
-        }
-
-        $filters_html = '';
-        foreach ($filters as $filter) {
-            $filters_html .= wp_kses($filter, AllowedTags::getWithFormTags());
-        }
-        $filter_submit_btn_text = esc_html__('Filter', 'event_espresso');
-        $filter_reset_btn_text = esc_html__('Reset Filters', 'event_espresso');
-        $filter_reset_btn_url = esc_url_raw($this->_admin_page->get_current_page_view_url());
-
-        echo "
+	}
+
+
+	/**
+	 * _filters
+	 * This receives the filters array from children _get_table_filters() and assembles the string including the filter
+	 * button.
+	 *
+	 * @access private
+	 * @return void  echos html showing filters
+	 */
+	private function _filters()
+	{
+		$classname = get_class($this);
+		$filters   = apply_filters(
+			"FHEE__{$classname}__filters",
+			(array) $this->_get_table_filters(),
+			$this,
+			$this->_screen
+		);
+
+		if (empty($filters)) {
+			return;
+		}
+
+		$filters_html = '';
+		foreach ($filters as $filter) {
+			$filters_html .= wp_kses($filter, AllowedTags::getWithFormTags());
+		}
+		$filter_submit_btn_text = esc_html__('Filter', 'event_espresso');
+		$filter_reset_btn_text = esc_html__('Reset Filters', 'event_espresso');
+		$filter_reset_btn_url = esc_url_raw($this->_admin_page->get_current_page_view_url());
+
+		echo "
         <div class='ee-list-table-filters actions alignleft'>
            $filters_html
             <span class='ee-list-table-filters__submit-buttons'>
@@ -510,444 +510,444 @@ 
                 </a>
             </span>
         </div>";
-    }
-
-
-    /**
-     * Callback for 'list_table_primary_column' WordPress filter
-     * If child EE_Admin_List_Table classes set the _primary_column property then that will be set as the primary
-     * column when class is instantiated.
-     *
-     * @param string $column_name
-     * @return string
-     * @see WP_List_Table::get_primary_column_name
-     */
-    public function set_primary_column($column_name)
-    {
-        return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
-    }
-
-
-    /**
-     *
-     */
-    public function prepare_items()
-    {
-        $this->_set_column_info();
-        // $this->_column_headers = $this->get_column_info();
-        $total_items = $this->_all_data_count;
-        $this->process_bulk_action();
-
-        $this->items = $this->_data;
-        $this->set_pagination_args(
-            [
-                'total_items' => $total_items,
-                'per_page'    => $this->_per_page,
-                'total_pages' => ceil($total_items / $this->_per_page),
-            ]
-        );
-    }
-
-
-    /**
-     * @param object|array $item
-     * @return string html content for the column
-     */
-    protected function column_cb($item)
-    {
-        return '';
-    }
-
-
-    /**
-     * This column is the default for when there is no defined column method for a registered column.
-     * This can be overridden by child classes, but allows for hooking in for custom columns.
-     *
-     * @param EE_Base_Class $item
-     * @param string        $column_name The column being called.
-     * @return string html content for the column
-     */
-    public function column_default($item, $column_name)
-    {
-        /**
-         * Dynamic hook allowing for adding additional column content in this list table.
-         * Note that $this->screen->id is in the format
-         * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
-         * table it is: event-espresso_page_espresso_messages.
-         * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
-         * hook prefix ("event-espresso") will be different.
-         */
-        ob_start();
-        do_action(
-            'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id,
-            $item,
-            $this->_screen
-        );
-        return ob_get_clean();
-    }
-
-
-    /**
-     * Get a list of columns. The format is:
-     * 'internal-name' => 'Title'
-     *
-     * @return array
-     * @since  3.1.0
-     * @access public
-     * @abstract
-     */
-    public function get_columns()
-    {
-        /**
-         * Dynamic hook allowing for adding additional columns in this list table.
-         * Note that $this->screen->id is in the format
-         * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
-         * table it is: event-espresso_page_espresso_messages.
-         * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
-         * hook prefix ("event-espresso") will be different.
-         *
-         * @var array
-         */
-        return apply_filters('FHEE_manage_' . $this->screen->id . '_columns', $this->_columns, $this->_screen);
-    }
-
-
-    /**
-     * Get an associative array ( id => link ) with the list
-     * of views available on this table.
-     *
-     * @return array
-     * @since  3.1.0
-     * @access protected
-     */
-    public function get_views()
-    {
-        return $this->_views;
-    }
-
-
-    /**
-     * Generate the views html.
-     */
-    public function display_views()
-    {
-        $views           = $this->get_views();
-        $assembled_views = [];
-
-        if (empty($views)) {
-            return;
-        }
-        echo "<ul class='subsubsub'>\n";
-        foreach ($views as $view) {
-            $count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
-            if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) {
-                $filter = "<li";
-                $filter .= $view['class'] ? " class='" . esc_attr($view['class']) . "'" : '';
-                $filter .= ">";
-                $filter .= '<a href="' . esc_url_raw($view['url']) . '">' . esc_html($view['label']) . '</a>';
-                $filter .= '<span class="count">(' . $count . ')</span>';
-                $filter .= '</li>';
-                $assembled_views[ $view['slug'] ] = $filter;
-            }
-        }
-
-        echo ! empty($assembled_views)
-            ? implode("<li style='margin:0 .5rem;'>|</li>", $assembled_views)
-            : '';
-        echo "</ul>";
-    }
-
-
-    /**
-     * Generates content for a single row of the table
-     *
-     * @param EE_Base_Class $item The current item
-     * @since  4.1
-     * @access public
-     */
-    public function single_row($item)
-    {
-        $row_class = $this->_get_row_class($item);
-        echo '<tr class="' . esc_attr($row_class) . '">';
-        $this->single_row_columns($item); // already escaped
-        echo '</tr>';
-    }
-
-
-    /**
-     * This simply sets up the row class for the table rows.
-     * Allows for easier overriding of child methods for setting up sorting.
-     *
-     * @param EE_Base_Class $item the current item
-     * @return string
-     */
-    protected function _get_row_class($item)
-    {
-        static $row_class = '';
-        $row_class = ($row_class === '' ? 'alternate' : '');
-
-        $new_row_class = $row_class;
-
-        if (! empty($this->_ajax_sorting_callback)) {
-            $new_row_class .= ' rowsortable';
-        }
-
-        return $new_row_class;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_sortable_columns()
-    {
-        return (array) $this->_sortable_columns;
-    }
-
-
-    /**
-     * @return string
-     */
-    public function get_ajax_sorting_callback()
-    {
-        return $this->_ajax_sorting_callback;
-    }
-
-
-    /**
-     * @return array
-     */
-    public function get_hidden_columns()
-    {
-        $user_id     = get_current_user_id();
-        $has_default = get_user_option('default' . $this->screen->id . 'columnshidden', $user_id);
-        if (empty($has_default) && ! empty($this->_hidden_columns)) {
-            update_user_option($user_id, 'default' . $this->screen->id . 'columnshidden', true);
-            update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, true);
-        }
-        $ref = 'manage' . $this->screen->id . 'columnshidden';
-        return (array) get_user_option($ref, $user_id);
-    }
-
-
-    /**
-     * Generates the columns for a single row of the table.
-     * Overridden from wp_list_table so as to allow us to filter the column content for a given
-     * column.
-     *
-     * @param EE_Base_Class $item The current item
-     * @since 3.1.0
-     */
-    public function single_row_columns($item)
-    {
-        [$columns, $hidden, $sortable, $primary] = $this->get_column_info();
-
-        foreach ($columns as $column_name => $column_display_name) {
-
-            /**
-             * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns
-             * are hidden or not instead of using "display:none;".  This bit of code provides backward compat.
-             */
-            $hidden_class = in_array($column_name, $hidden) ? ' hidden' : '';
-
-            $classes = $column_name . ' column-' . $column_name . $hidden_class;
-            if ($primary === $column_name) {
-                $classes .= ' has-row-actions column-primary';
-            }
-
-            $data = ' data-colname="' . wp_strip_all_tags($column_display_name) . '"';
-
-            $class = 'class="' . esc_attr($classes) . '"';
-
-            $attributes = "{$class}{$data}";
-
-            if ($column_name === 'cb') {
-                echo '<th scope="row" class="check-column">';
-                echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content',
-                    $this->column_cb($item), // already escaped
-                    $item,
-                    $this
-                );
-                echo '</th>';
-            } elseif (method_exists($this, 'column_' . $column_name)) {
-                echo "<td $attributes>"; // already escaped
-                echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content',
-                    call_user_func([$this, 'column_' . $column_name], $item),
-                    $item,
-                    $this
-                );
-                echo wp_kses($this->handle_row_actions($item, $column_name, $primary), AllowedTags::getWithFormTags());
-                echo "</td>";
-            } else {
-                echo "<td $attributes>"; // already escaped
-                echo apply_filters(
-                    'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content',
-                    $this->column_default($item, $column_name),
-                    $item,
-                    $column_name,
-                    $this
-                );
-                echo wp_kses($this->handle_row_actions($item, $column_name, $primary), AllowedTags::getWithFormTags());
-                echo "</td>";
-            }
-        }
-    }
-
-
-    /**
-     * Extra controls to be displayed between bulk actions and pagination
-     *
-     * @access public
-     * @param string $which
-     * @throws EE_Error
-     */
-    public function extra_tablenav($which)
-    {
-        if ($which === 'top') {
-            $this->_filters();
-            echo wp_kses($this->_get_hidden_fields(), AllowedTags::getWithFormTags());
-        } else {
-            echo '<div class="list-table-bottom-buttons alignleft actions">';
-            foreach ($this->_bottom_buttons as $type => $action) {
-                $route         = $action['route'] ?? '';
-                $extra_request = $action['extra_request'] ?? '';
-                $btn_class     = $action['btn_class'] ?? 'button button--secondary';
-                // already escaped
-                echo wp_kses($this->_admin_page->get_action_link_or_button(
-                    $route,
-                    $type,
-                    $extra_request,
-                    $btn_class
-                ), AllowedTags::getWithFormTags());
-            }
-            do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
-            echo '</div>';
-        }
-    }
-
-
-    /**
-     * Get an associative array ( option_name => option_title ) with the list
-     * of bulk actions available on this table.
-     *
-     * @return array
-     * @since  3.1.0
-     * @access protected
-     */
-    public function get_bulk_actions()
-    {
-        return (array) $this->_get_bulk_actions();
-    }
-
-
-    /**
-     * Processing bulk actions.
-     */
-    public function process_bulk_action()
-    {
-        // this is not used it is handled by the child EE_Admin_Page class (routes).  However, including here for
-        // reference in case there is a case where it gets used.
-    }
-
-
-    /**
-     * returns the EE admin page this list table is associated with
-     *
-     * @return EE_Admin_Page
-     */
-    public function get_admin_page()
-    {
-        return $this->_admin_page;
-    }
-
-
-    /**
-     * A "helper" function for all children to provide an html string of
-     * actions to output in their content.  It is preferable for child classes
-     * to use this method for generating their actions content so that it's
-     * filterable by plugins
-     *
-     * @param string        $action_container           what are the html container
-     *                                                  elements for this actions string?
-     * @param string        $action_class               What class is for the container
-     *                                                  element.
-     * @param string        $action_items               The contents for the action items
-     *                                                  container.  This is filtered before
-     *                                                  returned.
-     * @param string        $action_id                  What id (optional) is used for the
-     *                                                  container element.
-     * @param EE_Base_Class $item                       The object for the column displaying
-     *                                                  the actions.
-     * @return string The assembled action elements container.
-     */
-    protected function _action_string(
-        $action_items,
-        $item,
-        $action_container = 'ul',
-        $action_class = '',
-        $action_id = ''
-    ) {
-        $action_class = ! empty($action_class) ? ' class="' . esc_attr($action_class) . '"' : '';
-        $action_id    = ! empty($action_id) ? ' id="' . esc_attr($action_id) . '"' : '';
-        $open_tag     = ! empty($action_container) ? '<' . $action_container . $action_class . $action_id . '>' : '';
-        $close_tag    = ! empty($action_container) ? '</' . $action_container . '>' : '';
-        try {
-            $content = apply_filters(
-                'FHEE__EE_Admin_List_Table___action_string__action_items',
-                $action_items,
-                $item,
-                $this
-            );
-        } catch (Exception $e) {
-            if (WP_DEBUG) {
-                EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            }
-            $content = $action_items;
-        }
-        return "{$open_tag}{$content}{$close_tag}";
-    }
-
-
-    /**
-     * @return string
-     */
-    protected function getReturnUrl()
-    {
-        $host = $this->_admin_page->get_request()->getServerParam('HTTP_HOST');
-        $uri  = $this->_admin_page->get_request()->getServerParam('REQUEST_URI');
-        return urlencode(esc_url_raw("//{$host}{$uri}"));
-    }
-
-
-    /**
-     * @param string $id
-     * @param string $content
-     * @param string $align     start (default), center, end
-     * @return string
-     * @since   $VID:$
-     */
-    protected function columnContent($id, $content, $align = 'start')
-    {
-        if (! isset($this->_columns[ $id ])) {
-            throw new DomainException('missing column id');
-        }
-        $heading = $id !== 'cb' ? $this->_columns[ $id ] : '';
-        $align = in_array($align, ['start', 'center', 'end']) ? $align : 'start';
-        $align = "ee-responsive-table-cell--{$align}";
-
-        $html = "<div class='ee-responsive-table-cell ee-responsive-table-cell--column-{$id} {$align} ee-layout-row'>";
-        $html .= "<div class='ee-responsive-table-cell__heading'>{$heading}</div>";
-        $html .= "<div class='ee-responsive-table-cell__content ee-layout-row'>{$content}</div>";
-        $html .= "</div>";
-        return $html;
-    }
-
-
-    protected function actionsModalMenu($actions): string
-    {
-        return '
+	}
+
+
+	/**
+	 * Callback for 'list_table_primary_column' WordPress filter
+	 * If child EE_Admin_List_Table classes set the _primary_column property then that will be set as the primary
+	 * column when class is instantiated.
+	 *
+	 * @param string $column_name
+	 * @return string
+	 * @see WP_List_Table::get_primary_column_name
+	 */
+	public function set_primary_column($column_name)
+	{
+		return ! empty($this->_primary_column) ? $this->_primary_column : $column_name;
+	}
+
+
+	/**
+	 *
+	 */
+	public function prepare_items()
+	{
+		$this->_set_column_info();
+		// $this->_column_headers = $this->get_column_info();
+		$total_items = $this->_all_data_count;
+		$this->process_bulk_action();
+
+		$this->items = $this->_data;
+		$this->set_pagination_args(
+			[
+				'total_items' => $total_items,
+				'per_page'    => $this->_per_page,
+				'total_pages' => ceil($total_items / $this->_per_page),
+			]
+		);
+	}
+
+
+	/**
+	 * @param object|array $item
+	 * @return string html content for the column
+	 */
+	protected function column_cb($item)
+	{
+		return '';
+	}
+
+
+	/**
+	 * This column is the default for when there is no defined column method for a registered column.
+	 * This can be overridden by child classes, but allows for hooking in for custom columns.
+	 *
+	 * @param EE_Base_Class $item
+	 * @param string        $column_name The column being called.
+	 * @return string html content for the column
+	 */
+	public function column_default($item, $column_name)
+	{
+		/**
+		 * Dynamic hook allowing for adding additional column content in this list table.
+		 * Note that $this->screen->id is in the format
+		 * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
+		 * table it is: event-espresso_page_espresso_messages.
+		 * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
+		 * hook prefix ("event-espresso") will be different.
+		 */
+		ob_start();
+		do_action(
+			'AHEE__EE_Admin_List_Table__column_' . $column_name . '__' . $this->screen->id,
+			$item,
+			$this->_screen
+		);
+		return ob_get_clean();
+	}
+
+
+	/**
+	 * Get a list of columns. The format is:
+	 * 'internal-name' => 'Title'
+	 *
+	 * @return array
+	 * @since  3.1.0
+	 * @access public
+	 * @abstract
+	 */
+	public function get_columns()
+	{
+		/**
+		 * Dynamic hook allowing for adding additional columns in this list table.
+		 * Note that $this->screen->id is in the format
+		 * {sanitize_title($top_level_menu_label)}_page_{$espresso_admin_page_slug}.  So for the messages list
+		 * table it is: event-espresso_page_espresso_messages.
+		 * However, take note that if the top level menu label has been translated (i.e. "Event Espresso"). then the
+		 * hook prefix ("event-espresso") will be different.
+		 *
+		 * @var array
+		 */
+		return apply_filters('FHEE_manage_' . $this->screen->id . '_columns', $this->_columns, $this->_screen);
+	}
+
+
+	/**
+	 * Get an associative array ( id => link ) with the list
+	 * of views available on this table.
+	 *
+	 * @return array
+	 * @since  3.1.0
+	 * @access protected
+	 */
+	public function get_views()
+	{
+		return $this->_views;
+	}
+
+
+	/**
+	 * Generate the views html.
+	 */
+	public function display_views()
+	{
+		$views           = $this->get_views();
+		$assembled_views = [];
+
+		if (empty($views)) {
+			return;
+		}
+		echo "<ul class='subsubsub'>\n";
+		foreach ($views as $view) {
+			$count = isset($view['count']) && ! empty($view['count']) ? absint($view['count']) : 0;
+			if (isset($view['slug'], $view['class'], $view['url'], $view['label'])) {
+				$filter = "<li";
+				$filter .= $view['class'] ? " class='" . esc_attr($view['class']) . "'" : '';
+				$filter .= ">";
+				$filter .= '<a href="' . esc_url_raw($view['url']) . '">' . esc_html($view['label']) . '</a>';
+				$filter .= '<span class="count">(' . $count . ')</span>';
+				$filter .= '</li>';
+				$assembled_views[ $view['slug'] ] = $filter;
+			}
+		}
+
+		echo ! empty($assembled_views)
+			? implode("<li style='margin:0 .5rem;'>|</li>", $assembled_views)
+			: '';
+		echo "</ul>";
+	}
+
+
+	/**
+	 * Generates content for a single row of the table
+	 *
+	 * @param EE_Base_Class $item The current item
+	 * @since  4.1
+	 * @access public
+	 */
+	public function single_row($item)
+	{
+		$row_class = $this->_get_row_class($item);
+		echo '<tr class="' . esc_attr($row_class) . '">';
+		$this->single_row_columns($item); // already escaped
+		echo '</tr>';
+	}
+
+
+	/**
+	 * This simply sets up the row class for the table rows.
+	 * Allows for easier overriding of child methods for setting up sorting.
+	 *
+	 * @param EE_Base_Class $item the current item
+	 * @return string
+	 */
+	protected function _get_row_class($item)
+	{
+		static $row_class = '';
+		$row_class = ($row_class === '' ? 'alternate' : '');
+
+		$new_row_class = $row_class;
+
+		if (! empty($this->_ajax_sorting_callback)) {
+			$new_row_class .= ' rowsortable';
+		}
+
+		return $new_row_class;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_sortable_columns()
+	{
+		return (array) $this->_sortable_columns;
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function get_ajax_sorting_callback()
+	{
+		return $this->_ajax_sorting_callback;
+	}
+
+
+	/**
+	 * @return array
+	 */
+	public function get_hidden_columns()
+	{
+		$user_id     = get_current_user_id();
+		$has_default = get_user_option('default' . $this->screen->id . 'columnshidden', $user_id);
+		if (empty($has_default) && ! empty($this->_hidden_columns)) {
+			update_user_option($user_id, 'default' . $this->screen->id . 'columnshidden', true);
+			update_user_option($user_id, 'manage' . $this->screen->id . 'columnshidden', $this->_hidden_columns, true);
+		}
+		$ref = 'manage' . $this->screen->id . 'columnshidden';
+		return (array) get_user_option($ref, $user_id);
+	}
+
+
+	/**
+	 * Generates the columns for a single row of the table.
+	 * Overridden from wp_list_table so as to allow us to filter the column content for a given
+	 * column.
+	 *
+	 * @param EE_Base_Class $item The current item
+	 * @since 3.1.0
+	 */
+	public function single_row_columns($item)
+	{
+		[$columns, $hidden, $sortable, $primary] = $this->get_column_info();
+
+		foreach ($columns as $column_name => $column_display_name) {
+
+			/**
+			 * With WordPress version 4.3.RC+ WordPress started using the hidden css class to control whether columns
+			 * are hidden or not instead of using "display:none;".  This bit of code provides backward compat.
+			 */
+			$hidden_class = in_array($column_name, $hidden) ? ' hidden' : '';
+
+			$classes = $column_name . ' column-' . $column_name . $hidden_class;
+			if ($primary === $column_name) {
+				$classes .= ' has-row-actions column-primary';
+			}
+
+			$data = ' data-colname="' . wp_strip_all_tags($column_display_name) . '"';
+
+			$class = 'class="' . esc_attr($classes) . '"';
+
+			$attributes = "{$class}{$data}";
+
+			if ($column_name === 'cb') {
+				echo '<th scope="row" class="check-column">';
+				echo apply_filters(
+					'FHEE__EE_Admin_List_Table__single_row_columns__column_cb_content',
+					$this->column_cb($item), // already escaped
+					$item,
+					$this
+				);
+				echo '</th>';
+			} elseif (method_exists($this, 'column_' . $column_name)) {
+				echo "<td $attributes>"; // already escaped
+				echo apply_filters(
+					'FHEE__EE_Admin_List_Table__single_row_columns__column_' . $column_name . '__column_content',
+					call_user_func([$this, 'column_' . $column_name], $item),
+					$item,
+					$this
+				);
+				echo wp_kses($this->handle_row_actions($item, $column_name, $primary), AllowedTags::getWithFormTags());
+				echo "</td>";
+			} else {
+				echo "<td $attributes>"; // already escaped
+				echo apply_filters(
+					'FHEE__EE_Admin_List_Table__single_row_columns__column_default__column_content',
+					$this->column_default($item, $column_name),
+					$item,
+					$column_name,
+					$this
+				);
+				echo wp_kses($this->handle_row_actions($item, $column_name, $primary), AllowedTags::getWithFormTags());
+				echo "</td>";
+			}
+		}
+	}
+
+
+	/**
+	 * Extra controls to be displayed between bulk actions and pagination
+	 *
+	 * @access public
+	 * @param string $which
+	 * @throws EE_Error
+	 */
+	public function extra_tablenav($which)
+	{
+		if ($which === 'top') {
+			$this->_filters();
+			echo wp_kses($this->_get_hidden_fields(), AllowedTags::getWithFormTags());
+		} else {
+			echo '<div class="list-table-bottom-buttons alignleft actions">';
+			foreach ($this->_bottom_buttons as $type => $action) {
+				$route         = $action['route'] ?? '';
+				$extra_request = $action['extra_request'] ?? '';
+				$btn_class     = $action['btn_class'] ?? 'button button--secondary';
+				// already escaped
+				echo wp_kses($this->_admin_page->get_action_link_or_button(
+					$route,
+					$type,
+					$extra_request,
+					$btn_class
+				), AllowedTags::getWithFormTags());
+			}
+			do_action('AHEE__EE_Admin_List_Table__extra_tablenav__after_bottom_buttons', $this, $this->_screen);
+			echo '</div>';
+		}
+	}
+
+
+	/**
+	 * Get an associative array ( option_name => option_title ) with the list
+	 * of bulk actions available on this table.
+	 *
+	 * @return array
+	 * @since  3.1.0
+	 * @access protected
+	 */
+	public function get_bulk_actions()
+	{
+		return (array) $this->_get_bulk_actions();
+	}
+
+
+	/**
+	 * Processing bulk actions.
+	 */
+	public function process_bulk_action()
+	{
+		// this is not used it is handled by the child EE_Admin_Page class (routes).  However, including here for
+		// reference in case there is a case where it gets used.
+	}
+
+
+	/**
+	 * returns the EE admin page this list table is associated with
+	 *
+	 * @return EE_Admin_Page
+	 */
+	public function get_admin_page()
+	{
+		return $this->_admin_page;
+	}
+
+
+	/**
+	 * A "helper" function for all children to provide an html string of
+	 * actions to output in their content.  It is preferable for child classes
+	 * to use this method for generating their actions content so that it's
+	 * filterable by plugins
+	 *
+	 * @param string        $action_container           what are the html container
+	 *                                                  elements for this actions string?
+	 * @param string        $action_class               What class is for the container
+	 *                                                  element.
+	 * @param string        $action_items               The contents for the action items
+	 *                                                  container.  This is filtered before
+	 *                                                  returned.
+	 * @param string        $action_id                  What id (optional) is used for the
+	 *                                                  container element.
+	 * @param EE_Base_Class $item                       The object for the column displaying
+	 *                                                  the actions.
+	 * @return string The assembled action elements container.
+	 */
+	protected function _action_string(
+		$action_items,
+		$item,
+		$action_container = 'ul',
+		$action_class = '',
+		$action_id = ''
+	) {
+		$action_class = ! empty($action_class) ? ' class="' . esc_attr($action_class) . '"' : '';
+		$action_id    = ! empty($action_id) ? ' id="' . esc_attr($action_id) . '"' : '';
+		$open_tag     = ! empty($action_container) ? '<' . $action_container . $action_class . $action_id . '>' : '';
+		$close_tag    = ! empty($action_container) ? '</' . $action_container . '>' : '';
+		try {
+			$content = apply_filters(
+				'FHEE__EE_Admin_List_Table___action_string__action_items',
+				$action_items,
+				$item,
+				$this
+			);
+		} catch (Exception $e) {
+			if (WP_DEBUG) {
+				EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			}
+			$content = $action_items;
+		}
+		return "{$open_tag}{$content}{$close_tag}";
+	}
+
+
+	/**
+	 * @return string
+	 */
+	protected function getReturnUrl()
+	{
+		$host = $this->_admin_page->get_request()->getServerParam('HTTP_HOST');
+		$uri  = $this->_admin_page->get_request()->getServerParam('REQUEST_URI');
+		return urlencode(esc_url_raw("//{$host}{$uri}"));
+	}
+
+
+	/**
+	 * @param string $id
+	 * @param string $content
+	 * @param string $align     start (default), center, end
+	 * @return string
+	 * @since   $VID:$
+	 */
+	protected function columnContent($id, $content, $align = 'start')
+	{
+		if (! isset($this->_columns[ $id ])) {
+			throw new DomainException('missing column id');
+		}
+		$heading = $id !== 'cb' ? $this->_columns[ $id ] : '';
+		$align = in_array($align, ['start', 'center', 'end']) ? $align : 'start';
+		$align = "ee-responsive-table-cell--{$align}";
+
+		$html = "<div class='ee-responsive-table-cell ee-responsive-table-cell--column-{$id} {$align} ee-layout-row'>";
+		$html .= "<div class='ee-responsive-table-cell__heading'>{$heading}</div>";
+		$html .= "<div class='ee-responsive-table-cell__content ee-layout-row'>{$content}</div>";
+		$html .= "</div>";
+		return $html;
+	}
+
+
+	protected function actionsModalMenu($actions): string
+	{
+		return '
         <div class="ee-modal-menu">
             <button class="ee-modal-menu__button button button--secondary button--icon-only ee-aria-tooltip"
                     aria-label="' . esc_attr__('list table actions menu', 'event_espresso') . '"
@@ -959,24 +959,24 @@ 
                 ' . $actions . '
             </div>
         </div>';
-    }
+	}
 
 
-    protected function actionsColumnHeader(): string
-    {
-        return '
+	protected function actionsColumnHeader(): string
+	{
+		return '
             <span class="ee-actions-column-header-wrap">
                 <span class="dashicons dashicons-screenoptions"></span>
                 <span class="ee-actions-column-header">' . esc_html__('Actions', 'event_espresso') . '</span>
             </span>';
-    }
+	}
 
 
-    protected function getActionLink(string $url, string $display_text, string $label, $class = ''): string
-    {
-        $class = ! empty($class) ? "{$class} ee-list-table-action" : 'ee-list-table-action';
-        $class = ! empty($label) ? "{$class} ee-aria-tooltip" : $class;
-        $label = ! empty($label) ? " aria-label='{$label}'" : '';
-        return "<a href='{$url}' class='{$class}'{$label}>{$display_text}</a>";
-    }
+	protected function getActionLink(string $url, string $display_text, string $label, $class = ''): string
+	{
+		$class = ! empty($class) ? "{$class} ee-list-table-action" : 'ee-list-table-action';
+		$class = ! empty($label) ? "{$class} ee-aria-tooltip" : $class;
+		$label = ! empty($label) ? " aria-label='{$label}'" : '';
+		return "<a href='{$url}' class='{$class}'{$label}>{$display_text}</a>";
+	}
 }

caffeinated/modules/event_single_caff/templates/admin-event-single-settings.template.php

Indentation +47 added lines, -47 removed lines

@@ -4,10 +4,10 @@ 
 
 add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
 $values = EEH_Form_Fields::prep_answer_options(
-    array(
-        array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
-        array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
-    )
+	array(
+		array('id' => 1, 'text' => esc_html__('Yes', 'event_espresso')),
+		array('id' => 0, 'text' => esc_html__('No', 'event_espresso')),
+	)
 );
 ?>
 
@@ -15,9 +15,9 @@ 
 
 <h2 class="ee-admin-settings-hdr">
     <?php esc_html_e(
-        'Single Event Pages',
-        'event_espresso'
-    ); ?><?php // echo EEH_Template::get_help_tab_link('event_single_settings_info');?>
+		'Single Event Pages',
+		'event_espresso'
+	); ?><?php // echo EEH_Template::get_help_tab_link('event_single_settings_info');?>
 </h2>
 <table class="ee-admin-two-column-layout form-table">
     <tbody>
@@ -29,17 +29,17 @@ 
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_status_banner_single',
-                $display_status_banner_single,
-                $values,
-                'display_status_banner_single',
-                'display_status_banner_single'
-            ); ?>
+				'display_status_banner_single',
+				$display_status_banner_single,
+				$values,
+				'display_status_banner_single',
+				'display_status_banner_single'
+			); ?>
             <p class="description"><?php
-                esc_html_e(
-                    'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -47,23 +47,23 @@ 
         <th>
             <label for="display_venue">
                 <?php esc_html_e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                    'display_addresses_in_reg_form_info'
-                ); ?>
+					'display_addresses_in_reg_form_info'
+				); ?>
             </label>
         </th>
         <td>
             <?php echo EEH_Form_Fields::select(
-                'display_venue',
-                $display_venue,
-                $values,
-                'display_venue',
-                'display_venue'
-            ); ?>
+				'display_venue',
+				$display_venue,
+				$values,
+				'display_venue',
+				'display_venue'
+			); ?>
             <p class="description"><?php
-                esc_html_e(
-                    'Do not use this if you are using the venue shortcodes in your event description.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Do not use this if you are using the venue shortcodes in your event description.',
+					'event_espresso'
+				); ?></p>
         </td>
     </tr>
 
@@ -75,37 +75,37 @@ 
         </th>
         <td>
             <?php
-            echo EEH_Form_Fields::select(
-                'use_sortable_display_order',
-                $use_sortable_display_order,
-                $values,
-                'EED_Events_Single_use_sortable_display_order',
-                'EED_Events_Single_use_sortable_display_order'
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				'use_sortable_display_order',
+				$use_sortable_display_order,
+				$values,
+				'EED_Events_Single_use_sortable_display_order',
+				'EED_Events_Single_use_sortable_display_order'
+			);
+			?>
         </td>
     </tr>
 
     <tr>
         <th>
             <?php esc_html_e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link(
-                'display_addresses_in_reg_form_info'
-            ); ?>
+				'display_addresses_in_reg_form_info'
+			); ?>
         </th>
         <td>
 
             <?php wp_nonce_field(
-                'espresso_update_event_single_order',
-                'espresso_update_event_single_order_nonce',
-                false
-            ); ?>
+				'espresso_update_event_single_order',
+				'espresso_update_event_single_order_nonce',
+				false
+			); ?>
             <?php echo wp_kses($event_single_display_order, AllowedTags::getWithFormTags()); ?>
 
             <p class="description"><?php
-                esc_html_e(
-                    'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.',
+					'event_espresso'
+				); ?></p>
 
         </td>
     </tr>

admin_pages/payments/Payments_Admin_Page.core.php

Indentation +1206 added lines, -1206 removed lines

@@ -16,1210 +16,1210 @@
  */
 class Payments_Admin_Page extends EE_Admin_Page
 {
-    /**
-     * Variables used for when we're re-sorting the logs results,
-     * in case we needed to do two queries, and we need to resort
-     *
-     * @var string
-     */
-    private $_sort_logs_again_direction;
-
-
-    /**
-     * @Constructor
-     * @access public
-     * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function __construct($routing = true)
-    {
-        parent::__construct($routing);
-    }
-
-
-    protected function _init_page_props()
-    {
-        $this->page_slug = EE_PAYMENTS_PG_SLUG;
-        $this->page_label = esc_html__('Payment Methods', 'event_espresso');
-        $this->_admin_base_url = EE_PAYMENTS_ADMIN_URL;
-        $this->_admin_base_path = EE_PAYMENTS_ADMIN;
-    }
-
-
-    protected function _ajax_hooks()
-    {
-        // todo: all hooks for ajax goes here.
-    }
-
-
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = $this->page_label;
-        $this->_labels = array(
-            'publishbox' => esc_html__('Update Settings', 'event_espresso'),
-        );
-    }
-
-
-    protected function _set_page_routes()
-    {
-        /**
-         * note that with payment method capabilities, although we've implemented
-         * capability mapping which will be used for accessing payment methods owned by
-         * other users.  This is not fully implemented yet in the payment method ui.
-         * Currently, only the "plural" caps are in active use.
-         * When cap mapping is implemented, some routes will need to use the singular form of
-         * capability method and also include the $id of the payment method for the route.
-         **/
-        $this->_page_routes = array(
-            'default'                   => array(
-                'func'       => '_payment_methods_list',
-                'capability' => 'ee_edit_payment_methods',
-            ),
-            'payment_settings'          => array(
-                'func'       => '_payment_settings',
-                'capability' => 'ee_manage_gateways',
-            ),
-            'activate_payment_method'   => array(
-                'func'       => '_activate_payment_method',
-                'noheader'   => true,
-                'capability' => 'ee_edit_payment_methods',
-            ),
-            'deactivate_payment_method' => array(
-                'func'       => '_deactivate_payment_method',
-                'noheader'   => true,
-                'capability' => 'ee_delete_payment_methods',
-            ),
-            'update_payment_method'     => array(
-                'func'               => '_update_payment_method',
-                'noheader'           => true,
-                'headers_sent_route' => 'default',
-                'capability'         => 'ee_edit_payment_methods',
-            ),
-            'update_payment_settings'   => array(
-                'func'       => '_update_payment_settings',
-                'noheader'   => true,
-                'capability' => 'ee_manage_gateways',
-            ),
-            'payment_log'               => array(
-                'func'       => '_payment_log_overview_list_table',
-                'capability' => 'ee_read_payment_methods',
-            ),
-            'payment_log_details'       => array(
-                'func'       => '_payment_log_details',
-                'capability' => 'ee_read_payment_methods',
-            ),
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _set_page_config()
-    {
-        $payment_method_list_config = array(
-            'nav'           => array(
-                'label' => esc_html__('Payment Methods', 'event_espresso'),
-                'icon' => 'dashicons-bank',
-                'order' => 10,
-            ),
-            'metaboxes'     => $this->_default_espresso_metaboxes,
-            'help_tabs'     => array_merge(
-                array(
-                    'payment_methods_overview_help_tab' => array(
-                        'title'    => esc_html__('Payment Methods Overview', 'event_espresso'),
-                        'filename' => 'payment_methods_overview',
-                    ),
-                ),
-                $this->_add_payment_method_help_tabs()
-            ),
-            'require_nonce' => false,
-        );
-        $this->_page_config = array(
-            'default'          => $payment_method_list_config,
-            'payment_settings' => array(
-                'nav'           => array(
-                    'label' => esc_html__('Settings', 'event_espresso'),
-                    'icon' => 'dashicons-admin-generic',
-                    'order' => 20,
-                ),
-                'help_tabs'     => array(
-                    'payment_methods_settings_help_tab' => array(
-                        'title'    => esc_html__('Payment Method Settings', 'event_espresso'),
-                        'filename' => 'payment_methods_settings',
-                    ),
-                ),
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
-                'require_nonce' => false,
-            ),
-            'payment_log'      => array(
-                'nav'           => array(
-                    'label' => esc_html__("Logs", 'event_espresso'),
-                    'icon' => 'dashicons-text-page',
-                    'order' => 30,
-                ),
-                'list_table'    => 'Payment_Log_Admin_List_Table',
-                'metaboxes'     => $this->_default_espresso_metaboxes,
-                'require_nonce' => false,
-            ),
-        );
-    }
-
-
-    /**
-     * @return array
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _add_payment_method_help_tabs()
-    {
-        EE_Registry::instance()->load_lib('Payment_Method_Manager');
-        $payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
-        $all_pmt_help_tabs_config = array();
-        foreach ($payment_method_types as $payment_method_type) {
-            if (
-                ! EE_Registry::instance()->CAP->current_user_can(
-                    $payment_method_type->cap_name(),
-                    'specific_payment_method_type_access'
-                )
-            ) {
-                continue;
-            }
-            foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
-                $template_args = isset($config['template_args']) ? $config['template_args'] : array();
-                $template_args['admin_page_obj'] = $this;
-                $all_pmt_help_tabs_config[ $help_tab_name ] = array(
-                    'title'   => $config['title'],
-                    'content' => EEH_Template::display_template(
-                        $payment_method_type->file_folder() . 'help_tabs/' . $config['filename'] . '.help_tab.php',
-                        $template_args,
-                        true
-                    ),
-                );
-            }
-        }
-        return $all_pmt_help_tabs_config;
-    }
-
-
-    // none of the below group are currently used for Gateway Settings
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    public function admin_init()
-    {
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    public function load_scripts_styles()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        wp_register_style(
-            'espresso_payments',
-            EE_PAYMENTS_ASSETS_URL . 'ee-payments.css',
-            [],
-            EVENT_ESPRESSO_VERSION
-        );
-        // scripts
-        wp_enqueue_script('ee_admin_js');
-        wp_enqueue_script('ee-text-links');
-        wp_enqueue_script(
-            'espresso_payments',
-            EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js',
-            ['ee-datepicker'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-    }
-
-
-    public function load_scripts_styles_default()
-    {
-        wp_enqueue_style('espresso_payments');
-        wp_enqueue_style('ee-text-links');
-    }
-
-
-    public function load_scripts_styles_payment_log_details()
-    {
-        wp_enqueue_style('espresso_payments');
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _payment_methods_list()
-    {
-        /**
-         * first let's ensure payment methods have been set up.
-         * We do this here because when people activate a payment method for the first time (as an addon),
-         * it may not set up its capabilities or get registered correctly due to the loading process.
-         * However, people MUST set up the details for the payment method,
-         * so it's safe to do a recheck here.
-         */
-        EE_Registry::instance()->load_lib('Payment_Method_Manager');
-        EEM_Payment_Method::instance()->verify_button_urls();
-        // set up tabs, one for each payment method type
-        $tabs = array();
-        $payment_methods = array();
-        foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
-            // we don't want to show admin-only PMTs for now
-            if ($pmt_obj instanceof EE_PMT_Admin_Only) {
-                continue;
-            }
-            // check access
-            if (
-                ! EE_Registry::instance()->CAP->current_user_can(
-                    $pmt_obj->cap_name(),
-                    'specific_payment_method_type_access'
-                )
-            ) {
-                continue;
-            }
-            // check for any active pms of that type
-            $payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
-            if (! $payment_method instanceof EE_Payment_Method) {
-                $payment_method = EE_Payment_Method::new_instance(
-                    array(
-                        'PMD_slug'       => sanitize_key($pmt_obj->system_name()),
-                        'PMD_type'       => $pmt_obj->system_name(),
-                        'PMD_name'       => $pmt_obj->pretty_name(),
-                        'PMD_admin_name' => $pmt_obj->pretty_name(),
-                    )
-                );
-            }
-            $payment_methods[ $payment_method->slug() ] = $payment_method;
-        }
-        $payment_methods = apply_filters(
-            'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
-            $payment_methods
-        );
-        foreach ($payment_methods as $payment_method) {
-            if ($payment_method instanceof EE_Payment_Method) {
-                $this->addMetaBox(
-                    // html id
-                    'espresso_' . $payment_method->slug() . '_payment_settings',
-                    // title
-                    sprintf(esc_html__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
-                    // callback
-                    array($this, 'payment_method_settings_meta_box'),
-                    // post type
-                    null,
-                    // context
-                    'normal',
-                    // priority
-                    'default',
-                    // callback args
-                    array('payment_method' => $payment_method)
-                );
-                // setup for tabbed content
-                $tabs[ $payment_method->slug() ] = array(
-                    'label' => $payment_method->admin_name(),
-                    'class' => $payment_method->active() ? 'gateway-active' : '',
-                    'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
-                    'title' => esc_html__('Modify this Payment Method', 'event_espresso'),
-                    'slug'  => $payment_method->slug(),
-                    'icon'  => $payment_method->active()
-                        ? '<span class="dashicons dashicons-yes-alt"></span>'
-                        : '<span class="dashicons dashicons-remove"></span>',
-                );
-            }
-        }
-        $this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links(
-            $tabs,
-            'payment_method_links',
-            '',
-            $this->_get_active_payment_method_slug()
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     *   _get_active_payment_method_slug
-     *
-     * @return string
-     * @throws EE_Error
-     */
-    protected function _get_active_payment_method_slug()
-    {
-        $payment_method_slug = false;
-        // decide which payment method tab to open first, as dictated by the request's 'payment_method'
-        if (isset($this->_req_data['payment_method'])) {
-            // if they provided the current payment method, use it
-            $payment_method_slug = sanitize_key($this->_req_data['payment_method']);
-        }
-        /** @var EE_Payment_Method $payment_method */
-        $payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
-        // if that didn't work or wasn't provided, find another way to select the current pm
-        if (! $this->_verify_payment_method($payment_method)) {
-            // like, looking for an active one
-            $payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
-            // test that one as well
-            if ($this->_verify_payment_method($payment_method)) {
-                $payment_method_slug = $payment_method->slug();
-            } else {
-                $payment_method_slug = 'paypal_standard';
-            }
-        }
-        return $payment_method_slug;
-    }
-
-
-    /**
-     *    payment_method_settings_meta_box
-     *    returns TRUE if the passed payment method is properly constructed and the logged-in user has the correct
-     *    capabilities to access it
-     *
-     * @param EE_Payment_Method $payment_method
-     * @return boolean
-     * @throws EE_Error
-     */
-    protected function _verify_payment_method($payment_method)
-    {
-        if (
-            $payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base
-            && EE_Registry::instance()->CAP->current_user_can(
-                $payment_method->type_obj()->cap_name(),
-                'specific_payment_method_type_access'
-            )
-        ) {
-            return true;
-        }
-        return false;
-    }
-
-
-    /**
-     *    payment_method_settings_meta_box
-     *
-     * @param NULL  $post_obj_which_is_null is an object containing the current post (as a $post object)
-     * @param array $metabox                is an array with metabox id, title, callback, and args elements. the value
-     *                                      at 'args' has key 'payment_method', as set within _payment_methods_list
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox)
-    {
-        $payment_method = isset($metabox['args'], $metabox['args']['payment_method'])
-            ? $metabox['args']['payment_method'] : null;
-        if (! $payment_method instanceof EE_Payment_Method) {
-            throw new EE_Error(
-                esc_html__(
-                    'Payment method metabox setup incorrectly. No Payment method object was supplied',
-                    'event_espresso'
-                )
-            );
-        }
-        $payment_method_scopes = $payment_method->active();
-        // if the payment method really exists show its form, otherwise the activation template
-        if ($payment_method->ID() && ! empty($payment_method_scopes)) {
-            $form = $this->_generate_payment_method_settings_form($payment_method);
-            if ($form->form_data_present_in($this->_req_data)) {
-                $form->receive_form_submission($this->_req_data);
-            }
-            echo wp_kses($form->form_open() . $form->get_html_and_js() . $form->form_close(), AllowedTags::getWithFormTags());
-        } else {
-            echo wp_kses($this->_activate_payment_method_button($payment_method)->get_html_and_js(), AllowedTags::getWithFormTags());
-        }
-    }
-
-
-    /**
-     * Gets the form for all the settings related to this payment method type
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     */
-    protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method = null)
-    {
-        if (! $payment_method instanceof EE_Payment_Method) {
-            return new EE_Form_Section_Proper();
-        }
-        $subsections = apply_filters(
-            'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
-            [
-                'pci_dss_compliance'      => $this->_pci_dss_compliance($payment_method),
-                'currency_support'        => $this->_currency_support($payment_method),
-                'payment_method_settings' => $this->_payment_method_settings($payment_method),
-                'update'                  => $this->_update_payment_method_button($payment_method),
-                'deactivate'              => $this->_deactivate_payment_method_button($payment_method),
-                'fine_print'              => $this->_fine_print(),
-            ],
-            $payment_method
-        );
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => $payment_method->slug() . '_settings_form',
-                'html_id'         => $payment_method->slug() . '_settings_form',
-                'action'          => EE_Admin_Page::add_query_args_and_nonce(
-                    array(
-                        'action'         => 'update_payment_method',
-                        'payment_method' => $payment_method->slug(),
-                    ),
-                    EE_PAYMENTS_ADMIN_URL
-                ),
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => array_filter($subsections),
-            )
-        );
-    }
-
-
-    /**
-     * _pci_dss_compliance
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML|null
-     * @throws EE_Error
-     */
-    protected function _pci_dss_compliance(EE_Payment_Method $payment_method): ?EE_Form_Section_HTML
-    {
-        if (!$payment_method->type_obj()->requires_https()) {
-            return null;
-        }
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::tr(
-                    EEH_HTML::th(
-                        EEH_HTML::label(
-                            EEH_HTML::strong(
-                                esc_html__('IMPORTANT', 'event_espresso'),
-                                '',
-                                'important-notice'
-                            )
-                        )
-                    ) .
-                    EEH_HTML::td(
-                        EEH_HTML::strong(
-                            esc_html__(
-                                'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.',
-                                'event_espresso'
-                            )
-                        )
-                        .
-                        EEH_HTML::br()
-                        .
-                        esc_html__('Learn more about ', 'event_espresso')
-                        . EEH_HTML::link(
-                            'https://www.pcisecuritystandards.org/merchants/index.php',
-                            esc_html__('PCI DSS compliance', 'event_espresso')
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * _currency_support
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML|null
-     * @throws EE_Error
-     */
-    protected function _currency_support(EE_Payment_Method $payment_method): ?EE_Form_Section_HTML
-    {
-        if ($payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
-            return null;
-        }
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::tr(
-                    EEH_HTML::th(
-                        EEH_HTML::label(
-                            EEH_HTML::strong(
-                                esc_html__('IMPORTANT', 'event_espresso'),
-                                '',
-                                'important-notice'
-                            )
-                        )
-                    ) .
-                    EEH_HTML::td(
-                        EEH_HTML::strong(
-                            sprintf(
-                                esc_html__(
-                                    'This payment method does not support the currency set on your site (%1$s). Please activate a different payment method or change your site\'s country and associated currency.',
-                                    'event_espresso'
-                                ),
-                                EE_Config::instance()->currency->code
-                            )
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * _update_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Payment_Method_Form
-     * @throws EE_Error
-     */
-    protected function _payment_method_settings(EE_Payment_Method $payment_method)
-    {
-        // modify the form, so we only have/show fields that will be implemented for this version
-        return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
-    }
-
-
-    /**
-     * Simplifies the form to merely reproduce 4.1's gateway settings functionality
-     *
-     * @param EE_Form_Section_Proper $form_section
-     * @param string                 $payment_method_name
-     * @return EE_Payment_Method_Form
-     * @throws EE_Error
-     */
-    protected function _simplify_form($form_section, $payment_method_name = '')
-    {
-        if ($form_section instanceof EE_Payment_Method_Form) {
-            $form_section->exclude(
-                array(
-                    'PMD_type', // don't want them changing the type
-                    'PMD_slug', // or the slug (probably never)
-                    'PMD_wp_user', // or the user's ID
-                    'Currency' // or the currency, until the rest of EE supports simultaneous currencies
-                )
-            );
-            return $form_section;
-        } else {
-            throw new EE_Error(
-                sprintf(
-                    esc_html__(
-                        'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.',
-                        'event_espresso'
-                    ),
-                    $payment_method_name
-                )
-            );
-        }
-    }
-
-
-    /**
-     * _update_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML
-     * @throws EE_Error
-     */
-    protected function _update_payment_method_button(EE_Payment_Method $payment_method)
-    {
-        $update_button = new EE_Submit_Input(
-            array(
-                'name'       => 'submit',
-                'html_id'    => 'save_' . $payment_method->slug() . '_settings',
-                'default'    => sprintf(
-                    esc_html__('Update %s Payment Settings', 'event_espresso'),
-                    $payment_method->admin_name()
-                ),
-                'html_label' => EEH_HTML::nbsp(),
-            )
-        );
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::no_row(EEH_HTML::br(2)) .
-                EEH_HTML::tr(
-                    EEH_HTML::th(esc_html__('Update Settings', 'event_espresso')) .
-                    EEH_HTML::td(
-                        $update_button->get_html_for_input()
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * _deactivate_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_HTML
-     */
-    protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method)
-    {
-        $link_text_and_title = sprintf(
-            esc_html__('Deactivate %1$s Payments?', 'event_espresso'),
-            $payment_method->admin_name()
-        );
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::tr(
-                    EEH_HTML::th(esc_html__('Deactivate Payment Method', 'event_espresso')) .
-                    EEH_HTML::td(
-                        EEH_HTML::link(
-                            EE_Admin_Page::add_query_args_and_nonce(
-                                array(
-                                    'action'         => 'deactivate_payment_method',
-                                    'payment_method' => $payment_method->slug(),
-                                ),
-                                EE_PAYMENTS_ADMIN_URL
-                            ),
-                            $link_text_and_title,
-                            $link_text_and_title,
-                            'deactivate_' . $payment_method->slug(),
-                            'button button--secondary'
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * _activate_payment_method_button
-     *
-     * @access protected
-     * @param EE_Payment_Method $payment_method
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     */
-    protected function _activate_payment_method_button(EE_Payment_Method $payment_method)
-    {
-        $link_text_and_title = sprintf(
-            esc_html__('Activate %1$s Payment Method?', 'event_espresso'),
-            $payment_method->admin_name()
-        );
-        return new EE_Form_Section_Proper(
-            array(
-                'name'            => 'activate_' . $payment_method->slug() . '_settings_form',
-                'html_id'         => 'activate_' . $payment_method->slug() . '_settings_form',
-                'action'          => '#',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections'     => apply_filters(
-                    'FHEE__Payments_Admin_Page___activate_payment_method_button__form_subsections',
-                    array(
-                        new EE_Form_Section_HTML(
-                            EEH_HTML::table(
-                                EEH_HTML::tr(
-                                    EEH_HTML::td(
-                                        $payment_method->type_obj()->introductory_html(),
-                                        '',
-                                        '',
-                                        '',
-                                        'colspan="2"'
-                                    )
-                                ) .
-                                EEH_HTML::tr(
-                                    EEH_HTML::th(
-                                        EEH_HTML::label(esc_html__('Click to Activate ', 'event_espresso'))
-                                    ) .
-                                    EEH_HTML::td(
-                                        EEH_HTML::link(
-                                            EE_Admin_Page::add_query_args_and_nonce(
-                                                array(
-                                                    'action'              => 'activate_payment_method',
-                                                    'payment_method_type' => $payment_method->type(),
-                                                ),
-                                                EE_PAYMENTS_ADMIN_URL
-                                            ),
-                                            $link_text_and_title,
-                                            $link_text_and_title,
-                                            'activate_' . $payment_method->slug(),
-                                            'button button--primary-alt'
-                                        )
-                                    )
-                                )
-                            )
-                        ),
-                    ),
-                    $payment_method
-                ),
-            )
-        );
-    }
-
-
-    /**
-     * _fine_print
-     *
-     * @access protected
-     * @return EE_Form_Section_HTML
-     */
-    protected function _fine_print()
-    {
-        return new EE_Form_Section_HTML(
-            EEH_HTML::table(
-                EEH_HTML::tr(
-                    EEH_HTML::th() .
-                    EEH_HTML::td(
-                        EEH_HTML::p(esc_html__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
-     *
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @global WP_User $current_user
-     */
-    protected function _activate_payment_method()
-    {
-        if (isset($this->_req_data['payment_method_type'])) {
-            $payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
-            // see if one exists
-            EE_Registry::instance()->load_lib('Payment_Method_Manager');
-            $payment_method = EE_Payment_Method_Manager::instance()
-                                                       ->activate_a_payment_method_of_type($payment_method_type);
-            $this->_redirect_after_action(
-                1,
-                'Payment Method',
-                'activated',
-                array('action' => 'default', 'payment_method' => $payment_method->slug())
-            );
-        } else {
-            $this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
-        }
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _deactivate_payment_method()
-    {
-        if (isset($this->_req_data['payment_method'])) {
-            $payment_method_slug = sanitize_key($this->_req_data['payment_method']);
-            // deactivate it
-            EE_Registry::instance()->load_lib('Payment_Method_Manager');
-            $count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
-            $this->_redirect_after_action(
-                $count_updated,
-                'Payment Method',
-                'deactivated',
-                array('action' => 'default', 'payment_method' => $payment_method_slug)
-            );
-        } else {
-            $this->_redirect_after_action(false, 'Payment Method', 'deactivated', array('action' => 'default'));
-        }
-    }
-
-
-    /**
-     * Processes the payment method form that was submitted. This is slightly trickier than usual form
-     * processing because we first need to identify WHICH form was processed and which payment method
-     * it corresponds to. Once we have done that, we see if the form is valid. If it is, the
-     * form's data is saved, and we redirect to the default payment methods page, setting the updated payment method
-     * as the currently-selected one. If it DOESN'T validate, we render the page with the form's errors (in the
-     * subsequently called 'headers_sent_func' which is _payment_methods_list)
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _update_payment_method()
-    {
-        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            // ok let's find which gateway form to use based on the form input
-            EE_Registry::instance()->load_lib('Payment_Method_Manager');
-            /** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
-            $correct_pmt_form_to_use = null;
-            $payment_method = null;
-            foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
-                if ($payment_method instanceof EE_Payment_Method) {
-                    // get the form and simplify it, like what we do when we display it
-                    $pmt_form = $this->_generate_payment_method_settings_form($payment_method);
-                    if ($pmt_form->form_data_present_in($this->_req_data)) {
-                        $correct_pmt_form_to_use = $pmt_form;
-                        break;
-                    }
-                }
-            }
-            // if we couldn't find the correct payment method type...
-            if (! $correct_pmt_form_to_use) {
-                EE_Error::add_error(
-                    esc_html__(
-                        "We could not find which payment method type your form submission related to. Please contact support",
-                        'event_espresso'
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                $this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
-            }
-            $correct_pmt_form_to_use->receive_form_submission($this->_req_data);
-            if ($correct_pmt_form_to_use->is_valid()) {
-                $payment_settings_subform = $correct_pmt_form_to_use->get_subsection('payment_method_settings');
-                if (! $payment_settings_subform instanceof EE_Payment_Method_Form) {
-                    throw new EE_Error(
-                        sprintf(
-                            esc_html__(
-                                'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.',
-                                'event_espresso'
-                            ),
-                            'payment_method_settings'
-                        )
-                    );
-                }
-                $payment_settings_subform->save();
-                /** @var $pm EE_Payment_Method */
-                $this->_redirect_after_action(
-                    true,
-                    'Payment Method',
-                    'updated',
-                    array('action' => 'default', 'payment_method' => $payment_method->slug())
-                );
-            } else {
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'Payment method of type %s was not saved because there were validation errors. They have been marked in the form',
-                            'event_espresso'
-                        ),
-                        $payment_method instanceof EE_Payment_Method ? $payment_method->type_obj()->pretty_name()
-                            : esc_html__('"(unknown)"', 'event_espresso')
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-        }
-    }
-
-
-    /**
-     * Displays payment settings (not payment METHOD settings, that's _payment_method_settings)
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _payment_settings()
-    {
-        $form = $this->getPaymentSettingsForm();
-        $this->_set_add_edit_form_tags('update_payment_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_HTML::div(
-            $form->get_html_and_js(),
-            '',
-            'padding'
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     *        _update_payment_settings
-     *
-     * @access protected
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _update_payment_settings()
-    {
-        $form = $this->getPaymentSettingsForm();
-        if ($form->was_submitted($this->_req_data)) {
-            $form->receive_form_submission($this->_req_data);
-            if ($form->is_valid()) {
-                /**
-                 * @var $reg_config EE_Registration_Config
-                 */
-                $loader = LoaderFactory::getLoader();
-                $reg_config = $loader->getShared('EE_Registration_Config');
-                $valid_data = $form->valid_data();
-                $reg_config->show_pending_payment_options = $valid_data['show_pending_payment_options'];
-                $reg_config->gateway_log_lifespan = $valid_data['gateway_log_lifespan'];
-            }
-        }
-        EE_Registry::instance()->CFG = apply_filters(
-            'FHEE__Payments_Admin_Page___update_payment_settings__CFG',
-            EE_Registry::instance()->CFG
-        );
-
-        $what = esc_html__('Payment Settings', 'event_espresso');
-        $success = $this->_update_espresso_configuration(
-            $what,
-            EE_Registry::instance()->CFG,
-            __FILE__,
-            __FUNCTION__,
-            __LINE__
-        );
-        $this->_redirect_after_action(
-            $success,
-            $what,
-            esc_html__('updated', 'event_espresso'),
-            array('action' => 'payment_settings')
-        );
-    }
-
-
-    /**
-     * Gets the form used for updating payment settings
-     *
-     * @return EE_Form_Section_Proper
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function getPaymentSettingsForm()
-    {
-        /**
-         * @var $reg_config EE_Registration_Config
-         */
-        $reg_config = LoaderFactory::getLoader()->getShared('EE_Registration_Config');
-        return new EE_Form_Section_Proper(
-            array(
-                'name' => 'payment-settings',
-                'layout_strategy' => new EE_Admin_Two_Column_Layout(),
-                'subsections' => array(
-                    'show_pending_payment_options' => new EE_Yes_No_Input(
-                        array(
-                            'html_name' => 'show_pending_payment_options',
-                            'default' => $reg_config->show_pending_payment_options,
-                            'html_help_text' => esc_html__(
-                                "If a payment is marked as 'Pending Payment', or if payment is deferred (ie, an offline gateway like Check, Bank, or Invoice is used), then give registrants the option to retry payment. ",
-                                'event_espresso'
-                            )
-                        )
-                    ),
-                    'gateway_log_lifespan' => new EE_Select_Input(
-                        $reg_config->gatewayLogLifespanOptions(),
-                        array(
-                            'html_label_text' => esc_html__('Gateway Logs Lifespan', 'event_espresso'),
-                            'html_help_text' => esc_html__('If issues arise with payments being made through a payment gateway, it\'s helpful to log non-sensitive communications with the payment gateway. But it\'s a security responsibility, so it\'s a good idea to not keep them for any longer than necessary.', 'event_espresso'),
-                            'default' => $reg_config->gateway_log_lifespan,
-                        )
-                    )
-                )
-            )
-        );
-    }
-
-
-    /**
-     * @throws EE_Error
-     */
-    protected function _payment_log_overview_list_table()
-    {
-        $this->display_admin_list_table_page_with_sidebar();
-    }
-
-
-    protected function _set_list_table_views_payment_log()
-    {
-        $this->_views = array(
-            'all' => array(
-                'slug'  => 'all',
-                'label' => esc_html__('View All Logs', 'event_espresso'),
-                'count' => 0,
-            ),
-        );
-    }
-
-
-    /**
-     * @param int  $per_page
-     * @param int  $current_page
-     * @param bool $count
-     * @return array|int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function get_payment_logs($per_page = 50, $current_page = 0, $count = false)
-    {
-        EE_Registry::instance()->load_model('Change_Log');
-        // we may need to do multiple queries (joining differently), so we actually want an array of query params
-        $query_params = array(array('LOG_type' => EEM_Change_Log::type_gateway));
-        // check if they've selected a specific payment method
-        if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
-            $query_params[0]['OR*pm_or_pay_pm'] = array(
-                'Payment.Payment_Method.PMD_ID' => $this->_req_data['_payment_method'],
-                'Payment_Method.PMD_ID'         => $this->_req_data['_payment_method'],
-            );
-        }
-        // take into account search
-        if (isset($this->_req_data['s']) && $this->_req_data['s']) {
-            $similarity_string = array('LIKE', '%' . str_replace("", "%", $this->_req_data['s']) . '%');
-            $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Payment_Method.PMD_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Payment_Method.PMD_admin_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment.Payment_Method.PMD_type'] = $similarity_string;
-            $query_params[0]['OR*s']['LOG_message'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment_Method.PMD_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment_Method.PMD_admin_name'] = $similarity_string;
-            $query_params[0]['OR*s']['Payment_Method.PMD_type'] = $similarity_string;
-            $query_params[0]['OR*s']['LOG_message'] = $similarity_string;
-        }
-        if (
-            isset($this->_req_data['payment-filter-start-date'])
-            && isset($this->_req_data['payment-filter-end-date'])
-        ) {
-            // add date
-            $start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
-            $end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
-            // make sure our timestamps start and end right at the boundaries for each day
-            $start_date = date('Y-m-d', strtotime($start_date)) . ' 00:00:00';
-            $end_date = date('Y-m-d', strtotime($end_date)) . ' 23:59:59';
-            // convert to timestamps
-            $start_date = strtotime($start_date);
-            $end_date = strtotime($end_date);
-            // makes sure start date is the lowest value and vice versa
-            $start_date = min($start_date, $end_date);
-            $end_date = max($start_date, $end_date);
-            // convert for query
-            $start_date = EEM_Change_Log::instance()->convert_datetime_for_query(
-                'LOG_time',
-                date('Y-m-d H:i:s', $start_date),
-                'Y-m-d H:i:s'
-            );
-            $end_date   = EEM_Change_Log::instance()->convert_datetime_for_query(
-                'LOG_time',
-                date('Y-m-d H:i:s', $end_date),
-                'Y-m-d H:i:s'
-            );
-            $query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
-        }
-        if ($count) {
-            return EEM_Change_Log::instance()->count($query_params);
-        }
-        if (isset($this->_req_data['order'])) {
-            $sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order']))
-                ? $this->_req_data['order']
-                : 'DESC';
-            $query_params['order_by'] = array('LOG_time' => $sort);
-        } else {
-            $query_params['order_by'] = array('LOG_time' => 'DESC');
-        }
-        $offset = ($current_page - 1) * $per_page;
-        if (! isset($this->_req_data['download_results'])) {
-            $query_params['limit'] = array($offset, $per_page);
-        }
-        // now they've requested to instead just download the file instead of viewing it.
-        if (isset($this->_req_data['download_results'])) {
-            $wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
-            header('Content-Disposition: attachment');
-            header("Content-Disposition: attachment; filename=ee_payment_logs_for_" . sanitize_key(site_url()));
-            echo '<h1> '
-                . sprintf(
-                    esc_html__('Payment Logs for %1$s', 'event_espresso'),
-                    esc_url_raw(site_url())
-                )
-                . '</h1 >';
-            echo '<h3>' . esc_html__('Query:', 'event_espresso') . '</h3>';
-            echo esc_html(var_export($query_params, true));
-            echo '<h3>' . esc_html__('Results:', 'event_espresso') . '</h3>';
-            echo esc_html(var_export($wpdb_results, true));
-            die;
-        }
-        return EEM_Change_Log::instance()->get_all($query_params);
-    }
-
-
-    /**
-     * Used by usort to RE-sort log query results, because we lose the ordering
-     * because we're possibly combining the results from two queries
-     *
-     * @param EE_Change_Log $logA
-     * @param EE_Change_Log $logB
-     * @return int
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _sort_logs_again($logA, $logB)
-    {
-        $timeA = $logA->get_raw('LOG_time');
-        $timeB = $logB->get_raw('LOG_time');
-        if ($timeA == $timeB) {
-            return 0;
-        }
-        $comparison = $timeA < $timeB ? -1 : 1;
-        if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
-            return $comparison * -1;
-        }
-        return $comparison;
-    }
-
-
-    /**
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    protected function _payment_log_details()
-    {
-        EE_Registry::instance()->load_model('Change_Log');
-        /** @var $payment_log EE_Change_Log */
-        $payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
-        $payment_method = null;
-        $transaction = null;
-        if ($payment_log instanceof EE_Change_Log) {
-            if ($payment_log->object() instanceof EE_Payment) {
-                $payment_method = $payment_log->object()->payment_method();
-                $transaction = $payment_log->object()->transaction();
-            } elseif ($payment_log->object() instanceof EE_Payment_Method) {
-                $payment_method = $payment_log->object();
-            } elseif ($payment_log->object() instanceof EE_Transaction) {
-                $transaction = $payment_log->object();
-                $payment_method = $transaction->payment_method();
-            }
-        }
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
-            array(
-                'payment_log'    => $payment_log,
-                'payment_method' => $payment_method,
-                'transaction'    => $transaction,
-            ),
-            true
-        );
-        $this->display_admin_page_with_no_sidebar();
-    }
+	/**
+	 * Variables used for when we're re-sorting the logs results,
+	 * in case we needed to do two queries, and we need to resort
+	 *
+	 * @var string
+	 */
+	private $_sort_logs_again_direction;
+
+
+	/**
+	 * @Constructor
+	 * @access public
+	 * @param bool $routing indicate whether we want to just load the object and handle routing or just load the object.
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function __construct($routing = true)
+	{
+		parent::__construct($routing);
+	}
+
+
+	protected function _init_page_props()
+	{
+		$this->page_slug = EE_PAYMENTS_PG_SLUG;
+		$this->page_label = esc_html__('Payment Methods', 'event_espresso');
+		$this->_admin_base_url = EE_PAYMENTS_ADMIN_URL;
+		$this->_admin_base_path = EE_PAYMENTS_ADMIN;
+	}
+
+
+	protected function _ajax_hooks()
+	{
+		// todo: all hooks for ajax goes here.
+	}
+
+
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = $this->page_label;
+		$this->_labels = array(
+			'publishbox' => esc_html__('Update Settings', 'event_espresso'),
+		);
+	}
+
+
+	protected function _set_page_routes()
+	{
+		/**
+		 * note that with payment method capabilities, although we've implemented
+		 * capability mapping which will be used for accessing payment methods owned by
+		 * other users.  This is not fully implemented yet in the payment method ui.
+		 * Currently, only the "plural" caps are in active use.
+		 * When cap mapping is implemented, some routes will need to use the singular form of
+		 * capability method and also include the $id of the payment method for the route.
+		 **/
+		$this->_page_routes = array(
+			'default'                   => array(
+				'func'       => '_payment_methods_list',
+				'capability' => 'ee_edit_payment_methods',
+			),
+			'payment_settings'          => array(
+				'func'       => '_payment_settings',
+				'capability' => 'ee_manage_gateways',
+			),
+			'activate_payment_method'   => array(
+				'func'       => '_activate_payment_method',
+				'noheader'   => true,
+				'capability' => 'ee_edit_payment_methods',
+			),
+			'deactivate_payment_method' => array(
+				'func'       => '_deactivate_payment_method',
+				'noheader'   => true,
+				'capability' => 'ee_delete_payment_methods',
+			),
+			'update_payment_method'     => array(
+				'func'               => '_update_payment_method',
+				'noheader'           => true,
+				'headers_sent_route' => 'default',
+				'capability'         => 'ee_edit_payment_methods',
+			),
+			'update_payment_settings'   => array(
+				'func'       => '_update_payment_settings',
+				'noheader'   => true,
+				'capability' => 'ee_manage_gateways',
+			),
+			'payment_log'               => array(
+				'func'       => '_payment_log_overview_list_table',
+				'capability' => 'ee_read_payment_methods',
+			),
+			'payment_log_details'       => array(
+				'func'       => '_payment_log_details',
+				'capability' => 'ee_read_payment_methods',
+			),
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _set_page_config()
+	{
+		$payment_method_list_config = array(
+			'nav'           => array(
+				'label' => esc_html__('Payment Methods', 'event_espresso'),
+				'icon' => 'dashicons-bank',
+				'order' => 10,
+			),
+			'metaboxes'     => $this->_default_espresso_metaboxes,
+			'help_tabs'     => array_merge(
+				array(
+					'payment_methods_overview_help_tab' => array(
+						'title'    => esc_html__('Payment Methods Overview', 'event_espresso'),
+						'filename' => 'payment_methods_overview',
+					),
+				),
+				$this->_add_payment_method_help_tabs()
+			),
+			'require_nonce' => false,
+		);
+		$this->_page_config = array(
+			'default'          => $payment_method_list_config,
+			'payment_settings' => array(
+				'nav'           => array(
+					'label' => esc_html__('Settings', 'event_espresso'),
+					'icon' => 'dashicons-admin-generic',
+					'order' => 20,
+				),
+				'help_tabs'     => array(
+					'payment_methods_settings_help_tab' => array(
+						'title'    => esc_html__('Payment Method Settings', 'event_espresso'),
+						'filename' => 'payment_methods_settings',
+					),
+				),
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
+				'require_nonce' => false,
+			),
+			'payment_log'      => array(
+				'nav'           => array(
+					'label' => esc_html__("Logs", 'event_espresso'),
+					'icon' => 'dashicons-text-page',
+					'order' => 30,
+				),
+				'list_table'    => 'Payment_Log_Admin_List_Table',
+				'metaboxes'     => $this->_default_espresso_metaboxes,
+				'require_nonce' => false,
+			),
+		);
+	}
+
+
+	/**
+	 * @return array
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _add_payment_method_help_tabs()
+	{
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
+		$payment_method_types = EE_Payment_Method_Manager::instance()->payment_method_types();
+		$all_pmt_help_tabs_config = array();
+		foreach ($payment_method_types as $payment_method_type) {
+			if (
+				! EE_Registry::instance()->CAP->current_user_can(
+					$payment_method_type->cap_name(),
+					'specific_payment_method_type_access'
+				)
+			) {
+				continue;
+			}
+			foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
+				$template_args = isset($config['template_args']) ? $config['template_args'] : array();
+				$template_args['admin_page_obj'] = $this;
+				$all_pmt_help_tabs_config[ $help_tab_name ] = array(
+					'title'   => $config['title'],
+					'content' => EEH_Template::display_template(
+						$payment_method_type->file_folder() . 'help_tabs/' . $config['filename'] . '.help_tab.php',
+						$template_args,
+						true
+					),
+				);
+			}
+		}
+		return $all_pmt_help_tabs_config;
+	}
+
+
+	// none of the below group are currently used for Gateway Settings
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	public function admin_init()
+	{
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	public function load_scripts_styles()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		wp_register_style(
+			'espresso_payments',
+			EE_PAYMENTS_ASSETS_URL . 'ee-payments.css',
+			[],
+			EVENT_ESPRESSO_VERSION
+		);
+		// scripts
+		wp_enqueue_script('ee_admin_js');
+		wp_enqueue_script('ee-text-links');
+		wp_enqueue_script(
+			'espresso_payments',
+			EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js',
+			['ee-datepicker'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+	}
+
+
+	public function load_scripts_styles_default()
+	{
+		wp_enqueue_style('espresso_payments');
+		wp_enqueue_style('ee-text-links');
+	}
+
+
+	public function load_scripts_styles_payment_log_details()
+	{
+		wp_enqueue_style('espresso_payments');
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _payment_methods_list()
+	{
+		/**
+		 * first let's ensure payment methods have been set up.
+		 * We do this here because when people activate a payment method for the first time (as an addon),
+		 * it may not set up its capabilities or get registered correctly due to the loading process.
+		 * However, people MUST set up the details for the payment method,
+		 * so it's safe to do a recheck here.
+		 */
+		EE_Registry::instance()->load_lib('Payment_Method_Manager');
+		EEM_Payment_Method::instance()->verify_button_urls();
+		// set up tabs, one for each payment method type
+		$tabs = array();
+		$payment_methods = array();
+		foreach (EE_Payment_Method_Manager::instance()->payment_method_types() as $pmt_obj) {
+			// we don't want to show admin-only PMTs for now
+			if ($pmt_obj instanceof EE_PMT_Admin_Only) {
+				continue;
+			}
+			// check access
+			if (
+				! EE_Registry::instance()->CAP->current_user_can(
+					$pmt_obj->cap_name(),
+					'specific_payment_method_type_access'
+				)
+			) {
+				continue;
+			}
+			// check for any active pms of that type
+			$payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
+			if (! $payment_method instanceof EE_Payment_Method) {
+				$payment_method = EE_Payment_Method::new_instance(
+					array(
+						'PMD_slug'       => sanitize_key($pmt_obj->system_name()),
+						'PMD_type'       => $pmt_obj->system_name(),
+						'PMD_name'       => $pmt_obj->pretty_name(),
+						'PMD_admin_name' => $pmt_obj->pretty_name(),
+					)
+				);
+			}
+			$payment_methods[ $payment_method->slug() ] = $payment_method;
+		}
+		$payment_methods = apply_filters(
+			'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
+			$payment_methods
+		);
+		foreach ($payment_methods as $payment_method) {
+			if ($payment_method instanceof EE_Payment_Method) {
+				$this->addMetaBox(
+					// html id
+					'espresso_' . $payment_method->slug() . '_payment_settings',
+					// title
+					sprintf(esc_html__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
+					// callback
+					array($this, 'payment_method_settings_meta_box'),
+					// post type
+					null,
+					// context
+					'normal',
+					// priority
+					'default',
+					// callback args
+					array('payment_method' => $payment_method)
+				);
+				// setup for tabbed content
+				$tabs[ $payment_method->slug() ] = array(
+					'label' => $payment_method->admin_name(),
+					'class' => $payment_method->active() ? 'gateway-active' : '',
+					'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
+					'title' => esc_html__('Modify this Payment Method', 'event_espresso'),
+					'slug'  => $payment_method->slug(),
+					'icon'  => $payment_method->active()
+						? '<span class="dashicons dashicons-yes-alt"></span>'
+						: '<span class="dashicons dashicons-remove"></span>',
+				);
+			}
+		}
+		$this->_template_args['admin_page_header'] = EEH_Tabbed_Content::tab_text_links(
+			$tabs,
+			'payment_method_links',
+			'',
+			$this->_get_active_payment_method_slug()
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 *   _get_active_payment_method_slug
+	 *
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function _get_active_payment_method_slug()
+	{
+		$payment_method_slug = false;
+		// decide which payment method tab to open first, as dictated by the request's 'payment_method'
+		if (isset($this->_req_data['payment_method'])) {
+			// if they provided the current payment method, use it
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
+		}
+		/** @var EE_Payment_Method $payment_method */
+		$payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
+		// if that didn't work or wasn't provided, find another way to select the current pm
+		if (! $this->_verify_payment_method($payment_method)) {
+			// like, looking for an active one
+			$payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
+			// test that one as well
+			if ($this->_verify_payment_method($payment_method)) {
+				$payment_method_slug = $payment_method->slug();
+			} else {
+				$payment_method_slug = 'paypal_standard';
+			}
+		}
+		return $payment_method_slug;
+	}
+
+
+	/**
+	 *    payment_method_settings_meta_box
+	 *    returns TRUE if the passed payment method is properly constructed and the logged-in user has the correct
+	 *    capabilities to access it
+	 *
+	 * @param EE_Payment_Method $payment_method
+	 * @return boolean
+	 * @throws EE_Error
+	 */
+	protected function _verify_payment_method($payment_method)
+	{
+		if (
+			$payment_method instanceof EE_Payment_Method && $payment_method->type_obj() instanceof EE_PMT_Base
+			&& EE_Registry::instance()->CAP->current_user_can(
+				$payment_method->type_obj()->cap_name(),
+				'specific_payment_method_type_access'
+			)
+		) {
+			return true;
+		}
+		return false;
+	}
+
+
+	/**
+	 *    payment_method_settings_meta_box
+	 *
+	 * @param NULL  $post_obj_which_is_null is an object containing the current post (as a $post object)
+	 * @param array $metabox                is an array with metabox id, title, callback, and args elements. the value
+	 *                                      at 'args' has key 'payment_method', as set within _payment_methods_list
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function payment_method_settings_meta_box($post_obj_which_is_null, $metabox)
+	{
+		$payment_method = isset($metabox['args'], $metabox['args']['payment_method'])
+			? $metabox['args']['payment_method'] : null;
+		if (! $payment_method instanceof EE_Payment_Method) {
+			throw new EE_Error(
+				esc_html__(
+					'Payment method metabox setup incorrectly. No Payment method object was supplied',
+					'event_espresso'
+				)
+			);
+		}
+		$payment_method_scopes = $payment_method->active();
+		// if the payment method really exists show its form, otherwise the activation template
+		if ($payment_method->ID() && ! empty($payment_method_scopes)) {
+			$form = $this->_generate_payment_method_settings_form($payment_method);
+			if ($form->form_data_present_in($this->_req_data)) {
+				$form->receive_form_submission($this->_req_data);
+			}
+			echo wp_kses($form->form_open() . $form->get_html_and_js() . $form->form_close(), AllowedTags::getWithFormTags());
+		} else {
+			echo wp_kses($this->_activate_payment_method_button($payment_method)->get_html_and_js(), AllowedTags::getWithFormTags());
+		}
+	}
+
+
+	/**
+	 * Gets the form for all the settings related to this payment method type
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 */
+	protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method = null)
+	{
+		if (! $payment_method instanceof EE_Payment_Method) {
+			return new EE_Form_Section_Proper();
+		}
+		$subsections = apply_filters(
+			'FHEE__Payments_Admin_Page___generate_payment_method_settings_form__form_subsections',
+			[
+				'pci_dss_compliance'      => $this->_pci_dss_compliance($payment_method),
+				'currency_support'        => $this->_currency_support($payment_method),
+				'payment_method_settings' => $this->_payment_method_settings($payment_method),
+				'update'                  => $this->_update_payment_method_button($payment_method),
+				'deactivate'              => $this->_deactivate_payment_method_button($payment_method),
+				'fine_print'              => $this->_fine_print(),
+			],
+			$payment_method
+		);
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => $payment_method->slug() . '_settings_form',
+				'html_id'         => $payment_method->slug() . '_settings_form',
+				'action'          => EE_Admin_Page::add_query_args_and_nonce(
+					array(
+						'action'         => 'update_payment_method',
+						'payment_method' => $payment_method->slug(),
+					),
+					EE_PAYMENTS_ADMIN_URL
+				),
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => array_filter($subsections),
+			)
+		);
+	}
+
+
+	/**
+	 * _pci_dss_compliance
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML|null
+	 * @throws EE_Error
+	 */
+	protected function _pci_dss_compliance(EE_Payment_Method $payment_method): ?EE_Form_Section_HTML
+	{
+		if (!$payment_method->type_obj()->requires_https()) {
+			return null;
+		}
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::tr(
+					EEH_HTML::th(
+						EEH_HTML::label(
+							EEH_HTML::strong(
+								esc_html__('IMPORTANT', 'event_espresso'),
+								'',
+								'important-notice'
+							)
+						)
+					) .
+					EEH_HTML::td(
+						EEH_HTML::strong(
+							esc_html__(
+								'You are responsible for your own website security and Payment Card Industry Data Security Standards (PCI DSS) compliance.',
+								'event_espresso'
+							)
+						)
+						.
+						EEH_HTML::br()
+						.
+						esc_html__('Learn more about ', 'event_espresso')
+						. EEH_HTML::link(
+							'https://www.pcisecuritystandards.org/merchants/index.php',
+							esc_html__('PCI DSS compliance', 'event_espresso')
+						)
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * _currency_support
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML|null
+	 * @throws EE_Error
+	 */
+	protected function _currency_support(EE_Payment_Method $payment_method): ?EE_Form_Section_HTML
+	{
+		if ($payment_method->usable_for_currency(EE_Config::instance()->currency->code)) {
+			return null;
+		}
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::tr(
+					EEH_HTML::th(
+						EEH_HTML::label(
+							EEH_HTML::strong(
+								esc_html__('IMPORTANT', 'event_espresso'),
+								'',
+								'important-notice'
+							)
+						)
+					) .
+					EEH_HTML::td(
+						EEH_HTML::strong(
+							sprintf(
+								esc_html__(
+									'This payment method does not support the currency set on your site (%1$s). Please activate a different payment method or change your site\'s country and associated currency.',
+									'event_espresso'
+								),
+								EE_Config::instance()->currency->code
+							)
+						)
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * _update_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 */
+	protected function _payment_method_settings(EE_Payment_Method $payment_method)
+	{
+		// modify the form, so we only have/show fields that will be implemented for this version
+		return $this->_simplify_form($payment_method->type_obj()->settings_form(), $payment_method->name());
+	}
+
+
+	/**
+	 * Simplifies the form to merely reproduce 4.1's gateway settings functionality
+	 *
+	 * @param EE_Form_Section_Proper $form_section
+	 * @param string                 $payment_method_name
+	 * @return EE_Payment_Method_Form
+	 * @throws EE_Error
+	 */
+	protected function _simplify_form($form_section, $payment_method_name = '')
+	{
+		if ($form_section instanceof EE_Payment_Method_Form) {
+			$form_section->exclude(
+				array(
+					'PMD_type', // don't want them changing the type
+					'PMD_slug', // or the slug (probably never)
+					'PMD_wp_user', // or the user's ID
+					'Currency' // or the currency, until the rest of EE supports simultaneous currencies
+				)
+			);
+			return $form_section;
+		} else {
+			throw new EE_Error(
+				sprintf(
+					esc_html__(
+						'The EE_Payment_Method_Form for the "%1$s" payment method is missing or invalid.',
+						'event_espresso'
+					),
+					$payment_method_name
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * _update_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML
+	 * @throws EE_Error
+	 */
+	protected function _update_payment_method_button(EE_Payment_Method $payment_method)
+	{
+		$update_button = new EE_Submit_Input(
+			array(
+				'name'       => 'submit',
+				'html_id'    => 'save_' . $payment_method->slug() . '_settings',
+				'default'    => sprintf(
+					esc_html__('Update %s Payment Settings', 'event_espresso'),
+					$payment_method->admin_name()
+				),
+				'html_label' => EEH_HTML::nbsp(),
+			)
+		);
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::no_row(EEH_HTML::br(2)) .
+				EEH_HTML::tr(
+					EEH_HTML::th(esc_html__('Update Settings', 'event_espresso')) .
+					EEH_HTML::td(
+						$update_button->get_html_for_input()
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * _deactivate_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_HTML
+	 */
+	protected function _deactivate_payment_method_button(EE_Payment_Method $payment_method)
+	{
+		$link_text_and_title = sprintf(
+			esc_html__('Deactivate %1$s Payments?', 'event_espresso'),
+			$payment_method->admin_name()
+		);
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::tr(
+					EEH_HTML::th(esc_html__('Deactivate Payment Method', 'event_espresso')) .
+					EEH_HTML::td(
+						EEH_HTML::link(
+							EE_Admin_Page::add_query_args_and_nonce(
+								array(
+									'action'         => 'deactivate_payment_method',
+									'payment_method' => $payment_method->slug(),
+								),
+								EE_PAYMENTS_ADMIN_URL
+							),
+							$link_text_and_title,
+							$link_text_and_title,
+							'deactivate_' . $payment_method->slug(),
+							'button button--secondary'
+						)
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * _activate_payment_method_button
+	 *
+	 * @access protected
+	 * @param EE_Payment_Method $payment_method
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 */
+	protected function _activate_payment_method_button(EE_Payment_Method $payment_method)
+	{
+		$link_text_and_title = sprintf(
+			esc_html__('Activate %1$s Payment Method?', 'event_espresso'),
+			$payment_method->admin_name()
+		);
+		return new EE_Form_Section_Proper(
+			array(
+				'name'            => 'activate_' . $payment_method->slug() . '_settings_form',
+				'html_id'         => 'activate_' . $payment_method->slug() . '_settings_form',
+				'action'          => '#',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections'     => apply_filters(
+					'FHEE__Payments_Admin_Page___activate_payment_method_button__form_subsections',
+					array(
+						new EE_Form_Section_HTML(
+							EEH_HTML::table(
+								EEH_HTML::tr(
+									EEH_HTML::td(
+										$payment_method->type_obj()->introductory_html(),
+										'',
+										'',
+										'',
+										'colspan="2"'
+									)
+								) .
+								EEH_HTML::tr(
+									EEH_HTML::th(
+										EEH_HTML::label(esc_html__('Click to Activate ', 'event_espresso'))
+									) .
+									EEH_HTML::td(
+										EEH_HTML::link(
+											EE_Admin_Page::add_query_args_and_nonce(
+												array(
+													'action'              => 'activate_payment_method',
+													'payment_method_type' => $payment_method->type(),
+												),
+												EE_PAYMENTS_ADMIN_URL
+											),
+											$link_text_and_title,
+											$link_text_and_title,
+											'activate_' . $payment_method->slug(),
+											'button button--primary-alt'
+										)
+									)
+								)
+							)
+						),
+					),
+					$payment_method
+				),
+			)
+		);
+	}
+
+
+	/**
+	 * _fine_print
+	 *
+	 * @access protected
+	 * @return EE_Form_Section_HTML
+	 */
+	protected function _fine_print()
+	{
+		return new EE_Form_Section_HTML(
+			EEH_HTML::table(
+				EEH_HTML::tr(
+					EEH_HTML::th() .
+					EEH_HTML::td(
+						EEH_HTML::p(esc_html__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * Activates a payment method of that type. Mostly assuming there is only 1 of that type (or none so far)
+	 *
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @global WP_User $current_user
+	 */
+	protected function _activate_payment_method()
+	{
+		if (isset($this->_req_data['payment_method_type'])) {
+			$payment_method_type = sanitize_text_field($this->_req_data['payment_method_type']);
+			// see if one exists
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$payment_method = EE_Payment_Method_Manager::instance()
+													   ->activate_a_payment_method_of_type($payment_method_type);
+			$this->_redirect_after_action(
+				1,
+				'Payment Method',
+				'activated',
+				array('action' => 'default', 'payment_method' => $payment_method->slug())
+			);
+		} else {
+			$this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
+		}
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _deactivate_payment_method()
+	{
+		if (isset($this->_req_data['payment_method'])) {
+			$payment_method_slug = sanitize_key($this->_req_data['payment_method']);
+			// deactivate it
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			$count_updated = EE_Payment_Method_Manager::instance()->deactivate_payment_method($payment_method_slug);
+			$this->_redirect_after_action(
+				$count_updated,
+				'Payment Method',
+				'deactivated',
+				array('action' => 'default', 'payment_method' => $payment_method_slug)
+			);
+		} else {
+			$this->_redirect_after_action(false, 'Payment Method', 'deactivated', array('action' => 'default'));
+		}
+	}
+
+
+	/**
+	 * Processes the payment method form that was submitted. This is slightly trickier than usual form
+	 * processing because we first need to identify WHICH form was processed and which payment method
+	 * it corresponds to. Once we have done that, we see if the form is valid. If it is, the
+	 * form's data is saved, and we redirect to the default payment methods page, setting the updated payment method
+	 * as the currently-selected one. If it DOESN'T validate, we render the page with the form's errors (in the
+	 * subsequently called 'headers_sent_func' which is _payment_methods_list)
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _update_payment_method()
+	{
+		if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			// ok let's find which gateway form to use based on the form input
+			EE_Registry::instance()->load_lib('Payment_Method_Manager');
+			/** @var $correct_pmt_form_to_use EE_Payment_Method_Form */
+			$correct_pmt_form_to_use = null;
+			$payment_method = null;
+			foreach (EEM_Payment_Method::instance()->get_all() as $payment_method) {
+				if ($payment_method instanceof EE_Payment_Method) {
+					// get the form and simplify it, like what we do when we display it
+					$pmt_form = $this->_generate_payment_method_settings_form($payment_method);
+					if ($pmt_form->form_data_present_in($this->_req_data)) {
+						$correct_pmt_form_to_use = $pmt_form;
+						break;
+					}
+				}
+			}
+			// if we couldn't find the correct payment method type...
+			if (! $correct_pmt_form_to_use) {
+				EE_Error::add_error(
+					esc_html__(
+						"We could not find which payment method type your form submission related to. Please contact support",
+						'event_espresso'
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				$this->_redirect_after_action(false, 'Payment Method', 'activated', array('action' => 'default'));
+			}
+			$correct_pmt_form_to_use->receive_form_submission($this->_req_data);
+			if ($correct_pmt_form_to_use->is_valid()) {
+				$payment_settings_subform = $correct_pmt_form_to_use->get_subsection('payment_method_settings');
+				if (! $payment_settings_subform instanceof EE_Payment_Method_Form) {
+					throw new EE_Error(
+						sprintf(
+							esc_html__(
+								'The payment method could not be saved because the form sections were misnamed. We expected to find %1$s, but did not.',
+								'event_espresso'
+							),
+							'payment_method_settings'
+						)
+					);
+				}
+				$payment_settings_subform->save();
+				/** @var $pm EE_Payment_Method */
+				$this->_redirect_after_action(
+					true,
+					'Payment Method',
+					'updated',
+					array('action' => 'default', 'payment_method' => $payment_method->slug())
+				);
+			} else {
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'Payment method of type %s was not saved because there were validation errors. They have been marked in the form',
+							'event_espresso'
+						),
+						$payment_method instanceof EE_Payment_Method ? $payment_method->type_obj()->pretty_name()
+							: esc_html__('"(unknown)"', 'event_espresso')
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * Displays payment settings (not payment METHOD settings, that's _payment_method_settings)
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _payment_settings()
+	{
+		$form = $this->getPaymentSettingsForm();
+		$this->_set_add_edit_form_tags('update_payment_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_HTML::div(
+			$form->get_html_and_js(),
+			'',
+			'padding'
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 *        _update_payment_settings
+	 *
+	 * @access protected
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _update_payment_settings()
+	{
+		$form = $this->getPaymentSettingsForm();
+		if ($form->was_submitted($this->_req_data)) {
+			$form->receive_form_submission($this->_req_data);
+			if ($form->is_valid()) {
+				/**
+				 * @var $reg_config EE_Registration_Config
+				 */
+				$loader = LoaderFactory::getLoader();
+				$reg_config = $loader->getShared('EE_Registration_Config');
+				$valid_data = $form->valid_data();
+				$reg_config->show_pending_payment_options = $valid_data['show_pending_payment_options'];
+				$reg_config->gateway_log_lifespan = $valid_data['gateway_log_lifespan'];
+			}
+		}
+		EE_Registry::instance()->CFG = apply_filters(
+			'FHEE__Payments_Admin_Page___update_payment_settings__CFG',
+			EE_Registry::instance()->CFG
+		);
+
+		$what = esc_html__('Payment Settings', 'event_espresso');
+		$success = $this->_update_espresso_configuration(
+			$what,
+			EE_Registry::instance()->CFG,
+			__FILE__,
+			__FUNCTION__,
+			__LINE__
+		);
+		$this->_redirect_after_action(
+			$success,
+			$what,
+			esc_html__('updated', 'event_espresso'),
+			array('action' => 'payment_settings')
+		);
+	}
+
+
+	/**
+	 * Gets the form used for updating payment settings
+	 *
+	 * @return EE_Form_Section_Proper
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function getPaymentSettingsForm()
+	{
+		/**
+		 * @var $reg_config EE_Registration_Config
+		 */
+		$reg_config = LoaderFactory::getLoader()->getShared('EE_Registration_Config');
+		return new EE_Form_Section_Proper(
+			array(
+				'name' => 'payment-settings',
+				'layout_strategy' => new EE_Admin_Two_Column_Layout(),
+				'subsections' => array(
+					'show_pending_payment_options' => new EE_Yes_No_Input(
+						array(
+							'html_name' => 'show_pending_payment_options',
+							'default' => $reg_config->show_pending_payment_options,
+							'html_help_text' => esc_html__(
+								"If a payment is marked as 'Pending Payment', or if payment is deferred (ie, an offline gateway like Check, Bank, or Invoice is used), then give registrants the option to retry payment. ",
+								'event_espresso'
+							)
+						)
+					),
+					'gateway_log_lifespan' => new EE_Select_Input(
+						$reg_config->gatewayLogLifespanOptions(),
+						array(
+							'html_label_text' => esc_html__('Gateway Logs Lifespan', 'event_espresso'),
+							'html_help_text' => esc_html__('If issues arise with payments being made through a payment gateway, it\'s helpful to log non-sensitive communications with the payment gateway. But it\'s a security responsibility, so it\'s a good idea to not keep them for any longer than necessary.', 'event_espresso'),
+							'default' => $reg_config->gateway_log_lifespan,
+						)
+					)
+				)
+			)
+		);
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 */
+	protected function _payment_log_overview_list_table()
+	{
+		$this->display_admin_list_table_page_with_sidebar();
+	}
+
+
+	protected function _set_list_table_views_payment_log()
+	{
+		$this->_views = array(
+			'all' => array(
+				'slug'  => 'all',
+				'label' => esc_html__('View All Logs', 'event_espresso'),
+				'count' => 0,
+			),
+		);
+	}
+
+
+	/**
+	 * @param int  $per_page
+	 * @param int  $current_page
+	 * @param bool $count
+	 * @return array|int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function get_payment_logs($per_page = 50, $current_page = 0, $count = false)
+	{
+		EE_Registry::instance()->load_model('Change_Log');
+		// we may need to do multiple queries (joining differently), so we actually want an array of query params
+		$query_params = array(array('LOG_type' => EEM_Change_Log::type_gateway));
+		// check if they've selected a specific payment method
+		if (isset($this->_req_data['_payment_method']) && $this->_req_data['_payment_method'] !== 'all') {
+			$query_params[0]['OR*pm_or_pay_pm'] = array(
+				'Payment.Payment_Method.PMD_ID' => $this->_req_data['_payment_method'],
+				'Payment_Method.PMD_ID'         => $this->_req_data['_payment_method'],
+			);
+		}
+		// take into account search
+		if (isset($this->_req_data['s']) && $this->_req_data['s']) {
+			$similarity_string = array('LIKE', '%' . str_replace("", "%", $this->_req_data['s']) . '%');
+			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Payment_Method.PMD_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Payment_Method.PMD_admin_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment.Payment_Method.PMD_type'] = $similarity_string;
+			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment_Method.PMD_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment_Method.PMD_admin_name'] = $similarity_string;
+			$query_params[0]['OR*s']['Payment_Method.PMD_type'] = $similarity_string;
+			$query_params[0]['OR*s']['LOG_message'] = $similarity_string;
+		}
+		if (
+			isset($this->_req_data['payment-filter-start-date'])
+			&& isset($this->_req_data['payment-filter-end-date'])
+		) {
+			// add date
+			$start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
+			$end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
+			// make sure our timestamps start and end right at the boundaries for each day
+			$start_date = date('Y-m-d', strtotime($start_date)) . ' 00:00:00';
+			$end_date = date('Y-m-d', strtotime($end_date)) . ' 23:59:59';
+			// convert to timestamps
+			$start_date = strtotime($start_date);
+			$end_date = strtotime($end_date);
+			// makes sure start date is the lowest value and vice versa
+			$start_date = min($start_date, $end_date);
+			$end_date = max($start_date, $end_date);
+			// convert for query
+			$start_date = EEM_Change_Log::instance()->convert_datetime_for_query(
+				'LOG_time',
+				date('Y-m-d H:i:s', $start_date),
+				'Y-m-d H:i:s'
+			);
+			$end_date   = EEM_Change_Log::instance()->convert_datetime_for_query(
+				'LOG_time',
+				date('Y-m-d H:i:s', $end_date),
+				'Y-m-d H:i:s'
+			);
+			$query_params[0]['LOG_time'] = array('BETWEEN', array($start_date, $end_date));
+		}
+		if ($count) {
+			return EEM_Change_Log::instance()->count($query_params);
+		}
+		if (isset($this->_req_data['order'])) {
+			$sort = (isset($this->_req_data['order']) && ! empty($this->_req_data['order']))
+				? $this->_req_data['order']
+				: 'DESC';
+			$query_params['order_by'] = array('LOG_time' => $sort);
+		} else {
+			$query_params['order_by'] = array('LOG_time' => 'DESC');
+		}
+		$offset = ($current_page - 1) * $per_page;
+		if (! isset($this->_req_data['download_results'])) {
+			$query_params['limit'] = array($offset, $per_page);
+		}
+		// now they've requested to instead just download the file instead of viewing it.
+		if (isset($this->_req_data['download_results'])) {
+			$wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
+			header('Content-Disposition: attachment');
+			header("Content-Disposition: attachment; filename=ee_payment_logs_for_" . sanitize_key(site_url()));
+			echo '<h1> '
+				. sprintf(
+					esc_html__('Payment Logs for %1$s', 'event_espresso'),
+					esc_url_raw(site_url())
+				)
+				. '</h1 >';
+			echo '<h3>' . esc_html__('Query:', 'event_espresso') . '</h3>';
+			echo esc_html(var_export($query_params, true));
+			echo '<h3>' . esc_html__('Results:', 'event_espresso') . '</h3>';
+			echo esc_html(var_export($wpdb_results, true));
+			die;
+		}
+		return EEM_Change_Log::instance()->get_all($query_params);
+	}
+
+
+	/**
+	 * Used by usort to RE-sort log query results, because we lose the ordering
+	 * because we're possibly combining the results from two queries
+	 *
+	 * @param EE_Change_Log $logA
+	 * @param EE_Change_Log $logB
+	 * @return int
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _sort_logs_again($logA, $logB)
+	{
+		$timeA = $logA->get_raw('LOG_time');
+		$timeB = $logB->get_raw('LOG_time');
+		if ($timeA == $timeB) {
+			return 0;
+		}
+		$comparison = $timeA < $timeB ? -1 : 1;
+		if (strtoupper($this->_sort_logs_again_direction) == 'DESC') {
+			return $comparison * -1;
+		}
+		return $comparison;
+	}
+
+
+	/**
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	protected function _payment_log_details()
+	{
+		EE_Registry::instance()->load_model('Change_Log');
+		/** @var $payment_log EE_Change_Log */
+		$payment_log = EEM_Change_Log::instance()->get_one_by_ID($this->_req_data['ID']);
+		$payment_method = null;
+		$transaction = null;
+		if ($payment_log instanceof EE_Change_Log) {
+			if ($payment_log->object() instanceof EE_Payment) {
+				$payment_method = $payment_log->object()->payment_method();
+				$transaction = $payment_log->object()->transaction();
+			} elseif ($payment_log->object() instanceof EE_Payment_Method) {
+				$payment_method = $payment_log->object();
+			} elseif ($payment_log->object() instanceof EE_Transaction) {
+				$transaction = $payment_log->object();
+				$payment_method = $transaction->payment_method();
+			}
+		}
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+			array(
+				'payment_log'    => $payment_log,
+				'payment_method' => $payment_method,
+				'transaction'    => $transaction,
+			),
+			true
+		);
+		$this->display_admin_page_with_no_sidebar();
+	}
 }

Spacing +40 added lines, -40 removed lines

@@ -198,10 +198,10 @@ 
             foreach ($payment_method_type->help_tabs_config() as $help_tab_name => $config) {
                 $template_args = isset($config['template_args']) ? $config['template_args'] : array();
                 $template_args['admin_page_obj'] = $this;
-                $all_pmt_help_tabs_config[ $help_tab_name ] = array(
+                $all_pmt_help_tabs_config[$help_tab_name] = array(
                     'title'   => $config['title'],
                     'content' => EEH_Template::display_template(
-                        $payment_method_type->file_folder() . 'help_tabs/' . $config['filename'] . '.help_tab.php',
+                        $payment_method_type->file_folder().'help_tabs/'.$config['filename'].'.help_tab.php',
                         $template_args,
                         true
                     ),
@@ -244,7 +244,7 @@ 
         wp_enqueue_style('espresso-ui-theme');
         wp_register_style(
             'espresso_payments',
-            EE_PAYMENTS_ASSETS_URL . 'ee-payments.css',
+            EE_PAYMENTS_ASSETS_URL.'ee-payments.css',
             [],
             EVENT_ESPRESSO_VERSION
         );
@@ -253,7 +253,7 @@ 
         wp_enqueue_script('ee-text-links');
         wp_enqueue_script(
             'espresso_payments',
-            EE_PAYMENTS_ASSETS_URL . 'espresso_payments_admin.js',
+            EE_PAYMENTS_ASSETS_URL.'espresso_payments_admin.js',
             ['ee-datepicker'],
             EVENT_ESPRESSO_VERSION,
             true
@@ -308,7 +308,7 @@ 
             }
             // check for any active pms of that type
             $payment_method = EEM_Payment_Method::instance()->get_one_of_type($pmt_obj->system_name());
-            if (! $payment_method instanceof EE_Payment_Method) {
+            if ( ! $payment_method instanceof EE_Payment_Method) {
                 $payment_method = EE_Payment_Method::new_instance(
                     array(
                         'PMD_slug'       => sanitize_key($pmt_obj->system_name()),
@@ -318,7 +318,7 @@ 
                     )
                 );
             }
-            $payment_methods[ $payment_method->slug() ] = $payment_method;
+            $payment_methods[$payment_method->slug()] = $payment_method;
         }
         $payment_methods = apply_filters(
             'FHEE__Payments_Admin_Page___payment_methods_list__payment_methods',
@@ -328,7 +328,7 @@ 
             if ($payment_method instanceof EE_Payment_Method) {
                 $this->addMetaBox(
                     // html id
-                    'espresso_' . $payment_method->slug() . '_payment_settings',
+                    'espresso_'.$payment_method->slug().'_payment_settings',
                     // title
                     sprintf(esc_html__('%s Settings', 'event_espresso'), $payment_method->admin_name()),
                     // callback
@@ -343,10 +343,10 @@ 
                     array('payment_method' => $payment_method)
                 );
                 // setup for tabbed content
-                $tabs[ $payment_method->slug() ] = array(
+                $tabs[$payment_method->slug()] = array(
                     'label' => $payment_method->admin_name(),
                     'class' => $payment_method->active() ? 'gateway-active' : '',
-                    'href'  => 'espresso_' . $payment_method->slug() . '_payment_settings',
+                    'href'  => 'espresso_'.$payment_method->slug().'_payment_settings',
                     'title' => esc_html__('Modify this Payment Method', 'event_espresso'),
                     'slug'  => $payment_method->slug(),
                     'icon'  => $payment_method->active()
@@ -382,7 +382,7 @@ 
         /** @var EE_Payment_Method $payment_method */
         $payment_method = EEM_Payment_Method::instance()->get_one(array(array('PMD_slug' => $payment_method_slug)));
         // if that didn't work or wasn't provided, find another way to select the current pm
-        if (! $this->_verify_payment_method($payment_method)) {
+        if ( ! $this->_verify_payment_method($payment_method)) {
             // like, looking for an active one
             $payment_method = EEM_Payment_Method::instance()->get_one_active('CART');
             // test that one as well
@@ -434,7 +434,7 @@ 
     {
         $payment_method = isset($metabox['args'], $metabox['args']['payment_method'])
             ? $metabox['args']['payment_method'] : null;
-        if (! $payment_method instanceof EE_Payment_Method) {
+        if ( ! $payment_method instanceof EE_Payment_Method) {
             throw new EE_Error(
                 esc_html__(
                     'Payment method metabox setup incorrectly. No Payment method object was supplied',
@@ -449,7 +449,7 @@ 
             if ($form->form_data_present_in($this->_req_data)) {
                 $form->receive_form_submission($this->_req_data);
             }
-            echo wp_kses($form->form_open() . $form->get_html_and_js() . $form->form_close(), AllowedTags::getWithFormTags());
+            echo wp_kses($form->form_open().$form->get_html_and_js().$form->form_close(), AllowedTags::getWithFormTags());
         } else {
             echo wp_kses($this->_activate_payment_method_button($payment_method)->get_html_and_js(), AllowedTags::getWithFormTags());
         }
@@ -466,7 +466,7 @@ 
      */
     protected function _generate_payment_method_settings_form(EE_Payment_Method $payment_method = null)
     {
-        if (! $payment_method instanceof EE_Payment_Method) {
+        if ( ! $payment_method instanceof EE_Payment_Method) {
             return new EE_Form_Section_Proper();
         }
         $subsections = apply_filters(
@@ -483,8 +483,8 @@ 
         );
         return new EE_Form_Section_Proper(
             array(
-                'name'            => $payment_method->slug() . '_settings_form',
-                'html_id'         => $payment_method->slug() . '_settings_form',
+                'name'            => $payment_method->slug().'_settings_form',
+                'html_id'         => $payment_method->slug().'_settings_form',
                 'action'          => EE_Admin_Page::add_query_args_and_nonce(
                     array(
                         'action'         => 'update_payment_method',
@@ -509,7 +509,7 @@ 
      */
     protected function _pci_dss_compliance(EE_Payment_Method $payment_method): ?EE_Form_Section_HTML
     {
-        if (!$payment_method->type_obj()->requires_https()) {
+        if ( ! $payment_method->type_obj()->requires_https()) {
             return null;
         }
         return new EE_Form_Section_HTML(
@@ -523,7 +523,7 @@ 
                                 'important-notice'
                             )
                         )
-                    ) .
+                    ).
                     EEH_HTML::td(
                         EEH_HTML::strong(
                             esc_html__(
@@ -570,7 +570,7 @@ 
                                 'important-notice'
                             )
                         )
-                    ) .
+                    ).
                     EEH_HTML::td(
                         EEH_HTML::strong(
                             sprintf(
@@ -650,7 +650,7 @@ 
         $update_button = new EE_Submit_Input(
             array(
                 'name'       => 'submit',
-                'html_id'    => 'save_' . $payment_method->slug() . '_settings',
+                'html_id'    => 'save_'.$payment_method->slug().'_settings',
                 'default'    => sprintf(
                     esc_html__('Update %s Payment Settings', 'event_espresso'),
                     $payment_method->admin_name()
@@ -660,9 +660,9 @@ 
         );
         return new EE_Form_Section_HTML(
             EEH_HTML::table(
-                EEH_HTML::no_row(EEH_HTML::br(2)) .
+                EEH_HTML::no_row(EEH_HTML::br(2)).
                 EEH_HTML::tr(
-                    EEH_HTML::th(esc_html__('Update Settings', 'event_espresso')) .
+                    EEH_HTML::th(esc_html__('Update Settings', 'event_espresso')).
                     EEH_HTML::td(
                         $update_button->get_html_for_input()
                     )
@@ -688,7 +688,7 @@ 
         return new EE_Form_Section_HTML(
             EEH_HTML::table(
                 EEH_HTML::tr(
-                    EEH_HTML::th(esc_html__('Deactivate Payment Method', 'event_espresso')) .
+                    EEH_HTML::th(esc_html__('Deactivate Payment Method', 'event_espresso')).
                     EEH_HTML::td(
                         EEH_HTML::link(
                             EE_Admin_Page::add_query_args_and_nonce(
@@ -700,7 +700,7 @@ 
                             ),
                             $link_text_and_title,
                             $link_text_and_title,
-                            'deactivate_' . $payment_method->slug(),
+                            'deactivate_'.$payment_method->slug(),
                             'button button--secondary'
                         )
                     )
@@ -726,8 +726,8 @@ 
         );
         return new EE_Form_Section_Proper(
             array(
-                'name'            => 'activate_' . $payment_method->slug() . '_settings_form',
-                'html_id'         => 'activate_' . $payment_method->slug() . '_settings_form',
+                'name'            => 'activate_'.$payment_method->slug().'_settings_form',
+                'html_id'         => 'activate_'.$payment_method->slug().'_settings_form',
                 'action'          => '#',
                 'layout_strategy' => new EE_Admin_Two_Column_Layout(),
                 'subsections'     => apply_filters(
@@ -743,11 +743,11 @@ 
                                         '',
                                         'colspan="2"'
                                     )
-                                ) .
+                                ).
                                 EEH_HTML::tr(
                                     EEH_HTML::th(
                                         EEH_HTML::label(esc_html__('Click to Activate ', 'event_espresso'))
-                                    ) .
+                                    ).
                                     EEH_HTML::td(
                                         EEH_HTML::link(
                                             EE_Admin_Page::add_query_args_and_nonce(
@@ -759,7 +759,7 @@ 
                                             ),
                                             $link_text_and_title,
                                             $link_text_and_title,
-                                            'activate_' . $payment_method->slug(),
+                                            'activate_'.$payment_method->slug(),
                                             'button button--primary-alt'
                                         )
                                     )
@@ -785,7 +785,7 @@ 
         return new EE_Form_Section_HTML(
             EEH_HTML::table(
                 EEH_HTML::tr(
-                    EEH_HTML::th() .
+                    EEH_HTML::th().
                     EEH_HTML::td(
                         EEH_HTML::p(esc_html__('All fields marked with a * are required fields', 'event_espresso'), '', 'grey-text')
                     )
@@ -876,7 +876,7 @@ 
                 }
             }
             // if we couldn't find the correct payment method type...
-            if (! $correct_pmt_form_to_use) {
+            if ( ! $correct_pmt_form_to_use) {
                 EE_Error::add_error(
                     esc_html__(
                         "We could not find which payment method type your form submission related to. Please contact support",
@@ -891,7 +891,7 @@ 
             $correct_pmt_form_to_use->receive_form_submission($this->_req_data);
             if ($correct_pmt_form_to_use->is_valid()) {
                 $payment_settings_subform = $correct_pmt_form_to_use->get_subsection('payment_method_settings');
-                if (! $payment_settings_subform instanceof EE_Payment_Method_Form) {
+                if ( ! $payment_settings_subform instanceof EE_Payment_Method_Form) {
                     throw new EE_Error(
                         sprintf(
                             esc_html__(
@@ -1086,7 +1086,7 @@ 
         }
         // take into account search
         if (isset($this->_req_data['s']) && $this->_req_data['s']) {
-            $similarity_string = array('LIKE', '%' . str_replace("", "%", $this->_req_data['s']) . '%');
+            $similarity_string = array('LIKE', '%'.str_replace("", "%", $this->_req_data['s']).'%');
             $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_fname'] = $similarity_string;
             $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_lname'] = $similarity_string;
             $query_params[0]['OR*s']['Payment.Transaction.Registration.Attendee.ATT_email'] = $similarity_string;
@@ -1107,8 +1107,8 @@ 
             $start_date = wp_strip_all_tags($this->_req_data['payment-filter-start-date']);
             $end_date = wp_strip_all_tags($this->_req_data['payment-filter-end-date']);
             // make sure our timestamps start and end right at the boundaries for each day
-            $start_date = date('Y-m-d', strtotime($start_date)) . ' 00:00:00';
-            $end_date = date('Y-m-d', strtotime($end_date)) . ' 23:59:59';
+            $start_date = date('Y-m-d', strtotime($start_date)).' 00:00:00';
+            $end_date = date('Y-m-d', strtotime($end_date)).' 23:59:59';
             // convert to timestamps
             $start_date = strtotime($start_date);
             $end_date = strtotime($end_date);
@@ -1121,7 +1121,7 @@ 
                 date('Y-m-d H:i:s', $start_date),
                 'Y-m-d H:i:s'
             );
-            $end_date   = EEM_Change_Log::instance()->convert_datetime_for_query(
+            $end_date = EEM_Change_Log::instance()->convert_datetime_for_query(
                 'LOG_time',
                 date('Y-m-d H:i:s', $end_date),
                 'Y-m-d H:i:s'
@@ -1140,23 +1140,23 @@ 
             $query_params['order_by'] = array('LOG_time' => 'DESC');
         }
         $offset = ($current_page - 1) * $per_page;
-        if (! isset($this->_req_data['download_results'])) {
+        if ( ! isset($this->_req_data['download_results'])) {
             $query_params['limit'] = array($offset, $per_page);
         }
         // now they've requested to instead just download the file instead of viewing it.
         if (isset($this->_req_data['download_results'])) {
             $wpdb_results = EEM_Change_Log::instance()->get_all_efficiently($query_params);
             header('Content-Disposition: attachment');
-            header("Content-Disposition: attachment; filename=ee_payment_logs_for_" . sanitize_key(site_url()));
+            header("Content-Disposition: attachment; filename=ee_payment_logs_for_".sanitize_key(site_url()));
             echo '<h1> '
                 . sprintf(
                     esc_html__('Payment Logs for %1$s', 'event_espresso'),
                     esc_url_raw(site_url())
                 )
                 . '</h1 >';
-            echo '<h3>' . esc_html__('Query:', 'event_espresso') . '</h3>';
+            echo '<h3>'.esc_html__('Query:', 'event_espresso').'</h3>';
             echo esc_html(var_export($query_params, true));
-            echo '<h3>' . esc_html__('Results:', 'event_espresso') . '</h3>';
+            echo '<h3>'.esc_html__('Results:', 'event_espresso').'</h3>';
             echo esc_html(var_export($wpdb_results, true));
             die;
         }
@@ -1212,7 +1212,7 @@ 
             }
         }
         $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            EE_PAYMENTS_TEMPLATE_PATH . 'payment_log_details.template.php',
+            EE_PAYMENTS_TEMPLATE_PATH.'payment_log_details.template.php',
             array(
                 'payment_log'    => $payment_log,
                 'payment_method' => $payment_method,