eventespresso / event-espresso-core

languages/event_espresso-translations-js.php

Spacing +710 added lines, -710 removed lines

@@ -2,137 +2,137 @@ 
 /* THIS IS A GENERATED FILE. DO NOT EDIT DIRECTLY. */
 $generated_i18n_strings = array(
 	// Reference: packages/ui-components/src/Pagination/constants.ts:6
-	__( '2', 'event_espresso' ),
+	__('2', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:7
-	__( '6', 'event_espresso' ),
+	__('6', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:8
-	__( '12', 'event_espresso' ),
+	__('12', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:9
-	__( '24', 'event_espresso' ),
+	__('24', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:10
-	__( '48', 'event_espresso' ),
+	__('48', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/AvatarImage.tsx:27
-	__( 'contact avatar', 'event_espresso' ),
+	__('contact avatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/OrderByControl.tsx:12
-	__( 'Order by', 'event_espresso' ),
+	__('Order by', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/RegStatusControl.tsx:17
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectStatus.tsx:13
-	__( 'Select Registration Status', 'event_espresso' ),
+	__('Select Registration Status', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:14
-	__( 'Ascending', 'event_espresso' ),
+	__('Ascending', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:18
-	__( 'Descending', 'event_espresso' ),
+	__('Descending', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/components/SortOrderControl.tsx:24
-	__( 'Sort order:', 'event_espresso' ),
+	__('Sort order:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:41
-	__( 'There was some error fetching attendees list', 'event_espresso' ),
+	__('There was some error fetching attendees list', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:47
-	__( 'To get started, select what event you want to show attendees from in the block settings.', 'event_espresso' ),
+	__('To get started, select what event you want to show attendees from in the block settings.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/AttendeesDisplay.tsx:53
-	__( 'There are no attendees for selected options.', 'event_espresso' ),
+	__('There are no attendees for selected options.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:12
-	__( 'Display on Archives', 'event_espresso' ),
+	__('Display on Archives', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:17
-	__( 'Attendees are shown whenever this post is listed in an archive view.', 'event_espresso' ),
+	__('Attendees are shown whenever this post is listed in an archive view.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/ArchiveSettings.tsx:18
-	__( 'Attendees are hidden whenever this post is listed in an archive view.', 'event_espresso' ),
+	__('Attendees are hidden whenever this post is listed in an archive view.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/AttendeeLimit.tsx:29
-	__( 'Number of Attendees to Display:', 'event_espresso' ),
+	__('Number of Attendees to Display:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/AttendeeLimit.tsx:34
 	/* translators: %d attendees count */
-	_n_noop( 'Used to adjust the number of attendees displayed (There is %d total attendee for the current filter settings).', 'Used to adjust the number of attendees displayed (There are %d total attendees for the current filter settings).', 'event_espresso' ),
+	_n_noop('Used to adjust the number of attendees displayed (There is %d total attendee for the current filter settings).', 'Used to adjust the number of attendees displayed (There are %d total attendees for the current filter settings).', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:27
-	__( 'Display Gravatar', 'event_espresso' ),
+	__('Display Gravatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:32
-	__( 'Gravatar images are shown for each attendee.', 'event_espresso' ),
+	__('Gravatar images are shown for each attendee.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:33
-	__( 'No gravatar images are shown for each attendee.', 'event_espresso' ),
+	__('No gravatar images are shown for each attendee.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/GravatarSettings.tsx:38
-	__( 'Size of Gravatar', 'event_espresso' ),
+	__('Size of Gravatar', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectDatetime.tsx:22
-	__( 'Select Datetime', 'event_espresso' ),
+	__('Select Datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectEvent.tsx:22
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectEvent.tsx:22
-	__( 'Select Event', 'event_espresso' ),
+	__('Select Event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:11
-	__( 'Attendee id', 'event_espresso' ),
+	__('Attendee id', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:15
-	__( 'Last name only', 'event_espresso' ),
+	__('Last name only', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:19
-	__( 'First name only', 'event_espresso' ),
+	__('First name only', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:23
-	__( 'First, then Last name', 'event_espresso' ),
+	__('First, then Last name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:27
-	__( 'Last, then First name', 'event_espresso' ),
+	__('Last, then First name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectOrderBy.tsx:41
-	__( 'Order Attendees by:', 'event_espresso' ),
+	__('Order Attendees by:', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/SelectTicket.tsx:22
-	__( 'Select Ticket', 'event_espresso' ),
+	__('Select Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:21
-	__( 'Filter By Settings', 'event_espresso' ),
+	__('Filter By Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:36
-	__( 'Gravatar Setttings', 'event_espresso' ),
+	__('Gravatar Setttings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/controls/index.tsx:39
-	__( 'Archive Settings', 'event_espresso' ),
+	__('Archive Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:10
-	__( 'Event Attendees', 'event_espresso' ),
+	__('Event Attendees', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:11
-	__( 'Displays a list of people that have registered for the specified event', 'event_espresso' ),
+	__('Displays a list of people that have registered for the specified event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:12
 	// Reference: packages/edtr-services/src/constants.ts:25
-	__( 'event', 'event_espresso' ),
+	__('event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
-	__( 'attendees', 'event_espresso' ),
+	__('attendees', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event-attendees/index.tsx:14
-	__( 'list', 'event_espresso' ),
+	__('list', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/DisplayField.tsx:41
-	__( 'An unknown error occurred while fetching event details.', 'event_espresso' ),
+	__('An unknown error occurred while fetching event details.', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:10
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:24
 	// Reference: packages/utils/src/list/index.ts:14
-	__( 'Select…', 'event_espresso' ),
+	__('Select…', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:15
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:75
@@ -141,7 +141,7 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:198
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:48
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:42
-	__( 'Name', 'event_espresso' ),
+	__('Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:19
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:80
@@ -149,407 +149,407 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:203
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:54
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:47
-	__( 'Description', 'event_espresso' ),
+	__('Description', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:23
-	__( 'Short description', 'event_espresso' ),
+	__('Short description', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/SelectField.tsx:35
-	__( 'Select Field', 'event_espresso' ),
+	__('Select Field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:27
-	__( 'Text Color', 'event_espresso' ),
+	__('Text Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:32
-	__( 'Background Color', 'event_espresso' ),
+	__('Background Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:41
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:22
 	// Reference: packages/form-builder/src/FormSection/Tabs/FormSectionTabs.tsx:21
-	__( 'Settings', 'event_espresso' ),
+	__('Settings', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:45
-	__( 'Typography', 'event_espresso' ),
+	__('Typography', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/controls/index.tsx:48
-	__( 'Color', 'event_espresso' ),
+	__('Color', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:12
-	__( 'field', 'event_espresso' ),
+	__('field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:8
-	__( 'Event Field', 'event_espresso' ),
+	__('Event Field', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/event/index.tsx:9
-	__( 'Displays the selected field of an event', 'event_espresso' ),
+	__('Displays the selected field of an event', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:17
-	__( 'Error', 'event_espresso' ),
+	__('Error', 'event_espresso'),
 
 	// Reference: domains/core/admin/blocks/src/services/utils.ts:9
-	__( 'Loading…', 'event_espresso' ),
+	__('Loading…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventDescription.tsx:33
-	__( 'Event Description', 'event_espresso' ),
+	__('Event Description', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/ActiveStatus.tsx:28
-	__( 'Active status', 'event_espresso' ),
+	__('Active status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/AltRegPage.tsx:12
-	__( 'Alternative Registration Page', 'event_espresso' ),
+	__('Alternative Registration Page', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/DefaultRegistrationStatus.tsx:25
-	__( 'Default Registration Status', 'event_espresso' ),
+	__('Default Registration Status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/Donations.tsx:8
-	__( 'Donations Enabled', 'event_espresso' ),
+	__('Donations Enabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/Donations.tsx:8
-	__( 'Donations Disabled', 'event_espresso' ),
+	__('Donations Disabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/EventManager.tsx:16
-	__( 'Event Manager', 'event_espresso' ),
+	__('Event Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/EventPhoneNumber.tsx:15
-	__( 'Event Phone Number', 'event_espresso' ),
+	__('Event Phone Number', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/MaxRegistrations.tsx:13
-	__( 'Max Registrations per Transaction', 'event_espresso' ),
+	__('Max Registrations per Transaction', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/TicketSelector.tsx:8
-	__( 'Ticket Selector Enabled', 'event_espresso' ),
+	__('Ticket Selector Enabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/TicketSelector.tsx:8
-	__( 'Ticket Selector Disabled', 'event_espresso' ),
+	__('Ticket Selector Disabled', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/index.tsx:41
-	__( 'Event Details', 'event_espresso' ),
+	__('Event Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/EventRegistrationOptions/index.tsx:47
-	__( 'Registration Options', 'event_espresso' ),
+	__('Registration Options', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:10
-	__( 'primary information about the date', 'event_espresso' ),
+	__('primary information about the date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:10
-	__( 'Date Details', 'event_espresso' ),
+	__('Date Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:11
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:16
-	__( 'relations between tickets and dates', 'event_espresso' ),
+	__('relations between tickets and dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/DateFormSteps.tsx:11
-	__( 'Assign Tickets', 'event_espresso' ),
+	__('Assign Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/FooterButtons.tsx:22
-	__( 'Save and assign tickets', 'event_espresso' ),
+	__('Save and assign tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:30
 	/* translators: %d database id */
-	__( 'Edit datetime %s', 'event_espresso' ),
+	__('Edit datetime %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:33
-	__( 'New Datetime', 'event_espresso' ),
+	__('New Datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/multiStep/Modal.tsx:43
-	__( 'modal for datetime', 'event_espresso' ),
+	__('modal for datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:110
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:107
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:233
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:106
-	__( 'Details', 'event_espresso' ),
+	__('Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:114
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:111
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:83
-	__( 'Capacity', 'event_espresso' ),
+	__('Capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:119
-	__( 'The maximum number of registrants that can attend the event at this particular date.', 'event_espresso' ),
+	__('The maximum number of registrants that can attend the event at this particular date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:123
-	__( 'Set to 0 to close registration or leave blank for no limit.', 'event_espresso' ),
+	__('Set to 0 to close registration or leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:129
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:171
-	__( 'Trash', 'event_espresso' ),
+	__('Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:71
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:194
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:44
-	__( 'Basics', 'event_espresso' ),
+	__('Basics', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:88
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:62
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:62
-	__( 'Dates', 'event_espresso' ),
+	__('Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:92
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:53
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:215
-	__( 'Start Date', 'event_espresso' ),
+	__('Start Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/dateForm/useDateFormConfig.ts:99
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:67
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:222
-	__( 'End Date', 'event_espresso' ),
+	__('End Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DateRegistrationsLink.tsx:13
-	__( 'view ALL registrations for this date.', 'event_espresso' ),
+	__('view ALL registrations for this date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DateSoldLink.tsx:13
-	__( 'view approved registrations for this date.', 'event_espresso' ),
+	__('view approved registrations for this date.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesList.tsx:35
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/TableView.tsx:33
-	__( 'Event Dates', 'event_espresso' ),
+	__('Event Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesList.tsx:38
-	__( 'loading event dates…', 'event_espresso' ),
+	__('loading event dates…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesListButtons.tsx:22
-	__( 'Add a date or a ticket in order to use Ticket Assignment Manager', 'event_espresso' ),
+	__('Add a date or a ticket in order to use Ticket Assignment Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/DatesListButtons.tsx:32
-	__( 'Ticket Assignments', 'event_espresso' ),
+	__('Ticket Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:25
-	__( 'Number of related tickets', 'event_espresso' ),
+	__('Number of related tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:26
-	__( 'There are no tickets assigned to this datetime. Please click the ticket icon to update the assignments.', 'event_espresso' ),
+	__('There are no tickets assigned to this datetime. Please click the ticket icon to update the assignments.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/AssignTicketsButton.tsx:34
-	__( 'assign tickets', 'event_espresso' ),
+	__('assign tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:21
-	__( 'event datetime main menu', 'event_espresso' ),
+	__('event datetime main menu', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:33
-	__( 'edit datetime', 'event_espresso' ),
+	__('edit datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DateMainMenu.tsx:34
-	__( 'copy datetime', 'event_espresso' ),
+	__('copy datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:48
-	__( 'delete permanently', 'event_espresso' ),
+	__('delete permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:15
-	__( 'trash datetime', 'event_espresso' ),
+	__('trash datetime', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:18
-	__( 'Permanently Delete Datetime?', 'event_espresso' ),
+	__('Permanently Delete Datetime?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:18
-	__( 'Move Datetime to Trash?', 'event_espresso' ),
+	__('Move Datetime to Trash?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:20
-	__( 'Are you sure you want to permanently delete this datetime? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to permanently delete this datetime? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:23
-	__( 'Are you sure you want to move this datetime to the trash? You can "untrash" this datetime later if you need to.', 'event_espresso' ),
+	__('Are you sure you want to move this datetime to the trash? You can "untrash" this datetime later if you need to.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/actionsMenu/dropdown/DeleteDatetime.tsx:33
-	__( 'delete', 'event_espresso' ),
+	__('delete', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:36
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:42
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:43
-	__( 'bulk actions', 'event_espresso' ),
+	__('bulk actions', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:40
-	__( 'edit datetime details', 'event_espresso' ),
+	__('edit datetime details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:44
-	__( 'delete datetimes', 'event_espresso' ),
+	__('delete datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/actions/Actions.tsx:44
-	__( 'trash datetimes', 'event_espresso' ),
+	__('trash datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:14
-	__( 'Are you sure you want to permanently delete these datetimes? This action can NOT be undone!', 'event_espresso' ),
+	__('Are you sure you want to permanently delete these datetimes? This action can NOT be undone!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:15
-	__( 'Are you sure you want to trash these datetimes?', 'event_espresso' ),
+	__('Are you sure you want to trash these datetimes?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:16
-	__( 'Delete datetimes permanently', 'event_espresso' ),
+	__('Delete datetimes permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/delete/Delete.tsx:16
-	__( 'Trash datetimes', 'event_espresso' ),
+	__('Trash datetimes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/EditDetails.tsx:21
-	__( 'Bulk edit date details', 'event_espresso' ),
+	__('Bulk edit date details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/EditDetails.tsx:22
-	__( 'any changes will be applied to ALL of the selected dates.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected dates.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/formValidation.ts:12
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/formValidation.ts:12
-	__( 'Name must be at least three characters', 'event_espresso' ),
+	__('Name must be at least three characters', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:66
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:66
-	__( 'Shift dates', 'event_espresso' ),
+	__('Shift dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:91
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:90
-	__( 'earlier', 'event_espresso' ),
+	__('earlier', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/bulkEdit/details/useBulkEditFormConfig.ts:95
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:94
-	__( 'later', 'event_espresso' ),
+	__('later', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCapacity.tsx:31
 	/* translators: click to edit capacity<linebreak>(registration limit)… */
-	__( 'click to edit capacity%s(registration limit)…', 'event_espresso' ),
+	__('click to edit capacity%s(registration limit)…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:31
 	// Reference: packages/ee-components/src/SimpleTicketCard/SimpleTicketCard.tsx:27
 	// Reference: packages/ui-components/src/CalendarDateSwitcher/CalendarDateSwitcher.tsx:34
-	__( 'starts', 'event_espresso' ),
+	__('starts', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
 	// Reference: packages/ee-components/src/SimpleTicketCard/SimpleTicketCard.tsx:34
 	// Reference: packages/ui-components/src/CalendarDateSwitcher/CalendarDateSwitcher.tsx:47
-	__( 'ends', 'event_espresso' ),
+	__('ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
-	__( 'started', 'event_espresso' ),
+	__('started', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:32
-	__( 'ended', 'event_espresso' ),
+	__('ended', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:46
-	__( 'Edit Event Date', 'event_espresso' ),
+	__('Edit Event Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateCardSidebar.tsx:50
-	__( 'edit start and end dates', 'event_espresso' ),
+	__('edit start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:16
-	__( 'sold', 'event_espresso' ),
+	__('sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:21
-	__( 'capacity', 'event_espresso' ),
+	__('capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/DateDetailsPanel.tsx:27
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:26
-	__( 'reg list', 'event_espresso' ),
+	__('reg list', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:43
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:35
-	__( 'add description…', 'event_espresso' ),
+	__('add description…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:36
-	__( 'Edit description', 'event_espresso' ),
+	__('Edit description', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/cardView/Details.tsx:45
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/Details.tsx:37
-	__( 'click to edit description…', 'event_espresso' ),
+	__('click to edit description…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:10
-	__( 'Move Date to Trash', 'event_espresso' ),
+	__('Move Date to Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:13
 	// Reference: packages/constants/src/datetime.ts:6
-	__( 'Active', 'event_espresso' ),
+	__('Active', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:14
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:13
-	__( 'Trashed', 'event_espresso' ),
+	__('Trashed', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:14
 	// Reference: packages/constants/src/datetime.ts:8
-	__( 'Expired', 'event_espresso' ),
+	__('Expired', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:16
-	__( 'Sold Out', 'event_espresso' ),
+	__('Sold Out', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:17
 	// Reference: packages/constants/src/datetime.ts:12
-	__( 'Upcoming', 'event_espresso' ),
+	__('Upcoming', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:7
-	__( 'Edit Event Date Details', 'event_espresso' ),
+	__('Edit Event Date Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:8
-	__( 'View Registrations for this Date', 'event_espresso' ),
+	__('View Registrations for this Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/config.ts:9
-	__( 'Manage Ticket Assignments', 'event_espresso' ),
+	__('Manage Ticket Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/editable/EditableName.tsx:41
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditableName.tsx:41
-	__( 'click to edit title…', 'event_espresso' ),
+	__('click to edit title…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/editable/EditableName.tsx:42
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditableName.tsx:42
-	__( 'add title…', 'event_espresso' ),
+	__('add title…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/ActiveDatesFilters.tsx:17
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/ActiveTicketsFilters.tsx:17
-	__( 'ON', 'event_espresso' ),
+	__('ON', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:10
-	__( 'end dates only', 'event_espresso' ),
+	__('end dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:11
-	__( 'start and end dates', 'event_espresso' ),
+	__('start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:16
-	__( 'dates above 90% capacity', 'event_espresso' ),
+	__('dates above 90% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:17
-	__( 'dates above 75% capacity', 'event_espresso' ),
+	__('dates above 75% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:18
-	__( 'dates above 50% capacity', 'event_espresso' ),
+	__('dates above 50% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:19
-	__( 'dates below 50% capacity', 'event_espresso' ),
+	__('dates below 50% capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:23
-	__( 'all dates', 'event_espresso' ),
+	__('all dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:24
-	__( 'all active and upcoming', 'event_espresso' ),
+	__('all active and upcoming', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:25
-	__( 'active dates only', 'event_espresso' ),
+	__('active dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:26
-	__( 'upcoming dates only', 'event_espresso' ),
+	__('upcoming dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:27
-	__( 'next active or upcoming only', 'event_espresso' ),
+	__('next active or upcoming only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:28
-	__( 'sold out dates only', 'event_espresso' ),
+	__('sold out dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:29
-	__( 'recently expired dates', 'event_espresso' ),
+	__('recently expired dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:30
-	__( 'all expired dates', 'event_espresso' ),
+	__('all expired dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:31
-	__( 'trashed dates only', 'event_espresso' ),
+	__('trashed dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:35
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:9
 	// Reference: packages/dates/src/components/DateRangePicker/index.tsx:61
-	__( 'start date', 'event_espresso' ),
+	__('start date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:36
-	__( 'name', 'event_espresso' ),
+	__('name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:37
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:33
@@ -557,176 +557,176 @@ 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/HeaderCell.tsx:27
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:33
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:23
-	__( 'ID', 'event_espresso' ),
+	__('ID', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:38
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:47
-	__( 'custom order', 'event_espresso' ),
+	__('custom order', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:42
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:51
-	__( 'display', 'event_espresso' ),
+	__('display', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:43
-	__( 'recurrence', 'event_espresso' ),
+	__('recurrence', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:44
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:53
-	__( 'sales', 'event_espresso' ),
+	__('sales', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:45
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:55
-	__( 'sort by', 'event_espresso' ),
+	__('sort by', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:46
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:54
 	// Reference: packages/ee-components/src/EntityList/EntityListFilterBar.tsx:38
-	__( 'search', 'event_espresso' ),
+	__('search', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:47
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:56
-	__( 'status', 'event_espresso' ),
+	__('status', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/filterBar/controls/options.ts:9
-	__( 'start dates only', 'event_espresso' ),
+	__('start dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:26
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/NewDateModal.tsx:12
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/OptionsModalButton.tsx:18
-	__( 'Add New Date', 'event_espresso' ),
+	__('Add New Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:26
-	__( 'Add Single Date', 'event_espresso' ),
+	__('Add Single Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:44
-	__( 'Add a single date that only occurs once', 'event_espresso' ),
+	__('Add a single date that only occurs once', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/newDateOptions/AddSingleDate.tsx:46
-	__( 'Single Date', 'event_espresso' ),
+	__('Single Date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:108
-	__( 'Reg list', 'event_espresso' ),
+	__('Reg list', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:109
-	__( 'Regs', 'event_espresso' ),
+	__('Regs', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:124
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:123
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:59
-	__( 'Actions', 'event_espresso' ),
+	__('Actions', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:54
-	__( 'Start', 'event_espresso' ),
+	__('Start', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:68
-	__( 'End', 'event_espresso' ),
+	__('End', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:84
-	__( 'Cap', 'event_espresso' ),
+	__('Cap', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/datetimes/datesList/tableView/useHeaderRowGenerator.tsx:96
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:100
-	__( 'Sold', 'event_espresso' ),
+	__('Sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:33
 	// Reference: packages/form-builder/src/constants.ts:67
-	__( 'Text Input', 'event_espresso' ),
+	__('Text Input', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:34
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:32
-	__( 'Attendee First Name', 'event_espresso' ),
+	__('Attendee First Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:39
 	/* translators: field name */
-	__( 'Registration form must have a field of type "%1$s" which maps to "%2$s"', 'event_espresso' ),
+	__('Registration form must have a field of type "%1$s" which maps to "%2$s"', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:40
 	// Reference: packages/form-builder/src/constants.ts:82
-	__( 'Email Address', 'event_espresso' ),
+	__('Email Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:41
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:40
-	__( 'Attendee Email Address', 'event_espresso' ),
+	__('Attendee Email Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/ErrorMessage.tsx:49
-	__( 'Please add the required fields', 'event_espresso' ),
+	__('Please add the required fields', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/RegistrationForm.tsx:12
-	__( 'Registration Form', 'event_espresso' ),
+	__('Registration Form', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:13
-	__( 'primary registrant', 'event_espresso' ),
+	__('primary registrant', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:17
-	__( 'purchaser', 'event_espresso' ),
+	__('purchaser', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:21
-	__( 'registrants', 'event_espresso' ),
+	__('registrants', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:36
-	__( 'Attendee Last Name', 'event_espresso' ),
+	__('Attendee Last Name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:44
-	__( 'Attendee Address', 'event_espresso' ),
+	__('Attendee Address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/registrationForm/constants.ts:9
-	__( 'all', 'event_espresso' ),
+	__('all', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:18
-	__( 'Tickets must always have at least one date assigned to them but one or more of the tickets below does not have any. 
-Please correct the assignments for the highlighted cells.', 'event_espresso' ),
+	__('Tickets must always have at least one date assigned to them but one or more of the tickets below does not have any. 
+Please correct the assignments for the highlighted cells.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:22
-	__( 'Event Dates must always have at least one Ticket assigned to them but one or more of the Event Dates below does not have any. 
-Please correct the assignments for the highlighted cells.', 'event_espresso' ),
+	__('Event Dates must always have at least one Ticket assigned to them but one or more of the Event Dates below does not have any. 
+Please correct the assignments for the highlighted cells.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ErrorMessage.tsx:32
-	__( 'Please Update Assignments', 'event_espresso' ),
+	__('Please Update Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:26
-	__( 'There seem to be some dates/tickets which have no tickets/dates assigned. Do you want to fix them now?', 'event_espresso' ),
+	__('There seem to be some dates/tickets which have no tickets/dates assigned. Do you want to fix them now?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:29
-	__( 'Alert!', 'event_espresso' ),
+	__('Alert!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:42
 	/* translators: 1 entity id, 2 entity name */
-	__( 'Ticket Assignment Manager for Datetime: %1$s - %2$s', 'event_espresso' ),
+	__('Ticket Assignment Manager for Datetime: %1$s - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/ModalContainer.tsx:49
 	/* translators: 1 entity id, 2 entity name */
-	__( 'Ticket Assignment Manager for Ticket: %1$s - %2$s', 'event_espresso' ),
+	__('Ticket Assignment Manager for Ticket: %1$s - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/TicketAssignmentsManagerModal.tsx:45
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/Table.tsx:13
-	__( 'Ticket Assignment Manager', 'event_espresso' ),
+	__('Ticket Assignment Manager', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:10
-	__( 'existing relation', 'event_espresso' ),
+	__('existing relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:15
-	__( 'remove existing relation', 'event_espresso' ),
+	__('remove existing relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:20
-	__( 'add new relation', 'event_espresso' ),
+	__('add new relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:25
-	__( 'invalid relation', 'event_espresso' ),
+	__('invalid relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/config.ts:29
-	__( 'no relation', 'event_espresso' ),
+	__('no relation', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:15
-	__( 'Assignments', 'event_espresso' ),
+	__('Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:16
-	__( 'Event Dates are listed below', 'event_espresso' ),
+	__('Event Dates are listed below', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:17
-	__( 'Tickets are listed along the top', 'event_espresso' ),
+	__('Tickets are listed along the top', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/table/useGetHeaderRows.tsx:18
-	__( 'Click the cell buttons to toggle assigments', 'event_espresso' ),
+	__('Click the cell buttons to toggle assigments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/components/useSubmitButtonProps.ts:29
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:16
@@ -735,1566 +735,1566 @@ 
 	// Reference: packages/tpc/src/buttons/useSubmitButtonProps.tsx:29
 	// Reference: packages/ui-components/src/Modal/useSubmitButtonProps.tsx:13
 	// Reference: packages/ui-components/src/Stepper/buttons/Submit.tsx:7
-	__( 'Submit', 'event_espresso' ),
+	__('Submit', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/DatesByMonthControl.tsx:20
-	__( 'All Dates', 'event_espresso' ),
+	__('All Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/DatesByMonthControl.tsx:27
-	__( 'dates by month', 'event_espresso' ),
+	__('dates by month', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowExpiredTicketsControl.tsx:16
-	__( 'show expired tickets', 'event_espresso' ),
+	__('show expired tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowTrashedDatesControl.tsx:13
-	__( 'show trashed dates', 'event_espresso' ),
+	__('show trashed dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/ticketAssignmentsManager/filters/controls/ShowTrashedTicketsControl.tsx:16
-	__( 'show trashed tickets', 'event_espresso' ),
+	__('show trashed tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/Container.tsx:38
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actions/Actions.tsx:25
-	__( 'Default tickets', 'event_espresso' ),
+	__('Default tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/ModalBody.tsx:63
 	// Reference: packages/edtr-services/src/constants.ts:26
-	__( 'ticket', 'event_espresso' ),
+	__('ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:26
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:33
-	__( 'Set ticket prices', 'event_espresso' ),
+	__('Set ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:31
-	__( 'Skip prices - Save', 'event_espresso' ),
+	__('Skip prices - Save', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:37
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:57
-	__( 'Ticket details', 'event_espresso' ),
+	__('Ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/FooterButtons.tsx:38
-	__( 'Save', 'event_espresso' ),
+	__('Save', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/Modal.tsx:22
 	/* translators: %s ticket id */
-	__( 'Edit ticket %s', 'event_espresso' ),
+	__('Edit ticket %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/Modal.tsx:25
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:33
-	__( 'New Ticket Details', 'event_espresso' ),
+	__('New Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:10
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:10
-	__( 'primary information about the ticket', 'event_espresso' ),
+	__('primary information about the ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:10
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:10
-	__( 'Ticket Details', 'event_espresso' ),
+	__('Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:12
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:12
-	__( 'apply ticket price modifiers and taxes', 'event_espresso' ),
+	__('apply ticket price modifiers and taxes', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:14
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:14
-	__( 'Price Calculator', 'event_espresso' ),
+	__('Price Calculator', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/defaultTickets/multiStep/TicketFormSteps.tsx:16
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/TicketFormSteps.tsx:16
-	__( 'Assign Dates', 'event_espresso' ),
+	__('Assign Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:39
-	__( 'Skip prices - assign dates', 'event_espresso' ),
+	__('Skip prices - assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/FooterButtons.tsx:50
-	__( 'Save and assign dates', 'event_espresso' ),
+	__('Save and assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:29
 	/* translators: %1$s ticket name, %2$s ticket id */
-	__( 'Edit ticket "%1$s" - %2$s', 'event_espresso' ),
+	__('Edit ticket "%1$s" - %2$s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/multiStep/Modal.tsx:43
-	__( 'modal for ticket', 'event_espresso' ),
+	__('modal for ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:101
-	__( 'The maximum number of this ticket available for sale.', 'event_espresso' ),
+	__('The maximum number of this ticket available for sale.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:103
-	__( 'Set to 0 to stop sales, or leave blank for no limit.', 'event_espresso' ),
+	__('Set to 0 to stop sales, or leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:114
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:119
-	__( 'Number of Uses', 'event_espresso' ),
+	__('Number of Uses', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:120
-	__( 'Controls the total number of times this ticket can be used, regardless of the number of dates it is assigned to.', 'event_espresso' ),
+	__('Controls the total number of times this ticket can be used, regardless of the number of dates it is assigned to.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:124
-	__( 'Example: A ticket might have access to 4 different dates, but setting this field to 2 would mean that the ticket could only be used twice. Leave blank for no limit.', 'event_espresso' ),
+	__('Example: A ticket might have access to 4 different dates, but setting this field to 2 would mean that the ticket could only be used twice. Leave blank for no limit.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:132
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:127
-	__( 'Minimum Quantity', 'event_espresso' ),
+	__('Minimum Quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:137
-	__( 'The minimum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso' ),
+	__('The minimum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:141
-	__( 'Leave blank for no minimum.', 'event_espresso' ),
+	__('Leave blank for no minimum.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:147
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:135
-	__( 'Maximum Quantity', 'event_espresso' ),
+	__('Maximum Quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:153
-	__( 'The maximum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso' ),
+	__('The maximum quantity that can be selected for this ticket. Use this to create ticket bundles or graduated pricing.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:157
-	__( 'Leave blank for no maximum.', 'event_espresso' ),
+	__('Leave blank for no maximum.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:163
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:144
-	__( 'Required Ticket', 'event_espresso' ),
+	__('Required Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:165
-	__( 'If enabled, the ticket must be selected and will appear first in ticket lists.', 'event_espresso' ),
+	__('If enabled, the ticket must be selected and will appear first in ticket lists.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:177
-	__( 'Visibility', 'event_espresso' ),
+	__('Visibility', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:211
-	__( 'Ticket Sales', 'event_espresso' ),
+	__('Ticket Sales', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketForm/useTicketFormConfig.ts:95
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/useBulkEditFormConfig.ts:110
-	__( 'Quantity For Sale', 'event_espresso' ),
+	__('Quantity For Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketRegistrationsLink.tsx:13
-	__( 'total registrations.', 'event_espresso' ),
+	__('total registrations.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketRegistrationsLink.tsx:14
-	__( 'view ALL registrations for this ticket.', 'event_espresso' ),
+	__('view ALL registrations for this ticket.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketSoldLink.tsx:13
-	__( 'view approved registrations for this ticket.', 'event_espresso' ),
+	__('view approved registrations for this ticket.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketsList.tsx:36
-	__( 'Available Tickets', 'event_espresso' ),
+	__('Available Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/TicketsList.tsx:39
-	__( 'loading tickets…', 'event_espresso' ),
+	__('loading tickets…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:26
-	__( 'Number of related dates', 'event_espresso' ),
+	__('Number of related dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:27
-	__( 'There are no event dates assigned to this ticket. Please click the calendar icon to update the assignments.', 'event_espresso' ),
+	__('There are no event dates assigned to this ticket. Please click the calendar icon to update the assignments.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/AssignDatesButton.tsx:37
-	__( 'assign dates', 'event_espresso' ),
+	__('assign dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:19
-	__( 'Permanently Delete Ticket?', 'event_espresso' ),
+	__('Permanently Delete Ticket?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:19
-	__( 'Move Ticket to Trash?', 'event_espresso' ),
+	__('Move Ticket to Trash?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:22
-	__( 'Are you sure you want to permanently delete this ticket? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to permanently delete this ticket? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/DeleteTicket.tsx:48
 	// Reference: packages/ee-components/src/SimpleTicketCard/actions/Trash.tsx:6
-	__( 'trash ticket', 'event_espresso' ),
+	__('trash ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:25
-	__( 'ticket main menu', 'event_espresso' ),
+	__('ticket main menu', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:38
 	// Reference: packages/ee-components/src/SimpleTicketCard/actions/Edit.tsx:15
-	__( 'edit ticket', 'event_espresso' ),
+	__('edit ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/actionsMenu/dropdown/TicketMainMenu.tsx:39
-	__( 'copy ticket', 'event_espresso' ),
+	__('copy ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:46
-	__( 'edit ticket details', 'event_espresso' ),
+	__('edit ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:50
-	__( 'delete tickets', 'event_espresso' ),
+	__('delete tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:50
-	__( 'trash tickets', 'event_espresso' ),
+	__('trash tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/actions/Actions.tsx:54
-	__( 'edit ticket prices', 'event_espresso' ),
+	__('edit ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:14
-	__( 'Are you sure you want to permanently delete these tickets? This action can NOT be undone!', 'event_espresso' ),
+	__('Are you sure you want to permanently delete these tickets? This action can NOT be undone!', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:15
-	__( 'Are you sure you want to trash these tickets?', 'event_espresso' ),
+	__('Are you sure you want to trash these tickets?', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:16
-	__( 'Delete tickets permanently', 'event_espresso' ),
+	__('Delete tickets permanently', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/delete/Delete.tsx:16
-	__( 'Trash tickets', 'event_espresso' ),
+	__('Trash tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/EditDetails.tsx:21
-	__( 'Bulk edit ticket details', 'event_espresso' ),
+	__('Bulk edit ticket details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/details/EditDetails.tsx:22
-	__( 'any changes will be applied to ALL of the selected tickets.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected tickets.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/EditPrices.tsx:19
-	__( 'Bulk edit ticket prices', 'event_espresso' ),
+	__('Bulk edit ticket prices', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:20
-	__( 'Edit all prices together', 'event_espresso' ),
+	__('Edit all prices together', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:21
-	__( 'Edit all the selected ticket prices dynamically', 'event_espresso' ),
+	__('Edit all the selected ticket prices dynamically', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:25
-	__( 'Edit prices individually', 'event_espresso' ),
+	__('Edit prices individually', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/EditModeButtons.tsx:26
-	__( 'Edit prices for each ticket individually', 'event_espresso' ),
+	__('Edit prices for each ticket individually', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:14
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:34
 	// Reference: packages/form/src/ResetButton.tsx:18
 	// Reference: packages/tpc/src/buttons/useResetButtonProps.tsx:12
-	__( 'Reset', 'event_espresso' ),
+	__('Reset', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/buttons/FooterButtons.tsx:15
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:76
 	// Reference: packages/ui-components/src/Modal/useCancelButtonProps.tsx:10
-	__( 'Cancel', 'event_espresso' ),
+	__('Cancel', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/bulkEdit/prices/editSeparately/TPCInstance.tsx:26
 	/* translators: %s ticket name */
-	__( 'Edit prices for Ticket: %s', 'event_espresso' ),
+	__('Edit prices for Ticket: %s', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:30
-	__( 'sales start', 'event_espresso' ),
+	__('sales start', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:33
-	__( 'sales began', 'event_espresso' ),
+	__('sales began', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:35
-	__( 'sales ended', 'event_espresso' ),
+	__('sales ended', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:36
-	__( 'sales end', 'event_espresso' ),
+	__('sales end', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:50
-	__( 'Edit Ticket Sale Dates', 'event_espresso' ),
+	__('Edit Ticket Sale Dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketCardSidebar.tsx:54
-	__( 'edit ticket sales start and end dates', 'event_espresso' ),
+	__('edit ticket sales start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketDetailsPanel.tsx:21
-	__( 'quantity', 'event_espresso' ),
+	__('quantity', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketQuantity.tsx:28
 	// Reference: packages/edtr-services/src/apollo/mutations/tickets/useUpdateTicketQtyByCapacity.ts:78
-	__( 'Ticket quantity has been adjusted because it cannot be more than the related event date capacity.', 'event_espresso' ),
+	__('Ticket quantity has been adjusted because it cannot be more than the related event date capacity.', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/cardView/TicketQuantity.tsx:51
-	__( 'edit quantity of tickets available…', 'event_espresso' ),
+	__('edit quantity of tickets available…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:10
-	__( 'Move Ticket to Trash', 'event_espresso' ),
+	__('Move Ticket to Trash', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:15
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:54
-	__( 'On Sale', 'event_espresso' ),
+	__('On Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:17
-	__( 'Pending', 'event_espresso' ),
+	__('Pending', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:7
-	__( 'Edit Ticket Details', 'event_espresso' ),
+	__('Edit Ticket Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:8
-	__( 'Manage Date Assignments', 'event_espresso' ),
+	__('Manage Date Assignments', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/config.ts:9
 	// Reference: packages/tpc/src/components/table/Table.tsx:43
-	__( 'Ticket Price Calculator', 'event_espresso' ),
+	__('Ticket Price Calculator', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditablePrice.tsx:39
-	__( 'edit ticket total…', 'event_espresso' ),
+	__('edit ticket total…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/editable/EditablePrice.tsx:53
-	__( 'set price…', 'event_espresso' ),
+	__('set price…', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/IsChainedButton.tsx:23
-	__( 'tickets list is linked to dates list and is showing tickets for above dates only', 'event_espresso' ),
+	__('tickets list is linked to dates list and is showing tickets for above dates only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/IsChainedButton.tsx:24
-	__( 'tickets list is unlinked and is showing tickets for all event dates', 'event_espresso' ),
+	__('tickets list is unlinked and is showing tickets for all event dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:10
-	__( 'ticket sales start and end dates', 'event_espresso' ),
+	__('ticket sales start and end dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:15
-	__( 'tickets with 90% or more sold', 'event_espresso' ),
+	__('tickets with 90% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:16
-	__( 'tickets with 75% or more sold', 'event_espresso' ),
+	__('tickets with 75% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:17
-	__( 'tickets with 50% or more sold', 'event_espresso' ),
+	__('tickets with 50% or more sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:19
-	__( 'tickets with less than 50% sold', 'event_espresso' ),
+	__('tickets with less than 50% sold', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:28
-	__( 'all tickets for all dates', 'event_espresso' ),
+	__('all tickets for all dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:29
-	__( 'all on sale and sale pending', 'event_espresso' ),
+	__('all on sale and sale pending', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:30
-	__( 'on sale tickets only', 'event_espresso' ),
+	__('on sale tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:31
-	__( 'sale pending tickets only', 'event_espresso' ),
+	__('sale pending tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:32
-	__( 'next on sale or sale pending only', 'event_espresso' ),
+	__('next on sale or sale pending only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:33
-	__( 'sold out tickets only', 'event_espresso' ),
+	__('sold out tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:34
-	__( 'expired tickets only', 'event_espresso' ),
+	__('expired tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:35
-	__( 'trashed tickets only', 'event_espresso' ),
+	__('trashed tickets only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:40
-	__( 'all tickets for above dates', 'event_espresso' ),
+	__('all tickets for above dates', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:44
-	__( 'ticket sale date', 'event_espresso' ),
+	__('ticket sale date', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:45
-	__( 'ticket name', 'event_espresso' ),
+	__('ticket name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:46
-	__( 'ticket ID', 'event_espresso' ),
+	__('ticket ID', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:52
-	__( 'linked', 'event_espresso' ),
+	__('linked', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:8
-	__( 'ticket sales start date only', 'event_espresso' ),
+	__('ticket sales start date only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/filterBar/controls/options.ts:9
-	__( 'ticket sales end date only', 'event_espresso' ),
+	__('ticket sales end date only', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:18
-	__( 'Add New Ticket', 'event_espresso' ),
+	__('Add New Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:32
-	__( 'Add a single ticket and assign the dates to it', 'event_espresso' ),
+	__('Add a single ticket and assign the dates to it', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/newTicketOptions/AddSingleTicket.tsx:34
-	__( 'Single Ticket', 'event_espresso' ),
+	__('Single Ticket', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/TableView.tsx:39
-	__( 'Tickets', 'event_espresso' ),
+	__('Tickets', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:110
-	__( 'Reg List', 'event_espresso' ),
+	__('Reg List', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:53
-	__( 'Goes on Sale', 'event_espresso' ),
+	__('Goes on Sale', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:67
-	__( 'Sale Ends', 'event_espresso' ),
+	__('Sale Ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:68
-	__( 'Ends', 'event_espresso' ),
+	__('Ends', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:80
-	__( 'Price', 'event_espresso' ),
+	__('Price', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/tickets/ticketsList/tableView/useHeaderRowGenerator.tsx:90
-	__( 'Qty', 'event_espresso' ),
+	__('Qty', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:104
-	__( 'Venue telephone', 'event_espresso' ),
+	__('Venue telephone', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:111
-	__( 'Edit this Venue', 'event_espresso' ),
+	__('Edit this Venue', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:120
-	__( 'Select a Venue for the Event', 'event_espresso' ),
+	__('Select a Venue for the Event', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:21
-	__( 'Venue Details', 'event_espresso' ),
+	__('Venue Details', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:39
-	__( 'unlimited space', 'event_espresso' ),
+	__('unlimited space', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:42
 	/* translators: %d venue capacity */
-	__( 'Space for up to %d people', 'event_espresso' ),
+	__('Space for up to %d people', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:53
-	__( 'Venue address', 'event_espresso' ),
+	__('Venue address', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:59
-	__( 'Venue Details card', 'event_espresso' ),
+	__('Venue Details card', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:68
-	__( 'no image', 'event_espresso' ),
+	__('no image', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:72
-	__( 'Venue name', 'event_espresso' ),
+	__('Venue name', 'event_espresso'),
 
 	// Reference: domains/core/admin/eventEditor/src/ui/venue/VenueDetails.tsx:96
-	__( 'Venue capacity', 'event_espresso' ),
+	__('Venue capacity', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:29
-	__( 'Do you have a moment to share why you are deactivating Event Espresso?', 'event_espresso' ),
+	__('Do you have a moment to share why you are deactivating Event Espresso?', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:40
-	__( 'Skip', 'event_espresso' ),
+	__('Skip', 'event_espresso'),
 
 	// Reference: domains/core/admin/wpPluginsPage/src/exitSurvey/Popup.tsx:42
-	__( 'Sure I\'ll help', 'event_espresso' ),
+	__('Sure I\'ll help', 'event_espresso'),
 
 	// Reference: packages/adapters/src/Pagination/Pagination.tsx:23
-	__( 'pagination', 'event_espresso' ),
+	__('pagination', 'event_espresso'),
 
 	// Reference: packages/adapters/src/TagSelector/TagSelector.tsx:113
-	__( 'toggle menu', 'event_espresso' ),
+	__('toggle menu', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:10
-	__( 'Postponed', 'event_espresso' ),
+	__('Postponed', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:11
-	__( 'SoldOut', 'event_espresso' ),
+	__('SoldOut', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:7
 	// Reference: packages/predicates/src/registration/statusOptions.ts:11
-	__( 'Cancelled', 'event_espresso' ),
+	__('Cancelled', 'event_espresso'),
 
 	// Reference: packages/constants/src/datetime.ts:9
-	__( 'Inactive', 'event_espresso' ),
+	__('Inactive', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:25
-	__( 'error creating %s', 'event_espresso' ),
+	__('error creating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:26
-	__( 'error deleting %s', 'event_espresso' ),
+	__('error deleting %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:27
-	__( 'error updating %s', 'event_espresso' ),
+	__('error updating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:28
-	__( 'creating %s', 'event_espresso' ),
+	__('creating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:29
-	__( 'deleting %s', 'event_espresso' ),
+	__('deleting %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:30
-	__( 'updating %s', 'event_espresso' ),
+	__('updating %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:31
-	__( 'successfully created %s', 'event_espresso' ),
+	__('successfully created %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:32
-	__( 'successfully deleted %s', 'event_espresso' ),
+	__('successfully deleted %s', 'event_espresso'),
 
 	// Reference: packages/data/src/mutations/useMutationWithFeedback.ts:33
-	__( 'successfully updated %s', 'event_espresso' ),
+	__('successfully updated %s', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:13
-	__( 'day in range', 'event_espresso' ),
+	__('day in range', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateRangePicker/DateRangePickerLegend.tsx:17
 	// Reference: packages/dates/src/components/DateRangePicker/index.tsx:79
-	__( 'end date', 'event_espresso' ),
+	__('end date', 'event_espresso'),
 
 	// Reference: packages/dates/src/components/DateTimePicker.tsx:17
 	// Reference: packages/dates/src/components/TimePicker.tsx:17
 	// Reference: packages/form-builder/src/state/utils.ts:433
-	__( 'time', 'event_espresso' ),
+	__('time', 'event_espresso'),
 
 	// Reference: packages/dates/src/constants.ts:7
-	__( 'End Date & Time must be set later than the Start Date & Time', 'event_espresso' ),
+	__('End Date & Time must be set later than the Start Date & Time', 'event_espresso'),
 
 	// Reference: packages/dates/src/constants.ts:9
-	__( 'Start Date & Time must be set before the End Date & Time', 'event_espresso' ),
+	__('Start Date & Time must be set before the End Date & Time', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:16
-	__( 'month(s)', 'event_espresso' ),
+	__('month(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:17
-	__( 'week(s)', 'event_espresso' ),
+	__('week(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:18
-	__( 'day(s)', 'event_espresso' ),
+	__('day(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:19
-	__( 'hour(s)', 'event_espresso' ),
+	__('hour(s)', 'event_espresso'),
 
 	// Reference: packages/dates/src/utils/misc.ts:20
-	__( 'minute(s)', 'event_espresso' ),
+	__('minute(s)', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/apollo/mutations/useReorderEntities.ts:63
-	__( 'order updated', 'event_espresso' ),
+	__('order updated', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:24
-	__( 'datetime', 'event_espresso' ),
+	__('datetime', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:27
-	__( 'price', 'event_espresso' ),
+	__('price', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/constants.ts:28
 	// Reference: packages/tpc/src/inputs/PriceTypeInput.tsx:20
-	__( 'price type', 'event_espresso' ),
+	__('price type', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:38
 	// Reference: packages/ui-components/src/EditDateRangeButton/EditDateRangeButton.tsx:39
-	__( 'End date has been adjusted', 'event_espresso' ),
+	__('End date has been adjusted', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:59
-	__( 'Required', 'event_espresso' ),
+	__('Required', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:64
-	__( 'Start Date is required', 'event_espresso' ),
+	__('Start Date is required', 'event_espresso'),
 
 	// Reference: packages/edtr-services/src/utils/dateAndTime.ts:68
-	__( 'End Date is required', 'event_espresso' ),
+	__('End Date is required', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/EntityList/EntityList.tsx:30
-	__( 'no results found', 'event_espresso' ),
+	__('no results found', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/EntityList/EntityList.tsx:31
-	__( 'try changing filter settings', 'event_espresso' ),
+	__('try changing filter settings', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/ActionCheckbox.tsx:38
 	/* translators: %d entity id */
-	__( 'select entity with id %d', 'event_espresso' ),
+	__('select entity with id %d', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/ActionCheckbox.tsx:41
-	__( 'select all entities', 'event_espresso' ),
+	__('select all entities', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:20
-	__( 'Note: ', 'event_espresso' ),
+	__('Note: ', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:20
-	__( 'any changes will be applied to ALL of the selected entities.', 'event_espresso' ),
+	__('any changes will be applied to ALL of the selected entities.', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/BulkEditDetails.tsx:27
-	__( 'Bulk edit details', 'event_espresso' ),
+	__('Bulk edit details', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:17
-	__( 'Are you sure you want to bulk update the details?', 'event_espresso' ),
+	__('Are you sure you want to bulk update the details?', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/bulkEdit/details/Submit.tsx:18
-	__( 'Bulk update details', 'event_espresso' ),
+	__('Bulk update details', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:26
-	__( 'set order', 'event_espresso' ),
+	__('set order', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:28
-	__( 'Set Custom Dates Order - this is how dates are ordered on the frontend', 'event_espresso' ),
+	__('Set Custom Dates Order - this is how dates are ordered on the frontend', 'event_espresso'),
 
 	// Reference: packages/ee-components/src/filterBar/SortByControl/index.tsx:29
-	__( 'Set Custom Tickets Order - this is how tickets are ordered on the frontend', 'event_espresso' ),
+	__('Set Custom Tickets Order - this is how tickets are ordered on the frontend', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:32
-	__( 'delete form element', 'event_espresso' ),
+	__('delete form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:49
-	__( 'form element settings', 'event_espresso' ),
+	__('form element settings', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:59
-	__( 'copy form element', 'event_espresso' ),
+	__('copy form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/FormElementToolbar.tsx:69
-	__( 'click, hold, and drag to reorder form element', 'event_espresso' ),
+	__('click, hold, and drag to reorder form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:20
-	__( 'remove option', 'event_espresso' ),
+	__('remove option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:42
-	__( 'value', 'event_espresso' ),
+	__('value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:52
-	__( 'label', 'event_espresso' ),
+	__('label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOption.tsx:63
-	__( 'click, hold, and drag to reorder field option', 'event_espresso' ),
+	__('click, hold, and drag to reorder field option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:61
-	__( 'Options are the choices you give people to select from.', 'event_espresso' ),
+	__('Options are the choices you give people to select from.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:63
-	__( 'The value is a simple key that will be saved to the database and the label is what is shown to the user.', 'event_espresso' ),
+	__('The value is a simple key that will be saved to the database and the label is what is shown to the user.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FieldOptions.tsx:96
-	__( 'add new option', 'event_espresso' ),
+	__('add new option', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:26
 	// Reference: packages/form-builder/src/FormSection/Tabs/FormSectionTabs.tsx:25
-	__( 'Styles', 'event_espresso' ),
+	__('Styles', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/FormElementTabs.tsx:30
-	__( 'Validation', 'event_espresso' ),
+	__('Validation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:18
-	__( 'Change input type', 'event_espresso' ),
+	__('Change input type', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:19
-	__( 'Some configurations might be lost. Are you sure you want to change the input type?', 'event_espresso' ),
+	__('Some configurations might be lost. Are you sure you want to change the input type?', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/InputType.tsx:40
-	__( 'type', 'event_espresso' ),
+	__('type', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:26
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:17
-	__( 'public label', 'event_espresso' ),
+	__('public label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:33
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:22
-	__( 'admin label', 'event_espresso' ),
+	__('admin label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:40
-	__( 'content', 'event_espresso' ),
+	__('content', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:48
-	__( 'options', 'event_espresso' ),
+	__('options', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:51
-	__( 'placeholder', 'event_espresso' ),
+	__('placeholder', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:57
-	__( 'admin only', 'event_espresso' ),
+	__('admin only', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:62
-	__( 'help text', 'event_espresso' ),
+	__('help text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Settings.tsx:71
-	__( 'maps to', 'event_espresso' ),
+	__('maps to', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:15
 	// Reference: packages/form-builder/src/FormSection/Tabs/Styles.tsx:13
-	__( 'css class', 'event_espresso' ),
+	__('css class', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:20
-	__( 'help text css class', 'event_espresso' ),
+	__('help text css class', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:27
-	__( 'size', 'event_espresso' ),
+	__('size', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:35
-	__( 'step', 'event_espresso' ),
+	__('step', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Styles.tsx:41
-	__( 'maxlength', 'event_espresso' ),
+	__('maxlength', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:123
-	__( 'min', 'event_espresso' ),
+	__('min', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:128
-	__( 'max', 'event_espresso' ),
+	__('max', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:28
-	__( 'Germany', 'event_espresso' ),
+	__('Germany', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:32
-	__( 'France', 'event_espresso' ),
+	__('France', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:36
-	__( 'United Kingdom', 'event_espresso' ),
+	__('United Kingdom', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:40
-	__( 'United States', 'event_espresso' ),
+	__('United States', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:44
-	__( 'Custom', 'event_espresso' ),
+	__('Custom', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:54
-	__( 'required', 'event_espresso' ),
+	__('required', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:59
-	__( 'required text', 'event_espresso' ),
+	__('required text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:66
-	__( 'autocomplete', 'event_espresso' ),
+	__('autocomplete', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:74
-	__( 'custom format', 'event_espresso' ),
+	__('custom format', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:75
-	__( 'format', 'event_espresso' ),
+	__('format', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormElement/Tabs/Validation.tsx:83
-	__( 'pattern', 'event_espresso' ),
+	__('pattern', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:110
-	__( 'add new form element', 'event_espresso' ),
+	__('add new form element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:117
 	// Reference: packages/form/src/renderers/RepeatableRenderer.tsx:52
-	__( 'Add', 'event_espresso' ),
+	__('Add', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:76
-	__( 'Add Form Element', 'event_espresso' ),
+	__('Add Form Element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:85
-	__( 'form element order can be changed after adding by using the drag handles in the form element toolbar', 'event_espresso' ),
+	__('form element order can be changed after adding by using the drag handles in the form element toolbar', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/AddFormElementPopover.tsx:92
-	__( 'load existing form section', 'event_espresso' ),
+	__('load existing form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:32
-	__( 'delete form section', 'event_espresso' ),
+	__('delete form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:47
-	__( 'form section settings', 'event_espresso' ),
+	__('form section settings', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:57
-	__( 'copy form section', 'event_espresso' ),
+	__('copy form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSectionToolbar.tsx:74
-	__( 'click, hold, and drag to reorder form section', 'event_espresso' ),
+	__('click, hold, and drag to reorder form section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/FormSections.tsx:26
-	__( 'Add Form Section', 'event_espresso' ),
+	__('Add Form Section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:47
-	__( 'save form section for use in other forms', 'event_espresso' ),
+	__('save form section for use in other forms', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:51
-	__( 'save as', 'event_espresso' ),
+	__('save as', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:55
-	__( 'default', 'event_espresso' ),
+	__('default', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:58
-	__( ' a copy of this form section will be automatically added to ALL new events', 'event_espresso' ),
+	__(' a copy of this form section will be automatically added to ALL new events', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:61
-	__( 'shared', 'event_espresso' ),
+	__('shared', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/SaveSection.tsx:64
-	__( 'a copy of this form section will be saved for use in other events but not loaded by default', 'event_espresso' ),
+	__('a copy of this form section will be saved for use in other events but not loaded by default', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:27
-	__( 'show label', 'event_espresso' ),
+	__('show label', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/FormSection/Tabs/Settings.tsx:33
-	__( 'applies to', 'event_espresso' ),
+	__('applies to', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:102
 	// Reference: packages/form-builder/src/state/utils.ts:436
-	__( 'URL', 'event_espresso' ),
+	__('URL', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:104
-	__( 'adds a text input for entering a URL address', 'event_espresso' ),
+	__('adds a text input for entering a URL address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:107
-	__( 'Date', 'event_espresso' ),
+	__('Date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:109
-	__( 'adds a text input that allows users to enter a date directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a date directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:112
 	// Reference: packages/form-builder/src/state/utils.ts:369
-	__( 'Local Date', 'event_espresso' ),
+	__('Local Date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:117
-	__( 'Month', 'event_espresso' ),
+	__('Month', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:119
-	__( 'adds a text input that allows users to enter a month and year directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a month and year directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:122
-	__( 'Time', 'event_espresso' ),
+	__('Time', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:124
-	__( 'adds a text input that allows users to enter a time directly via keyboard or a timepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a time directly via keyboard or a timepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:127
-	__( 'Week', 'event_espresso' ),
+	__('Week', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:129
-	__( 'adds a text input that allows users to enter a week and year directly via keyboard or a datepicker', 'event_espresso' ),
+	__('adds a text input that allows users to enter a week and year directly via keyboard or a datepicker', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:132
-	__( 'Day Selector', 'event_espresso' ),
+	__('Day Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:134
-	__( 'adds a dropdown selector that allows users to select the day of the month (01 to 31)', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the day of the month (01 to 31)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:137
-	__( 'Month Selector', 'event_espresso' ),
+	__('Month Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:139
-	__( 'adds a dropdown selector that allows users to select the month of the year (01 to 12)', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the month of the year (01 to 12)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:142
-	__( 'Year Selector', 'event_espresso' ),
+	__('Year Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:144
-	__( 'adds a dropdown selector that allows users to select the year from a configurable range', 'event_espresso' ),
+	__('adds a dropdown selector that allows users to select the year from a configurable range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:147
-	__( 'Radio Buttons', 'event_espresso' ),
+	__('Radio Buttons', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:149
-	__( 'adds one or more radio buttons that allow users to only select one option from those provided', 'event_espresso' ),
+	__('adds one or more radio buttons that allow users to only select one option from those provided', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:152
 	// Reference: packages/form-builder/src/state/utils.ts:375
-	__( 'Decimal Number', 'event_espresso' ),
+	__('Decimal Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:154
-	__( 'adds a text input that only accepts numbers whose value is a decimal (float)', 'event_espresso' ),
+	__('adds a text input that only accepts numbers whose value is a decimal (float)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:157
 	// Reference: packages/form-builder/src/state/utils.ts:378
-	__( 'Whole Number', 'event_espresso' ),
+	__('Whole Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:159
-	__( 'adds a text input that only accepts numbers whose value is an integer (whole number)', 'event_espresso' ),
+	__('adds a text input that only accepts numbers whose value is an integer (whole number)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:162
-	__( 'Number Range', 'event_espresso' ),
+	__('Number Range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:167
-	__( 'Phone Number', 'event_espresso' ),
+	__('Phone Number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:172
-	__( 'Dropdown', 'event_espresso' ),
+	__('Dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:174
-	__( 'adds a dropdown selector that accepts a single value', 'event_espresso' ),
+	__('adds a dropdown selector that accepts a single value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:177
-	__( 'Multi Select', 'event_espresso' ),
+	__('Multi Select', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:179
-	__( 'adds a dropdown selector that accepts multiple values', 'event_espresso' ),
+	__('adds a dropdown selector that accepts multiple values', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:182
-	__( 'Toggle/Switch', 'event_espresso' ),
+	__('Toggle/Switch', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:184
-	__( 'adds a toggle or a switch to accept true or false value', 'event_espresso' ),
+	__('adds a toggle or a switch to accept true or false value', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:187
-	__( 'Multi Checkbox', 'event_espresso' ),
+	__('Multi Checkbox', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:189
-	__( 'adds checkboxes that allow users to select zero or more options from those provided', 'event_espresso' ),
+	__('adds checkboxes that allow users to select zero or more options from those provided', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:192
-	__( 'Country Selector', 'event_espresso' ),
+	__('Country Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:194
-	__( 'adds a dropdown selector populated with names of countries that are enabled for the site', 'event_espresso' ),
+	__('adds a dropdown selector populated with names of countries that are enabled for the site', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:197
-	__( 'State Selector', 'event_espresso' ),
+	__('State Selector', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:202
-	__( 'Button', 'event_espresso' ),
+	__('Button', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:204
-	__( 'adds a button to the form that can be used for triggering fucntionality (requires custom coding)', 'event_espresso' ),
+	__('adds a button to the form that can be used for triggering fucntionality (requires custom coding)', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:207
-	__( 'Reset Button', 'event_espresso' ),
+	__('Reset Button', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:209
-	__( 'adds a button that will reset the form back to its original state.', 'event_espresso' ),
+	__('adds a button that will reset the form back to its original state.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:55
-	__( 'Form Section', 'event_espresso' ),
+	__('Form Section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:57
-	__( 'Used for creating logical groupings for questions and form elements. Need to add a heading or description? Use the HTML form element.', 'event_espresso' ),
+	__('Used for creating logical groupings for questions and form elements. Need to add a heading or description? Use the HTML form element.', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:62
-	__( 'HTML Block', 'event_espresso' ),
+	__('HTML Block', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:64
-	__( 'allows you to add HTML like headings or text paragraphs to your form', 'event_espresso' ),
+	__('allows you to add HTML like headings or text paragraphs to your form', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:69
-	__( 'adds a text input that only accepts plain text', 'event_espresso' ),
+	__('adds a text input that only accepts plain text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:72
-	__( 'Plain Text Area', 'event_espresso' ),
+	__('Plain Text Area', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:74
-	__( 'adds a textarea block that only accepts plain text', 'event_espresso' ),
+	__('adds a textarea block that only accepts plain text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:77
-	__( 'HTML Text Area', 'event_espresso' ),
+	__('HTML Text Area', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:79
-	__( 'adds a textarea block that accepts text including simple HTML markup', 'event_espresso' ),
+	__('adds a textarea block that accepts text including simple HTML markup', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:84
-	__( 'adds a text input that only accepts a valid email address', 'event_espresso' ),
+	__('adds a text input that only accepts a valid email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:87
-	__( 'Email Confirmation', 'event_espresso' ),
+	__('Email Confirmation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:92
-	__( 'Password', 'event_espresso' ),
+	__('Password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:94
-	__( 'adds a text input that accepts text but masks what the user enters', 'event_espresso' ),
+	__('adds a text input that accepts text but masks what the user enters', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/constants.ts:97
-	__( 'Password Confirmation', 'event_espresso' ),
+	__('Password Confirmation', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/data/useElementMutator.ts:54
-	__( 'element', 'event_espresso' ),
+	__('element', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/data/useSectionMutator.ts:54
-	__( 'section', 'event_espresso' ),
+	__('section', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:360
-	__( 'click', 'event_espresso' ),
+	__('click', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:363
-	__( 'checkboxes', 'event_espresso' ),
+	__('checkboxes', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:366
-	__( 'date', 'event_espresso' ),
+	__('date', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:372
-	__( 'day', 'event_espresso' ),
+	__('day', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:381
-	__( 'email address', 'event_espresso' ),
+	__('email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:384
-	__( 'confirm email address', 'event_espresso' ),
+	__('confirm email address', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:388
-	__( 'month', 'event_espresso' ),
+	__('month', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:391
-	__( 'password', 'event_espresso' ),
+	__('password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:394
-	__( 'confirm password', 'event_espresso' ),
+	__('confirm password', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:397
-	__( 'radio buttons', 'event_espresso' ),
+	__('radio buttons', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:400
-	__( 'number range', 'event_espresso' ),
+	__('number range', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:403
-	__( 'selection dropdown', 'event_espresso' ),
+	__('selection dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:406
-	__( 'country', 'event_espresso' ),
+	__('country', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:409
-	__( 'multi-select dropdown', 'event_espresso' ),
+	__('multi-select dropdown', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:412
-	__( 'state/province', 'event_espresso' ),
+	__('state/province', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:415
-	__( 'on/off switch', 'event_espresso' ),
+	__('on/off switch', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:418
-	__( 'reset', 'event_espresso' ),
+	__('reset', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:421
-	__( 'phone number', 'event_espresso' ),
+	__('phone number', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:424
-	__( 'text', 'event_espresso' ),
+	__('text', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:427
-	__( 'simple textarea', 'event_espresso' ),
+	__('simple textarea', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:430
-	__( 'html textarea', 'event_espresso' ),
+	__('html textarea', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:439
-	__( 'week', 'event_espresso' ),
+	__('week', 'event_espresso'),
 
 	// Reference: packages/form-builder/src/state/utils.ts:442
-	__( 'year', 'event_espresso' ),
+	__('year', 'event_espresso'),
 
 	// Reference: packages/form/src/adapters/WPMediaImage.tsx:12
-	__( 'Select Image', 'event_espresso' ),
+	__('Select Image', 'event_espresso'),
 
 	// Reference: packages/form/src/adapters/WPMediaImage.tsx:44
 	// Reference: packages/rich-text-editor/src/components/AdvancedTextEditor/toolbarButtons/WPMedia.tsx:11
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:12
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityTemplate.tsx:32
-	__( 'Select', 'event_espresso' ),
+	__('Select', 'event_espresso'),
 
 	// Reference: packages/form/src/renderers/FormRenderer.tsx:51
-	__( 'Form Errors', 'event_espresso' ),
+	__('Form Errors', 'event_espresso'),
 
 	// Reference: packages/form/src/renderers/RepeatableRenderer.tsx:36
 	/* translators: %d the entry number */
-	__( 'Entry %d', 'event_espresso' ),
+	__('Entry %d', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:11
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:17
-	__( 'sold out', 'event_espresso' ),
+	__('sold out', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:14
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:14
-	__( 'expired', 'event_espresso' ),
+	__('expired', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:17
-	__( 'upcoming', 'event_espresso' ),
+	__('upcoming', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:20
-	__( 'active', 'event_espresso' ),
+	__('active', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:23
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:11
-	__( 'trashed', 'event_espresso' ),
+	__('trashed', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:26
-	__( 'cancelled', 'event_espresso' ),
+	__('cancelled', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:29
-	__( 'postponed', 'event_espresso' ),
+	__('postponed', 'event_espresso'),
 
 	// Reference: packages/helpers/src/datetimes/getStatusTextLabel.ts:33
-	__( 'inactive', 'event_espresso' ),
+	__('inactive', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:20
-	__( 'pending', 'event_espresso' ),
+	__('pending', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/getStatusTextLabel.ts:23
-	__( 'on sale', 'event_espresso' ),
+	__('on sale', 'event_espresso'),
 
 	// Reference: packages/helpers/src/tickets/ticketVisibilityOptions.ts:6
-	__( 'Where the ticket can be viewed throughout the UI. ', 'event_espresso' ),
+	__('Where the ticket can be viewed throughout the UI. ', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:16
-	__( 'Declined', 'event_espresso' ),
+	__('Declined', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:21
-	__( 'Incomplete', 'event_espresso' ),
+	__('Incomplete', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:26
-	__( 'Not Approved', 'event_espresso' ),
+	__('Not Approved', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:31
-	__( 'Pending Payment', 'event_espresso' ),
+	__('Pending Payment', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:36
-	__( 'Wait List', 'event_espresso' ),
+	__('Wait List', 'event_espresso'),
 
 	// Reference: packages/predicates/src/registration/statusOptions.ts:6
-	__( 'Approved', 'event_espresso' ),
+	__('Approved', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/AdvancedTextEditor/toolbarButtons/WPMedia.tsx:9
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:10
-	__( 'Select media', 'event_espresso' ),
+	__('Select media', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/RichTextEditor.tsx:84
-	__( 'Write something…', 'event_espresso' ),
+	__('Write something…', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/Toolbar.tsx:20
-	__( 'RTE Toolbar', 'event_espresso' ),
+	__('RTE Toolbar', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:11
-	__( 'Normal', 'event_espresso' ),
+	__('Normal', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:12
-	__( 'H1', 'event_espresso' ),
+	__('H1', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:13
-	__( 'H2', 'event_espresso' ),
+	__('H2', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:14
-	__( 'H3', 'event_espresso' ),
+	__('H3', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:15
-	__( 'H4', 'event_espresso' ),
+	__('H4', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:16
-	__( 'H5', 'event_espresso' ),
+	__('H5', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:17
-	__( 'H6', 'event_espresso' ),
+	__('H6', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:18
-	__( 'Block quote', 'event_espresso' ),
+	__('Block quote', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/blockType/Component.tsx:19
-	__( 'Code', 'event_espresso' ),
+	__('Code', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:36
-	__( 'Set color', 'event_espresso' ),
+	__('Set color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:45
-	__( 'Text color', 'event_espresso' ),
+	__('Text color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/colorPicker/Component.tsx:47
-	__( 'Background color', 'event_espresso' ),
+	__('Background color', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:39
-	__( 'Add image', 'event_espresso' ),
+	__('Add image', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:51
-	__( 'Image URL', 'event_espresso' ),
+	__('Image URL', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:55
-	__( 'Alt text', 'event_espresso' ),
+	__('Alt text', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:56
-	__( 'Width', 'event_espresso' ),
+	__('Width', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/image/Component.tsx:60
-	__( 'Height', 'event_espresso' ),
+	__('Height', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/link/Component.tsx:54
-	__( 'Edit link', 'event_espresso' ),
+	__('Edit link', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/link/Component.tsx:64
-	__( 'URL title', 'event_espresso' ),
+	__('URL title', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:11
-	__( 'Unordered list', 'event_espresso' ),
+	__('Unordered list', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:12
-	__( 'Ordered list', 'event_espresso' ),
+	__('Ordered list', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:13
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:13
-	__( 'Indent', 'event_espresso' ),
+	__('Indent', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/list/Component.tsx:14
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:14
-	__( 'Outdent', 'event_espresso' ),
+	__('Outdent', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:11
-	__( 'Unordered textalign', 'event_espresso' ),
+	__('Unordered textalign', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/Toolbar/controls/textAlign/Component.tsx:12
-	__( 'Ordered textalign', 'event_espresso' ),
+	__('Ordered textalign', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/RichTextEditor/render/Image/Toolbar.tsx:32
-	__( 'Image toolbar', 'event_espresso' ),
+	__('Image toolbar', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/WithEditMode/WithEditMode.tsx:62
 	// Reference: packages/rich-text-editor/src/rte-old/components/RTEWithEditMode/RTEWithEditMode.tsx:35
-	__( 'Visual editor', 'event_espresso' ),
+	__('Visual editor', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/components/WithEditMode/WithEditMode.tsx:66
 	// Reference: packages/rich-text-editor/src/rte-old/components/RTEWithEditMode/RTEWithEditMode.tsx:39
-	__( 'HTML editor', 'event_espresso' ),
+	__('HTML editor', 'event_espresso'),
 
 	// Reference: packages/rich-text-editor/src/rte-old/components/toolbarButtons/WPMedia.tsx:68
-	__( 'Add Media', 'event_espresso' ),
+	__('Add Media', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/AddPriceModifierButton.tsx:16
-	__( 'add new price modifier after this row', 'event_espresso' ),
+	__('add new price modifier after this row', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:14
-	__( 'Delete all prices', 'event_espresso' ),
+	__('Delete all prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:27
-	__( 'Are you sure you want to delete all of this ticket\'s prices and make it free? This action is permanent and can not be undone.', 'event_espresso' ),
+	__('Are you sure you want to delete all of this ticket\'s prices and make it free? This action is permanent and can not be undone.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeleteAllPricesButton.tsx:31
-	__( 'Delete all prices?', 'event_espresso' ),
+	__('Delete all prices?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/DeletePriceModifierButton.tsx:12
-	__( 'delete price modifier', 'event_espresso' ),
+	__('delete price modifier', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:14
-	__( 'Ticket base price is being reverse calculated from bottom to top starting with the ticket total. Entering a new ticket total will reverse calculate the ticket base price after applying all price modifiers in reverse. Click to turn off reverse calculations', 'event_espresso' ),
+	__('Ticket base price is being reverse calculated from bottom to top starting with the ticket total. Entering a new ticket total will reverse calculate the ticket base price after applying all price modifiers in reverse. Click to turn off reverse calculations', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:17
-	__( 'Ticket total is being calculated normally from top to bottom starting from the base price. Entering a new ticket base price will recalculate the ticket total after applying all price modifiers. Click to turn on reverse calculations', 'event_espresso' ),
+	__('Ticket total is being calculated normally from top to bottom starting from the base price. Entering a new ticket base price will recalculate the ticket total after applying all price modifiers. Click to turn on reverse calculations', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:21
-	__( 'Disable reverse calculate', 'event_espresso' ),
+	__('Disable reverse calculate', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/ReverseCalculateButton.tsx:21
-	__( 'Enable reverse calculate', 'event_espresso' ),
+	__('Enable reverse calculate', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/TicketPriceCalculatorButton.tsx:28
-	__( 'ticket price calculator', 'event_espresso' ),
+	__('ticket price calculator', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/AddDefaultTaxesButton.tsx:9
-	__( 'Add default taxes', 'event_espresso' ),
+	__('Add default taxes', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:10
-	__( 'Are you sure you want to remove all of this ticket\'s taxes?', 'event_espresso' ),
+	__('Are you sure you want to remove all of this ticket\'s taxes?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:14
-	__( 'Remove all taxes?', 'event_espresso' ),
+	__('Remove all taxes?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/buttons/taxes/RemoveTaxesButton.tsx:7
-	__( 'Remove taxes', 'event_espresso' ),
+	__('Remove taxes', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/AddDefaultPricesButton.tsx:9
-	__( 'Add default prices', 'event_espresso' ),
+	__('Add default prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/DefaultPricesInfo.tsx:29
-	__( 'Modify default prices.', 'event_espresso' ),
+	__('Modify default prices.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/DefaultTaxesInfo.tsx:29
-	__( 'New default taxes are available. Click the - Add default taxes - button to add them now.', 'event_espresso' ),
+	__('New default taxes are available. Click the - Add default taxes - button to add them now.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/LockedTicketsBanner.tsx:12
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:74
-	__( 'Price editing is disabled!', 'event_espresso' ),
+	__('Price editing is disabled!', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:12
-	__( 'One or more price types are missing. Maybe they were placed in the trash?', 'event_espresso' ),
+	__('One or more price types are missing. Maybe they were placed in the trash?', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:17
 	/* translators: %s link to price types admin */
-	__( 'Go to the%sto restore (untrash) your price types and/or create some new ones.', 'event_espresso' ),
+	__('Go to the%sto restore (untrash) your price types and/or create some new ones.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:18
-	__( 'price types admin page', 'event_espresso' ),
+	__('price types admin page', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPriceTypesBanner.tsx:26
-	__( 'Missing Price Types!', 'event_espresso' ),
+	__('Missing Price Types!', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:14
-	__( 'This Ticket is Currently Free', 'event_espresso' ),
+	__('This Ticket is Currently Free', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:21
 	/* translators: %s default prices */
-	__( 'Click the button below to load your %s into the calculator.', 'event_espresso' ),
+	__('Click the button below to load your %s into the calculator.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:22
-	__( 'default prices', 'event_espresso' ),
+	__('default prices', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:29
-	__( 'Additional ticket price modifiers can be added or removed.', 'event_espresso' ),
+	__('Additional ticket price modifiers can be added or removed.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/NoPricesBanner.tsx:31
-	__( 'Click the save button below to assign which dates this ticket will be available for purchase on.', 'event_espresso' ),
+	__('Click the save button below to assign which dates this ticket will be available for purchase on.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/TicketPriceCalculatorModal.tsx:22
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:7
 	// Reference: packages/ui-components/src/Confirm/useConfirmWithButton.tsx:10
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:52
-	__( 'Changes will be lost if you proceed.', 'event_espresso' ),
+	__('Changes will be lost if you proceed.', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/TicketPriceCalculatorModal.tsx:33
 	/* translators: %s ticket name */
-	__( 'Price Calculator for Ticket: %s', 'event_espresso' ),
+	__('Price Calculator for Ticket: %s', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useFooterRowGenerator.tsx:48
-	__( 'Total', 'event_espresso' ),
+	__('Total', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useFooterRowGenerator.tsx:57
-	__( 'ticket total', 'event_espresso' ),
+	__('ticket total', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:29
-	__( 'Order', 'event_espresso' ),
+	__('Order', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:35
-	__( 'Price Type', 'event_espresso' ),
+	__('Price Type', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:41
-	__( 'Label', 'event_espresso' ),
+	__('Label', 'event_espresso'),
 
 	// Reference: packages/tpc/src/components/table/useHeaderRowGenerator.ts:53
-	__( 'Amount', 'event_espresso' ),
+	__('Amount', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:22
-	__( 'Copy ticket', 'event_espresso' ),
+	__('Copy ticket', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:26
-	__( 'Copy and archive this ticket', 'event_espresso' ),
+	__('Copy and archive this ticket', 'event_espresso'),
 
 	// Reference: packages/tpc/src/hooks/useLockedTicketAction.ts:29
-	__( 'OK', 'event_espresso' ),
+	__('OK', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceAmountInput.tsx:34
-	__( 'amount', 'event_espresso' ),
+	__('amount', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceAmountInput.tsx:46
-	__( 'amount…', 'event_espresso' ),
+	__('amount…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceDescriptionInput.tsx:14
-	__( 'description…', 'event_espresso' ),
+	__('description…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceDescriptionInput.tsx:9
-	__( 'price description', 'event_espresso' ),
+	__('price description', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceIdInput.tsx:6
-	__( 'price id', 'event_espresso' ),
+	__('price id', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceNameInput.tsx:13
-	__( 'label…', 'event_espresso' ),
+	__('label…', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceNameInput.tsx:8
-	__( 'price name', 'event_espresso' ),
+	__('price name', 'event_espresso'),
 
 	// Reference: packages/tpc/src/inputs/PriceOrderInput.tsx:14
-	__( 'price order', 'event_espresso' ),
+	__('price order', 'event_espresso'),
 
 	// Reference: packages/tpc/src/utils/constants.ts:8
-	__( 'Ticket price modifications are blocked for Tickets that have already been sold to registrants, because doing so would negatively affect internal accounting for the event. If you still need to modify ticket prices, then create a copy of those tickets, edit the prices for the new tickets, and then trash the old tickets.', 'event_espresso' ),
+	__('Ticket price modifications are blocked for Tickets that have already been sold to registrants, because doing so would negatively affect internal accounting for the event. If you still need to modify ticket prices, then create a copy of those tickets, edit the prices for the new tickets, and then trash the old tickets.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ActiveFilters/ActiveFilters.tsx:8
-	__( 'active filters:', 'event_espresso' ),
+	__('active filters:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ActiveFilters/FilterTag/index.tsx:15
 	/* translators: %s filter name */
-	__( 'remove filter - %s', 'event_espresso' ),
+	__('remove filter - %s', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:105
-	__( 'Country:', 'event_espresso' ),
+	__('Country:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:113
-	__( 'Zip:', 'event_espresso' ),
+	__('Zip:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:81
-	__( 'Address:', 'event_espresso' ),
+	__('Address:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:89
-	__( 'City:', 'event_espresso' ),
+	__('City:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Address/Address.tsx:97
-	__( 'State:', 'event_espresso' ),
+	__('State:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CalendarDateRange/CalendarDateRange.tsx:37
-	__( 'to', 'event_espresso' ),
+	__('to', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CalendarPageDate/CalendarPageDate.tsx:54
-	__( 'TO', 'event_espresso' ),
+	__('TO', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/ColorPicker.tsx:60
-	__( 'Custom color', 'event_espresso' ),
+	__('Custom color', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/Swatch.tsx:23
 	/* translators: color name */
-	__( 'Color: %s', 'event_espresso' ),
+	__('Color: %s', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:13
-	__( 'Cyan bluish gray', 'event_espresso' ),
+	__('Cyan bluish gray', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:17
-	__( 'White', 'event_espresso' ),
+	__('White', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:21
-	__( 'Pale pink', 'event_espresso' ),
+	__('Pale pink', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:25
-	__( 'Vivid red', 'event_espresso' ),
+	__('Vivid red', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:29
-	__( 'Luminous vivid orange', 'event_espresso' ),
+	__('Luminous vivid orange', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:33
-	__( 'Luminous vivid amber', 'event_espresso' ),
+	__('Luminous vivid amber', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:37
-	__( 'Light green cyan', 'event_espresso' ),
+	__('Light green cyan', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:41
-	__( 'Vivid green cyan', 'event_espresso' ),
+	__('Vivid green cyan', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:45
-	__( 'Pale cyan blue', 'event_espresso' ),
+	__('Pale cyan blue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:49
-	__( 'Vivid cyan blue', 'event_espresso' ),
+	__('Vivid cyan blue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:53
-	__( 'Vivid purple', 'event_espresso' ),
+	__('Vivid purple', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/ColorPicker/constants.ts:9
-	__( 'Black', 'event_espresso' ),
+	__('Black', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:8
 	// Reference: packages/ui-components/src/Modal/ModalWithAlert.tsx:24
-	__( 'Are you sure you want to close this?', 'event_espresso' ),
+	__('Are you sure you want to close this?', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmClose.tsx:9
 	// Reference: packages/ui-components/src/Modal/ModalWithAlert.tsx:25
-	__( 'Yes, discard changes', 'event_espresso' ),
+	__('Yes, discard changes', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/ConfirmDelete.tsx:7
-	__( 'Are you sure you want to delete this?', 'event_espresso' ),
+	__('Are you sure you want to delete this?', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmWithButton.tsx:11
-	__( 'Please confirm this action.', 'event_espresso' ),
+	__('Please confirm this action.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:39
-	__( 'cancel', 'event_espresso' ),
+	__('cancel', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Confirm/useConfirmationDialog.tsx:40
-	__( 'confirm', 'event_espresso' ),
+	__('confirm', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/CurrencyDisplay/CurrencyDisplay.tsx:34
-	__( 'free', 'event_espresso' ),
+	__('free', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DateTimeRangePicker/DateTimeRangePicker.tsx:117
 	// Reference: packages/ui-components/src/Popover/PopoverForm/PopoverForm.tsx:44
-	__( 'save', 'event_espresso' ),
+	__('save', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DebugInfo/DebugInfo.tsx:36
-	__( 'Hide Debug Info', 'event_espresso' ),
+	__('Hide Debug Info', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/DebugInfo/DebugInfo.tsx:36
-	__( 'Show Debug Info', 'event_espresso' ),
+	__('Show Debug Info', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EditDateRangeButton/EditDateRangeButton.tsx:49
-	__( 'Edit Start and End Dates and Times', 'event_espresso' ),
+	__('Edit Start and End Dates and Times', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/CopyEntity.tsx:8
-	__( 'copy', 'event_espresso' ),
+	__('copy', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/EditEntity.tsx:8
-	__( 'edit', 'event_espresso' ),
+	__('edit', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/TrashEntity.tsx:8
-	__( 'trash', 'event_espresso' ),
+	__('trash', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityActionsMenu/entityMenuItems/Untrash.tsx:8
-	__( 'untrash', 'event_espresso' ),
+	__('untrash', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/EntityList.tsx:23
-	__( 'OOPS!', 'event_espresso' ),
+	__('OOPS!', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/EntityList.tsx:23
-	__( 'Error Loading Entites List', 'event_espresso' ),
+	__('Error Loading Entites List', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/RegistrationsLink/index.tsx:12
-	__( 'click to open the registrations admin page in a new tab or window', 'event_espresso' ),
+	__('click to open the registrations admin page in a new tab or window', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/CardViewFilterButton.tsx:22
-	__( 'card view', 'event_espresso' ),
+	__('card view', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/TableViewFilterButton.tsx:21
-	__( 'table view', 'event_espresso' ),
+	__('table view', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleBulkActionsButton.tsx:8
-	__( 'hide bulk actions', 'event_espresso' ),
+	__('hide bulk actions', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleBulkActionsButton.tsx:8
-	__( 'show bulk actions', 'event_espresso' ),
+	__('show bulk actions', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/EntityList/filterBar/buttons/ToggleFiltersButton.tsx:23
-	__( 'filters', 'event_espresso' ),
+	__('filters', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Legend/ToggleLegendButton.tsx:38
-	__( 'legend', 'event_espresso' ),
+	__('legend', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/LoadingNotice/LoadingNotice.tsx:11
-	__( 'loading…', 'event_espresso' ),
+	__('loading…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Modal/Modal.tsx:59
-	__( 'close modal', 'event_espresso' ),
+	__('close modal', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:10
-	__( 'jump to previous', 'event_espresso' ),
+	__('jump to previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:11
-	__( 'jump to next', 'event_espresso' ),
+	__('jump to next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:12
-	__( 'page', 'event_espresso' ),
+	__('page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:8
-	__( 'previous', 'event_espresso' ),
+	__('previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/ItemRender.tsx:9
-	__( 'next', 'event_espresso' ),
+	__('next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/PerPage.tsx:37
-	__( 'items per page', 'event_espresso' ),
+	__('items per page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:10
 	/* translators: %s is per page value */
-	__( '%s / page', 'event_espresso' ),
+	__('%s / page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:13
-	__( 'Next Page', 'event_espresso' ),
+	__('Next Page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Pagination/constants.ts:14
-	__( 'Previous Page', 'event_espresso' ),
+	__('Previous Page', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/PercentSign/index.tsx:10
-	__( '%', 'event_espresso' ),
+	__('%', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:31
 	/* translators: entity type to select */
-	__( 'Select an existing %s to use as a template.', 'event_espresso' ),
+	__('Select an existing %s to use as a template.', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:38
-	__( 'or', 'event_espresso' ),
+	__('or', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:43
 	/* translators: entity type to add */
-	__( 'Add a new %s and insert details manually', 'event_espresso' ),
+	__('Add a new %s and insert details manually', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/SimpleEntityList/EntityOptionsRow/index.tsx:48
-	__( 'Add New', 'event_espresso' ),
+	__('Add New', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Stepper/buttons/Next.tsx:8
-	__( 'Next', 'event_espresso' ),
+	__('Next', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Stepper/buttons/Previous.tsx:8
-	__( 'Previous', 'event_espresso' ),
+	__('Previous', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/Steps/Steps.tsx:31
-	__( 'Steps', 'event_espresso' ),
+	__('Steps', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TabbableText/index.tsx:21
-	__( 'click to edit…', 'event_espresso' ),
+	__('click to edit…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:14
-	__( 'The Website\'s Time Zone', 'event_espresso' ),
+	__('The Website\'s Time Zone', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:19
-	__( 'UTC (Greenwich Mean Time)', 'event_espresso' ),
+	__('UTC (Greenwich Mean Time)', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/Content.tsx:9
-	__( 'Your Local Time Zone', 'event_espresso' ),
+	__('Your Local Time Zone', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/TimezoneTimeInfo.tsx:25
-	__( 'click for timezone information', 'event_espresso' ),
+	__('click for timezone information', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/TimezoneTimeInfo/TimezoneTimeInfo.tsx:30
-	__( 'This Date Converted To:', 'event_espresso' ),
+	__('This Date Converted To:', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:120
-	__( 'Add New Venue', 'event_espresso' ),
+	__('Add New Venue', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:36
-	__( '~ no venue ~', 'event_espresso' ),
+	__('~ no venue ~', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:43
-	__( 'assign venue…', 'event_espresso' ),
+	__('assign venue…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/VenueSelector/VenueSelector.tsx:44
-	__( 'click to select a venue…', 'event_espresso' ),
+	__('click to select a venue…', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:51
-	__( 'select all', 'event_espresso' ),
+	__('select all', 'event_espresso'),
 
 	// Reference: packages/ui-components/src/bulkEdit/BulkActions.tsx:54
-	__( 'apply', 'event_espresso' )
+	__('apply', 'event_espresso')
 );
 /* THIS IS THE END OF THE GENERATED FILE */

espresso.php

Indentation +107 added lines, -107 removed lines

@@ -37,138 +37,138 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time.
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time.
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
 <div class="error">
 	<p>
 		<?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
 	</p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '7.4.0');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
 <div class="error">
 	<p>
 		<?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="https://www.php.net/downloads.php">https://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="https://www.php.net/downloads.php">https://php.net/downloads.php</a>'
+					);
+					?>
 	</p>
 </div>
 <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
 
-        require_once __DIR__ . '/vendor/autoload.php';
+		require_once __DIR__ . '/vendor/autoload.php';
 
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version(): string
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '5.0.15.rc.000');
-        }
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version(): string
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '5.0.15.rc.000');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-            update_option('event-espresso-core_allow_tracking', 'no');
-            update_option('event-espresso-core_tracking_notice', 'hide');
-            // Run WP GraphQL activation callback
-            espressoLoadWpGraphQL();
-            graphql_activation_callback();
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+			update_option('event-espresso-core_allow_tracking', 'no');
+			update_option('event-espresso-core_tracking_notice', 'hide');
+			// Run WP GraphQL activation callback
+			espressoLoadWpGraphQL();
+			graphql_activation_callback();
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        /**
-         * espresso_plugin_deactivation
-         */
-        function espresso_plugin_deactivation()
-        {
-            // Run WP GraphQL deactivation callback
-            espressoLoadWpGraphQL();
-            graphql_deactivation_callback();
-            delete_option('event-espresso-core_allow_tracking');
-            delete_option('event-espresso-core_tracking_notice');
-        }
-        register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
+		/**
+		 * espresso_plugin_deactivation
+		 */
+		function espresso_plugin_deactivation()
+		{
+			// Run WP GraphQL deactivation callback
+			espressoLoadWpGraphQL();
+			graphql_deactivation_callback();
+			delete_option('event-espresso-core_allow_tracking');
+			delete_option('event-espresso-core_tracking_notice');
+		}
+		register_deactivation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_deactivation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin(string $plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin(string $plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }
 
 
 if (! function_exists('espressoLoadWpGraphQL')) {
-    function espressoLoadWpGraphQL()
-    {
-        if (
-            ! class_exists('WPGraphQL')
-            && is_readable(__DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php')
-        ) {
-            require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
-        }
-    }
+	function espressoLoadWpGraphQL()
+	{
+		if (
+			! class_exists('WPGraphQL')
+			&& is_readable(__DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php')
+		) {
+			require_once __DIR__ . '/vendor/wp-graphql/wp-graphql/wp-graphql.php';
+		}
+	}
 }

core/EE_Session.core.php

Indentation +1299 added lines, -1299 removed lines

@@ -24,1292 +24,1292 @@ 
  */
 class EE_Session implements SessionIdentifierInterface
 {
-    const session_id_prefix    = 'ee_ssn_';
-
-    const hash_check_prefix    = 'ee_shc_';
-
-    const OPTION_NAME_SETTINGS = 'ee_session_settings';
-
-    const STATUS_CLOSED        = 0;
-
-    const STATUS_OPEN          = 1;
-
-    const SAVE_STATE_CLEAN     = 'clean';
-
-    const SAVE_STATE_DIRTY     = 'dirty';
-
-
-    private static ?EE_Session $_instance = null;
-
-    protected ?Base64Encoder $encryption = null;
-
-    protected ?CacheStorageInterface $cache_storage = null;
-
-    protected ?RequestInterface $request = null;
-
-    protected ?SessionStartHandler $session_start_handler = null;
-
-    /**
-     * how long an EE session lasts
-     * default session lifespan of 1 hour (for not so instant IPNs)
-     *
-     * @var SessionLifespan|null $session_lifespan
-     */
-    private ?SessionLifespan $session_lifespan = null;
-
-    /**
-     * the session id
-     *
-     * @var string
-     */
-    private string $_sid = '';
-
-    /**
-     * session id salt
-     *
-     * @var string
-     */
-    private string $_sid_salt = '';
-
-    private array $_session_data = [];
-
-    /**
-     * session expiration time as Unix timestamp in GMT
-     *
-     * @var int
-     */
-    private int $_expiration = 0;
-
-    /**
-     * whether session has expired at some point
-     *
-     * @var boolean
-     */
-    private bool $_expired = false;
-
-    /**
-     * current time as Unix timestamp in GMT
-     *
-     * @var int|null
-     */
-    private ?int $_time = null;
-
-    /**
-     * whether to encrypt session data
-     *
-     * @var bool
-     */
-    private bool $_use_encryption = false;
-
-    /**
-     * well... according to the server...
-     *
-     * @var string
-     */
-    private string $_user_agent = '';
-
-
-    /**
-     * array for defining default session vars
-     *
-     * @var array
-     */
-    private array $_default_session_vars = [
-        'id'            => null,
-        'user_id'       => null,
-        'ip_address'    => null,
-        'user_agent'    => null,
-        'init_access'   => null,
-        'last_access'   => null,
-        'expiration'    => null,
-        'pages_visited' => [],
-    ];
-
-    /**
-     * timestamp for when last garbage collection cycle was performed
-     *
-     * @var int $_last_gc
-     */
-    private int $_last_gc = 0;
-
-    /**
-     * whether session is active or not
-     *
-     * @var int $status
-     */
-    private int $status = EE_Session::STATUS_CLOSED;
-
-    /**
-     * whether session data has changed therefore requiring a session save
-     *
-     * @var string $save_state
-     */
-    private string $save_state = EE_Session::SAVE_STATE_CLEAN;
-
-
-    /**
-     * @singleton method used to instantiate class object
-     * @param CacheStorageInterface|null $cache_storage
-     * @param SessionLifespan|null       $lifespan
-     * @param RequestInterface|null      $request
-     * @param SessionStartHandler|null   $session_start_handler
-     * @param Base64Encoder|null         $encryption
-     * @return EE_Session|null
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function instance(
-        CacheStorageInterface $cache_storage = null,
-        SessionLifespan $lifespan = null,
-        RequestInterface $request = null,
-        SessionStartHandler $session_start_handler = null,
-        Base64Encoder $encryption = null
-    ): ?EE_Session {
-        // check if class object is instantiated
-        // session loading is turned ON by default, but prior to the init hook, can be turned back OFF via:
-        // add_filter( 'FHEE_load_EE_Session', '__return_false' );
-        if (
-            ! self::$_instance instanceof EE_Session
-            && $cache_storage instanceof CacheStorageInterface
-            && $lifespan instanceof SessionLifespan
-            && $request instanceof RequestInterface
-            && $session_start_handler instanceof SessionStartHandler
-            && apply_filters('FHEE_load_EE_Session', true)
-        ) {
-            self::$_instance = new self(
-                $cache_storage,
-                $lifespan,
-                $request,
-                $session_start_handler,
-                $encryption
-            );
-        }
-        return self::$_instance;
-    }
-
-
-    /**
-     * protected constructor to prevent direct creation
-     *
-     * @param CacheStorageInterface $cache_storage
-     * @param SessionLifespan       $lifespan
-     * @param RequestInterface      $request
-     * @param SessionStartHandler   $session_start_handler
-     * @param Base64Encoder|null    $encryption
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function __construct(
-        CacheStorageInterface $cache_storage,
-        SessionLifespan $lifespan,
-        RequestInterface $request,
-        SessionStartHandler $session_start_handler,
-        Base64Encoder $encryption = null
-    ) {
-        // session loading is turned ON by default,
-        // but prior to the 'AHEE__EE_System__core_loaded_and_ready' hook
-        // (which currently fires on the init hook at priority 9),
-        // can be turned back OFF via: add_filter( 'FHEE_load_EE_Session', '__return_false' );
-        if (! apply_filters('FHEE_load_EE_Session', true)) {
-            return;
-        }
-        $this->session_start_handler = $session_start_handler;
-        $this->session_lifespan      = $lifespan;
-        $this->request               = $request;
-        if (! defined('ESPRESSO_SESSION')) {
-            define('ESPRESSO_SESSION', true);
-        }
-        // retrieve session options from db
-        $session_settings = (array) get_option(EE_Session::OPTION_NAME_SETTINGS, []);
-        if (! empty($session_settings)) {
-            // cycle though existing session options
-            foreach ($session_settings as $var_name => $session_setting) {
-                // set values for class properties
-                $var_name          = '_' . $var_name;
-                $this->{$var_name} = $session_setting;
-            }
-        }
-        $this->cache_storage = $cache_storage;
-        // are we using encryption?
-        $this->_use_encryption = $encryption instanceof Base64Encoder
-                                 && EE_Registry::instance()->CFG->admin->encode_session_data();
-        // encrypt data via: $this->encryption->encodeString();
-        $this->encryption = $encryption;
-        // filter hook allows outside functions/classes/plugins to change default empty cart
-        $extra_default_session_vars  = apply_filters('FHEE__EE_Session__construct__extra_default_session_vars', []);
-        $this->_default_session_vars = array_merge($this->_default_session_vars, $extra_default_session_vars);
-        // apply default session vars
-        $this->_set_defaults();
-        add_action('AHEE__EE_System__initialize', [$this, 'open_session']);
-        // check request for 'clear_session' param
-        add_action('AHEE__EE_Request_Handler__construct__complete', [$this, 'wp_loaded']);
-        // once everything is all said and done,
-        add_action('shutdown', [$this, 'update'], 100);
-        add_action('shutdown', [$this, 'garbageCollection'], 1000);
-        $this->configure_garbage_collection_filters();
-    }
-
-
-    /**
-     * @return bool
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function isLoadedAndActive(): bool
-    {
-        return did_action('AHEE__EE_System__core_loaded_and_ready')
-               && EE_Session::instance() instanceof EE_Session
-               && EE_Session::instance()->isActive();
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function isActive(): bool
-    {
-        return $this->status === EE_Session::STATUS_OPEN;
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidSessionDataException
-     * @throws RuntimeException
-     * @throws ReflectionException
-     */
-    public function open_session()
-    {
-        // Check for an existing session and retrieve it from the database, unless the system is in maintenance level 2.
-        if (DbStatus::isOnline() && ! $this->_espresso_session()) {
-            // or just start a new one
-            $this->_create_espresso_session();
-        }
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function expired(): bool
-    {
-        return $this->_expired;
-    }
-
-
-    /**
-     * @return void
-     */
-    public function reset_expired()
-    {
-        $this->_expired = false;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function expiration(): int
-    {
-        return $this->_expiration;
-    }
-
-
-    /**
-     * @return int
-     */
-    public function extension(): int
-    {
-        return apply_filters('FHEE__EE_Session__extend_expiration__seconds_added', 10 * MINUTE_IN_SECONDS);
-    }
-
-
-    /**
-     * @param int $time number of seconds to add to session expiration
-     */
-    public function extend_expiration(int $time = 0)
-    {
-        $time              = $time
-            ?: $this->extension();
-        $this->_expiration += absint($time);
-    }
-
-
-    /**
-     * @return int
-     */
-    public function lifespan(): int
-    {
-        return $this->session_lifespan->inSeconds();
-    }
-
-
-    /**
-     * Marks whether the session data has been updated or not.
-     * Valid options are:
-     *      EE_Session::SAVE_STATE_CLEAN - session data remains unchanged and updating is not necessary
-     *      EE_Session::SAVE_STATE_DIRTY - session data has changed since last save and needs to be updated
-     * default value is EE_Session::SAVE_STATE_DIRTY
-     *
-     * @param string $save_state
-     */
-    public function setSaveState(string $save_state = EE_Session::SAVE_STATE_DIRTY)
-    {
-        $valid_save_states = [
-            EE_Session::SAVE_STATE_CLEAN,
-            EE_Session::SAVE_STATE_DIRTY,
-        ];
-        if (! in_array($save_state, $valid_save_states, true)) {
-            $save_state = EE_Session::SAVE_STATE_DIRTY;
-        }
-        $this->save_state = $save_state;
-    }
-
-
-    /**
-     * This just sets some defaults for the _session data property
-     *
-     * @return void
-     */
-    private function _set_defaults()
-    {
-        // set some defaults
-        foreach ($this->_default_session_vars as $key => $default_var) {
-            if (is_array($default_var)) {
-                $this->_session_data[ $key ] = [];
-            } else {
-                $this->_session_data[ $key ] = '';
-            }
-        }
-    }
-
-
-    /**
-     * @retrieve  session data
-     * @return    string
-     */
-    public function id(): string
-    {
-        return $this->_sid;
-    }
-
-
-    /**
-     * @param EE_Cart $cart
-     * @return bool
-     */
-    public function set_cart(EE_Cart $cart): bool
-    {
-        $this->_session_data['cart'] = $cart;
-        $this->setSaveState();
-        return true;
-    }
-
-
-    /**
-     * reset_cart
-     */
-    public function reset_cart()
-    {
-        do_action('AHEE__EE_Session__reset_cart__before_reset', $this);
-        $this->_session_data['cart'] = null;
-        $this->setSaveState();
-    }
-
-
-    /**
-     * @return EE_Cart
-     */
-    public function cart(): ?EE_Cart
-    {
-        return isset($this->_session_data['cart']) && $this->_session_data['cart'] instanceof EE_Cart
-            ? $this->_session_data['cart']
-            : null;
-    }
-
-
-    /**
-     * @param EE_Checkout $checkout
-     * @return bool
-     */
-    public function set_checkout(EE_Checkout $checkout): bool
-    {
-        $this->_session_data['checkout'] = $checkout;
-        $this->setSaveState();
-        return true;
-    }
-
-
-    /**
-     * reset_checkout
-     */
-    public function reset_checkout()
-    {
-        do_action('AHEE__EE_Session__reset_checkout__before_reset', $this);
-        $this->_session_data['checkout'] = null;
-        $this->setSaveState();
-    }
-
-
-    /**
-     * @return EE_Checkout
-     */
-    public function checkout(): ?EE_Checkout
-    {
-        return isset($this->_session_data['checkout']) && $this->_session_data['checkout'] instanceof EE_Checkout
-            ? $this->_session_data['checkout']
-            : null;
-    }
-
-
-    /**
-     * @param EE_Transaction $transaction
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public function set_transaction(EE_Transaction $transaction): bool
-    {
-        // first remove the session from the transaction before we save the transaction in the session
-        $transaction->set_txn_session_data(null);
-        $this->_session_data['transaction'] = $transaction;
-        $this->setSaveState();
-        return true;
-    }
-
-
-    /**
-     * reset_transaction
-     */
-    public function reset_transaction()
-    {
-        do_action('AHEE__EE_Session__reset_transaction__before_reset', $this);
-        $this->_session_data['transaction'] = null;
-        $this->setSaveState();
-    }
-
-
-    /**
-     * @return EE_Transaction
-     */
-    public function transaction(): ?EE_Transaction
-    {
-        return isset($this->_session_data['transaction'])
-               && $this->_session_data['transaction'] instanceof EE_Transaction
-            ? $this->_session_data['transaction']
-            : null;
-    }
-
-
-    /**
-     * retrieve session data
-     *
-     * @param string|null $key
-     * @param bool        $reset_cache
-     * @return array|EE_Cart|EE_Checkout|EE_Transaction
-     */
-    public function get_session_data(?string $key = null, bool $reset_cache = false)
-    {
-        if ($reset_cache) {
-            $this->reset_cart();
-            $this->reset_checkout();
-            $this->reset_transaction();
-        }
-        if (! empty($key)) {
-            return $this->_session_data[ $key ] ?? null;
-        }
-        return $this->_session_data;
-    }
-
-
-    /**
-     * Returns TRUE on success, FALSE on fail
-     *
-     * @param array $data
-     * @return bool
-     */
-    public function set_session_data(array $data): bool
-    {
-        // nothing ??? bad data ??? go home!
-        if (empty($data)) {
-            EE_Error::add_error(
-                esc_html__(
-                    'No session data or invalid session data was provided.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        foreach ($data as $key => $value) {
-            if (isset($this->_default_session_vars[ $key ])) {
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'Sorry! %s is a default session datum and can not be reset.',
-                            'event_espresso'
-                        ),
-                        $key
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                return false;
-            }
-            $this->_session_data[ $key ] = $value;
-            $this->setSaveState();
-        }
-        return true;
-    }
-
-
-    /**
-     * @initiate session
-     * @return bool TRUE on success, FALSE on fail
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidSessionDataException
-     * @throws RuntimeException
-     * @throws ReflectionException
-     */
-    private function _espresso_session(): bool
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, '');
-        $this->session_start_handler->startSession();
-        $this->status = EE_Session::STATUS_OPEN;
-        // get our modified session ID
-        $this->_sid = $this->_generate_session_id();
-        // set the "user agent"
-        $this->_user_agent = $this->request->userAgent();
-        // now let's retrieve what's in the db
-        $session_data = $this->_retrieve_session_data();
-        if (empty($session_data)) {
-            // set initial site access time and the session expiration
-            $this->_set_init_access_and_expiration();
-            // set referer
-            $this->_session_data['pages_visited'][ $this->_session_data['init_access'] ] = esc_attr(
-                $this->request->getServerParam('HTTP_REFERER')
-            );
-            // no previous session = go back and create one (on top of the data above)
-            return false;
-        }
-        // get the current time in UTC
-        $this->_time = $this->_time !== null
-            ? $this->_time
-            : time();
-        // and reset the session expiration
-        $this->_expiration = $session_data['expiration'] ?? $this->_time + $this->session_lifespan->inSeconds();
-        // now the user agent
-        if ($session_data['user_agent'] !== $this->_user_agent) {
-            return false;
-        }
-        // wait a minute... how old are you?
-        if ($this->_time > $this->_expiration) {
-            // yer too old fer me!
-            $this->_expired = true;
-            // wipe out everything that isn't a default session datum
-            $this->clear_session(__CLASS__, __FUNCTION__);
-        }
-        // make event espresso session data available to plugin
-        $this->_session_data = array_merge($this->_session_data, $session_data);
-        return true;
-    }
-
-    private function sessionKey(string $prefix = ''): string
-    {
-        return $prefix . EE_Session::session_id_prefix . $this->_sid;
-    }
-
-    private function hashCheckKey(): string
-    {
-        return EE_Session::hash_check_prefix . $this->_sid;
-    }
-
-
-    /**
-     * _get_session_data
-     * Retrieves the session data, and attempts to correct any encoding issues that can occur due to improperly setup
-     * databases
-     *
-     * @return array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidSessionDataException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws RuntimeException
-     * @throws ReflectionException
-     */
-    protected function _retrieve_session_data(): array
-    {
-        try {
-            // we're using WP's Transient API to store session data using the PHP session ID as the option name
-            $session_data = $this->cache_storage->get($this->sessionKey(), false);
-            if (empty($session_data)) {
-                return [];
-            }
-            if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
-                $hash_check = $this->cache_storage->get($this->hashCheckKey(), false);
-                if ($hash_check && $hash_check !== md5($session_data)) {
-                    EE_Error::add_error(
-                        sprintf(
-                            esc_html__(
-                                'The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.',
-                                'event_espresso'
-                            ),
-                            $this->sessionKey()
-                        ),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                }
-            }
-        } catch (Exception $e) {
-            // let's just eat that error for now and attempt to correct any corrupted data
-            global $wpdb;
-            $row          = $wpdb->get_row(
-                $wpdb->prepare(
-                    "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1",
-                    $this->sessionKey('_transient_')
-                )
-            );
-            $session_data = is_object($row) ? $row->option_value : null;
-            if ($session_data) {
-                $session_data = preg_replace_callback(
-                    '!s:(d+):"(.*?)";!',
-                    function ($match) {
-                        return $match[1] === strlen($match[2])
-                            ? $match[0]
-                            : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
-                    },
-                    $session_data
-                );
-            }
-            $session_data = maybe_unserialize($session_data);
-        }
-        // in case the data is encoded... try to decode it
-        $session_data = $this->_use_encryption
-            ? $this->encryption->decodeString($session_data)
-            : $session_data;
-        if (! is_array($session_data)) {
-            try {
-                $session_data = maybe_unserialize($session_data);
-            } catch (Exception $e) {
-                $msg = esc_html__(
-                    'An error occurred while attempting to unserialize the session data.',
-                    'event_espresso'
-                );
-                $msg .= WP_DEBUG
-                    ? '<br><pre>'
-                      . print_r($session_data, true)
-                      . '</pre><br>'
-                      . $this->find_serialize_error($session_data)
-                    : '';
-                $this->cache_storage->delete($this->sessionKey());
-                throw new InvalidSessionDataException($msg, 0, $e);
-            }
-        }
-        // just a check to make sure the session array is indeed an array
-        if (! is_array($session_data)) {
-            // no?!?! then something is wrong
-            $msg = esc_html__(
-                'The session data is missing, invalid, or corrupted.',
-                'event_espresso'
-            );
-            $msg .= WP_DEBUG
-                ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
-                : '';
-            $this->cache_storage->delete($this->sessionKey());
-            throw new InvalidSessionDataException($msg);
-        }
-        if (isset($session_data['transaction']) && absint($session_data['transaction']) !== 0) {
-            $session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
-                $session_data['transaction']
-            );
-        }
-        return $session_data;
-    }
-
-
-    /**
-     * _generate_session_id
-     * Retrieves the PHP session id either directly from the PHP session,
-     * or from the request array if it was passed in from an AJAX request.
-     * The session id is then salted and hashed (mmm sounds tasty)
-     * so that it can be safely used as a request param
-     *
-     * @return string
-     */
-    protected function _generate_session_id(): string
-    {
-        // check if the SID was passed explicitly, otherwise get from session, then add salt and hash it to reduce length
-        $session_id = $this->request->requestParamIsSet('EESID')
-            ? $this->request->getRequestParam('EESID')
-            : md5(session_id() . get_current_blog_id() . $this->_get_sid_salt());
-        return apply_filters('FHEE__EE_Session___generate_session_id__session_id', $session_id);
-    }
-
-
-    /**
-     * _get_sid_salt
-     *
-     * @return string
-     */
-    protected function _get_sid_salt(): string
-    {
-        // was session id salt already saved to db ?
-        if (empty($this->_sid_salt)) {
-            // no?  then maybe use WP defined constant
-            if (defined('AUTH_SALT')) {
-                $this->_sid_salt = AUTH_SALT;
-            }
-            // if salt doesn't exist or is too short
-            if (strlen($this->_sid_salt) < 32) {
-                // create a new one
-                $this->_sid_salt = wp_generate_password(64);
-            }
-            // and save it as a permanent session setting
-            $this->updateSessionSettings(['sid_salt' => $this->_sid_salt]);
-        }
-        return $this->_sid_salt;
-    }
-
-
-    /**
-     * _set_init_access_and_expiration
-     *
-     * @return void
-     */
-    protected function _set_init_access_and_expiration()
-    {
-        $this->_time       = time();
-        $this->_expiration = $this->_time + $this->session_lifespan->inSeconds();
-        // set initial site access time
-        $this->_session_data['init_access'] = $this->_time;
-        // and the session expiration
-        $this->_session_data['expiration'] = $this->_expiration;
-    }
-
-
-    /**
-     * @update session data  prior to saving to the db
-     * @param bool $new_session
-     * @return bool TRUE on success, FALSE on fail
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function update(bool $new_session = false): bool
-    {
-        $this->_session_data = isset($this->_session_data['id']) ? $this->_session_data : [];
-        if (empty($this->_session_data)) {
-            $this->_set_defaults();
-        }
-        $session_data = [];
-        foreach ($this->_session_data as $key => $value) {
-            switch ($key) {
-                case 'id':
-                    // session ID
-                    $session_data['id'] = $this->_sid;
-                    break;
-                case 'ip_address':
-                    // visitor ip address
-                    $session_data['ip_address'] = $this->request->ipAddress();
-                    break;
-                case 'user_agent':
-                    // visitor user_agent
-                    $session_data['user_agent'] = $this->_user_agent;
-                    break;
-                case 'init_access':
-                    $session_data['init_access'] = absint($value);
-                    break;
-                case 'last_access':
-                    // current access time
-                    $session_data['last_access'] = $this->_time;
-                    break;
-                case 'expiration':
-                    // when the session expires
-                    $session_data['expiration'] = ! empty($this->_expiration)
-                        ? $this->_expiration
-                        : $session_data['init_access'] + $this->session_lifespan->inSeconds();
-                    break;
-                case 'user_id':
-                    // current user if logged in
-                    $session_data['user_id'] = $this->_wp_user_id();
-                    break;
-                case 'pages_visited':
-                    $page_visit = $this->_get_page_visit();
-                    if ($page_visit) {
-                        // set pages visited where the first will be the http referrer
-                        $this->_session_data['pages_visited'][ $this->_time ] = $page_visit;
-                        // we'll only save the last 10 page visits.
-                        $session_data['pages_visited'] = array_slice($this->_session_data['pages_visited'], -10);
-                    }
-                    break;
-                default:
-                    // carry any other data over
-                    $session_data[ $key ] = $this->_session_data[ $key ];
-            }
-        }
-        $this->_session_data = $session_data;
-        // creating a new session does not require saving to the db just yet
-        if (! $new_session) {
-            // ready? let's save
-            if ($this->_save_session_to_db()) {
-                return true;
-            }
-            return false;
-        }
-        // meh, why not?
-        return true;
-    }
-
-
-    /**
-     * @create session data array
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function _create_espresso_session()
-    {
-        do_action('AHEE_log', __CLASS__, __FUNCTION__, '');
-        // use the update function for now with $new_session arg set to TRUE
-        $this->update(true);
-    }
-
-
-    /**
-     * Detects if there is anything worth saving in the session (eg the cart is a good one, notices are pretty good
-     * too). This is used when determining if we want to save the session or not.
-     *
-     * @return bool
-     * @since 4.9.67.p
-     */
-    private function sessionHasStuffWorthSaving(): bool
-    {
-        if ($this->save_state === EE_Session::SAVE_STATE_DIRTY) {
-            return true;
-        }
-        $default_session_vars = array_keys($this->_default_session_vars);
-        foreach ($this->_session_data as $key => $sessionDatum) {
-            if (in_array($key, $default_session_vars, true)) {
-                continue;
-            }
-            if (! empty($sessionDatum)) {
-                return true;
-            }
-            if (
-                $key === 'ee_notices'
-                && (
-                    ! empty($this->_session_data['ee_notices']['attention'])
-                    || ! empty($this->_session_data['ee_notices']['errors'])
-                    || ! empty($this->_session_data['ee_notices']['success'])
-                )
-            ) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-
-    /**
-     * _save_session_to_db
-     *
-     * @param bool $clear_session
-     * @return bool
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    private function _save_session_to_db(bool $clear_session = false): bool
-    {
-        // don't save sessions for crawlers
-        // and unless we're deleting the session data, don't save anything if there isn't a cart
-        if (
-            $this->request->isBot()
-            || (
-                ! $clear_session
-                && ! $this->sessionHasStuffWorthSaving()
-                && apply_filters('FHEE__EE_Session___save_session_to_db__abort_session_save', true)
-            )
-        ) {
-            return false;
-        }
-        $transaction = $this->transaction();
-        if ($transaction instanceof EE_Transaction) {
-            if (! $transaction->ID()) {
-                $transaction->save();
-            }
-            $this->_session_data['transaction'] = $transaction->ID();
-        }
-        // then serialize all of our session data
-        $session_data = serialize($this->_session_data);
-        // do we need to also encode it to avoid corrupted data when saved to the db?
-        $session_data = $this->_use_encryption
-            ? $this->encryption->encodeString($session_data)
-            : $session_data;
-        // maybe save hash check
-        if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
-            $this->cache_storage->add(
-                $this->hashCheckKey(),
-                md5($session_data),
-                $this->session_lifespan->inSeconds()
-            );
-        }
-        // we're using the Transient API for storing session data,
-        $saved = $this->cache_storage->add(
-            $this->sessionKey(),
-            $session_data,
-            $this->session_lifespan->inSeconds()
-        );
-        $this->setSaveState(EE_Session::SAVE_STATE_CLEAN);
-        return $saved;
-    }
-
-
-    /**
-     * @get    the full page request the visitor is accessing
-     * @return string
-     */
-    public function _get_page_visit(): string
-    {
-        $page_visit = home_url('/') . 'wp-admin/admin-ajax.php';
-        // check for request url
-        if ($this->request->serverParamIsSet('REQUEST_URI')) {
-            $page_id     = '?';
-            $e_reg       = '';
-            $request_uri = $this->request->getServerParam('REQUEST_URI');
-            $ru_bits     = explode('?', $request_uri);
-            $request_uri = $ru_bits[0];
-            $http_host   = $this->request->getServerParam('HTTP_HOST');
-            // check for page_id in SERVER REQUEST
-            if ($this->request->requestParamIsSet('page_id')) {
-                // rebuild $e_reg without any of the extra parameters
-                $page_id .= 'page_id=' . $this->request->getRequestParam('page_id', 0, 'int') . '&amp;';
-            }
-            // check for $e_reg in SERVER REQUEST
-            if ($this->request->requestParamIsSet('ee')) {
-                // rebuild $e_reg without any of the extra parameters
-                $e_reg = 'ee=' . $this->request->getRequestParam('ee');
-            }
-            $page_visit = esc_url(rtrim($http_host . $request_uri . $page_id . $e_reg, '?'));
-        }
-        return $page_visit !== home_url('/wp-admin/admin-ajax.php')
-            ? $page_visit
-            : '';
-    }
-
-
-    /**
-     * @the    current wp user id
-     * @return int
-     */
-    public function _wp_user_id(): int
-    {
-        // if I need to explain the following lines of code, then you shouldn't be looking at this!
-        return get_current_user_id();
-    }
-
-
-    /**
-     * Clear EE_Session data
-     *
-     * @param string $class
-     * @param string $function
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function clear_session(string $class = '', string $function = '')
-    {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' . $function . '()');
-        $this->reset_cart();
-        $this->reset_checkout();
-        $this->reset_transaction();
-        // wipe out everything that isn't a default session datum
-        $this->reset_data(array_keys($this->_session_data));
-        // reset initial site access time and the session expiration
-        $this->_set_init_access_and_expiration();
-        $this->setSaveState();
-        $this->_save_session_to_db(true);
-    }
-
-
-    /**
-     * resets all non-default session vars. Returns TRUE on success, FALSE on fail
-     *
-     * @param array|mixed $keys_to_reset
-     * @param bool        $show_all_notices
-     * @return bool
-     */
-    public function reset_data($keys_to_reset = [], bool $show_all_notices = false): bool
-    {
-        $keys_to_reset = (array) apply_filters(
-            'FHEE__EE_Session__reset_data__session_data_keys_to_reset',
-            (array) $keys_to_reset
-        );
-        // nothing ??? go home!
-        if (empty($keys_to_reset)) {
-            EE_Error::add_error(
-                esc_html__(
-                    'No session data could be reset, because no session var name was provided.',
-                    'event_espresso'
-                ),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-        $return_value = true;
-        // since $keys_to_reset is an array, cycle through the values
-        foreach ($keys_to_reset as $key_to_reset) {
-            // first check to make sure it is a valid session var
-            if (! isset($this->_session_data[ $key_to_reset ]) && $show_all_notices) {
-                // oops! that session var does not exist!
-                EE_Error::add_error(
-                    sprintf(
-                        esc_html__(
-                            'The session item provided, %s, is invalid or does not exist.',
-                            'event_espresso'
-                        ),
-                        $key_to_reset
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-                $return_value = false;
-                continue;
-            }
-            // then check to make sure it is not a default var
-            if (array_key_exists($key_to_reset, $this->_default_session_vars)) {
-                // yeeeeeeeeerrrrrrrrrrr OUT !!!!
-                if ($show_all_notices) {
-                    EE_Error::add_error(
-                        sprintf(
-                            esc_html__(
-                                'Sorry! %s is a default session datum and can not be reset.',
-                                'event_espresso'
-                            ),
-                            $key_to_reset
-                        ),
-                        __FILE__,
-                        __FUNCTION__,
-                        __LINE__
-                    );
-                }
-                $return_value = false;
-                continue;
-            }
-            // remove session var
-            unset($this->_session_data[ $key_to_reset ]);
-            $this->setSaveState();
-            if ($show_all_notices) {
-                EE_Error::add_success(
-                    sprintf(
-                        esc_html__('The session variable %s was removed.', 'event_espresso'),
-                        $key_to_reset
-                    ),
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                );
-            }
-        } // end of foreach
-        return $return_value;
-    }
-
-
-    /**
-     *   wp_loaded
-     *
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     */
-    public function wp_loaded()
-    {
-        if ($this->request->requestParamIsSet('clear_session')) {
-            $this->clear_session(__CLASS__, __FUNCTION__);
-        }
-    }
-
-
-    /**
-     * Used to reset the entire object (for tests).
-     *
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws InvalidArgumentException
-     * @throws ReflectionException
-     * @since 4.3.0
-     */
-    public function reset_instance()
-    {
-        $this->clear_session();
-        self::$_instance = null;
-    }
-
-
-    public function configure_garbage_collection_filters()
-    {
-        // run old filter we had for controlling session cleanup
-        $expired_session_transient_delete_query_limit = absint(
-            apply_filters(
-                'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit',
-                50
-            )
-        );
-        // is there a value? or one that is different from the default 50 records?
-        if ($expired_session_transient_delete_query_limit === 0) {
-            // hook into TransientCacheStorage in case Session cleanup was turned off
-            add_filter('FHEE__TransientCacheStorage__transient_cleanup_schedule', '__return_zero');
-        } elseif ($expired_session_transient_delete_query_limit !== 50) {
-            // or use that for the new transient cleanup query limit
-            add_filter(
-                'FHEE__TransientCacheStorage__clearExpiredTransients__limit',
-                function () use ($expired_session_transient_delete_query_limit) {
-                    return $expired_session_transient_delete_query_limit;
-                }
-            );
-        }
-    }
-
-
-    /**
-     * @see http://stackoverflow.com/questions/10152904/unserialize-function-unserialize-error-at-offset/21389439#10152996
-     * @param string $data1
-     * @return string
-     */
-    private function find_serialize_error(string $data1): string
-    {
-        $error = '<pre>';
-        $data2 = preg_replace_callback(
-            '!s:(\d+):"(.*?)";!',
-            function ($match) {
-                return ($match[1] === strlen($match[2]))
-                    ? $match[0]
-                    : 's:'
-                      . strlen($match[2])
-                      . ':"'
-                      . $match[2]
-                      . '";';
-            },
-            $data1
-        );
-        $max   = (strlen($data1) > strlen($data2))
-            ? strlen($data1)
-            : strlen($data2);
-        $error .= $data1 . PHP_EOL;
-        $error .= $data2 . PHP_EOL;
-        for ($i = 0; $i < $max; $i++) {
-            if (@$data1[ $i ] !== @$data2[ $i ]) {
-                $error  .= 'Difference ' . @$data1[ $i ] . ' != ' . @$data2[ $i ] . PHP_EOL;
-                $error  .= "\t-> ORD number " . ord(@$data1[ $i ]) . ' != ' . ord(@$data2[ $i ]) . PHP_EOL;
-                $error  .= "\t-> Line Number = $i" . PHP_EOL;
-                $start  = ($i - 20);
-                $start  = ($start < 0)
-                    ? 0
-                    : $start;
-                $length = 40;
-                $point  = $max - $i;
-                if ($point < 20) {
-                    $rlength = 1;
-                    $rpoint  = -$point;
-                } else {
-                    $rpoint  = $length - 20;
-                    $rlength = 1;
-                }
-                $error .= "\t-> Section Data1  = ";
-                $error .= substr_replace(
-                    substr($data1, $start, $length),
-                    "<b style=\"color:green\">$i</b>",
-                    $rpoint,
-                    $rlength
-                );
-                $error .= PHP_EOL;
-                $error .= "\t-> Section Data2  = ";
-                $error .= substr_replace(
-                    substr($data2, $start, $length),
-                    "<b style=\"color:red\">$i</b>",
-                    $rpoint,
-                    $rlength
-                );
-                $error .= PHP_EOL;
-            }
-        }
-        $error .= '</pre>';
-        return $error;
-    }
-
-
-    /**
-     * Saves an  array of settings used for configuring aspects of session behaviour
-     *
-     * @param array $updated_settings
-     */
-    private function updateSessionSettings(array $updated_settings = [])
-    {
-        // add existing settings, but only if not included in incoming $updated_settings array
-        $updated_settings += get_option(EE_Session::OPTION_NAME_SETTINGS, []);
-        update_option(EE_Session::OPTION_NAME_SETTINGS, $updated_settings);
-    }
-
-
-    /**
-     * garbage_collection
-     */
-    public function garbageCollection()
-    {
-        // only perform during regular requests if last garbage collection was over an hour ago
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && (time() - HOUR_IN_SECONDS) >= $this->_last_gc) {
-            $this->_last_gc = time();
-            $this->updateSessionSettings(['last_gc' => $this->_last_gc]);
-            /** @type WPDB $wpdb */
-            global $wpdb;
-            // filter the query limit. Set to 0 to turn off garbage collection
-            $expired_session_transient_delete_query_limit = absint(
-                apply_filters(
-                    'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit',
-                    50
-                )
-            );
-            // non-zero LIMIT means take out the trash
-            if ($expired_session_transient_delete_query_limit) {
-                $session_key    = str_replace('_', '\_', EE_Session::session_id_prefix);
-                $hash_check_key = str_replace('_', '\_', EE_Session::hash_check_prefix);
-                // since transient expiration timestamps are set in the future, we can compare against NOW,
-                // but we only want to pick up any trash that's been around for more than a day
-                $expiration = time() - DAY_IN_SECONDS;
-                $SQL        = "
+	const session_id_prefix    = 'ee_ssn_';
+
+	const hash_check_prefix    = 'ee_shc_';
+
+	const OPTION_NAME_SETTINGS = 'ee_session_settings';
+
+	const STATUS_CLOSED        = 0;
+
+	const STATUS_OPEN          = 1;
+
+	const SAVE_STATE_CLEAN     = 'clean';
+
+	const SAVE_STATE_DIRTY     = 'dirty';
+
+
+	private static ?EE_Session $_instance = null;
+
+	protected ?Base64Encoder $encryption = null;
+
+	protected ?CacheStorageInterface $cache_storage = null;
+
+	protected ?RequestInterface $request = null;
+
+	protected ?SessionStartHandler $session_start_handler = null;
+
+	/**
+	 * how long an EE session lasts
+	 * default session lifespan of 1 hour (for not so instant IPNs)
+	 *
+	 * @var SessionLifespan|null $session_lifespan
+	 */
+	private ?SessionLifespan $session_lifespan = null;
+
+	/**
+	 * the session id
+	 *
+	 * @var string
+	 */
+	private string $_sid = '';
+
+	/**
+	 * session id salt
+	 *
+	 * @var string
+	 */
+	private string $_sid_salt = '';
+
+	private array $_session_data = [];
+
+	/**
+	 * session expiration time as Unix timestamp in GMT
+	 *
+	 * @var int
+	 */
+	private int $_expiration = 0;
+
+	/**
+	 * whether session has expired at some point
+	 *
+	 * @var boolean
+	 */
+	private bool $_expired = false;
+
+	/**
+	 * current time as Unix timestamp in GMT
+	 *
+	 * @var int|null
+	 */
+	private ?int $_time = null;
+
+	/**
+	 * whether to encrypt session data
+	 *
+	 * @var bool
+	 */
+	private bool $_use_encryption = false;
+
+	/**
+	 * well... according to the server...
+	 *
+	 * @var string
+	 */
+	private string $_user_agent = '';
+
+
+	/**
+	 * array for defining default session vars
+	 *
+	 * @var array
+	 */
+	private array $_default_session_vars = [
+		'id'            => null,
+		'user_id'       => null,
+		'ip_address'    => null,
+		'user_agent'    => null,
+		'init_access'   => null,
+		'last_access'   => null,
+		'expiration'    => null,
+		'pages_visited' => [],
+	];
+
+	/**
+	 * timestamp for when last garbage collection cycle was performed
+	 *
+	 * @var int $_last_gc
+	 */
+	private int $_last_gc = 0;
+
+	/**
+	 * whether session is active or not
+	 *
+	 * @var int $status
+	 */
+	private int $status = EE_Session::STATUS_CLOSED;
+
+	/**
+	 * whether session data has changed therefore requiring a session save
+	 *
+	 * @var string $save_state
+	 */
+	private string $save_state = EE_Session::SAVE_STATE_CLEAN;
+
+
+	/**
+	 * @singleton method used to instantiate class object
+	 * @param CacheStorageInterface|null $cache_storage
+	 * @param SessionLifespan|null       $lifespan
+	 * @param RequestInterface|null      $request
+	 * @param SessionStartHandler|null   $session_start_handler
+	 * @param Base64Encoder|null         $encryption
+	 * @return EE_Session|null
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function instance(
+		CacheStorageInterface $cache_storage = null,
+		SessionLifespan $lifespan = null,
+		RequestInterface $request = null,
+		SessionStartHandler $session_start_handler = null,
+		Base64Encoder $encryption = null
+	): ?EE_Session {
+		// check if class object is instantiated
+		// session loading is turned ON by default, but prior to the init hook, can be turned back OFF via:
+		// add_filter( 'FHEE_load_EE_Session', '__return_false' );
+		if (
+			! self::$_instance instanceof EE_Session
+			&& $cache_storage instanceof CacheStorageInterface
+			&& $lifespan instanceof SessionLifespan
+			&& $request instanceof RequestInterface
+			&& $session_start_handler instanceof SessionStartHandler
+			&& apply_filters('FHEE_load_EE_Session', true)
+		) {
+			self::$_instance = new self(
+				$cache_storage,
+				$lifespan,
+				$request,
+				$session_start_handler,
+				$encryption
+			);
+		}
+		return self::$_instance;
+	}
+
+
+	/**
+	 * protected constructor to prevent direct creation
+	 *
+	 * @param CacheStorageInterface $cache_storage
+	 * @param SessionLifespan       $lifespan
+	 * @param RequestInterface      $request
+	 * @param SessionStartHandler   $session_start_handler
+	 * @param Base64Encoder|null    $encryption
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function __construct(
+		CacheStorageInterface $cache_storage,
+		SessionLifespan $lifespan,
+		RequestInterface $request,
+		SessionStartHandler $session_start_handler,
+		Base64Encoder $encryption = null
+	) {
+		// session loading is turned ON by default,
+		// but prior to the 'AHEE__EE_System__core_loaded_and_ready' hook
+		// (which currently fires on the init hook at priority 9),
+		// can be turned back OFF via: add_filter( 'FHEE_load_EE_Session', '__return_false' );
+		if (! apply_filters('FHEE_load_EE_Session', true)) {
+			return;
+		}
+		$this->session_start_handler = $session_start_handler;
+		$this->session_lifespan      = $lifespan;
+		$this->request               = $request;
+		if (! defined('ESPRESSO_SESSION')) {
+			define('ESPRESSO_SESSION', true);
+		}
+		// retrieve session options from db
+		$session_settings = (array) get_option(EE_Session::OPTION_NAME_SETTINGS, []);
+		if (! empty($session_settings)) {
+			// cycle though existing session options
+			foreach ($session_settings as $var_name => $session_setting) {
+				// set values for class properties
+				$var_name          = '_' . $var_name;
+				$this->{$var_name} = $session_setting;
+			}
+		}
+		$this->cache_storage = $cache_storage;
+		// are we using encryption?
+		$this->_use_encryption = $encryption instanceof Base64Encoder
+								 && EE_Registry::instance()->CFG->admin->encode_session_data();
+		// encrypt data via: $this->encryption->encodeString();
+		$this->encryption = $encryption;
+		// filter hook allows outside functions/classes/plugins to change default empty cart
+		$extra_default_session_vars  = apply_filters('FHEE__EE_Session__construct__extra_default_session_vars', []);
+		$this->_default_session_vars = array_merge($this->_default_session_vars, $extra_default_session_vars);
+		// apply default session vars
+		$this->_set_defaults();
+		add_action('AHEE__EE_System__initialize', [$this, 'open_session']);
+		// check request for 'clear_session' param
+		add_action('AHEE__EE_Request_Handler__construct__complete', [$this, 'wp_loaded']);
+		// once everything is all said and done,
+		add_action('shutdown', [$this, 'update'], 100);
+		add_action('shutdown', [$this, 'garbageCollection'], 1000);
+		$this->configure_garbage_collection_filters();
+	}
+
+
+	/**
+	 * @return bool
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function isLoadedAndActive(): bool
+	{
+		return did_action('AHEE__EE_System__core_loaded_and_ready')
+			   && EE_Session::instance() instanceof EE_Session
+			   && EE_Session::instance()->isActive();
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function isActive(): bool
+	{
+		return $this->status === EE_Session::STATUS_OPEN;
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidSessionDataException
+	 * @throws RuntimeException
+	 * @throws ReflectionException
+	 */
+	public function open_session()
+	{
+		// Check for an existing session and retrieve it from the database, unless the system is in maintenance level 2.
+		if (DbStatus::isOnline() && ! $this->_espresso_session()) {
+			// or just start a new one
+			$this->_create_espresso_session();
+		}
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function expired(): bool
+	{
+		return $this->_expired;
+	}
+
+
+	/**
+	 * @return void
+	 */
+	public function reset_expired()
+	{
+		$this->_expired = false;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function expiration(): int
+	{
+		return $this->_expiration;
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function extension(): int
+	{
+		return apply_filters('FHEE__EE_Session__extend_expiration__seconds_added', 10 * MINUTE_IN_SECONDS);
+	}
+
+
+	/**
+	 * @param int $time number of seconds to add to session expiration
+	 */
+	public function extend_expiration(int $time = 0)
+	{
+		$time              = $time
+			?: $this->extension();
+		$this->_expiration += absint($time);
+	}
+
+
+	/**
+	 * @return int
+	 */
+	public function lifespan(): int
+	{
+		return $this->session_lifespan->inSeconds();
+	}
+
+
+	/**
+	 * Marks whether the session data has been updated or not.
+	 * Valid options are:
+	 *      EE_Session::SAVE_STATE_CLEAN - session data remains unchanged and updating is not necessary
+	 *      EE_Session::SAVE_STATE_DIRTY - session data has changed since last save and needs to be updated
+	 * default value is EE_Session::SAVE_STATE_DIRTY
+	 *
+	 * @param string $save_state
+	 */
+	public function setSaveState(string $save_state = EE_Session::SAVE_STATE_DIRTY)
+	{
+		$valid_save_states = [
+			EE_Session::SAVE_STATE_CLEAN,
+			EE_Session::SAVE_STATE_DIRTY,
+		];
+		if (! in_array($save_state, $valid_save_states, true)) {
+			$save_state = EE_Session::SAVE_STATE_DIRTY;
+		}
+		$this->save_state = $save_state;
+	}
+
+
+	/**
+	 * This just sets some defaults for the _session data property
+	 *
+	 * @return void
+	 */
+	private function _set_defaults()
+	{
+		// set some defaults
+		foreach ($this->_default_session_vars as $key => $default_var) {
+			if (is_array($default_var)) {
+				$this->_session_data[ $key ] = [];
+			} else {
+				$this->_session_data[ $key ] = '';
+			}
+		}
+	}
+
+
+	/**
+	 * @retrieve  session data
+	 * @return    string
+	 */
+	public function id(): string
+	{
+		return $this->_sid;
+	}
+
+
+	/**
+	 * @param EE_Cart $cart
+	 * @return bool
+	 */
+	public function set_cart(EE_Cart $cart): bool
+	{
+		$this->_session_data['cart'] = $cart;
+		$this->setSaveState();
+		return true;
+	}
+
+
+	/**
+	 * reset_cart
+	 */
+	public function reset_cart()
+	{
+		do_action('AHEE__EE_Session__reset_cart__before_reset', $this);
+		$this->_session_data['cart'] = null;
+		$this->setSaveState();
+	}
+
+
+	/**
+	 * @return EE_Cart
+	 */
+	public function cart(): ?EE_Cart
+	{
+		return isset($this->_session_data['cart']) && $this->_session_data['cart'] instanceof EE_Cart
+			? $this->_session_data['cart']
+			: null;
+	}
+
+
+	/**
+	 * @param EE_Checkout $checkout
+	 * @return bool
+	 */
+	public function set_checkout(EE_Checkout $checkout): bool
+	{
+		$this->_session_data['checkout'] = $checkout;
+		$this->setSaveState();
+		return true;
+	}
+
+
+	/**
+	 * reset_checkout
+	 */
+	public function reset_checkout()
+	{
+		do_action('AHEE__EE_Session__reset_checkout__before_reset', $this);
+		$this->_session_data['checkout'] = null;
+		$this->setSaveState();
+	}
+
+
+	/**
+	 * @return EE_Checkout
+	 */
+	public function checkout(): ?EE_Checkout
+	{
+		return isset($this->_session_data['checkout']) && $this->_session_data['checkout'] instanceof EE_Checkout
+			? $this->_session_data['checkout']
+			: null;
+	}
+
+
+	/**
+	 * @param EE_Transaction $transaction
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public function set_transaction(EE_Transaction $transaction): bool
+	{
+		// first remove the session from the transaction before we save the transaction in the session
+		$transaction->set_txn_session_data(null);
+		$this->_session_data['transaction'] = $transaction;
+		$this->setSaveState();
+		return true;
+	}
+
+
+	/**
+	 * reset_transaction
+	 */
+	public function reset_transaction()
+	{
+		do_action('AHEE__EE_Session__reset_transaction__before_reset', $this);
+		$this->_session_data['transaction'] = null;
+		$this->setSaveState();
+	}
+
+
+	/**
+	 * @return EE_Transaction
+	 */
+	public function transaction(): ?EE_Transaction
+	{
+		return isset($this->_session_data['transaction'])
+			   && $this->_session_data['transaction'] instanceof EE_Transaction
+			? $this->_session_data['transaction']
+			: null;
+	}
+
+
+	/**
+	 * retrieve session data
+	 *
+	 * @param string|null $key
+	 * @param bool        $reset_cache
+	 * @return array|EE_Cart|EE_Checkout|EE_Transaction
+	 */
+	public function get_session_data(?string $key = null, bool $reset_cache = false)
+	{
+		if ($reset_cache) {
+			$this->reset_cart();
+			$this->reset_checkout();
+			$this->reset_transaction();
+		}
+		if (! empty($key)) {
+			return $this->_session_data[ $key ] ?? null;
+		}
+		return $this->_session_data;
+	}
+
+
+	/**
+	 * Returns TRUE on success, FALSE on fail
+	 *
+	 * @param array $data
+	 * @return bool
+	 */
+	public function set_session_data(array $data): bool
+	{
+		// nothing ??? bad data ??? go home!
+		if (empty($data)) {
+			EE_Error::add_error(
+				esc_html__(
+					'No session data or invalid session data was provided.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		foreach ($data as $key => $value) {
+			if (isset($this->_default_session_vars[ $key ])) {
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'Sorry! %s is a default session datum and can not be reset.',
+							'event_espresso'
+						),
+						$key
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				return false;
+			}
+			$this->_session_data[ $key ] = $value;
+			$this->setSaveState();
+		}
+		return true;
+	}
+
+
+	/**
+	 * @initiate session
+	 * @return bool TRUE on success, FALSE on fail
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidSessionDataException
+	 * @throws RuntimeException
+	 * @throws ReflectionException
+	 */
+	private function _espresso_session(): bool
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
+		$this->session_start_handler->startSession();
+		$this->status = EE_Session::STATUS_OPEN;
+		// get our modified session ID
+		$this->_sid = $this->_generate_session_id();
+		// set the "user agent"
+		$this->_user_agent = $this->request->userAgent();
+		// now let's retrieve what's in the db
+		$session_data = $this->_retrieve_session_data();
+		if (empty($session_data)) {
+			// set initial site access time and the session expiration
+			$this->_set_init_access_and_expiration();
+			// set referer
+			$this->_session_data['pages_visited'][ $this->_session_data['init_access'] ] = esc_attr(
+				$this->request->getServerParam('HTTP_REFERER')
+			);
+			// no previous session = go back and create one (on top of the data above)
+			return false;
+		}
+		// get the current time in UTC
+		$this->_time = $this->_time !== null
+			? $this->_time
+			: time();
+		// and reset the session expiration
+		$this->_expiration = $session_data['expiration'] ?? $this->_time + $this->session_lifespan->inSeconds();
+		// now the user agent
+		if ($session_data['user_agent'] !== $this->_user_agent) {
+			return false;
+		}
+		// wait a minute... how old are you?
+		if ($this->_time > $this->_expiration) {
+			// yer too old fer me!
+			$this->_expired = true;
+			// wipe out everything that isn't a default session datum
+			$this->clear_session(__CLASS__, __FUNCTION__);
+		}
+		// make event espresso session data available to plugin
+		$this->_session_data = array_merge($this->_session_data, $session_data);
+		return true;
+	}
+
+	private function sessionKey(string $prefix = ''): string
+	{
+		return $prefix . EE_Session::session_id_prefix . $this->_sid;
+	}
+
+	private function hashCheckKey(): string
+	{
+		return EE_Session::hash_check_prefix . $this->_sid;
+	}
+
+
+	/**
+	 * _get_session_data
+	 * Retrieves the session data, and attempts to correct any encoding issues that can occur due to improperly setup
+	 * databases
+	 *
+	 * @return array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidSessionDataException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws RuntimeException
+	 * @throws ReflectionException
+	 */
+	protected function _retrieve_session_data(): array
+	{
+		try {
+			// we're using WP's Transient API to store session data using the PHP session ID as the option name
+			$session_data = $this->cache_storage->get($this->sessionKey(), false);
+			if (empty($session_data)) {
+				return [];
+			}
+			if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
+				$hash_check = $this->cache_storage->get($this->hashCheckKey(), false);
+				if ($hash_check && $hash_check !== md5($session_data)) {
+					EE_Error::add_error(
+						sprintf(
+							esc_html__(
+								'The stored data for session %1$s failed to pass a hash check and therefore appears to be invalid.',
+								'event_espresso'
+							),
+							$this->sessionKey()
+						),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+				}
+			}
+		} catch (Exception $e) {
+			// let's just eat that error for now and attempt to correct any corrupted data
+			global $wpdb;
+			$row          = $wpdb->get_row(
+				$wpdb->prepare(
+					"SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1",
+					$this->sessionKey('_transient_')
+				)
+			);
+			$session_data = is_object($row) ? $row->option_value : null;
+			if ($session_data) {
+				$session_data = preg_replace_callback(
+					'!s:(d+):"(.*?)";!',
+					function ($match) {
+						return $match[1] === strlen($match[2])
+							? $match[0]
+							: 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
+					},
+					$session_data
+				);
+			}
+			$session_data = maybe_unserialize($session_data);
+		}
+		// in case the data is encoded... try to decode it
+		$session_data = $this->_use_encryption
+			? $this->encryption->decodeString($session_data)
+			: $session_data;
+		if (! is_array($session_data)) {
+			try {
+				$session_data = maybe_unserialize($session_data);
+			} catch (Exception $e) {
+				$msg = esc_html__(
+					'An error occurred while attempting to unserialize the session data.',
+					'event_espresso'
+				);
+				$msg .= WP_DEBUG
+					? '<br><pre>'
+					  . print_r($session_data, true)
+					  . '</pre><br>'
+					  . $this->find_serialize_error($session_data)
+					: '';
+				$this->cache_storage->delete($this->sessionKey());
+				throw new InvalidSessionDataException($msg, 0, $e);
+			}
+		}
+		// just a check to make sure the session array is indeed an array
+		if (! is_array($session_data)) {
+			// no?!?! then something is wrong
+			$msg = esc_html__(
+				'The session data is missing, invalid, or corrupted.',
+				'event_espresso'
+			);
+			$msg .= WP_DEBUG
+				? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+				: '';
+			$this->cache_storage->delete($this->sessionKey());
+			throw new InvalidSessionDataException($msg);
+		}
+		if (isset($session_data['transaction']) && absint($session_data['transaction']) !== 0) {
+			$session_data['transaction'] = EEM_Transaction::instance()->get_one_by_ID(
+				$session_data['transaction']
+			);
+		}
+		return $session_data;
+	}
+
+
+	/**
+	 * _generate_session_id
+	 * Retrieves the PHP session id either directly from the PHP session,
+	 * or from the request array if it was passed in from an AJAX request.
+	 * The session id is then salted and hashed (mmm sounds tasty)
+	 * so that it can be safely used as a request param
+	 *
+	 * @return string
+	 */
+	protected function _generate_session_id(): string
+	{
+		// check if the SID was passed explicitly, otherwise get from session, then add salt and hash it to reduce length
+		$session_id = $this->request->requestParamIsSet('EESID')
+			? $this->request->getRequestParam('EESID')
+			: md5(session_id() . get_current_blog_id() . $this->_get_sid_salt());
+		return apply_filters('FHEE__EE_Session___generate_session_id__session_id', $session_id);
+	}
+
+
+	/**
+	 * _get_sid_salt
+	 *
+	 * @return string
+	 */
+	protected function _get_sid_salt(): string
+	{
+		// was session id salt already saved to db ?
+		if (empty($this->_sid_salt)) {
+			// no?  then maybe use WP defined constant
+			if (defined('AUTH_SALT')) {
+				$this->_sid_salt = AUTH_SALT;
+			}
+			// if salt doesn't exist or is too short
+			if (strlen($this->_sid_salt) < 32) {
+				// create a new one
+				$this->_sid_salt = wp_generate_password(64);
+			}
+			// and save it as a permanent session setting
+			$this->updateSessionSettings(['sid_salt' => $this->_sid_salt]);
+		}
+		return $this->_sid_salt;
+	}
+
+
+	/**
+	 * _set_init_access_and_expiration
+	 *
+	 * @return void
+	 */
+	protected function _set_init_access_and_expiration()
+	{
+		$this->_time       = time();
+		$this->_expiration = $this->_time + $this->session_lifespan->inSeconds();
+		// set initial site access time
+		$this->_session_data['init_access'] = $this->_time;
+		// and the session expiration
+		$this->_session_data['expiration'] = $this->_expiration;
+	}
+
+
+	/**
+	 * @update session data  prior to saving to the db
+	 * @param bool $new_session
+	 * @return bool TRUE on success, FALSE on fail
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function update(bool $new_session = false): bool
+	{
+		$this->_session_data = isset($this->_session_data['id']) ? $this->_session_data : [];
+		if (empty($this->_session_data)) {
+			$this->_set_defaults();
+		}
+		$session_data = [];
+		foreach ($this->_session_data as $key => $value) {
+			switch ($key) {
+				case 'id':
+					// session ID
+					$session_data['id'] = $this->_sid;
+					break;
+				case 'ip_address':
+					// visitor ip address
+					$session_data['ip_address'] = $this->request->ipAddress();
+					break;
+				case 'user_agent':
+					// visitor user_agent
+					$session_data['user_agent'] = $this->_user_agent;
+					break;
+				case 'init_access':
+					$session_data['init_access'] = absint($value);
+					break;
+				case 'last_access':
+					// current access time
+					$session_data['last_access'] = $this->_time;
+					break;
+				case 'expiration':
+					// when the session expires
+					$session_data['expiration'] = ! empty($this->_expiration)
+						? $this->_expiration
+						: $session_data['init_access'] + $this->session_lifespan->inSeconds();
+					break;
+				case 'user_id':
+					// current user if logged in
+					$session_data['user_id'] = $this->_wp_user_id();
+					break;
+				case 'pages_visited':
+					$page_visit = $this->_get_page_visit();
+					if ($page_visit) {
+						// set pages visited where the first will be the http referrer
+						$this->_session_data['pages_visited'][ $this->_time ] = $page_visit;
+						// we'll only save the last 10 page visits.
+						$session_data['pages_visited'] = array_slice($this->_session_data['pages_visited'], -10);
+					}
+					break;
+				default:
+					// carry any other data over
+					$session_data[ $key ] = $this->_session_data[ $key ];
+			}
+		}
+		$this->_session_data = $session_data;
+		// creating a new session does not require saving to the db just yet
+		if (! $new_session) {
+			// ready? let's save
+			if ($this->_save_session_to_db()) {
+				return true;
+			}
+			return false;
+		}
+		// meh, why not?
+		return true;
+	}
+
+
+	/**
+	 * @create session data array
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function _create_espresso_session()
+	{
+		do_action('AHEE_log', __CLASS__, __FUNCTION__, '');
+		// use the update function for now with $new_session arg set to TRUE
+		$this->update(true);
+	}
+
+
+	/**
+	 * Detects if there is anything worth saving in the session (eg the cart is a good one, notices are pretty good
+	 * too). This is used when determining if we want to save the session or not.
+	 *
+	 * @return bool
+	 * @since 4.9.67.p
+	 */
+	private function sessionHasStuffWorthSaving(): bool
+	{
+		if ($this->save_state === EE_Session::SAVE_STATE_DIRTY) {
+			return true;
+		}
+		$default_session_vars = array_keys($this->_default_session_vars);
+		foreach ($this->_session_data as $key => $sessionDatum) {
+			if (in_array($key, $default_session_vars, true)) {
+				continue;
+			}
+			if (! empty($sessionDatum)) {
+				return true;
+			}
+			if (
+				$key === 'ee_notices'
+				&& (
+					! empty($this->_session_data['ee_notices']['attention'])
+					|| ! empty($this->_session_data['ee_notices']['errors'])
+					|| ! empty($this->_session_data['ee_notices']['success'])
+				)
+			) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+
+	/**
+	 * _save_session_to_db
+	 *
+	 * @param bool $clear_session
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	private function _save_session_to_db(bool $clear_session = false): bool
+	{
+		// don't save sessions for crawlers
+		// and unless we're deleting the session data, don't save anything if there isn't a cart
+		if (
+			$this->request->isBot()
+			|| (
+				! $clear_session
+				&& ! $this->sessionHasStuffWorthSaving()
+				&& apply_filters('FHEE__EE_Session___save_session_to_db__abort_session_save', true)
+			)
+		) {
+			return false;
+		}
+		$transaction = $this->transaction();
+		if ($transaction instanceof EE_Transaction) {
+			if (! $transaction->ID()) {
+				$transaction->save();
+			}
+			$this->_session_data['transaction'] = $transaction->ID();
+		}
+		// then serialize all of our session data
+		$session_data = serialize($this->_session_data);
+		// do we need to also encode it to avoid corrupted data when saved to the db?
+		$session_data = $this->_use_encryption
+			? $this->encryption->encodeString($session_data)
+			: $session_data;
+		// maybe save hash check
+		if (apply_filters('FHEE__EE_Session___perform_session_id_hash_check', WP_DEBUG)) {
+			$this->cache_storage->add(
+				$this->hashCheckKey(),
+				md5($session_data),
+				$this->session_lifespan->inSeconds()
+			);
+		}
+		// we're using the Transient API for storing session data,
+		$saved = $this->cache_storage->add(
+			$this->sessionKey(),
+			$session_data,
+			$this->session_lifespan->inSeconds()
+		);
+		$this->setSaveState(EE_Session::SAVE_STATE_CLEAN);
+		return $saved;
+	}
+
+
+	/**
+	 * @get    the full page request the visitor is accessing
+	 * @return string
+	 */
+	public function _get_page_visit(): string
+	{
+		$page_visit = home_url('/') . 'wp-admin/admin-ajax.php';
+		// check for request url
+		if ($this->request->serverParamIsSet('REQUEST_URI')) {
+			$page_id     = '?';
+			$e_reg       = '';
+			$request_uri = $this->request->getServerParam('REQUEST_URI');
+			$ru_bits     = explode('?', $request_uri);
+			$request_uri = $ru_bits[0];
+			$http_host   = $this->request->getServerParam('HTTP_HOST');
+			// check for page_id in SERVER REQUEST
+			if ($this->request->requestParamIsSet('page_id')) {
+				// rebuild $e_reg without any of the extra parameters
+				$page_id .= 'page_id=' . $this->request->getRequestParam('page_id', 0, 'int') . '&amp;';
+			}
+			// check for $e_reg in SERVER REQUEST
+			if ($this->request->requestParamIsSet('ee')) {
+				// rebuild $e_reg without any of the extra parameters
+				$e_reg = 'ee=' . $this->request->getRequestParam('ee');
+			}
+			$page_visit = esc_url(rtrim($http_host . $request_uri . $page_id . $e_reg, '?'));
+		}
+		return $page_visit !== home_url('/wp-admin/admin-ajax.php')
+			? $page_visit
+			: '';
+	}
+
+
+	/**
+	 * @the    current wp user id
+	 * @return int
+	 */
+	public function _wp_user_id(): int
+	{
+		// if I need to explain the following lines of code, then you shouldn't be looking at this!
+		return get_current_user_id();
+	}
+
+
+	/**
+	 * Clear EE_Session data
+	 *
+	 * @param string $class
+	 * @param string $function
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function clear_session(string $class = '', string $function = '')
+	{
+		do_action('AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' . $function . '()');
+		$this->reset_cart();
+		$this->reset_checkout();
+		$this->reset_transaction();
+		// wipe out everything that isn't a default session datum
+		$this->reset_data(array_keys($this->_session_data));
+		// reset initial site access time and the session expiration
+		$this->_set_init_access_and_expiration();
+		$this->setSaveState();
+		$this->_save_session_to_db(true);
+	}
+
+
+	/**
+	 * resets all non-default session vars. Returns TRUE on success, FALSE on fail
+	 *
+	 * @param array|mixed $keys_to_reset
+	 * @param bool        $show_all_notices
+	 * @return bool
+	 */
+	public function reset_data($keys_to_reset = [], bool $show_all_notices = false): bool
+	{
+		$keys_to_reset = (array) apply_filters(
+			'FHEE__EE_Session__reset_data__session_data_keys_to_reset',
+			(array) $keys_to_reset
+		);
+		// nothing ??? go home!
+		if (empty($keys_to_reset)) {
+			EE_Error::add_error(
+				esc_html__(
+					'No session data could be reset, because no session var name was provided.',
+					'event_espresso'
+				),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+		$return_value = true;
+		// since $keys_to_reset is an array, cycle through the values
+		foreach ($keys_to_reset as $key_to_reset) {
+			// first check to make sure it is a valid session var
+			if (! isset($this->_session_data[ $key_to_reset ]) && $show_all_notices) {
+				// oops! that session var does not exist!
+				EE_Error::add_error(
+					sprintf(
+						esc_html__(
+							'The session item provided, %s, is invalid or does not exist.',
+							'event_espresso'
+						),
+						$key_to_reset
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+				$return_value = false;
+				continue;
+			}
+			// then check to make sure it is not a default var
+			if (array_key_exists($key_to_reset, $this->_default_session_vars)) {
+				// yeeeeeeeeerrrrrrrrrrr OUT !!!!
+				if ($show_all_notices) {
+					EE_Error::add_error(
+						sprintf(
+							esc_html__(
+								'Sorry! %s is a default session datum and can not be reset.',
+								'event_espresso'
+							),
+							$key_to_reset
+						),
+						__FILE__,
+						__FUNCTION__,
+						__LINE__
+					);
+				}
+				$return_value = false;
+				continue;
+			}
+			// remove session var
+			unset($this->_session_data[ $key_to_reset ]);
+			$this->setSaveState();
+			if ($show_all_notices) {
+				EE_Error::add_success(
+					sprintf(
+						esc_html__('The session variable %s was removed.', 'event_espresso'),
+						$key_to_reset
+					),
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				);
+			}
+		} // end of foreach
+		return $return_value;
+	}
+
+
+	/**
+	 *   wp_loaded
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 */
+	public function wp_loaded()
+	{
+		if ($this->request->requestParamIsSet('clear_session')) {
+			$this->clear_session(__CLASS__, __FUNCTION__);
+		}
+	}
+
+
+	/**
+	 * Used to reset the entire object (for tests).
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws InvalidArgumentException
+	 * @throws ReflectionException
+	 * @since 4.3.0
+	 */
+	public function reset_instance()
+	{
+		$this->clear_session();
+		self::$_instance = null;
+	}
+
+
+	public function configure_garbage_collection_filters()
+	{
+		// run old filter we had for controlling session cleanup
+		$expired_session_transient_delete_query_limit = absint(
+			apply_filters(
+				'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit',
+				50
+			)
+		);
+		// is there a value? or one that is different from the default 50 records?
+		if ($expired_session_transient_delete_query_limit === 0) {
+			// hook into TransientCacheStorage in case Session cleanup was turned off
+			add_filter('FHEE__TransientCacheStorage__transient_cleanup_schedule', '__return_zero');
+		} elseif ($expired_session_transient_delete_query_limit !== 50) {
+			// or use that for the new transient cleanup query limit
+			add_filter(
+				'FHEE__TransientCacheStorage__clearExpiredTransients__limit',
+				function () use ($expired_session_transient_delete_query_limit) {
+					return $expired_session_transient_delete_query_limit;
+				}
+			);
+		}
+	}
+
+
+	/**
+	 * @see http://stackoverflow.com/questions/10152904/unserialize-function-unserialize-error-at-offset/21389439#10152996
+	 * @param string $data1
+	 * @return string
+	 */
+	private function find_serialize_error(string $data1): string
+	{
+		$error = '<pre>';
+		$data2 = preg_replace_callback(
+			'!s:(\d+):"(.*?)";!',
+			function ($match) {
+				return ($match[1] === strlen($match[2]))
+					? $match[0]
+					: 's:'
+					  . strlen($match[2])
+					  . ':"'
+					  . $match[2]
+					  . '";';
+			},
+			$data1
+		);
+		$max   = (strlen($data1) > strlen($data2))
+			? strlen($data1)
+			: strlen($data2);
+		$error .= $data1 . PHP_EOL;
+		$error .= $data2 . PHP_EOL;
+		for ($i = 0; $i < $max; $i++) {
+			if (@$data1[ $i ] !== @$data2[ $i ]) {
+				$error  .= 'Difference ' . @$data1[ $i ] . ' != ' . @$data2[ $i ] . PHP_EOL;
+				$error  .= "\t-> ORD number " . ord(@$data1[ $i ]) . ' != ' . ord(@$data2[ $i ]) . PHP_EOL;
+				$error  .= "\t-> Line Number = $i" . PHP_EOL;
+				$start  = ($i - 20);
+				$start  = ($start < 0)
+					? 0
+					: $start;
+				$length = 40;
+				$point  = $max - $i;
+				if ($point < 20) {
+					$rlength = 1;
+					$rpoint  = -$point;
+				} else {
+					$rpoint  = $length - 20;
+					$rlength = 1;
+				}
+				$error .= "\t-> Section Data1  = ";
+				$error .= substr_replace(
+					substr($data1, $start, $length),
+					"<b style=\"color:green\">$i</b>",
+					$rpoint,
+					$rlength
+				);
+				$error .= PHP_EOL;
+				$error .= "\t-> Section Data2  = ";
+				$error .= substr_replace(
+					substr($data2, $start, $length),
+					"<b style=\"color:red\">$i</b>",
+					$rpoint,
+					$rlength
+				);
+				$error .= PHP_EOL;
+			}
+		}
+		$error .= '</pre>';
+		return $error;
+	}
+
+
+	/**
+	 * Saves an  array of settings used for configuring aspects of session behaviour
+	 *
+	 * @param array $updated_settings
+	 */
+	private function updateSessionSettings(array $updated_settings = [])
+	{
+		// add existing settings, but only if not included in incoming $updated_settings array
+		$updated_settings += get_option(EE_Session::OPTION_NAME_SETTINGS, []);
+		update_option(EE_Session::OPTION_NAME_SETTINGS, $updated_settings);
+	}
+
+
+	/**
+	 * garbage_collection
+	 */
+	public function garbageCollection()
+	{
+		// only perform during regular requests if last garbage collection was over an hour ago
+		if (! (defined('DOING_AJAX') && DOING_AJAX) && (time() - HOUR_IN_SECONDS) >= $this->_last_gc) {
+			$this->_last_gc = time();
+			$this->updateSessionSettings(['last_gc' => $this->_last_gc]);
+			/** @type WPDB $wpdb */
+			global $wpdb;
+			// filter the query limit. Set to 0 to turn off garbage collection
+			$expired_session_transient_delete_query_limit = absint(
+				apply_filters(
+					'FHEE__EE_Session__garbage_collection___expired_session_transient_delete_query_limit',
+					50
+				)
+			);
+			// non-zero LIMIT means take out the trash
+			if ($expired_session_transient_delete_query_limit) {
+				$session_key    = str_replace('_', '\_', EE_Session::session_id_prefix);
+				$hash_check_key = str_replace('_', '\_', EE_Session::hash_check_prefix);
+				// since transient expiration timestamps are set in the future, we can compare against NOW,
+				// but we only want to pick up any trash that's been around for more than a day
+				$expiration = time() - DAY_IN_SECONDS;
+				$SQL        = "
                     SELECT option_name
                     FROM $wpdb->options
                     WHERE
@@ -1318,17 +1318,17 @@ 
                     AND option_value < $expiration
                     LIMIT $expired_session_transient_delete_query_limit
                 ";
-                // produces something like:
-                // SELECT option_name FROM wp_options
-                // WHERE ( option_name LIKE '\_transient\_timeout\_ee\_ssn\_%'
-                // OR option_name LIKE '\_transient\_timeout\_ee\_shc\_%' )
-                // AND option_value < 1508368198 LIMIT 50
-                $expired_sessions = $wpdb->get_col($SQL);
-                // valid results?
-                if (! empty($expired_sessions)) {
-                    $this->cache_storage->deleteMany($expired_sessions, true);
-                }
-            }
-        }
-    }
+				// produces something like:
+				// SELECT option_name FROM wp_options
+				// WHERE ( option_name LIKE '\_transient\_timeout\_ee\_ssn\_%'
+				// OR option_name LIKE '\_transient\_timeout\_ee\_shc\_%' )
+				// AND option_value < 1508368198 LIMIT 50
+				$expired_sessions = $wpdb->get_col($SQL);
+				// valid results?
+				if (! empty($expired_sessions)) {
+					$this->cache_storage->deleteMany($expired_sessions, true);
+				}
+			}
+		}
+	}
 }

Spacing +45 added lines, -45 removed lines

@@ -212,22 +212,22 @@ 
         // but prior to the 'AHEE__EE_System__core_loaded_and_ready' hook
         // (which currently fires on the init hook at priority 9),
         // can be turned back OFF via: add_filter( 'FHEE_load_EE_Session', '__return_false' );
-        if (! apply_filters('FHEE_load_EE_Session', true)) {
+        if ( ! apply_filters('FHEE_load_EE_Session', true)) {
             return;
         }
         $this->session_start_handler = $session_start_handler;
         $this->session_lifespan      = $lifespan;
         $this->request               = $request;
-        if (! defined('ESPRESSO_SESSION')) {
+        if ( ! defined('ESPRESSO_SESSION')) {
             define('ESPRESSO_SESSION', true);
         }
         // retrieve session options from db
         $session_settings = (array) get_option(EE_Session::OPTION_NAME_SETTINGS, []);
-        if (! empty($session_settings)) {
+        if ( ! empty($session_settings)) {
             // cycle though existing session options
             foreach ($session_settings as $var_name => $session_setting) {
                 // set values for class properties
-                $var_name          = '_' . $var_name;
+                $var_name          = '_'.$var_name;
                 $this->{$var_name} = $session_setting;
             }
         }
@@ -336,7 +336,7 @@ 
      */
     public function extend_expiration(int $time = 0)
     {
-        $time              = $time
+        $time = $time
             ?: $this->extension();
         $this->_expiration += absint($time);
     }
@@ -366,7 +366,7 @@ 
             EE_Session::SAVE_STATE_CLEAN,
             EE_Session::SAVE_STATE_DIRTY,
         ];
-        if (! in_array($save_state, $valid_save_states, true)) {
+        if ( ! in_array($save_state, $valid_save_states, true)) {
             $save_state = EE_Session::SAVE_STATE_DIRTY;
         }
         $this->save_state = $save_state;
@@ -383,9 +383,9 @@ 
         // set some defaults
         foreach ($this->_default_session_vars as $key => $default_var) {
             if (is_array($default_var)) {
-                $this->_session_data[ $key ] = [];
+                $this->_session_data[$key] = [];
             } else {
-                $this->_session_data[ $key ] = '';
+                $this->_session_data[$key] = '';
             }
         }
     }
@@ -522,8 +522,8 @@ 
             $this->reset_checkout();
             $this->reset_transaction();
         }
-        if (! empty($key)) {
-            return $this->_session_data[ $key ] ?? null;
+        if ( ! empty($key)) {
+            return $this->_session_data[$key] ?? null;
         }
         return $this->_session_data;
     }
@@ -551,7 +551,7 @@ 
             return false;
         }
         foreach ($data as $key => $value) {
-            if (isset($this->_default_session_vars[ $key ])) {
+            if (isset($this->_default_session_vars[$key])) {
                 EE_Error::add_error(
                     sprintf(
                         esc_html__(
@@ -566,7 +566,7 @@ 
                 );
                 return false;
             }
-            $this->_session_data[ $key ] = $value;
+            $this->_session_data[$key] = $value;
             $this->setSaveState();
         }
         return true;
@@ -599,7 +599,7 @@ 
             // set initial site access time and the session expiration
             $this->_set_init_access_and_expiration();
             // set referer
-            $this->_session_data['pages_visited'][ $this->_session_data['init_access'] ] = esc_attr(
+            $this->_session_data['pages_visited'][$this->_session_data['init_access']] = esc_attr(
                 $this->request->getServerParam('HTTP_REFERER')
             );
             // no previous session = go back and create one (on top of the data above)
@@ -629,12 +629,12 @@ 
 
     private function sessionKey(string $prefix = ''): string
     {
-        return $prefix . EE_Session::session_id_prefix . $this->_sid;
+        return $prefix.EE_Session::session_id_prefix.$this->_sid;
     }
 
     private function hashCheckKey(): string
     {
-        return EE_Session::hash_check_prefix . $this->_sid;
+        return EE_Session::hash_check_prefix.$this->_sid;
     }
 
 
@@ -680,7 +680,7 @@ 
         } catch (Exception $e) {
             // let's just eat that error for now and attempt to correct any corrupted data
             global $wpdb;
-            $row          = $wpdb->get_row(
+            $row = $wpdb->get_row(
                 $wpdb->prepare(
                     "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1",
                     $this->sessionKey('_transient_')
@@ -690,10 +690,10 @@ 
             if ($session_data) {
                 $session_data = preg_replace_callback(
                     '!s:(d+):"(.*?)";!',
-                    function ($match) {
+                    function($match) {
                         return $match[1] === strlen($match[2])
                             ? $match[0]
-                            : 's:' . strlen($match[2]) . ':"' . $match[2] . '";';
+                            : 's:'.strlen($match[2]).':"'.$match[2].'";';
                     },
                     $session_data
                 );
@@ -704,7 +704,7 @@ 
         $session_data = $this->_use_encryption
             ? $this->encryption->decodeString($session_data)
             : $session_data;
-        if (! is_array($session_data)) {
+        if ( ! is_array($session_data)) {
             try {
                 $session_data = maybe_unserialize($session_data);
             } catch (Exception $e) {
@@ -723,14 +723,14 @@ 
             }
         }
         // just a check to make sure the session array is indeed an array
-        if (! is_array($session_data)) {
+        if ( ! is_array($session_data)) {
             // no?!?! then something is wrong
             $msg = esc_html__(
                 'The session data is missing, invalid, or corrupted.',
                 'event_espresso'
             );
             $msg .= WP_DEBUG
-                ? '<br><pre>' . print_r($session_data, true) . '</pre><br>' . $this->find_serialize_error($session_data)
+                ? '<br><pre>'.print_r($session_data, true).'</pre><br>'.$this->find_serialize_error($session_data)
                 : '';
             $this->cache_storage->delete($this->sessionKey());
             throw new InvalidSessionDataException($msg);
@@ -758,7 +758,7 @@ 
         // check if the SID was passed explicitly, otherwise get from session, then add salt and hash it to reduce length
         $session_id = $this->request->requestParamIsSet('EESID')
             ? $this->request->getRequestParam('EESID')
-            : md5(session_id() . get_current_blog_id() . $this->_get_sid_salt());
+            : md5(session_id().get_current_blog_id().$this->_get_sid_salt());
         return apply_filters('FHEE__EE_Session___generate_session_id__session_id', $session_id);
     }
 
@@ -856,19 +856,19 @@ 
                     $page_visit = $this->_get_page_visit();
                     if ($page_visit) {
                         // set pages visited where the first will be the http referrer
-                        $this->_session_data['pages_visited'][ $this->_time ] = $page_visit;
+                        $this->_session_data['pages_visited'][$this->_time] = $page_visit;
                         // we'll only save the last 10 page visits.
                         $session_data['pages_visited'] = array_slice($this->_session_data['pages_visited'], -10);
                     }
                     break;
                 default:
                     // carry any other data over
-                    $session_data[ $key ] = $this->_session_data[ $key ];
+                    $session_data[$key] = $this->_session_data[$key];
             }
         }
         $this->_session_data = $session_data;
         // creating a new session does not require saving to the db just yet
-        if (! $new_session) {
+        if ( ! $new_session) {
             // ready? let's save
             if ($this->_save_session_to_db()) {
                 return true;
@@ -913,7 +913,7 @@ 
             if (in_array($key, $default_session_vars, true)) {
                 continue;
             }
-            if (! empty($sessionDatum)) {
+            if ( ! empty($sessionDatum)) {
                 return true;
             }
             if (
@@ -958,7 +958,7 @@ 
         }
         $transaction = $this->transaction();
         if ($transaction instanceof EE_Transaction) {
-            if (! $transaction->ID()) {
+            if ( ! $transaction->ID()) {
                 $transaction->save();
             }
             $this->_session_data['transaction'] = $transaction->ID();
@@ -994,7 +994,7 @@ 
      */
     public function _get_page_visit(): string
     {
-        $page_visit = home_url('/') . 'wp-admin/admin-ajax.php';
+        $page_visit = home_url('/').'wp-admin/admin-ajax.php';
         // check for request url
         if ($this->request->serverParamIsSet('REQUEST_URI')) {
             $page_id     = '?';
@@ -1006,14 +1006,14 @@ 
             // check for page_id in SERVER REQUEST
             if ($this->request->requestParamIsSet('page_id')) {
                 // rebuild $e_reg without any of the extra parameters
-                $page_id .= 'page_id=' . $this->request->getRequestParam('page_id', 0, 'int') . '&amp;';
+                $page_id .= 'page_id='.$this->request->getRequestParam('page_id', 0, 'int').'&amp;';
             }
             // check for $e_reg in SERVER REQUEST
             if ($this->request->requestParamIsSet('ee')) {
                 // rebuild $e_reg without any of the extra parameters
-                $e_reg = 'ee=' . $this->request->getRequestParam('ee');
+                $e_reg = 'ee='.$this->request->getRequestParam('ee');
             }
-            $page_visit = esc_url(rtrim($http_host . $request_uri . $page_id . $e_reg, '?'));
+            $page_visit = esc_url(rtrim($http_host.$request_uri.$page_id.$e_reg, '?'));
         }
         return $page_visit !== home_url('/wp-admin/admin-ajax.php')
             ? $page_visit
@@ -1046,7 +1046,7 @@ 
      */
     public function clear_session(string $class = '', string $function = '')
     {
-        do_action('AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : ' . $class . '::' . $function . '()');
+        do_action('AHEE_log', __FILE__, __FUNCTION__, 'session cleared by : '.$class.'::'.$function.'()');
         $this->reset_cart();
         $this->reset_checkout();
         $this->reset_transaction();
@@ -1089,7 +1089,7 @@ 
         // since $keys_to_reset is an array, cycle through the values
         foreach ($keys_to_reset as $key_to_reset) {
             // first check to make sure it is a valid session var
-            if (! isset($this->_session_data[ $key_to_reset ]) && $show_all_notices) {
+            if ( ! isset($this->_session_data[$key_to_reset]) && $show_all_notices) {
                 // oops! that session var does not exist!
                 EE_Error::add_error(
                     sprintf(
@@ -1127,7 +1127,7 @@ 
                 continue;
             }
             // remove session var
-            unset($this->_session_data[ $key_to_reset ]);
+            unset($this->_session_data[$key_to_reset]);
             $this->setSaveState();
             if ($show_all_notices) {
                 EE_Error::add_success(
@@ -1196,7 +1196,7 @@ 
             // or use that for the new transient cleanup query limit
             add_filter(
                 'FHEE__TransientCacheStorage__clearExpiredTransients__limit',
-                function () use ($expired_session_transient_delete_query_limit) {
+                function() use ($expired_session_transient_delete_query_limit) {
                     return $expired_session_transient_delete_query_limit;
                 }
             );
@@ -1214,7 +1214,7 @@ 
         $error = '<pre>';
         $data2 = preg_replace_callback(
             '!s:(\d+):"(.*?)";!',
-            function ($match) {
+            function($match) {
                 return ($match[1] === strlen($match[2]))
                     ? $match[0]
                     : 's:'
@@ -1225,16 +1225,16 @@ 
             },
             $data1
         );
-        $max   = (strlen($data1) > strlen($data2))
+        $max = (strlen($data1) > strlen($data2))
             ? strlen($data1)
             : strlen($data2);
-        $error .= $data1 . PHP_EOL;
-        $error .= $data2 . PHP_EOL;
+        $error .= $data1.PHP_EOL;
+        $error .= $data2.PHP_EOL;
         for ($i = 0; $i < $max; $i++) {
-            if (@$data1[ $i ] !== @$data2[ $i ]) {
-                $error  .= 'Difference ' . @$data1[ $i ] . ' != ' . @$data2[ $i ] . PHP_EOL;
-                $error  .= "\t-> ORD number " . ord(@$data1[ $i ]) . ' != ' . ord(@$data2[ $i ]) . PHP_EOL;
-                $error  .= "\t-> Line Number = $i" . PHP_EOL;
+            if (@$data1[$i] !== @$data2[$i]) {
+                $error  .= 'Difference '.@$data1[$i].' != '.@$data2[$i].PHP_EOL;
+                $error  .= "\t-> ORD number ".ord(@$data1[$i]).' != '.ord(@$data2[$i]).PHP_EOL;
+                $error  .= "\t-> Line Number = $i".PHP_EOL;
                 $start  = ($i - 20);
                 $start  = ($start < 0)
                     ? 0
@@ -1290,7 +1290,7 @@ 
     public function garbageCollection()
     {
         // only perform during regular requests if last garbage collection was over an hour ago
-        if (! (defined('DOING_AJAX') && DOING_AJAX) && (time() - HOUR_IN_SECONDS) >= $this->_last_gc) {
+        if ( ! (defined('DOING_AJAX') && DOING_AJAX) && (time() - HOUR_IN_SECONDS) >= $this->_last_gc) {
             $this->_last_gc = time();
             $this->updateSessionSettings(['last_gc' => $this->_last_gc]);
             /** @type WPDB $wpdb */
@@ -1325,7 +1325,7 @@ 
                 // AND option_value < 1508368198 LIMIT 50
                 $expired_sessions = $wpdb->get_col($SQL);
                 // valid results?
-                if (! empty($expired_sessions)) {
+                if ( ! empty($expired_sessions)) {
                     $this->cache_storage->deleteMany($expired_sessions, true);
                 }
             }

core/helpers/EEH_Form_Fields.helper.php

Indentation +2064 added lines, -2064 removed lines

@@ -27,1056 +27,1056 @@ 
  */
 class EEH_Form_Fields
 {
-    /**
-     *  Generates HTML for the forms used on admin pages
-     *
-     *
-     * @static
-     * @access public
-     * @param array $input_vars - array of input field details
-     *                          format:
-     *                          $template_form_fields['field-id'] = array(
-     *                          'name' => 'name_attribute',
-     *                          'label' => esc_html__('Field Label', 'event_espresso'), //or false
-     *                          'input' => 'hidden', //field input type can be 'text', 'select', 'textarea', 'hidden',
-     *                          'checkbox', 'wp_editor'
-     *                          'type' => 'int', //what "type" the value is (i.e. string, int etc)
-     *                          'required' => false, //boolean for whether the field is required
-     *                          'validation' => true, //boolean, whether to validate the field (todo)
-     *                          'value' => 'some_value_for_field', //what value is used for field
-     *                          'format' => '%d', //what format the value is (%d, %f, or %s)
-     *                          'db-col' => 'column_in_db' //used to indicate which column the field corresponds with
-     *                          in the db
-     *                          'options' => optiona, optionb || array('value' => 'label', '') //if the input type is
-     *                          "select", this allows you to set the args for the different <option> tags.
-     *                          'tabindex' => 1 //this allows you to set the tabindex for the field.
-     *                          'append_content' => '' //this allows you to send in html content to append to the
-     *                          field.
-     *                          )
-     * @param array $form_id    - used for defining unique identifiers for the form.
-     * @return string
-     * @todo   : at some point we can break this down into other static methods to abstract it a bit better.
-     */
-    public static function get_form_fields($input_vars = [], $form_id = false)
-    {
-
-        if (empty($input_vars)) {
-            EE_Error::add_error(
-                esc_html__('missing required variables for the form field generator', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return false;
-        }
-
-        $output        = "";
-        $inputs        = [];
-        $hidden_inputs = [];
-
-        // cycle thru inputs
-        foreach ($input_vars as $input_key => $input_value) {
-            $defaults = [
-                'append_content' => '',
-                'css_class'      => '',
-                'cols'           => 80,
-                'db-col'         => 'column_in_db',
-                'format'         => '%d',
-                'input'          => 'hidden',
-                'label'          => esc_html__('No label', 'event_espresso'),
-                'name'           => $input_key,
-                'options'        => [],
-                'required'       => false,
-                'tabindex'       => 0,
-                'rows'           => 10,
-                'type'           => 'int',
-                'validation'     => true,
-                'value'          => 'some_value_for_field',
-            ];
-
-            $input_value = wp_parse_args($input_value, $defaults);
-
-            $append_content = $input_value['append_content'];
-            $css_class      = $input_value['css_class'];
-            $cols           = $input_value['cols'];
-            $label          = $input_value['label'];
-            $name           = $input_value['name'];
-            $options        = $input_value['options'];
-            $required       = $input_value['required'];
-            $tab_index      = $input_value['tabindex'];
-            $rows           = $input_value['rows'];
-            $type           = $input_value['input'];
-            $value          = $input_value['value'];
-
-            $id    = $form_id ? $form_id . '-' . $input_key : $input_key;
-            $class = $required ? 'required ' . $css_class : $css_class;
-
-            // what type of input are we dealing with ?
-            switch ($type) {
-                case 'checkbox':
-                case 'radio':
-                    $field = self::adminMulti($value, $class, $id, $name, $required, $tab_index, $type, 1, $label);
-                    $field .= $append_content ?: '';
-                    break;
-
-                case 'hidden':
-                    $field           = null;
-                    $hidden_inputs[] = self::adminHidden($css_class, $id, $name, $value);
-                    break;
-
-                case 'select':
-                    $options = is_array($options) ? $options : explode(',', $options);
-                    $field   = self::adminLabel($id, $label, $required);
-                    $field   .= self::adminSelect($value, $class, $id, $name, $required, $tab_index, $options);
-                    $field   .= $append_content ?: '';
-                    break;
-
-                case 'textarea':
-                    $field = self::adminLabel($id, $label, $required);
-                    $field .= self::adminTextarea($class, $cols, $id, $name, $required, $rows, $tab_index, $value);
-                    $field .= $append_content ?: '';
-                    break;
-
-                case 'wp_editor':
-                    $label = esc_html($label);
-                    $field = "<h4>{$label}</h4>";
-                    $field .= $append_content ?: '';
-                    $field .= self::adminWpEditor(
-                        $class,
-                        $id,
-                        $name,
-                        $rows,
-                        $tab_index,
-                        $value
-                    );
-                    break;
-
-                default:
-                    $field = self::adminLabel($id, $label, $required);
-                    $field .= self::adminText($class, $id, $name, $required, $tab_index, $value);
-                    $field .= $append_content ?: '';
-            }
-            if ($field) {
-                $inputs[] = $field;
-            }
-        } // end foreach( $input_vars as $input_key => $input_value )
-
-        if (! empty($inputs)) {
-            $glue   = "
+	/**
+	 *  Generates HTML for the forms used on admin pages
+	 *
+	 *
+	 * @static
+	 * @access public
+	 * @param array $input_vars - array of input field details
+	 *                          format:
+	 *                          $template_form_fields['field-id'] = array(
+	 *                          'name' => 'name_attribute',
+	 *                          'label' => esc_html__('Field Label', 'event_espresso'), //or false
+	 *                          'input' => 'hidden', //field input type can be 'text', 'select', 'textarea', 'hidden',
+	 *                          'checkbox', 'wp_editor'
+	 *                          'type' => 'int', //what "type" the value is (i.e. string, int etc)
+	 *                          'required' => false, //boolean for whether the field is required
+	 *                          'validation' => true, //boolean, whether to validate the field (todo)
+	 *                          'value' => 'some_value_for_field', //what value is used for field
+	 *                          'format' => '%d', //what format the value is (%d, %f, or %s)
+	 *                          'db-col' => 'column_in_db' //used to indicate which column the field corresponds with
+	 *                          in the db
+	 *                          'options' => optiona, optionb || array('value' => 'label', '') //if the input type is
+	 *                          "select", this allows you to set the args for the different <option> tags.
+	 *                          'tabindex' => 1 //this allows you to set the tabindex for the field.
+	 *                          'append_content' => '' //this allows you to send in html content to append to the
+	 *                          field.
+	 *                          )
+	 * @param array $form_id    - used for defining unique identifiers for the form.
+	 * @return string
+	 * @todo   : at some point we can break this down into other static methods to abstract it a bit better.
+	 */
+	public static function get_form_fields($input_vars = [], $form_id = false)
+	{
+
+		if (empty($input_vars)) {
+			EE_Error::add_error(
+				esc_html__('missing required variables for the form field generator', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return false;
+		}
+
+		$output        = "";
+		$inputs        = [];
+		$hidden_inputs = [];
+
+		// cycle thru inputs
+		foreach ($input_vars as $input_key => $input_value) {
+			$defaults = [
+				'append_content' => '',
+				'css_class'      => '',
+				'cols'           => 80,
+				'db-col'         => 'column_in_db',
+				'format'         => '%d',
+				'input'          => 'hidden',
+				'label'          => esc_html__('No label', 'event_espresso'),
+				'name'           => $input_key,
+				'options'        => [],
+				'required'       => false,
+				'tabindex'       => 0,
+				'rows'           => 10,
+				'type'           => 'int',
+				'validation'     => true,
+				'value'          => 'some_value_for_field',
+			];
+
+			$input_value = wp_parse_args($input_value, $defaults);
+
+			$append_content = $input_value['append_content'];
+			$css_class      = $input_value['css_class'];
+			$cols           = $input_value['cols'];
+			$label          = $input_value['label'];
+			$name           = $input_value['name'];
+			$options        = $input_value['options'];
+			$required       = $input_value['required'];
+			$tab_index      = $input_value['tabindex'];
+			$rows           = $input_value['rows'];
+			$type           = $input_value['input'];
+			$value          = $input_value['value'];
+
+			$id    = $form_id ? $form_id . '-' . $input_key : $input_key;
+			$class = $required ? 'required ' . $css_class : $css_class;
+
+			// what type of input are we dealing with ?
+			switch ($type) {
+				case 'checkbox':
+				case 'radio':
+					$field = self::adminMulti($value, $class, $id, $name, $required, $tab_index, $type, 1, $label);
+					$field .= $append_content ?: '';
+					break;
+
+				case 'hidden':
+					$field           = null;
+					$hidden_inputs[] = self::adminHidden($css_class, $id, $name, $value);
+					break;
+
+				case 'select':
+					$options = is_array($options) ? $options : explode(',', $options);
+					$field   = self::adminLabel($id, $label, $required);
+					$field   .= self::adminSelect($value, $class, $id, $name, $required, $tab_index, $options);
+					$field   .= $append_content ?: '';
+					break;
+
+				case 'textarea':
+					$field = self::adminLabel($id, $label, $required);
+					$field .= self::adminTextarea($class, $cols, $id, $name, $required, $rows, $tab_index, $value);
+					$field .= $append_content ?: '';
+					break;
+
+				case 'wp_editor':
+					$label = esc_html($label);
+					$field = "<h4>{$label}</h4>";
+					$field .= $append_content ?: '';
+					$field .= self::adminWpEditor(
+						$class,
+						$id,
+						$name,
+						$rows,
+						$tab_index,
+						$value
+					);
+					break;
+
+				default:
+					$field = self::adminLabel($id, $label, $required);
+					$field .= self::adminText($class, $id, $name, $required, $tab_index, $value);
+					$field .= $append_content ?: '';
+			}
+			if ($field) {
+				$inputs[] = $field;
+			}
+		} // end foreach( $input_vars as $input_key => $input_value )
+
+		if (! empty($inputs)) {
+			$glue   = "
                 </li>
                 <li>
                     ";
-            $inputs = implode($glue, $inputs);
-            $output = "
+			$inputs = implode($glue, $inputs);
+			$output = "
             <ul>
                 <li>
                 {$inputs}
                 </li>
             </ul>
             ";
-        }
-        return $output . implode("\n", $hidden_inputs);
-    }
-
-
-    /**
-     * form_fields_array
-     * This utility function assembles form fields from a given structured array with field information.
-     * //TODO: This is an alternate generator that we may want to use instead.
-     *
-     * @param array $fields structured array of fields to assemble in the following format:
-     *                      [field_name] => array(
-     *                      ['label'] => 'label for field',
-     *                      ['labels'] => array('label_1', 'label_2'); //optional - if the field type is a multi select
-     *                      type of field you can indicated the labels for each option via this index
-     *                      ['extra_desc'] => 'extra description for the field', //optional
-     *                      ['type'] => 'textarea'|'text'|'wp_editor'|'checkbox'|'radio'|'hidden'|'select', //defaults
-     *                      to text
-     *                      ['value'] => 'value that goes in the field', //(if multi then this is an array of values
-     *                      and the 'default' paramater will be used for what is selected)
-     *                      ['default'] => 'default if the field type is multi (i.e. select or radios or checkboxes)',
-     *                      ['class'] => 'name-of-class(es)-for-input',
-     *                      ['classes'] => array('class_1', 'class_2'); //optional - if the field type is a multi
-     *                      select type of field you can indicate the css class for each option via this index.
-     *                      ['id'] => 'css-id-for-input') //defaults to 'field_name'
-     *                      ['unique_id'] => 1 //defaults to empty string.  This is useful for when the fields
-     *                      generated are going to be used in a loop and you want to make sure that the field
-     *                      identifiers are unique from each other.
-     *                      ['dimensions'] => array(100,300), //defaults to empty array.  This is used by field types
-     *                      such as textarea to indicate cols/rows.
-     *                      ['tabindex'] => '' //this allows you to set the tabindex for the field.
-     *                      ['wpeditor_args'] => array() //if the type of field is wpeditor then this can optionally
-     *                      contain an array of arguments for the editor setup.
-     *
-     * @return array         an array of inputs for form indexed by field name, and in the following structure:
-     *     [field_name] => array( 'label' => '{label_html}', 'field' => '{input_html}'
-     */
-    public static function get_form_fields_array($fields)
-    {
-
-        $form_fields = [];
-        $fields      = (array) $fields;
-
-        foreach ($fields as $field_name => $field_atts) {
-            // defaults:
-            $defaults = [
-                'class'         => '',
-                'classes'       => '',
-                'default'       => '',
-                'dimensions'    => ['10', '5'],
-                'extra_desc'    => '',
-                'id'            => $field_name,
-                'label'         => '',
-                'labels'        => '',
-                'required'      => false,
-                'tabindex'      => 0,
-                'type'          => 'text',
-                'unique_id'     => '',
-                'value'         => '',
-                'wpeditor_args' => [],
-            ];
-            // merge defaults with passed arguments
-            $_fields = wp_parse_args($field_atts, $defaults);
-
-            $class          = $_fields['class'];
-            $classes        = $_fields['classes'];
-            $default        = $_fields['default'];
-            $dims           = $_fields['dimensions'];
-            $extra_desc     = $_fields['extra_desc'];
-            $id             = $_fields['id'];
-            $label          = $_fields['label'];
-            $labels         = $_fields['labels'];
-            $required       = $_fields['required'];
-            $tab_index      = $_fields['tabindex'];
-            $type           = $_fields['type'];
-            $unique_id      = $_fields['unique_id'];
-            $value          = $_fields['value'];
-            $wp_editor_args = $_fields['wpeditor_args'];
-
-            // generate label
-            $label = ! empty($label) ? self::adminLabel($id, $label, $required) : '';
-            // generate field name
-            $name = ! empty($unique_id) ? $field_name . '[' . $unique_id . ']' : $field_name;
-
-            // we determine what we're building based on the type
-            switch ($type) {
-                case 'checkbox':
-                case 'radio':
-                    if (is_array($value)) {
-                        $c_input = '';
-                        foreach ($value as $key => $val) {
-                            $c_input .= self::adminMulti(
-                                $default,
-                                isset($classes[ $key ]) ? $classes[ $key ] : '',
-                                $field_name . '_' . $value,
-                                $name,
-                                $required,
-                                $tab_index,
-                                $type,
-                                $val,
-                                isset($labels[ $key ]) ? $labels[ $key ] : ''
-                            );
-                        }
-                        $field = $c_input;
-                    } else {
-                        $field = self::adminMulti(
-                            $default,
-                            $class,
-                            $id,
-                            $name,
-                            $required,
-                            $tab_index,
-                            $type,
-                            $value,
-                            $_fields['label']
-                        );
-                    }
-                    break;
-
-                case 'hidden':
-                    $field = self::adminHidden($class, $id, $name, $value);
-                    break;
-
-                case 'select':
-                    $options = [];
-                    foreach ($value as $key => $val) {
-                        $options[ $val ] = isset($labels[ $key ]) ? $labels[ $key ] : '';
-                    }
-                    $field = self::adminSelect($default, $class, $id, $name, $required, $tab_index, $options);
-                    break;
-
-                case 'textarea':
-                    $field =
-                        self::adminTextarea($class, $dims[0], $id, $name, $required, $dims[1], $tab_index, $value);
-                    break;
-
-                case 'wp_editor':
-                    $field = self::adminWpEditor(
-                        $class,
-                        $_fields['id'],
-                        $name,
-                        $dims[1],
-                        $tab_index,
-                        $value,
-                        $wp_editor_args
-                    );
-                    break;
-
-                default:
-                    $field = self::adminText($class, $id, $name, $required, $tab_index, $value);
-            }
-
-            $form_fields[ $field_name ] = ['label' => $label, 'field' => $field . $extra_desc];
-        }
-
-        return $form_fields;
-    }
-
-
-    /**
-     * @param string $class
-     * @param string $id
-     * @param string $name
-     * @param string $value
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function adminHidden($class, $id, $name, $value)
-    {
-        $id    = esc_attr($id);
-        $name  = esc_attr($name);
-        $class = esc_attr($class);
-        return "
+		}
+		return $output . implode("\n", $hidden_inputs);
+	}
+
+
+	/**
+	 * form_fields_array
+	 * This utility function assembles form fields from a given structured array with field information.
+	 * //TODO: This is an alternate generator that we may want to use instead.
+	 *
+	 * @param array $fields structured array of fields to assemble in the following format:
+	 *                      [field_name] => array(
+	 *                      ['label'] => 'label for field',
+	 *                      ['labels'] => array('label_1', 'label_2'); //optional - if the field type is a multi select
+	 *                      type of field you can indicated the labels for each option via this index
+	 *                      ['extra_desc'] => 'extra description for the field', //optional
+	 *                      ['type'] => 'textarea'|'text'|'wp_editor'|'checkbox'|'radio'|'hidden'|'select', //defaults
+	 *                      to text
+	 *                      ['value'] => 'value that goes in the field', //(if multi then this is an array of values
+	 *                      and the 'default' paramater will be used for what is selected)
+	 *                      ['default'] => 'default if the field type is multi (i.e. select or radios or checkboxes)',
+	 *                      ['class'] => 'name-of-class(es)-for-input',
+	 *                      ['classes'] => array('class_1', 'class_2'); //optional - if the field type is a multi
+	 *                      select type of field you can indicate the css class for each option via this index.
+	 *                      ['id'] => 'css-id-for-input') //defaults to 'field_name'
+	 *                      ['unique_id'] => 1 //defaults to empty string.  This is useful for when the fields
+	 *                      generated are going to be used in a loop and you want to make sure that the field
+	 *                      identifiers are unique from each other.
+	 *                      ['dimensions'] => array(100,300), //defaults to empty array.  This is used by field types
+	 *                      such as textarea to indicate cols/rows.
+	 *                      ['tabindex'] => '' //this allows you to set the tabindex for the field.
+	 *                      ['wpeditor_args'] => array() //if the type of field is wpeditor then this can optionally
+	 *                      contain an array of arguments for the editor setup.
+	 *
+	 * @return array         an array of inputs for form indexed by field name, and in the following structure:
+	 *     [field_name] => array( 'label' => '{label_html}', 'field' => '{input_html}'
+	 */
+	public static function get_form_fields_array($fields)
+	{
+
+		$form_fields = [];
+		$fields      = (array) $fields;
+
+		foreach ($fields as $field_name => $field_atts) {
+			// defaults:
+			$defaults = [
+				'class'         => '',
+				'classes'       => '',
+				'default'       => '',
+				'dimensions'    => ['10', '5'],
+				'extra_desc'    => '',
+				'id'            => $field_name,
+				'label'         => '',
+				'labels'        => '',
+				'required'      => false,
+				'tabindex'      => 0,
+				'type'          => 'text',
+				'unique_id'     => '',
+				'value'         => '',
+				'wpeditor_args' => [],
+			];
+			// merge defaults with passed arguments
+			$_fields = wp_parse_args($field_atts, $defaults);
+
+			$class          = $_fields['class'];
+			$classes        = $_fields['classes'];
+			$default        = $_fields['default'];
+			$dims           = $_fields['dimensions'];
+			$extra_desc     = $_fields['extra_desc'];
+			$id             = $_fields['id'];
+			$label          = $_fields['label'];
+			$labels         = $_fields['labels'];
+			$required       = $_fields['required'];
+			$tab_index      = $_fields['tabindex'];
+			$type           = $_fields['type'];
+			$unique_id      = $_fields['unique_id'];
+			$value          = $_fields['value'];
+			$wp_editor_args = $_fields['wpeditor_args'];
+
+			// generate label
+			$label = ! empty($label) ? self::adminLabel($id, $label, $required) : '';
+			// generate field name
+			$name = ! empty($unique_id) ? $field_name . '[' . $unique_id . ']' : $field_name;
+
+			// we determine what we're building based on the type
+			switch ($type) {
+				case 'checkbox':
+				case 'radio':
+					if (is_array($value)) {
+						$c_input = '';
+						foreach ($value as $key => $val) {
+							$c_input .= self::adminMulti(
+								$default,
+								isset($classes[ $key ]) ? $classes[ $key ] : '',
+								$field_name . '_' . $value,
+								$name,
+								$required,
+								$tab_index,
+								$type,
+								$val,
+								isset($labels[ $key ]) ? $labels[ $key ] : ''
+							);
+						}
+						$field = $c_input;
+					} else {
+						$field = self::adminMulti(
+							$default,
+							$class,
+							$id,
+							$name,
+							$required,
+							$tab_index,
+							$type,
+							$value,
+							$_fields['label']
+						);
+					}
+					break;
+
+				case 'hidden':
+					$field = self::adminHidden($class, $id, $name, $value);
+					break;
+
+				case 'select':
+					$options = [];
+					foreach ($value as $key => $val) {
+						$options[ $val ] = isset($labels[ $key ]) ? $labels[ $key ] : '';
+					}
+					$field = self::adminSelect($default, $class, $id, $name, $required, $tab_index, $options);
+					break;
+
+				case 'textarea':
+					$field =
+						self::adminTextarea($class, $dims[0], $id, $name, $required, $dims[1], $tab_index, $value);
+					break;
+
+				case 'wp_editor':
+					$field = self::adminWpEditor(
+						$class,
+						$_fields['id'],
+						$name,
+						$dims[1],
+						$tab_index,
+						$value,
+						$wp_editor_args
+					);
+					break;
+
+				default:
+					$field = self::adminText($class, $id, $name, $required, $tab_index, $value);
+			}
+
+			$form_fields[ $field_name ] = ['label' => $label, 'field' => $field . $extra_desc];
+		}
+
+		return $form_fields;
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param string $id
+	 * @param string $name
+	 * @param string $value
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function adminHidden($class, $id, $name, $value)
+	{
+		$id    = esc_attr($id);
+		$name  = esc_attr($name);
+		$class = esc_attr($class);
+		return "
         <input name='{$name}' type='hidden' id='{$id}' class='{$class}' value='{$value}' />";
-    }
-
-
-    /**
-     * @param string $id
-     * @param string $label
-     * @param string $required
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function adminLabel($id, $label, $required)
-    {
-        $id       = esc_attr($id);
-        $label    = esc_html($label);
-        $required = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? " <span>*</span>" : '';
-        return "<label for='{$id}'>{$label}{$required}</label>";
-    }
-
-
-    /**
-     * @param string $default
-     * @param string $class
-     * @param string $id
-     * @param string $name
-     * @param string $required
-     * @param int    $tab_index
-     * @param string $type
-     * @param string $value
-     * @param string $label
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function adminMulti($default, $class, $id, $name, $required, $tab_index, $type, $value, $label = '')
-    {
-        $id        = esc_attr($id);
-        $name      = esc_attr($name);
-        $class     = esc_attr($class);
-        $tab_index = absint($tab_index);
-        $checked   = ! empty($default) && $default == $value ? 'checked ' : '';
-        $required  = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
-        $input     = "
+	}
+
+
+	/**
+	 * @param string $id
+	 * @param string $label
+	 * @param string $required
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function adminLabel($id, $label, $required)
+	{
+		$id       = esc_attr($id);
+		$label    = esc_html($label);
+		$required = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? " <span>*</span>" : '';
+		return "<label for='{$id}'>{$label}{$required}</label>";
+	}
+
+
+	/**
+	 * @param string $default
+	 * @param string $class
+	 * @param string $id
+	 * @param string $name
+	 * @param string $required
+	 * @param int    $tab_index
+	 * @param string $type
+	 * @param string $value
+	 * @param string $label
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function adminMulti($default, $class, $id, $name, $required, $tab_index, $type, $value, $label = '')
+	{
+		$id        = esc_attr($id);
+		$name      = esc_attr($name);
+		$class     = esc_attr($class);
+		$tab_index = absint($tab_index);
+		$checked   = ! empty($default) && $default == $value ? 'checked ' : '';
+		$required  = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
+		$input     = "
         <input name='{$name}[]' type='{$type}' id='{$id}' class='{$class}' value='{$value}' {$checked} {$required} tabindex='{$tab_index}'/>";
-        if ($label === '') {
-            return $input;
-        }
-        $label = esc_html($label);
-        $label_class = self::appendInputSizeClass('', $label);
-        $label_class = $label_class ? ' class="' . $label_class . '"' : '';
-        return "
+		if ($label === '') {
+			return $input;
+		}
+		$label = esc_html($label);
+		$label_class = self::appendInputSizeClass('', $label);
+		$label_class = $label_class ? ' class="' . $label_class . '"' : '';
+		return "
         <label for='$id'{$label_class}>
             {$input}
             {$label}
         </label>";
-    }
-
-
-    /**
-     * @param string $default
-     * @param string $class
-     * @param string $id
-     * @param string $name
-     * @param string $required
-     * @param int    $tab_index
-     * @param array  $options
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function adminSelect($default, $class, $id, $name, $required, $tab_index, $options = [])
-    {
-        $options_array = [];
-        foreach ($options as $value => $label) {
-            $selected        = ! empty($default) && $default == $value ? 'selected' : '';
-            $value           = esc_attr($value);
-            $label           = wp_strip_all_tags($label);
-            $options_array[] = "<option value='{$value}' {$selected}>{$label}</option>";
-        }
-        $options_html = implode("\n", $options_array);
-        $id           = esc_attr($id);
-        $name         = esc_attr($name);
-        $class        = esc_attr($class);
-        $tab_index    = absint($tab_index);
-        $required     = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
-
-        $class = self::appendInputSizeClass($class, $options);
-
-        return "
+	}
+
+
+	/**
+	 * @param string $default
+	 * @param string $class
+	 * @param string $id
+	 * @param string $name
+	 * @param string $required
+	 * @param int    $tab_index
+	 * @param array  $options
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function adminSelect($default, $class, $id, $name, $required, $tab_index, $options = [])
+	{
+		$options_array = [];
+		foreach ($options as $value => $label) {
+			$selected        = ! empty($default) && $default == $value ? 'selected' : '';
+			$value           = esc_attr($value);
+			$label           = wp_strip_all_tags($label);
+			$options_array[] = "<option value='{$value}' {$selected}>{$label}</option>";
+		}
+		$options_html = implode("\n", $options_array);
+		$id           = esc_attr($id);
+		$name         = esc_attr($name);
+		$class        = esc_attr($class);
+		$tab_index    = absint($tab_index);
+		$required     = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
+
+		$class = self::appendInputSizeClass($class, $options);
+
+		return "
         <select name='{$name}' id='{$id}' class='{$class}' {$required} tabindex='{$tab_index}'>
             {$options_html}
         </select>";
-    }
-
-
-    /**
-     * @param string $class
-     * @param string $id
-     * @param string $name
-     * @param string $required
-     * @param int    $tab_index
-     * @param string $value
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function adminText($class, $id, $name, $required, $tab_index, $value)
-    {
-        $id        = esc_attr($id);
-        $name      = esc_attr($name);
-        $class     = esc_attr($class);
-        $tab_index = absint($tab_index);
-        $required  = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
-        $class     = self::appendInputSizeClass($class, $value);
-        $value     = esc_attr($value);
-        return "
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param string $id
+	 * @param string $name
+	 * @param string $required
+	 * @param int    $tab_index
+	 * @param string $value
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function adminText($class, $id, $name, $required, $tab_index, $value)
+	{
+		$id        = esc_attr($id);
+		$name      = esc_attr($name);
+		$class     = esc_attr($class);
+		$tab_index = absint($tab_index);
+		$required  = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
+		$class     = self::appendInputSizeClass($class, $value);
+		$value     = esc_attr($value);
+		return "
         <input name='{$name}' type='text' id='{$id}' class='{$class}' value='{$value}' {$required} tabindex='{$tab_index}'/>";
-    }
-
-
-    /**
-     * @param string $class
-     * @param int    $cols
-     * @param string $id
-     * @param string $name
-     * @param string $required
-     * @param int    $rows
-     * @param int    $tab_index
-     * @param string $value
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function adminTextarea($class, $cols, $id, $name, $required, $rows, $tab_index, $value)
-    {
-        $id        = esc_attr($id);
-        $name      = esc_attr($name);
-        $class     = esc_attr($class);
-        $cols      = absint($cols);
-        $rows      = absint($rows);
-        $value     = esc_textarea($value);
-        $tab_index = absint($tab_index);
-        $required  = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
-        return "
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param int    $cols
+	 * @param string $id
+	 * @param string $name
+	 * @param string $required
+	 * @param int    $rows
+	 * @param int    $tab_index
+	 * @param string $value
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function adminTextarea($class, $cols, $id, $name, $required, $rows, $tab_index, $value)
+	{
+		$id        = esc_attr($id);
+		$name      = esc_attr($name);
+		$class     = esc_attr($class);
+		$cols      = absint($cols);
+		$rows      = absint($rows);
+		$value     = esc_textarea($value);
+		$tab_index = absint($tab_index);
+		$required  = filter_var($required, FILTER_VALIDATE_BOOLEAN) ? 'required' : '';
+		return "
         <textarea name='{$name}' id='{$id}' class='{$class}' rows='{$rows}' cols='{$cols}' {$required} tabindex='{$tab_index}'>{$value}</textarea>";
-    }
-
-
-    /**
-     * @param string $class
-     * @param string $id
-     * @param string $name
-     * @param int    $rows
-     * @param int    $tab_index
-     * @param string $value
-     * @param array  $wp_editor_args
-     * @return false|string
-     * @since   4.10.14.p
-     */
-    private static function adminWpEditor($class, $id, $name, $rows, $tab_index, $value, $wp_editor_args = [])
-    {
-        $editor_settings = $wp_editor_args + [
-                'textarea_name' => esc_attr($name),
-                'textarea_rows' => absint($rows),
-                'editor_class'  => esc_attr($class),
-                'tabindex'      => absint($tab_index),
-            ];
-        ob_start();
-        wp_editor($value, esc_attr($id), $editor_settings);
-        return ob_get_clean();
-    }
-
-
-    /**
-     * espresso admin page select_input
-     * Turns an array into a select fields
-     *
-     * @static
-     * @access public
-     * @param string  $name       field name
-     * @param array   $values     option values, numbered array starting at 0, where each value is an array with a key
-     *                            'text' (meaning text to display' and 'id' (meaning the internal value) eg:
-     *                            array(1=>array('text'=>'Monday','id'=>1),2=>array('text'=>'Tuesday','id'=>2)...). or
-     *                            as an array of key-value pairs, where the key is to be used for the select input's
-     *                            name, and the value will be the text shown to the user.  Optionally you can also
-     *                            include an additional key of "class" which will add a specific class to the option
-     *                            for that value.
-     * @param string  $default    default value
-     * @param string  $parameters extra parameters
-     * @param string  $class      css class
-     * @param boolean $autosize   whether to autosize the select or not
-     * @return string              html string for the select input
-     */
-    public static function select_input(
-        $name,
-        $values,
-        $default = '',
-        $parameters = '',
-        $class = '',
-        $autosize = true
-    ) {
-        // if $values was submitted in the wrong format, convert it over
-        if (! empty($values) && (! array_key_exists(0, $values) || ! is_array($values[0]))) {
-            $converted_values = [];
-            foreach ($values as $id => $text) {
-                $converted_values[] = ['id' => $id, 'text' => $text];
-            }
-            $values = $converted_values;
-        }
-
-        $field =
-            '<select id="' . EEH_Formatter::ee_tep_output_string($name)
-            . '" name="' . EEH_Formatter::ee_tep_output_string($name)
-            . '"';
-
-        if (EEH_Formatter::ee_tep_not_null($parameters)) {
-            $field .= ' ' . $parameters;
-        }
-        $class = $autosize ? self::appendInputSizeClass($class, $values) : '';
-
-        $field .= ' class="' . $class . '">';
-
-        if (empty($default) && isset($GLOBALS[ $name ])) {
-            $default = stripslashes($GLOBALS[ $name ]);
-        }
-
-        $field .= self::selectInputOption($values, $default);
-        $field .= '</select>';
-
-        return $field;
-    }
-
-
-    private static function selectInputOption(array $values, $default): string
-    {
-        if (isset($values['id'], $values['text'])) {
-            $id = is_scalar($values['id']) ? $values['id'] : '';
-            $text = is_scalar($values['text']) ? $values['text'] : '';
-            $selected = $default == $values['id'] ? ' selected = "selected"' : '';
-            $html_class = isset($values['class']) ? ' class="' . $values['class'] . '"' : '';
-            return "<option value='{$id}'{$selected}{$html_class}>{$text}</option>";
-        }
-        $options = '';
-        foreach ($values as $value) {
-            $options .= self::selectInputOption($value, $default);
-        }
-        return $options;
-    }
-
-
-    /**
-     * @param mixed $value
-     * @return int
-     * @since   5.0.0.p
-     */
-    private static function getInputValueLength($value): int
-    {
-        if ($value instanceof EE_Question_Option) {
-            return self::getInputValueLength($value->desc());
-        }
-        if (is_array($value)) {
-            $chars = 0;
-            foreach ($value as $val) {
-                $length = self::getInputValueLength($val);
-                $chars = max($length, $chars);
-            }
-            return $chars;
-        }
-        // not a primitive? return something big
-        if (! is_scalar($value)) {
-            return 500;
-        }
-        return strlen((string) $value);
-    }
-
-
-    /**
-     * @param string $class
-     * @param mixed $value
-     * @return string
-     * @since   5.0.0.p
-     */
-    private static function appendInputSizeClass(string $class, $value): string
-    {
-        if (strpos($class, 'ee-input-width--') !== false) {
-            return $class;
-        }
-        $chars = self::getInputValueLength($value);
-        if ($chars && $chars < 5) {
-            return "{$class} ee-input-width--tiny";
-        }
-        if ($chars && $chars < 25) {
-            return "{$class} ee-input-width--small";
-        }
-        if ($chars && $chars > 100) {
-            return "{$class} ee-input-width--big";
-        }
-        return "{$class} ee-input-width--reg";
-    }
-
-
-    /**
-     * generate_question_groups_html
-     *
-     * @param array  $question_groups
-     * @param string $group_wrapper
-     * @return string HTML
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function generate_question_groups_html($question_groups = [], $group_wrapper = 'fieldset')
-    {
-
-        $html                            = '';
-        $before_question_group_questions =
-            apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
-        $after_question_group_questions  =
-            apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
-
-        if (! empty($question_groups)) {
-            // loop thru question groups
-            foreach ($question_groups as $QSG) {
-                // check that questions exist
-                if (! empty($QSG['QSG_questions'])) {
-                    // use fieldsets
-                    $html .= "\n\t"
-                             . '<'
-                             . $group_wrapper
-                             . ' class="espresso-question-group-wrap" id="'
-                             . $QSG['QSG_identifier']
-                             . '">';
-                    // group_name
-                    $html .= $QSG['QSG_show_group_name']
-                        ? "\n\t\t"
-                          . '<h5 class="espresso-question-group-title-h5 section-title">'
-                          . self::prep_answer($QSG['QSG_name'])
-                          . '</h5>'
-                        : '';
-                    // group_desc
-                    $html .= $QSG['QSG_show_group_desc'] && ! empty($QSG['QSG_desc'])
-                        ? '<div class="espresso-question-group-desc-pg">'
-                          . self::prep_answer($QSG['QSG_desc'])
-                          . '</div>'
-                        : '';
-
-                    $html .= $before_question_group_questions;
-                    // loop thru questions
-                    foreach ($QSG['QSG_questions'] as $question) {
-                        $QFI  = new EE_Question_Form_Input(
-                            $question['qst_obj'],
-                            $question['ans_obj'],
-                            $question
-                        );
-                        $html .= self::generate_form_input($QFI);
-                    }
-                    $html .= $after_question_group_questions;
-                    $html .= "\n\t" . '</' . $group_wrapper . '>';
-                }
-            }
-        }
-
-        return $html;
-    }
-
-
-    /**
-     * generate_question_groups_html
-     *
-     * @param array  $question_groups
-     * @param array  $q_meta
-     * @param bool   $from_admin
-     * @param string $group_wrapper
-     * @return string HTML
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function generate_question_groups_html2(
-        $question_groups = [],
-        $q_meta = [],
-        $from_admin = false,
-        $group_wrapper = 'fieldset'
-    ) {
-
-        $html                            = '';
-        $before_question_group_questions =
-            apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
-        $after_question_group_questions  =
-            apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
-
-        $default_q_meta = [
-            'att_nmbr'    => 1,
-            'ticket_id'   => '',
-            'input_name'  => '',
-            'input_id'    => '',
-            'input_class' => '',
-        ];
-        $q_meta         = array_merge($default_q_meta, $q_meta);
-
-        if (! empty($question_groups)) {
-            // loop thru question groups
-            foreach ($question_groups as $QSG) {
-                if ($QSG instanceof EE_Question_Group) {
-                    // check that questions exist
-
-                    $where = ['QST_deleted' => 0];
-                    if (! $from_admin) {
-                        $where['QST_admin_only'] = 0;
-                    }
-                    $questions =
-                        $QSG->questions([$where, 'order_by' => ['Question_Group_Question.QGQ_order' => 'ASC']]);
-                    if (! empty($questions)) {
-                        // use fieldsets
-                        $html .= "\n\t"
-                                 . '<' . $group_wrapper . ' class="espresso-question-group-wrap" '
-                                 . 'id="' . $QSG->get('QSG_identifier') . '">';
-                        // group_name
-                        if ($QSG->show_group_name()) {
-                            $html .= "\n\t\t"
-                                     . '<h5 class="espresso-question-group-title-h5 section-title">'
-                                     . $QSG->get_pretty('QSG_name')
-                                     . '</h5>';
-                        }
-                        // group_desc
-                        if ($QSG->show_group_desc()) {
-                            $html .= '<div class="espresso-question-group-desc-pg">'
-                                     . $QSG->get_pretty('QSG_desc')
-                                     . '</div>';
-                        }
-
-                        $html .= $before_question_group_questions;
-                        // loop thru questions
-                        foreach ($questions as $QST) {
-                            $qstn_id = $QST->is_system_question() ? $QST->system_ID() : $QST->ID();
-
-                            $answer = null;
-
-                            /** @var RequestInterface $request */
-                            $request      = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-                            $request_qstn = $request->getRequestParam('qstn', [], 'string', true);
-                            if (! empty($request_qstn) && isset($q_meta['input_id']) && isset($q_meta['att_nmbr'])) {
-                                // check for answer in $request_qstn in case we are reprocessing a form after an error
-                                if (isset($request_qstn[ $q_meta['input_id'] ][ $qstn_id ])) {
-                                    $answer = is_array($request_qstn[ $q_meta['input_id'] ][ $qstn_id ])
-                                        ? $request_qstn[ $q_meta['input_id'] ][ $qstn_id ]
-                                        : sanitize_text_field($request_qstn[ $q_meta['input_id'] ][ $qstn_id ]);
-                                }
-                            } elseif (isset($q_meta['attendee']) && $q_meta['attendee']) {
-                                // attendee data from the session
-                                $answer =
-                                    isset($q_meta['attendee'][ $qstn_id ]) ? $q_meta['attendee'][ $qstn_id ] : null;
-                            }
-
-
-                            $QFI  = new EE_Question_Form_Input(
-                                $QST,
-                                EE_Answer::new_instance(
-                                    [
-                                        'ANS_ID'    => 0,
-                                        'QST_ID'    => 0,
-                                        'REG_ID'    => 0,
-                                        'ANS_value' => $answer,
-                                    ]
-                                ),
-                                $q_meta
-                            );
-                            $html .= self::generate_form_input($QFI);
-                        }
-                        $html .= $after_question_group_questions;
-                        $html .= "\n\t" . '</' . $group_wrapper . '>';
-                    }
-                }
-            }
-        }
-        return $html;
-    }
-
-
-    /**
-     * generate_form_input
-     *
-     * @param EE_Question_Form_Input $QFI
-     * @return string HTML
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function generate_form_input(EE_Question_Form_Input $QFI)
-    {
-        if (isset($QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin()) {
-            return '';
-        }
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-
-        $QFI = self::_load_system_dropdowns($QFI);
-        $QFI = self::_load_specialized_dropdowns($QFI);
-
-        // we also need to verify
-
-        $display_text = (string) $QFI->get('QST_display_text');
-        $input_name   = (string) $QFI->get('QST_input_name');
-        $answer       = $request->getRequestParam($input_name, $QFI->get('ANS_value'));
-        $input_id     = (string) $QFI->get('QST_input_id');
-        $input_class  = (string) $QFI->get('QST_input_class');
-        //      $disabled = $QFI->get('QST_disabled') ? ' disabled="disabled"' : '';
-        $disabled          = (bool) $QFI->get('QST_disabled');
-        $required_label    = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>');
-        $QST_required      = (bool) $QFI->get('QST_required');
-        $required          = $QST_required
-            ? ['label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required]
-            : [];
-        $use_html_entities = $QFI->get_meta('htmlentities');
-        $required_text     = (string) $QFI->get('QST_required_text') !== ''
-            ? (string) $QFI->get('QST_required_text')
-            : esc_html__('This field is required', 'event_espresso');
-        $required_text     = $QST_required
-            ? "\n\t\t\t"
-              . '<div class="required-text hidden">'
-              . self::prep_answer($required_text, $use_html_entities)
-              . '</div>'
-            : '';
-        $label_class       = (string) $QFI->get('label_class');
-        $label_class       = $label_class ? "{$label_class} espresso-form-input-lbl" : 'espresso-form-input-lbl';
-        $QST_options       = $QFI->options(true, $answer);
-        $options           = is_array($QST_options) ? self::prep_answer_options($QST_options) : [];
-        $system_ID         = (string) $QFI->get('QST_system');
-        $label_b4          = (bool) $QFI->get_meta('label_b4');
-        $use_desc_4_label  = (bool) $QFI->get_meta('use_desc_4_label');
-        $add_mobile_label  = (bool) $QFI->get_meta('add_mobile_label');
-
-
-        switch ($QFI->get('QST_type')) {
-            case 'TEXTAREA':
-                return EEH_Form_Fields::textarea(
-                    $display_text,
-                    $answer,
-                    $input_name,
-                    $input_id,
-                    $input_class,
-                    [],
-                    $required,
-                    $required_text,
-                    $label_class,
-                    $disabled,
-                    $system_ID,
-                    $use_html_entities,
-                    $add_mobile_label
-                );
-
-            case 'DROPDOWN':
-                return EEH_Form_Fields::select(
-                    $display_text,
-                    $answer,
-                    $options,
-                    $input_name,
-                    $input_id,
-                    $input_class,
-                    $required,
-                    $required_text,
-                    $label_class,
-                    $disabled,
-                    $system_ID,
-                    $use_html_entities,
-                    true,
-                    $add_mobile_label
-                );
-
-
-            case 'RADIO_BTN':
-                return EEH_Form_Fields::radio(
-                    $display_text,
-                    $answer,
-                    $options,
-                    $input_name,
-                    $input_id,
-                    $input_class,
-                    $required,
-                    $required_text,
-                    $label_class,
-                    $disabled,
-                    $system_ID,
-                    $use_html_entities,
-                    $label_b4,
-                    $use_desc_4_label,
-                    $add_mobile_label
-                );
-
-            case 'CHECKBOX':
-                return EEH_Form_Fields::checkbox(
-                    $display_text,
-                    $answer,
-                    $options,
-                    $input_name,
-                    $input_id,
-                    $input_class,
-                    $required,
-                    $required_text,
-                    $label_class,
-                    $disabled,
-                    $label_b4,
-                    $system_ID,
-                    $use_html_entities,
-                    $add_mobile_label
-                );
-
-            case 'DATE':
-                return EEH_Form_Fields::datepicker(
-                    $display_text,
-                    $answer,
-                    $input_name,
-                    $input_id,
-                    $input_class,
-                    $required,
-                    $required_text,
-                    $label_class,
-                    $disabled,
-                    $system_ID,
-                    $use_html_entities,
-                    $add_mobile_label
-                );
-
-            case 'TEXT':
-            default:
-                return EEH_Form_Fields::text(
-                    $display_text,
-                    $answer,
-                    $input_name,
-                    $input_id,
-                    $input_class,
-                    $required,
-                    $required_text,
-                    $label_class,
-                    $disabled,
-                    $system_ID,
-                    $use_html_entities,
-                    $add_mobile_label
-                );
-        }
-    }
-
-
-    public static function label(
-        string $question,
-        string $required_text = '',
-        string $required_label = '',
-        string $name = '',
-        string $label_class = '',
-        bool $filter = true
-    ): string {
-        $for   = ! empty($name) ? " for='{$name}'" : '';
-        $class = ! empty($label_class) ? " class='{$label_class}'" : '';
-        $label = self::prep_question($question) . $required_label;
-        $label_html = "
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param string $id
+	 * @param string $name
+	 * @param int    $rows
+	 * @param int    $tab_index
+	 * @param string $value
+	 * @param array  $wp_editor_args
+	 * @return false|string
+	 * @since   4.10.14.p
+	 */
+	private static function adminWpEditor($class, $id, $name, $rows, $tab_index, $value, $wp_editor_args = [])
+	{
+		$editor_settings = $wp_editor_args + [
+				'textarea_name' => esc_attr($name),
+				'textarea_rows' => absint($rows),
+				'editor_class'  => esc_attr($class),
+				'tabindex'      => absint($tab_index),
+			];
+		ob_start();
+		wp_editor($value, esc_attr($id), $editor_settings);
+		return ob_get_clean();
+	}
+
+
+	/**
+	 * espresso admin page select_input
+	 * Turns an array into a select fields
+	 *
+	 * @static
+	 * @access public
+	 * @param string  $name       field name
+	 * @param array   $values     option values, numbered array starting at 0, where each value is an array with a key
+	 *                            'text' (meaning text to display' and 'id' (meaning the internal value) eg:
+	 *                            array(1=>array('text'=>'Monday','id'=>1),2=>array('text'=>'Tuesday','id'=>2)...). or
+	 *                            as an array of key-value pairs, where the key is to be used for the select input's
+	 *                            name, and the value will be the text shown to the user.  Optionally you can also
+	 *                            include an additional key of "class" which will add a specific class to the option
+	 *                            for that value.
+	 * @param string  $default    default value
+	 * @param string  $parameters extra parameters
+	 * @param string  $class      css class
+	 * @param boolean $autosize   whether to autosize the select or not
+	 * @return string              html string for the select input
+	 */
+	public static function select_input(
+		$name,
+		$values,
+		$default = '',
+		$parameters = '',
+		$class = '',
+		$autosize = true
+	) {
+		// if $values was submitted in the wrong format, convert it over
+		if (! empty($values) && (! array_key_exists(0, $values) || ! is_array($values[0]))) {
+			$converted_values = [];
+			foreach ($values as $id => $text) {
+				$converted_values[] = ['id' => $id, 'text' => $text];
+			}
+			$values = $converted_values;
+		}
+
+		$field =
+			'<select id="' . EEH_Formatter::ee_tep_output_string($name)
+			. '" name="' . EEH_Formatter::ee_tep_output_string($name)
+			. '"';
+
+		if (EEH_Formatter::ee_tep_not_null($parameters)) {
+			$field .= ' ' . $parameters;
+		}
+		$class = $autosize ? self::appendInputSizeClass($class, $values) : '';
+
+		$field .= ' class="' . $class . '">';
+
+		if (empty($default) && isset($GLOBALS[ $name ])) {
+			$default = stripslashes($GLOBALS[ $name ]);
+		}
+
+		$field .= self::selectInputOption($values, $default);
+		$field .= '</select>';
+
+		return $field;
+	}
+
+
+	private static function selectInputOption(array $values, $default): string
+	{
+		if (isset($values['id'], $values['text'])) {
+			$id = is_scalar($values['id']) ? $values['id'] : '';
+			$text = is_scalar($values['text']) ? $values['text'] : '';
+			$selected = $default == $values['id'] ? ' selected = "selected"' : '';
+			$html_class = isset($values['class']) ? ' class="' . $values['class'] . '"' : '';
+			return "<option value='{$id}'{$selected}{$html_class}>{$text}</option>";
+		}
+		$options = '';
+		foreach ($values as $value) {
+			$options .= self::selectInputOption($value, $default);
+		}
+		return $options;
+	}
+
+
+	/**
+	 * @param mixed $value
+	 * @return int
+	 * @since   5.0.0.p
+	 */
+	private static function getInputValueLength($value): int
+	{
+		if ($value instanceof EE_Question_Option) {
+			return self::getInputValueLength($value->desc());
+		}
+		if (is_array($value)) {
+			$chars = 0;
+			foreach ($value as $val) {
+				$length = self::getInputValueLength($val);
+				$chars = max($length, $chars);
+			}
+			return $chars;
+		}
+		// not a primitive? return something big
+		if (! is_scalar($value)) {
+			return 500;
+		}
+		return strlen((string) $value);
+	}
+
+
+	/**
+	 * @param string $class
+	 * @param mixed $value
+	 * @return string
+	 * @since   5.0.0.p
+	 */
+	private static function appendInputSizeClass(string $class, $value): string
+	{
+		if (strpos($class, 'ee-input-width--') !== false) {
+			return $class;
+		}
+		$chars = self::getInputValueLength($value);
+		if ($chars && $chars < 5) {
+			return "{$class} ee-input-width--tiny";
+		}
+		if ($chars && $chars < 25) {
+			return "{$class} ee-input-width--small";
+		}
+		if ($chars && $chars > 100) {
+			return "{$class} ee-input-width--big";
+		}
+		return "{$class} ee-input-width--reg";
+	}
+
+
+	/**
+	 * generate_question_groups_html
+	 *
+	 * @param array  $question_groups
+	 * @param string $group_wrapper
+	 * @return string HTML
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function generate_question_groups_html($question_groups = [], $group_wrapper = 'fieldset')
+	{
+
+		$html                            = '';
+		$before_question_group_questions =
+			apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions  =
+			apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
+
+		if (! empty($question_groups)) {
+			// loop thru question groups
+			foreach ($question_groups as $QSG) {
+				// check that questions exist
+				if (! empty($QSG['QSG_questions'])) {
+					// use fieldsets
+					$html .= "\n\t"
+							 . '<'
+							 . $group_wrapper
+							 . ' class="espresso-question-group-wrap" id="'
+							 . $QSG['QSG_identifier']
+							 . '">';
+					// group_name
+					$html .= $QSG['QSG_show_group_name']
+						? "\n\t\t"
+						  . '<h5 class="espresso-question-group-title-h5 section-title">'
+						  . self::prep_answer($QSG['QSG_name'])
+						  . '</h5>'
+						: '';
+					// group_desc
+					$html .= $QSG['QSG_show_group_desc'] && ! empty($QSG['QSG_desc'])
+						? '<div class="espresso-question-group-desc-pg">'
+						  . self::prep_answer($QSG['QSG_desc'])
+						  . '</div>'
+						: '';
+
+					$html .= $before_question_group_questions;
+					// loop thru questions
+					foreach ($QSG['QSG_questions'] as $question) {
+						$QFI  = new EE_Question_Form_Input(
+							$question['qst_obj'],
+							$question['ans_obj'],
+							$question
+						);
+						$html .= self::generate_form_input($QFI);
+					}
+					$html .= $after_question_group_questions;
+					$html .= "\n\t" . '</' . $group_wrapper . '>';
+				}
+			}
+		}
+
+		return $html;
+	}
+
+
+	/**
+	 * generate_question_groups_html
+	 *
+	 * @param array  $question_groups
+	 * @param array  $q_meta
+	 * @param bool   $from_admin
+	 * @param string $group_wrapper
+	 * @return string HTML
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function generate_question_groups_html2(
+		$question_groups = [],
+		$q_meta = [],
+		$from_admin = false,
+		$group_wrapper = 'fieldset'
+	) {
+
+		$html                            = '';
+		$before_question_group_questions =
+			apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__before_question_group_questions', '');
+		$after_question_group_questions  =
+			apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
+
+		$default_q_meta = [
+			'att_nmbr'    => 1,
+			'ticket_id'   => '',
+			'input_name'  => '',
+			'input_id'    => '',
+			'input_class' => '',
+		];
+		$q_meta         = array_merge($default_q_meta, $q_meta);
+
+		if (! empty($question_groups)) {
+			// loop thru question groups
+			foreach ($question_groups as $QSG) {
+				if ($QSG instanceof EE_Question_Group) {
+					// check that questions exist
+
+					$where = ['QST_deleted' => 0];
+					if (! $from_admin) {
+						$where['QST_admin_only'] = 0;
+					}
+					$questions =
+						$QSG->questions([$where, 'order_by' => ['Question_Group_Question.QGQ_order' => 'ASC']]);
+					if (! empty($questions)) {
+						// use fieldsets
+						$html .= "\n\t"
+								 . '<' . $group_wrapper . ' class="espresso-question-group-wrap" '
+								 . 'id="' . $QSG->get('QSG_identifier') . '">';
+						// group_name
+						if ($QSG->show_group_name()) {
+							$html .= "\n\t\t"
+									 . '<h5 class="espresso-question-group-title-h5 section-title">'
+									 . $QSG->get_pretty('QSG_name')
+									 . '</h5>';
+						}
+						// group_desc
+						if ($QSG->show_group_desc()) {
+							$html .= '<div class="espresso-question-group-desc-pg">'
+									 . $QSG->get_pretty('QSG_desc')
+									 . '</div>';
+						}
+
+						$html .= $before_question_group_questions;
+						// loop thru questions
+						foreach ($questions as $QST) {
+							$qstn_id = $QST->is_system_question() ? $QST->system_ID() : $QST->ID();
+
+							$answer = null;
+
+							/** @var RequestInterface $request */
+							$request      = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+							$request_qstn = $request->getRequestParam('qstn', [], 'string', true);
+							if (! empty($request_qstn) && isset($q_meta['input_id']) && isset($q_meta['att_nmbr'])) {
+								// check for answer in $request_qstn in case we are reprocessing a form after an error
+								if (isset($request_qstn[ $q_meta['input_id'] ][ $qstn_id ])) {
+									$answer = is_array($request_qstn[ $q_meta['input_id'] ][ $qstn_id ])
+										? $request_qstn[ $q_meta['input_id'] ][ $qstn_id ]
+										: sanitize_text_field($request_qstn[ $q_meta['input_id'] ][ $qstn_id ]);
+								}
+							} elseif (isset($q_meta['attendee']) && $q_meta['attendee']) {
+								// attendee data from the session
+								$answer =
+									isset($q_meta['attendee'][ $qstn_id ]) ? $q_meta['attendee'][ $qstn_id ] : null;
+							}
+
+
+							$QFI  = new EE_Question_Form_Input(
+								$QST,
+								EE_Answer::new_instance(
+									[
+										'ANS_ID'    => 0,
+										'QST_ID'    => 0,
+										'REG_ID'    => 0,
+										'ANS_value' => $answer,
+									]
+								),
+								$q_meta
+							);
+							$html .= self::generate_form_input($QFI);
+						}
+						$html .= $after_question_group_questions;
+						$html .= "\n\t" . '</' . $group_wrapper . '>';
+					}
+				}
+			}
+		}
+		return $html;
+	}
+
+
+	/**
+	 * generate_form_input
+	 *
+	 * @param EE_Question_Form_Input $QFI
+	 * @return string HTML
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function generate_form_input(EE_Question_Form_Input $QFI)
+	{
+		if (isset($QFI->QST_admin_only) && $QFI->QST_admin_only && ! is_admin()) {
+			return '';
+		}
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+
+		$QFI = self::_load_system_dropdowns($QFI);
+		$QFI = self::_load_specialized_dropdowns($QFI);
+
+		// we also need to verify
+
+		$display_text = (string) $QFI->get('QST_display_text');
+		$input_name   = (string) $QFI->get('QST_input_name');
+		$answer       = $request->getRequestParam($input_name, $QFI->get('ANS_value'));
+		$input_id     = (string) $QFI->get('QST_input_id');
+		$input_class  = (string) $QFI->get('QST_input_class');
+		//      $disabled = $QFI->get('QST_disabled') ? ' disabled="disabled"' : '';
+		$disabled          = (bool) $QFI->get('QST_disabled');
+		$required_label    = apply_filters(' FHEE__EEH_Form_Fields__generate_form_input__required_label', '<em>*</em>');
+		$QST_required      = (bool) $QFI->get('QST_required');
+		$required          = $QST_required
+			? ['label' => $required_label, 'class' => 'required needs-value', 'title' => $QST_required]
+			: [];
+		$use_html_entities = $QFI->get_meta('htmlentities');
+		$required_text     = (string) $QFI->get('QST_required_text') !== ''
+			? (string) $QFI->get('QST_required_text')
+			: esc_html__('This field is required', 'event_espresso');
+		$required_text     = $QST_required
+			? "\n\t\t\t"
+			  . '<div class="required-text hidden">'
+			  . self::prep_answer($required_text, $use_html_entities)
+			  . '</div>'
+			: '';
+		$label_class       = (string) $QFI->get('label_class');
+		$label_class       = $label_class ? "{$label_class} espresso-form-input-lbl" : 'espresso-form-input-lbl';
+		$QST_options       = $QFI->options(true, $answer);
+		$options           = is_array($QST_options) ? self::prep_answer_options($QST_options) : [];
+		$system_ID         = (string) $QFI->get('QST_system');
+		$label_b4          = (bool) $QFI->get_meta('label_b4');
+		$use_desc_4_label  = (bool) $QFI->get_meta('use_desc_4_label');
+		$add_mobile_label  = (bool) $QFI->get_meta('add_mobile_label');
+
+
+		switch ($QFI->get('QST_type')) {
+			case 'TEXTAREA':
+				return EEH_Form_Fields::textarea(
+					$display_text,
+					$answer,
+					$input_name,
+					$input_id,
+					$input_class,
+					[],
+					$required,
+					$required_text,
+					$label_class,
+					$disabled,
+					$system_ID,
+					$use_html_entities,
+					$add_mobile_label
+				);
+
+			case 'DROPDOWN':
+				return EEH_Form_Fields::select(
+					$display_text,
+					$answer,
+					$options,
+					$input_name,
+					$input_id,
+					$input_class,
+					$required,
+					$required_text,
+					$label_class,
+					$disabled,
+					$system_ID,
+					$use_html_entities,
+					true,
+					$add_mobile_label
+				);
+
+
+			case 'RADIO_BTN':
+				return EEH_Form_Fields::radio(
+					$display_text,
+					$answer,
+					$options,
+					$input_name,
+					$input_id,
+					$input_class,
+					$required,
+					$required_text,
+					$label_class,
+					$disabled,
+					$system_ID,
+					$use_html_entities,
+					$label_b4,
+					$use_desc_4_label,
+					$add_mobile_label
+				);
+
+			case 'CHECKBOX':
+				return EEH_Form_Fields::checkbox(
+					$display_text,
+					$answer,
+					$options,
+					$input_name,
+					$input_id,
+					$input_class,
+					$required,
+					$required_text,
+					$label_class,
+					$disabled,
+					$label_b4,
+					$system_ID,
+					$use_html_entities,
+					$add_mobile_label
+				);
+
+			case 'DATE':
+				return EEH_Form_Fields::datepicker(
+					$display_text,
+					$answer,
+					$input_name,
+					$input_id,
+					$input_class,
+					$required,
+					$required_text,
+					$label_class,
+					$disabled,
+					$system_ID,
+					$use_html_entities,
+					$add_mobile_label
+				);
+
+			case 'TEXT':
+			default:
+				return EEH_Form_Fields::text(
+					$display_text,
+					$answer,
+					$input_name,
+					$input_id,
+					$input_class,
+					$required,
+					$required_text,
+					$label_class,
+					$disabled,
+					$system_ID,
+					$use_html_entities,
+					$add_mobile_label
+				);
+		}
+	}
+
+
+	public static function label(
+		string $question,
+		string $required_text = '',
+		string $required_label = '',
+		string $name = '',
+		string $label_class = '',
+		bool $filter = true
+	): string {
+		$for   = ! empty($name) ? " for='{$name}'" : '';
+		$class = ! empty($label_class) ? " class='{$label_class}'" : '';
+		$label = self::prep_question($question) . $required_label;
+		$label_html = "
             {$required_text}
             <label{$for}{$class}>{$label}</label>";
-        // filter label but ensure required text comes before it
-        return $filter
-            ? apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text)
-            : $label_html;
-    }
-
-
-
-    public static function mobileLabel(
-        bool $add_mobile_label,
-        string $question,
-        string $required_text = '',
-        string $required_label = '',
-        string $label_class = '',
-        string $name = ''
-    ): string {
-        return $add_mobile_label
-            ? self::label($question, $required_text, $required_label, $name, $label_class, false)
-            : '';
-    }
-
-
-    /**
-     * generates HTML for a form text input
-     *
-     * @param string $question    label content
-     * @param string $answer      form input value attribute
-     * @param string $name        form input name attribute
-     * @param string $id          form input css id attribute
-     * @param string $class       form input css class attribute
-     * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
-     *                            required 'class', and required 'msg' attribute
-     * @param string $label_class css class attribute for the label
-     * @param string $disabled    disabled="disabled" or null
-     * @return string HTML
-     */
-    public static function text(
-        $question = false,
-        $answer = null,
-        $name = false,
-        $id = '',
-        $class = '',
-        $required = false,
-        $required_text = '',
-        $label_class = '',
-        $disabled = false,
-        $system_ID = false,
-        $use_html_entities = true,
-        $add_mobile_label = false,
-        $extra_attributes = ''
-    ) {
-        // need these
-        if (! $question || ! $name) {
-            return null;
-        }
-        // prep the answer
-        $answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
-        // prep the required array
-        $required = self::prep_required($required);
-        // set disabled tag
-        $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
-        // ya gots ta have style man!!!
-        $txt_class = is_admin() ? 'regular-text' : 'espresso-text-inp';
-        $class     = empty($class) ? $txt_class : $class;
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class = self::appendInputSizeClass($class, $answer);
-        $class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
-        $extra_attributes = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', $extra_attributes);
-
-        $label_html = self::label($question, $required_text, $required['label'], $name, $label_class);
-        $mobile_label = self::mobileLabel(
-            $add_mobile_label,
-            $question,
-            $required_text,
-            $required['label'],
-            $label_class,
-            $name
-        );
-
-        $input_html = $mobile_label . '
+		// filter label but ensure required text comes before it
+		return $filter
+			? apply_filters('FHEE__EEH_Form_Fields__label_html', $label_html, $required_text)
+			: $label_html;
+	}
+
+
+
+	public static function mobileLabel(
+		bool $add_mobile_label,
+		string $question,
+		string $required_text = '',
+		string $required_label = '',
+		string $label_class = '',
+		string $name = ''
+	): string {
+		return $add_mobile_label
+			? self::label($question, $required_text, $required_label, $name, $label_class, false)
+			: '';
+	}
+
+
+	/**
+	 * generates HTML for a form text input
+	 *
+	 * @param string $question    label content
+	 * @param string $answer      form input value attribute
+	 * @param string $name        form input name attribute
+	 * @param string $id          form input css id attribute
+	 * @param string $class       form input css class attribute
+	 * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
+	 *                            required 'class', and required 'msg' attribute
+	 * @param string $label_class css class attribute for the label
+	 * @param string $disabled    disabled="disabled" or null
+	 * @return string HTML
+	 */
+	public static function text(
+		$question = false,
+		$answer = null,
+		$name = false,
+		$id = '',
+		$class = '',
+		$required = false,
+		$required_text = '',
+		$label_class = '',
+		$disabled = false,
+		$system_ID = false,
+		$use_html_entities = true,
+		$add_mobile_label = false,
+		$extra_attributes = ''
+	) {
+		// need these
+		if (! $question || ! $name) {
+			return null;
+		}
+		// prep the answer
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
+		// prep the required array
+		$required = self::prep_required($required);
+		// set disabled tag
+		$disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
+		// ya gots ta have style man!!!
+		$txt_class = is_admin() ? 'regular-text' : 'espresso-text-inp';
+		$class     = empty($class) ? $txt_class : $class;
+		$class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
+		$class = self::appendInputSizeClass($class, $answer);
+		$class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
+		$extra_attributes = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', $extra_attributes);
+
+		$label_html = self::label($question, $required_text, $required['label'], $name, $label_class);
+		$mobile_label = self::mobileLabel(
+			$add_mobile_label,
+			$question,
+			$required_text,
+			$required['label'],
+			$label_class,
+			$name
+		);
+
+		$input_html = $mobile_label . '
             <input  type="text"
                     name="' . $name . '"
                     id="' . $id . '"
@@ -1086,1040 +1086,1040 @@ 
                     ' . $disabled . ' ' . $extra_attributes . '
             />';
 
-        $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
-    }
-
-
-    /**
-     * generates HTML for a form textarea
-     *
-     * @param string $question    label content
-     * @param string $answer      form input value attribute
-     * @param string $name        form input name attribute
-     * @param string $id          form input css id attribute
-     * @param string $class       form input css class attribute
-     * @param array  $dimensions  array of form input rows and cols attributes : array( 'rows' => 3, 'cols' => 40 )
-     * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
-     *                            required 'class', and required 'msg' attribute
-     * @param string $label_class css class attribute for the label
-     * @param string $disabled    disabled="disabled" or null
-     * @return string HTML
-     */
-    public static function textarea(
-        $question = false,
-        $answer = null,
-        $name = false,
-        $id = '',
-        $class = '',
-        $dimensions = false,
-        $required = false,
-        $required_text = '',
-        $label_class = '',
-        $disabled = false,
-        $system_ID = false,
-        $use_html_entities = true,
-        $add_mobile_label = false
-    ) {
-        // need these
-        if (! $question || ! $name) {
-            return null;
-        }
-        // prep the answer
-        $answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
-        // prep the required array
-        $required = self::prep_required($required);
-        // make sure $dimensions is an array
-        $dimensions = is_array($dimensions) ? $dimensions : [];
-        // and set some defaults
-        $dimensions = array_merge(['rows' => 3, 'cols' => 40], $dimensions);
-        // set disabled tag
-        $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
-        // ya gots ta have style man!!!
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class     .= ! empty($required['class']) ? ' ' . $required['class'] : '';
-        $extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
-
-        $label_html   = self::label($question, $required_text, $required['label'], $name, $label_class);
-        $mobile_label = self::mobileLabel(
-            $add_mobile_label,
-            $question,
-            $required_text,
-            $required['label'],
-            $label_class,
-            $name
-        );
-
-        $input_html = $mobile_label
-            . '<textarea name="' . $name . '" id="' . $id . '" class="' . trim($class) . '" '
-            . 'rows="' . $dimensions['rows'] . '" cols="' . $dimensions['cols'] . '"  '
-            . 'aria-label="' . $required['msg'] . '" ' . $disabled . ' ' . $extra . '>'
-             . esc_textarea($answer)
-              . '</textarea>';
-
-        $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
-    }
-
-
-    /**
-     * generates HTML for a form select input
-     *
-     * @param string $question    label content
-     * @param string $answer      form input value attribute
-     * @param array  $options     array of answer options where array key = option value and array value = option
-     *                            display text
-     * @param string $name        form input name attribute
-     * @param string $id          form input css id attribute
-     * @param string $class       form input css class attribute
-     * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
-     *                            required 'class', and required 'msg' attribute
-     * @param string $label_class css class attribute for the label
-     * @param string $disabled    disabled="disabled" or null
-     * @return string HTML
-     */
-    public static function select(
-        $question = false,
-        $answer = null,
-        $options = false,
-        $name = false,
-        $id = '',
-        $class = '',
-        $required = false,
-        $required_text = '',
-        $label_class = '',
-        $disabled = false,
-        $system_ID = false,
-        $use_html_entities = true,
-        $add_please_select_option = false,
-        $add_mobile_label = false
-    ) {
-
-        // need these
-        if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
-            return null;
-        }
-        // prep the answer
-        $answer = is_array($answer)
-            ? self::prep_answer(array_shift($answer), $use_html_entities)
-            : self::prep_answer($answer, $use_html_entities);
-        // prep the required array
-        $required = self::prep_required($required);
-        // set disabled tag
-        $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
-        // ya gots ta have style man!!!
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class = self::appendInputSizeClass($class, $options);
-        $extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
-
-        $label_html   = self::label($question, $required_text, $required['label'], $name, $label_class);
-        $mobile_label = self::mobileLabel(
-            $add_mobile_label,
-            $question,
-            $required_text,
-            $required['label'],
-            $label_class,
-            $name
-        );
-
-        $input_html = $mobile_label
-            . '<select name="' . $name . '" id="' . $id . '" class="' . trim($class) . ' ' . $required['class'] . '" '
-            . 'aria-label="' . esc_attr($required['msg']) . '"' . $disabled . ' ' . $extra . '>';
-        // recursively count array elements, to determine total number of options
-        $only_option = count($options, 1) == 1;
-        if (! $only_option) {
-            // if there is NO answer set and there are multiple options to choose from, then set the "please select" message as selected
-            $selected   = $answer === null ? ' selected' : '';
-            $input_html .= $add_please_select_option
-                ? "\n\t\t\t\t"
-                  . '<option value=""' . $selected . '>'
-                  . esc_html__(' - please select - ', 'event_espresso')
-                  . '</option>'
-                : '';
-        }
-        foreach ($options as $key => $value) {
-            // if value is an array, then create option groups, else create regular ol' options
-            $input_html .= is_array($value)
-                ? self::_generate_select_option_group(
-                    $key,
-                    $value,
-                    $answer,
-                    $use_html_entities
-                )
-                : self::_generate_select_option(
-                    $value->value(),
-                    $value->desc(),
-                    $answer,
-                    $only_option,
-                    $use_html_entities
-                );
-        }
-
-        $input_html .= "\n\t\t\t" . '</select>';
-
-        $input_html =
-            apply_filters(
-                'FHEE__EEH_Form_Fields__select__before_end_wrapper',
-                $input_html,
-                $question,
-                $answer,
-                $name,
-                $id,
-                $class,
-                $system_ID
-            );
-
-        $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
-    }
-
-
-    /**
-     *  _generate_select_option_group
-     *
-     *  if  $value for a select box is an array, then the key will be used as the optgroup label
-     *  and the value array will be looped thru and the elements sent to _generate_select_option
-     *
-     * @param mixed   $opt_group
-     * @param mixed   $QSOs
-     * @param mixed   $answer
-     * @param boolean $use_html_entities
-     * @return string
-     */
-    private static function _generate_select_option_group($opt_group, $QSOs, $answer, $use_html_entities = true)
-    {
-        $html = "\n\t\t\t\t" . '<optgroup label="' . self::prep_option_value($opt_group) . '">';
-        foreach ($QSOs as $QSO) {
-            $html .= self::_generate_select_option($QSO->value(), $QSO->desc(), $answer, false, $use_html_entities);
-        }
-        $html .= "\n\t\t\t\t" . '</optgroup>';
-        return $html;
-    }
-
-
-    /**
-     *  _generate_select_option
-     *
-     * @param mixed   $key
-     * @param mixed   $value
-     * @param mixed   $answer
-     * @param int     $only_option
-     * @param boolean $use_html_entities
-     * @return string
-     */
-    private static function _generate_select_option(
-        $key,
-        $value,
-        $answer,
-        $only_option = false,
-        $use_html_entities = true
-    ) {
-        $key      = self::prep_answer($key, $use_html_entities);
-        $value    = self::prep_answer($value, $use_html_entities);
-        $value    = ! empty($value) ? $value : $key;
-        $selected = ($answer == $key || $only_option) ? 'selected' : '';
-        return "\n\t\t\t\t"
-               . '<option value="' . self::prep_option_value($key) . '" ' . $selected . '> '
-               . $value
-               . '&nbsp;&nbsp;&nbsp;</option>';
-    }
-
-
-    /**
-     * generates HTML for form radio button inputs
-     *
-     * @param string      $question    label content
-     * @param string|int  $answer      form input value attribute
-     * @param array|bool  $options     array of answer options where array key = option value and array value = option
-     *                                 display text
-     * @param string $name        form input name attribute
-     * @param string      $id          form input css id attribute
-     * @param string      $class       form input css class attribute
-     * @param array|bool  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
-     *                                 required 'class', and required 'msg' attribute
-     * @param string      $required_text
-     * @param string      $label_class css class attribute for the label
-     * @param bool|string $disabled    disabled="disabled" or null
-     * @param string      $system_ID
-     * @param bool        $use_html_entities
-     * @param bool        $label_b4
-     * @param bool        $use_desc_4_label
-     * @return string HTML
-     */
-    public static function radio(
-        string $question = '',
-        $answer = null,
-        $options = false,
-        string $name = '',
-        string $id = '',
-        string $class = '',
-        $required = false,
-        string $required_text = '',
-        string $label_class = '',
-        bool $disabled = false,
-        string $system_ID = '',
-        bool $use_html_entities = true,
-        bool $label_b4 = false,
-        bool $use_desc_4_label = false,
-        bool $add_mobile_label = false
-    ) {
-        // need these
-        if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
-            return null;
-        }
-        // prep the answer
-        $answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
-        // prep the required array
-        $required = self::prep_required($required);
-        // set disabled tag
-        $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
-        // ya gots ta have style man!!!
-        $radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-        $class       = ! empty($class) ? $class : 'espresso-radio-btn-inp';
-        $extra       = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
-
-        $label_html = self::label($question, $required_text, $required['label'], '', $label_class);
-        $mobile_label = self::mobileLabel(
-            $add_mobile_label,
-            $question,
-            $required_text,
-            $required['label'],
-            $label_class
-        );
-
-        $input_html = $mobile_label
-            . '<ul id="' . $id . '-ul" class="espresso-radio-btn-options-ul ' . $class . '-ul">';
-
-        $class .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
-
-        foreach ($options as $OPT) {
-            if ($OPT instanceof EE_Question_Option) {
-                $value   = self::prep_option_value($OPT->value());
-                $label   = $use_desc_4_label ? $OPT->desc() : $OPT->value();
-                $size    = $use_desc_4_label
-                    ? self::get_label_size_class($OPT->value() . ' ' . $OPT->desc())
-                    : self::get_label_size_class($OPT->value());
-                $desc    = $OPT->desc();// no self::prep_answer
-                $answer  = is_numeric($value) && empty($answer) ? 0 : $answer;
-                $value  = is_numeric($answer) && empty($value) ? 0 : $value;
-                $checked = (string) $value == (string) $answer ? ' checked' : '';
-                $opt     = '-' . sanitize_key($value);
-
-                $input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-                $input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-radio-btn-lbl">';
-                $input_html .= $label_b4 ? "\n\t\t\t\t\t\t" . '<span>' . $label . '</span>&nbsp;' : '';
-                $input_html .= "\n\t\t\t\t\t\t"
-                               . '<input type="radio" name="' . $name . '" id="' . $id . $opt . '" '
-                               . 'class="' . $class . '" value="' . $value . '" '
-                               . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled
-                               . $checked . ' ' . $extra . '/>';
-                $input_html .= ! $label_b4
-                    ? "\n\t\t\t\t\t\t"
-                      . '&nbsp;<span class="espresso-radio-btn-desc">'
-                      . $label
-                      . '</span>'
-                    : '';
-                $input_html .= "\n\t\t\t\t\t" . '</label>';
-                $input_html .= $use_desc_4_label
-                    ? ''
-                    : '<span class="espresso-radio-btn-option-desc small-text grey-text">' . $desc . '</span>';
-                $input_html .= "\n\t\t\t\t" . '</li>';
-            }
-        }
-
-        $input_html .= "\n\t\t\t" . '</ul>';
-
-        $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
-    }
-
-
-    /**
-     * generates HTML for form checkbox inputs
-     *
-     * @param string $question    label content
-     * @param string $answer      form input value attribute
-     * @param array  $options     array of options where array key = option value and array value = option display text
-     * @param string $name        form input name attribute
-     * @param string $id          form input css id attribute
-     * @param string $class       form input css class attribute
-     * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
-     *                            required 'class', and required 'msg' attribute
-     * @param string $label_class css class attribute for the label
-     * @param string $disabled    disabled="disabled" or null
-     * @return string HTML
-     */
-    public static function checkbox(
-        $question = false,
-        $answer = null,
-        $options = false,
-        $name = false,
-        $id = '',
-        $class = '',
-        $required = false,
-        $required_text = '',
-        $label_class = '',
-        $disabled = false,
-        $label_b4 = false,
-        $system_ID = false,
-        $use_html_entities = true,
-        $add_mobile_label = false
-    ) {
-        // need these
-        if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
-            return null;
-        }
-        $answer = maybe_unserialize($answer);
-
-        // prep the answer(s)
-        $answer = is_array($answer) ? $answer : [sanitize_key($answer) => $answer];
-
-        foreach ($answer as $key => $value) {
-            $key            = self::prep_option_value($key);
-            $answer[ $key ] = self::prep_answer($value, $use_html_entities);
-        }
-
-        // prep the required array
-        $required = self::prep_required($required);
-        // set disabled tag
-        $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
-        // ya gots ta have style man!!!
-        $radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
-        $class       = empty($class) ? 'espresso-radio-btn-inp' : $class;
-        $extra       = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
-
-        $label_html   = self::label($question, $required_text, $required['label'], '', $label_class);
-        $mobile_label = self::mobileLabel(
-            $add_mobile_label,
-            $question,
-            $required_text,
-            $required['label'],
-            $label_class
-        );
-
-        $input_html = $mobile_label
-            . '<ul id="' . $id . '-ul" class="espresso-checkbox-options-ul ' . $class . '-ul">';
-
-        $class .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
-
-        foreach ($options as $OPT) {
-            $value = $OPT->value();// self::prep_option_value( $OPT->value() );
-            $size  = self::get_label_size_class($OPT->value() . ' ' . $OPT->desc());
-            $text  = self::prep_answer($OPT->value());
-            $desc  = $OPT->desc();
-            $opt   = '-' . sanitize_key($value);
-
-            $checked = is_array($answer) && in_array($text, $answer) ? ' checked' : '';
-
-            $input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-            $input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-checkbox-lbl">';
-            $input_html .= $label_b4 ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>&nbsp;' : '';
-            $input_html .= "\n\t\t\t\t\t\t"
-                           . '<input type="checkbox" name="' . $name . '[' . $OPT->ID() . ']" '
-                           . 'id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" '
-                           . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-            $input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t" . '&nbsp;<span>' . $text . '</span>' : '';
-            $input_html .= "\n\t\t\t\t\t" . '</label>';
-            if (! empty($desc) && $desc != $text) {
-                $input_html .= "\n\t\t\t\t\t"
-                               . ' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">'
-                               . $desc
-                               . '</div>';
-            }
-            $input_html .= "\n\t\t\t\t" . '</li>';
-        }
-
-        $input_html .= "\n\t\t\t" . '</ul>';
-
-        $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
-    }
-
-
-    /**
-     * generates HTML for a form datepicker input
-     *
-     * @param string $question    label content
-     * @param string $answer      form input value attribute
-     * @param string $name        form input name attribute
-     * @param string $id          form input css id attribute
-     * @param string $class       form input css class attribute
-     * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
-     *                            required 'class', and required 'msg' attribute
-     * @param string $label_class css class attribute for the label
-     * @param string $disabled    disabled="disabled" or null
-     * @return string HTML
-     */
-    public static function datepicker(
-        $question = false,
-        $answer = null,
-        $name = false,
-        $id = '',
-        $class = '',
-        $required = false,
-        $required_text = '',
-        $label_class = '',
-        $disabled = false,
-        $system_ID = false,
-        $use_html_entities = true,
-        $add_mobile_label = false
-    ) {
-        // need these
-        if (! $question || ! $name) {
-            return null;
-        }
-        // prep the answer
-        $answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
-        // prep the required array
-        $required = self::prep_required($required);
-        // set disabled tag
-        $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
-        // ya gots ta have style man!!!
-        $txt_class = is_admin() ? 'regular-text' : 'espresso-datepicker-inp';
-        $class     = empty($class) ? $txt_class : $class;
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class = self::appendInputSizeClass($class, $answer);
-        $extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
-
-        $label_html   = self::label($question, $required_text, $required['label'], '', $label_class);
-        $mobile_label = self::mobileLabel(
-            $add_mobile_label,
-            $question,
-            $required_text,
-            $required['label'],
-            $label_class,
-            $name
-        );
-
-        $input_html = $mobile_label
-            . '<input type="text" name="' . $name . '" id="' . $id . '" '
-            . 'class="' . $class . ' ' . $required['class'] . ' datepicker" value="' . $answer . '"  '
-            . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled . ' ' . $extra . '/>';
-
-        // enqueue scripts
-        wp_register_style(
-            'espresso-ui-theme',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css',
-            [],
-            EVENT_ESPRESSO_VERSION
-        );
-        wp_enqueue_style('espresso-ui-theme');
-        wp_enqueue_script('jquery-ui-datepicker');
-
-        $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
-    }
-
-
-    /**
-     *  remove_label_keep_required_msg
-     *  this will strip out a form input's label HTML while keeping the required text HTML that MUST be before the label
-     *
-     * @access public
-     * @return     string
-     */
-    public static function remove_label_keep_required_msg($label_html, $required_text)
-    {
-        return $required_text;
-    }
-
-
-    /**
-     * Simply returns the HTML for a hidden input of the given name and value.
-     *
-     * @param string $name
-     * @param string $value
-     * @return string HTML
-     */
-    public static function hidden_input($name, $value, $id = '')
-    {
-        $id = ! empty($id) ? $id : $name;
-        return '<input id="' . $id . '" type="hidden" name="' . $name . '" value="' . $value . '"/>';
-    }
-
-
-    /**
-     * prep_question
-     *
-     * @param string $question
-     * @return string
-     */
-    public static function prep_question($question)
-    {
-        return $question;
-    }
-
-
-    /**
-     *  prep_answer
-     *
-     * @param mixed $answer
-     * @return string
-     */
-    public static function prep_answer($answer, $use_html_entities = true)
-    {
-        // make sure we convert bools first.  Otherwise (bool) false becomes an empty string which is NOT desired,
-        // we want "0".
-        if (is_bool($answer)) {
-            $answer = $answer ? 1 : 0;
-        }
-        $answer = trim(stripslashes(str_replace('&#039;', "'", $answer)));
-        return $use_html_entities ? htmlentities($answer, ENT_QUOTES, 'UTF-8') : $answer;
-    }
-
-
-    /**
-     *  prep_answer_options
-     *
-     * @param array $QSOs array of EE_Question_Option objects
-     * @return array
-     */
-    public static function prep_answer_options($QSOs = [])
-    {
-        $prepped_answer_options = [];
-        if (is_array($QSOs) && ! empty($QSOs)) {
-            foreach ($QSOs as $key => $QSO) {
-                if (! $QSO instanceof EE_Question_Option) {
-                    $QSO = EE_Question_Option::new_instance(
-                        [
-                            'QSO_value' => is_array($QSO) && isset($QSO['id'])
-                                ? (string) $QSO['id']
-                                : (string) $key,
-                            'QSO_desc'  => is_array($QSO) && isset($QSO['text'])
-                                ? (string) $QSO['text']
-                                : (string) $QSO,
-                        ]
-                    );
-                }
-                if ($QSO->opt_group()) {
-                    $prepped_answer_options[ $QSO->opt_group() ][] = $QSO;
-                } else {
-                    $prepped_answer_options[] = $QSO;
-                }
-            }
-        }
-        //      d( $prepped_answer_options );
-        return $prepped_answer_options;
-    }
-
-
-    /**
-     *  prep_option_value
-     *
-     * @param string|int $option_value
-     * @return string
-     */
-    public static function prep_option_value($option_value)
-    {
-        return esc_attr(trim(stripslashes($option_value)));
-    }
-
-
-    /**
-     *  prep_required
-     *
-     * @param string|array $required
-     * @return array
-     */
-    public static function prep_required($required = [])
-    {
-        // make sure required is an array
-        $required = is_array($required) ? $required : [];
-        // and set some defaults
-        return array_merge(['label' => '', 'class' => '', 'msg' => ''], $required);
-    }
-
-
-    /**
-     *  get_label_size_class
-     *
-     * @param string $value
-     * @return string
-     */
-    public static function get_label_size_class($value = false)
-    {
-        if ($value === false || $value === '') {
-            return ' class="medium-lbl"';
-        }
-        // determine length of option value
-        $val_size = strlen($value);
-        switch ($val_size) {
-            case $val_size < 3:
-                $size = ' class="nano-lbl"';
-                break;
-            case $val_size < 6:
-                $size = ' class="micro-lbl"';
-                break;
-            case $val_size < 12:
-                $size = ' class="tiny-lbl"';
-                break;
-            case $val_size < 25:
-                $size = ' class="small-lbl"';
-                break;
-            case $val_size > 100:
-                $size = ' class="big-lbl"';
-                break;
-            default:
-                $size = ' class="medium-lbl"';
-                break;
-        }
-        return $size;
-    }
-
-
-    /**
-     *  _load_system_dropdowns
-     *
-     * @param EE_Question_Form_Input $QFI
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    private static function _load_system_dropdowns($QFI)
-    {
-        $QST_system = $QFI->get('QST_system');
-        switch ($QST_system) {
-            case 'state':
-                $QFI = self::generate_state_dropdown($QFI);
-                break;
-            case 'country':
-                $QFI = self::generate_country_dropdown($QFI);
-                break;
-            case 'admin-state':
-                $QFI = self::generate_state_dropdown($QFI, true);
-                break;
-            case 'admin-country':
-                $QFI = self::generate_country_dropdown($QFI, true);
-                break;
-        }
-        return $QFI;
-    }
-
-
-    /**
-     * This preps dropdowns that are specialized.
-     *
-     * @param EE_Question_Form_Input $QFI
-     *
-     * @return EE_Question_Form_Input
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since  4.6.0
-     */
-    protected static function _load_specialized_dropdowns($QFI)
-    {
-        switch ($QFI->get('QST_type')) {
-            case 'STATE':
-                $QFI = self::generate_state_dropdown($QFI);
-                break;
-            case 'COUNTRY':
-                $QFI = self::generate_country_dropdown($QFI);
-                break;
-        }
-        return $QFI;
-    }
-
-
-    /**
-     *    generate_state_dropdown
-     *
-     * @param EE_Question_Form_Input $QST
-     * @param bool                   $get_all
-     * @return EE_Question_Form_Input
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function generate_state_dropdown($QST, $get_all = false)
-    {
-        $states = $get_all
-            ? EEM_State::instance()->get_all_states()
-            : EEM_State::instance()->get_all_states_of_active_countries();
-        if ($states && count($states) != count($QST->options())) {
-            $QST->set('QST_type', 'DROPDOWN');
-            // if multiple countries, we'll create option groups within the dropdown
-            foreach ($states as $state) {
-                if ($state instanceof EE_State) {
-                    $QSO = EE_Question_Option::new_instance(
-                        [
-                            'QSO_value'   => $state->ID(),
-                            'QSO_desc'    => $state->name(),
-                            'QST_ID'      => $QST->get('QST_ID'),
-                            'QSO_deleted' => false,
-                        ]
-                    );
-                    // set option group
-                    $QSO->set_opt_group($state->country()->name());
-                    // add option to question
-                    $QST->add_temp_option($QSO);
-                }
-            }
-        }
-        return $QST;
-    }
-
-
-    /**
-     *    generate_country_dropdown
-     *
-     * @param      $QST
-     * @param bool $get_all
-     * @return array
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @internal param array $question
-     */
-    public static function generate_country_dropdown($QST, $get_all = false)
-    {
-        $countries = $get_all
-            ? EEM_Country::instance()->get_all_countries()
-            : EEM_Country::instance()->get_all_active_countries();
-        if ($countries && count($countries) != count($QST->options())) {
-            $QST->set('QST_type', 'DROPDOWN');
-            // now add countries
-            foreach ($countries as $country) {
-                if ($country instanceof EE_Country) {
-                    $QSO = EE_Question_Option::new_instance(
-                        [
-                            'QSO_value'   => $country->ID(),
-                            'QSO_desc'    => $country->name(),
-                            'QST_ID'      => $QST->get('QST_ID'),
-                            'QSO_deleted' => false,
-                        ]
-                    );
-                    $QST->add_temp_option($QSO);
-                }
-            }
-        }
-        return $QST;
-    }
-
-
-    /**
-     *  generates options for a month dropdown selector with numbers from 01 to 12
-     *
-     * @return array()
-     */
-    public static function two_digit_months_dropdown_options()
-    {
-        $options = [];
-        for ($x = 1; $x <= 12; $x++) {
-            $mm             = str_pad($x, 2, '0', STR_PAD_LEFT);
-            $options[ $mm ] = $mm;
-        }
-        return EEH_Form_Fields::prep_answer_options($options);
-    }
-
-
-    /**
-     *  generates a year dropdown selector with numbers for the next ten years
-     *
-     * @return array
-     */
-    public static function next_decade_two_digit_year_dropdown_options()
-    {
-        $options      = [];
-        $current_year = date('y');
-        $next_decade  = $current_year + 10;
-        for ($x = $current_year; $x <= $next_decade; $x++) {
-            $yy             = str_pad($x, 2, '0', STR_PAD_LEFT);
-            $options[ $yy ] = $yy;
-        }
-        return EEH_Form_Fields::prep_answer_options($options);
-    }
-
-
-    /**
-     * generates a month/year dropdown selector for all registrations matching the given criteria.  Typically used for
-     * list table filter.
-     *
-     * @param string  $cur_date     any currently selected date can be entered here.
-     * @param string  $status       Registration status
-     * @param integer $evt_category Event Category ID if the Event Category filter is selected
-     * @return string                html
-     * @throws EE_Error
-     */
-    public static function generate_registration_months_dropdown($cur_date = '', $status = '', $evt_category = 0)
-    {
-        $_where = [];
-        if (! empty($status)) {
-            $_where['STS_ID'] = $status;
-        }
-
-        if ($evt_category > 0) {
-            $_where['Event.Term_Taxonomy.term_id'] = $evt_category;
-        }
-
-        $regdtts = EEM_Registration::instance()->get_reg_months_and_years($_where);
-
-        // setup vals for select input helper
-        $options = [
-            0 => [
-                'text' => esc_html__('Select a Month/Year', 'event_espresso'),
-                'id'   => '',
-            ],
-        ];
-
-        foreach ($regdtts as $regdtt) {
-            $date      = $regdtt->reg_month . ' ' . $regdtt->reg_year;
-            $options[] = [
-                'text' => $date,
-                'id'   => $date,
-            ];
-        }
-
-        return self::select_input('month_range', $options, $cur_date);
-    }
-
-
-    /**
-     * generates a month/year dropdown selector for all events matching the given criteria
-     * Typically used for list table filter
-     *
-     * @param string $cur_date          any currently selected date can be entered here.
-     * @param string $status            "view" (i.e. all, today, month, draft)
-     * @param int    $evt_category      category event belongs to
-     * @param string $evt_active_status "upcoming", "expired", "active", or "inactive"
-     * @return string                    html
-     * @throws EE_Error
-     */
-    public static function generate_event_months_dropdown(
-        $cur_date = '',
-        $status = null,
-        $evt_category = null,
-        $evt_active_status = null
-    ) {
-        // determine what post_status our condition will have for the query.
-        // phpcs:disable PSR2.ControlStructures.SwitchDeclaration.TerminatingComment
-        switch ($status) {
-            case 'month':
-            case 'today':
-            case null:
-            case 'all':
-                $where['Event.status'] = ['NOT IN', ['trash']];
-                break;
-            case 'draft':
-                $where['Event.status'] = ['IN', ['draft', 'auto-draft']];
-                break;
-            default:
-                $where['Event.status'] = $status;
-        }
-
-        // phpcs:enable
-
-        // categories?
-
-
-        if (! empty($evt_category) and $evt_category > 0) {
-            $where['Event.Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
-            $where['Event.Term_Taxonomy.term_id']  = $evt_category;
-        }
-
-
-        //      $where['DTT_is_primary'] = 1;
-
-        $DTTS = EEM_Datetime::instance()->get_dtt_months_and_years($where, $evt_active_status);
-
-        // let's setup vals for select input helper
-        $options = [
-            0 => [
-                'text' => esc_html__('Select a Month/Year', 'event_espresso'),
-                'id'   => "",
-            ],
-        ];
-
-
-        // translate month and date
-        global $wp_locale;
-
-        foreach ($DTTS as $DTT) {
-            $localized_date = $wp_locale->get_month($DTT->dtt_month_num) . ' ' . $DTT->dtt_year;
-            $id             = $DTT->dtt_month . ' ' . $DTT->dtt_year;
-            $options[]      = [
-                'text' => $localized_date,
-                'id'   => $id,
-            ];
-        }
-
-
-        return self::select_input('month_range', $options, $cur_date);
-    }
-
-
-    /**
-     * generates the dropdown selector for event categories
-     * typically used as a filter on list tables.
-     *
-     * @param integer $current_cat currently selected category
-     * @return string               html for dropdown
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function generate_event_category_dropdown($current_cat = -1)
-    {
-        $categories = EEM_Term::instance()->get_all_ee_categories(true);
-        $options    = [
-            '0' => [
-                'text' => esc_html__('All Categories', 'event_espresso'),
-                'id'   => -1,
-            ],
-        ];
-
-        // setup categories for dropdown
-        foreach ($categories as $category) {
-            $options[] = [
-                'text' => $category->get('name'),
-                'id'   => $category->ID(),
-            ];
-        }
-
-        return self::select_input('EVT_CAT', $options, $current_cat);
-    }
-
-
-    /**
-     *    generate a submit button with or without it's own microform
-     *    this is the only way to create buttons that are compatible across all themes
-     *
-     * @access    public
-     * @param string      $url              - the form action
-     * @param string      $ID               - some kind of unique ID, appended with "-sbmt" for the input and "-frm"
-     *                                      for the form
-     * @param string      $class            - css classes (separated by spaces if more than one)
-     * @param string      $text             - what appears on the button
-     * @param string      $nonce_action     - if using nonces
-     * @param bool|string $input_only       - whether to print form header and footer. TRUE returns the input without
-     *                                      the form
-     * @param string      $extra_attributes - any extra attributes that need to be attached to the form input
-     * @return    string
-     */
-    public static function submit_button(
-        $url = '',
-        $ID = '',
-        $class = '',
-        $text = '',
-        $nonce_action = '',
-        $input_only = false,
-        $extra_attributes = ''
-    ) {
-        $btn = '';
-        if (empty($url) || empty($ID)) {
-            return $btn;
-        }
-        $text = ! empty($text) ? $text : esc_html__('Submit', 'event_espresso');
-        $btn  .= '<input id="' . $ID . '-btn" class="' . $class . '" '
-                 . 'type="submit" value="' . $text . '" ' . $extra_attributes . '/>';
-        if (! $input_only) {
-            $btn_frm = '<form id="' . $ID . '-frm" method="POST" action="' . $url . '">';
-            $btn_frm .= ! empty($nonce_action)
-                ? wp_nonce_field($nonce_action, $nonce_action . '_nonce', true, false)
-                : '';
-            $btn_frm .= $btn;
-            $btn_frm .= '</form>';
-            $btn     = $btn_frm;
-            unset($btn_frm);
-        }
-        return $btn;
-    }
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return $label_html . $input_html;
+	}
+
+
+	/**
+	 * generates HTML for a form textarea
+	 *
+	 * @param string $question    label content
+	 * @param string $answer      form input value attribute
+	 * @param string $name        form input name attribute
+	 * @param string $id          form input css id attribute
+	 * @param string $class       form input css class attribute
+	 * @param array  $dimensions  array of form input rows and cols attributes : array( 'rows' => 3, 'cols' => 40 )
+	 * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
+	 *                            required 'class', and required 'msg' attribute
+	 * @param string $label_class css class attribute for the label
+	 * @param string $disabled    disabled="disabled" or null
+	 * @return string HTML
+	 */
+	public static function textarea(
+		$question = false,
+		$answer = null,
+		$name = false,
+		$id = '',
+		$class = '',
+		$dimensions = false,
+		$required = false,
+		$required_text = '',
+		$label_class = '',
+		$disabled = false,
+		$system_ID = false,
+		$use_html_entities = true,
+		$add_mobile_label = false
+	) {
+		// need these
+		if (! $question || ! $name) {
+			return null;
+		}
+		// prep the answer
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
+		// prep the required array
+		$required = self::prep_required($required);
+		// make sure $dimensions is an array
+		$dimensions = is_array($dimensions) ? $dimensions : [];
+		// and set some defaults
+		$dimensions = array_merge(['rows' => 3, 'cols' => 40], $dimensions);
+		// set disabled tag
+		$disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
+		// ya gots ta have style man!!!
+		$class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
+		$class     .= ! empty($required['class']) ? ' ' . $required['class'] : '';
+		$extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
+
+		$label_html   = self::label($question, $required_text, $required['label'], $name, $label_class);
+		$mobile_label = self::mobileLabel(
+			$add_mobile_label,
+			$question,
+			$required_text,
+			$required['label'],
+			$label_class,
+			$name
+		);
+
+		$input_html = $mobile_label
+			. '<textarea name="' . $name . '" id="' . $id . '" class="' . trim($class) . '" '
+			. 'rows="' . $dimensions['rows'] . '" cols="' . $dimensions['cols'] . '"  '
+			. 'aria-label="' . $required['msg'] . '" ' . $disabled . ' ' . $extra . '>'
+			 . esc_textarea($answer)
+			  . '</textarea>';
+
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return $label_html . $input_html;
+	}
+
+
+	/**
+	 * generates HTML for a form select input
+	 *
+	 * @param string $question    label content
+	 * @param string $answer      form input value attribute
+	 * @param array  $options     array of answer options where array key = option value and array value = option
+	 *                            display text
+	 * @param string $name        form input name attribute
+	 * @param string $id          form input css id attribute
+	 * @param string $class       form input css class attribute
+	 * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
+	 *                            required 'class', and required 'msg' attribute
+	 * @param string $label_class css class attribute for the label
+	 * @param string $disabled    disabled="disabled" or null
+	 * @return string HTML
+	 */
+	public static function select(
+		$question = false,
+		$answer = null,
+		$options = false,
+		$name = false,
+		$id = '',
+		$class = '',
+		$required = false,
+		$required_text = '',
+		$label_class = '',
+		$disabled = false,
+		$system_ID = false,
+		$use_html_entities = true,
+		$add_please_select_option = false,
+		$add_mobile_label = false
+	) {
+
+		// need these
+		if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
+			return null;
+		}
+		// prep the answer
+		$answer = is_array($answer)
+			? self::prep_answer(array_shift($answer), $use_html_entities)
+			: self::prep_answer($answer, $use_html_entities);
+		// prep the required array
+		$required = self::prep_required($required);
+		// set disabled tag
+		$disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
+		// ya gots ta have style man!!!
+		$class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
+		$class = self::appendInputSizeClass($class, $options);
+		$extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
+
+		$label_html   = self::label($question, $required_text, $required['label'], $name, $label_class);
+		$mobile_label = self::mobileLabel(
+			$add_mobile_label,
+			$question,
+			$required_text,
+			$required['label'],
+			$label_class,
+			$name
+		);
+
+		$input_html = $mobile_label
+			. '<select name="' . $name . '" id="' . $id . '" class="' . trim($class) . ' ' . $required['class'] . '" '
+			. 'aria-label="' . esc_attr($required['msg']) . '"' . $disabled . ' ' . $extra . '>';
+		// recursively count array elements, to determine total number of options
+		$only_option = count($options, 1) == 1;
+		if (! $only_option) {
+			// if there is NO answer set and there are multiple options to choose from, then set the "please select" message as selected
+			$selected   = $answer === null ? ' selected' : '';
+			$input_html .= $add_please_select_option
+				? "\n\t\t\t\t"
+				  . '<option value=""' . $selected . '>'
+				  . esc_html__(' - please select - ', 'event_espresso')
+				  . '</option>'
+				: '';
+		}
+		foreach ($options as $key => $value) {
+			// if value is an array, then create option groups, else create regular ol' options
+			$input_html .= is_array($value)
+				? self::_generate_select_option_group(
+					$key,
+					$value,
+					$answer,
+					$use_html_entities
+				)
+				: self::_generate_select_option(
+					$value->value(),
+					$value->desc(),
+					$answer,
+					$only_option,
+					$use_html_entities
+				);
+		}
+
+		$input_html .= "\n\t\t\t" . '</select>';
+
+		$input_html =
+			apply_filters(
+				'FHEE__EEH_Form_Fields__select__before_end_wrapper',
+				$input_html,
+				$question,
+				$answer,
+				$name,
+				$id,
+				$class,
+				$system_ID
+			);
+
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return $label_html . $input_html;
+	}
+
+
+	/**
+	 *  _generate_select_option_group
+	 *
+	 *  if  $value for a select box is an array, then the key will be used as the optgroup label
+	 *  and the value array will be looped thru and the elements sent to _generate_select_option
+	 *
+	 * @param mixed   $opt_group
+	 * @param mixed   $QSOs
+	 * @param mixed   $answer
+	 * @param boolean $use_html_entities
+	 * @return string
+	 */
+	private static function _generate_select_option_group($opt_group, $QSOs, $answer, $use_html_entities = true)
+	{
+		$html = "\n\t\t\t\t" . '<optgroup label="' . self::prep_option_value($opt_group) . '">';
+		foreach ($QSOs as $QSO) {
+			$html .= self::_generate_select_option($QSO->value(), $QSO->desc(), $answer, false, $use_html_entities);
+		}
+		$html .= "\n\t\t\t\t" . '</optgroup>';
+		return $html;
+	}
+
+
+	/**
+	 *  _generate_select_option
+	 *
+	 * @param mixed   $key
+	 * @param mixed   $value
+	 * @param mixed   $answer
+	 * @param int     $only_option
+	 * @param boolean $use_html_entities
+	 * @return string
+	 */
+	private static function _generate_select_option(
+		$key,
+		$value,
+		$answer,
+		$only_option = false,
+		$use_html_entities = true
+	) {
+		$key      = self::prep_answer($key, $use_html_entities);
+		$value    = self::prep_answer($value, $use_html_entities);
+		$value    = ! empty($value) ? $value : $key;
+		$selected = ($answer == $key || $only_option) ? 'selected' : '';
+		return "\n\t\t\t\t"
+			   . '<option value="' . self::prep_option_value($key) . '" ' . $selected . '> '
+			   . $value
+			   . '&nbsp;&nbsp;&nbsp;</option>';
+	}
+
+
+	/**
+	 * generates HTML for form radio button inputs
+	 *
+	 * @param string      $question    label content
+	 * @param string|int  $answer      form input value attribute
+	 * @param array|bool  $options     array of answer options where array key = option value and array value = option
+	 *                                 display text
+	 * @param string $name        form input name attribute
+	 * @param string      $id          form input css id attribute
+	 * @param string      $class       form input css class attribute
+	 * @param array|bool  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
+	 *                                 required 'class', and required 'msg' attribute
+	 * @param string      $required_text
+	 * @param string      $label_class css class attribute for the label
+	 * @param bool|string $disabled    disabled="disabled" or null
+	 * @param string      $system_ID
+	 * @param bool        $use_html_entities
+	 * @param bool        $label_b4
+	 * @param bool        $use_desc_4_label
+	 * @return string HTML
+	 */
+	public static function radio(
+		string $question = '',
+		$answer = null,
+		$options = false,
+		string $name = '',
+		string $id = '',
+		string $class = '',
+		$required = false,
+		string $required_text = '',
+		string $label_class = '',
+		bool $disabled = false,
+		string $system_ID = '',
+		bool $use_html_entities = true,
+		bool $label_b4 = false,
+		bool $use_desc_4_label = false,
+		bool $add_mobile_label = false
+	) {
+		// need these
+		if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
+			return null;
+		}
+		// prep the answer
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
+		// prep the required array
+		$required = self::prep_required($required);
+		// set disabled tag
+		$disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
+		// ya gots ta have style man!!!
+		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
+		$class       = ! empty($class) ? $class : 'espresso-radio-btn-inp';
+		$extra       = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
+
+		$label_html = self::label($question, $required_text, $required['label'], '', $label_class);
+		$mobile_label = self::mobileLabel(
+			$add_mobile_label,
+			$question,
+			$required_text,
+			$required['label'],
+			$label_class
+		);
+
+		$input_html = $mobile_label
+			. '<ul id="' . $id . '-ul" class="espresso-radio-btn-options-ul ' . $class . '-ul">';
+
+		$class .= ! empty($system_ID) ? ' ' . $system_ID : '';
+		$class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
+
+		foreach ($options as $OPT) {
+			if ($OPT instanceof EE_Question_Option) {
+				$value   = self::prep_option_value($OPT->value());
+				$label   = $use_desc_4_label ? $OPT->desc() : $OPT->value();
+				$size    = $use_desc_4_label
+					? self::get_label_size_class($OPT->value() . ' ' . $OPT->desc())
+					: self::get_label_size_class($OPT->value());
+				$desc    = $OPT->desc();// no self::prep_answer
+				$answer  = is_numeric($value) && empty($answer) ? 0 : $answer;
+				$value  = is_numeric($answer) && empty($value) ? 0 : $value;
+				$checked = (string) $value == (string) $answer ? ' checked' : '';
+				$opt     = '-' . sanitize_key($value);
+
+				$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
+				$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-radio-btn-lbl">';
+				$input_html .= $label_b4 ? "\n\t\t\t\t\t\t" . '<span>' . $label . '</span>&nbsp;' : '';
+				$input_html .= "\n\t\t\t\t\t\t"
+							   . '<input type="radio" name="' . $name . '" id="' . $id . $opt . '" '
+							   . 'class="' . $class . '" value="' . $value . '" '
+							   . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled
+							   . $checked . ' ' . $extra . '/>';
+				$input_html .= ! $label_b4
+					? "\n\t\t\t\t\t\t"
+					  . '&nbsp;<span class="espresso-radio-btn-desc">'
+					  . $label
+					  . '</span>'
+					: '';
+				$input_html .= "\n\t\t\t\t\t" . '</label>';
+				$input_html .= $use_desc_4_label
+					? ''
+					: '<span class="espresso-radio-btn-option-desc small-text grey-text">' . $desc . '</span>';
+				$input_html .= "\n\t\t\t\t" . '</li>';
+			}
+		}
+
+		$input_html .= "\n\t\t\t" . '</ul>';
+
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return $label_html . $input_html;
+	}
+
+
+	/**
+	 * generates HTML for form checkbox inputs
+	 *
+	 * @param string $question    label content
+	 * @param string $answer      form input value attribute
+	 * @param array  $options     array of options where array key = option value and array value = option display text
+	 * @param string $name        form input name attribute
+	 * @param string $id          form input css id attribute
+	 * @param string $class       form input css class attribute
+	 * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
+	 *                            required 'class', and required 'msg' attribute
+	 * @param string $label_class css class attribute for the label
+	 * @param string $disabled    disabled="disabled" or null
+	 * @return string HTML
+	 */
+	public static function checkbox(
+		$question = false,
+		$answer = null,
+		$options = false,
+		$name = false,
+		$id = '',
+		$class = '',
+		$required = false,
+		$required_text = '',
+		$label_class = '',
+		$disabled = false,
+		$label_b4 = false,
+		$system_ID = false,
+		$use_html_entities = true,
+		$add_mobile_label = false
+	) {
+		// need these
+		if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
+			return null;
+		}
+		$answer = maybe_unserialize($answer);
+
+		// prep the answer(s)
+		$answer = is_array($answer) ? $answer : [sanitize_key($answer) => $answer];
+
+		foreach ($answer as $key => $value) {
+			$key            = self::prep_option_value($key);
+			$answer[ $key ] = self::prep_answer($value, $use_html_entities);
+		}
+
+		// prep the required array
+		$required = self::prep_required($required);
+		// set disabled tag
+		$disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
+		// ya gots ta have style man!!!
+		$radio_class = is_admin() ? 'ee-admin-radio-lbl' : $label_class;
+		$class       = empty($class) ? 'espresso-radio-btn-inp' : $class;
+		$extra       = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
+
+		$label_html   = self::label($question, $required_text, $required['label'], '', $label_class);
+		$mobile_label = self::mobileLabel(
+			$add_mobile_label,
+			$question,
+			$required_text,
+			$required['label'],
+			$label_class
+		);
+
+		$input_html = $mobile_label
+			. '<ul id="' . $id . '-ul" class="espresso-checkbox-options-ul ' . $class . '-ul">';
+
+		$class .= ! empty($system_ID) ? ' ' . $system_ID : '';
+		$class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
+
+		foreach ($options as $OPT) {
+			$value = $OPT->value();// self::prep_option_value( $OPT->value() );
+			$size  = self::get_label_size_class($OPT->value() . ' ' . $OPT->desc());
+			$text  = self::prep_answer($OPT->value());
+			$desc  = $OPT->desc();
+			$opt   = '-' . sanitize_key($value);
+
+			$checked = is_array($answer) && in_array($text, $answer) ? ' checked' : '';
+
+			$input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
+			$input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-checkbox-lbl">';
+			$input_html .= $label_b4 ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>&nbsp;' : '';
+			$input_html .= "\n\t\t\t\t\t\t"
+						   . '<input type="checkbox" name="' . $name . '[' . $OPT->ID() . ']" '
+						   . 'id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" '
+						   . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
+			$input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t" . '&nbsp;<span>' . $text . '</span>' : '';
+			$input_html .= "\n\t\t\t\t\t" . '</label>';
+			if (! empty($desc) && $desc != $text) {
+				$input_html .= "\n\t\t\t\t\t"
+							   . ' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">'
+							   . $desc
+							   . '</div>';
+			}
+			$input_html .= "\n\t\t\t\t" . '</li>';
+		}
+
+		$input_html .= "\n\t\t\t" . '</ul>';
+
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return $label_html . $input_html;
+	}
+
+
+	/**
+	 * generates HTML for a form datepicker input
+	 *
+	 * @param string $question    label content
+	 * @param string $answer      form input value attribute
+	 * @param string $name        form input name attribute
+	 * @param string $id          form input css id attribute
+	 * @param string $class       form input css class attribute
+	 * @param array  $required    'label', 'class', and 'msg' - array of values for required "label" content, css
+	 *                            required 'class', and required 'msg' attribute
+	 * @param string $label_class css class attribute for the label
+	 * @param string $disabled    disabled="disabled" or null
+	 * @return string HTML
+	 */
+	public static function datepicker(
+		$question = false,
+		$answer = null,
+		$name = false,
+		$id = '',
+		$class = '',
+		$required = false,
+		$required_text = '',
+		$label_class = '',
+		$disabled = false,
+		$system_ID = false,
+		$use_html_entities = true,
+		$add_mobile_label = false
+	) {
+		// need these
+		if (! $question || ! $name) {
+			return null;
+		}
+		// prep the answer
+		$answer = is_array($answer) ? '' : self::prep_answer($answer, $use_html_entities);
+		// prep the required array
+		$required = self::prep_required($required);
+		// set disabled tag
+		$disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
+		// ya gots ta have style man!!!
+		$txt_class = is_admin() ? 'regular-text' : 'espresso-datepicker-inp';
+		$class     = empty($class) ? $txt_class : $class;
+		$class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
+		$class = self::appendInputSizeClass($class, $answer);
+		$extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
+
+		$label_html   = self::label($question, $required_text, $required['label'], '', $label_class);
+		$mobile_label = self::mobileLabel(
+			$add_mobile_label,
+			$question,
+			$required_text,
+			$required['label'],
+			$label_class,
+			$name
+		);
+
+		$input_html = $mobile_label
+			. '<input type="text" name="' . $name . '" id="' . $id . '" '
+			. 'class="' . $class . ' ' . $required['class'] . ' datepicker" value="' . $answer . '"  '
+			. 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled . ' ' . $extra . '/>';
+
+		// enqueue scripts
+		wp_register_style(
+			'espresso-ui-theme',
+			EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css',
+			[],
+			EVENT_ESPRESSO_VERSION
+		);
+		wp_enqueue_style('espresso-ui-theme');
+		wp_enqueue_script('jquery-ui-datepicker');
+
+		$input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
+		return $label_html . $input_html;
+	}
+
+
+	/**
+	 *  remove_label_keep_required_msg
+	 *  this will strip out a form input's label HTML while keeping the required text HTML that MUST be before the label
+	 *
+	 * @access public
+	 * @return     string
+	 */
+	public static function remove_label_keep_required_msg($label_html, $required_text)
+	{
+		return $required_text;
+	}
+
+
+	/**
+	 * Simply returns the HTML for a hidden input of the given name and value.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @return string HTML
+	 */
+	public static function hidden_input($name, $value, $id = '')
+	{
+		$id = ! empty($id) ? $id : $name;
+		return '<input id="' . $id . '" type="hidden" name="' . $name . '" value="' . $value . '"/>';
+	}
+
+
+	/**
+	 * prep_question
+	 *
+	 * @param string $question
+	 * @return string
+	 */
+	public static function prep_question($question)
+	{
+		return $question;
+	}
+
+
+	/**
+	 *  prep_answer
+	 *
+	 * @param mixed $answer
+	 * @return string
+	 */
+	public static function prep_answer($answer, $use_html_entities = true)
+	{
+		// make sure we convert bools first.  Otherwise (bool) false becomes an empty string which is NOT desired,
+		// we want "0".
+		if (is_bool($answer)) {
+			$answer = $answer ? 1 : 0;
+		}
+		$answer = trim(stripslashes(str_replace('&#039;', "'", $answer)));
+		return $use_html_entities ? htmlentities($answer, ENT_QUOTES, 'UTF-8') : $answer;
+	}
+
+
+	/**
+	 *  prep_answer_options
+	 *
+	 * @param array $QSOs array of EE_Question_Option objects
+	 * @return array
+	 */
+	public static function prep_answer_options($QSOs = [])
+	{
+		$prepped_answer_options = [];
+		if (is_array($QSOs) && ! empty($QSOs)) {
+			foreach ($QSOs as $key => $QSO) {
+				if (! $QSO instanceof EE_Question_Option) {
+					$QSO = EE_Question_Option::new_instance(
+						[
+							'QSO_value' => is_array($QSO) && isset($QSO['id'])
+								? (string) $QSO['id']
+								: (string) $key,
+							'QSO_desc'  => is_array($QSO) && isset($QSO['text'])
+								? (string) $QSO['text']
+								: (string) $QSO,
+						]
+					);
+				}
+				if ($QSO->opt_group()) {
+					$prepped_answer_options[ $QSO->opt_group() ][] = $QSO;
+				} else {
+					$prepped_answer_options[] = $QSO;
+				}
+			}
+		}
+		//      d( $prepped_answer_options );
+		return $prepped_answer_options;
+	}
+
+
+	/**
+	 *  prep_option_value
+	 *
+	 * @param string|int $option_value
+	 * @return string
+	 */
+	public static function prep_option_value($option_value)
+	{
+		return esc_attr(trim(stripslashes($option_value)));
+	}
+
+
+	/**
+	 *  prep_required
+	 *
+	 * @param string|array $required
+	 * @return array
+	 */
+	public static function prep_required($required = [])
+	{
+		// make sure required is an array
+		$required = is_array($required) ? $required : [];
+		// and set some defaults
+		return array_merge(['label' => '', 'class' => '', 'msg' => ''], $required);
+	}
+
+
+	/**
+	 *  get_label_size_class
+	 *
+	 * @param string $value
+	 * @return string
+	 */
+	public static function get_label_size_class($value = false)
+	{
+		if ($value === false || $value === '') {
+			return ' class="medium-lbl"';
+		}
+		// determine length of option value
+		$val_size = strlen($value);
+		switch ($val_size) {
+			case $val_size < 3:
+				$size = ' class="nano-lbl"';
+				break;
+			case $val_size < 6:
+				$size = ' class="micro-lbl"';
+				break;
+			case $val_size < 12:
+				$size = ' class="tiny-lbl"';
+				break;
+			case $val_size < 25:
+				$size = ' class="small-lbl"';
+				break;
+			case $val_size > 100:
+				$size = ' class="big-lbl"';
+				break;
+			default:
+				$size = ' class="medium-lbl"';
+				break;
+		}
+		return $size;
+	}
+
+
+	/**
+	 *  _load_system_dropdowns
+	 *
+	 * @param EE_Question_Form_Input $QFI
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	private static function _load_system_dropdowns($QFI)
+	{
+		$QST_system = $QFI->get('QST_system');
+		switch ($QST_system) {
+			case 'state':
+				$QFI = self::generate_state_dropdown($QFI);
+				break;
+			case 'country':
+				$QFI = self::generate_country_dropdown($QFI);
+				break;
+			case 'admin-state':
+				$QFI = self::generate_state_dropdown($QFI, true);
+				break;
+			case 'admin-country':
+				$QFI = self::generate_country_dropdown($QFI, true);
+				break;
+		}
+		return $QFI;
+	}
+
+
+	/**
+	 * This preps dropdowns that are specialized.
+	 *
+	 * @param EE_Question_Form_Input $QFI
+	 *
+	 * @return EE_Question_Form_Input
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since  4.6.0
+	 */
+	protected static function _load_specialized_dropdowns($QFI)
+	{
+		switch ($QFI->get('QST_type')) {
+			case 'STATE':
+				$QFI = self::generate_state_dropdown($QFI);
+				break;
+			case 'COUNTRY':
+				$QFI = self::generate_country_dropdown($QFI);
+				break;
+		}
+		return $QFI;
+	}
+
+
+	/**
+	 *    generate_state_dropdown
+	 *
+	 * @param EE_Question_Form_Input $QST
+	 * @param bool                   $get_all
+	 * @return EE_Question_Form_Input
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function generate_state_dropdown($QST, $get_all = false)
+	{
+		$states = $get_all
+			? EEM_State::instance()->get_all_states()
+			: EEM_State::instance()->get_all_states_of_active_countries();
+		if ($states && count($states) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
+			// if multiple countries, we'll create option groups within the dropdown
+			foreach ($states as $state) {
+				if ($state instanceof EE_State) {
+					$QSO = EE_Question_Option::new_instance(
+						[
+							'QSO_value'   => $state->ID(),
+							'QSO_desc'    => $state->name(),
+							'QST_ID'      => $QST->get('QST_ID'),
+							'QSO_deleted' => false,
+						]
+					);
+					// set option group
+					$QSO->set_opt_group($state->country()->name());
+					// add option to question
+					$QST->add_temp_option($QSO);
+				}
+			}
+		}
+		return $QST;
+	}
+
+
+	/**
+	 *    generate_country_dropdown
+	 *
+	 * @param      $QST
+	 * @param bool $get_all
+	 * @return array
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @internal param array $question
+	 */
+	public static function generate_country_dropdown($QST, $get_all = false)
+	{
+		$countries = $get_all
+			? EEM_Country::instance()->get_all_countries()
+			: EEM_Country::instance()->get_all_active_countries();
+		if ($countries && count($countries) != count($QST->options())) {
+			$QST->set('QST_type', 'DROPDOWN');
+			// now add countries
+			foreach ($countries as $country) {
+				if ($country instanceof EE_Country) {
+					$QSO = EE_Question_Option::new_instance(
+						[
+							'QSO_value'   => $country->ID(),
+							'QSO_desc'    => $country->name(),
+							'QST_ID'      => $QST->get('QST_ID'),
+							'QSO_deleted' => false,
+						]
+					);
+					$QST->add_temp_option($QSO);
+				}
+			}
+		}
+		return $QST;
+	}
+
+
+	/**
+	 *  generates options for a month dropdown selector with numbers from 01 to 12
+	 *
+	 * @return array()
+	 */
+	public static function two_digit_months_dropdown_options()
+	{
+		$options = [];
+		for ($x = 1; $x <= 12; $x++) {
+			$mm             = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[ $mm ] = $mm;
+		}
+		return EEH_Form_Fields::prep_answer_options($options);
+	}
+
+
+	/**
+	 *  generates a year dropdown selector with numbers for the next ten years
+	 *
+	 * @return array
+	 */
+	public static function next_decade_two_digit_year_dropdown_options()
+	{
+		$options      = [];
+		$current_year = date('y');
+		$next_decade  = $current_year + 10;
+		for ($x = $current_year; $x <= $next_decade; $x++) {
+			$yy             = str_pad($x, 2, '0', STR_PAD_LEFT);
+			$options[ $yy ] = $yy;
+		}
+		return EEH_Form_Fields::prep_answer_options($options);
+	}
+
+
+	/**
+	 * generates a month/year dropdown selector for all registrations matching the given criteria.  Typically used for
+	 * list table filter.
+	 *
+	 * @param string  $cur_date     any currently selected date can be entered here.
+	 * @param string  $status       Registration status
+	 * @param integer $evt_category Event Category ID if the Event Category filter is selected
+	 * @return string                html
+	 * @throws EE_Error
+	 */
+	public static function generate_registration_months_dropdown($cur_date = '', $status = '', $evt_category = 0)
+	{
+		$_where = [];
+		if (! empty($status)) {
+			$_where['STS_ID'] = $status;
+		}
+
+		if ($evt_category > 0) {
+			$_where['Event.Term_Taxonomy.term_id'] = $evt_category;
+		}
+
+		$regdtts = EEM_Registration::instance()->get_reg_months_and_years($_where);
+
+		// setup vals for select input helper
+		$options = [
+			0 => [
+				'text' => esc_html__('Select a Month/Year', 'event_espresso'),
+				'id'   => '',
+			],
+		];
+
+		foreach ($regdtts as $regdtt) {
+			$date      = $regdtt->reg_month . ' ' . $regdtt->reg_year;
+			$options[] = [
+				'text' => $date,
+				'id'   => $date,
+			];
+		}
+
+		return self::select_input('month_range', $options, $cur_date);
+	}
+
+
+	/**
+	 * generates a month/year dropdown selector for all events matching the given criteria
+	 * Typically used for list table filter
+	 *
+	 * @param string $cur_date          any currently selected date can be entered here.
+	 * @param string $status            "view" (i.e. all, today, month, draft)
+	 * @param int    $evt_category      category event belongs to
+	 * @param string $evt_active_status "upcoming", "expired", "active", or "inactive"
+	 * @return string                    html
+	 * @throws EE_Error
+	 */
+	public static function generate_event_months_dropdown(
+		$cur_date = '',
+		$status = null,
+		$evt_category = null,
+		$evt_active_status = null
+	) {
+		// determine what post_status our condition will have for the query.
+		// phpcs:disable PSR2.ControlStructures.SwitchDeclaration.TerminatingComment
+		switch ($status) {
+			case 'month':
+			case 'today':
+			case null:
+			case 'all':
+				$where['Event.status'] = ['NOT IN', ['trash']];
+				break;
+			case 'draft':
+				$where['Event.status'] = ['IN', ['draft', 'auto-draft']];
+				break;
+			default:
+				$where['Event.status'] = $status;
+		}
+
+		// phpcs:enable
+
+		// categories?
+
+
+		if (! empty($evt_category) and $evt_category > 0) {
+			$where['Event.Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
+			$where['Event.Term_Taxonomy.term_id']  = $evt_category;
+		}
+
+
+		//      $where['DTT_is_primary'] = 1;
+
+		$DTTS = EEM_Datetime::instance()->get_dtt_months_and_years($where, $evt_active_status);
+
+		// let's setup vals for select input helper
+		$options = [
+			0 => [
+				'text' => esc_html__('Select a Month/Year', 'event_espresso'),
+				'id'   => "",
+			],
+		];
+
+
+		// translate month and date
+		global $wp_locale;
+
+		foreach ($DTTS as $DTT) {
+			$localized_date = $wp_locale->get_month($DTT->dtt_month_num) . ' ' . $DTT->dtt_year;
+			$id             = $DTT->dtt_month . ' ' . $DTT->dtt_year;
+			$options[]      = [
+				'text' => $localized_date,
+				'id'   => $id,
+			];
+		}
+
+
+		return self::select_input('month_range', $options, $cur_date);
+	}
+
+
+	/**
+	 * generates the dropdown selector for event categories
+	 * typically used as a filter on list tables.
+	 *
+	 * @param integer $current_cat currently selected category
+	 * @return string               html for dropdown
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function generate_event_category_dropdown($current_cat = -1)
+	{
+		$categories = EEM_Term::instance()->get_all_ee_categories(true);
+		$options    = [
+			'0' => [
+				'text' => esc_html__('All Categories', 'event_espresso'),
+				'id'   => -1,
+			],
+		];
+
+		// setup categories for dropdown
+		foreach ($categories as $category) {
+			$options[] = [
+				'text' => $category->get('name'),
+				'id'   => $category->ID(),
+			];
+		}
+
+		return self::select_input('EVT_CAT', $options, $current_cat);
+	}
+
+
+	/**
+	 *    generate a submit button with or without it's own microform
+	 *    this is the only way to create buttons that are compatible across all themes
+	 *
+	 * @access    public
+	 * @param string      $url              - the form action
+	 * @param string      $ID               - some kind of unique ID, appended with "-sbmt" for the input and "-frm"
+	 *                                      for the form
+	 * @param string      $class            - css classes (separated by spaces if more than one)
+	 * @param string      $text             - what appears on the button
+	 * @param string      $nonce_action     - if using nonces
+	 * @param bool|string $input_only       - whether to print form header and footer. TRUE returns the input without
+	 *                                      the form
+	 * @param string      $extra_attributes - any extra attributes that need to be attached to the form input
+	 * @return    string
+	 */
+	public static function submit_button(
+		$url = '',
+		$ID = '',
+		$class = '',
+		$text = '',
+		$nonce_action = '',
+		$input_only = false,
+		$extra_attributes = ''
+	) {
+		$btn = '';
+		if (empty($url) || empty($ID)) {
+			return $btn;
+		}
+		$text = ! empty($text) ? $text : esc_html__('Submit', 'event_espresso');
+		$btn  .= '<input id="' . $ID . '-btn" class="' . $class . '" '
+				 . 'type="submit" value="' . $text . '" ' . $extra_attributes . '/>';
+		if (! $input_only) {
+			$btn_frm = '<form id="' . $ID . '-frm" method="POST" action="' . $url . '">';
+			$btn_frm .= ! empty($nonce_action)
+				? wp_nonce_field($nonce_action, $nonce_action . '_nonce', true, false)
+				: '';
+			$btn_frm .= $btn;
+			$btn_frm .= '</form>';
+			$btn     = $btn_frm;
+			unset($btn_frm);
+		}
+		return $btn;
+	}
 }

Spacing +135 added lines, -135 removed lines

@@ -108,8 +108,8 @@ 
             $type           = $input_value['input'];
             $value          = $input_value['value'];
 
-            $id    = $form_id ? $form_id . '-' . $input_key : $input_key;
-            $class = $required ? 'required ' . $css_class : $css_class;
+            $id    = $form_id ? $form_id.'-'.$input_key : $input_key;
+            $class = $required ? 'required '.$css_class : $css_class;
 
             // what type of input are we dealing with ?
             switch ($type) {
@@ -161,8 +161,8 @@ 
             }
         } // end foreach( $input_vars as $input_key => $input_value )
 
-        if (! empty($inputs)) {
-            $glue   = "
+        if ( ! empty($inputs)) {
+            $glue = "
                 </li>
                 <li>
                     ";
@@ -175,7 +175,7 @@ 
             </ul>
             ";
         }
-        return $output . implode("\n", $hidden_inputs);
+        return $output.implode("\n", $hidden_inputs);
     }
 
 
@@ -256,7 +256,7 @@ 
             // generate label
             $label = ! empty($label) ? self::adminLabel($id, $label, $required) : '';
             // generate field name
-            $name = ! empty($unique_id) ? $field_name . '[' . $unique_id . ']' : $field_name;
+            $name = ! empty($unique_id) ? $field_name.'['.$unique_id.']' : $field_name;
 
             // we determine what we're building based on the type
             switch ($type) {
@@ -267,14 +267,14 @@ 
                         foreach ($value as $key => $val) {
                             $c_input .= self::adminMulti(
                                 $default,
-                                isset($classes[ $key ]) ? $classes[ $key ] : '',
-                                $field_name . '_' . $value,
+                                isset($classes[$key]) ? $classes[$key] : '',
+                                $field_name.'_'.$value,
                                 $name,
                                 $required,
                                 $tab_index,
                                 $type,
                                 $val,
-                                isset($labels[ $key ]) ? $labels[ $key ] : ''
+                                isset($labels[$key]) ? $labels[$key] : ''
                             );
                         }
                         $field = $c_input;
@@ -300,7 +300,7 @@ 
                 case 'select':
                     $options = [];
                     foreach ($value as $key => $val) {
-                        $options[ $val ] = isset($labels[ $key ]) ? $labels[ $key ] : '';
+                        $options[$val] = isset($labels[$key]) ? $labels[$key] : '';
                     }
                     $field = self::adminSelect($default, $class, $id, $name, $required, $tab_index, $options);
                     break;
@@ -326,7 +326,7 @@ 
                     $field = self::adminText($class, $id, $name, $required, $tab_index, $value);
             }
 
-            $form_fields[ $field_name ] = ['label' => $label, 'field' => $field . $extra_desc];
+            $form_fields[$field_name] = ['label' => $label, 'field' => $field.$extra_desc];
         }
 
         return $form_fields;
@@ -395,7 +395,7 @@ 
         }
         $label = esc_html($label);
         $label_class = self::appendInputSizeClass('', $label);
-        $label_class = $label_class ? ' class="' . $label_class . '"' : '';
+        $label_class = $label_class ? ' class="'.$label_class.'"' : '';
         return "
         <label for='$id'{$label_class}>
             {$input}
@@ -545,7 +545,7 @@ 
         $autosize = true
     ) {
         // if $values was submitted in the wrong format, convert it over
-        if (! empty($values) && (! array_key_exists(0, $values) || ! is_array($values[0]))) {
+        if ( ! empty($values) && ( ! array_key_exists(0, $values) || ! is_array($values[0]))) {
             $converted_values = [];
             foreach ($values as $id => $text) {
                 $converted_values[] = ['id' => $id, 'text' => $text];
@@ -554,19 +554,19 @@ 
         }
 
         $field =
-            '<select id="' . EEH_Formatter::ee_tep_output_string($name)
-            . '" name="' . EEH_Formatter::ee_tep_output_string($name)
+            '<select id="'.EEH_Formatter::ee_tep_output_string($name)
+            . '" name="'.EEH_Formatter::ee_tep_output_string($name)
             . '"';
 
         if (EEH_Formatter::ee_tep_not_null($parameters)) {
-            $field .= ' ' . $parameters;
+            $field .= ' '.$parameters;
         }
         $class = $autosize ? self::appendInputSizeClass($class, $values) : '';
 
-        $field .= ' class="' . $class . '">';
+        $field .= ' class="'.$class.'">';
 
-        if (empty($default) && isset($GLOBALS[ $name ])) {
-            $default = stripslashes($GLOBALS[ $name ]);
+        if (empty($default) && isset($GLOBALS[$name])) {
+            $default = stripslashes($GLOBALS[$name]);
         }
 
         $field .= self::selectInputOption($values, $default);
@@ -582,7 +582,7 @@ 
             $id = is_scalar($values['id']) ? $values['id'] : '';
             $text = is_scalar($values['text']) ? $values['text'] : '';
             $selected = $default == $values['id'] ? ' selected = "selected"' : '';
-            $html_class = isset($values['class']) ? ' class="' . $values['class'] . '"' : '';
+            $html_class = isset($values['class']) ? ' class="'.$values['class'].'"' : '';
             return "<option value='{$id}'{$selected}{$html_class}>{$text}</option>";
         }
         $options = '';
@@ -612,7 +612,7 @@ 
             return $chars;
         }
         // not a primitive? return something big
-        if (! is_scalar($value)) {
+        if ( ! is_scalar($value)) {
             return 500;
         }
         return strlen((string) $value);
@@ -662,11 +662,11 @@ 
         $after_question_group_questions  =
             apply_filters('FHEE__EEH_Form_Fields__generate_question_groups_html__after_question_group_questions', '');
 
-        if (! empty($question_groups)) {
+        if ( ! empty($question_groups)) {
             // loop thru question groups
             foreach ($question_groups as $QSG) {
                 // check that questions exist
-                if (! empty($QSG['QSG_questions'])) {
+                if ( ! empty($QSG['QSG_questions'])) {
                     // use fieldsets
                     $html .= "\n\t"
                              . '<'
@@ -691,7 +691,7 @@ 
                     $html .= $before_question_group_questions;
                     // loop thru questions
                     foreach ($QSG['QSG_questions'] as $question) {
-                        $QFI  = new EE_Question_Form_Input(
+                        $QFI = new EE_Question_Form_Input(
                             $question['qst_obj'],
                             $question['ans_obj'],
                             $question
@@ -699,7 +699,7 @@ 
                         $html .= self::generate_form_input($QFI);
                     }
                     $html .= $after_question_group_questions;
-                    $html .= "\n\t" . '</' . $group_wrapper . '>';
+                    $html .= "\n\t".'</'.$group_wrapper.'>';
                 }
             }
         }
@@ -739,25 +739,25 @@ 
             'input_id'    => '',
             'input_class' => '',
         ];
-        $q_meta         = array_merge($default_q_meta, $q_meta);
+        $q_meta = array_merge($default_q_meta, $q_meta);
 
-        if (! empty($question_groups)) {
+        if ( ! empty($question_groups)) {
             // loop thru question groups
             foreach ($question_groups as $QSG) {
                 if ($QSG instanceof EE_Question_Group) {
                     // check that questions exist
 
                     $where = ['QST_deleted' => 0];
-                    if (! $from_admin) {
+                    if ( ! $from_admin) {
                         $where['QST_admin_only'] = 0;
                     }
                     $questions =
                         $QSG->questions([$where, 'order_by' => ['Question_Group_Question.QGQ_order' => 'ASC']]);
-                    if (! empty($questions)) {
+                    if ( ! empty($questions)) {
                         // use fieldsets
                         $html .= "\n\t"
-                                 . '<' . $group_wrapper . ' class="espresso-question-group-wrap" '
-                                 . 'id="' . $QSG->get('QSG_identifier') . '">';
+                                 . '<'.$group_wrapper.' class="espresso-question-group-wrap" '
+                                 . 'id="'.$QSG->get('QSG_identifier').'">';
                         // group_name
                         if ($QSG->show_group_name()) {
                             $html .= "\n\t\t"
@@ -782,21 +782,21 @@ 
                             /** @var RequestInterface $request */
                             $request      = LoaderFactory::getLoader()->getShared(RequestInterface::class);
                             $request_qstn = $request->getRequestParam('qstn', [], 'string', true);
-                            if (! empty($request_qstn) && isset($q_meta['input_id']) && isset($q_meta['att_nmbr'])) {
+                            if ( ! empty($request_qstn) && isset($q_meta['input_id']) && isset($q_meta['att_nmbr'])) {
                                 // check for answer in $request_qstn in case we are reprocessing a form after an error
-                                if (isset($request_qstn[ $q_meta['input_id'] ][ $qstn_id ])) {
-                                    $answer = is_array($request_qstn[ $q_meta['input_id'] ][ $qstn_id ])
-                                        ? $request_qstn[ $q_meta['input_id'] ][ $qstn_id ]
-                                        : sanitize_text_field($request_qstn[ $q_meta['input_id'] ][ $qstn_id ]);
+                                if (isset($request_qstn[$q_meta['input_id']][$qstn_id])) {
+                                    $answer = is_array($request_qstn[$q_meta['input_id']][$qstn_id])
+                                        ? $request_qstn[$q_meta['input_id']][$qstn_id]
+                                        : sanitize_text_field($request_qstn[$q_meta['input_id']][$qstn_id]);
                                 }
                             } elseif (isset($q_meta['attendee']) && $q_meta['attendee']) {
                                 // attendee data from the session
                                 $answer =
-                                    isset($q_meta['attendee'][ $qstn_id ]) ? $q_meta['attendee'][ $qstn_id ] : null;
+                                    isset($q_meta['attendee'][$qstn_id]) ? $q_meta['attendee'][$qstn_id] : null;
                             }
 
 
-                            $QFI  = new EE_Question_Form_Input(
+                            $QFI = new EE_Question_Form_Input(
                                 $QST,
                                 EE_Answer::new_instance(
                                     [
@@ -811,7 +811,7 @@ 
                             $html .= self::generate_form_input($QFI);
                         }
                         $html .= $after_question_group_questions;
-                        $html .= "\n\t" . '</' . $group_wrapper . '>';
+                        $html .= "\n\t".'</'.$group_wrapper.'>';
                     }
                 }
             }
@@ -993,7 +993,7 @@ 
     ): string {
         $for   = ! empty($name) ? " for='{$name}'" : '';
         $class = ! empty($label_class) ? " class='{$label_class}'" : '';
-        $label = self::prep_question($question) . $required_label;
+        $label = self::prep_question($question).$required_label;
         $label_html = "
             {$required_text}
             <label{$for}{$class}>{$label}</label>";
@@ -1049,7 +1049,7 @@ 
         $extra_attributes = ''
     ) {
         // need these
-        if (! $question || ! $name) {
+        if ( ! $question || ! $name) {
             return null;
         }
         // prep the answer
@@ -1061,9 +1061,9 @@ 
         // ya gots ta have style man!!!
         $txt_class = is_admin() ? 'regular-text' : 'espresso-text-inp';
         $class     = empty($class) ? $txt_class : $class;
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
+        $class .= ! empty($system_ID) ? ' '.$system_ID : '';
         $class = self::appendInputSizeClass($class, $answer);
-        $class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
+        $class .= ! empty($required['class']) ? ' '.$required['class'] : '';
         $extra_attributes = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', $extra_attributes);
 
         $label_html = self::label($question, $required_text, $required['label'], $name, $label_class);
@@ -1076,18 +1076,18 @@ 
             $name
         );
 
-        $input_html = $mobile_label . '
+        $input_html = $mobile_label.'
             <input  type="text"
-                    name="' . $name . '"
-                    id="' . $id . '"
-                    class="' . trim($class) . '"
-                    value="' . esc_attr($answer) . '"
-                    aria-label="' . esc_attr($required['msg']) . '"
-                    ' . $disabled . ' ' . $extra_attributes . '
+                    name="' . $name.'"
+                    id="' . $id.'"
+                    class="' . trim($class).'"
+                    value="' . esc_attr($answer).'"
+                    aria-label="' . esc_attr($required['msg']).'"
+                    ' . $disabled.' '.$extra_attributes.'
             />';
 
         $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
+        return $label_html.$input_html;
     }
 
 
@@ -1122,7 +1122,7 @@ 
         $add_mobile_label = false
     ) {
         // need these
-        if (! $question || ! $name) {
+        if ( ! $question || ! $name) {
             return null;
         }
         // prep the answer
@@ -1136,9 +1136,9 @@ 
         // set disabled tag
         $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
         // ya gots ta have style man!!!
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class     .= ! empty($required['class']) ? ' ' . $required['class'] : '';
-        $extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
+        $class     .= ! empty($system_ID) ? ' '.$system_ID : '';
+        $class     .= ! empty($required['class']) ? ' '.$required['class'] : '';
+        $extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
         $label_html   = self::label($question, $required_text, $required['label'], $name, $label_class);
         $mobile_label = self::mobileLabel(
@@ -1151,14 +1151,14 @@ 
         );
 
         $input_html = $mobile_label
-            . '<textarea name="' . $name . '" id="' . $id . '" class="' . trim($class) . '" '
-            . 'rows="' . $dimensions['rows'] . '" cols="' . $dimensions['cols'] . '"  '
-            . 'aria-label="' . $required['msg'] . '" ' . $disabled . ' ' . $extra . '>'
+            . '<textarea name="'.$name.'" id="'.$id.'" class="'.trim($class).'" '
+            . 'rows="'.$dimensions['rows'].'" cols="'.$dimensions['cols'].'"  '
+            . 'aria-label="'.$required['msg'].'" '.$disabled.' '.$extra.'>'
              . esc_textarea($answer)
               . '</textarea>';
 
         $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
+        return $label_html.$input_html;
     }
 
 
@@ -1196,7 +1196,7 @@ 
     ) {
 
         // need these
-        if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
+        if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
             return null;
         }
         // prep the answer
@@ -1208,9 +1208,9 @@ 
         // set disabled tag
         $disabled = $answer === null || ! $disabled ? '' : ' disabled="disabled"';
         // ya gots ta have style man!!!
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
+        $class .= ! empty($system_ID) ? ' '.$system_ID : '';
         $class = self::appendInputSizeClass($class, $options);
-        $extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
+        $extra = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
         $label_html   = self::label($question, $required_text, $required['label'], $name, $label_class);
         $mobile_label = self::mobileLabel(
@@ -1223,16 +1223,16 @@ 
         );
 
         $input_html = $mobile_label
-            . '<select name="' . $name . '" id="' . $id . '" class="' . trim($class) . ' ' . $required['class'] . '" '
-            . 'aria-label="' . esc_attr($required['msg']) . '"' . $disabled . ' ' . $extra . '>';
+            . '<select name="'.$name.'" id="'.$id.'" class="'.trim($class).' '.$required['class'].'" '
+            . 'aria-label="'.esc_attr($required['msg']).'"'.$disabled.' '.$extra.'>';
         // recursively count array elements, to determine total number of options
         $only_option = count($options, 1) == 1;
-        if (! $only_option) {
+        if ( ! $only_option) {
             // if there is NO answer set and there are multiple options to choose from, then set the "please select" message as selected
-            $selected   = $answer === null ? ' selected' : '';
+            $selected = $answer === null ? ' selected' : '';
             $input_html .= $add_please_select_option
                 ? "\n\t\t\t\t"
-                  . '<option value=""' . $selected . '>'
+                  . '<option value=""'.$selected.'>'
                   . esc_html__(' - please select - ', 'event_espresso')
                   . '</option>'
                 : '';
@@ -1255,7 +1255,7 @@ 
                 );
         }
 
-        $input_html .= "\n\t\t\t" . '</select>';
+        $input_html .= "\n\t\t\t".'</select>';
 
         $input_html =
             apply_filters(
@@ -1270,7 +1270,7 @@ 
             );
 
         $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
+        return $label_html.$input_html;
     }
 
 
@@ -1288,11 +1288,11 @@ 
      */
     private static function _generate_select_option_group($opt_group, $QSOs, $answer, $use_html_entities = true)
     {
-        $html = "\n\t\t\t\t" . '<optgroup label="' . self::prep_option_value($opt_group) . '">';
+        $html = "\n\t\t\t\t".'<optgroup label="'.self::prep_option_value($opt_group).'">';
         foreach ($QSOs as $QSO) {
             $html .= self::_generate_select_option($QSO->value(), $QSO->desc(), $answer, false, $use_html_entities);
         }
-        $html .= "\n\t\t\t\t" . '</optgroup>';
+        $html .= "\n\t\t\t\t".'</optgroup>';
         return $html;
     }
 
@@ -1319,7 +1319,7 @@ 
         $value    = ! empty($value) ? $value : $key;
         $selected = ($answer == $key || $only_option) ? 'selected' : '';
         return "\n\t\t\t\t"
-               . '<option value="' . self::prep_option_value($key) . '" ' . $selected . '> '
+               . '<option value="'.self::prep_option_value($key).'" '.$selected.'> '
                . $value
                . '&nbsp;&nbsp;&nbsp;</option>';
     }
@@ -1364,7 +1364,7 @@ 
         bool $add_mobile_label = false
     ) {
         // need these
-        if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
+        if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
             return null;
         }
         // prep the answer
@@ -1388,50 +1388,50 @@ 
         );
 
         $input_html = $mobile_label
-            . '<ul id="' . $id . '-ul" class="espresso-radio-btn-options-ul ' . $class . '-ul">';
+            . '<ul id="'.$id.'-ul" class="espresso-radio-btn-options-ul '.$class.'-ul">';
 
-        $class .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
+        $class .= ! empty($system_ID) ? ' '.$system_ID : '';
+        $class .= ! empty($required['class']) ? ' '.$required['class'] : '';
 
         foreach ($options as $OPT) {
             if ($OPT instanceof EE_Question_Option) {
                 $value   = self::prep_option_value($OPT->value());
                 $label   = $use_desc_4_label ? $OPT->desc() : $OPT->value();
                 $size    = $use_desc_4_label
-                    ? self::get_label_size_class($OPT->value() . ' ' . $OPT->desc())
+                    ? self::get_label_size_class($OPT->value().' '.$OPT->desc())
                     : self::get_label_size_class($OPT->value());
-                $desc    = $OPT->desc();// no self::prep_answer
+                $desc    = $OPT->desc(); // no self::prep_answer
                 $answer  = is_numeric($value) && empty($answer) ? 0 : $answer;
-                $value  = is_numeric($answer) && empty($value) ? 0 : $value;
+                $value = is_numeric($answer) && empty($value) ? 0 : $value;
                 $checked = (string) $value == (string) $answer ? ' checked' : '';
-                $opt     = '-' . sanitize_key($value);
+                $opt     = '-'.sanitize_key($value);
 
-                $input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-                $input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-radio-btn-lbl">';
-                $input_html .= $label_b4 ? "\n\t\t\t\t\t\t" . '<span>' . $label . '</span>&nbsp;' : '';
+                $input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+                $input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-radio-btn-lbl">';
+                $input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$label.'</span>&nbsp;' : '';
                 $input_html .= "\n\t\t\t\t\t\t"
-                               . '<input type="radio" name="' . $name . '" id="' . $id . $opt . '" '
-                               . 'class="' . $class . '" value="' . $value . '" '
-                               . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled
-                               . $checked . ' ' . $extra . '/>';
+                               . '<input type="radio" name="'.$name.'" id="'.$id.$opt.'" '
+                               . 'class="'.$class.'" value="'.$value.'" '
+                               . 'aria-label="'.esc_attr($required['msg']).'" '.$disabled
+                               . $checked.' '.$extra.'/>';
                 $input_html .= ! $label_b4
                     ? "\n\t\t\t\t\t\t"
                       . '&nbsp;<span class="espresso-radio-btn-desc">'
                       . $label
                       . '</span>'
                     : '';
-                $input_html .= "\n\t\t\t\t\t" . '</label>';
+                $input_html .= "\n\t\t\t\t\t".'</label>';
                 $input_html .= $use_desc_4_label
                     ? ''
-                    : '<span class="espresso-radio-btn-option-desc small-text grey-text">' . $desc . '</span>';
-                $input_html .= "\n\t\t\t\t" . '</li>';
+                    : '<span class="espresso-radio-btn-option-desc small-text grey-text">'.$desc.'</span>';
+                $input_html .= "\n\t\t\t\t".'</li>';
             }
         }
 
-        $input_html .= "\n\t\t\t" . '</ul>';
+        $input_html .= "\n\t\t\t".'</ul>';
 
         $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
+        return $label_html.$input_html;
     }
 
 
@@ -1467,7 +1467,7 @@ 
         $add_mobile_label = false
     ) {
         // need these
-        if (! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
+        if ( ! $question || ! $name || ! $options || empty($options) || ! is_array($options)) {
             return null;
         }
         $answer = maybe_unserialize($answer);
@@ -1477,7 +1477,7 @@ 
 
         foreach ($answer as $key => $value) {
             $key            = self::prep_option_value($key);
-            $answer[ $key ] = self::prep_answer($value, $use_html_entities);
+            $answer[$key] = self::prep_answer($value, $use_html_entities);
         }
 
         // prep the required array
@@ -1499,42 +1499,42 @@ 
         );
 
         $input_html = $mobile_label
-            . '<ul id="' . $id . '-ul" class="espresso-checkbox-options-ul ' . $class . '-ul">';
+            . '<ul id="'.$id.'-ul" class="espresso-checkbox-options-ul '.$class.'-ul">';
 
-        $class .= ! empty($system_ID) ? ' ' . $system_ID : '';
-        $class .= ! empty($required['class']) ? ' ' . $required['class'] : '';
+        $class .= ! empty($system_ID) ? ' '.$system_ID : '';
+        $class .= ! empty($required['class']) ? ' '.$required['class'] : '';
 
         foreach ($options as $OPT) {
-            $value = $OPT->value();// self::prep_option_value( $OPT->value() );
-            $size  = self::get_label_size_class($OPT->value() . ' ' . $OPT->desc());
+            $value = $OPT->value(); // self::prep_option_value( $OPT->value() );
+            $size  = self::get_label_size_class($OPT->value().' '.$OPT->desc());
             $text  = self::prep_answer($OPT->value());
             $desc  = $OPT->desc();
-            $opt   = '-' . sanitize_key($value);
+            $opt   = '-'.sanitize_key($value);
 
             $checked = is_array($answer) && in_array($text, $answer) ? ' checked' : '';
 
-            $input_html .= "\n\t\t\t\t" . '<li' . $size . '>';
-            $input_html .= "\n\t\t\t\t\t" . '<label class="' . $radio_class . ' espresso-checkbox-lbl">';
-            $input_html .= $label_b4 ? "\n\t\t\t\t\t\t" . '<span>' . $text . '</span>&nbsp;' : '';
+            $input_html .= "\n\t\t\t\t".'<li'.$size.'>';
+            $input_html .= "\n\t\t\t\t\t".'<label class="'.$radio_class.' espresso-checkbox-lbl">';
+            $input_html .= $label_b4 ? "\n\t\t\t\t\t\t".'<span>'.$text.'</span>&nbsp;' : '';
             $input_html .= "\n\t\t\t\t\t\t"
-                           . '<input type="checkbox" name="' . $name . '[' . $OPT->ID() . ']" '
-                           . 'id="' . $id . $opt . '" class="' . $class . '" value="' . $value . '" '
-                           . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled . $checked . ' ' . $extra . '/>';
-            $input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t" . '&nbsp;<span>' . $text . '</span>' : '';
-            $input_html .= "\n\t\t\t\t\t" . '</label>';
-            if (! empty($desc) && $desc != $text) {
+                           . '<input type="checkbox" name="'.$name.'['.$OPT->ID().']" '
+                           . 'id="'.$id.$opt.'" class="'.$class.'" value="'.$value.'" '
+                           . 'aria-label="'.esc_attr($required['msg']).'" '.$disabled.$checked.' '.$extra.'/>';
+            $input_html .= ! $label_b4 ? "\n\t\t\t\t\t\t".'&nbsp;<span>'.$text.'</span>' : '';
+            $input_html .= "\n\t\t\t\t\t".'</label>';
+            if ( ! empty($desc) && $desc != $text) {
                 $input_html .= "\n\t\t\t\t\t"
                                . ' &nbsp; <br/><div class="espresso-checkbox-option-desc small-text grey-text">'
                                . $desc
                                . '</div>';
             }
-            $input_html .= "\n\t\t\t\t" . '</li>';
+            $input_html .= "\n\t\t\t\t".'</li>';
         }
 
-        $input_html .= "\n\t\t\t" . '</ul>';
+        $input_html .= "\n\t\t\t".'</ul>';
 
         $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
+        return $label_html.$input_html;
     }
 
 
@@ -1567,7 +1567,7 @@ 
         $add_mobile_label = false
     ) {
         // need these
-        if (! $question || ! $name) {
+        if ( ! $question || ! $name) {
             return null;
         }
         // prep the answer
@@ -1579,7 +1579,7 @@ 
         // ya gots ta have style man!!!
         $txt_class = is_admin() ? 'regular-text' : 'espresso-datepicker-inp';
         $class     = empty($class) ? $txt_class : $class;
-        $class     .= ! empty($system_ID) ? ' ' . $system_ID : '';
+        $class .= ! empty($system_ID) ? ' '.$system_ID : '';
         $class = self::appendInputSizeClass($class, $answer);
         $extra     = apply_filters('FHEE__EEH_Form_Fields__additional_form_field_attributes', '');
 
@@ -1594,14 +1594,14 @@ 
         );
 
         $input_html = $mobile_label
-            . '<input type="text" name="' . $name . '" id="' . $id . '" '
-            . 'class="' . $class . ' ' . $required['class'] . ' datepicker" value="' . $answer . '"  '
-            . 'aria-label="' . esc_attr($required['msg']) . '" ' . $disabled . ' ' . $extra . '/>';
+            . '<input type="text" name="'.$name.'" id="'.$id.'" '
+            . 'class="'.$class.' '.$required['class'].' datepicker" value="'.$answer.'"  '
+            . 'aria-label="'.esc_attr($required['msg']).'" '.$disabled.' '.$extra.'/>';
 
         // enqueue scripts
         wp_register_style(
             'espresso-ui-theme',
-            EE_GLOBAL_ASSETS_URL . 'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css',
+            EE_GLOBAL_ASSETS_URL.'css/espresso-ui-theme/jquery-ui-1.10.3.custom.min.css',
             [],
             EVENT_ESPRESSO_VERSION
         );
@@ -1609,7 +1609,7 @@ 
         wp_enqueue_script('jquery-ui-datepicker');
 
         $input_html = apply_filters('FHEE__EEH_Form_Fields__input_html', $input_html, $label_html, $id);
-        return $label_html . $input_html;
+        return $label_html.$input_html;
     }
 
 
@@ -1636,7 +1636,7 @@ 
     public static function hidden_input($name, $value, $id = '')
     {
         $id = ! empty($id) ? $id : $name;
-        return '<input id="' . $id . '" type="hidden" name="' . $name . '" value="' . $value . '"/>';
+        return '<input id="'.$id.'" type="hidden" name="'.$name.'" value="'.$value.'"/>';
     }
 
 
@@ -1681,7 +1681,7 @@ 
         $prepped_answer_options = [];
         if (is_array($QSOs) && ! empty($QSOs)) {
             foreach ($QSOs as $key => $QSO) {
-                if (! $QSO instanceof EE_Question_Option) {
+                if ( ! $QSO instanceof EE_Question_Option) {
                     $QSO = EE_Question_Option::new_instance(
                         [
                             'QSO_value' => is_array($QSO) && isset($QSO['id'])
@@ -1694,7 +1694,7 @@ 
                     );
                 }
                 if ($QSO->opt_group()) {
-                    $prepped_answer_options[ $QSO->opt_group() ][] = $QSO;
+                    $prepped_answer_options[$QSO->opt_group()][] = $QSO;
                 } else {
                     $prepped_answer_options[] = $QSO;
                 }
@@ -1906,7 +1906,7 @@ 
         $options = [];
         for ($x = 1; $x <= 12; $x++) {
             $mm             = str_pad($x, 2, '0', STR_PAD_LEFT);
-            $options[ $mm ] = $mm;
+            $options[$mm] = $mm;
         }
         return EEH_Form_Fields::prep_answer_options($options);
     }
@@ -1924,7 +1924,7 @@ 
         $next_decade  = $current_year + 10;
         for ($x = $current_year; $x <= $next_decade; $x++) {
             $yy             = str_pad($x, 2, '0', STR_PAD_LEFT);
-            $options[ $yy ] = $yy;
+            $options[$yy] = $yy;
         }
         return EEH_Form_Fields::prep_answer_options($options);
     }
@@ -1943,7 +1943,7 @@ 
     public static function generate_registration_months_dropdown($cur_date = '', $status = '', $evt_category = 0)
     {
         $_where = [];
-        if (! empty($status)) {
+        if ( ! empty($status)) {
             $_where['STS_ID'] = $status;
         }
 
@@ -1962,7 +1962,7 @@ 
         ];
 
         foreach ($regdtts as $regdtt) {
-            $date      = $regdtt->reg_month . ' ' . $regdtt->reg_year;
+            $date      = $regdtt->reg_month.' '.$regdtt->reg_year;
             $options[] = [
                 'text' => $date,
                 'id'   => $date,
@@ -2011,7 +2011,7 @@ 
         // categories?
 
 
-        if (! empty($evt_category) and $evt_category > 0) {
+        if ( ! empty($evt_category) and $evt_category > 0) {
             $where['Event.Term_Taxonomy.taxonomy'] = 'espresso_event_categories';
             $where['Event.Term_Taxonomy.term_id']  = $evt_category;
         }
@@ -2034,8 +2034,8 @@ 
         global $wp_locale;
 
         foreach ($DTTS as $DTT) {
-            $localized_date = $wp_locale->get_month($DTT->dtt_month_num) . ' ' . $DTT->dtt_year;
-            $id             = $DTT->dtt_month . ' ' . $DTT->dtt_year;
+            $localized_date = $wp_locale->get_month($DTT->dtt_month_num).' '.$DTT->dtt_year;
+            $id             = $DTT->dtt_month.' '.$DTT->dtt_year;
             $options[]      = [
                 'text' => $localized_date,
                 'id'   => $id,
@@ -2108,16 +2108,16 @@ 
             return $btn;
         }
         $text = ! empty($text) ? $text : esc_html__('Submit', 'event_espresso');
-        $btn  .= '<input id="' . $ID . '-btn" class="' . $class . '" '
-                 . 'type="submit" value="' . $text . '" ' . $extra_attributes . '/>';
-        if (! $input_only) {
-            $btn_frm = '<form id="' . $ID . '-frm" method="POST" action="' . $url . '">';
+        $btn .= '<input id="'.$ID.'-btn" class="'.$class.'" '
+                 . 'type="submit" value="'.$text.'" '.$extra_attributes.'/>';
+        if ( ! $input_only) {
+            $btn_frm = '<form id="'.$ID.'-frm" method="POST" action="'.$url.'">';
             $btn_frm .= ! empty($nonce_action)
-                ? wp_nonce_field($nonce_action, $nonce_action . '_nonce', true, false)
+                ? wp_nonce_field($nonce_action, $nonce_action.'_nonce', true, false)
                 : '';
             $btn_frm .= $btn;
             $btn_frm .= '</form>';
-            $btn     = $btn_frm;
+            $btn = $btn_frm;
             unset($btn_frm);
         }
         return $btn;

core/helpers/EEH_Export.helper.php

Indentation +168 added lines, -168 removed lines

@@ -13,172 +13,172 @@
  */
 class EEH_Export
 {
-    /**
-     * Gets the 'normal' column named for fields
-     * @param EE_Model_Field_Base $field
-     * @return string
-     * @throws EE_Error
-     */
-    public static function get_column_name_for_field(EE_Model_Field_Base $field)
-    {
-        $column_name = wp_specialchars_decode($field->get_nicename(), ENT_QUOTES);
-        if (
-            apply_filters(
-                'FHEE__EEH_Export__get_column_name_for_field__add_field_name',
-                false,
-                $column_name,
-                $field
-            )
-        ) {
-            $column_name .= "["
-                . wp_specialchars_decode($field->get_name(), ENT_QUOTES)
-                . "]";
-        }
-        return $column_name;
-    }
-
-
-    /**
-     * Writes $data to the csv file open in $filehandle. uses the array indices of $data for column headers
-     *
-     * @param string $filepath
-     * @param array  $data                  2D array,first numerically-indexed,
-     *                                      and next-level-down preferably indexed by string
-     * @param bool   $write_column_headers  whether or not we should add the keys in the bottom-most array
-     *                                      as a row for headers in the CSV.
-     *                                      Eg, if $data looked like:
-     *                                          array(
-     *                                              0=>array('EVT_ID'=>1,'EVT_name'=>'monkey'...),
-     *                                              1=>array(...,...)
-     *                                          )
-     * @param bool   $headers_only          if true then we won't print any data, just headers. defaults to false
-     * @return boolean                      if we successfully wrote to the CSV or not. If there's no $data,
-     *                                      we consider that a success (because we wrote everything there was...nothing)
-     * @throws EE_Error
-     */
-    public static function write_data_array_to_csv(
-        string $filepath,
-        array $data,
-        bool $write_column_headers = true,
-        bool $headers_only = false
-    ) {
-        // determine if $data is actually a 2d array
-        if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
-            // make sure top level is numerically indexed,
-            if (EEH_Array::is_associative_array($data)) {
-                throw new EE_Error(sprintf(esc_html__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data))));
-            }
-            $new_file_contents = '';
-            $item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
-            // now, is the last item in the top-level array of $data an associative or numeric array?
-            if ($write_column_headers && EEH_Array::is_associative_array($item_in_top_level_array)) {
-                // its associative, so we want to output its keys as column headers
-                $keys = array_keys($item_in_top_level_array);
-                $new_file_contents .=  EEH_Export::get_csv_row($keys);
-                if ($headers_only) {
-                    return EEH_File::write_to_file(
-                        $filepath,
-                        EEH_File::get_file_contents($filepath) . $new_file_contents
-                    );
-                }
-            }
-            // start writing data
-            foreach ($data as $data_row) {
-                $new_row = EEH_Export::get_csv_row($data_row);
-                $new_file_contents .= $new_row ?: '';
-            }
-            return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath) . $new_file_contents);
-        }
-        // no data TO write... so we can assume that's a success
-        return true;
-    }
-
-
-
-     /**
-      *
-     *  Writes a row to the csv file
-     *  @param array $row - individual row of csv data
-     *  @param string $delimiter - csv delimiter
-     *  @param string $enclosure - csv enclosure
-     *  @param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
-     *  @return string of text for teh csv file
-     */
-    public static function get_csv_row(array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false)
-    {
-        // Allow user to filter the csv delimiter and enclosure for other countries csv standards
-        $delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
-        $enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
-
-        $delimiter_esc = preg_quote($delimiter, '/');
-        $enclosure_esc = preg_quote($enclosure, '/');
-
-        $output = array();
-        foreach ($row as $field_value) {
-            if (is_object($field_value) || is_array($field_value)) {
-                $field_value = serialize($field_value);
-            }
-            if ($field_value === null && $mysql_null) {
-                $output[] = 'NULL';
-                continue;
-            }
-
-            $output[] = $field_value && preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value)
-                ? ( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure )
-                : $field_value;
-        }
-
-        return  implode($delimiter, $output) . PHP_EOL;
-    }
-
-
-
-    /**
-     * Shortcut for preparing a database result for display
-     * @param EEM_Base $model
-     * @param string $field_name
-     * @param string $raw_db_value
-     * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
-     * @return string
-     */
-    public static function prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true)
-    {
-        $field_obj = $model->field_settings_for($field_name);
-        $value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
-        if ($field_obj instanceof EE_Datetime_Field) {
-            $field_obj->set_date_format(EEH_Export::get_date_format_for_export($field_obj->get_date_format($pretty_schema)), $pretty_schema);
-            $field_obj->set_time_format(EEH_Export::get_time_format_for_export($field_obj->get_time_format($pretty_schema)), $pretty_schema);
-        }
-        if ($pretty_schema === true) {
-            return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
-        } elseif (is_string($pretty_schema)) {
-            return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
-        } else {
-            return $field_obj->prepare_for_get($value_on_model_obj);
-        }
-    }
-
-
-
-    /**
-     * Gets the date format to use in exports. filterable
-     * @param string $current_format
-     * @return string
-     */
-    public static function get_date_format_for_export($current_format = null)
-    {
-        return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format);
-    }
-
-
-
-    /**
-     * Gets the time format we want to use in exports. Filterable
-     * @param string $current_format
-     * @return string
-     */
-    public static function get_time_format_for_export($current_format = null)
-    {
-        return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format);
-    }
+	/**
+	 * Gets the 'normal' column named for fields
+	 * @param EE_Model_Field_Base $field
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public static function get_column_name_for_field(EE_Model_Field_Base $field)
+	{
+		$column_name = wp_specialchars_decode($field->get_nicename(), ENT_QUOTES);
+		if (
+			apply_filters(
+				'FHEE__EEH_Export__get_column_name_for_field__add_field_name',
+				false,
+				$column_name,
+				$field
+			)
+		) {
+			$column_name .= "["
+				. wp_specialchars_decode($field->get_name(), ENT_QUOTES)
+				. "]";
+		}
+		return $column_name;
+	}
+
+
+	/**
+	 * Writes $data to the csv file open in $filehandle. uses the array indices of $data for column headers
+	 *
+	 * @param string $filepath
+	 * @param array  $data                  2D array,first numerically-indexed,
+	 *                                      and next-level-down preferably indexed by string
+	 * @param bool   $write_column_headers  whether or not we should add the keys in the bottom-most array
+	 *                                      as a row for headers in the CSV.
+	 *                                      Eg, if $data looked like:
+	 *                                          array(
+	 *                                              0=>array('EVT_ID'=>1,'EVT_name'=>'monkey'...),
+	 *                                              1=>array(...,...)
+	 *                                          )
+	 * @param bool   $headers_only          if true then we won't print any data, just headers. defaults to false
+	 * @return boolean                      if we successfully wrote to the CSV or not. If there's no $data,
+	 *                                      we consider that a success (because we wrote everything there was...nothing)
+	 * @throws EE_Error
+	 */
+	public static function write_data_array_to_csv(
+		string $filepath,
+		array $data,
+		bool $write_column_headers = true,
+		bool $headers_only = false
+	) {
+		// determine if $data is actually a 2d array
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
+			// make sure top level is numerically indexed,
+			if (EEH_Array::is_associative_array($data)) {
+				throw new EE_Error(sprintf(esc_html__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data))));
+			}
+			$new_file_contents = '';
+			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
+			// now, is the last item in the top-level array of $data an associative or numeric array?
+			if ($write_column_headers && EEH_Array::is_associative_array($item_in_top_level_array)) {
+				// its associative, so we want to output its keys as column headers
+				$keys = array_keys($item_in_top_level_array);
+				$new_file_contents .=  EEH_Export::get_csv_row($keys);
+				if ($headers_only) {
+					return EEH_File::write_to_file(
+						$filepath,
+						EEH_File::get_file_contents($filepath) . $new_file_contents
+					);
+				}
+			}
+			// start writing data
+			foreach ($data as $data_row) {
+				$new_row = EEH_Export::get_csv_row($data_row);
+				$new_file_contents .= $new_row ?: '';
+			}
+			return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath) . $new_file_contents);
+		}
+		// no data TO write... so we can assume that's a success
+		return true;
+	}
+
+
+
+	 /**
+	  *
+	  *  Writes a row to the csv file
+	  *  @param array $row - individual row of csv data
+	  *  @param string $delimiter - csv delimiter
+	  *  @param string $enclosure - csv enclosure
+	  *  @param bool $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
+	  *  @return string of text for teh csv file
+	  */
+	public static function get_csv_row(array $row, $delimiter = ',', $enclosure = '"', $mysql_null = false)
+	{
+		// Allow user to filter the csv delimiter and enclosure for other countries csv standards
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
+
+		$delimiter_esc = preg_quote($delimiter, '/');
+		$enclosure_esc = preg_quote($enclosure, '/');
+
+		$output = array();
+		foreach ($row as $field_value) {
+			if (is_object($field_value) || is_array($field_value)) {
+				$field_value = serialize($field_value);
+			}
+			if ($field_value === null && $mysql_null) {
+				$output[] = 'NULL';
+				continue;
+			}
+
+			$output[] = $field_value && preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value)
+				? ( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure )
+				: $field_value;
+		}
+
+		return  implode($delimiter, $output) . PHP_EOL;
+	}
+
+
+
+	/**
+	 * Shortcut for preparing a database result for display
+	 * @param EEM_Base $model
+	 * @param string $field_name
+	 * @param string $raw_db_value
+	 * @param boolean|string $pretty_schema true to display pretty, a string to use a specific "Schema", or false to NOT display pretty
+	 * @return string
+	 */
+	public static function prepare_value_from_db_for_display($model, $field_name, $raw_db_value, $pretty_schema = true)
+	{
+		$field_obj = $model->field_settings_for($field_name);
+		$value_on_model_obj = $field_obj->prepare_for_set_from_db($raw_db_value);
+		if ($field_obj instanceof EE_Datetime_Field) {
+			$field_obj->set_date_format(EEH_Export::get_date_format_for_export($field_obj->get_date_format($pretty_schema)), $pretty_schema);
+			$field_obj->set_time_format(EEH_Export::get_time_format_for_export($field_obj->get_time_format($pretty_schema)), $pretty_schema);
+		}
+		if ($pretty_schema === true) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj);
+		} elseif (is_string($pretty_schema)) {
+			return $field_obj->prepare_for_pretty_echoing($value_on_model_obj, $pretty_schema);
+		} else {
+			return $field_obj->prepare_for_get($value_on_model_obj);
+		}
+	}
+
+
+
+	/**
+	 * Gets the date format to use in exports. filterable
+	 * @param string $current_format
+	 * @return string
+	 */
+	public static function get_date_format_for_export($current_format = null)
+	{
+		return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format);
+	}
+
+
+
+	/**
+	 * Gets the time format we want to use in exports. Filterable
+	 * @param string $current_format
+	 * @return string
+	 */
+	public static function get_time_format_for_export($current_format = null)
+	{
+		return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format);
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -74,11 +74,11 @@ 
             if ($write_column_headers && EEH_Array::is_associative_array($item_in_top_level_array)) {
                 // its associative, so we want to output its keys as column headers
                 $keys = array_keys($item_in_top_level_array);
-                $new_file_contents .=  EEH_Export::get_csv_row($keys);
+                $new_file_contents .= EEH_Export::get_csv_row($keys);
                 if ($headers_only) {
                     return EEH_File::write_to_file(
                         $filepath,
-                        EEH_File::get_file_contents($filepath) . $new_file_contents
+                        EEH_File::get_file_contents($filepath).$new_file_contents
                     );
                 }
             }
@@ -87,7 +87,7 @@ 
                 $new_row = EEH_Export::get_csv_row($data_row);
                 $new_file_contents .= $new_row ?: '';
             }
-            return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath) . $new_file_contents);
+            return EEH_File::write_to_file($filepath, EEH_File::get_file_contents($filepath).$new_file_contents);
         }
         // no data TO write... so we can assume that's a success
         return true;
@@ -124,11 +124,11 @@ 
             }
 
             $output[] = $field_value && preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value)
-                ? ( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure )
+                ? ($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure)
                 : $field_value;
         }
 
-        return  implode($delimiter, $output) . PHP_EOL;
+        return  implode($delimiter, $output).PHP_EOL;
     }
 
 

core/helpers/EEH_Template.helper.php

Indentation +924 added lines, -924 removed lines

@@ -7,36 +7,36 @@ 
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 if (! function_exists('espresso_get_template_part')) {
-    /**
-     * espresso_get_template_part
-     * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
-     * so not a very useful function at all except that it adds familiarity PLUS filtering based off of the entire template part name
-     *
-     * @param string $slug The slug name for the generic template.
-     * @param string $name The name of the specialised template.
-     */
-    function espresso_get_template_part($slug = null, $name = null)
-    {
-        EEH_Template::get_template_part($slug, $name);
-    }
+	/**
+	 * espresso_get_template_part
+	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
+	 * so not a very useful function at all except that it adds familiarity PLUS filtering based off of the entire template part name
+	 *
+	 * @param string $slug The slug name for the generic template.
+	 * @param string $name The name of the specialised template.
+	 */
+	function espresso_get_template_part($slug = null, $name = null)
+	{
+		EEH_Template::get_template_part($slug, $name);
+	}
 }
 
 
 if (! function_exists('espresso_get_object_css_class')) {
-    /**
-     * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
-     *
-     * @param EE_Base_Class $object the EE object the css class is being generated for
-     * @param string        $prefix added to the beginning of the generated class
-     * @param string        $suffix added to the end of the generated class
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_get_object_css_class($object = null, $prefix = '', $suffix = '')
-    {
-        return EEH_Template::get_object_css_class($object, $prefix, $suffix);
-    }
+	/**
+	 * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
+	 *
+	 * @param EE_Base_Class $object the EE object the css class is being generated for
+	 * @param string        $prefix added to the beginning of the generated class
+	 * @param string        $suffix added to the end of the generated class
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_get_object_css_class($object = null, $prefix = '', $suffix = '')
+	{
+		return EEH_Template::get_object_css_class($object, $prefix, $suffix);
+	}
 }
 
 
@@ -50,651 +50,651 @@ 
  */
 class EEH_Template
 {
-    private static $_espresso_themes = [];
-
-
-    /**
-     *    is_espresso_theme - returns TRUE or FALSE on whether the currently active WP theme is an espresso theme
-     *
-     * @return boolean
-     */
-    public static function is_espresso_theme()
-    {
-        return wp_get_theme()->get('TextDomain') === 'event_espresso';
-    }
-
-
-    /**
-     *    load_espresso_theme_functions - if current theme is an espresso theme, or uses ee theme template parts, then
-     *    load its functions.php file ( if not already loaded )
-     *
-     * @return void
-     */
-    public static function load_espresso_theme_functions()
-    {
-        if (! defined('EE_THEME_FUNCTIONS_LOADED')) {
-            if (is_readable(EE_PUBLIC . EE_Config::get_current_theme() . '/functions.php')) {
-                require_once(EE_PUBLIC . EE_Config::get_current_theme() . '/functions.php');
-            }
-        }
-    }
-
-
-    /**
-     *    get_espresso_themes - returns an array of Espresso Child themes located in the /templates/ directory
-     *
-     * @return array
-     */
-    public static function get_espresso_themes()
-    {
-        if (empty(EEH_Template::$_espresso_themes)) {
-            $espresso_themes = glob(EE_PUBLIC . '*', GLOB_ONLYDIR);
-            if (empty($espresso_themes)) {
-                return [];
-            }
-            if (($key = array_search('global_assets', $espresso_themes)) !== false) {
-                unset($espresso_themes[ $key ]);
-            }
-            EEH_Template::$_espresso_themes = [];
-            foreach ($espresso_themes as $espresso_theme) {
-                EEH_Template::$_espresso_themes[ basename($espresso_theme) ] = $espresso_theme;
-            }
-        }
-        return EEH_Template::$_espresso_themes;
-    }
-
-
-    /**
-     * EEH_Template::get_template_part
-     * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead,
-     * and doesn't add base versions of files so not a very useful function at all except that it adds familiarity PLUS
-     * filtering based off of the entire template part name
-     *
-     * @param string $slug The slug name for the generic template.
-     * @param string $name The name of the specialised template.
-     * @param array  $template_args
-     * @param bool   $return_string
-     * @return string        the html output for the formatted money value
-     */
-    public static function get_template_part(
-        $slug = null,
-        $name = null,
-        $template_args = [],
-        $return_string = false
-    ) {
-        do_action("get_template_part_{$slug}-{$name}", $slug, $name);
-        $templates = [];
-        $name      = (string) $name;
-        if ($name != '') {
-            $templates[] = "{$slug}-{$name}.php";
-        }
-        // allow template parts to be turned off via something like:
-        // add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
-        if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", true)) {
-            return EEH_Template::locate_template($templates, $template_args, true, $return_string);
-        }
-        return '';
-    }
-
-
-    /**
-     *    locate_template
-     *    locate a template file by looking in the following places, in the following order:
-     *        <server path up to>/wp-content/themes/<current active WordPress theme>/
-     *        <assumed full absolute server path>
-     *        <server path up to>/wp-content/uploads/espresso/templates/<current EE theme>/
-     *        <server path up to>/wp-content/uploads/espresso/templates/
-     *        <server path up to>/wp-content/plugins/<EE4 folder>/public/<current EE theme>/
-     *        <server path up to>/wp-content/plugins/<EE4 folder>/core/templates/<current EE theme>/
-     *        <server path up to>/wp-content/plugins/<EE4 folder>/
-     *    as soon as the template is found in one of these locations, it will be returned or loaded
-     *        Example:
-     *          You are using the WordPress Twenty Sixteen theme,
-     *        and you want to customize the "some-event.template.php" template,
-     *          which is located in the "/relative/path/to/" folder relative to the main EE plugin folder.
-     *          Assuming WP is installed on your server in the "/home/public_html/" folder,
-     *        EEH_Template::locate_template() will look at the following paths in order until the template is found:
-     *        /home/public_html/wp-content/themes/twentysixteen/some-event.template.php
-     *        /relative/path/to/some-event.template.php
-     *        /home/public_html/wp-content/uploads/espresso/templates/Espresso_Arabica_2014/relative/path/to/some-event.template.php
-     *        /home/public_html/wp-content/uploads/espresso/templates/relative/path/to/some-event.template.php
-     *        /home/public_html/wp-content/plugins/event-espresso-core-reg/public/Espresso_Arabica_2014/relative/path/to/some-event.template.php
-     *        /home/public_html/wp-content/plugins/event-espresso-core-reg/core/templates/Espresso_Arabica_2014/relative/path/to/some-event.template.php
-     *        /home/public_html/wp-content/plugins/event-espresso-core-reg/relative/path/to/some-event.template.php
-     *          Had you passed an absolute path to your template that was in some other location,
-     *        ie: "/absolute/path/to/some-event.template.php"
-     *          then the search would have been :
-     *        /home/public_html/wp-content/themes/twentysixteen/some-event.template.php
-     *        /absolute/path/to/some-event.template.php
-     *          and stopped there upon finding it in the second location
-     *
-     * @param array|string $templates       array of template file names including extension (or just a single string)
-     * @param array        $template_args   an array of arguments to be extracted for use in the template
-     * @param boolean      $load            whether to pass the located template path on to the
-     *                                      EEH_Template::display_template() method or simply return it
-     * @param boolean      $return_string   whether to send output immediately to screen, or capture and return as a
-     *                                      string
-     * @param boolean      $check_if_custom If TRUE, this flags this method to return boolean for whether this will
-     *                                      generate a custom template or not. Used in places where you don't actually
-     *                                      load the template, you just want to know if there's a custom version of it.
-     * @return mixed
-     * @throws DomainException
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public static function locate_template(
-        $templates = [],
-        array $template_args = [],
-        bool $load = true,
-        bool $return_string = true,
-        bool $check_if_custom = false
-    ) {
-        // first use WP locate_template to check for template in the current theme folder
-        $template_path = locate_template($templates);
-
-        if ($check_if_custom && ! empty($template_path)) {
-            return true;
-        }
-
-        // not in the theme
-        if (empty($template_path)) {
-            // not even a template to look for ?
-            if (empty($templates)) {
-                $loader = LoaderFactory::getLoader();
-                /** @var RequestInterface $request */
-                $request = $loader->getShared(RequestInterface::class);
-                // get post_type
-                $post_type = $request->getRequestParam('post_type');
-                /** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_types */
-                $custom_post_types = $loader->getShared(
-                    'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
-                );
-                // get array of EE Custom Post Types
-                $EE_CPTs = $custom_post_types->getDefinitions();
-                // build template name based on request
-                if (isset($EE_CPTs[ $post_type ])) {
-                    $archive_or_single = is_archive() ? 'archive' : '';
-                    $archive_or_single = is_single() ? 'single' : $archive_or_single;
-                    $templates         = $archive_or_single . '-' . $post_type . '.php';
-                }
-            }
-            // currently active EE template theme
-            $current_theme = EE_Config::get_current_theme();
-
-            // array of paths to folders that may contain templates
-            $template_folder_paths = [
-                // first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-                EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
-                // then in the root of the /wp-content/uploads/espresso/templates/ folder
-                EVENT_ESPRESSO_TEMPLATE_DIR,
-            ];
-
-            // add core plugin folders for checking only if we're not $check_if_custom
-            if (! $check_if_custom) {
-                $core_paths            = [
-                    // in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-                    EE_PUBLIC . $current_theme,
-                    // in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-                    EE_TEMPLATES . $current_theme,
-                    // or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
-                    EE_PLUGIN_DIR_PATH,
-                ];
-                $template_folder_paths = array_merge($template_folder_paths, $core_paths);
-            }
-
-            // now filter that array
-            $template_folder_paths = apply_filters(
-                'FHEE__EEH_Template__locate_template__template_folder_paths',
-                $template_folder_paths
-            );
-            $templates             = is_array($templates) ? $templates : [$templates];
-            $template_folder_paths =
-                is_array($template_folder_paths) ? $template_folder_paths : [$template_folder_paths];
-            // array to hold all possible template paths
-            $full_template_paths = [];
-            $file_name           = '';
-
-            // loop through $templates
-            foreach ($templates as $template) {
-                // normalize directory separators
-                $template                      = EEH_File::standardise_directory_separators($template);
-                $file_name                     = basename($template);
-                $template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
-                // while looping through all template folder paths
-                foreach ($template_folder_paths as $template_folder_path) {
-                    // normalize directory separators
-                    $template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
-                    // determine if any common base path exists between the two paths
-                    $common_base_path = EEH_Template::_find_common_base_path(
-                        [$template_folder_path, $template_path_minus_file_name]
-                    );
-                    if ($common_base_path !== '') {
-                        // both paths have a common base, so just tack the filename onto our search path
-                        $resolved_path = EEH_File::end_with_directory_separator($template_folder_path) . $file_name;
-                    } else {
-                        // no common base path, so let's just concatenate
-                        $resolved_path = EEH_File::end_with_directory_separator($template_folder_path) . $template;
-                    }
-                    // build up our template locations array by adding our resolved paths
-                    $full_template_paths[] = $resolved_path;
-                }
-                // if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
-                array_unshift($full_template_paths, $template);
-                // path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-                array_unshift($full_template_paths, get_stylesheet_directory() . '/' . $file_name);
-            }
-            // filter final array of full template paths
-            $full_template_paths = apply_filters(
-                'FHEE__EEH_Template__locate_template__full_template_paths',
-                $full_template_paths,
-                $file_name
-            );
-            // now loop through our final array of template location paths and check each location
-            foreach ((array) $full_template_paths as $full_template_path) {
-                if (is_readable($full_template_path)) {
-                    $template_path = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $full_template_path);
-                    break;
-                }
-            }
-        }
-
-        // Display a deprecated notice if the template file is located in the WordPress uploads directory
-        if (strpos($template_path, 'wp-content/uploads/espresso') !== false) {
-            EE_Error::doing_it_wrong(
-                __CLASS__,
-                esc_html__(
-                    'The use of the WordPress uploads directory as a location to override template files has been deprecated.',
-                    'event_espresso'
-                ),
-                '5.0.0'
-            );
-        }
-
-        // hook that can be used to display the full template path that will be used
-        do_action('AHEE__EEH_Template__locate_template__full_template_path', $template_path);
-
-        // if we got it and you want to see it...
-        if ($template_path && $load && ! $check_if_custom) {
-            if ($return_string) {
-                return EEH_Template::display_template($template_path, $template_args, true);
-            }
-            EEH_Template::display_template($template_path, $template_args);
-        }
-        return $check_if_custom && ! empty($template_path) ? true : $template_path;
-    }
-
-
-    /**
-     * _find_common_base_path
-     * given two paths, this determines if there is a common base path between the two
-     *
-     * @param array $paths
-     * @return string
-     */
-    protected static function _find_common_base_path($paths)
-    {
-        $last_offset      = 0;
-        $common_base_path = '';
-        while (($index = strpos($paths[0], '/', $last_offset)) !== false) {
-            $dir_length = $index - $last_offset + 1;
-            $directory  = substr($paths[0], $last_offset, $dir_length);
-            foreach ($paths as $path) {
-                if (substr($path, $last_offset, $dir_length) != $directory) {
-                    return $common_base_path;
-                }
-            }
-            $common_base_path .= $directory;
-            $last_offset      = $index + 1;
-        }
-        return substr($common_base_path, 0, -1);
-    }
-
-
-    /**
-     * load and display a template
-     *
-     * @param bool|string $template_path    server path to the file to be loaded, including file name and extension
-     * @param array       $template_args    an array of arguments to be extracted for use in the template
-     * @param boolean     $return_string    whether to send output immediately to screen, or capture and return as a
-     *                                      string
-     * @param bool        $throw_exceptions if set to true, will throw an exception if the template is either
-     *                                      not found or is not readable
-     * @return string
-     * @throws DomainException
-     */
-    public static function display_template(
-        $template_path = false,
-        $template_args = [],
-        $return_string = false,
-        $throw_exceptions = false
-    ) {
-        /**
-         * These two filters are intended for last minute changes to templates being loaded and/or template arg
-         * modifications.  NOTE... modifying these things can cause breakage as most templates running through
-         * the display_template method are templates we DON'T want modified (usually because of js
-         * dependencies etc).  So unless you know what you are doing, do NOT filter templates or template args
-         * using this.
-         *
-         * @since 4.6.0
-         */
-        $template_path = (string) apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
-        $template_args = (array) apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
-
-        // you gimme nuttin - YOU GET NUTTIN !!
-        if (! $template_path || ! is_readable($template_path)) {
-            // ignore whether template is accessible ?
-            if ($throw_exceptions) {
-                throw new DomainException(
-                    esc_html__('Invalid, unreadable, or missing file.', 'event_espresso')
-                );
-            }
-            return '';
-        }
-        // if $template_args are not in an array, then make it so
-        if (! is_array($template_args) && ! is_object($template_args)) {
-            $template_args = [$template_args];
-        }
-        extract($template_args, EXTR_SKIP);
-
-        if ($return_string) {
-            // because we want to return a string, we are going to capture the output
-            ob_start();
-            include($template_path);
-            return ob_get_clean();
-        }
-        include($template_path);
-        return '';
-    }
-
-
-    /**
-     * get_object_css_class - attempts to generate a css class based on the type of EE object passed
-     *
-     * @param EE_Base_Class $object the EE object the css class is being generated for
-     * @param string        $prefix added to the beginning of the generated class
-     * @param string        $suffix added to the end of the generated class
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    public static function get_object_css_class($object = null, $prefix = '', $suffix = '')
-    {
-        // in the beginning...
-        $prefix = ! empty($prefix) ? rtrim($prefix, '-') . '-' : '';
-        // da muddle
-        $class = '';
-        // the end
-        $suffix = ! empty($suffix) ? '-' . ltrim($suffix, '-') : '';
-        // is the passed object an EE object ?
-        if ($object instanceof EE_Base_Class) {
-            // grab the exact type of object
-            $obj_class = get_class($object);
-            // depending on the type of object...
-            switch ($obj_class) {
-                // no specifics just yet...
-                default:
-                    $class = strtolower(str_replace('_', '-', $obj_class));
-                    $class .= method_exists($obj_class, 'name') ? '-' . sanitize_title($object->name()) : '';
-            }
-        }
-        return $prefix . $class . $suffix;
-    }
-
-
-    /**
-     * EEH_Template::format_currency
-     * This helper takes a raw float value and formats it according to the default config country currency settings, or
-     * the country currency settings from the supplied country ISO code
-     *
-     * @param float   $amount       raw money value
-     * @param boolean $return_raw   whether to return the formatted float value only with no currency sign or code
-     * @param boolean $display_code whether to display the country code (USD). Default = TRUE
-     * @param string  $CNT_ISO      2 letter ISO code for a country
-     * @param string  $cur_code_span_class
-     * @return string        the html output for the formatted money value
-     */
-    public static function format_currency(
-        $amount = null,
-        $return_raw = false,
-        $display_code = true,
-        $CNT_ISO = '',
-        $cur_code_span_class = 'currency-code'
-    ) {
-        // ensure amount was received
-        if ($amount === null) {
-            $msg = esc_html__('In order to format currency, an amount needs to be passed.', 'event_espresso');
-            EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
-            return '';
-        }
-        // ensure amount is float
-        $amount  = (float) apply_filters('FHEE__EEH_Template__format_currency__raw_amount', (float) $amount);
-        $CNT_ISO = apply_filters('FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount);
-        // filter raw amount (allows 0.00 to be changed to "free" for example)
-        $amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
-        // still a number, or was amount converted to a string like "free" ?
-        if (! is_float($amount_formatted)) {
-            return esc_html($amount_formatted);
-        }
-        try {
-            // was a country ISO code passed ? if so generate currency config object for that country
-            $mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : null;
-        } catch (Exception $e) {
-            // eat exception
-            $mny = null;
-        }
-        // verify results
-        if (! $mny instanceof EE_Currency_Config) {
-            // set default config country currency settings
-            $mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config
-                ? EE_Registry::instance()->CFG->currency
-                : new EE_Currency_Config();
-        }
-        // format float
-        $amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
-        // add formatting ?
-        if (! $return_raw) {
-            // add currency sign
-            if ($mny->sign_b4) {
-                if ($amount >= 0) {
-                    $amount_formatted = $mny->sign . $amount_formatted;
-                } else {
-                    $amount_formatted = '-' . $mny->sign . str_replace('-', '', $amount_formatted);
-                }
-            } else {
-                $amount_formatted = $amount_formatted . $mny->sign;
-            }
-
-            // filter to allow global setting of display_code
-            $display_code = (bool) apply_filters(
-                'FHEE__EEH_Template__format_currency__display_code',
-                $display_code
-            );
-
-            // add currency code ?
-            $amount_formatted = $display_code
-                ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">' . $mny->code . '</span>'
-                : $amount_formatted;
-        }
-        // filter results
-        $amount_formatted = apply_filters(
-            'FHEE__EEH_Template__format_currency__amount_formatted',
-            $amount_formatted,
-            $mny,
-            $return_raw
-        );
-        // clean up vars
-        unset($mny);
-        // return formatted currency amount
-        return $amount_formatted;
-    }
-
-
-    /**
-     * This function is used for outputting the localized label for a given status id in the schema requested (and
-     * possibly plural).  The intended use of this function is only for cases where wanting a label outside of a
-     * related status model or model object (i.e. in documentation etc.)
-     *
-     * @param string  $status_id  Status ID matching a registered status in the esp_status table.  If there is no
-     *                            match, then 'Unknown' will be returned.
-     * @param boolean $plural     Whether to return plural or not
-     * @param string  $schema     'UPPER', 'lower', or 'Sentence'
-     * @return string             The localized label for the status id.
-     * @throws EE_Error
-     */
-    public static function pretty_status($status_id, $plural = false, $schema = 'upper')
-    {
-        $status = EEM_Status::instance()->localized_status(
-            [$status_id => esc_html__('unknown', 'event_espresso')],
-            $plural,
-            $schema
-        );
-        return $status[ $status_id ];
-    }
-
-
-    /**
-     * This helper just returns a button or link for the given parameters
-     *
-     * @param string $url   the url for the link, note that `esc_url` will be called on it
-     * @param string $label What is the label you want displayed for the button
-     * @param string $class what class is used for the button (defaults to 'button--primary')
-     * @param string $icon
-     * @param string $title
-     * @return string the html output for the button
-     */
-    public static function get_button_or_link($url, $label, $class = 'button button--primary', $icon = '', $title = '')
-    {
-        $icon_html = '';
-        if (! empty($icon)) {
-            $dashicons = preg_split("(ee-icon |dashicons )", $icon);
-            $dashicons = array_filter($dashicons);
-            $count     = count($dashicons);
-            $icon_html .= $count > 1 ? '<span class="ee-composite-dashicon">' : '';
-            foreach ($dashicons as $dashicon) {
-                $type      = strpos($dashicon, 'ee-icon') !== false ? 'ee-icon ' : 'dashicons ';
-                $icon_html .= '<span class="' . $type . $dashicon . '"></span>';
-            }
-            $icon_html .= $count > 1 ? '</span>' : '';
-        }
-        // sanitize & escape
-        $id    = sanitize_title_with_dashes($label);
-        $url   = esc_url_raw($url);
-        $class = esc_attr($class);
-        $title = esc_attr($title);
-        $class .= $title ? ' ee-aria-tooltip' : '';
-        $title = $title ? " aria-label='{$title}'" : '';
-        $label = esc_html($label);
-        return "<a id='{$id}' href='{$url}' class='{$class}'{$title}>{$icon_html}{$label}</a>";
-    }
-
-
-    /**
-     * This returns a generated link that will load the related help tab on admin pages.
-     *
-     * @param string      $help_tab_id the id for the connected help tab
-     * @param bool|string $page        The page identifier for the page the help tab is on
-     * @param bool|string $action      The action (route) for the admin page the help tab is on.
-     * @param bool|string $icon_style  (optional) include css class for the style you want to use for the help icon.
-     * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
-     * @return string              generated link
-     */
-    public static function get_help_tab_link(
-        $help_tab_id,
-        $page = false,
-        $action = false,
-        $icon_style = false,
-        $help_text = false
-    ) {
-        $allowedtags = AllowedTags::getAllowedTags();
-        /** @var RequestInterface $request */
-        $request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
-        $page    = $page ?: $request->getRequestParam('page', '', 'key');
-        $action  = $action ?: $request->getRequestParam('action', 'default', 'key');
-
-
-        $help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
-        $icon         = ! $icon_style ? 'dashicons-editor-help' : $icon_style;
-        $help_text    = ! $help_text ? '' : $help_text;
-        return '
+	private static $_espresso_themes = [];
+
+
+	/**
+	 *    is_espresso_theme - returns TRUE or FALSE on whether the currently active WP theme is an espresso theme
+	 *
+	 * @return boolean
+	 */
+	public static function is_espresso_theme()
+	{
+		return wp_get_theme()->get('TextDomain') === 'event_espresso';
+	}
+
+
+	/**
+	 *    load_espresso_theme_functions - if current theme is an espresso theme, or uses ee theme template parts, then
+	 *    load its functions.php file ( if not already loaded )
+	 *
+	 * @return void
+	 */
+	public static function load_espresso_theme_functions()
+	{
+		if (! defined('EE_THEME_FUNCTIONS_LOADED')) {
+			if (is_readable(EE_PUBLIC . EE_Config::get_current_theme() . '/functions.php')) {
+				require_once(EE_PUBLIC . EE_Config::get_current_theme() . '/functions.php');
+			}
+		}
+	}
+
+
+	/**
+	 *    get_espresso_themes - returns an array of Espresso Child themes located in the /templates/ directory
+	 *
+	 * @return array
+	 */
+	public static function get_espresso_themes()
+	{
+		if (empty(EEH_Template::$_espresso_themes)) {
+			$espresso_themes = glob(EE_PUBLIC . '*', GLOB_ONLYDIR);
+			if (empty($espresso_themes)) {
+				return [];
+			}
+			if (($key = array_search('global_assets', $espresso_themes)) !== false) {
+				unset($espresso_themes[ $key ]);
+			}
+			EEH_Template::$_espresso_themes = [];
+			foreach ($espresso_themes as $espresso_theme) {
+				EEH_Template::$_espresso_themes[ basename($espresso_theme) ] = $espresso_theme;
+			}
+		}
+		return EEH_Template::$_espresso_themes;
+	}
+
+
+	/**
+	 * EEH_Template::get_template_part
+	 * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead,
+	 * and doesn't add base versions of files so not a very useful function at all except that it adds familiarity PLUS
+	 * filtering based off of the entire template part name
+	 *
+	 * @param string $slug The slug name for the generic template.
+	 * @param string $name The name of the specialised template.
+	 * @param array  $template_args
+	 * @param bool   $return_string
+	 * @return string        the html output for the formatted money value
+	 */
+	public static function get_template_part(
+		$slug = null,
+		$name = null,
+		$template_args = [],
+		$return_string = false
+	) {
+		do_action("get_template_part_{$slug}-{$name}", $slug, $name);
+		$templates = [];
+		$name      = (string) $name;
+		if ($name != '') {
+			$templates[] = "{$slug}-{$name}.php";
+		}
+		// allow template parts to be turned off via something like:
+		// add_filter( 'FHEE__content_espresso_events_tickets_template__display_datetimes', '__return_false' );
+		if (apply_filters("FHEE__EEH_Template__get_template_part__display__{$slug}_{$name}", true)) {
+			return EEH_Template::locate_template($templates, $template_args, true, $return_string);
+		}
+		return '';
+	}
+
+
+	/**
+	 *    locate_template
+	 *    locate a template file by looking in the following places, in the following order:
+	 *        <server path up to>/wp-content/themes/<current active WordPress theme>/
+	 *        <assumed full absolute server path>
+	 *        <server path up to>/wp-content/uploads/espresso/templates/<current EE theme>/
+	 *        <server path up to>/wp-content/uploads/espresso/templates/
+	 *        <server path up to>/wp-content/plugins/<EE4 folder>/public/<current EE theme>/
+	 *        <server path up to>/wp-content/plugins/<EE4 folder>/core/templates/<current EE theme>/
+	 *        <server path up to>/wp-content/plugins/<EE4 folder>/
+	 *    as soon as the template is found in one of these locations, it will be returned or loaded
+	 *        Example:
+	 *          You are using the WordPress Twenty Sixteen theme,
+	 *        and you want to customize the "some-event.template.php" template,
+	 *          which is located in the "/relative/path/to/" folder relative to the main EE plugin folder.
+	 *          Assuming WP is installed on your server in the "/home/public_html/" folder,
+	 *        EEH_Template::locate_template() will look at the following paths in order until the template is found:
+	 *        /home/public_html/wp-content/themes/twentysixteen/some-event.template.php
+	 *        /relative/path/to/some-event.template.php
+	 *        /home/public_html/wp-content/uploads/espresso/templates/Espresso_Arabica_2014/relative/path/to/some-event.template.php
+	 *        /home/public_html/wp-content/uploads/espresso/templates/relative/path/to/some-event.template.php
+	 *        /home/public_html/wp-content/plugins/event-espresso-core-reg/public/Espresso_Arabica_2014/relative/path/to/some-event.template.php
+	 *        /home/public_html/wp-content/plugins/event-espresso-core-reg/core/templates/Espresso_Arabica_2014/relative/path/to/some-event.template.php
+	 *        /home/public_html/wp-content/plugins/event-espresso-core-reg/relative/path/to/some-event.template.php
+	 *          Had you passed an absolute path to your template that was in some other location,
+	 *        ie: "/absolute/path/to/some-event.template.php"
+	 *          then the search would have been :
+	 *        /home/public_html/wp-content/themes/twentysixteen/some-event.template.php
+	 *        /absolute/path/to/some-event.template.php
+	 *          and stopped there upon finding it in the second location
+	 *
+	 * @param array|string $templates       array of template file names including extension (or just a single string)
+	 * @param array        $template_args   an array of arguments to be extracted for use in the template
+	 * @param boolean      $load            whether to pass the located template path on to the
+	 *                                      EEH_Template::display_template() method or simply return it
+	 * @param boolean      $return_string   whether to send output immediately to screen, or capture and return as a
+	 *                                      string
+	 * @param boolean      $check_if_custom If TRUE, this flags this method to return boolean for whether this will
+	 *                                      generate a custom template or not. Used in places where you don't actually
+	 *                                      load the template, you just want to know if there's a custom version of it.
+	 * @return mixed
+	 * @throws DomainException
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public static function locate_template(
+		$templates = [],
+		array $template_args = [],
+		bool $load = true,
+		bool $return_string = true,
+		bool $check_if_custom = false
+	) {
+		// first use WP locate_template to check for template in the current theme folder
+		$template_path = locate_template($templates);
+
+		if ($check_if_custom && ! empty($template_path)) {
+			return true;
+		}
+
+		// not in the theme
+		if (empty($template_path)) {
+			// not even a template to look for ?
+			if (empty($templates)) {
+				$loader = LoaderFactory::getLoader();
+				/** @var RequestInterface $request */
+				$request = $loader->getShared(RequestInterface::class);
+				// get post_type
+				$post_type = $request->getRequestParam('post_type');
+				/** @var EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions $custom_post_types */
+				$custom_post_types = $loader->getShared(
+					'EventEspresso\core\domain\entities\custom_post_types\CustomPostTypeDefinitions'
+				);
+				// get array of EE Custom Post Types
+				$EE_CPTs = $custom_post_types->getDefinitions();
+				// build template name based on request
+				if (isset($EE_CPTs[ $post_type ])) {
+					$archive_or_single = is_archive() ? 'archive' : '';
+					$archive_or_single = is_single() ? 'single' : $archive_or_single;
+					$templates         = $archive_or_single . '-' . $post_type . '.php';
+				}
+			}
+			// currently active EE template theme
+			$current_theme = EE_Config::get_current_theme();
+
+			// array of paths to folders that may contain templates
+			$template_folder_paths = [
+				// first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
+				EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+				// then in the root of the /wp-content/uploads/espresso/templates/ folder
+				EVENT_ESPRESSO_TEMPLATE_DIR,
+			];
+
+			// add core plugin folders for checking only if we're not $check_if_custom
+			if (! $check_if_custom) {
+				$core_paths            = [
+					// in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
+					EE_PUBLIC . $current_theme,
+					// in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
+					EE_TEMPLATES . $current_theme,
+					// or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
+					EE_PLUGIN_DIR_PATH,
+				];
+				$template_folder_paths = array_merge($template_folder_paths, $core_paths);
+			}
+
+			// now filter that array
+			$template_folder_paths = apply_filters(
+				'FHEE__EEH_Template__locate_template__template_folder_paths',
+				$template_folder_paths
+			);
+			$templates             = is_array($templates) ? $templates : [$templates];
+			$template_folder_paths =
+				is_array($template_folder_paths) ? $template_folder_paths : [$template_folder_paths];
+			// array to hold all possible template paths
+			$full_template_paths = [];
+			$file_name           = '';
+
+			// loop through $templates
+			foreach ($templates as $template) {
+				// normalize directory separators
+				$template                      = EEH_File::standardise_directory_separators($template);
+				$file_name                     = basename($template);
+				$template_path_minus_file_name = substr($template, 0, (strlen($file_name) * -1));
+				// while looping through all template folder paths
+				foreach ($template_folder_paths as $template_folder_path) {
+					// normalize directory separators
+					$template_folder_path = EEH_File::standardise_directory_separators($template_folder_path);
+					// determine if any common base path exists between the two paths
+					$common_base_path = EEH_Template::_find_common_base_path(
+						[$template_folder_path, $template_path_minus_file_name]
+					);
+					if ($common_base_path !== '') {
+						// both paths have a common base, so just tack the filename onto our search path
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path) . $file_name;
+					} else {
+						// no common base path, so let's just concatenate
+						$resolved_path = EEH_File::end_with_directory_separator($template_folder_path) . $template;
+					}
+					// build up our template locations array by adding our resolved paths
+					$full_template_paths[] = $resolved_path;
+				}
+				// if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
+				array_unshift($full_template_paths, $template);
+				// path to the directory of the current theme: /wp-content/themes/(current WP theme)/
+				array_unshift($full_template_paths, get_stylesheet_directory() . '/' . $file_name);
+			}
+			// filter final array of full template paths
+			$full_template_paths = apply_filters(
+				'FHEE__EEH_Template__locate_template__full_template_paths',
+				$full_template_paths,
+				$file_name
+			);
+			// now loop through our final array of template location paths and check each location
+			foreach ((array) $full_template_paths as $full_template_path) {
+				if (is_readable($full_template_path)) {
+					$template_path = str_replace(['\\', '/'], DIRECTORY_SEPARATOR, $full_template_path);
+					break;
+				}
+			}
+		}
+
+		// Display a deprecated notice if the template file is located in the WordPress uploads directory
+		if (strpos($template_path, 'wp-content/uploads/espresso') !== false) {
+			EE_Error::doing_it_wrong(
+				__CLASS__,
+				esc_html__(
+					'The use of the WordPress uploads directory as a location to override template files has been deprecated.',
+					'event_espresso'
+				),
+				'5.0.0'
+			);
+		}
+
+		// hook that can be used to display the full template path that will be used
+		do_action('AHEE__EEH_Template__locate_template__full_template_path', $template_path);
+
+		// if we got it and you want to see it...
+		if ($template_path && $load && ! $check_if_custom) {
+			if ($return_string) {
+				return EEH_Template::display_template($template_path, $template_args, true);
+			}
+			EEH_Template::display_template($template_path, $template_args);
+		}
+		return $check_if_custom && ! empty($template_path) ? true : $template_path;
+	}
+
+
+	/**
+	 * _find_common_base_path
+	 * given two paths, this determines if there is a common base path between the two
+	 *
+	 * @param array $paths
+	 * @return string
+	 */
+	protected static function _find_common_base_path($paths)
+	{
+		$last_offset      = 0;
+		$common_base_path = '';
+		while (($index = strpos($paths[0], '/', $last_offset)) !== false) {
+			$dir_length = $index - $last_offset + 1;
+			$directory  = substr($paths[0], $last_offset, $dir_length);
+			foreach ($paths as $path) {
+				if (substr($path, $last_offset, $dir_length) != $directory) {
+					return $common_base_path;
+				}
+			}
+			$common_base_path .= $directory;
+			$last_offset      = $index + 1;
+		}
+		return substr($common_base_path, 0, -1);
+	}
+
+
+	/**
+	 * load and display a template
+	 *
+	 * @param bool|string $template_path    server path to the file to be loaded, including file name and extension
+	 * @param array       $template_args    an array of arguments to be extracted for use in the template
+	 * @param boolean     $return_string    whether to send output immediately to screen, or capture and return as a
+	 *                                      string
+	 * @param bool        $throw_exceptions if set to true, will throw an exception if the template is either
+	 *                                      not found or is not readable
+	 * @return string
+	 * @throws DomainException
+	 */
+	public static function display_template(
+		$template_path = false,
+		$template_args = [],
+		$return_string = false,
+		$throw_exceptions = false
+	) {
+		/**
+		 * These two filters are intended for last minute changes to templates being loaded and/or template arg
+		 * modifications.  NOTE... modifying these things can cause breakage as most templates running through
+		 * the display_template method are templates we DON'T want modified (usually because of js
+		 * dependencies etc).  So unless you know what you are doing, do NOT filter templates or template args
+		 * using this.
+		 *
+		 * @since 4.6.0
+		 */
+		$template_path = (string) apply_filters('FHEE__EEH_Template__display_template__template_path', $template_path);
+		$template_args = (array) apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
+
+		// you gimme nuttin - YOU GET NUTTIN !!
+		if (! $template_path || ! is_readable($template_path)) {
+			// ignore whether template is accessible ?
+			if ($throw_exceptions) {
+				throw new DomainException(
+					esc_html__('Invalid, unreadable, or missing file.', 'event_espresso')
+				);
+			}
+			return '';
+		}
+		// if $template_args are not in an array, then make it so
+		if (! is_array($template_args) && ! is_object($template_args)) {
+			$template_args = [$template_args];
+		}
+		extract($template_args, EXTR_SKIP);
+
+		if ($return_string) {
+			// because we want to return a string, we are going to capture the output
+			ob_start();
+			include($template_path);
+			return ob_get_clean();
+		}
+		include($template_path);
+		return '';
+	}
+
+
+	/**
+	 * get_object_css_class - attempts to generate a css class based on the type of EE object passed
+	 *
+	 * @param EE_Base_Class $object the EE object the css class is being generated for
+	 * @param string        $prefix added to the beginning of the generated class
+	 * @param string        $suffix added to the end of the generated class
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	public static function get_object_css_class($object = null, $prefix = '', $suffix = '')
+	{
+		// in the beginning...
+		$prefix = ! empty($prefix) ? rtrim($prefix, '-') . '-' : '';
+		// da muddle
+		$class = '';
+		// the end
+		$suffix = ! empty($suffix) ? '-' . ltrim($suffix, '-') : '';
+		// is the passed object an EE object ?
+		if ($object instanceof EE_Base_Class) {
+			// grab the exact type of object
+			$obj_class = get_class($object);
+			// depending on the type of object...
+			switch ($obj_class) {
+				// no specifics just yet...
+				default:
+					$class = strtolower(str_replace('_', '-', $obj_class));
+					$class .= method_exists($obj_class, 'name') ? '-' . sanitize_title($object->name()) : '';
+			}
+		}
+		return $prefix . $class . $suffix;
+	}
+
+
+	/**
+	 * EEH_Template::format_currency
+	 * This helper takes a raw float value and formats it according to the default config country currency settings, or
+	 * the country currency settings from the supplied country ISO code
+	 *
+	 * @param float   $amount       raw money value
+	 * @param boolean $return_raw   whether to return the formatted float value only with no currency sign or code
+	 * @param boolean $display_code whether to display the country code (USD). Default = TRUE
+	 * @param string  $CNT_ISO      2 letter ISO code for a country
+	 * @param string  $cur_code_span_class
+	 * @return string        the html output for the formatted money value
+	 */
+	public static function format_currency(
+		$amount = null,
+		$return_raw = false,
+		$display_code = true,
+		$CNT_ISO = '',
+		$cur_code_span_class = 'currency-code'
+	) {
+		// ensure amount was received
+		if ($amount === null) {
+			$msg = esc_html__('In order to format currency, an amount needs to be passed.', 'event_espresso');
+			EE_Error::add_error($msg, __FILE__, __FUNCTION__, __LINE__);
+			return '';
+		}
+		// ensure amount is float
+		$amount  = (float) apply_filters('FHEE__EEH_Template__format_currency__raw_amount', (float) $amount);
+		$CNT_ISO = apply_filters('FHEE__EEH_Template__format_currency__CNT_ISO', $CNT_ISO, $amount);
+		// filter raw amount (allows 0.00 to be changed to "free" for example)
+		$amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
+		// still a number, or was amount converted to a string like "free" ?
+		if (! is_float($amount_formatted)) {
+			return esc_html($amount_formatted);
+		}
+		try {
+			// was a country ISO code passed ? if so generate currency config object for that country
+			$mny = $CNT_ISO !== '' ? new EE_Currency_Config($CNT_ISO) : null;
+		} catch (Exception $e) {
+			// eat exception
+			$mny = null;
+		}
+		// verify results
+		if (! $mny instanceof EE_Currency_Config) {
+			// set default config country currency settings
+			$mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config
+				? EE_Registry::instance()->CFG->currency
+				: new EE_Currency_Config();
+		}
+		// format float
+		$amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
+		// add formatting ?
+		if (! $return_raw) {
+			// add currency sign
+			if ($mny->sign_b4) {
+				if ($amount >= 0) {
+					$amount_formatted = $mny->sign . $amount_formatted;
+				} else {
+					$amount_formatted = '-' . $mny->sign . str_replace('-', '', $amount_formatted);
+				}
+			} else {
+				$amount_formatted = $amount_formatted . $mny->sign;
+			}
+
+			// filter to allow global setting of display_code
+			$display_code = (bool) apply_filters(
+				'FHEE__EEH_Template__format_currency__display_code',
+				$display_code
+			);
+
+			// add currency code ?
+			$amount_formatted = $display_code
+				? $amount_formatted . ' <span class="' . $cur_code_span_class . '">' . $mny->code . '</span>'
+				: $amount_formatted;
+		}
+		// filter results
+		$amount_formatted = apply_filters(
+			'FHEE__EEH_Template__format_currency__amount_formatted',
+			$amount_formatted,
+			$mny,
+			$return_raw
+		);
+		// clean up vars
+		unset($mny);
+		// return formatted currency amount
+		return $amount_formatted;
+	}
+
+
+	/**
+	 * This function is used for outputting the localized label for a given status id in the schema requested (and
+	 * possibly plural).  The intended use of this function is only for cases where wanting a label outside of a
+	 * related status model or model object (i.e. in documentation etc.)
+	 *
+	 * @param string  $status_id  Status ID matching a registered status in the esp_status table.  If there is no
+	 *                            match, then 'Unknown' will be returned.
+	 * @param boolean $plural     Whether to return plural or not
+	 * @param string  $schema     'UPPER', 'lower', or 'Sentence'
+	 * @return string             The localized label for the status id.
+	 * @throws EE_Error
+	 */
+	public static function pretty_status($status_id, $plural = false, $schema = 'upper')
+	{
+		$status = EEM_Status::instance()->localized_status(
+			[$status_id => esc_html__('unknown', 'event_espresso')],
+			$plural,
+			$schema
+		);
+		return $status[ $status_id ];
+	}
+
+
+	/**
+	 * This helper just returns a button or link for the given parameters
+	 *
+	 * @param string $url   the url for the link, note that `esc_url` will be called on it
+	 * @param string $label What is the label you want displayed for the button
+	 * @param string $class what class is used for the button (defaults to 'button--primary')
+	 * @param string $icon
+	 * @param string $title
+	 * @return string the html output for the button
+	 */
+	public static function get_button_or_link($url, $label, $class = 'button button--primary', $icon = '', $title = '')
+	{
+		$icon_html = '';
+		if (! empty($icon)) {
+			$dashicons = preg_split("(ee-icon |dashicons )", $icon);
+			$dashicons = array_filter($dashicons);
+			$count     = count($dashicons);
+			$icon_html .= $count > 1 ? '<span class="ee-composite-dashicon">' : '';
+			foreach ($dashicons as $dashicon) {
+				$type      = strpos($dashicon, 'ee-icon') !== false ? 'ee-icon ' : 'dashicons ';
+				$icon_html .= '<span class="' . $type . $dashicon . '"></span>';
+			}
+			$icon_html .= $count > 1 ? '</span>' : '';
+		}
+		// sanitize & escape
+		$id    = sanitize_title_with_dashes($label);
+		$url   = esc_url_raw($url);
+		$class = esc_attr($class);
+		$title = esc_attr($title);
+		$class .= $title ? ' ee-aria-tooltip' : '';
+		$title = $title ? " aria-label='{$title}'" : '';
+		$label = esc_html($label);
+		return "<a id='{$id}' href='{$url}' class='{$class}'{$title}>{$icon_html}{$label}</a>";
+	}
+
+
+	/**
+	 * This returns a generated link that will load the related help tab on admin pages.
+	 *
+	 * @param string      $help_tab_id the id for the connected help tab
+	 * @param bool|string $page        The page identifier for the page the help tab is on
+	 * @param bool|string $action      The action (route) for the admin page the help tab is on.
+	 * @param bool|string $icon_style  (optional) include css class for the style you want to use for the help icon.
+	 * @param bool|string $help_text   (optional) send help text you want to use for the link if default not to be used
+	 * @return string              generated link
+	 */
+	public static function get_help_tab_link(
+		$help_tab_id,
+		$page = false,
+		$action = false,
+		$icon_style = false,
+		$help_text = false
+	) {
+		$allowedtags = AllowedTags::getAllowedTags();
+		/** @var RequestInterface $request */
+		$request = LoaderFactory::getLoader()->getShared(RequestInterface::class);
+		$page    = $page ?: $request->getRequestParam('page', '', 'key');
+		$action  = $action ?: $request->getRequestParam('action', 'default', 'key');
+
+
+		$help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
+		$icon         = ! $icon_style ? 'dashicons-editor-help' : $icon_style;
+		$help_text    = ! $help_text ? '' : $help_text;
+		return '
             <a id="' . esc_attr($help_tab_lnk) . '"
                class="espresso-help-tab-lnk ee-help-btn ee-aria-tooltip dashicons ' . esc_attr($icon) . '"
                aria-label="' . esc_attr__(
-                   'Click to open the \'Help\' tab for more information about this feature.',
-                   'event_espresso'
-               ) . '"
+				   'Click to open the \'Help\' tab for more information about this feature.',
+				   'event_espresso'
+			   ) . '"
             >
                 ' . wp_kses($help_text, $allowedtags) . '
             </a>';
-    }
-
-
-    /**
-     * This is a helper method to generate a status legend for a given status array.
-     * Note this will only work if the incoming statuses have a key in the EEM_Status->localized_status() methods
-     * status_array.
-     *
-     * @param array  $status_array   array of statuses that will make up the legend. In format:
-     *                               array(
-     *                               'status_item' => 'status_name'
-     *                               )
-     * @param string $active_status  This is used to indicate what the active status is IF that is to be highlighted in
-     *                               the legend.
-     * @return string               html structure for status.
-     * @throws EE_Error
-     */
-    public static function status_legend($status_array, $active_status = '')
-    {
-        if (! is_array($status_array)) {
-            throw new EE_Error(
-                esc_html__(
-                    'The EEH_Template::status_legend helper required the incoming status_array argument to be an array!',
-                    'event_espresso'
-                )
-            );
-        }
-
-        $content = '
+	}
+
+
+	/**
+	 * This is a helper method to generate a status legend for a given status array.
+	 * Note this will only work if the incoming statuses have a key in the EEM_Status->localized_status() methods
+	 * status_array.
+	 *
+	 * @param array  $status_array   array of statuses that will make up the legend. In format:
+	 *                               array(
+	 *                               'status_item' => 'status_name'
+	 *                               )
+	 * @param string $active_status  This is used to indicate what the active status is IF that is to be highlighted in
+	 *                               the legend.
+	 * @return string               html structure for status.
+	 * @throws EE_Error
+	 */
+	public static function status_legend($status_array, $active_status = '')
+	{
+		if (! is_array($status_array)) {
+			throw new EE_Error(
+				esc_html__(
+					'The EEH_Template::status_legend helper required the incoming status_array argument to be an array!',
+					'event_espresso'
+				)
+			);
+		}
+
+		$content = '
             <div class="ee-list-table-legend-container">
                 <h4 class="status-legend-title">
                     ' . esc_html__('Status Legend', 'event_espresso') . '
                 </h4>
                 <dl class="ee-list-table-legend">';
 
-        foreach ($status_array as $item => $status) {
-            $active_class = $active_status == $status ? 'class="ee-is-active-status"' : '';
-            $content      .= '
+		foreach ($status_array as $item => $status) {
+			$active_class = $active_status == $status ? 'class="ee-is-active-status"' : '';
+			$content      .= '
                     <dt id="' . esc_attr('ee-legend-item-tooltip-' . $item) . '" ' . $active_class . '>
                         <span class="' . esc_attr('ee-status-legend ee-status-bg--' . $status) . '"></span>
                         <span class="ee-legend-description">
                             ' . EEH_Template::pretty_status($status, false, 'sentence') . '
                         </span>
                     </dt>';
-        }
+		}
 
-        $content .= '
+		$content .= '
                 </dl>
             </div>
 ';
-        return $content;
-    }
-
-
-    /**
-     * Gets HTML for laying out a deeply-nested array (and objects) in a format
-     * that's nice for presenting in the wp admin
-     *
-     * @param mixed $data
-     * @return string
-     */
-    public static function layout_array_as_table($data)
-    {
-        if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
-            $data = (array) $data;
-        }
-        ob_start();
-        if (is_array($data)) {
-            if (EEH_Array::is_associative_array($data)) { ?>
+		return $content;
+	}
+
+
+	/**
+	 * Gets HTML for laying out a deeply-nested array (and objects) in a format
+	 * that's nice for presenting in the wp admin
+	 *
+	 * @param mixed $data
+	 * @return string
+	 */
+	public static function layout_array_as_table($data)
+	{
+		if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+			$data = (array) $data;
+		}
+		ob_start();
+		if (is_array($data)) {
+			if (EEH_Array::is_associative_array($data)) { ?>
                 <table class="widefat">
                     <tbody>
                         <?php foreach ($data as $data_key => $data_values) { ?>
@@ -712,285 +712,285 @@ 
             <?php } else { ?>
                 <ul>
                     <?php
-                    foreach ($data as $datum) {
-                        echo "<li>";
-                        echo self::layout_array_as_table($datum);
-                        echo "</li>";
-                    } ?>
+					foreach ($data as $datum) {
+						echo "<li>";
+						echo self::layout_array_as_table($datum);
+						echo "</li>";
+					} ?>
                 </ul>
             <?php }
-        } else {
-            // simple value
-            echo esc_html($data);
-        }
-        return ob_get_clean();
-    }
-
-
-    /**
-     * wrapper for self::get_paging_html() that simply echos the generated paging html
-     *
-     * @param        $total_items
-     * @param        $current
-     * @param        $per_page
-     * @param        $url
-     * @param bool   $show_num_field
-     * @param string $paged_arg_name
-     * @param array  $items_label
-     * @see   self:get_paging_html() for argument docs.
-     * @since 4.4.0
-     */
-    public static function paging_html(
-        $total_items,
-        $current,
-        $per_page,
-        $url,
-        $show_num_field = true,
-        $paged_arg_name = 'paged',
-        $items_label = []
-    ) {
-        echo self::get_paging_html(
-            $total_items,
-            $current,
-            $per_page,
-            $url,
-            $show_num_field,
-            $paged_arg_name,
-            $items_label
-        );
-    }
-
-
-    /**
-     * A method for generating paging similar to WP_List_Table
-     *
-     * @param int    $total_items       How many total items there are to page.
-     * @param int    $current           What the current page is.
-     * @param int    $per_page          How many items per page.
-     * @param string $url               What the base url for page links is.
-     * @param bool   $show_num_field    Whether to show the input for changing page number.
-     * @param string $paged_arg_name    The name of the key for the paged query argument.
-     * @param array  $items_label       An array of singular/plural values for the items label:
-     *                                  array(
-     *                                  'single' => 'item',
-     *                                  'plural' => 'items'
-     *                                  )
-     * @return  string
-     * @since    4.4.0
-     * @see      wp-admin/includes/class-wp-list-table.php WP_List_Table::pagination()
-     */
-    public static function get_paging_html(
-        int $total_items,
-        int $current,
-        int $per_page,
-        string $url,
-        bool $show_num_field = true,
-        string $paged_arg_name = 'paged',
-        array $items_label = [],
-        string $button_size = 'small'
-    ): string {
-        $page_links     = [];
-        $paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
-
-        // filter items_label
-        $items_label = apply_filters(
-            'FHEE__EEH_Template__get_paging_html__items_label',
-            $items_label
-        );
-
-        if (
-            empty($items_label)
-            || ! is_array($items_label)
-            || ! isset($items_label['single'])
-            || ! isset($items_label['plural'])
-        ) {
-            $items_label = [
-                'single' => esc_html__('1 item', 'event_espresso'),
-                'plural' => esc_html__('%s items', 'event_espresso'),
-            ];
-        } else {
-            $items_label = [
-                'single' => '1 ' . esc_html($items_label['single']),
-                'plural' => '%s ' . esc_html($items_label['plural']),
-            ];
-        }
-
-        $total_pages = (int) ceil($total_items / $per_page);
-
-        if ($total_pages <= 1) {
-            return '';
-        }
-
-        $item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
-
-        $output = '<span class="displaying-num">' . $item_label . '</span>';
-
-        $disable_first = $current === 1 ? 'disabled' : '';
-        $disable_last  = $current === $total_pages ? 'disabled' : '';
-
-        $button_size = in_array($button_size, ['tiny', 'small', 'default', 'big']) ? $button_size : 'small';
-        $button_classes = "button button--secondary button--icon-only button--$button_size";
-
-        $page_links[] = sprintf(
-            '<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
-            esc_attr("first-page $button_classes $disable_first"),
-            esc_attr__('Go to the first page', 'event_espresso'),
-            esc_url_raw(remove_query_arg($paged_arg_name, $url)),
-            '&laquo;'
-        );
-
-        $page_links[] = sprintf(
-            '<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
-            esc_attr("prev-page $button_classes $disable_first"),
-            esc_attr__('Go to the previous page', 'event_espresso'),
-            esc_url_raw(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
-            '&lsaquo;'
-        );
-
-        $html_current_page = $show_num_field
-            ? sprintf(
-                "<input class='current-page ee-input-size--small' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
-                esc_attr__('Current page', 'event_espresso'),
-                esc_attr($current),
-                strlen($total_pages)
-            )
-            : $current;
-
-        $html_total_pages = sprintf(
-            '<span class="total-pages">%s</span>',
-            number_format_i18n($total_pages)
-        );
-        $page_links[]     = sprintf(
-            _x('%3$s%1$s of %2$s%4$s', 'paging', 'event_espresso'),
-            "{$html_current_page}<span class='paging-input-of'>",
-            "</span>{$html_total_pages}",
-            '<span class="paging-input">',
-            '</span>'
-        );
-
-        $page_links[] = sprintf(
-            '<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
-            esc_attr("next-page $button_classes $disable_last"),
-            esc_attr__('Go to the next page', 'event_espresso'),
-            esc_url_raw(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
-            '&rsaquo;'
-        );
-
-        $page_links[] = sprintf(
-            '<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
-            esc_attr("last-page $button_classes $disable_last"),
-            esc_attr__('Go to the last page', 'event_espresso'),
-            esc_url_raw(add_query_arg($paged_arg_name, $total_pages, $url)),
-            '&raquo;'
-        );
-
-        $output .= "\n" . '<span class="pagination-links">' . join("\n", $page_links) . '</span>';
-
-        $page_class = ' no-pages';
-        if ($total_pages) {
-            $page_class = $total_pages < 2 ? ' one-page' : '';
-        }
-
-        return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
-    }
-
-
-    /**
-     * @param string $wrap_class
-     * @param string $wrap_id
-     * @return string
-     */
-    public static function powered_by_event_espresso($wrap_class = '', $wrap_id = '', array $query_args = [])
-    {
-        $admin = is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX);
-        if (
-            ! $admin
-            && ! apply_filters(
-                'FHEE__EEH_Template__powered_by_event_espresso__show_reg_footer',
-                EE_Registry::instance()->CFG->admin->show_reg_footer
-            )
-        ) {
-            return '';
-        }
-        $tag        = $admin ? 'span' : 'div';
-        $attributes = ! empty($wrap_id) ? " id=\"{$wrap_id}\"" : '';
-        $wrap_class = $admin ? "{$wrap_class} float-left" : $wrap_class;
-        $attributes .= ! empty($wrap_class)
-            ? " class=\"{$wrap_class} powered-by-event-espresso-credit\""
-            : ' class="powered-by-event-espresso-credit"';
-        $query_args = array_merge(
-            [
-                'ap_id'        => EE_Registry::instance()->CFG->admin->affiliate_id(),
-                'utm_source'   => 'powered_by_event_espresso',
-                'utm_medium'   => 'link',
-                'utm_campaign' => 'powered_by',
-            ],
-            $query_args
-        );
-        $powered_by = apply_filters(
-            'FHEE__EEH_Template__powered_by_event_espresso_text',
-            $admin ? 'Event Espresso - ' . EVENT_ESPRESSO_VERSION : 'Event Espresso'
-        );
-        $url        = add_query_arg($query_args, 'https://eventespresso.com/');
-        $url        = apply_filters('FHEE__EEH_Template__powered_by_event_espresso__url', $url);
-        return (string) apply_filters(
-            'FHEE__EEH_Template__powered_by_event_espresso__html',
-            sprintf(
-                esc_html_x(
-                    '%3$s%1$sOnline event registration and ticketing powered by %2$s%3$s',
-                    'Online event registration and ticketing powered by [link to eventespresso.com]',
-                    'event_espresso'
-                ),
-                "<{$tag}{$attributes}>",
-                "<a href=\"{$url}\" target=\"_blank\" rel=\"nofollow\">{$powered_by}</a></{$tag}>",
-                $admin ? '' : '<br />'
-            ),
-            $wrap_class,
-            $wrap_id
-        );
-    }
-
-
-    /**
-     * @param string $image_name
-     * @return string|null
-     * @since   4.10.14.p
-     */
-    public static function getScreenshotUrl($image_name)
-    {
-        return esc_url_raw(EE_GLOBAL_ASSETS_URL . 'images/screenshots/' . $image_name . '.jpg');
-    }
+		} else {
+			// simple value
+			echo esc_html($data);
+		}
+		return ob_get_clean();
+	}
+
+
+	/**
+	 * wrapper for self::get_paging_html() that simply echos the generated paging html
+	 *
+	 * @param        $total_items
+	 * @param        $current
+	 * @param        $per_page
+	 * @param        $url
+	 * @param bool   $show_num_field
+	 * @param string $paged_arg_name
+	 * @param array  $items_label
+	 * @see   self:get_paging_html() for argument docs.
+	 * @since 4.4.0
+	 */
+	public static function paging_html(
+		$total_items,
+		$current,
+		$per_page,
+		$url,
+		$show_num_field = true,
+		$paged_arg_name = 'paged',
+		$items_label = []
+	) {
+		echo self::get_paging_html(
+			$total_items,
+			$current,
+			$per_page,
+			$url,
+			$show_num_field,
+			$paged_arg_name,
+			$items_label
+		);
+	}
+
+
+	/**
+	 * A method for generating paging similar to WP_List_Table
+	 *
+	 * @param int    $total_items       How many total items there are to page.
+	 * @param int    $current           What the current page is.
+	 * @param int    $per_page          How many items per page.
+	 * @param string $url               What the base url for page links is.
+	 * @param bool   $show_num_field    Whether to show the input for changing page number.
+	 * @param string $paged_arg_name    The name of the key for the paged query argument.
+	 * @param array  $items_label       An array of singular/plural values for the items label:
+	 *                                  array(
+	 *                                  'single' => 'item',
+	 *                                  'plural' => 'items'
+	 *                                  )
+	 * @return  string
+	 * @since    4.4.0
+	 * @see      wp-admin/includes/class-wp-list-table.php WP_List_Table::pagination()
+	 */
+	public static function get_paging_html(
+		int $total_items,
+		int $current,
+		int $per_page,
+		string $url,
+		bool $show_num_field = true,
+		string $paged_arg_name = 'paged',
+		array $items_label = [],
+		string $button_size = 'small'
+	): string {
+		$page_links     = [];
+		$paged_arg_name = empty($paged_arg_name) ? 'paged' : sanitize_key($paged_arg_name);
+
+		// filter items_label
+		$items_label = apply_filters(
+			'FHEE__EEH_Template__get_paging_html__items_label',
+			$items_label
+		);
+
+		if (
+			empty($items_label)
+			|| ! is_array($items_label)
+			|| ! isset($items_label['single'])
+			|| ! isset($items_label['plural'])
+		) {
+			$items_label = [
+				'single' => esc_html__('1 item', 'event_espresso'),
+				'plural' => esc_html__('%s items', 'event_espresso'),
+			];
+		} else {
+			$items_label = [
+				'single' => '1 ' . esc_html($items_label['single']),
+				'plural' => '%s ' . esc_html($items_label['plural']),
+			];
+		}
+
+		$total_pages = (int) ceil($total_items / $per_page);
+
+		if ($total_pages <= 1) {
+			return '';
+		}
+
+		$item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
+
+		$output = '<span class="displaying-num">' . $item_label . '</span>';
+
+		$disable_first = $current === 1 ? 'disabled' : '';
+		$disable_last  = $current === $total_pages ? 'disabled' : '';
+
+		$button_size = in_array($button_size, ['tiny', 'small', 'default', 'big']) ? $button_size : 'small';
+		$button_classes = "button button--secondary button--icon-only button--$button_size";
+
+		$page_links[] = sprintf(
+			'<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
+			esc_attr("first-page $button_classes $disable_first"),
+			esc_attr__('Go to the first page', 'event_espresso'),
+			esc_url_raw(remove_query_arg($paged_arg_name, $url)),
+			'&laquo;'
+		);
+
+		$page_links[] = sprintf(
+			'<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
+			esc_attr("prev-page $button_classes $disable_first"),
+			esc_attr__('Go to the previous page', 'event_espresso'),
+			esc_url_raw(add_query_arg($paged_arg_name, max(1, $current - 1), $url)),
+			'&lsaquo;'
+		);
+
+		$html_current_page = $show_num_field
+			? sprintf(
+				"<input class='current-page ee-input-size--small' title='%s' type='text' name=$paged_arg_name value='%s' size='%d' />",
+				esc_attr__('Current page', 'event_espresso'),
+				esc_attr($current),
+				strlen($total_pages)
+			)
+			: $current;
+
+		$html_total_pages = sprintf(
+			'<span class="total-pages">%s</span>',
+			number_format_i18n($total_pages)
+		);
+		$page_links[]     = sprintf(
+			_x('%3$s%1$s of %2$s%4$s', 'paging', 'event_espresso'),
+			"{$html_current_page}<span class='paging-input-of'>",
+			"</span>{$html_total_pages}",
+			'<span class="paging-input">',
+			'</span>'
+		);
+
+		$page_links[] = sprintf(
+			'<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
+			esc_attr("next-page $button_classes $disable_last"),
+			esc_attr__('Go to the next page', 'event_espresso'),
+			esc_url_raw(add_query_arg($paged_arg_name, min($total_pages, $current + 1), $url)),
+			'&rsaquo;'
+		);
+
+		$page_links[] = sprintf(
+			'<a class="%s" aria-label="%s" href="%s"><span class="ee-pagination-arrow">%s</span></a>',
+			esc_attr("last-page $button_classes $disable_last"),
+			esc_attr__('Go to the last page', 'event_espresso'),
+			esc_url_raw(add_query_arg($paged_arg_name, $total_pages, $url)),
+			'&raquo;'
+		);
+
+		$output .= "\n" . '<span class="pagination-links">' . join("\n", $page_links) . '</span>';
+
+		$page_class = ' no-pages';
+		if ($total_pages) {
+			$page_class = $total_pages < 2 ? ' one-page' : '';
+		}
+
+		return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+	}
+
+
+	/**
+	 * @param string $wrap_class
+	 * @param string $wrap_id
+	 * @return string
+	 */
+	public static function powered_by_event_espresso($wrap_class = '', $wrap_id = '', array $query_args = [])
+	{
+		$admin = is_admin() && ! (defined('DOING_AJAX') && DOING_AJAX);
+		if (
+			! $admin
+			&& ! apply_filters(
+				'FHEE__EEH_Template__powered_by_event_espresso__show_reg_footer',
+				EE_Registry::instance()->CFG->admin->show_reg_footer
+			)
+		) {
+			return '';
+		}
+		$tag        = $admin ? 'span' : 'div';
+		$attributes = ! empty($wrap_id) ? " id=\"{$wrap_id}\"" : '';
+		$wrap_class = $admin ? "{$wrap_class} float-left" : $wrap_class;
+		$attributes .= ! empty($wrap_class)
+			? " class=\"{$wrap_class} powered-by-event-espresso-credit\""
+			: ' class="powered-by-event-espresso-credit"';
+		$query_args = array_merge(
+			[
+				'ap_id'        => EE_Registry::instance()->CFG->admin->affiliate_id(),
+				'utm_source'   => 'powered_by_event_espresso',
+				'utm_medium'   => 'link',
+				'utm_campaign' => 'powered_by',
+			],
+			$query_args
+		);
+		$powered_by = apply_filters(
+			'FHEE__EEH_Template__powered_by_event_espresso_text',
+			$admin ? 'Event Espresso - ' . EVENT_ESPRESSO_VERSION : 'Event Espresso'
+		);
+		$url        = add_query_arg($query_args, 'https://eventespresso.com/');
+		$url        = apply_filters('FHEE__EEH_Template__powered_by_event_espresso__url', $url);
+		return (string) apply_filters(
+			'FHEE__EEH_Template__powered_by_event_espresso__html',
+			sprintf(
+				esc_html_x(
+					'%3$s%1$sOnline event registration and ticketing powered by %2$s%3$s',
+					'Online event registration and ticketing powered by [link to eventespresso.com]',
+					'event_espresso'
+				),
+				"<{$tag}{$attributes}>",
+				"<a href=\"{$url}\" target=\"_blank\" rel=\"nofollow\">{$powered_by}</a></{$tag}>",
+				$admin ? '' : '<br />'
+			),
+			$wrap_class,
+			$wrap_id
+		);
+	}
+
+
+	/**
+	 * @param string $image_name
+	 * @return string|null
+	 * @since   4.10.14.p
+	 */
+	public static function getScreenshotUrl($image_name)
+	{
+		return esc_url_raw(EE_GLOBAL_ASSETS_URL . 'images/screenshots/' . $image_name . '.jpg');
+	}
 }
 
 
 if (! function_exists('espresso_pagination')) {
-    /**
-     *    espresso_pagination
-     *
-     * @access    public
-     * @return    void
-     */
-    function espresso_pagination()
-    {
-        global $wp_query;
-        $big        = 999999999; // need an unlikely integer
-        $pagination = paginate_links(
-            [
-                'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
-                'format'       => '?paged=%#%',
-                'current'      => max(1, get_query_var('paged')),
-                'total'        => $wp_query->max_num_pages,
-                'show_all'     => true,
-                'end_size'     => 10,
-                'mid_size'     => 6,
-                'prev_next'    => true,
-                'prev_text'    => esc_html__('&lsaquo; PREV', 'event_espresso'),
-                'next_text'    => esc_html__('NEXT &rsaquo;', 'event_espresso'),
-                'type'         => 'plain',
-                'add_args'     => false,
-                'add_fragment' => '',
-            ]
-        );
-        echo ! empty($pagination) ? '<div class="ee-pagination-dv ee-clear-float">' . $pagination . '</div>' : '';
-    }
+	/**
+	 *    espresso_pagination
+	 *
+	 * @access    public
+	 * @return    void
+	 */
+	function espresso_pagination()
+	{
+		global $wp_query;
+		$big        = 999999999; // need an unlikely integer
+		$pagination = paginate_links(
+			[
+				'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
+				'format'       => '?paged=%#%',
+				'current'      => max(1, get_query_var('paged')),
+				'total'        => $wp_query->max_num_pages,
+				'show_all'     => true,
+				'end_size'     => 10,
+				'mid_size'     => 6,
+				'prev_next'    => true,
+				'prev_text'    => esc_html__('&lsaquo; PREV', 'event_espresso'),
+				'next_text'    => esc_html__('NEXT &rsaquo;', 'event_espresso'),
+				'type'         => 'plain',
+				'add_args'     => false,
+				'add_fragment' => '',
+			]
+		);
+		echo ! empty($pagination) ? '<div class="ee-pagination-dv ee-clear-float">' . $pagination . '</div>' : '';
+	}
 }

Spacing +57 added lines, -57 removed lines

@@ -6,7 +6,7 @@ 
 use EventEspresso\core\services\request\RequestInterface;
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
-if (! function_exists('espresso_get_template_part')) {
+if ( ! function_exists('espresso_get_template_part')) {
     /**
      * espresso_get_template_part
      * basically a copy of the WordPress get_template_part() function but uses EEH_Template::locate_template() instead, and doesn't add base versions of files
@@ -22,7 +22,7 @@ 
 }
 
 
-if (! function_exists('espresso_get_object_css_class')) {
+if ( ! function_exists('espresso_get_object_css_class')) {
     /**
      * espresso_get_object_css_class - attempts to generate a css class based on the type of EE object passed
      *
@@ -72,9 +72,9 @@ 
      */
     public static function load_espresso_theme_functions()
     {
-        if (! defined('EE_THEME_FUNCTIONS_LOADED')) {
-            if (is_readable(EE_PUBLIC . EE_Config::get_current_theme() . '/functions.php')) {
-                require_once(EE_PUBLIC . EE_Config::get_current_theme() . '/functions.php');
+        if ( ! defined('EE_THEME_FUNCTIONS_LOADED')) {
+            if (is_readable(EE_PUBLIC.EE_Config::get_current_theme().'/functions.php')) {
+                require_once(EE_PUBLIC.EE_Config::get_current_theme().'/functions.php');
             }
         }
     }
@@ -88,16 +88,16 @@ 
     public static function get_espresso_themes()
     {
         if (empty(EEH_Template::$_espresso_themes)) {
-            $espresso_themes = glob(EE_PUBLIC . '*', GLOB_ONLYDIR);
+            $espresso_themes = glob(EE_PUBLIC.'*', GLOB_ONLYDIR);
             if (empty($espresso_themes)) {
                 return [];
             }
             if (($key = array_search('global_assets', $espresso_themes)) !== false) {
-                unset($espresso_themes[ $key ]);
+                unset($espresso_themes[$key]);
             }
             EEH_Template::$_espresso_themes = [];
             foreach ($espresso_themes as $espresso_theme) {
-                EEH_Template::$_espresso_themes[ basename($espresso_theme) ] = $espresso_theme;
+                EEH_Template::$_espresso_themes[basename($espresso_theme)] = $espresso_theme;
             }
         }
         return EEH_Template::$_espresso_themes;
@@ -213,10 +213,10 @@ 
                 // get array of EE Custom Post Types
                 $EE_CPTs = $custom_post_types->getDefinitions();
                 // build template name based on request
-                if (isset($EE_CPTs[ $post_type ])) {
+                if (isset($EE_CPTs[$post_type])) {
                     $archive_or_single = is_archive() ? 'archive' : '';
                     $archive_or_single = is_single() ? 'single' : $archive_or_single;
-                    $templates         = $archive_or_single . '-' . $post_type . '.php';
+                    $templates         = $archive_or_single.'-'.$post_type.'.php';
                 }
             }
             // currently active EE template theme
@@ -225,18 +225,18 @@ 
             // array of paths to folders that may contain templates
             $template_folder_paths = [
                 // first check the /wp-content/uploads/espresso/templates/(current EE theme)/  folder for an EE theme template file
-                EVENT_ESPRESSO_TEMPLATE_DIR . $current_theme,
+                EVENT_ESPRESSO_TEMPLATE_DIR.$current_theme,
                 // then in the root of the /wp-content/uploads/espresso/templates/ folder
                 EVENT_ESPRESSO_TEMPLATE_DIR,
             ];
 
             // add core plugin folders for checking only if we're not $check_if_custom
-            if (! $check_if_custom) {
-                $core_paths            = [
+            if ( ! $check_if_custom) {
+                $core_paths = [
                     // in the  /wp-content/plugins/(EE4 folder)/public/(current EE theme)/ folder within the plugin
-                    EE_PUBLIC . $current_theme,
+                    EE_PUBLIC.$current_theme,
                     // in the  /wp-content/plugins/(EE4 folder)/core/templates/(current EE theme)/ folder within the plugin
-                    EE_TEMPLATES . $current_theme,
+                    EE_TEMPLATES.$current_theme,
                     // or maybe relative from the plugin root: /wp-content/plugins/(EE4 folder)/
                     EE_PLUGIN_DIR_PATH,
                 ];
@@ -271,10 +271,10 @@ 
                     );
                     if ($common_base_path !== '') {
                         // both paths have a common base, so just tack the filename onto our search path
-                        $resolved_path = EEH_File::end_with_directory_separator($template_folder_path) . $file_name;
+                        $resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$file_name;
                     } else {
                         // no common base path, so let's just concatenate
-                        $resolved_path = EEH_File::end_with_directory_separator($template_folder_path) . $template;
+                        $resolved_path = EEH_File::end_with_directory_separator($template_folder_path).$template;
                     }
                     // build up our template locations array by adding our resolved paths
                     $full_template_paths[] = $resolved_path;
@@ -282,7 +282,7 @@ 
                 // if $template is an absolute path, then we'll tack it onto the start of our array so that it gets searched first
                 array_unshift($full_template_paths, $template);
                 // path to the directory of the current theme: /wp-content/themes/(current WP theme)/
-                array_unshift($full_template_paths, get_stylesheet_directory() . '/' . $file_name);
+                array_unshift($full_template_paths, get_stylesheet_directory().'/'.$file_name);
             }
             // filter final array of full template paths
             $full_template_paths = apply_filters(
@@ -345,7 +345,7 @@ 
                 }
             }
             $common_base_path .= $directory;
-            $last_offset      = $index + 1;
+            $last_offset = $index + 1;
         }
         return substr($common_base_path, 0, -1);
     }
@@ -382,7 +382,7 @@ 
         $template_args = (array) apply_filters('FHEE__EEH_Template__display_template__template_args', $template_args);
 
         // you gimme nuttin - YOU GET NUTTIN !!
-        if (! $template_path || ! is_readable($template_path)) {
+        if ( ! $template_path || ! is_readable($template_path)) {
             // ignore whether template is accessible ?
             if ($throw_exceptions) {
                 throw new DomainException(
@@ -392,7 +392,7 @@ 
             return '';
         }
         // if $template_args are not in an array, then make it so
-        if (! is_array($template_args) && ! is_object($template_args)) {
+        if ( ! is_array($template_args) && ! is_object($template_args)) {
             $template_args = [$template_args];
         }
         extract($template_args, EXTR_SKIP);
@@ -421,11 +421,11 @@ 
     public static function get_object_css_class($object = null, $prefix = '', $suffix = '')
     {
         // in the beginning...
-        $prefix = ! empty($prefix) ? rtrim($prefix, '-') . '-' : '';
+        $prefix = ! empty($prefix) ? rtrim($prefix, '-').'-' : '';
         // da muddle
         $class = '';
         // the end
-        $suffix = ! empty($suffix) ? '-' . ltrim($suffix, '-') : '';
+        $suffix = ! empty($suffix) ? '-'.ltrim($suffix, '-') : '';
         // is the passed object an EE object ?
         if ($object instanceof EE_Base_Class) {
             // grab the exact type of object
@@ -435,10 +435,10 @@ 
                 // no specifics just yet...
                 default:
                     $class = strtolower(str_replace('_', '-', $obj_class));
-                    $class .= method_exists($obj_class, 'name') ? '-' . sanitize_title($object->name()) : '';
+                    $class .= method_exists($obj_class, 'name') ? '-'.sanitize_title($object->name()) : '';
             }
         }
-        return $prefix . $class . $suffix;
+        return $prefix.$class.$suffix;
     }
 
 
@@ -473,7 +473,7 @@ 
         // filter raw amount (allows 0.00 to be changed to "free" for example)
         $amount_formatted = apply_filters('FHEE__EEH_Template__format_currency__amount', $amount, $return_raw);
         // still a number, or was amount converted to a string like "free" ?
-        if (! is_float($amount_formatted)) {
+        if ( ! is_float($amount_formatted)) {
             return esc_html($amount_formatted);
         }
         try {
@@ -484,7 +484,7 @@ 
             $mny = null;
         }
         // verify results
-        if (! $mny instanceof EE_Currency_Config) {
+        if ( ! $mny instanceof EE_Currency_Config) {
             // set default config country currency settings
             $mny = EE_Registry::instance()->CFG->currency instanceof EE_Currency_Config
                 ? EE_Registry::instance()->CFG->currency
@@ -493,16 +493,16 @@ 
         // format float
         $amount_formatted = number_format($amount, $mny->dec_plc, $mny->dec_mrk, $mny->thsnds);
         // add formatting ?
-        if (! $return_raw) {
+        if ( ! $return_raw) {
             // add currency sign
             if ($mny->sign_b4) {
                 if ($amount >= 0) {
-                    $amount_formatted = $mny->sign . $amount_formatted;
+                    $amount_formatted = $mny->sign.$amount_formatted;
                 } else {
-                    $amount_formatted = '-' . $mny->sign . str_replace('-', '', $amount_formatted);
+                    $amount_formatted = '-'.$mny->sign.str_replace('-', '', $amount_formatted);
                 }
             } else {
-                $amount_formatted = $amount_formatted . $mny->sign;
+                $amount_formatted = $amount_formatted.$mny->sign;
             }
 
             // filter to allow global setting of display_code
@@ -513,7 +513,7 @@ 
 
             // add currency code ?
             $amount_formatted = $display_code
-                ? $amount_formatted . ' <span class="' . $cur_code_span_class . '">' . $mny->code . '</span>'
+                ? $amount_formatted.' <span class="'.$cur_code_span_class.'">'.$mny->code.'</span>'
                 : $amount_formatted;
         }
         // filter results
@@ -549,7 +549,7 @@ 
             $plural,
             $schema
         );
-        return $status[ $status_id ];
+        return $status[$status_id];
     }
 
 
@@ -566,14 +566,14 @@ 
     public static function get_button_or_link($url, $label, $class = 'button button--primary', $icon = '', $title = '')
     {
         $icon_html = '';
-        if (! empty($icon)) {
+        if ( ! empty($icon)) {
             $dashicons = preg_split("(ee-icon |dashicons )", $icon);
             $dashicons = array_filter($dashicons);
             $count     = count($dashicons);
             $icon_html .= $count > 1 ? '<span class="ee-composite-dashicon">' : '';
             foreach ($dashicons as $dashicon) {
-                $type      = strpos($dashicon, 'ee-icon') !== false ? 'ee-icon ' : 'dashicons ';
-                $icon_html .= '<span class="' . $type . $dashicon . '"></span>';
+                $type = strpos($dashicon, 'ee-icon') !== false ? 'ee-icon ' : 'dashicons ';
+                $icon_html .= '<span class="'.$type.$dashicon.'"></span>';
             }
             $icon_html .= $count > 1 ? '</span>' : '';
         }
@@ -613,18 +613,18 @@ 
         $action  = $action ?: $request->getRequestParam('action', 'default', 'key');
 
 
-        $help_tab_lnk = $page . '-' . $action . '-' . $help_tab_id;
+        $help_tab_lnk = $page.'-'.$action.'-'.$help_tab_id;
         $icon         = ! $icon_style ? 'dashicons-editor-help' : $icon_style;
         $help_text    = ! $help_text ? '' : $help_text;
         return '
-            <a id="' . esc_attr($help_tab_lnk) . '"
-               class="espresso-help-tab-lnk ee-help-btn ee-aria-tooltip dashicons ' . esc_attr($icon) . '"
+            <a id="' . esc_attr($help_tab_lnk).'"
+               class="espresso-help-tab-lnk ee-help-btn ee-aria-tooltip dashicons ' . esc_attr($icon).'"
                aria-label="' . esc_attr__(
                    'Click to open the \'Help\' tab for more information about this feature.',
                    'event_espresso'
-               ) . '"
+               ).'"
             >
-                ' . wp_kses($help_text, $allowedtags) . '
+                ' . wp_kses($help_text, $allowedtags).'
             </a>';
     }
 
@@ -645,7 +645,7 @@ 
      */
     public static function status_legend($status_array, $active_status = '')
     {
-        if (! is_array($status_array)) {
+        if ( ! is_array($status_array)) {
             throw new EE_Error(
                 esc_html__(
                     'The EEH_Template::status_legend helper required the incoming status_array argument to be an array!',
@@ -657,17 +657,17 @@ 
         $content = '
             <div class="ee-list-table-legend-container">
                 <h4 class="status-legend-title">
-                    ' . esc_html__('Status Legend', 'event_espresso') . '
+                    ' . esc_html__('Status Legend', 'event_espresso').'
                 </h4>
                 <dl class="ee-list-table-legend">';
 
         foreach ($status_array as $item => $status) {
             $active_class = $active_status == $status ? 'class="ee-is-active-status"' : '';
-            $content      .= '
-                    <dt id="' . esc_attr('ee-legend-item-tooltip-' . $item) . '" ' . $active_class . '>
-                        <span class="' . esc_attr('ee-status-legend ee-status-bg--' . $status) . '"></span>
+            $content .= '
+                    <dt id="' . esc_attr('ee-legend-item-tooltip-'.$item).'" '.$active_class.'>
+                        <span class="' . esc_attr('ee-status-legend ee-status-bg--'.$status).'"></span>
                         <span class="ee-legend-description">
-                            ' . EEH_Template::pretty_status($status, false, 'sentence') . '
+                            ' . EEH_Template::pretty_status($status, false, 'sentence').'
                         </span>
                     </dt>';
         }
@@ -810,8 +810,8 @@ 
             ];
         } else {
             $items_label = [
-                'single' => '1 ' . esc_html($items_label['single']),
-                'plural' => '%s ' . esc_html($items_label['plural']),
+                'single' => '1 '.esc_html($items_label['single']),
+                'plural' => '%s '.esc_html($items_label['plural']),
             ];
         }
 
@@ -823,7 +823,7 @@ 
 
         $item_label = $total_items > 1 ? sprintf($items_label['plural'], $total_items) : $items_label['single'];
 
-        $output = '<span class="displaying-num">' . $item_label . '</span>';
+        $output = '<span class="displaying-num">'.$item_label.'</span>';
 
         $disable_first = $current === 1 ? 'disabled' : '';
         $disable_last  = $current === $total_pages ? 'disabled' : '';
@@ -860,7 +860,7 @@ 
             '<span class="total-pages">%s</span>',
             number_format_i18n($total_pages)
         );
-        $page_links[]     = sprintf(
+        $page_links[] = sprintf(
             _x('%3$s%1$s of %2$s%4$s', 'paging', 'event_espresso'),
             "{$html_current_page}<span class='paging-input-of'>",
             "</span>{$html_total_pages}",
@@ -884,14 +884,14 @@ 
             '&raquo;'
         );
 
-        $output .= "\n" . '<span class="pagination-links">' . join("\n", $page_links) . '</span>';
+        $output .= "\n".'<span class="pagination-links">'.join("\n", $page_links).'</span>';
 
         $page_class = ' no-pages';
         if ($total_pages) {
             $page_class = $total_pages < 2 ? ' one-page' : '';
         }
 
-        return '<div class="tablenav"><div class="tablenav-pages' . $page_class . '">' . $output . '</div></div>';
+        return '<div class="tablenav"><div class="tablenav-pages'.$page_class.'">'.$output.'</div></div>';
     }
 
 
@@ -929,7 +929,7 @@ 
         );
         $powered_by = apply_filters(
             'FHEE__EEH_Template__powered_by_event_espresso_text',
-            $admin ? 'Event Espresso - ' . EVENT_ESPRESSO_VERSION : 'Event Espresso'
+            $admin ? 'Event Espresso - '.EVENT_ESPRESSO_VERSION : 'Event Espresso'
         );
         $url        = add_query_arg($query_args, 'https://eventespresso.com/');
         $url        = apply_filters('FHEE__EEH_Template__powered_by_event_espresso__url', $url);
@@ -958,12 +958,12 @@ 
      */
     public static function getScreenshotUrl($image_name)
     {
-        return esc_url_raw(EE_GLOBAL_ASSETS_URL . 'images/screenshots/' . $image_name . '.jpg');
+        return esc_url_raw(EE_GLOBAL_ASSETS_URL.'images/screenshots/'.$image_name.'.jpg');
     }
 }
 
 
-if (! function_exists('espresso_pagination')) {
+if ( ! function_exists('espresso_pagination')) {
     /**
      *    espresso_pagination
      *
@@ -991,6 +991,6 @@ 
                 'add_fragment' => '',
             ]
         );
-        echo ! empty($pagination) ? '<div class="ee-pagination-dv ee-clear-float">' . $pagination . '</div>' : '';
+        echo ! empty($pagination) ? '<div class="ee-pagination-dv ee-clear-float">'.$pagination.'</div>' : '';
     }
 }

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_gateways.dmsstage.php

Indentation +231 added lines, -231 removed lines

@@ -15,256 +15,256 @@
 class EE_DMS_4_1_0_gateways extends EE_Data_Migration_Script_Stage
 {
 
-    private bool $_converted_active_gateways = false;
+	private bool $_converted_active_gateways = false;
 
-    protected array $_gateways_we_know_how_to_migrate = [
-        'aim'        => 'Aim',
-        'bank'       => 'Bank',
-        'check'      => 'Check',
-        'invoice'    => 'Invoice',
-        'paypal'     => 'Paypal_Standard',
-        'paypal_pro' => 'Paypal_Pro',
+	protected array $_gateways_we_know_how_to_migrate = [
+		'aim'        => 'Aim',
+		'bank'       => 'Bank',
+		'check'      => 'Check',
+		'invoice'    => 'Invoice',
+		'paypal'     => 'Paypal_Standard',
+		'paypal_pro' => 'Paypal_Pro',
 
-    ];
+	];
 
-    protected array $_gateways_we_leave_alone = [
-        '2checkout'        => '2checkout',
-        'anz'              => 'Anz',
-        'atos'             => 'Atos',
-        'authnet'          => 'Authnet',
-        'beanstream'       => 'Beanstream',
-        'evertec'          => 'Evertec',
-        'eway'             => 'Eway',
-        'eway_rapid3'      => 'Eway_Rapid3',
-        'exact'            => 'Exact',
-        'firstdata'        => 'Firstdata',
-        'firstdat_e4'      => 'Firstdata_E4',
-        'ideal'            => 'Ideal',
-        'infusion_payment' => 'InfusionSoft',
-        'luottokunta'      => 'Luottokunta',
-        'megasoft'         => 'Megasoft',
-        'moneris_hpp'      => 'Moneris_HPP',
-        'mwarrior'         => 'Mwarrior',
-        'nab'              => 'NAB',
-        'paychoice'        => 'Paychoice',
-        'paytrace'         => 'Paytrace',
-        'psigate'          => 'Psigate',
-        'purchase_order'   => 'Purchase_Order',
-        'qbms'             => 'QBMS',
-        'quickpay'         => 'Quickpay',
-        'realauth'         => 'Realauth',
-        'securepay_aus'    => 'Securepay_Aus',
-        'stripe'           => 'Stripe',
-        'usaepay_offsite'  => 'USAePay_Offsite',
-        'usaepay_onsite'   => 'USAePay_Onsite',
-        'wepay'            => 'Wepay',
-        'worldpay'         => 'Worldpay',
-    ];
+	protected array $_gateways_we_leave_alone = [
+		'2checkout'        => '2checkout',
+		'anz'              => 'Anz',
+		'atos'             => 'Atos',
+		'authnet'          => 'Authnet',
+		'beanstream'       => 'Beanstream',
+		'evertec'          => 'Evertec',
+		'eway'             => 'Eway',
+		'eway_rapid3'      => 'Eway_Rapid3',
+		'exact'            => 'Exact',
+		'firstdata'        => 'Firstdata',
+		'firstdat_e4'      => 'Firstdata_E4',
+		'ideal'            => 'Ideal',
+		'infusion_payment' => 'InfusionSoft',
+		'luottokunta'      => 'Luottokunta',
+		'megasoft'         => 'Megasoft',
+		'moneris_hpp'      => 'Moneris_HPP',
+		'mwarrior'         => 'Mwarrior',
+		'nab'              => 'NAB',
+		'paychoice'        => 'Paychoice',
+		'paytrace'         => 'Paytrace',
+		'psigate'          => 'Psigate',
+		'purchase_order'   => 'Purchase_Order',
+		'qbms'             => 'QBMS',
+		'quickpay'         => 'Quickpay',
+		'realauth'         => 'Realauth',
+		'securepay_aus'    => 'Securepay_Aus',
+		'stripe'           => 'Stripe',
+		'usaepay_offsite'  => 'USAePay_Offsite',
+		'usaepay_onsite'   => 'USAePay_Onsite',
+		'wepay'            => 'Wepay',
+		'worldpay'         => 'Worldpay',
+	];
 
 
-    public function __construct()
-    {
-        $this->_pretty_name = esc_html__("Gateways", "event_espresso");
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		$this->_pretty_name = esc_html__("Gateways", "event_espresso");
+		parent::__construct();
+	}
 
 
-    public function _migration_step($num_items_to_migrate = 50)
-    {
-        // loads existing EE_Config from DB, if it exists
-        $new_gateway_config_obj  = EE_Config::instance()->gateway;
-        $items_actually_migrated = 0;
-        // convert settings
-        $gateways_to_deal_with = array_merge(
-            $this->_gateways_we_know_how_to_migrate,
-            $this->_gateways_we_leave_alone
-        );
-        // just do a part of them on this request
-        $gateways_to_deal_with = array_slice(
-            $gateways_to_deal_with,
-            $this->count_records_migrated(),
-            $num_items_to_migrate
-        );// $this->_gateways_we_know_how_to_migrate;
-        foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
-            $old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
-            if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                // determine the old option's name
-                $old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
-                if (! $old_gateway_settings) {
-                    // no settings existed for this gateway anyways... weird...
-                    $items_actually_migrated++;
-                    continue;
-                }
-                // now prepare the settings to make sure they're in the 4.1 format
-                $new_gateway_settings = $this->_convert_gateway_settings(
-                    (array) $old_gateway_settings,
-                    $new_gateway_slug
-                );
+	public function _migration_step($num_items_to_migrate = 50)
+	{
+		// loads existing EE_Config from DB, if it exists
+		$new_gateway_config_obj  = EE_Config::instance()->gateway;
+		$items_actually_migrated = 0;
+		// convert settings
+		$gateways_to_deal_with = array_merge(
+			$this->_gateways_we_know_how_to_migrate,
+			$this->_gateways_we_leave_alone
+		);
+		// just do a part of them on this request
+		$gateways_to_deal_with = array_slice(
+			$gateways_to_deal_with,
+			$this->count_records_migrated(),
+			$num_items_to_migrate
+		);// $this->_gateways_we_know_how_to_migrate;
+		foreach ($gateways_to_deal_with as $old_gateway_slug => $new_gateway_slug) {
+			$old_gateway_wp_option_name = $this->_get_old_gateway_option_name($new_gateway_slug);
+			if (isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				// determine the old option's name
+				$old_gateway_settings = $this->_get_old_gateway_option($new_gateway_slug);
+				if (! $old_gateway_settings) {
+					// no settings existed for this gateway anyways... weird...
+					$items_actually_migrated++;
+					continue;
+				}
+				// now prepare the settings to make sure they're in the 4.1 format
+				$new_gateway_settings = $this->_convert_gateway_settings(
+					(array) $old_gateway_settings,
+					$new_gateway_slug
+				);
 
-                $new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
-                // and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
-                // I think it's ok to do right away this time (we wont need gateway settings elsewhere)
-                delete_option($old_gateway_wp_option_name);
-            } else {// it must be one of the ones we mostly leave alone
-                global $wpdb;
-                // yeah we could do this all in one query... and if you're reading this and would like to, go ahead. Although you'll
-                // only be saving users 50 milliseconds the one time this runs...
-                $wpdb->query(
-                    $wpdb->prepare(
-                        "UPDATE " . $wpdb->options . " SET autoload='no' WHERE option_name=%s",
-                        $old_gateway_wp_option_name
-                    )
-                );
-            }
+				$new_gateway_config_obj->payment_settings[ $new_gateway_slug ] = $new_gateway_settings;
+				// and when we're done, remove the old option. Sometimes we'd prefer to do this in a different stage, but
+				// I think it's ok to do right away this time (we wont need gateway settings elsewhere)
+				delete_option($old_gateway_wp_option_name);
+			} else {// it must be one of the ones we mostly leave alone
+				global $wpdb;
+				// yeah we could do this all in one query... and if you're reading this and would like to, go ahead. Although you'll
+				// only be saving users 50 milliseconds the one time this runs...
+				$wpdb->query(
+					$wpdb->prepare(
+						"UPDATE " . $wpdb->options . " SET autoload='no' WHERE option_name=%s",
+						$old_gateway_wp_option_name
+					)
+				);
+			}
 
-            $items_actually_migrated++;
-        }
-        // if we can keep going, and it hasn't been done yet, convert active gateways
-        if ($items_actually_migrated < $num_items_to_migrate && ! $this->_converted_active_gateways) {
-            $this->_convert_active_gateways();
-            $this->_converted_active_gateways = true;
-            $items_actually_migrated++;
-        }
+			$items_actually_migrated++;
+		}
+		// if we can keep going, and it hasn't been done yet, convert active gateways
+		if ($items_actually_migrated < $num_items_to_migrate && ! $this->_converted_active_gateways) {
+			$this->_convert_active_gateways();
+			$this->_converted_active_gateways = true;
+			$items_actually_migrated++;
+		}
 
-        EE_Config::instance()->update_espresso_config(false, false);
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+		EE_Config::instance()->update_espresso_config(false, false);
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 
 
-    public function _count_records_to_migrate(): int
-    {
-        $count_of_gateways_to_convert     = (int) count($this->_gateways_we_know_how_to_migrate);
-        $step_of_setting_active_gateways  = 1;
-        $count_of_gateways_to_leave_alone = (int) count($this->_gateways_we_leave_alone);
-        //  $button_images_to_update =
-        return $count_of_gateways_to_convert + $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
-    }
+	public function _count_records_to_migrate(): int
+	{
+		$count_of_gateways_to_convert     = (int) count($this->_gateways_we_know_how_to_migrate);
+		$step_of_setting_active_gateways  = 1;
+		$count_of_gateways_to_leave_alone = (int) count($this->_gateways_we_leave_alone);
+		//  $button_images_to_update =
+		return $count_of_gateways_to_convert + $step_of_setting_active_gateways + $count_of_gateways_to_leave_alone;
+	}
 
 
-    /**
-     * Takes the old array of 3.1 gateway settings for this gateway and converts it
-     * into an array with all the 4.1 gateway setting array keys (often the keys were
-     * changed from 3.1 to 4.1)
-     *
-     * @param array  $old_gateway_settings
-     * @param string $new_gateway_slug
-     * @return array
-     */
-    private function _convert_gateway_settings(array $old_gateway_settings, string $new_gateway_slug): array
-    {
-        $new_gateway_settings = $old_gateway_settings;
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
-                $new_gateway_settings['page_title']     = $old_gateway_settings['bank_title'];
-                break;
-            case 'Invoice':
-                $new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
-                // Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
-                // it gets used in the receipts which are available to everyone. So usually it's best to not
-                // migrate this.
-                unset($new_gateway_settings['payment_address']);
-                break;
-            case 'Paypal_Pro':
-                $new_gateway_settings['email']        = $old_gateway_settings['paypal_pro_email'];
-                $new_gateway_settings['username']     = $old_gateway_settings['paypal_api_username'];
-                $new_gateway_settings['password']     = $old_gateway_settings['paypal_api_password'];
-                $new_gateway_settings['signature']    = $old_gateway_settings['paypal_api_signature'];
-                $new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
-                $new_gateway_settings['use_sandbox']  = $old_gateway_settings['paypal_pro_use_sandbox'];
-                break;
-        }
-        return $new_gateway_settings;
-    }
+	/**
+	 * Takes the old array of 3.1 gateway settings for this gateway and converts it
+	 * into an array with all the 4.1 gateway setting array keys (often the keys were
+	 * changed from 3.1 to 4.1)
+	 *
+	 * @param array  $old_gateway_settings
+	 * @param string $new_gateway_slug
+	 * @return array
+	 */
+	private function _convert_gateway_settings(array $old_gateway_settings, string $new_gateway_slug): array
+	{
+		$new_gateway_settings = $old_gateway_settings;
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$new_gateway_settings['account_number'] = $old_gateway_settings['bank_account'];
+				$new_gateway_settings['page_title']     = $old_gateway_settings['bank_title'];
+				break;
+			case 'Invoice':
+				$new_gateway_settings['invoice_logo_url'] = $old_gateway_settings['image_url'];
+				// Dont' migrate the old invoice payee address. It was usually given dummy data. And in EE4
+				// it gets used in the receipts which are available to everyone. So usually it's best to not
+				// migrate this.
+				unset($new_gateway_settings['payment_address']);
+				break;
+			case 'Paypal_Pro':
+				$new_gateway_settings['email']        = $old_gateway_settings['paypal_pro_email'];
+				$new_gateway_settings['username']     = $old_gateway_settings['paypal_api_username'];
+				$new_gateway_settings['password']     = $old_gateway_settings['paypal_api_password'];
+				$new_gateway_settings['signature']    = $old_gateway_settings['paypal_api_signature'];
+				$new_gateway_settings['credit_cards'] = explode(",", $old_gateway_settings['paypal_api_credit_cards']);
+				$new_gateway_settings['use_sandbox']  = $old_gateway_settings['paypal_pro_use_sandbox'];
+				break;
+		}
+		return $new_gateway_settings;
+	}
 
 
-    /**
-     * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
-     *
-     * @param string $new_gateway_slug
-     * @return string
-     */
-    private function _get_old_gateway_option(string $new_gateway_slug): ?string
-    {
-        return get_option(
-            $this->_get_old_gateway_option_name($new_gateway_slug),
-            null
-        );
-    }
+	/**
+	 * Figures out the correct 3.1 gateway settings option name for the given 4.1 gateway
+	 *
+	 * @param string $new_gateway_slug
+	 * @return string
+	 */
+	private function _get_old_gateway_option(string $new_gateway_slug): ?string
+	{
+		return get_option(
+			$this->_get_old_gateway_option_name($new_gateway_slug),
+			null
+		);
+	}
 
 
-    /**
-     * Just gets the old gateways slug
-     *
-     * @param string $new_gateway_slug
-     * @return string
-     */
-    private function _get_old_gateway_option_name(string $new_gateway_slug): string
-    {
-        $new_gateway_slugs_to_new = array_flip(
-            array_merge(
-                $this->_gateways_we_know_how_to_migrate,
-                $this->_gateways_we_leave_alone
-            )
-        );
-        $old_gateway_slug         = $new_gateway_slugs_to_new[ $new_gateway_slug ];
-        $normal_option_prefix     = 'event_espresso_';
-        $normal_option_postfix    = '_settings';
-        switch ($new_gateway_slug) {
-            case 'Bank':
-                $option_name = $normal_option_prefix . 'bank_deposit' . $normal_option_postfix;
-                break;
-            case 'Aim':
-                $option_name = $normal_option_prefix . 'authnet_aim' . $normal_option_postfix;
-                break;
-            case 'Check':
-                $option_name = $normal_option_prefix . 'check_payment' . $normal_option_postfix;
-                break;
-            case 'Ideal':
-                $option_name = $normal_option_prefix . 'ideal_mollie' . $normal_option_postfix;
-                break;
-            case 'Invoice':
-                $option_name = $normal_option_prefix . 'invoice_payment' . $normal_option_postfix;
-                break;
-            case 'Purchase_Order':
-                $option_name = $normal_option_prefix . 'purchase_order_payment' . $normal_option_postfix;
-                break;
-            case 'USAePay_Offsite':
-                $option_name = 'espresso_usaepay_offsite' . $normal_option_postfix;
-                break;
-            case 'USAePay_Onsite':
-                $option_name = 'espresso_usaepay_onsite' . $normal_option_postfix;
-                break;
-            default:
-                $option_name = apply_filters(
-                    'FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option',
-                    $normal_option_prefix . $old_gateway_slug . $normal_option_postfix
-                );
-        }
-        return $option_name;
-    }
+	/**
+	 * Just gets the old gateways slug
+	 *
+	 * @param string $new_gateway_slug
+	 * @return string
+	 */
+	private function _get_old_gateway_option_name(string $new_gateway_slug): string
+	{
+		$new_gateway_slugs_to_new = array_flip(
+			array_merge(
+				$this->_gateways_we_know_how_to_migrate,
+				$this->_gateways_we_leave_alone
+			)
+		);
+		$old_gateway_slug         = $new_gateway_slugs_to_new[ $new_gateway_slug ];
+		$normal_option_prefix     = 'event_espresso_';
+		$normal_option_postfix    = '_settings';
+		switch ($new_gateway_slug) {
+			case 'Bank':
+				$option_name = $normal_option_prefix . 'bank_deposit' . $normal_option_postfix;
+				break;
+			case 'Aim':
+				$option_name = $normal_option_prefix . 'authnet_aim' . $normal_option_postfix;
+				break;
+			case 'Check':
+				$option_name = $normal_option_prefix . 'check_payment' . $normal_option_postfix;
+				break;
+			case 'Ideal':
+				$option_name = $normal_option_prefix . 'ideal_mollie' . $normal_option_postfix;
+				break;
+			case 'Invoice':
+				$option_name = $normal_option_prefix . 'invoice_payment' . $normal_option_postfix;
+				break;
+			case 'Purchase_Order':
+				$option_name = $normal_option_prefix . 'purchase_order_payment' . $normal_option_postfix;
+				break;
+			case 'USAePay_Offsite':
+				$option_name = 'espresso_usaepay_offsite' . $normal_option_postfix;
+				break;
+			case 'USAePay_Onsite':
+				$option_name = 'espresso_usaepay_onsite' . $normal_option_postfix;
+				break;
+			default:
+				$option_name = apply_filters(
+					'FHEE__EE_DMS_4_1_0_gateways__get_old_gateway_option',
+					$normal_option_prefix . $old_gateway_slug . $normal_option_postfix
+				);
+		}
+		return $option_name;
+	}
 
 
-    private function _convert_active_gateways()
-    {
-        // just does it all one big swoop
-        $old_active_gateways = get_option('event_espresso_active_gateways');
-        $new_active_gateways = EE_Config::instance()->gateway->active_gateways;
-        foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
-            if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
-                $this->add_error(
-                    sprintf(esc_html__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug)
-                );
-                continue;
-            }
-            $new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
+	private function _convert_active_gateways()
+	{
+		// just does it all one big swoop
+		$old_active_gateways = get_option('event_espresso_active_gateways');
+		$new_active_gateways = EE_Config::instance()->gateway->active_gateways;
+		foreach ($old_active_gateways as $old_gateway_slug => $filepath) {
+			if (! isset($this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ])) {
+				$this->add_error(
+					sprintf(esc_html__("The %s gateway does not exist in EE 4.1", "event_espresso"), $old_gateway_slug)
+				);
+				continue;
+			}
+			$new_gateway_slug = $this->_gateways_we_know_how_to_migrate[ $old_gateway_slug ];
 
-            // in the new format we can also upload gateways to the uploads directory and
-            $new_active_gateways[ $new_gateway_slug ] = false;
-        }
-        EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
-    }
+			// in the new format we can also upload gateways to the uploads directory and
+			$new_active_gateways[ $new_gateway_slug ] = false;
+		}
+		EE_Config::instance()->gateway->active_gateways = $new_active_gateways;
+	}
 }

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_questions.dmsstage.php

Indentation +144 added lines, -144 removed lines

@@ -67,159 +67,159 @@
 class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage
 {
 
-    private string $_option_table;
+	private string $_option_table;
 
 
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name  = esc_html__("Questions", "event_espresso");
-        $this->_old_table    = $wpdb->prefix . "events_question";
-        $this->_new_table    = $wpdb->prefix . "esp_question";
-        $this->_option_table = $wpdb->prefix . "esp_question_option";
-        parent::__construct();
-    }
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name  = esc_html__("Questions", "event_espresso");
+		$this->_old_table    = $wpdb->prefix . "events_question";
+		$this->_new_table    = $wpdb->prefix . "esp_question";
+		$this->_option_table = $wpdb->prefix . "esp_question_option";
+		parent::__construct();
+	}
 
 
-    /**
-     * @throws EE_Error
-     */
-    public function _migration_step($num_items_to_migrate = 50)
-    {
-        global $wpdb;
-        $start_at_record         = $this->count_records_migrated();
-        $rows                    = $wpdb->get_results(
-            $wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items_to_migrate),
-            ARRAY_A
-        );
-        $items_actually_migrated = 0;
-        foreach ($rows as $question_row) {
-            $new_id = $this->_insert_new_question($question_row);
-            $this->get_migration_script()->set_mapping(
-                $this->_old_table,
-                $question_row['id'],
-                $this->_new_table,
-                $new_id
-            );
-            $items_actually_migrated++;
-        }
-        if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	/**
+	 * @throws EE_Error
+	 */
+	public function _migration_step($num_items_to_migrate = 50)
+	{
+		global $wpdb;
+		$start_at_record         = $this->count_records_migrated();
+		$rows                    = $wpdb->get_results(
+			$wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items_to_migrate),
+			ARRAY_A
+		);
+		$items_actually_migrated = 0;
+		foreach ($rows as $question_row) {
+			$new_id = $this->_insert_new_question($question_row);
+			$this->get_migration_script()->set_mapping(
+				$this->_old_table,
+				$question_row['id'],
+				$this->_new_table,
+				$new_id
+			);
+			$items_actually_migrated++;
+		}
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 
 
-    public function _count_records_to_migrate()
-    {
-        global $wpdb;
-        return $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
-    }
+	public function _count_records_to_migrate()
+	{
+		global $wpdb;
+		return $wpdb->get_var("SELECT COUNT(id) FROM " . $this->_old_table);
+	}
 
 
-    private function _insert_new_question($old_question): int
-    {
-        global $wpdb;
-        // if this pretends to be a 'system' question, check if we already have a
-        // system question for that string. If so, pretend THAT new question
-        // is what we just inserted
-        if ($old_question['system_name']) {
-            $id_of_new_system_question = intval(
-                $wpdb->get_var(
-                    $wpdb->prepare(
-                        "SELECT QST_ID FROM $this->_new_table WHERE QST_system = %s",
-                        $old_question['system_name']
-                    )
-                )
-            );
-            if ($id_of_new_system_question) {
-                return $id_of_new_system_question;
-            }
-            // ok so this must be the first one. Carry on.
-        }
+	private function _insert_new_question($old_question): int
+	{
+		global $wpdb;
+		// if this pretends to be a 'system' question, check if we already have a
+		// system question for that string. If so, pretend THAT new question
+		// is what we just inserted
+		if ($old_question['system_name']) {
+			$id_of_new_system_question = intval(
+				$wpdb->get_var(
+					$wpdb->prepare(
+						"SELECT QST_ID FROM $this->_new_table WHERE QST_system = %s",
+						$old_question['system_name']
+					)
+				)
+			);
+			if ($id_of_new_system_question) {
+				return $id_of_new_system_question;
+			}
+			// ok so this must be the first one. Carry on.
+		}
 
-        $cols_n_values = [
-            'QST_display_text'  => stripslashes($old_question['question']),
-            'QST_admin_label'   => sanitize_title($old_question['question'] ?: ''),
-            'QST_system'        => (string) $old_question['system_name'],
-            'QST_type'          => $old_question['question_type'],
-            'QST_required'      => 'Y' == $old_question['required'],
-            'QST_required_text' => stripslashes($old_question['required_text'] ?: ''),
-            'QST_order'         => $old_question['sequence'],
-            'QST_admin_only'    => 'Y' == $old_question['admin_only'],
-            'QST_wp_user'       => $old_question['wp_user'],
-            'QST_deleted'       => false,
-        ];
-        $data_types    = [
-            '%s',// QST_display_text
-            '%s',// QST-admin_label
-            '%s',// QST_system
-            '%s',// QST_type
-            '%d',// QST_required
-            '%s',// QST_required_text
-            '%d',// QST_order
-            '%d',// QST_admin_only
-            '%d',// QST_wp_user
-            '%d',// QST_deleted
-        ];
-        $success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_question,
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        $new_id = $wpdb->insert_id;
-        // now take care of possibly adding question options
-        if (in_array($old_question['question_type'], ['DROPDOWN', 'SINGLE', 'MULTIPLE'])) {
-            $options = explode(",", $old_question['response']);
-            foreach ($options as $option) {
-                $this->_insert_question_option($option, $new_id);
-            }
-        }
-        return $new_id;
-    }
+		$cols_n_values = [
+			'QST_display_text'  => stripslashes($old_question['question']),
+			'QST_admin_label'   => sanitize_title($old_question['question'] ?: ''),
+			'QST_system'        => (string) $old_question['system_name'],
+			'QST_type'          => $old_question['question_type'],
+			'QST_required'      => 'Y' == $old_question['required'],
+			'QST_required_text' => stripslashes($old_question['required_text'] ?: ''),
+			'QST_order'         => $old_question['sequence'],
+			'QST_admin_only'    => 'Y' == $old_question['admin_only'],
+			'QST_wp_user'       => $old_question['wp_user'],
+			'QST_deleted'       => false,
+		];
+		$data_types    = [
+			'%s',// QST_display_text
+			'%s',// QST-admin_label
+			'%s',// QST_system
+			'%s',// QST_type
+			'%d',// QST_required
+			'%s',// QST_required_text
+			'%d',// QST_order
+			'%d',// QST_admin_only
+			'%d',// QST_wp_user
+			'%d',// QST_deleted
+		];
+		$success       = $wpdb->insert($this->_new_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_question,
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		$new_id = $wpdb->insert_id;
+		// now take care of possibly adding question options
+		if (in_array($old_question['question_type'], ['DROPDOWN', 'SINGLE', 'MULTIPLE'])) {
+			$options = explode(",", $old_question['response']);
+			foreach ($options as $option) {
+				$this->_insert_question_option($option, $new_id);
+			}
+		}
+		return $new_id;
+	}
 
 
-    /**
-     * Adds a question option to the db
-     *
-     * @param string $option
-     * @param int    $question_id
-     * @return void
-     * @global wpdb  $wpdb
-     */
-    private function _insert_question_option(string $option, int $question_id): void
-    {
-        $option = trim($option);
-        global $wpdb;
-        $cols_n_values = [
-            'QST_ID'      => $question_id,
-            'QSO_value'   => $option,
-            'QSO_deleted' => false,
-        ];
-        $data_types    = [
-            '%d',// QST_ID
-            '%s',// QSO_value
-            '%d',// QSO_deleted
-        ];
-        $success       = $wpdb->insert($this->_option_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    ['option' => $option, 'new_question_id' => $question_id],
-                    $this->_option_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-        }
-    }
+	/**
+	 * Adds a question option to the db
+	 *
+	 * @param string $option
+	 * @param int    $question_id
+	 * @return void
+	 * @global wpdb  $wpdb
+	 */
+	private function _insert_question_option(string $option, int $question_id): void
+	{
+		$option = trim($option);
+		global $wpdb;
+		$cols_n_values = [
+			'QST_ID'      => $question_id,
+			'QSO_value'   => $option,
+			'QSO_deleted' => false,
+		];
+		$data_types    = [
+			'%d',// QST_ID
+			'%s',// QSO_value
+			'%d',// QSO_deleted
+		];
+		$success       = $wpdb->insert($this->_option_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					['option' => $option, 'new_question_id' => $question_id],
+					$this->_option_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+		}
+	}
 }

core/data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_events.dmsstage.php

Indentation +817 added lines, -817 removed lines

@@ -175,825 +175,825 @@
 class EE_DMS_4_1_0_events extends EE_Data_Migration_Script_Stage
 {
 
-    private string $_old_start_end_table;
-
-    private string $_new_meta_table;
-
-    private string $_new_datetime_table;
-
-
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_old_table           = $wpdb->prefix . "events_detail";
-        $this->_old_start_end_table = $wpdb->prefix . "events_start_end";
-        $this->_new_table           = $wpdb->prefix . "posts";
-        $this->_new_meta_table      = $wpdb->prefix . "esp_event_meta";
-        $this->_new_datetime_table  = $wpdb->prefix . "esp_datetime";
-        $this->_pretty_name         = esc_html__("Events", "event_espresso");
-        parent::__construct();
-    }
-
-
-    /**
-     * Counts the records to migrate; the public version may cache it
-     *
-     * @return int
-     */
-    public function _count_records_to_migrate(): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
-    }
-
-
-    /**
-     * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property
-     * accordingly. Note: it should not alter the count of items migrated. That is done in the public function that
-     * calls this. IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the
-     * last migration step, otherwise it should always return $num_items_to_migrate. (Eg, if we're migrating attendees
-     * rows from the database, and $num_items_to_migrate is set to 50, then we SHOULD actually migrate 50 rows,but at
-     * very least we MUST report/return 50 items migrated)
-     *
-     * @param int $num_items_to_migrate
-     * @return int number of items ACTUALLY migrated
-     * @throws EE_Error
-     */
-    protected function _migration_step($num_items_to_migrate = 50)
-    {
-        global $wpdb;
-        // because the migration of each event can be a LOT more work, make each step smaller
-        $num_items_to_migrate     = max(1, $num_items_to_migrate / 5);
-        $events                   =
-            $wpdb->get_results(
-                $wpdb->prepare(
-                    "SELECT * FROM $this->_old_table WHERE event_status!='D' LIMIT %d,%d",
-                    $this->count_records_migrated(),
-                    $num_items_to_migrate
-                ),
-                ARRAY_A
-            );
-        $items_migrated_this_step = 0;
-
-        foreach ($events as $event_row) {
-            $guid = null;
-            // insert new 4.1 Attendee object using $wpdb
-            $post_id = $this->_insert_cpt($event_row);
-            if ($post_id) {
-                $this->get_migration_script()->set_mapping(
-                    $this->_old_table,
-                    $event_row['id'],
-                    $this->_new_table,
-                    $post_id
-                );
-                $meta_id = $this->_insert_event_meta($event_row, $post_id);
-                if ($meta_id) {
-                    $this->get_migration_script()->set_mapping(
-                        $this->_old_table,
-                        $event_row['id'],
-                        $this->_new_meta_table,
-                        $meta_id
-                    );
-                }
-                $this->_convert_start_end_times($event_row, $post_id);
-                $event_meta = maybe_unserialize($event_row['event_meta']);
-                $guid       = $event_meta['event_thumbnail_url'] ?? null;
-                if ($guid) {
-                    $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
-                        $guid,
-                        $post_id,
-                        $this
-                    );
-                }
-                // maybe create a venue from info on the event?
-                $new_venue_id = $this->_maybe_create_venue($event_row);
-                if ($new_venue_id) {
-                    $this->_insert_new_venue_to_event($post_id, $new_venue_id);
-                }
-                $this->_add_post_metas($event_row, $post_id);
-            }
-            $items_migrated_this_step++;
-            if ($guid) {
-                // if we had to check for an image attachment
-                // then let's call it a day (avoid timing out, because this took a long time)
-                break;
-            }
-        }
-        if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
-            $this->set_status(EE_Data_Migration_Manager::status_completed);
-        }
-        return $items_migrated_this_step;
-    }
-
-
-    /**
-     * Stores any extra 3.1 "event_meta" column things as post meta
-     *
-     * @param array $old_event
-     * @param int   $post_id
-     * @return void
-     */
-    private function _add_post_metas(array $old_event, int $post_id)
-    {
-        $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (! $event_meta || ! is_array($event_meta)) {
-            return;
-        }
-        unset($event_meta['date_submitted']);              // factored into CPT
-        unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
-        unset($event_meta['default_payment_status']);      // dido
-        unset($event_meta['event_thumbnail_url']);         // used to find post featured image
-        foreach ($event_meta as $meta_key => $meta_value) {
-            if ($meta_key) {// if the meta key is just an empty string, ignore it
-                $success = add_post_meta($post_id, $meta_key, $meta_value, true);
-                if (! $success) {
-                    $this->add_error(
-                        sprintf(
-                            esc_html__(
-                                "Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s",
-                                "event_espresso"
-                            ),
-                            $post_id,
-                            $meta_key,
-                            $meta_value,
-                            implode(",", $old_event)
-                        )
-                    );
-                }
-            }
-        }
-        if ($old_event['alt_email']) {
-            add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
-        }
-        if ($old_event['recurrence_id']) {
-            add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
-        }
-    }
-
-
-    /**
-     * Finds a unique slug for this event, given its name (we could have simply used
-     * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
-     * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
-     *
-     * @param string $event_name      (the name of the event for reading by humans)
-     * @param string $old_identifier  the old EE3 identifier (a long unique string)
-     * @param string $new_post_status a post status
-     * @return string
-     */
-    private function _find_unique_slug(
-        string $event_name,
-        string $old_identifier = '',
-        string $new_post_status = 'publish'
-    ): string {
-        $original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
-        return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
-    }
-
-
-    /**
-     * returns whether there is a post that has this same slug (post_title)
-     *
-     * @param string $slug
-     * @return boolean
-     * @global wpdb  $wpdb
-     */
-    private function _other_post_exists_with_that_slug(string $slug): bool
-    {
-        global $wpdb;
-        $query =
-            $wpdb->prepare(
-                "SELECT COUNT(ID) FROM $this->_new_table WHERE event_status != 'D' AND post_name = %s",
-                $slug
-            );
-        $count = $wpdb->get_var($query);
-        return (bool) intval($count);
-    }
-
-
-    /**
-     * @param $old_event
-     * @return int
-     */
-    private function _insert_cpt($old_event): int
-    {
-        global $wpdb;
-        // convert 3.1 event status to 4.1 CPT status
-        // for reference, 3.1 event stati available for setting are:
-        //      $status = array(array('id' => 'A', 'text' => esc_html__('Public', 'event_espresso')), array('id' => 'S', 'text' => esc_html__('Waitlist', 'event_espresso')), array('id' => 'O', 'text' => esc_html__('Ongoing', 'event_espresso')), array('id' => 'R', 'text' => esc_html__('Draft', 'event_espresso')), array('id' => 'D', 'text' => esc_html__('Deleted', 'event_espresso')));
-        //      and the json api uses the following to convert from 3.1 to 4.0
-        //      'S'=>'secondary/waitlist',
-        //      'A'=>'active',
-        //      'X'=>'denied',
-        //      'IA'=>'inactive',
-        //      'O'=>'ongoing',
-        //      'P'=>'pending',
-        //      'R'=>'draft',
-        //      'D'=>'deleted');
-        //      4.1 Event Post stati are the normal post statis
-        //      (publish,future,draft,pending,private,trash,auto-draft,inherit)
-        //      and 3 custom ones: cancelled,postponed,sold_out
-        $status_conversions = [
-            'R'  => 'draft',
-            'X'  => 'draft',
-            // 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
-            'P'  => 'pending',
-            'IA' => 'draft',
-            // draft and in the past
-            // IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
-            'O'  => 'publish',
-            // @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
-            'A'  => 'publish',
-            'S'  => 'draft',
-            // @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
-            'D'  => 'trash',
-        ];
-        $post_status        = $status_conversions[ $old_event['event_status'] ];
-        // check if we've sold out
-        if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
-            $post_status = 'sold_out';
-        }
-        //      FYI postponed and cancelled don't exist in 3.1
-        $cols_n_values                      = [
-            'post_title'        => stripslashes($old_event['event_name']),// EVT_name
-            'post_content'      => stripslashes($old_event['event_desc']),// EVT_desc
-            'post_name'         => $this->_find_unique_slug(
-                $old_event['event_name'],
-                $old_event['event_identifier'],
-                $post_status
-            ),// EVT_slug
-            'post_date'         => $old_event['submitted'],// EVT_created NOT
-            'post_date_gmt'     => get_gmt_from_date($old_event['submitted']),
-            'post_excerpt'      => '',// EVT_short_desc
-            'post_modified'     => $old_event['submitted'],// EVT_modified
-            'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_author'       => $old_event['wp_user'],// EVT_wp_user
-            'post_parent'       => 0,// parent maybe get this from some REM field?
-            'menu_order'        => 0,// EVT_order
-            'post_type'         => 'espresso_events',// post_type
-            'post_status'       => $post_status,// status
-        ];
-        $cols_n_values_with_no_invalid_text = [];
-        foreach ($cols_n_values as $col => $value) {
-            $value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
-            if (! is_wp_error($value_sans_invalid_chars)) {
-                $cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
-            } else {
-                // otherwise leave it as-is. It will blow everything up and stop the migration
-                $cols_n_values_with_no_invalid_text[ $col ] = $value;
-            }
-        }
-        $cols_n_values = $cols_n_values_with_no_invalid_text;
-        $data_types    = [
-            '%s',// EVT_name
-            '%s',// EVT_desc
-            '%s',// EVT_slug
-            '%s',// EVT_created
-            '%s',
-            '%s',// EVT_short_desc
-            '%s',// EVT_modified
-            '%s',
-            '%s',// EVT_wp_user
-            '%d',// post_parent
-            '%d',// EVT_order
-            '%s',// post_type
-            '%s',// status
-        ];
-        $success       = $wpdb->insert(
-            $this->_new_table,
-            $cols_n_values,
-            $data_types
-        );
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * Counts all the registrations for the event in the 3.1 DB. (takes into account attendee rows which represent
-     * various registrations)
-     *
-     * @param int   $event_id
-     * @return int
-     * @global wpdb $wpdb
-     */
-    public static function count_registrations(int $event_id): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var(
-            $wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id)
-        );
-    }
-
-
-    /**
-     * @param $old_event
-     * @param $new_cpt_id
-     * @return int
-     */
-    private function _insert_event_meta($old_event, $new_cpt_id): int
-    {
-        global $wpdb;
-        $event_meta = maybe_unserialize($old_event['event_meta']);
-        //      for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
-        //  array('id' => "", 'text' => 'No Change'),
-        //  array('id' => 'Incomplete', 'text' => 'Incomplete'),
-        //  array('id' => 'Pending', 'text' => 'Pending'),
-        //  //array('id' => 'Completed', 'text' => 'Completed')
-        // );
-        $default_reg_status =
-            $this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
-                $event_meta['default_payment_status'] ?? '',
-                intval($old_event['require_pre_approval'])
-            );
-        $cols_n_values      = [
-            'EVT_ID'                          => $new_cpt_id,// EVT_ID_fk
-            'EVT_display_desc'                => 'Y' == $old_event['display_desc'],
-            'EVT_display_ticket_selector'     => 'Y' == $old_event['display_reg_form'],
-            'EVT_visible_on'                  => $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $old_event,
-                current_time(
-                    'mysql'
-                ),
-                $old_event['timezone_string']
-            ),// don't use the old 'visible_on', as it wasn't ever used
-            'EVT_additional_limit'            => $old_event['allow_multiple'] == 'N' ? 1
-                : $old_event['additional_limit'],
-            'EVT_default_registration_status' => $default_reg_status,
-            'EVT_member_only'                 => $old_event['member_only'],
-            'EVT_phone'                       => $old_event['phone'],
-            'EVT_allow_overflow'              => 'Y' == $old_event['allow_overflow'],
-            'EVT_timezone_string'             => $old_event['timezone_string'],
-            'EVT_external_URL'                => $old_event['externalURL'],
-            'EVT_donations'                   => false,// doesn't exist in 3.1
-
-        ];
-        $data_types         = [
-            '%s',// EVT_ID
-            '%d',// EVT_display_desc
-            '%d',// EVT_display_ticket_selector
-            '%s',// EVT_visible_on
-            '%d',// EVT_additional_limit
-            '%s',// EVT_default_registration_status
-            '%d',// EVT_member_only
-            '%s',// EVT_phone
-            '%d',// EVT_allow_overflow
-            '%s',// EVT_timezone_string
-            '%s',// EVT_external_URL
-            '%d',// EVT_donations
-        ];
-        $success            = $wpdb->insert(
-            $this->_new_meta_table,
-            $cols_n_values,
-            $data_types
-        );
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_meta_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * @param $old_event
-     * @return int
-     */
-    private function _maybe_create_venue($old_event): int
-    {
-        if (
-            $old_event['address'] ||
-            $old_event['address2'] ||
-            $old_event['city'] ||
-            $old_event['state'] ||
-            $old_event['zip'] ||
-            $old_event['venue_title'] ||
-            $old_event['venue_url'] ||
-            $old_event['venue_image'] ||
-            $old_event['venue_phone'] ||
-            $old_event['virtual_url'] ||
-            $old_event['virtual_phone']
-        ) {
-            $old_id = $this->_duplicate_venue_exists($old_event);
-            if ($old_id) {
-                return $old_id;
-            }
-            $new_id = $this->_insert_venue_into_posts($old_event);
-            if ($new_id) {
-                $this->_insert_venue_into_meta_table($new_id, $old_event);
-                $guid = $old_event['venue_image'] ?? null;
-                if($guid) {
-                    $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
-                        $guid,
-                        $new_id,
-                        $this
-                    );
-                }
-            }
-            // we don't bother recording the conversion from old events to venues as that
-            // will complicate finding the conversion from old venues to new events
-            return $new_id;
-        }
-        return 0;
-    }
-
-
-    /**
-     * Assuming there is venue data on this event, check if there is a duplicate venue already in the system for it.
-     * If so, return it. Otherwise, return NULL.
-     *
-     * @param array $old_event
-     * @return int duplicate venue id
-     */
-    private function _duplicate_venue_exists(array $old_event): int
-    {
-        global $wpdb;
-        $conditions     = [
-            'VNU_address'       => $old_event ['address'],
-            'VNU_address2'      => $old_event['address2'],
-            'VNU_city'          => $old_event['city'],
-            'VNU_zip'           => $old_event['zip'],
-            'post_title'        => $this->_get_venue_title_for_event($old_event),
-            'VNU_phone'         => $old_event['venue_phone'],// VNU_phone
-            'VNU_url'           => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'   => $old_event['virtual_url'],// VNU_virtual_url
-        ];
-        $sql_conditions = [];
-        foreach ($conditions as $column => $value) {
-            $sql_conditions [] = $wpdb->prepare("$column = %s", $value);
-        }
-        $query = "SELECT VNU_ID
+	private string $_old_start_end_table;
+
+	private string $_new_meta_table;
+
+	private string $_new_datetime_table;
+
+
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_old_table           = $wpdb->prefix . "events_detail";
+		$this->_old_start_end_table = $wpdb->prefix . "events_start_end";
+		$this->_new_table           = $wpdb->prefix . "posts";
+		$this->_new_meta_table      = $wpdb->prefix . "esp_event_meta";
+		$this->_new_datetime_table  = $wpdb->prefix . "esp_datetime";
+		$this->_pretty_name         = esc_html__("Events", "event_espresso");
+		parent::__construct();
+	}
+
+
+	/**
+	 * Counts the records to migrate; the public version may cache it
+	 *
+	 * @return int
+	 */
+	public function _count_records_to_migrate(): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
+	}
+
+
+	/**
+	 * IMPORTANT: if an error is encountered, or everything is finished, this stage should update its status property
+	 * accordingly. Note: it should not alter the count of items migrated. That is done in the public function that
+	 * calls this. IMPORTANT: The count of items migrated should ONLY be less than $num_items_to_migrate when it's the
+	 * last migration step, otherwise it should always return $num_items_to_migrate. (Eg, if we're migrating attendees
+	 * rows from the database, and $num_items_to_migrate is set to 50, then we SHOULD actually migrate 50 rows,but at
+	 * very least we MUST report/return 50 items migrated)
+	 *
+	 * @param int $num_items_to_migrate
+	 * @return int number of items ACTUALLY migrated
+	 * @throws EE_Error
+	 */
+	protected function _migration_step($num_items_to_migrate = 50)
+	{
+		global $wpdb;
+		// because the migration of each event can be a LOT more work, make each step smaller
+		$num_items_to_migrate     = max(1, $num_items_to_migrate / 5);
+		$events                   =
+			$wpdb->get_results(
+				$wpdb->prepare(
+					"SELECT * FROM $this->_old_table WHERE event_status!='D' LIMIT %d,%d",
+					$this->count_records_migrated(),
+					$num_items_to_migrate
+				),
+				ARRAY_A
+			);
+		$items_migrated_this_step = 0;
+
+		foreach ($events as $event_row) {
+			$guid = null;
+			// insert new 4.1 Attendee object using $wpdb
+			$post_id = $this->_insert_cpt($event_row);
+			if ($post_id) {
+				$this->get_migration_script()->set_mapping(
+					$this->_old_table,
+					$event_row['id'],
+					$this->_new_table,
+					$post_id
+				);
+				$meta_id = $this->_insert_event_meta($event_row, $post_id);
+				if ($meta_id) {
+					$this->get_migration_script()->set_mapping(
+						$this->_old_table,
+						$event_row['id'],
+						$this->_new_meta_table,
+						$meta_id
+					);
+				}
+				$this->_convert_start_end_times($event_row, $post_id);
+				$event_meta = maybe_unserialize($event_row['event_meta']);
+				$guid       = $event_meta['event_thumbnail_url'] ?? null;
+				if ($guid) {
+					$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
+						$guid,
+						$post_id,
+						$this
+					);
+				}
+				// maybe create a venue from info on the event?
+				$new_venue_id = $this->_maybe_create_venue($event_row);
+				if ($new_venue_id) {
+					$this->_insert_new_venue_to_event($post_id, $new_venue_id);
+				}
+				$this->_add_post_metas($event_row, $post_id);
+			}
+			$items_migrated_this_step++;
+			if ($guid) {
+				// if we had to check for an image attachment
+				// then let's call it a day (avoid timing out, because this took a long time)
+				break;
+			}
+		}
+		if ($this->count_records_migrated() + $items_migrated_this_step >= $this->count_records_to_migrate()) {
+			$this->set_status(EE_Data_Migration_Manager::status_completed);
+		}
+		return $items_migrated_this_step;
+	}
+
+
+	/**
+	 * Stores any extra 3.1 "event_meta" column things as post meta
+	 *
+	 * @param array $old_event
+	 * @param int   $post_id
+	 * @return void
+	 */
+	private function _add_post_metas(array $old_event, int $post_id)
+	{
+		$event_meta = maybe_unserialize($old_event['event_meta']);
+		if (! $event_meta || ! is_array($event_meta)) {
+			return;
+		}
+		unset($event_meta['date_submitted']);              // factored into CPT
+		unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
+		unset($event_meta['default_payment_status']);      // dido
+		unset($event_meta['event_thumbnail_url']);         // used to find post featured image
+		foreach ($event_meta as $meta_key => $meta_value) {
+			if ($meta_key) {// if the meta key is just an empty string, ignore it
+				$success = add_post_meta($post_id, $meta_key, $meta_value, true);
+				if (! $success) {
+					$this->add_error(
+						sprintf(
+							esc_html__(
+								"Could not add post meta for CPT with ID #%d. Meta key: '%s',meta value:'%d' for 3.1 event: %s",
+								"event_espresso"
+							),
+							$post_id,
+							$meta_key,
+							$meta_value,
+							implode(",", $old_event)
+						)
+					);
+				}
+			}
+		}
+		if ($old_event['alt_email']) {
+			add_post_meta($post_id, 'alt_email', $old_event['alt_email']);
+		}
+		if ($old_event['recurrence_id']) {
+			add_post_meta($post_id, 'recurrence_id', $old_event['recurrence_id']);
+		}
+	}
+
+
+	/**
+	 * Finds a unique slug for this event, given its name (we could have simply used
+	 * the old unique_identifier column, but it added a long string of seemingly random characters onto the end
+	 * and really wasn't that pretty for a slug, so we decided we'd make our own slug again)
+	 *
+	 * @param string $event_name      (the name of the event for reading by humans)
+	 * @param string $old_identifier  the old EE3 identifier (a long unique string)
+	 * @param string $new_post_status a post status
+	 * @return string
+	 */
+	private function _find_unique_slug(
+		string $event_name,
+		string $old_identifier = '',
+		string $new_post_status = 'publish'
+	): string {
+		$original_name = $event_name ? sanitize_title($event_name) : $old_identifier;
+		return wp_unique_post_slug($original_name, 0, $new_post_status, 'espresso_events', 0);
+	}
+
+
+	/**
+	 * returns whether there is a post that has this same slug (post_title)
+	 *
+	 * @param string $slug
+	 * @return boolean
+	 * @global wpdb  $wpdb
+	 */
+	private function _other_post_exists_with_that_slug(string $slug): bool
+	{
+		global $wpdb;
+		$query =
+			$wpdb->prepare(
+				"SELECT COUNT(ID) FROM $this->_new_table WHERE event_status != 'D' AND post_name = %s",
+				$slug
+			);
+		$count = $wpdb->get_var($query);
+		return (bool) intval($count);
+	}
+
+
+	/**
+	 * @param $old_event
+	 * @return int
+	 */
+	private function _insert_cpt($old_event): int
+	{
+		global $wpdb;
+		// convert 3.1 event status to 4.1 CPT status
+		// for reference, 3.1 event stati available for setting are:
+		//      $status = array(array('id' => 'A', 'text' => esc_html__('Public', 'event_espresso')), array('id' => 'S', 'text' => esc_html__('Waitlist', 'event_espresso')), array('id' => 'O', 'text' => esc_html__('Ongoing', 'event_espresso')), array('id' => 'R', 'text' => esc_html__('Draft', 'event_espresso')), array('id' => 'D', 'text' => esc_html__('Deleted', 'event_espresso')));
+		//      and the json api uses the following to convert from 3.1 to 4.0
+		//      'S'=>'secondary/waitlist',
+		//      'A'=>'active',
+		//      'X'=>'denied',
+		//      'IA'=>'inactive',
+		//      'O'=>'ongoing',
+		//      'P'=>'pending',
+		//      'R'=>'draft',
+		//      'D'=>'deleted');
+		//      4.1 Event Post stati are the normal post statis
+		//      (publish,future,draft,pending,private,trash,auto-draft,inherit)
+		//      and 3 custom ones: cancelled,postponed,sold_out
+		$status_conversions = [
+			'R'  => 'draft',
+			'X'  => 'draft',
+			// 4.1 doesn't have a "not approved for publishing" status. this is what posts are set to that aren't approved
+			'P'  => 'pending',
+			'IA' => 'draft',
+			// draft and in the past
+			// IA=inactive in 3.1: events were switched to this when they expired. in 4.1 that's just calculated
+			'O'  => 'publish',
+			// @todo: will be an event type later; if this is the status, set the end date WAAAY later; and add term for 'ongoing'
+			'A'  => 'publish',
+			'S'  => 'draft',
+			// @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
+			'D'  => 'trash',
+		];
+		$post_status        = $status_conversions[ $old_event['event_status'] ];
+		// check if we've sold out
+		if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
+			$post_status = 'sold_out';
+		}
+		//      FYI postponed and cancelled don't exist in 3.1
+		$cols_n_values                      = [
+			'post_title'        => stripslashes($old_event['event_name']),// EVT_name
+			'post_content'      => stripslashes($old_event['event_desc']),// EVT_desc
+			'post_name'         => $this->_find_unique_slug(
+				$old_event['event_name'],
+				$old_event['event_identifier'],
+				$post_status
+			),// EVT_slug
+			'post_date'         => $old_event['submitted'],// EVT_created NOT
+			'post_date_gmt'     => get_gmt_from_date($old_event['submitted']),
+			'post_excerpt'      => '',// EVT_short_desc
+			'post_modified'     => $old_event['submitted'],// EVT_modified
+			'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
+			'post_author'       => $old_event['wp_user'],// EVT_wp_user
+			'post_parent'       => 0,// parent maybe get this from some REM field?
+			'menu_order'        => 0,// EVT_order
+			'post_type'         => 'espresso_events',// post_type
+			'post_status'       => $post_status,// status
+		];
+		$cols_n_values_with_no_invalid_text = [];
+		foreach ($cols_n_values as $col => $value) {
+			$value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
+			if (! is_wp_error($value_sans_invalid_chars)) {
+				$cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+			} else {
+				// otherwise leave it as-is. It will blow everything up and stop the migration
+				$cols_n_values_with_no_invalid_text[ $col ] = $value;
+			}
+		}
+		$cols_n_values = $cols_n_values_with_no_invalid_text;
+		$data_types    = [
+			'%s',// EVT_name
+			'%s',// EVT_desc
+			'%s',// EVT_slug
+			'%s',// EVT_created
+			'%s',
+			'%s',// EVT_short_desc
+			'%s',// EVT_modified
+			'%s',
+			'%s',// EVT_wp_user
+			'%d',// post_parent
+			'%d',// EVT_order
+			'%s',// post_type
+			'%s',// status
+		];
+		$success       = $wpdb->insert(
+			$this->_new_table,
+			$cols_n_values,
+			$data_types
+		);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * Counts all the registrations for the event in the 3.1 DB. (takes into account attendee rows which represent
+	 * various registrations)
+	 *
+	 * @param int   $event_id
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	public static function count_registrations(int $event_id): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var(
+			$wpdb->prepare("SELECT sum(quantity) FROM {$wpdb->prefix}events_attendee WHERE event_id=%d", $event_id)
+		);
+	}
+
+
+	/**
+	 * @param $old_event
+	 * @param $new_cpt_id
+	 * @return int
+	 */
+	private function _insert_event_meta($old_event, $new_cpt_id): int
+	{
+		global $wpdb;
+		$event_meta = maybe_unserialize($old_event['event_meta']);
+		//      for reference, 3.1 'default_payment_status' are: $default_payment_status = array(
+		//  array('id' => "", 'text' => 'No Change'),
+		//  array('id' => 'Incomplete', 'text' => 'Incomplete'),
+		//  array('id' => 'Pending', 'text' => 'Pending'),
+		//  //array('id' => 'Completed', 'text' => 'Completed')
+		// );
+		$default_reg_status =
+			$this->get_migration_script()->convert_3_1_payment_status_to_4_1_STS_ID(
+				$event_meta['default_payment_status'] ?? '',
+				intval($old_event['require_pre_approval'])
+			);
+		$cols_n_values      = [
+			'EVT_ID'                          => $new_cpt_id,// EVT_ID_fk
+			'EVT_display_desc'                => 'Y' == $old_event['display_desc'],
+			'EVT_display_ticket_selector'     => 'Y' == $old_event['display_reg_form'],
+			'EVT_visible_on'                  => $this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$old_event,
+				current_time(
+					'mysql'
+				),
+				$old_event['timezone_string']
+			),// don't use the old 'visible_on', as it wasn't ever used
+			'EVT_additional_limit'            => $old_event['allow_multiple'] == 'N' ? 1
+				: $old_event['additional_limit'],
+			'EVT_default_registration_status' => $default_reg_status,
+			'EVT_member_only'                 => $old_event['member_only'],
+			'EVT_phone'                       => $old_event['phone'],
+			'EVT_allow_overflow'              => 'Y' == $old_event['allow_overflow'],
+			'EVT_timezone_string'             => $old_event['timezone_string'],
+			'EVT_external_URL'                => $old_event['externalURL'],
+			'EVT_donations'                   => false,// doesn't exist in 3.1
+
+		];
+		$data_types         = [
+			'%s',// EVT_ID
+			'%d',// EVT_display_desc
+			'%d',// EVT_display_ticket_selector
+			'%s',// EVT_visible_on
+			'%d',// EVT_additional_limit
+			'%s',// EVT_default_registration_status
+			'%d',// EVT_member_only
+			'%s',// EVT_phone
+			'%d',// EVT_allow_overflow
+			'%s',// EVT_timezone_string
+			'%s',// EVT_external_URL
+			'%d',// EVT_donations
+		];
+		$success            = $wpdb->insert(
+			$this->_new_meta_table,
+			$cols_n_values,
+			$data_types
+		);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_meta_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * @param $old_event
+	 * @return int
+	 */
+	private function _maybe_create_venue($old_event): int
+	{
+		if (
+			$old_event['address'] ||
+			$old_event['address2'] ||
+			$old_event['city'] ||
+			$old_event['state'] ||
+			$old_event['zip'] ||
+			$old_event['venue_title'] ||
+			$old_event['venue_url'] ||
+			$old_event['venue_image'] ||
+			$old_event['venue_phone'] ||
+			$old_event['virtual_url'] ||
+			$old_event['virtual_phone']
+		) {
+			$old_id = $this->_duplicate_venue_exists($old_event);
+			if ($old_id) {
+				return $old_id;
+			}
+			$new_id = $this->_insert_venue_into_posts($old_event);
+			if ($new_id) {
+				$this->_insert_venue_into_meta_table($new_id, $old_event);
+				$guid = $old_event['venue_image'] ?? null;
+				if($guid) {
+					$this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
+						$guid,
+						$new_id,
+						$this
+					);
+				}
+			}
+			// we don't bother recording the conversion from old events to venues as that
+			// will complicate finding the conversion from old venues to new events
+			return $new_id;
+		}
+		return 0;
+	}
+
+
+	/**
+	 * Assuming there is venue data on this event, check if there is a duplicate venue already in the system for it.
+	 * If so, return it. Otherwise, return NULL.
+	 *
+	 * @param array $old_event
+	 * @return int duplicate venue id
+	 */
+	private function _duplicate_venue_exists(array $old_event): int
+	{
+		global $wpdb;
+		$conditions     = [
+			'VNU_address'       => $old_event ['address'],
+			'VNU_address2'      => $old_event['address2'],
+			'VNU_city'          => $old_event['city'],
+			'VNU_zip'           => $old_event['zip'],
+			'post_title'        => $this->_get_venue_title_for_event($old_event),
+			'VNU_phone'         => $old_event['venue_phone'],// VNU_phone
+			'VNU_url'           => $old_event['venue_url'],// VNU_url
+			'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
+			'VNU_virtual_url'   => $old_event['virtual_url'],// VNU_virtual_url
+		];
+		$sql_conditions = [];
+		foreach ($conditions as $column => $value) {
+			$sql_conditions [] = $wpdb->prepare("$column = %s", $value);
+		}
+		$query = "SELECT VNU_ID
 					FROM
 		$wpdb->posts as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
 			WHERE " . implode(" AND ", $sql_conditions) . " LIMIT 1";
-        return (int) $wpdb->get_var($query);
-    }
-
-
-    /**
-     * Gets teh venue's title or makes one up if there is none
-     *
-     * @param array $event_data_array keys are events_details columns and values are their values
-     * @return string
-     */
-    protected function _get_venue_title_for_event(array $event_data_array): string
-    {
-        return $event_data_array['venue_title']
-            ? stripslashes($event_data_array['venue_title'])
-            : stripslashes(
-                sprintf(
-                    esc_html__('Venue of %s', 'event_espresso'),
-                    $event_data_array['event_name']
-                )
-            );
-    }
-
-
-    /**
-     * Inserts the CPT
-     *
-     * @param array $old_event keys are cols, values are col values
-     * @return int
-     */
-    private function _insert_venue_into_posts(array $old_event): int
-    {
-        global $wpdb;
-        $insertion_array  = [
-            'post_title'        => $this->_get_venue_title_for_event($old_event),// VNU_name
-            'post_content'      => '',// VNU_desc
-            'post_name'         => $this->_find_unique_slug(
-                $old_event['venue_title'],
-                sanitize_title('venue-of-' . $old_event['event_name'])
-            ),// VNU_identifier
-            'post_date'         => current_time('mysql'),// VNU_created
-            'post_date_gmt'     => get_gmt_from_date(current_time('mysql')),
-            'post_excerpt'      => '',// VNU_short_desc arbitrary only 50 characters
-            'post_modified'     => current_time('mysql'),// VNU_modified
-            'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
-            'post_author'       => $old_event['wp_user'],// VNU_wp_user
-            'post_parent'       => 0,// parent
-            'menu_order'        => 0,// VNU_order
-            'post_type'         => 'espresso_venues',// post_type
-        ];
-        $data_types_array = [
-            '%s',// VNU_name
-            '%s',// VNU_desc
-            '%s',// VNU_identifier
-            '%s',// VNU_created
-            '%s',
-            '%s',// VNU_short_desc
-            '%s',// VNU_modified
-            '%s',
-            '%d',// VNU_wp_user
-            '%d',// parent
-            '%d',// VNU_order
-            '%s',// post_type
-        ];
-        $success          = $wpdb->insert(
-            $wpdb->posts,
-            $insertion_array,
-            $data_types_array
-        );
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_table,
-                    $insertion_array,
-                    $data_types_array
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * Inserts into the venue_meta table
-     *
-     * @param int   $cpt_id
-     * @param array $old_event
-     * @return void
-     */
-    private function _insert_venue_into_meta_table(int $cpt_id, array $old_event): void
-    {
-        global $wpdb;
-
-        // assume the country is the same as the organization's old settings
-        $country_iso = $this->get_migration_script()->get_default_country_iso();
-        // find the state from the venue, or the organization, or just guess california
-        if (! $old_event['state']) {
-            $old_org_options = get_option('events_organization_settings');
-            $state_name      = stripslashes($old_org_options['organization_state']);
-        } else {
-            $state_name = $old_event['state'];
-        }
-        if (! $state_name) {
-            $state_name = 'CA';
-        }
-        // get a state ID with the same name, if possible
-        try {
-            $state    = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
-            $state_id = $state['STA_ID'];
-        } catch (EE_Error $e) {
-            $this->add_error($e->getMessage());
-            $state_id = 0;
-        }
-        // now insert into meta table
-        $insertion_array = [
-            'VNU_ID'              => $cpt_id,// VNU_ID_fk
-            'VNU_address'         => stripslashes($old_event['address']),// VNU_address
-            'VNU_address2'        => stripslashes($old_event['address2']),// VNU_address2
-            'VNU_city'            => stripslashes($old_event['city']),// VNU_city
-            'STA_ID'              => $state_id,// STA_ID
-            'CNT_ISO'             => $country_iso,// CNT_ISO
-            'VNU_zip'             => $old_event['zip'],// VNU_zip
-            'VNU_phone'           => $old_event['venue_phone'],// VNU_phone
-            'VNU_capacity'        => -1,// VNU_capacity
-            'VNU_url'             => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone'   => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'     => $old_event['virtual_url'],// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
-            'VNU_enable_for_gmap' => true, // VNU_enable_for_gmap
-        ];
-        $data_types      = [
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
-        ];
-        $success         = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    $old_event,
-                    $this->_new_meta_table,
-                    $insertion_array,
-                    $data_types
-                )
-            );
-        }
-    }
-
-
-    /**
-     * @param $new_event_id
-     * @param $new_venue_id
-     * @return void
-     */
-    private function _insert_new_venue_to_event($new_event_id, $new_venue_id): void
-    {
-        global $wpdb;
-        if (! $new_event_id) {
-            $this->add_error(
-                sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id)
-            );
-            return;
-        }
-        if (! $new_venue_id) {
-            $this->add_error(
-                sprintf(esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id)
-            );
-            return;
-        }
-        $cols_n_values = [
-            'EVT_ID'      => $new_event_id,
-            'VNU_ID'      => $new_venue_id,
-            'EVV_primary' => true,
-        ];
-        $data_types    = [
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
-        ];
-        $success       = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_table,
-                    [],
-                    $this->_new_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-        }
-    }
-
-
-    /**
-     * Converts all the 3.1 start-end times for the event to 4.1 datetimes
-     *
-     * @param array $old_event  results of get_results(...,ARRAY_A)
-     * @param int   $new_cpt_id new post ID
-     * @return void (if there are errors though, adds them to the stage's error list
-     * @throws EE_Error
-     * @global wpdb $wpdb
-     */
-    private function _convert_start_end_times(array $old_event, int $new_cpt_id)
-    {
-        $start_end_times = $this->_get_old_start_end_times($old_event['id']);
-        foreach ($start_end_times as $start_end_time) {
-            $datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
-            if ($datetime_id) {
-                $this->get_migration_script()->set_mapping(
-                    $this->_old_start_end_table,
-                    $start_end_time['id'],
-                    $this->_new_datetime_table,
-                    $datetime_id
-                );
-            }
-        }
-    }
-
-
-    /**
-     * Queries the 3.1 wp_events_start_end table to get all the start and end times for the event
-     *
-     * @param int   $old_event_id
-     * @return array
-     * @global wpdb $wpdb
-     */
-    private function _get_old_start_end_times(int $old_event_id): array
-    {
-        global $wpdb;
-        return $wpdb->get_results(
-            $wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id),
-            ARRAY_A
-        );
-    }
-
-
-    /**
-     * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
-     *
-     * @param array $start_end_time_row
-     * @param array $old_event_row
-     * @param int   $new_cpt_id
-     * @return int ID of new datetime
-     */
-    private function _insert_new_datetime(array $start_end_time_row, array $old_event_row, int $new_cpt_id): int
-    {
-        global $wpdb;
-        $start_date         = $old_event_row['start_date'];
-        $start_time         = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
-        $end_date           = $old_event_row['end_date'];
-        $end_time           = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
-        $existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
-        $start_datetime_utc =
-            $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $start_end_time_row,
-                "$start_date $start_time:00",
-                $old_event_row['timezone_string']
-            );
-        $end_datetime_utc   =
-            $this->get_migration_script()->convert_date_string_to_utc(
-                $this,
-                $start_end_time_row,
-                "$end_date $end_time:00",
-                $old_event_row['timezone_string']
-            );
-        $cols_n_values      = [
-            'EVT_ID'        => $new_cpt_id,
-            // EVT_ID
-            'DTT_EVT_start' => $start_datetime_utc,
-            // DTT_EVT_start
-            'DTT_EVT_end'   => $end_datetime_utc,
-            // DTT_EVT_end
-            'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit']
-                : $old_event_row['reg_limit'],
-            // DTT_reg_limit
-            'DTT_sold'      => 0,
-            // note: we will increment this as registrations are added during the migration
-            //          'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
-            'DTT_order'     => $existing_datetimes,
-            // DTT_order, just give it the same order as the count of how many datetimes already exist
-            'DTT_parent'    => 0,
-            'DTT_deleted'   => false,
-        ];
-        $data_types         = [
-            '%d',// EVT_Id
-            '%s',// DTT_EVT_start
-            '%s',// DTT_EVT_end
-            '%d',// DTT_reg_limit
-            '%d',// DTT_sold
-            //          '%d',//DTT_is_primary
-            '%d',// DTT_order
-            '%d',// DTT_parent
-            '%d',// DTT_deleted
-        ];
-        $success            = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
-        if (! $success) {
-            $this->add_error(
-                $this->get_migration_script()->_create_error_message_for_db_insertion(
-                    $this->_old_start_end_table,
-                    array_merge($old_event_row, $start_end_time_row),
-                    $this->_new_datetime_table,
-                    $cols_n_values,
-                    $data_types
-                )
-            );
-            return 0;
-        }
-        return $wpdb->insert_id;
-    }
-
-
-    /**
-     * Checks if there's a 4.1 datetime for this event already. This is mostly only handy
-     * when deciding whether a datetime we're about ot insert should be the 'primary' or not
-     *
-     * @param int   $cpt_event_id
-     * @return int
-     * @global wpdb $wpdb
-     */
-    private function _count_other_datetimes_exist_for_new_event(int $cpt_event_id): int
-    {
-        global $wpdb;
-        return (int) $wpdb->get_var(
-            $wpdb->prepare(
-                "SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",
-                $cpt_event_id
-            )
-        );
-    }
+		return (int) $wpdb->get_var($query);
+	}
+
+
+	/**
+	 * Gets teh venue's title or makes one up if there is none
+	 *
+	 * @param array $event_data_array keys are events_details columns and values are their values
+	 * @return string
+	 */
+	protected function _get_venue_title_for_event(array $event_data_array): string
+	{
+		return $event_data_array['venue_title']
+			? stripslashes($event_data_array['venue_title'])
+			: stripslashes(
+				sprintf(
+					esc_html__('Venue of %s', 'event_espresso'),
+					$event_data_array['event_name']
+				)
+			);
+	}
+
+
+	/**
+	 * Inserts the CPT
+	 *
+	 * @param array $old_event keys are cols, values are col values
+	 * @return int
+	 */
+	private function _insert_venue_into_posts(array $old_event): int
+	{
+		global $wpdb;
+		$insertion_array  = [
+			'post_title'        => $this->_get_venue_title_for_event($old_event),// VNU_name
+			'post_content'      => '',// VNU_desc
+			'post_name'         => $this->_find_unique_slug(
+				$old_event['venue_title'],
+				sanitize_title('venue-of-' . $old_event['event_name'])
+			),// VNU_identifier
+			'post_date'         => current_time('mysql'),// VNU_created
+			'post_date_gmt'     => get_gmt_from_date(current_time('mysql')),
+			'post_excerpt'      => '',// VNU_short_desc arbitrary only 50 characters
+			'post_modified'     => current_time('mysql'),// VNU_modified
+			'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
+			'post_author'       => $old_event['wp_user'],// VNU_wp_user
+			'post_parent'       => 0,// parent
+			'menu_order'        => 0,// VNU_order
+			'post_type'         => 'espresso_venues',// post_type
+		];
+		$data_types_array = [
+			'%s',// VNU_name
+			'%s',// VNU_desc
+			'%s',// VNU_identifier
+			'%s',// VNU_created
+			'%s',
+			'%s',// VNU_short_desc
+			'%s',// VNU_modified
+			'%s',
+			'%d',// VNU_wp_user
+			'%d',// parent
+			'%d',// VNU_order
+			'%s',// post_type
+		];
+		$success          = $wpdb->insert(
+			$wpdb->posts,
+			$insertion_array,
+			$data_types_array
+		);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_table,
+					$insertion_array,
+					$data_types_array
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * Inserts into the venue_meta table
+	 *
+	 * @param int   $cpt_id
+	 * @param array $old_event
+	 * @return void
+	 */
+	private function _insert_venue_into_meta_table(int $cpt_id, array $old_event): void
+	{
+		global $wpdb;
+
+		// assume the country is the same as the organization's old settings
+		$country_iso = $this->get_migration_script()->get_default_country_iso();
+		// find the state from the venue, or the organization, or just guess california
+		if (! $old_event['state']) {
+			$old_org_options = get_option('events_organization_settings');
+			$state_name      = stripslashes($old_org_options['organization_state']);
+		} else {
+			$state_name = $old_event['state'];
+		}
+		if (! $state_name) {
+			$state_name = 'CA';
+		}
+		// get a state ID with the same name, if possible
+		try {
+			$state    = $this->get_migration_script()->get_or_create_state($state_name, $country_iso);
+			$state_id = $state['STA_ID'];
+		} catch (EE_Error $e) {
+			$this->add_error($e->getMessage());
+			$state_id = 0;
+		}
+		// now insert into meta table
+		$insertion_array = [
+			'VNU_ID'              => $cpt_id,// VNU_ID_fk
+			'VNU_address'         => stripslashes($old_event['address']),// VNU_address
+			'VNU_address2'        => stripslashes($old_event['address2']),// VNU_address2
+			'VNU_city'            => stripslashes($old_event['city']),// VNU_city
+			'STA_ID'              => $state_id,// STA_ID
+			'CNT_ISO'             => $country_iso,// CNT_ISO
+			'VNU_zip'             => $old_event['zip'],// VNU_zip
+			'VNU_phone'           => $old_event['venue_phone'],// VNU_phone
+			'VNU_capacity'        => -1,// VNU_capacity
+			'VNU_url'             => $old_event['venue_url'],// VNU_url
+			'VNU_virtual_phone'   => $old_event['virtual_phone'],// VNU_virtual_phone
+			'VNU_virtual_url'     => $old_event['virtual_url'],// VNU_virtual_url
+			'VNU_google_map_link' => '',// VNU_google_map_link
+			'VNU_enable_for_gmap' => true, // VNU_enable_for_gmap
+		];
+		$data_types      = [
+			'%d',// VNU_ID_fk
+			'%s',// VNU_address
+			'%s',// VNU_address2
+			'%s',// VNU_city
+			'%d',// STA_ID
+			'%s',// CNT_ISO
+			'%s',// VNU_zip
+			'%s',// VNU_phone
+			'%d',// VNU_capacity
+			'%s',// VNU_url
+			'%s',// VNU_virtual_phone
+			'%s',// VNU_virtual_url
+			'%s',// VNU_google_map_link
+			'%d',// VNU_enable_for_gmap
+		];
+		$success         = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					$old_event,
+					$this->_new_meta_table,
+					$insertion_array,
+					$data_types
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * @param $new_event_id
+	 * @param $new_venue_id
+	 * @return void
+	 */
+	private function _insert_new_venue_to_event($new_event_id, $new_venue_id): void
+	{
+		global $wpdb;
+		if (! $new_event_id) {
+			$this->add_error(
+				sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id)
+			);
+			return;
+		}
+		if (! $new_venue_id) {
+			$this->add_error(
+				sprintf(esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id)
+			);
+			return;
+		}
+		$cols_n_values = [
+			'EVT_ID'      => $new_event_id,
+			'VNU_ID'      => $new_venue_id,
+			'EVV_primary' => true,
+		];
+		$data_types    = [
+			'%d',// EVT_ID
+			'%d',// VNU_ID
+			'%d',// EVT_primary
+		];
+		$success       = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_table,
+					[],
+					$this->_new_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+		}
+	}
+
+
+	/**
+	 * Converts all the 3.1 start-end times for the event to 4.1 datetimes
+	 *
+	 * @param array $old_event  results of get_results(...,ARRAY_A)
+	 * @param int   $new_cpt_id new post ID
+	 * @return void (if there are errors though, adds them to the stage's error list
+	 * @throws EE_Error
+	 * @global wpdb $wpdb
+	 */
+	private function _convert_start_end_times(array $old_event, int $new_cpt_id)
+	{
+		$start_end_times = $this->_get_old_start_end_times($old_event['id']);
+		foreach ($start_end_times as $start_end_time) {
+			$datetime_id = $this->_insert_new_datetime($start_end_time, $old_event, $new_cpt_id);
+			if ($datetime_id) {
+				$this->get_migration_script()->set_mapping(
+					$this->_old_start_end_table,
+					$start_end_time['id'],
+					$this->_new_datetime_table,
+					$datetime_id
+				);
+			}
+		}
+	}
+
+
+	/**
+	 * Queries the 3.1 wp_events_start_end table to get all the start and end times for the event
+	 *
+	 * @param int   $old_event_id
+	 * @return array
+	 * @global wpdb $wpdb
+	 */
+	private function _get_old_start_end_times(int $old_event_id): array
+	{
+		global $wpdb;
+		return $wpdb->get_results(
+			$wpdb->prepare("SELECT * FROM $this->_old_start_end_table WHERE event_id=%d", $old_event_id),
+			ARRAY_A
+		);
+	}
+
+
+	/**
+	 * Inserts a 4.1 datetime given the 3.1 start_end db row and event_details row
+	 *
+	 * @param array $start_end_time_row
+	 * @param array $old_event_row
+	 * @param int   $new_cpt_id
+	 * @return int ID of new datetime
+	 */
+	private function _insert_new_datetime(array $start_end_time_row, array $old_event_row, int $new_cpt_id): int
+	{
+		global $wpdb;
+		$start_date         = $old_event_row['start_date'];
+		$start_time         = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['start_time']);
+		$end_date           = $old_event_row['end_date'];
+		$end_time           = $this->get_migration_script()->convertTimeFromAMPM($start_end_time_row['end_time']);
+		$existing_datetimes = $this->_count_other_datetimes_exist_for_new_event($new_cpt_id);
+		$start_datetime_utc =
+			$this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$start_end_time_row,
+				"$start_date $start_time:00",
+				$old_event_row['timezone_string']
+			);
+		$end_datetime_utc   =
+			$this->get_migration_script()->convert_date_string_to_utc(
+				$this,
+				$start_end_time_row,
+				"$end_date $end_time:00",
+				$old_event_row['timezone_string']
+			);
+		$cols_n_values      = [
+			'EVT_ID'        => $new_cpt_id,
+			// EVT_ID
+			'DTT_EVT_start' => $start_datetime_utc,
+			// DTT_EVT_start
+			'DTT_EVT_end'   => $end_datetime_utc,
+			// DTT_EVT_end
+			'DTT_reg_limit' => intval($start_end_time_row['reg_limit']) ? $start_end_time_row['reg_limit']
+				: $old_event_row['reg_limit'],
+			// DTT_reg_limit
+			'DTT_sold'      => 0,
+			// note: we will increment this as registrations are added during the migration
+			//          'DTT_is_primary'=> 0 == $existing_datetimes ,//DTT_is_primary... if count==0, then we'll call it the 'primary'
+			'DTT_order'     => $existing_datetimes,
+			// DTT_order, just give it the same order as the count of how many datetimes already exist
+			'DTT_parent'    => 0,
+			'DTT_deleted'   => false,
+		];
+		$data_types         = [
+			'%d',// EVT_Id
+			'%s',// DTT_EVT_start
+			'%s',// DTT_EVT_end
+			'%d',// DTT_reg_limit
+			'%d',// DTT_sold
+			//          '%d',//DTT_is_primary
+			'%d',// DTT_order
+			'%d',// DTT_parent
+			'%d',// DTT_deleted
+		];
+		$success            = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
+		if (! $success) {
+			$this->add_error(
+				$this->get_migration_script()->_create_error_message_for_db_insertion(
+					$this->_old_start_end_table,
+					array_merge($old_event_row, $start_end_time_row),
+					$this->_new_datetime_table,
+					$cols_n_values,
+					$data_types
+				)
+			);
+			return 0;
+		}
+		return $wpdb->insert_id;
+	}
+
+
+	/**
+	 * Checks if there's a 4.1 datetime for this event already. This is mostly only handy
+	 * when deciding whether a datetime we're about ot insert should be the 'primary' or not
+	 *
+	 * @param int   $cpt_event_id
+	 * @return int
+	 * @global wpdb $wpdb
+	 */
+	private function _count_other_datetimes_exist_for_new_event(int $cpt_event_id): int
+	{
+		global $wpdb;
+		return (int) $wpdb->get_var(
+			$wpdb->prepare(
+				"SELECT COUNT(*) FROM $this->_new_datetime_table WHERE EVT_ID=%d",
+				$cpt_event_id
+			)
+		);
+	}
 }

Spacing +144 added lines, -144 removed lines

@@ -188,11 +188,11 @@ 
     public function __construct()
     {
         global $wpdb;
-        $this->_old_table           = $wpdb->prefix . "events_detail";
-        $this->_old_start_end_table = $wpdb->prefix . "events_start_end";
-        $this->_new_table           = $wpdb->prefix . "posts";
-        $this->_new_meta_table      = $wpdb->prefix . "esp_event_meta";
-        $this->_new_datetime_table  = $wpdb->prefix . "esp_datetime";
+        $this->_old_table           = $wpdb->prefix."events_detail";
+        $this->_old_start_end_table = $wpdb->prefix."events_start_end";
+        $this->_new_table           = $wpdb->prefix."posts";
+        $this->_new_meta_table      = $wpdb->prefix."esp_event_meta";
+        $this->_new_datetime_table  = $wpdb->prefix."esp_datetime";
         $this->_pretty_name         = esc_html__("Events", "event_espresso");
         parent::__construct();
     }
@@ -206,7 +206,7 @@ 
     public function _count_records_to_migrate(): int
     {
         global $wpdb;
-        return (int) $wpdb->get_var("SELECT COUNT(*) FROM " . $this->_old_table . ' WHERE event_status !="D"');
+        return (int) $wpdb->get_var("SELECT COUNT(*) FROM ".$this->_old_table.' WHERE event_status !="D"');
     }
 
 
@@ -299,17 +299,17 @@ 
     private function _add_post_metas(array $old_event, int $post_id)
     {
         $event_meta = maybe_unserialize($old_event['event_meta']);
-        if (! $event_meta || ! is_array($event_meta)) {
+        if ( ! $event_meta || ! is_array($event_meta)) {
             return;
         }
-        unset($event_meta['date_submitted']);              // factored into CPT
-        unset($event_meta['additional_attendee_reg_info']);// factored into event meta table
-        unset($event_meta['default_payment_status']);      // dido
-        unset($event_meta['event_thumbnail_url']);         // used to find post featured image
+        unset($event_meta['date_submitted']); // factored into CPT
+        unset($event_meta['additional_attendee_reg_info']); // factored into event meta table
+        unset($event_meta['default_payment_status']); // dido
+        unset($event_meta['event_thumbnail_url']); // used to find post featured image
         foreach ($event_meta as $meta_key => $meta_value) {
             if ($meta_key) {// if the meta key is just an empty string, ignore it
                 $success = add_post_meta($post_id, $meta_key, $meta_value, true);
-                if (! $success) {
+                if ( ! $success) {
                     $this->add_error(
                         sprintf(
                             esc_html__(
@@ -411,63 +411,63 @@ 
             // @todo: is it ok to just mark secondary/waitlist events as DRAFTS?
             'D'  => 'trash',
         ];
-        $post_status        = $status_conversions[ $old_event['event_status'] ];
+        $post_status = $status_conversions[$old_event['event_status']];
         // check if we've sold out
         if (intval($old_event['reg_limit']) <= self::count_registrations($old_event['id'])) {
             $post_status = 'sold_out';
         }
         //      FYI postponed and cancelled don't exist in 3.1
-        $cols_n_values                      = [
-            'post_title'        => stripslashes($old_event['event_name']),// EVT_name
-            'post_content'      => stripslashes($old_event['event_desc']),// EVT_desc
+        $cols_n_values = [
+            'post_title'        => stripslashes($old_event['event_name']), // EVT_name
+            'post_content'      => stripslashes($old_event['event_desc']), // EVT_desc
             'post_name'         => $this->_find_unique_slug(
                 $old_event['event_name'],
                 $old_event['event_identifier'],
                 $post_status
-            ),// EVT_slug
-            'post_date'         => $old_event['submitted'],// EVT_created NOT
+            ), // EVT_slug
+            'post_date'         => $old_event['submitted'], // EVT_created NOT
             'post_date_gmt'     => get_gmt_from_date($old_event['submitted']),
-            'post_excerpt'      => '',// EVT_short_desc
-            'post_modified'     => $old_event['submitted'],// EVT_modified
+            'post_excerpt'      => '', // EVT_short_desc
+            'post_modified'     => $old_event['submitted'], // EVT_modified
             'post_modified_gmt' => get_gmt_from_date($old_event['submitted']),
-            'post_author'       => $old_event['wp_user'],// EVT_wp_user
-            'post_parent'       => 0,// parent maybe get this from some REM field?
-            'menu_order'        => 0,// EVT_order
-            'post_type'         => 'espresso_events',// post_type
-            'post_status'       => $post_status,// status
+            'post_author'       => $old_event['wp_user'], // EVT_wp_user
+            'post_parent'       => 0, // parent maybe get this from some REM field?
+            'menu_order'        => 0, // EVT_order
+            'post_type'         => 'espresso_events', // post_type
+            'post_status'       => $post_status, // status
         ];
         $cols_n_values_with_no_invalid_text = [];
         foreach ($cols_n_values as $col => $value) {
             $value_sans_invalid_chars = $wpdb->strip_invalid_text_for_column($this->_new_table, $col, $value);
-            if (! is_wp_error($value_sans_invalid_chars)) {
-                $cols_n_values_with_no_invalid_text[ $col ] = $value_sans_invalid_chars;
+            if ( ! is_wp_error($value_sans_invalid_chars)) {
+                $cols_n_values_with_no_invalid_text[$col] = $value_sans_invalid_chars;
             } else {
                 // otherwise leave it as-is. It will blow everything up and stop the migration
-                $cols_n_values_with_no_invalid_text[ $col ] = $value;
+                $cols_n_values_with_no_invalid_text[$col] = $value;
             }
         }
         $cols_n_values = $cols_n_values_with_no_invalid_text;
         $data_types    = [
-            '%s',// EVT_name
-            '%s',// EVT_desc
-            '%s',// EVT_slug
-            '%s',// EVT_created
+            '%s', // EVT_name
+            '%s', // EVT_desc
+            '%s', // EVT_slug
+            '%s', // EVT_created
             '%s',
-            '%s',// EVT_short_desc
-            '%s',// EVT_modified
+            '%s', // EVT_short_desc
+            '%s', // EVT_modified
             '%s',
-            '%s',// EVT_wp_user
-            '%d',// post_parent
-            '%d',// EVT_order
-            '%s',// post_type
-            '%s',// status
+            '%s', // EVT_wp_user
+            '%d', // post_parent
+            '%d', // EVT_order
+            '%s', // post_type
+            '%s', // status
         ];
-        $success       = $wpdb->insert(
+        $success = $wpdb->insert(
             $this->_new_table,
             $cols_n_values,
             $data_types
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -520,8 +520,8 @@ 
                 $event_meta['default_payment_status'] ?? '',
                 intval($old_event['require_pre_approval'])
             );
-        $cols_n_values      = [
-            'EVT_ID'                          => $new_cpt_id,// EVT_ID_fk
+        $cols_n_values = [
+            'EVT_ID'                          => $new_cpt_id, // EVT_ID_fk
             'EVT_display_desc'                => 'Y' == $old_event['display_desc'],
             'EVT_display_ticket_selector'     => 'Y' == $old_event['display_reg_form'],
             'EVT_visible_on'                  => $this->get_migration_script()->convert_date_string_to_utc(
@@ -531,7 +531,7 @@ 
                     'mysql'
                 ),
                 $old_event['timezone_string']
-            ),// don't use the old 'visible_on', as it wasn't ever used
+            ), // don't use the old 'visible_on', as it wasn't ever used
             'EVT_additional_limit'            => $old_event['allow_multiple'] == 'N' ? 1
                 : $old_event['additional_limit'],
             'EVT_default_registration_status' => $default_reg_status,
@@ -540,29 +540,29 @@ 
             'EVT_allow_overflow'              => 'Y' == $old_event['allow_overflow'],
             'EVT_timezone_string'             => $old_event['timezone_string'],
             'EVT_external_URL'                => $old_event['externalURL'],
-            'EVT_donations'                   => false,// doesn't exist in 3.1
+            'EVT_donations'                   => false, // doesn't exist in 3.1
 
         ];
-        $data_types         = [
-            '%s',// EVT_ID
-            '%d',// EVT_display_desc
-            '%d',// EVT_display_ticket_selector
-            '%s',// EVT_visible_on
-            '%d',// EVT_additional_limit
-            '%s',// EVT_default_registration_status
-            '%d',// EVT_member_only
-            '%s',// EVT_phone
-            '%d',// EVT_allow_overflow
-            '%s',// EVT_timezone_string
-            '%s',// EVT_external_URL
-            '%d',// EVT_donations
+        $data_types = [
+            '%s', // EVT_ID
+            '%d', // EVT_display_desc
+            '%d', // EVT_display_ticket_selector
+            '%s', // EVT_visible_on
+            '%d', // EVT_additional_limit
+            '%s', // EVT_default_registration_status
+            '%d', // EVT_member_only
+            '%s', // EVT_phone
+            '%d', // EVT_allow_overflow
+            '%s', // EVT_timezone_string
+            '%s', // EVT_external_URL
+            '%d', // EVT_donations
         ];
-        $success            = $wpdb->insert(
+        $success = $wpdb->insert(
             $this->_new_meta_table,
             $cols_n_values,
             $data_types
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -605,7 +605,7 @@ 
             if ($new_id) {
                 $this->_insert_venue_into_meta_table($new_id, $old_event);
                 $guid = $old_event['venue_image'] ?? null;
-                if($guid) {
+                if ($guid) {
                     $this->get_migration_script()->convert_image_url_to_attachment_and_attach_to_post(
                         $guid,
                         $new_id,
@@ -631,16 +631,16 @@ 
     private function _duplicate_venue_exists(array $old_event): int
     {
         global $wpdb;
-        $conditions     = [
+        $conditions = [
             'VNU_address'       => $old_event ['address'],
             'VNU_address2'      => $old_event['address2'],
             'VNU_city'          => $old_event['city'],
             'VNU_zip'           => $old_event['zip'],
             'post_title'        => $this->_get_venue_title_for_event($old_event),
-            'VNU_phone'         => $old_event['venue_phone'],// VNU_phone
-            'VNU_url'           => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone' => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'   => $old_event['virtual_url'],// VNU_virtual_url
+            'VNU_phone'         => $old_event['venue_phone'], // VNU_phone
+            'VNU_url'           => $old_event['venue_url'], // VNU_url
+            'VNU_virtual_phone' => $old_event['virtual_phone'], // VNU_virtual_phone
+            'VNU_virtual_url'   => $old_event['virtual_url'], // VNU_virtual_url
         ];
         $sql_conditions = [];
         foreach ($conditions as $column => $value) {
@@ -650,7 +650,7 @@ 
 					FROM
 		$wpdb->posts as p INNER JOIN
 		{$wpdb->prefix}esp_venue_meta as v ON p.ID = v.VNU_ID
-			WHERE " . implode(" AND ", $sql_conditions) . " LIMIT 1";
+			WHERE ".implode(" AND ", $sql_conditions)." LIMIT 1";
         return (int) $wpdb->get_var($query);
     }
 
@@ -683,43 +683,43 @@ 
     private function _insert_venue_into_posts(array $old_event): int
     {
         global $wpdb;
-        $insertion_array  = [
-            'post_title'        => $this->_get_venue_title_for_event($old_event),// VNU_name
-            'post_content'      => '',// VNU_desc
+        $insertion_array = [
+            'post_title'        => $this->_get_venue_title_for_event($old_event), // VNU_name
+            'post_content'      => '', // VNU_desc
             'post_name'         => $this->_find_unique_slug(
                 $old_event['venue_title'],
-                sanitize_title('venue-of-' . $old_event['event_name'])
-            ),// VNU_identifier
-            'post_date'         => current_time('mysql'),// VNU_created
+                sanitize_title('venue-of-'.$old_event['event_name'])
+            ), // VNU_identifier
+            'post_date'         => current_time('mysql'), // VNU_created
             'post_date_gmt'     => get_gmt_from_date(current_time('mysql')),
-            'post_excerpt'      => '',// VNU_short_desc arbitrary only 50 characters
-            'post_modified'     => current_time('mysql'),// VNU_modified
+            'post_excerpt'      => '', // VNU_short_desc arbitrary only 50 characters
+            'post_modified'     => current_time('mysql'), // VNU_modified
             'post_modified_gmt' => get_gmt_from_date(current_time('mysql')),
-            'post_author'       => $old_event['wp_user'],// VNU_wp_user
-            'post_parent'       => 0,// parent
-            'menu_order'        => 0,// VNU_order
-            'post_type'         => 'espresso_venues',// post_type
+            'post_author'       => $old_event['wp_user'], // VNU_wp_user
+            'post_parent'       => 0, // parent
+            'menu_order'        => 0, // VNU_order
+            'post_type'         => 'espresso_venues', // post_type
         ];
         $data_types_array = [
-            '%s',// VNU_name
-            '%s',// VNU_desc
-            '%s',// VNU_identifier
-            '%s',// VNU_created
+            '%s', // VNU_name
+            '%s', // VNU_desc
+            '%s', // VNU_identifier
+            '%s', // VNU_created
             '%s',
-            '%s',// VNU_short_desc
-            '%s',// VNU_modified
+            '%s', // VNU_short_desc
+            '%s', // VNU_modified
             '%s',
-            '%d',// VNU_wp_user
-            '%d',// parent
-            '%d',// VNU_order
-            '%s',// post_type
+            '%d', // VNU_wp_user
+            '%d', // parent
+            '%d', // VNU_order
+            '%s', // post_type
         ];
-        $success          = $wpdb->insert(
+        $success = $wpdb->insert(
             $wpdb->posts,
             $insertion_array,
             $data_types_array
         );
-        if (! $success) {
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -749,13 +749,13 @@ 
         // assume the country is the same as the organization's old settings
         $country_iso = $this->get_migration_script()->get_default_country_iso();
         // find the state from the venue, or the organization, or just guess california
-        if (! $old_event['state']) {
+        if ( ! $old_event['state']) {
             $old_org_options = get_option('events_organization_settings');
             $state_name      = stripslashes($old_org_options['organization_state']);
         } else {
             $state_name = $old_event['state'];
         }
-        if (! $state_name) {
+        if ( ! $state_name) {
             $state_name = 'CA';
         }
         // get a state ID with the same name, if possible
@@ -768,39 +768,39 @@ 
         }
         // now insert into meta table
         $insertion_array = [
-            'VNU_ID'              => $cpt_id,// VNU_ID_fk
-            'VNU_address'         => stripslashes($old_event['address']),// VNU_address
-            'VNU_address2'        => stripslashes($old_event['address2']),// VNU_address2
-            'VNU_city'            => stripslashes($old_event['city']),// VNU_city
-            'STA_ID'              => $state_id,// STA_ID
-            'CNT_ISO'             => $country_iso,// CNT_ISO
-            'VNU_zip'             => $old_event['zip'],// VNU_zip
-            'VNU_phone'           => $old_event['venue_phone'],// VNU_phone
-            'VNU_capacity'        => -1,// VNU_capacity
-            'VNU_url'             => $old_event['venue_url'],// VNU_url
-            'VNU_virtual_phone'   => $old_event['virtual_phone'],// VNU_virtual_phone
-            'VNU_virtual_url'     => $old_event['virtual_url'],// VNU_virtual_url
-            'VNU_google_map_link' => '',// VNU_google_map_link
+            'VNU_ID'              => $cpt_id, // VNU_ID_fk
+            'VNU_address'         => stripslashes($old_event['address']), // VNU_address
+            'VNU_address2'        => stripslashes($old_event['address2']), // VNU_address2
+            'VNU_city'            => stripslashes($old_event['city']), // VNU_city
+            'STA_ID'              => $state_id, // STA_ID
+            'CNT_ISO'             => $country_iso, // CNT_ISO
+            'VNU_zip'             => $old_event['zip'], // VNU_zip
+            'VNU_phone'           => $old_event['venue_phone'], // VNU_phone
+            'VNU_capacity'        => -1, // VNU_capacity
+            'VNU_url'             => $old_event['venue_url'], // VNU_url
+            'VNU_virtual_phone'   => $old_event['virtual_phone'], // VNU_virtual_phone
+            'VNU_virtual_url'     => $old_event['virtual_url'], // VNU_virtual_url
+            'VNU_google_map_link' => '', // VNU_google_map_link
             'VNU_enable_for_gmap' => true, // VNU_enable_for_gmap
         ];
-        $data_types      = [
-            '%d',// VNU_ID_fk
-            '%s',// VNU_address
-            '%s',// VNU_address2
-            '%s',// VNU_city
-            '%d',// STA_ID
-            '%s',// CNT_ISO
-            '%s',// VNU_zip
-            '%s',// VNU_phone
-            '%d',// VNU_capacity
-            '%s',// VNU_url
-            '%s',// VNU_virtual_phone
-            '%s',// VNU_virtual_url
-            '%s',// VNU_google_map_link
-            '%d',// VNU_enable_for_gmap
+        $data_types = [
+            '%d', // VNU_ID_fk
+            '%s', // VNU_address
+            '%s', // VNU_address2
+            '%s', // VNU_city
+            '%d', // STA_ID
+            '%s', // CNT_ISO
+            '%s', // VNU_zip
+            '%s', // VNU_phone
+            '%d', // VNU_capacity
+            '%s', // VNU_url
+            '%s', // VNU_virtual_phone
+            '%s', // VNU_virtual_url
+            '%s', // VNU_google_map_link
+            '%d', // VNU_enable_for_gmap
         ];
-        $success         = $wpdb->insert($wpdb->prefix . "esp_venue_meta", $insertion_array, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($wpdb->prefix."esp_venue_meta", $insertion_array, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -822,13 +822,13 @@ 
     private function _insert_new_venue_to_event($new_event_id, $new_venue_id): void
     {
         global $wpdb;
-        if (! $new_event_id) {
+        if ( ! $new_event_id) {
             $this->add_error(
                 sprintf(esc_html__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $new_event_id)
             );
             return;
         }
-        if (! $new_venue_id) {
+        if ( ! $new_venue_id) {
             $this->add_error(
                 sprintf(esc_html__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $new_venue_id)
             );
@@ -839,13 +839,13 @@ 
             'VNU_ID'      => $new_venue_id,
             'EVV_primary' => true,
         ];
-        $data_types    = [
-            '%d',// EVT_ID
-            '%d',// VNU_ID
-            '%d',// EVT_primary
+        $data_types = [
+            '%d', // EVT_ID
+            '%d', // VNU_ID
+            '%d', // EVT_primary
         ];
-        $success       = $wpdb->insert($wpdb->prefix . "esp_event_venue", $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($wpdb->prefix."esp_event_venue", $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_table,
@@ -925,14 +925,14 @@ 
                 "$start_date $start_time:00",
                 $old_event_row['timezone_string']
             );
-        $end_datetime_utc   =
+        $end_datetime_utc =
             $this->get_migration_script()->convert_date_string_to_utc(
                 $this,
                 $start_end_time_row,
                 "$end_date $end_time:00",
                 $old_event_row['timezone_string']
             );
-        $cols_n_values      = [
+        $cols_n_values = [
             'EVT_ID'        => $new_cpt_id,
             // EVT_ID
             'DTT_EVT_start' => $start_datetime_utc,
@@ -950,19 +950,19 @@ 
             'DTT_parent'    => 0,
             'DTT_deleted'   => false,
         ];
-        $data_types         = [
-            '%d',// EVT_Id
-            '%s',// DTT_EVT_start
-            '%s',// DTT_EVT_end
-            '%d',// DTT_reg_limit
-            '%d',// DTT_sold
+        $data_types = [
+            '%d', // EVT_Id
+            '%s', // DTT_EVT_start
+            '%s', // DTT_EVT_end
+            '%d', // DTT_reg_limit
+            '%d', // DTT_sold
             //          '%d',//DTT_is_primary
-            '%d',// DTT_order
-            '%d',// DTT_parent
-            '%d',// DTT_deleted
+            '%d', // DTT_order
+            '%d', // DTT_parent
+            '%d', // DTT_deleted
         ];
-        $success            = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
-        if (! $success) {
+        $success = $wpdb->insert($this->_new_datetime_table, $cols_n_values, $data_types);
+        if ( ! $success) {
             $this->add_error(
                 $this->get_migration_script()->_create_error_message_for_db_insertion(
                     $this->_old_start_end_table,