eventespresso / event-espresso-core

caffeinated/admin/new/pricing/templates/event_tickets_datetime_ticket_row.template.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
 
             <!--<div class="total-price-container"><?php printf(
                 esc_html__('Total Final Price: %s', 'event_espresso'),
-                '<span class="ticket-price-amount">' . $TKT_price . '</span>'
+                '<span class="ticket-price-amount">'.$TKT_price.'</span>'
             ); ?> </div>-->
             <textarea name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_description]"
                       class="edit-ticket-TKT_description ee-full-textarea-inp"
@@ -267,7 +267,7 @@ 
                         ); ?></label>
                 </div>
                 <div class="ticket-is-taxable-container">
-                    <?php if (! empty($tax_rows)) { ?>
+                    <?php if ( ! empty($tax_rows)) { ?>
                         <?php if ($disabled) : ?>
                             <?php
                             $tax_value = ! empty($TKT_taxable) ? 1 : 0;

Braces +40 added lines, -16 removed lines

@@ -79,8 +79,11 @@ 
                    class="edit-ticket-TKT_start_date ee-text-inp" value="<?php echo esc_attr($TKT_start_date); ?>">
             <input type="text" name="archived_ticket[TKT_start_date]" class="edit-ticket-TKT_start_date ee-text-inp"
                    value="<?php echo esc_attr($TKT_start_date); ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_start_date-<?php echo esc_attr($tkt_row); ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_start_date-<?php echo esc_attr($tkt_row);
+}
+?>" type="text"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_start_date]"
                    class="edit-ticket-TKT_start_date ee-text-inp ee-datepicker" value="<?php echo esc_attr($TKT_start_date); ?>"
                    data-context="start-ticket" data-date-field-context="#display-ticketrow-<?php echo esc_attr($tkt_row); ?>"
@@ -94,8 +97,11 @@ 
                    class="edit-ticket-TKT_end_date ee-text-inp" value="<?php echo esc_attr($TKT_end_date); ?>">
             <input type="text" name="archived_ticket[TKT_end_date]" class="edit-ticket-TKT_end_date ee-text-inp"
                    value="<?php echo esc_attr($TKT_end_date); ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_end_date-<?php echo esc_attr($tkt_row); ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_end_date-<?php echo esc_attr($tkt_row);
+}
+?>" type="text"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_end_date]"
                    class="edit-ticket-TKT_end_date ee-text-inp ee-datepicker" value="<?php echo esc_attr($TKT_end_date); ?>"
                    data-context="end-ticket" data-date-field-context="#display-ticketrow-<?php echo esc_attr($tkt_row); ?>"
@@ -111,8 +117,11 @@ 
             <input type="text" name="archived_ticket[<?php echo esc_attr($tkt_row); ?>][TKT_base_price]"
                    class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric"
                    value="<?php echo esc_attr($TKT_base_price); ?>" disabled>
-        <?php else : ?>
-            <input id="edit-ticket-TKT_base_price-<?php echo esc_attr($tkt_row); ?>" type="text"
+        <?php else {
+	: ?>
+            <input id="edit-ticket-TKT_base_price-<?php echo esc_attr($tkt_row);
+}
+?>" type="text"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_base_price]"
                    class="edit-ticket-TKT_base_price ee-small-text-inp edit-price-PRC_amount ee-numeric"
                    value="<?php echo esc_attr($TKT_base_price); ?>">
@@ -129,8 +138,11 @@ 
             <input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric"
                    name="archived_ticket[<?php echo esc_attr($tkt_row); ?>][TKT_qty]" value="<?php echo esc_attr($TKT_qty_for_input); ?>"
                    disabled>
-        <?php else : ?>
-            <input type="text" id="edit-ticket-TKT_qty-<?php echo esc_attr($tkt_row); ?>"
+        <?php else {
+	: ?>
+            <input type="text" id="edit-ticket-TKT_qty-<?php echo esc_attr($tkt_row);
+}
+?>"
                    class="edit-ticket-TKT_qty ee-small-text-inp ee-numeric"
                    name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_qty]"
                    value="<?php echo esc_attr($TKT_qty_for_input); ?>">
@@ -209,9 +221,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric"
                                        name="archived_ticket[<?php echo esc_attr($tkt_row); ?>][TKT_uses]"
                                        value="<?php echo esc_attr($TKT_uses); ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_uses ee-small-text-inp ee-numeric"
-                                       name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_uses]"
+                                       name="<?php echo esc_attr($edit_tickets_name);
+}
+?>[<?php echo esc_attr($tkt_row); ?>][TKT_uses]"
                                        value="<?php echo esc_attr($TKT_uses); ?>">
                             <?php endif; ?>
                         </td>
@@ -223,9 +238,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
                                        name="archived_ticket[<?php echo esc_attr($tkt_row); ?>][TKT_min]"
                                        value="<?php echo esc_attr($TKT_min); ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_min ee-small-text-inp ee-numeric"
-                                       name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_min]"
+                                       name="<?php echo esc_attr($edit_tickets_name);
+}
+?>[<?php echo esc_attr($tkt_row); ?>][TKT_min]"
                                        value="<?php echo esc_attr($TKT_min); ?>">
                             <?php endif; ?>
                         </td>
@@ -237,9 +255,12 @@ 
                                 <input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
                                        name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_max]"
                                        value="<?php echo esc_attr($TKT_max); ?>" disabled>
-                            <?php else : ?>
+                            <?php else {
+	: ?>
                                 <input type="text" class="edit-ticket-TKT_max ee-small-text-inp ee-numeric"
-                                       name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_max]"
+                                       name="<?php echo esc_attr($edit_tickets_name);
+}
+?>[<?php echo esc_attr($tkt_row); ?>][TKT_max]"
                                        value="<?php echo esc_attr($TKT_max); ?>">
                             <?php endif; ?>
                         </td>
@@ -278,8 +299,11 @@ 
                         <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo esc_attr($tkt_row); ?>"
                                type="checkbox" name="archived_ticket[<?php echo esc_attr($tkt_row); ?>][TKT_taxable]"
                                value="1"<?php echo $TKT_taxable; ?> disabled>
-                        <?php else : ?>
-                        <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo esc_attr($tkt_row); ?>"
+                        <?php else {
+	: ?>
+                        <input class="TKT-taxable-checkbox" id="edit-ticket-TKT_taxable-<?php echo esc_attr($tkt_row);
+}
+?>"
                                type="checkbox"
                                name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_taxable]"
                                value="1"<?php echo $TKT_taxable; ?>>

Indentation +62 added lines, -62 removed lines

@@ -58,7 +58,7 @@ 
 ?>
 <tr valign="top" class="ee-ticket-sortable ticket-row <?php echo sanitize_html_class($ticket_archive_class);
 if (WP_DEBUG) {
-    echo ' ee-wp-debug';
+	echo ' ee-wp-debug';
 } ?>" id="display-ticketrow-<?php echo esc_attr($tkt_row); ?>">
     <!--<td class="ee-tkt-order-field"><span class="dashicons dashicons-sort <?php echo sanitize_html_class($tkt_status_class); ?>">
     <input type="hidden" name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_order]" class="edit-ticket-TKT_order" value ="<?php echo absint($TKT_order); ?>" ></span></td>-->
@@ -167,9 +167,9 @@ 
                    class="edit-ticket-TKT_row" value="<?php echo esc_attr($tkt_row); ?>">
 
             <!--<div class="total-price-container"><?php printf(
-                esc_html__('Total Final Price: %s', 'event_espresso'),
-                '<span class="ticket-price-amount">' . $TKT_price . '</span>'
-            ); ?> </div>-->
+				esc_html__('Total Final Price: %s', 'event_espresso'),
+				'<span class="ticket-price-amount">' . $TKT_price . '</span>'
+			); ?> </div>-->
             <textarea name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_description]"
                       class="edit-ticket-TKT_description ee-full-textarea-inp"
                       placeholder="Ticket Description"><?php echo esc_textarea($TKT_description); ?></textarea>
@@ -183,20 +183,20 @@ 
                     <thead>
                     <tr valign="bottom">
                         <td><span class="TD_TKT_number_datetimes_label"><?php
-                                esc_html_e(
-                                    '# Datetimes',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'# Datetimes',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="TD_TKT_min_qty_label"><?php
-                                esc_html_e(
-                                    'Minimum Quantity',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Minimum Quantity',
+									'event_espresso'
+								); ?></span></td>
                         <td><span class="TD_TKT_max_qty_label"><?php
-                                esc_html_e(
-                                    'Maximum Quantity',
-                                    'event_espresso'
-                                ); ?></span></td>
+								esc_html_e(
+									'Maximum Quantity',
+									'event_espresso'
+								); ?></span></td>
                     </tr>
                     </thead>
                     <tbody>
@@ -254,24 +254,24 @@ 
                     <input type="checkbox"
                            name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_required]"
                            class="edit-ticket-TKT_required" value="1"<?php
-                            echo $TKT_required
-                                ? ' checked="checked"'
-                                : '';
-                            echo $disabled
-                                ? ' disabled'
-                                : ''; ?>>
+							echo $TKT_required
+								? ' checked="checked"'
+								: '';
+							echo $disabled
+								? ' disabled'
+								: ''; ?>>
                     <label for="edit-ticket-TKT_required"><?php
-                        esc_html_e(
-                            'This ticket is required (will appear first in frontend ticket lists).',
-                            'event_espresso'
-                        ); ?></label>
+						esc_html_e(
+							'This ticket is required (will appear first in frontend ticket lists).',
+							'event_espresso'
+						); ?></label>
                 </div>
                 <div class="ticket-is-taxable-container">
                     <?php if (! empty($tax_rows)) { ?>
                         <?php if ($disabled) : ?>
                             <?php
-                            $tax_value = ! empty($TKT_taxable) ? 1 : 0;
-                            ?>
+							$tax_value = ! empty($TKT_taxable) ? 1 : 0;
+							?>
                         <input class="TKT-taxable-checkbox" type="hidden"
                                name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_taxable]"
                                value="<?php echo esc_attr($tax_value); ?>">
@@ -285,16 +285,16 @@ 
                                value="1"<?php echo $TKT_taxable; ?>>
                         <?php endif; ?>
                     <label for="edit-ticket-TKT_taxable-<?php echo esc_attr($tkt_row); ?>"> <?php
-                        esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
+						esc_html_e('This ticket is taxable.', 'event_espresso'); ?>
                     <?php } //end tax_rows check ?>
                 </div>
             </div>
             <div class="price-table-container">
                 <h4 class="tickets-heading price-table-info"<?php echo $show_price_modifier; ?>><?php
-                    esc_html_e(
-                        'Price Modifiers',
-                        'event_espresso'
-                    ); ?></h4>
+					esc_html_e(
+						'Price Modifiers',
+						'event_espresso'
+					); ?></h4>
                 <table class="price-table">
                     <thead class="price-table-info"<?php echo $show_price_modifier; ?>>
                     <tr>
@@ -314,10 +314,10 @@ 
                     <tr class="price-subtotal-row TKT-taxes-display"<?php echo $display_subtotal; ?>>
                         <td colspan="4" class="ee-numeric">
                             <span class="TKT-taxable-subtotal-label"><strong><?php
-                                    esc_html_e(
-                                        'Subtotal',
-                                        'event_espresso'
-                                    ); ?></strong></span>
+									esc_html_e(
+										'Subtotal',
+										'event_espresso'
+									); ?></strong></span>
                         </td>
                         <td class="ee-numeric">
                             <span
@@ -350,51 +350,51 @@ 
             <div style="clear:both"></div>
             <h4 class="tickets-heading"><?php esc_html_e('Event Datetimes', 'event_espresso'); ?></h4>
             <p><?php
-                esc_html_e(
-                    'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
-                    'event_espresso'
-                ); ?></p>
+				esc_html_e(
+					'This ticket will be usable (allow entrance) for the following selected event datetimes (click to select).  The "# Datetimes" amount (above) indicates how many of the assigned datetimes the ticket holder can gain access to:',
+					'event_espresso'
+				); ?></p>
             <ul class="datetime-tickets-list">
                 <?php echo $ticket_datetimes_list; ?>
             </ul>
 
             <?php do_action(
-                'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
-                $tkt_row,
-                $TKT_ID
-            ); ?>
+				'AHEE__event_tickets_datetime_ticket_row_template__advanced_details_end',
+				$tkt_row,
+				$TKT_ID
+			); ?>
             <div class="ee-editor-footer-container">
                 <div class="ee-editor-id-container">
                     <span class="ee-item-id"><?php echo
-                        $TKT_ID
-                            ? sprintf(
-                                esc_html__('Ticket ID: %d', 'event_espresso'),
-                                $TKT_ID
-                            )
-                                             : ''; ?></span>
+						$TKT_ID
+							? sprintf(
+								esc_html__('Ticket ID: %d', 'event_espresso'),
+								$TKT_ID
+							)
+											 : ''; ?></span>
                 </div>
                 <div class="save-cancel-button-container">
                     <label for="edit-ticket-TKT_is_default_selector"><?php
-                        esc_html_e(
-                            'use this new ticket as a default ticket for any new events',
-                            'event_espresso'
-                        ); ?></label>
+						esc_html_e(
+							'use this new ticket as a default ticket for any new events',
+							'event_espresso'
+						); ?></label>
                     <input type="checkbox"
                            name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_is_default_selector]"
                            class="edit-ticket-TKT_is_default_selector" value="1"<?php
-                            echo $disabled
-                                ? ' disabled'
-                                : ''; ?>>
+							echo $disabled
+								? ' disabled'
+								: ''; ?>>
                     <input type="hidden"
                            name="<?php echo esc_attr($edit_tickets_name); ?>[<?php echo esc_attr($tkt_row); ?>][TKT_is_default]"
                            class="edit-ticket-TKT_is_default" value="<?php echo esc_attr($TKT_is_default); ?>">
                     <!--<button class="button-primary ee-save-button" data-context="ticket" data-ticket-row="<?php echo esc_attr($tkt_row); ?>"><?php esc_html_e(
-                        'Update Ticket',
-                        'event_espresso'
-                    ); ?></button>-->
+						'Update Ticket',
+						'event_espresso'
+					); ?></button>-->
                     <button class="button-secondary ee-cancel-button" data-context="ticket"
                             data-ticket-row="<?php echo esc_attr($tkt_row); ?>"><?php
-                                    esc_html_e('Close', 'event_espresso'); ?></button>
+									esc_html_e('Close', 'event_espresso'); ?></button>
                 </div>
             </div>
             <!-- these hidden inputs are for tracking changes in dtts attached to tickets during a js session -->

public/template_tags.php

Indentation +1057 added lines, -1057 removed lines

@@ -19,13 +19,13 @@ 
  */
 function is_espresso_event($event = null)
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        // extract EE_Event object from passed param regardless of what it is (within reason of course)
-        $event = EEH_Event_View::get_event($event);
-        // do we have a valid event ?
-        return $event instanceof EE_Event;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		// extract EE_Event object from passed param regardless of what it is (within reason of course)
+		$event = EEH_Event_View::get_event($event);
+		// do we have a valid event ?
+		return $event instanceof EE_Event;
+	}
+	return false;
 }
 
 /**
@@ -36,12 +36,12 @@ 
  */
 function is_espresso_event_single()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        // return conditionals set by CPTs
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		// return conditionals set by CPTs
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_single : false;
+	}
+	return false;
 }
 
 /**
@@ -52,11 +52,11 @@ 
  */
 function is_espresso_event_archive()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_archive : false;
+	}
+	return false;
 }
 
 /**
@@ -67,11 +67,11 @@ 
  */
 function is_espresso_event_taxonomy()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_event_taxonomy : false;
+	}
+	return false;
 }
 
 /**
@@ -85,13 +85,13 @@ 
  */
 function is_espresso_venue($venue = null)
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        // extract EE_Venue object from passed param regardless of what it is (within reason of course)
-        $venue = EEH_Venue_View::get_venue($venue, false);
-        // do we have a valid event ?
-        return $venue instanceof EE_Venue;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		// extract EE_Venue object from passed param regardless of what it is (within reason of course)
+		$venue = EEH_Venue_View::get_venue($venue, false);
+		// do we have a valid event ?
+		return $venue instanceof EE_Venue;
+	}
+	return false;
 }
 
 /**
@@ -102,11 +102,11 @@ 
  */
 function is_espresso_venue_single()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_single : false;
+	}
+	return false;
 }
 
 /**
@@ -117,11 +117,11 @@ 
  */
 function is_espresso_venue_archive()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_archive : false;
+	}
+	return false;
 }
 
 /**
@@ -132,11 +132,11 @@ 
  */
 function is_espresso_venue_taxonomy()
 {
-    if (can_use_espresso_conditionals(__FUNCTION__)) {
-        global $wp_query;
-        return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : false;
-    }
-    return false;
+	if (can_use_espresso_conditionals(__FUNCTION__)) {
+		global $wp_query;
+		return $wp_query instanceof WP_Query ? $wp_query->is_espresso_venue_taxonomy : false;
+	}
+	return false;
 }
 
 /**
@@ -148,62 +148,62 @@ 
  */
 function can_use_espresso_conditionals($conditional_tag)
 {
-    if (! did_action('AHEE__EE_System__initialize')) {
-        EE_Error::doing_it_wrong(
-            __FUNCTION__,
-            sprintf(
-                esc_html__(
-                    'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.',
-                    'event_espresso'
-                ),
-                $conditional_tag
-            ),
-            '4.4.0'
-        );
-        return false;
-    }
-    return true;
+	if (! did_action('AHEE__EE_System__initialize')) {
+		EE_Error::doing_it_wrong(
+			__FUNCTION__,
+			sprintf(
+				esc_html__(
+					'The "%s" conditional tag can not be used until after the "init" hook has run, but works best when used within a theme\'s template files.',
+					'event_espresso'
+				),
+				$conditional_tag
+			),
+			'4.4.0'
+		);
+		return false;
+	}
+	return true;
 }
 
 
 /*************************** Event Queries ***************************/
 
 if (! function_exists('espresso_get_events')) {
-    /**
-     *    espresso_get_events
-     *
-     * @param array $params
-     * @return array
-     */
-    function espresso_get_events($params = [])
-    {
-        //set default params
-        $default_espresso_events_params = [
-            'limit'         => 10,
-            'show_expired'  => false,
-            'month'         => null,
-            'category_slug' => null,
-            'order_by'      => 'start_date',
-            'sort'          => 'ASC',
-        ];
-        // allow the defaults to be filtered
-        $default_espresso_events_params = apply_filters(
-            'espresso_get_events__default_espresso_events_params',
-            $default_espresso_events_params
-        );
-        // grab params and merge with defaults, then extract
-        $params = array_merge($default_espresso_events_params, $params);
-        // run the query
-        $events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
-        // assign results to a variable so we can return it
-        $events = $events_query->have_posts() ? $events_query->posts : [];
-        // but first reset the query and postdata
-        wp_reset_query();
-        wp_reset_postdata();
-        EED_Events_Archive::remove_all_events_archive_filters();
-        unset($events_query);
-        return $events;
-    }
+	/**
+	 *    espresso_get_events
+	 *
+	 * @param array $params
+	 * @return array
+	 */
+	function espresso_get_events($params = [])
+	{
+		//set default params
+		$default_espresso_events_params = [
+			'limit'         => 10,
+			'show_expired'  => false,
+			'month'         => null,
+			'category_slug' => null,
+			'order_by'      => 'start_date',
+			'sort'          => 'ASC',
+		];
+		// allow the defaults to be filtered
+		$default_espresso_events_params = apply_filters(
+			'espresso_get_events__default_espresso_events_params',
+			$default_espresso_events_params
+		);
+		// grab params and merge with defaults, then extract
+		$params = array_merge($default_espresso_events_params, $params);
+		// run the query
+		$events_query = new EventEspresso\core\domain\services\wp_queries\EventListQuery($params);
+		// assign results to a variable so we can return it
+		$events = $events_query->have_posts() ? $events_query->posts : [];
+		// but first reset the query and postdata
+		wp_reset_query();
+		wp_reset_postdata();
+		EED_Events_Archive::remove_all_events_archive_filters();
+		unset($events_query);
+		return $events;
+	}
 }
 
 
@@ -218,357 +218,357 @@ 
  */
 function espresso_load_ticket_selector()
 {
-    EE_Registry::instance()->load_file(EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module');
+	EE_Registry::instance()->load_file(EE_MODULES . 'ticket_selector', 'EED_Ticket_Selector', 'module');
 }
 
 if (! function_exists('espresso_ticket_selector')) {
-    /**
-     * espresso_ticket_selector
-     *
-     * @param null $event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_ticket_selector($event = null)
-    {
-        if (! apply_filters('FHEE_disable_espresso_ticket_selector', false)) {
-            espresso_load_ticket_selector();
-            EED_Ticket_Selector::set_definitions();
-            echo EED_Ticket_Selector::display_ticket_selector($event); // already escaped
-        }
-    }
+	/**
+	 * espresso_ticket_selector
+	 *
+	 * @param null $event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_ticket_selector($event = null)
+	{
+		if (! apply_filters('FHEE_disable_espresso_ticket_selector', false)) {
+			espresso_load_ticket_selector();
+			EED_Ticket_Selector::set_definitions();
+			echo EED_Ticket_Selector::display_ticket_selector($event); // already escaped
+		}
+	}
 }
 
 
 if (! function_exists('espresso_view_details_btn')) {
-    /**
-     * espresso_view_details_btn
-     *
-     * @param null $event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_view_details_btn($event = null)
-    {
-        if (! apply_filters('FHEE_disable_espresso_view_details_btn', false)) {
-            espresso_load_ticket_selector();
-            echo EED_Ticket_Selector::display_ticket_selector($event, true); // already escaped
-        }
-    }
+	/**
+	 * espresso_view_details_btn
+	 *
+	 * @param null $event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_view_details_btn($event = null)
+	{
+		if (! apply_filters('FHEE_disable_espresso_view_details_btn', false)) {
+			espresso_load_ticket_selector();
+			echo EED_Ticket_Selector::display_ticket_selector($event, true); // already escaped
+		}
+	}
 }
 
 
 /*************************** EEH_Event_View ***************************/
 
 if (! function_exists('espresso_load_event_list_assets')) {
-    /**
-     * espresso_load_event_list_assets
-     * ensures that event list styles and scripts are loaded
-     *
-     * @return void
-     */
-    function espresso_load_event_list_assets()
-    {
-        $event_list = EED_Events_Archive::instance();
-        add_action('AHEE__EE_System__initialize_last', [$event_list, 'load_event_list_assets'], 10);
-        add_filter('FHEE_enable_default_espresso_css', '__return_true');
-    }
+	/**
+	 * espresso_load_event_list_assets
+	 * ensures that event list styles and scripts are loaded
+	 *
+	 * @return void
+	 */
+	function espresso_load_event_list_assets()
+	{
+		$event_list = EED_Events_Archive::instance();
+		add_action('AHEE__EE_System__initialize_last', [$event_list, 'load_event_list_assets'], 10);
+		add_filter('FHEE_enable_default_espresso_css', '__return_true');
+	}
 }
 
 
 if (! function_exists('espresso_event_reg_button')) {
-    /**
-     * espresso_event_reg_button
-     * returns the "Register Now" button if event is active,
-     * an inactive button like status banner if the event is not active
-     * or a "Read More" button if so desired
-     *
-     * @param null $btn_text_if_active
-     * @param bool $btn_text_if_inactive
-     * @param bool $EVT_ID
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_reg_button($btn_text_if_active = null, $btn_text_if_inactive = false, $EVT_ID = false)
-    {
-        $event = EEH_Event_View::get_event($EVT_ID);
-        if (! $event instanceof EE_Event) {
-            return;
-        }
-        $event_status = $event->get_active_status();
-        switch ($event_status) {
-            case EE_Datetime::sold_out :
-                $btn_text = __('Sold Out', 'event_espresso');
-                $class    = 'ee-pink';
-                break;
-            case EE_Datetime::expired :
-                $btn_text = __('Event is Over', 'event_espresso');
-                $class    = 'ee-grey';
-                break;
-            case EE_Datetime::inactive :
-                $btn_text = __('Event Not Active', 'event_espresso');
-                $class    = 'ee-grey';
-                break;
-            case EE_Datetime::cancelled :
-                $btn_text = __('Event was Cancelled', 'event_espresso');
-                $class    = 'ee-red';
-                break;
-            case EE_Datetime::upcoming :
-            case EE_Datetime::active :
-            default :
-                $btn_text = ! empty($btn_text_if_active)
-                    ? $btn_text_if_active
-                    : __('Register Now', 'event_espresso');
-                $class    = 'ee-green';
-        }
-        if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
-            $btn_text = $btn_text_if_inactive;
-            $class    = 'ee-grey';
-        }
-        ?>
+	/**
+	 * espresso_event_reg_button
+	 * returns the "Register Now" button if event is active,
+	 * an inactive button like status banner if the event is not active
+	 * or a "Read More" button if so desired
+	 *
+	 * @param null $btn_text_if_active
+	 * @param bool $btn_text_if_inactive
+	 * @param bool $EVT_ID
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_reg_button($btn_text_if_active = null, $btn_text_if_inactive = false, $EVT_ID = false)
+	{
+		$event = EEH_Event_View::get_event($EVT_ID);
+		if (! $event instanceof EE_Event) {
+			return;
+		}
+		$event_status = $event->get_active_status();
+		switch ($event_status) {
+			case EE_Datetime::sold_out :
+				$btn_text = __('Sold Out', 'event_espresso');
+				$class    = 'ee-pink';
+				break;
+			case EE_Datetime::expired :
+				$btn_text = __('Event is Over', 'event_espresso');
+				$class    = 'ee-grey';
+				break;
+			case EE_Datetime::inactive :
+				$btn_text = __('Event Not Active', 'event_espresso');
+				$class    = 'ee-grey';
+				break;
+			case EE_Datetime::cancelled :
+				$btn_text = __('Event was Cancelled', 'event_espresso');
+				$class    = 'ee-red';
+				break;
+			case EE_Datetime::upcoming :
+			case EE_Datetime::active :
+			default :
+				$btn_text = ! empty($btn_text_if_active)
+					? $btn_text_if_active
+					: __('Register Now', 'event_espresso');
+				$class    = 'ee-green';
+		}
+		if ($event_status < 1 && ! empty($btn_text_if_inactive)) {
+			$btn_text = $btn_text_if_inactive;
+			$class    = 'ee-grey';
+		}
+		?>
         <a class="ee-button ee-register-button <?php echo esc_attr($class); ?>"
            href="<?php espresso_event_link_url($EVT_ID); ?>"
             <?php echo EED_Events_Archive::link_target(); // already escaped
-            ?>
+			?>
         >
             <?php echo esc_html($btn_text); ?>
         </a>
         <?php
-    }
+	}
 }
 
 
 if (! function_exists('espresso_display_ticket_selector')) {
-    /**
-     * espresso_display_ticket_selector
-     * whether or not to display the Ticket Selector for an event
-     *
-     * @param bool $EVT_ID
-     * @return boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_display_ticket_selector($EVT_ID = false)
-    {
-        return EEH_Event_View::display_ticket_selector($EVT_ID);
-    }
+	/**
+	 * espresso_display_ticket_selector
+	 * whether or not to display the Ticket Selector for an event
+	 *
+	 * @param bool $EVT_ID
+	 * @return boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_display_ticket_selector($EVT_ID = false)
+	{
+		return EEH_Event_View::display_ticket_selector($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_status_banner')) {
-    /**
-     * espresso_event_status
-     * returns a banner showing the event status if it is sold out, expired, or inactive
-     *
-     * @param bool $EVT_ID
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_status_banner($EVT_ID = false)
-    {
-        return EEH_Event_View::event_status($EVT_ID);
-    }
+	/**
+	 * espresso_event_status
+	 * returns a banner showing the event status if it is sold out, expired, or inactive
+	 *
+	 * @param bool $EVT_ID
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_status_banner($EVT_ID = false)
+	{
+		return EEH_Event_View::event_status($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_status')) {
-    /**
-     * espresso_event_status
-     * returns the event status if it is sold out, expired, or inactive
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_status($EVT_ID = 0, $echo = true)
-    {
-        return EEH_Event_View::event_active_status($EVT_ID, $echo);
-    }
+	/**
+	 * espresso_event_status
+	 * returns the event status if it is sold out, expired, or inactive
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_status($EVT_ID = 0, $echo = true)
+	{
+		return EEH_Event_View::event_active_status($EVT_ID, $echo);
+	}
 }
 
 
 if (! function_exists('espresso_event_categories')) {
-    /**
-     * espresso_event_categories
-     * returns the terms associated with an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $hide_uncategorized
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = true, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
-    }
+	/**
+	 * espresso_event_categories
+	 * returns the terms associated with an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $hide_uncategorized
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_categories($EVT_ID = 0, $hide_uncategorized = true, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_categories($EVT_ID, $hide_uncategorized);
+	}
 }
 
 
 if (! function_exists('espresso_event_tickets_available')) {
-    /**
-     * espresso_event_tickets_available
-     * returns the ticket types available for purchase for an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @param bool $format
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_tickets_available($EVT_ID = 0, $echo = true, $format = true)
-    {
-        $tickets = EEH_Event_View::event_tickets_available($EVT_ID);
-        if (is_array($tickets) && ! empty($tickets)) {
-            // if formatting then $html will be a string, else it will be an array of ticket objects
-            $html =
-                $format ? '<ul id="ee-event-tickets-ul-' . esc_attr($EVT_ID) . '" class="ee-event-tickets-ul">' : [];
-            foreach ($tickets as $ticket) {
-                if ($ticket instanceof EE_Ticket) {
-                    if ($format) {
-                        $html .= '<li id="ee-event-tickets-li-'
-                                 . esc_attr($ticket->ID())
-                                 . '" class="ee-event-tickets-li">';
-                        $html .= esc_html($ticket->name()) . ' ';
-                        $html .= EEH_Template::format_currency(
-                            $ticket->get_ticket_total_with_taxes()
-                        ); // already escaped
-                        $html .= '</li>';
-                    } else {
-                        $html[] = $ticket;
-                    }
-                }
-            }
-            if ($format) {
-                $html .= '</ul>';
-            }
-            if ($echo && $format) {
-                echo wp_kses($html, AllowedTags::getAllowedTags());
-                return '';
-            }
-            return $html;
-        }
-        return '';
-    }
+	/**
+	 * espresso_event_tickets_available
+	 * returns the ticket types available for purchase for an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @param bool $format
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_tickets_available($EVT_ID = 0, $echo = true, $format = true)
+	{
+		$tickets = EEH_Event_View::event_tickets_available($EVT_ID);
+		if (is_array($tickets) && ! empty($tickets)) {
+			// if formatting then $html will be a string, else it will be an array of ticket objects
+			$html =
+				$format ? '<ul id="ee-event-tickets-ul-' . esc_attr($EVT_ID) . '" class="ee-event-tickets-ul">' : [];
+			foreach ($tickets as $ticket) {
+				if ($ticket instanceof EE_Ticket) {
+					if ($format) {
+						$html .= '<li id="ee-event-tickets-li-'
+								 . esc_attr($ticket->ID())
+								 . '" class="ee-event-tickets-li">';
+						$html .= esc_html($ticket->name()) . ' ';
+						$html .= EEH_Template::format_currency(
+							$ticket->get_ticket_total_with_taxes()
+						); // already escaped
+						$html .= '</li>';
+					} else {
+						$html[] = $ticket;
+					}
+				}
+			}
+			if ($format) {
+				$html .= '</ul>';
+			}
+			if ($echo && $format) {
+				echo wp_kses($html, AllowedTags::getAllowedTags());
+				return '';
+			}
+			return $html;
+		}
+		return '';
+	}
 }
 
 if (! function_exists('espresso_event_date_obj')) {
-    /**
-     * espresso_event_date_obj
-     * returns the primary date object for an event
-     *
-     * @param bool $EVT_ID
-     * @return EE_Datetime|null
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_obj($EVT_ID = false)
-    {
-        return EEH_Event_View::get_primary_date_obj($EVT_ID);
-    }
+	/**
+	 * espresso_event_date_obj
+	 * returns the primary date object for an event
+	 *
+	 * @param bool $EVT_ID
+	 * @return EE_Datetime|null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_obj($EVT_ID = false)
+	{
+		return EEH_Event_View::get_primary_date_obj($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_date')) {
-    /**
-     * espresso_event_date
-     * returns the primary date for an event
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
-    {
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
-        if ($echo) {
-            echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
-
-    }
+	/**
+	 * espresso_event_date
+	 * returns the primary date for an event
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
+	{
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::the_event_date($date_format, $time_format, $EVT_ID);
+
+	}
 }
 
 
 if (! function_exists('espresso_list_of_event_dates')) {
-    /**
-     * espresso_list_of_event_dates
-     * returns a unordered list of dates for an event
-     *
-     * @param int    $EVT_ID
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $echo
-     * @param null   $show_expired
-     * @param bool   $format
-     * @param bool   $add_breaks
-     * @param null   $limit
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_list_of_event_dates(
-        $EVT_ID = 0,
-        $date_format = '',
-        $time_format = '',
-        $echo = true,
-        $show_expired = null,
-        $format = true,
-        $add_breaks = true,
-        $limit = null
-    ) {
-        $allowedtags = AllowedTags::getAllowedTags();
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
-        $datetimes   = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, $limit);
-        if (! $format) {
-            return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
-        }
-        $newline = $add_breaks ? '<br />' : '';
-        if (is_array($datetimes) && ! empty($datetimes)) {
-            global $post;
-            $html =
-                '<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="ee-event-datetimes-ul ee-clearfix">';
-            foreach ($datetimes as $datetime) {
-                if ($datetime instanceof EE_Datetime) {
-
-                    $datetime_name        = $datetime->name();
-                    $datetime_html        = ! empty($datetime_name)
-                        ? '
+	/**
+	 * espresso_list_of_event_dates
+	 * returns a unordered list of dates for an event
+	 *
+	 * @param int    $EVT_ID
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $echo
+	 * @param null   $show_expired
+	 * @param bool   $format
+	 * @param bool   $add_breaks
+	 * @param null   $limit
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_list_of_event_dates(
+		$EVT_ID = 0,
+		$date_format = '',
+		$time_format = '',
+		$echo = true,
+		$show_expired = null,
+		$format = true,
+		$add_breaks = true,
+		$limit = null
+	) {
+		$allowedtags = AllowedTags::getAllowedTags();
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_list_of_event_dates__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_list_of_event_dates__time_format', $time_format);
+		$datetimes   = EEH_Event_View::get_all_date_obj($EVT_ID, $show_expired, false, $limit);
+		if (! $format) {
+			return apply_filters('FHEE__espresso_list_of_event_dates__datetimes', $datetimes);
+		}
+		$newline = $add_breaks ? '<br />' : '';
+		if (is_array($datetimes) && ! empty($datetimes)) {
+			global $post;
+			$html =
+				'<ul id="ee-event-datetimes-ul-' . esc_attr($post->ID) . '" class="ee-event-datetimes-ul ee-clearfix">';
+			foreach ($datetimes as $datetime) {
+				if ($datetime instanceof EE_Datetime) {
+
+					$datetime_name        = $datetime->name();
+					$datetime_html        = ! empty($datetime_name)
+						? '
                         <strong class="ee-event-datetimes-li-date-name">
                           ' . esc_html($datetime_name) . '
                        </strong>' . $newline
-                        : '';
+						: '';
 
-                    $datetime_description = $datetime->description();
-                    $datetime_html .= ! empty($datetime_description)
-                        ? '
+					$datetime_description = $datetime->description();
+					$datetime_html .= ! empty($datetime_description)
+						? '
                         <span class="ee-event-datetimes-li-date-desc">
                             ' . wp_kses($datetime_description, $allowedtags) . '
                         </span>' . $newline
-                        : '';
+						: '';
 
-                    $datetime_html .= '
+					$datetime_html .= '
                         <span class="dashicons dashicons-calendar"></span>
                         <span class="ee-event-datetimes-li-daterange">' . $datetime->date_range($date_format) . '</span>
                         <br/>
@@ -576,482 +576,482 @@ 
                         <span class="ee-event-datetimes-li-timerange">' . $datetime->time_range($time_format) . '</span>
                         ';
 
-                    $datetime_html = apply_filters(
-                        'FHEE__espresso_list_of_event_dates__datetime_html',
-                        $datetime_html,
-                        $datetime
-                    );
+					$datetime_html = apply_filters(
+						'FHEE__espresso_list_of_event_dates__datetime_html',
+						$datetime_html,
+						$datetime
+					);
 
-                    $DTD_ID        = esc_attr($datetime->ID());
-                    $active_status = esc_attr(' ee-event-datetimes-li-' . $datetime->get_active_status());
+					$DTD_ID        = esc_attr($datetime->ID());
+					$active_status = esc_attr(' ee-event-datetimes-li-' . $datetime->get_active_status());
 
-                    $html .= '
+					$html .= '
                     <li id="ee-event-datetimes-li-' . $DTD_ID . '" class="ee-event-datetimes-li' . $active_status . '">
                         ' . $datetime_html . '
                     </li>';
-                }
-            }
-            $html .= '</ul>';
-        } else {
-            $html =
-                '
+				}
+			}
+			$html .= '</ul>';
+		} else {
+			$html =
+				'
             <p>
                 <span class="dashicons dashicons-marker pink-text"></span>
                 ' . esc_html__(
-                    'There are no upcoming dates for this event.',
-                    'event_espresso'
-                ) . '
+					'There are no upcoming dates for this event.',
+					'event_espresso'
+				) . '
             </p>
             <br/>';
-        }
-        if ($echo) {
-            echo wp_kses($html, AllowedTags::getAllowedTags());
-            return '';
-        }
-        return $html;
-    }
+		}
+		if ($echo) {
+			echo wp_kses($html, AllowedTags::getAllowedTags());
+			return '';
+		}
+		return $html;
+	}
 }
 
 
 if (! function_exists('espresso_event_end_date')) {
-    /**
-     * espresso_event_end_date
-     * returns the last date for an event
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
-    {
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
-        $time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
-        if ($echo) {
-            echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
-    }
+	/**
+	 * espresso_event_end_date
+	 * returns the last date for an event
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_end_date($date_format = '', $time_format = '', $EVT_ID = false, $echo = true)
+	{
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$date_format = apply_filters('FHEE__espresso_event_end_date__date_format', $date_format);
+		$time_format = apply_filters('FHEE__espresso_event_end_date__time_format', $time_format);
+		if ($echo) {
+			echo EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::the_event_end_date($date_format, $time_format, $EVT_ID);
+	}
 }
 
 if (! function_exists('espresso_event_date_range')) {
-    /**
-     * espresso_event_date_range
-     * returns the first and last chronologically ordered dates for an event (if different)
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param string $single_date_format
-     * @param string $single_time_format
-     * @param bool   $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_range(
-        $date_format = '',
-        $time_format = '',
-        $single_date_format = '',
-        $single_time_format = '',
-        $EVT_ID = false,
-        $echo = true
-    ) {
-        // set and filter date and time formats when a range is returned
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
-        // get the start and end date with NO time portion
-        $the_event_date     = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
-        $the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
-        // now we can determine if date range spans more than one day
-        if ($the_event_date != $the_event_end_date) {
-            $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-            $time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
-            $html        = sprintf(
-            /* translators: 1: first event date, 2: last event date */
-                esc_html__('%1$s - %2$s', 'event_espresso'),
-                EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
-                EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
-            );
-        } else {
-            // set and filter date and time formats when only a single datetime is returned
-            $single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
-            $single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
-            $single_date_format =
-                apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
-            $single_time_format =
-                apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
-            $html               =
-                EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
-        }
-        if ($echo) {
-            echo wp_kses($html, AllowedTags::getAllowedTags());
-            return '';
-        }
-        return $html;
-    }
+	/**
+	 * espresso_event_date_range
+	 * returns the first and last chronologically ordered dates for an event (if different)
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param string $single_date_format
+	 * @param string $single_time_format
+	 * @param bool   $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_range(
+		$date_format = '',
+		$time_format = '',
+		$single_date_format = '',
+		$single_time_format = '',
+		$EVT_ID = false,
+		$echo = true
+	) {
+		// set and filter date and time formats when a range is returned
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_event_date_range__date_format', $date_format);
+		// get the start and end date with NO time portion
+		$the_event_date     = EEH_Event_View::the_earliest_event_date($date_format, '', $EVT_ID);
+		$the_event_end_date = EEH_Event_View::the_latest_event_date($date_format, '', $EVT_ID);
+		// now we can determine if date range spans more than one day
+		if ($the_event_date != $the_event_end_date) {
+			$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+			$time_format = apply_filters('FHEE__espresso_event_date_range__time_format', $time_format);
+			$html        = sprintf(
+			/* translators: 1: first event date, 2: last event date */
+				esc_html__('%1$s - %2$s', 'event_espresso'),
+				EEH_Event_View::the_earliest_event_date($date_format, $time_format, $EVT_ID),
+				EEH_Event_View::the_latest_event_date($date_format, $time_format, $EVT_ID)
+			);
+		} else {
+			// set and filter date and time formats when only a single datetime is returned
+			$single_date_format = ! empty($single_date_format) ? $single_date_format : get_option('date_format');
+			$single_time_format = ! empty($single_time_format) ? $single_time_format : get_option('time_format');
+			$single_date_format =
+				apply_filters('FHEE__espresso_event_date_range__single_date_format', $single_date_format);
+			$single_time_format =
+				apply_filters('FHEE__espresso_event_date_range__single_time_format', $single_time_format);
+			$html               =
+				EEH_Event_View::the_earliest_event_date($single_date_format, $single_time_format, $EVT_ID);
+		}
+		if ($echo) {
+			echo wp_kses($html, AllowedTags::getAllowedTags());
+			return '';
+		}
+		return $html;
+	}
 }
 
 if (! function_exists('espresso_next_upcoming_datetime_obj')) {
-    /**
-     * espresso_next_upcoming_datetime_obj
-     * returns the next upcoming datetime object for an event
-     *
-     * @param int $EVT_ID
-     * @return EE_Datetime|null
-     * @throws EE_Error
-     */
-    function espresso_next_upcoming_datetime_obj($EVT_ID = 0)
-    {
-        return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
-    }
+	/**
+	 * espresso_next_upcoming_datetime_obj
+	 * returns the next upcoming datetime object for an event
+	 *
+	 * @param int $EVT_ID
+	 * @return EE_Datetime|null
+	 * @throws EE_Error
+	 */
+	function espresso_next_upcoming_datetime_obj($EVT_ID = 0)
+	{
+		return EEH_Event_View::get_next_upcoming_date_obj($EVT_ID);
+	}
 }
 
 if (! function_exists('espresso_next_upcoming_datetime')) {
-    /**
-     * espresso_next_upcoming_datetime
-     * returns the start date and time for the next upcoming event.
-     *
-     * @param string $date_format
-     * @param string $time_format
-     * @param int    $EVT_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true)
-    {
-
-        $date_format = ! empty($date_format) ? $date_format : get_option('date_format');
-        $date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
-
-        $time_format = ! empty($time_format) ? $time_format : get_option('time_format');
-        $time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
-
-        $datetime_format = trim($date_format . ' ' . $time_format);
-
-        $datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
-
-        if (! $datetime instanceof EE_Datetime) {
-            return '';
-        }
-        if ($echo) {
-            echo esc_html($datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format));
-            return '';
-        }
-        return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
-    }
+	/**
+	 * espresso_next_upcoming_datetime
+	 * returns the start date and time for the next upcoming event.
+	 *
+	 * @param string $date_format
+	 * @param string $time_format
+	 * @param int    $EVT_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_next_upcoming_datetime($date_format = '', $time_format = '', $EVT_ID = 0, $echo = true)
+	{
+
+		$date_format = ! empty($date_format) ? $date_format : get_option('date_format');
+		$date_format = apply_filters('FHEE__espresso_next_upcoming_datetime__date_format', $date_format);
+
+		$time_format = ! empty($time_format) ? $time_format : get_option('time_format');
+		$time_format = apply_filters('FHEE__espresso_next_upcoming_datetime__time_format', $time_format);
+
+		$datetime_format = trim($date_format . ' ' . $time_format);
+
+		$datetime = espresso_next_upcoming_datetime_obj($EVT_ID);
+
+		if (! $datetime instanceof EE_Datetime) {
+			return '';
+		}
+		if ($echo) {
+			echo esc_html($datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format));
+			return '';
+		}
+		return $datetime->get_i18n_datetime('DTT_EVT_start', $datetime_format);
+	}
 }
 
 if (! function_exists('espresso_event_date_as_calendar_page')) {
-    /**
-     * espresso_event_date_as_calendar_page
-     * returns the primary date for an event, stylized to appear as the page of a calendar
-     *
-     * @param bool $EVT_ID
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_date_as_calendar_page($EVT_ID = false)
-    {
-        EEH_Event_View::event_date_as_calendar_page($EVT_ID);
-    }
+	/**
+	 * espresso_event_date_as_calendar_page
+	 * returns the primary date for an event, stylized to appear as the page of a calendar
+	 *
+	 * @param bool $EVT_ID
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_date_as_calendar_page($EVT_ID = false)
+	{
+		EEH_Event_View::event_date_as_calendar_page($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_link_url')) {
-    /**
-     * espresso_event_link_url
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_link_url($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_link_url($EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_link_url($EVT_ID);
-    }
+	/**
+	 * espresso_event_link_url
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_link_url($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_link_url($EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_link_url($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_has_content_or_excerpt')) {
-    /**
-     *    espresso_event_has_content_or_excerpt
-     *
-     * @access    public
-     * @param bool $EVT_ID
-     * @return    boolean
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_has_content_or_excerpt($EVT_ID = false)
-    {
-        return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
-    }
+	/**
+	 *    espresso_event_has_content_or_excerpt
+	 *
+	 * @access    public
+	 * @param bool $EVT_ID
+	 * @return    boolean
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_has_content_or_excerpt($EVT_ID = false)
+	{
+		return EEH_Event_View::event_has_content_or_excerpt($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_event_content_or_excerpt')) {
-    /**
-     * espresso_event_content_or_excerpt
-     *
-     * @param int  $num_words
-     * @param null $more
-     * @param bool $echo
-     * @return string
-     */
-    function espresso_event_content_or_excerpt($num_words = 55, $more = null, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_content_or_excerpt($num_words, $more); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_content_or_excerpt($num_words, $more);
-    }
+	/**
+	 * espresso_event_content_or_excerpt
+	 *
+	 * @param int  $num_words
+	 * @param null $more
+	 * @param bool $echo
+	 * @return string
+	 */
+	function espresso_event_content_or_excerpt($num_words = 55, $more = null, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_content_or_excerpt($num_words, $more); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_content_or_excerpt($num_words, $more);
+	}
 }
 
 
 if (! function_exists('espresso_event_phone')) {
-    /**
-     * espresso_event_phone
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_phone($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::event_phone($EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::event_phone($EVT_ID);
-    }
+	/**
+	 * espresso_event_phone
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_phone($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::event_phone($EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::event_phone($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_edit_event_link')) {
-    /**
-     * espresso_edit_event_link
-     * returns a link to edit an event
-     *
-     * @param int  $EVT_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_edit_event_link($EVT_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Event_View::edit_event_link($EVT_ID); // already escaped
-            return '';
-        }
-        return EEH_Event_View::edit_event_link($EVT_ID);
-    }
+	/**
+	 * espresso_edit_event_link
+	 * returns a link to edit an event
+	 *
+	 * @param int  $EVT_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_edit_event_link($EVT_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Event_View::edit_event_link($EVT_ID); // already escaped
+			return '';
+		}
+		return EEH_Event_View::edit_event_link($EVT_ID);
+	}
 }
 
 
 if (! function_exists('espresso_organization_name')) {
-    /**
-     * espresso_organization_name
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_name($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('name'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('name');
-    }
+	/**
+	 * espresso_organization_name
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_name($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('name'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('name');
+	}
 }
 
 if (! function_exists('espresso_organization_address')) {
-    /**
-     * espresso_organization_address
-     *
-     * @param string $type
-     * @return string
-     */
-    function espresso_organization_address($type = 'inline')
-    {
-        if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
-            $address = new EventEspresso\core\domain\entities\GenericAddress(
-                EE_Registry::instance()->CFG->organization->address_1,
-                EE_Registry::instance()->CFG->organization->address_2,
-                EE_Registry::instance()->CFG->organization->city,
-                EE_Registry::instance()->CFG->organization->STA_ID,
-                EE_Registry::instance()->CFG->organization->zip,
-                EE_Registry::instance()->CFG->organization->CNT_ISO
-            );
-            return EEH_Address::format($address, $type);
-        }
-        return '';
-    }
+	/**
+	 * espresso_organization_address
+	 *
+	 * @param string $type
+	 * @return string
+	 */
+	function espresso_organization_address($type = 'inline')
+	{
+		if (EE_Registry::instance()->CFG->organization instanceof EE_Organization_Config) {
+			$address = new EventEspresso\core\domain\entities\GenericAddress(
+				EE_Registry::instance()->CFG->organization->address_1,
+				EE_Registry::instance()->CFG->organization->address_2,
+				EE_Registry::instance()->CFG->organization->city,
+				EE_Registry::instance()->CFG->organization->STA_ID,
+				EE_Registry::instance()->CFG->organization->zip,
+				EE_Registry::instance()->CFG->organization->CNT_ISO
+			);
+			return EEH_Address::format($address, $type);
+		}
+		return '';
+	}
 }
 
 if (! function_exists('espresso_organization_email')) {
-    /**
-     * espresso_organization_email
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_email($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('email'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('email');
-    }
+	/**
+	 * espresso_organization_email
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_email($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('email'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('email');
+	}
 }
 
 if (! function_exists('espresso_organization_logo_url')) {
-    /**
-     * espresso_organization_logo_url
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_logo_url($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
-    }
+	/**
+	 * espresso_organization_logo_url
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_logo_url($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('logo_url'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('logo_url');
+	}
 }
 
 if (! function_exists('espresso_organization_facebook')) {
-    /**
-     * espresso_organization_facebook
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_facebook($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('facebook'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
-    }
+	/**
+	 * espresso_organization_facebook
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_facebook($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('facebook'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('facebook');
+	}
 }
 
 if (! function_exists('espresso_organization_twitter')) {
-    /**
-     * espresso_organization_twitter
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_twitter($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('twitter'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
-    }
+	/**
+	 * espresso_organization_twitter
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_twitter($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('twitter'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('twitter');
+	}
 }
 
 if (! function_exists('espresso_organization_linkedin')) {
-    /**
-     * espresso_organization_linkedin
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_linkedin($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
-    }
+	/**
+	 * espresso_organization_linkedin
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_linkedin($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('linkedin'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('linkedin');
+	}
 }
 
 if (! function_exists('espresso_organization_pinterest')) {
-    /**
-     * espresso_organization_pinterest
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_pinterest($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
-    }
+	/**
+	 * espresso_organization_pinterest
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_pinterest($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('pinterest'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('pinterest');
+	}
 }
 
 if (! function_exists('espresso_organization_google')) {
-    /**
-     * espresso_organization_google
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_google($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('google'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('google');
-    }
+	/**
+	 * espresso_organization_google
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_google($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('google'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('google');
+	}
 }
 
 if (! function_exists('espresso_organization_instagram')) {
-    /**
-     * espresso_organization_instagram
-     *
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     */
-    function espresso_organization_instagram($echo = true)
-    {
-        if ($echo) {
-            echo EE_Registry::instance()->CFG->organization->get_pretty('instagram'); // already escaped
-            return '';
-        }
-        return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
-    }
+	/**
+	 * espresso_organization_instagram
+	 *
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 */
+	function espresso_organization_instagram($echo = true)
+	{
+		if ($echo) {
+			echo EE_Registry::instance()->CFG->organization->get_pretty('instagram'); // already escaped
+			return '';
+		}
+		return EE_Registry::instance()->CFG->organization->get_pretty('instagram');
+	}
 }
 
 
@@ -1059,345 +1059,345 @@ 
 
 
 if (! function_exists('espresso_event_venues')) {
-    /**
-     * espresso_event_venues
-     *
-     * @return array  all venues related to an event
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_event_venues()
-    {
-        return EEH_Venue_View::get_event_venues();
-    }
+	/**
+	 * espresso_event_venues
+	 *
+	 * @return array  all venues related to an event
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_event_venues()
+	{
+		return EEH_Venue_View::get_event_venues();
+	}
 }
 
 
 if (! function_exists('espresso_venue_id')) {
-    /**
-     *    espresso_venue_name
-     *
-     * @access    public
-     * @param int $EVT_ID
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_id($EVT_ID = 0)
-    {
-        $venue = EEH_Venue_View::get_venue($EVT_ID);
-        return $venue instanceof EE_Venue ? $venue->ID() : 0;
-    }
+	/**
+	 *    espresso_venue_name
+	 *
+	 * @access    public
+	 * @param int $EVT_ID
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_id($EVT_ID = 0)
+	{
+		$venue = EEH_Venue_View::get_venue($EVT_ID);
+		return $venue instanceof EE_Venue ? $venue->ID() : 0;
+	}
 }
 
 
 if (! function_exists('espresso_is_venue_private')) {
-    /**
-     * Return whether a venue is private or not.
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     *
-     * @return bool | null
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @see EEH_Venue_View::get_venue() for more info on expected return results.
-     */
-    function espresso_is_venue_private($VNU_ID = 0)
-    {
-        return EEH_Venue_View::is_venue_private($VNU_ID);
-    }
+	/**
+	 * Return whether a venue is private or not.
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 *
+	 * @return bool | null
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @see EEH_Venue_View::get_venue() for more info on expected return results.
+	 */
+	function espresso_is_venue_private($VNU_ID = 0)
+	{
+		return EEH_Venue_View::is_venue_private($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_is_password_protected')) {
-    /**
-     * returns true or false if a venue is password protected or not
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_is_password_protected($VNU_ID = 0)
-    {
-        EE_Registry::instance()->load_helper('Venue_View');
-        return EEH_Venue_View::is_venue_password_protected($VNU_ID);
-    }
+	/**
+	 * returns true or false if a venue is password protected or not
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_is_password_protected($VNU_ID = 0)
+	{
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::is_venue_password_protected($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_password_protected_venue_form')) {
-    /**
-     * Returns a password form if venue is password protected.
-     *
-     * @param int $VNU_ID optional, the venue id to check.
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_password_protected_venue_form($VNU_ID = 0)
-    {
-        EE_Registry::instance()->load_helper('Venue_View');
-        return EEH_Venue_View::password_protected_venue_form($VNU_ID);
-    }
+	/**
+	 * Returns a password form if venue is password protected.
+	 *
+	 * @param int $VNU_ID optional, the venue id to check.
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_password_protected_venue_form($VNU_ID = 0)
+	{
+		EE_Registry::instance()->load_helper('Venue_View');
+		return EEH_Venue_View::password_protected_venue_form($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_name')) {
-    /**
-     *    espresso_venue_name
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to the Venue's details page or website
-     * @param bool   $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_name($link_to, $VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_name($link_to, $VNU_ID);
-    }
+	/**
+	 *    espresso_venue_name
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $link_to - options( details, website, none ) whether to turn Venue name into a clickable link to the Venue's details page or website
+	 * @param bool   $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_name($VNU_ID = 0, $link_to = 'details', $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_name($link_to, $VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_name($link_to, $VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_link')) {
-    /**
-     *    espresso_venue_link
-     *
-     * @access    public
-     * @param int    $VNU_ID
-     * @param string $text
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_link($VNU_ID = 0, $text = '')
-    {
-        return EEH_Venue_View::venue_details_link($VNU_ID, $text);
-    }
+	/**
+	 *    espresso_venue_link
+	 *
+	 * @access    public
+	 * @param int    $VNU_ID
+	 * @param string $text
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_link($VNU_ID = 0, $text = '')
+	{
+		return EEH_Venue_View::venue_details_link($VNU_ID, $text);
+	}
 }
 
 
 if (! function_exists('espresso_venue_description')) {
-    /**
-     *    espresso_venue_description
-     *
-     * @access    public
-     * @param bool $VNU_ID
-     * @param bool $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_description($VNU_ID = false, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_description($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_description($VNU_ID);
-    }
+	/**
+	 *    espresso_venue_description
+	 *
+	 * @access    public
+	 * @param bool $VNU_ID
+	 * @param bool $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_description($VNU_ID = false, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_description($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_description($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_excerpt')) {
-    /**
-     *    espresso_venue_excerpt
-     *
-     * @access    public
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return    string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_excerpt($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_excerpt($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_excerpt($VNU_ID);
-    }
+	/**
+	 *    espresso_venue_excerpt
+	 *
+	 * @access    public
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return    string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_excerpt($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_excerpt($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_excerpt($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_categories')) {
-    /**
-     * espresso_venue_categories
-     * returns the terms associated with a venue
-     *
-     * @param int  $VNU_ID
-     * @param bool $hide_uncategorized
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = true, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
-    }
+	/**
+	 * espresso_venue_categories
+	 * returns the terms associated with a venue
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $hide_uncategorized
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_categories($VNU_ID = 0, $hide_uncategorized = true, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_categories($VNU_ID, $hide_uncategorized);
+	}
 }
 
 
 if (! function_exists('espresso_venue_address')) {
-    /**
-     * espresso_venue_address
-     * returns a formatted block of html  for displaying a venue's address
-     *
-     * @param string $type 'inline' or 'multiline'
-     * @param int    $VNU_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_address($type, $VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_address($type, $VNU_ID);
-    }
+	/**
+	 * espresso_venue_address
+	 * returns a formatted block of html  for displaying a venue's address
+	 *
+	 * @param string $type 'inline' or 'multiline'
+	 * @param int    $VNU_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_address($type = 'multiline', $VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_address($type, $VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_raw_address')) {
-    /**
-     * espresso_venue_address
-     * returns an UN-formatted string containing a venue's address
-     *
-     * @param string $type 'inline' or 'multiline'
-     * @param int    $VNU_ID
-     * @param bool   $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_address($type, $VNU_ID, false, false); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_address($type, $VNU_ID, false, false);
-    }
+	/**
+	 * espresso_venue_address
+	 * returns an UN-formatted string containing a venue's address
+	 *
+	 * @param string $type 'inline' or 'multiline'
+	 * @param int    $VNU_ID
+	 * @param bool   $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_raw_address($type = 'multiline', $VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_address($type, $VNU_ID, false, false); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_address($type, $VNU_ID, false, false);
+	}
 }
 
 
 if (! function_exists('espresso_venue_has_address')) {
-    /**
-     * espresso_venue_has_address
-     * returns TRUE or FALSE if a Venue has address information
-     *
-     * @param int $VNU_ID
-     * @return bool
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_has_address($VNU_ID = 0)
-    {
-        return EEH_Venue_View::venue_has_address($VNU_ID);
-    }
+	/**
+	 * espresso_venue_has_address
+	 * returns TRUE or FALSE if a Venue has address information
+	 *
+	 * @param int $VNU_ID
+	 * @return bool
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_has_address($VNU_ID = 0)
+	{
+		return EEH_Venue_View::venue_has_address($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_gmap')) {
-    /**
-     * espresso_venue_gmap
-     * returns a google map for the venue address
-     *
-     * @param int   $VNU_ID
-     * @param bool  $map_ID
-     * @param array $gmap
-     * @param bool  $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [], $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
-    }
+	/**
+	 * espresso_venue_gmap
+	 * returns a google map for the venue address
+	 *
+	 * @param int   $VNU_ID
+	 * @param bool  $map_ID
+	 * @param array $gmap
+	 * @param bool  $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_gmap($VNU_ID = 0, $map_ID = false, $gmap = [], $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_gmap($VNU_ID, $map_ID, $gmap);
+	}
 }
 
 
 if (! function_exists('espresso_venue_phone')) {
-    /**
-     * espresso_venue_phone
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_phone($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_phone($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_phone($VNU_ID);
-    }
+	/**
+	 * espresso_venue_phone
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_phone($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_phone($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_phone($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_venue_website')) {
-    /**
-     * espresso_venue_website
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_venue_website($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::venue_website_link($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::venue_website_link($VNU_ID);
-    }
+	/**
+	 * espresso_venue_website
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_venue_website($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::venue_website_link($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::venue_website_link($VNU_ID);
+	}
 }
 
 
 if (! function_exists('espresso_edit_venue_link')) {
-    /**
-     * espresso_edit_venue_link
-     *
-     * @param int  $VNU_ID
-     * @param bool $echo
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     */
-    function espresso_edit_venue_link($VNU_ID = 0, $echo = true)
-    {
-        if ($echo) {
-            echo EEH_Venue_View::edit_venue_link($VNU_ID); // already escaped
-            return '';
-        }
-        return EEH_Venue_View::edit_venue_link($VNU_ID);
-    }
+	/**
+	 * espresso_edit_venue_link
+	 *
+	 * @param int  $VNU_ID
+	 * @param bool $echo
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 */
+	function espresso_edit_venue_link($VNU_ID = 0, $echo = true)
+	{
+		if ($echo) {
+			echo EEH_Venue_View::edit_venue_link($VNU_ID); // already escaped
+			return '';
+		}
+		return EEH_Venue_View::edit_venue_link($VNU_ID);
+	}
 }
 
 

public/Espresso_Arabica_2014/content-espresso_venues-details.php

Spacing +13 added lines, -13 removed lines

@@ -5,43 +5,43 @@
 global $post;
 ?>
 <div class="venue-content">
-<?php if ( apply_filters( 'FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE )): ?>
+<?php if (apply_filters('FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE)): ?>
 	<div class="entry-meta">
-		<span class="tags-links"><?php espresso_venue_categories( $post->ID, TRUE, TRUE ); ?></span>
+		<span class="tags-links"><?php espresso_venue_categories($post->ID, TRUE, TRUE); ?></span>
 		<?php
-			if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
+			if ( ! post_password_required() && (comments_open() || get_comments_number())) :
 		?>
-		<span class="comments-link"><?php comments_popup_link( esc_html__( 'Leave a comment', 'event_espresso' ), esc_html__( '1 Comment', 'event_espresso' ), esc_html__( '% Comments', 'event_espresso' ) ); ?></span>
+		<span class="comments-link"><?php comments_popup_link(esc_html__('Leave a comment', 'event_espresso'), esc_html__('1 Comment', 'event_espresso'), esc_html__('% Comments', 'event_espresso')); ?></span>
 		<?php
 			endif;
 
-			edit_post_link( esc_html__( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
+			edit_post_link(esc_html__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
 		?>
 	</div>
 <?php  endif; ?>
 	
 	<h3 class="event-venues-h3 ee-event-h3">
-		<?php esc_html_e( 'Details', 'event_espresso' ); ?>
+		<?php esc_html_e('Details', 'event_espresso'); ?>
 	</h3>
 
-	<?php if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+	<?php if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php esc_html_e( 'Venue Phone:', 'event_espresso' ); ?> </strong></span><?php echo wp_kses($venue_phone, AllowedTags::getAllowedTags()); ?>
+		<span class="small-text"><strong><?php esc_html_e('Venue Phone:', 'event_espresso'); ?> </strong></span><?php echo wp_kses($venue_phone, AllowedTags::getAllowedTags()); ?>
 	</p>
 	<?php endif; ?>
-	<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
+	<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
 	<p>
-		<span class="small-text"><strong><?php esc_html_e( 'Venue Website:', 'event_espresso' ); ?> </strong></span><?php echo wp_kses($venue_website, AllowedTags::getAllowedTags()); ?>
+		<span class="small-text"><strong><?php esc_html_e('Venue Website:', 'event_espresso'); ?> </strong></span><?php echo wp_kses($venue_website, AllowedTags::getAllowedTags()); ?>
 	</p>
 	<?php endif; ?>
 	<?php 
-	do_action( 'AHEE__content_espresso_venues_details_template__before_the_content', $post ); 
-	if ( is_archive() && has_excerpt( $post->ID )) {
+	do_action('AHEE__content_espresso_venues_details_template__before_the_content', $post); 
+	if (is_archive() && has_excerpt($post->ID)) {
 		the_excerpt();
 	} else {
 		the_content();
 	}
-	do_action( 'AHEE__content_espresso_venues_details_template__after_the_content', $post ); 
+	do_action('AHEE__content_espresso_venues_details_template__after_the_content', $post); 
 	?>
 </div>
 <!-- .venue-content -->

public/Espresso_Arabica_2014/content-espresso_events-venues.php

Spacing +32 added lines, -32 removed lines

@@ -3,75 +3,75 @@
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 if (
-	( is_single() && espresso_display_venue_in_event_details() )
-	|| ( is_archive() && espresso_display_venue_in_event_list() )
+	(is_single() && espresso_display_venue_in_event_details())
+	|| (is_archive() && espresso_display_venue_in_event_list())
 ) :
 	global $post;
-	do_action( 'AHEE_event_details_before_venue_details', $post );
-	$venue_name = espresso_venue_name( 0, 'details', FALSE );
-	if ( empty( $venue_name ) && espresso_is_venue_private() ) {
-		do_action( 'AHEE_event_details_after_venue_details', $post );
+	do_action('AHEE_event_details_before_venue_details', $post);
+	$venue_name = espresso_venue_name(0, 'details', FALSE);
+	if (empty($venue_name) && espresso_is_venue_private()) {
+		do_action('AHEE_event_details_after_venue_details', $post);
 		return '';
 	}
 ?>
 
 <div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
 	<h4>
-        <strong><?php esc_html_e( 'Venue:', 'event_espresso' ); ?></strong>&nbsp;&nbsp;
+        <strong><?php esc_html_e('Venue:', 'event_espresso'); ?></strong>&nbsp;&nbsp;
         <strong> <?php echo wp_kses($venue_name, AllowedTags::getAllowedTags()); ?></strong>
     </h4>
 	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
-<?php  if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
+<?php  if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
 	<p>
 		<span class="small-text">
-            <strong><?php esc_html_e( 'Venue Phone:', 'event_espresso' ); ?></strong>
+            <strong><?php esc_html_e('Venue Phone:', 'event_espresso'); ?></strong>
         </span>
         <?php echo wp_kses($venue_phone, AllowedTags::getAllowedTags()); ?>
 	</p>
-<?php endif;  ?>
-<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
+<?php endif; ?>
+<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
 	<p>
 		<span class="small-text">
-            <strong><?php esc_html_e( 'Venue Website:', 'event_espresso' ); ?></strong>
+            <strong><?php esc_html_e('Venue Website:', 'event_espresso'); ?></strong>
         </span>
         <?php echo wp_kses($venue_website, AllowedTags::getAllowedTags()); ?>
 	</p>
 <?php endif; ?>
-<?php  if ( espresso_venue_has_address( $post->ID )) : ?>
-	<strong><span class="dashicons dashicons-location-alt"></span><?php esc_html_e( 'Address:', 'event_espresso' ); ?></strong>
-	<?php espresso_venue_address( 'inline' ); // already escaped ?>
-	<?php espresso_venue_gmap( $post->ID ); // already escaped ?>
+<?php  if (espresso_venue_has_address($post->ID)) : ?>
+	<strong><span class="dashicons dashicons-location-alt"></span><?php esc_html_e('Address:', 'event_espresso'); ?></strong>
+	<?php espresso_venue_address('inline'); // already escaped ?>
+	<?php espresso_venue_gmap($post->ID); // already escaped ?>
 	<div class="clear"><br/></div>
-<?php endif;  ?>
+<?php endif; ?>
 
-	<?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
-	<?php if ( is_single() ) : ?>
-		<?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_description ) : ?>
+	<?php $VNU_ID = espresso_venue_id($post->ID); ?>
+	<?php if (is_single()) : ?>
+		<?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
+		<?php if ($venue_description) : ?>
 	<p>
-		<strong><?php esc_html_e( 'Description:', 'event_espresso' ); ?></strong><br/>
-		<?php echo do_shortcode( $venue_description ); ?>
+		<strong><?php esc_html_e('Description:', 'event_espresso'); ?></strong><br/>
+		<?php echo do_shortcode($venue_description); ?>
 	</p>
-		<?php endif;  ?>
+		<?php endif; ?>
 	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
-		<?php if ( $venue_excerpt ) : ?>
+		<?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
+		<?php if ($venue_excerpt) : ?>
 	<p>
-		<strong><?php esc_html_e( 'Description:', 'event_espresso' ); ?></strong><br/>
+		<strong><?php esc_html_e('Description:', 'event_espresso'); ?></strong><br/>
 		<?php echo wp_kses($venue_excerpt, AllowedTags::getAllowedTags()); ?>
 	</p>
-			<?php endif;  ?>
-		<?php endif;  ?>
+			<?php endif; ?>
+		<?php endif; ?>
 </div>
 <!-- .espresso-venue-dv -->
 <?php
-do_action( 'AHEE_event_details_after_venue_details', $post );
+do_action('AHEE_event_details_after_venue_details', $post);
 else :
-	if ( espresso_venue_is_password_protected() ) :
+	if (espresso_venue_is_password_protected()) :
 ?>
 	<div class="espresso-venue-dv  espresso-password-protected-venue-dv" >
 		<h3 class="event-venues-h3 ee-event-h3">
-			<?php esc_html_e( 'Location', 'event_espresso' );?>
+			<?php esc_html_e('Location', 'event_espresso'); ?>
 		</h3>
 		<?php echo espresso_password_protected_venue_form(); ?>
 	</div>

public/Espresso_Arabica_2014/content-espresso_event_attendees.php

Indentation +5 added lines, -5 removed lines

@@ -15,11 +15,11 @@
 use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
 $gravatar = $show_gravatar
-    ? get_avatar(
-        $contact->email(),
-        (int) apply_filters('FHEE__loop-espresso_attendees-shortcode__template__avatar_size', 32)
-    )
-    : '';
+	? get_avatar(
+		$contact->email(),
+		(int) apply_filters('FHEE__loop-espresso_attendees-shortcode__template__avatar_size', 32)
+	)
+	: '';
 ?>
 <?php do_action( 'AHEE__content-espresso_event_attendees__before', $contact, $show_gravatar ); ?>
 <li><?php echo wp_kses($gravatar . '&nbsp;' .  $contact->full_name(true), AllowedTags::getAllowedTags()); ?></li>

Spacing +3 added lines, -3 removed lines

@@ -21,8 +21,8 @@
     )
     : '';
 ?>
-<?php do_action( 'AHEE__content-espresso_event_attendees__before', $contact, $show_gravatar ); ?>
-<li><?php echo wp_kses($gravatar . '&nbsp;' .  $contact->full_name(true), AllowedTags::getAllowedTags()); ?></li>
-<?php do_action( 'AHEE__content-espresso_event_attendees__after', $contact, $show_gravatar ); ?>
+<?php do_action('AHEE__content-espresso_event_attendees__before', $contact, $show_gravatar); ?>
+<li><?php echo wp_kses($gravatar.'&nbsp;'.$contact->full_name(true), AllowedTags::getAllowedTags()); ?></li>
+<?php do_action('AHEE__content-espresso_event_attendees__after', $contact, $show_gravatar); ?>
 
 <!--<br >-->

public/Espresso_Arabica_2014/content-espresso_events-details.php

Spacing +15 added lines, -15 removed lines

@@ -4,27 +4,27 @@ 
 <div class="event-content">
 <?php use EventEspresso\core\services\request\sanitizers\AllowedTags;
 
-if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
+if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
 
 	<div class="entry-meta">
 
 		<span class="tags-links">
-            <?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?>
+            <?php espresso_event_categories($post->ID, TRUE, TRUE); ?>
         </span>
 
-	    <?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
+	    <?php if ( ! post_password_required() && (comments_open() || get_comments_number())) : ?>
 	    <span class="comments-link">
         <?php comments_popup_link(
-            esc_html__( 'Leave a comment', 'event_espresso' ),
-            esc_html__( '1 Comment', 'event_espresso' ),
-            esc_html__( '% Comments', 'event_espresso' )
+            esc_html__('Leave a comment', 'event_espresso'),
+            esc_html__('1 Comment', 'event_espresso'),
+            esc_html__('% Comments', 'event_espresso')
         ); ?>
         </span>
 
         <?php
             endif;
             edit_post_link(
-                esc_html__( 'Edit', 'event_espresso' ),
+                esc_html__('Edit', 'event_espresso'),
                 '<span class="edit-link">',
                 '</span>'
             );
@@ -32,25 +32,25 @@ 
 	</div>
 
 <?php endif;
-	$event_phone = espresso_event_phone( $post->ID, FALSE );
+	$event_phone = espresso_event_phone($post->ID, FALSE);
 
-	if ( $event_phone != '' ) : ?>
+	if ($event_phone != '') : ?>
 	<p class="event-phone">
 		<span class="small-text">
-            <strong><?php esc_html_e( 'Event Phone:', 'event_espresso' ); ?> </strong>
+            <strong><?php esc_html_e('Event Phone:', 'event_espresso'); ?> </strong>
         </span>
         <?php echo wp_kses($event_phone, AllowedTags::getAllowedTags()); ?>
 	</p>
-<?php endif;  ?>
+<?php endif; ?>
 
 <?php
-	if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_the_content', true ) ) {
-		do_action( 'AHEE_event_details_before_the_content', $post );
+	if (apply_filters('FHEE__content_espresso_events_details_template__display_the_content', true)) {
+		do_action('AHEE_event_details_before_the_content', $post);
 		echo apply_filters(
 			'FHEE__content_espresso_events_details_template__the_content',
-			espresso_event_content_or_excerpt( 55, null, false ) 
+			espresso_event_content_or_excerpt(55, null, false) 
 		);
-		do_action( 'AHEE_event_details_after_the_content', $post );
+		do_action('AHEE_event_details_after_the_content', $post);
 	}
  ?>
 </div>

widgets/upcoming_events/EEW_Upcoming_Events.widget.php

Indentation +594 added lines, -594 removed lines

@@ -13,109 +13,109 @@ 
 class EEW_Upcoming_Events extends EspressoWidget
 {
 
-    /**
-     * @var string
-     */
-    private $title;
-    /**
-     * @var string
-     */
-    private $events_category;
-
-    /**
-     * @var bool
-     */
-    private $show_expired;
-
-    /**
-     * @var string
-     */
-    private $image_size;
-
-    /**
-     * @var bool
-     */
-    private $show_desc;
-
-    /**
-     * @var bool
-     */
-    private $show_dates;
-
-    /**
-     * @var string
-     */
-    private $date_limit;
-
-    /**
-     * @var string
-     */
-    private $date_range;
-
-    /**
-     * @var string
-     */
-    private $limit;
-
-    /**
-     * @var string
-     */
-    private $order;
-
-
-    /**
-     * Register widget with WordPress.
-     */
-    public function __construct()
-    {
-        parent::__construct(
-            esc_html__('Event Espresso Upcoming Events', 'event_espresso'),
-            ['description' => esc_html__('A widget to display your upcoming events.', 'event_espresso')]
-        );
-    }
-
-
-    /**
-     * Back-end widget form.
-     *
-     * @param array $instance Previously saved values from database.
-     * @return void
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @see WP_Widget::form()
-     */
-    public function form($instance)
-    {
-
-        EE_Registry::instance()->load_class('Question_Option', [], false, false, true);
-        // Set up some default widget settings.
-        $defaults = [
-            'title'           => esc_html__('Upcoming Events', 'event_espresso'),
-            'category_name'   => '',
-            'show_expired'    => 0,
-            'show_desc'       => true,
-            'show_dates'      => true,
-            'show_everywhere' => false,
-            'date_limit'      => 2,
-            'limit'           => 10,
-            'sort'            => 'ASC',
-            'date_range'      => false,
-            'image_size'      => 'medium',
-        ];
-
-        $instance = wp_parse_args((array) $instance, $defaults);
-        // don't add HTML labels for EE_Form_Fields generated inputs
-        add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
-        $yes_no_values = [
-            EE_Question_Option::new_instance(['QSO_value' => false, 'QSO_desc' => esc_html__('No', 'event_espresso')]),
-            EE_Question_Option::new_instance(['QSO_value' => true, 'QSO_desc' => esc_html__('Yes', 'event_espresso')]),
-        ];
-        $sort_values   = [
-            EE_Question_Option::new_instance(['QSO_value' => 'ASC', 'QSO_desc' => esc_html__('ASC', 'event_espresso')]),
-            EE_Question_Option::new_instance(['QSO_value' => 'DESC', 'QSO_desc' => esc_html__('DESC', 'event_espresso')]),
-        ];
-
-        ?>
+	/**
+	 * @var string
+	 */
+	private $title;
+	/**
+	 * @var string
+	 */
+	private $events_category;
+
+	/**
+	 * @var bool
+	 */
+	private $show_expired;
+
+	/**
+	 * @var string
+	 */
+	private $image_size;
+
+	/**
+	 * @var bool
+	 */
+	private $show_desc;
+
+	/**
+	 * @var bool
+	 */
+	private $show_dates;
+
+	/**
+	 * @var string
+	 */
+	private $date_limit;
+
+	/**
+	 * @var string
+	 */
+	private $date_range;
+
+	/**
+	 * @var string
+	 */
+	private $limit;
+
+	/**
+	 * @var string
+	 */
+	private $order;
+
+
+	/**
+	 * Register widget with WordPress.
+	 */
+	public function __construct()
+	{
+		parent::__construct(
+			esc_html__('Event Espresso Upcoming Events', 'event_espresso'),
+			['description' => esc_html__('A widget to display your upcoming events.', 'event_espresso')]
+		);
+	}
+
+
+	/**
+	 * Back-end widget form.
+	 *
+	 * @param array $instance Previously saved values from database.
+	 * @return void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @see WP_Widget::form()
+	 */
+	public function form($instance)
+	{
+
+		EE_Registry::instance()->load_class('Question_Option', [], false, false, true);
+		// Set up some default widget settings.
+		$defaults = [
+			'title'           => esc_html__('Upcoming Events', 'event_espresso'),
+			'category_name'   => '',
+			'show_expired'    => 0,
+			'show_desc'       => true,
+			'show_dates'      => true,
+			'show_everywhere' => false,
+			'date_limit'      => 2,
+			'limit'           => 10,
+			'sort'            => 'ASC',
+			'date_range'      => false,
+			'image_size'      => 'medium',
+		];
+
+		$instance = wp_parse_args((array) $instance, $defaults);
+		// don't add HTML labels for EE_Form_Fields generated inputs
+		add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
+		$yes_no_values = [
+			EE_Question_Option::new_instance(['QSO_value' => false, 'QSO_desc' => esc_html__('No', 'event_espresso')]),
+			EE_Question_Option::new_instance(['QSO_value' => true, 'QSO_desc' => esc_html__('Yes', 'event_espresso')]),
+		];
+		$sort_values   = [
+			EE_Question_Option::new_instance(['QSO_value' => 'ASC', 'QSO_desc' => esc_html__('ASC', 'event_espresso')]),
+			EE_Question_Option::new_instance(['QSO_value' => 'DESC', 'QSO_desc' => esc_html__('DESC', 'event_espresso')]),
+		];
+
+		?>
 
         <!-- Widget Title: Text Input -->
 
@@ -152,32 +152,32 @@ 
                 <?php esc_html_e('Show Expired Events:', 'event_espresso'); ?>
             </label>
             <?php
-            $show_expired_options   = $yes_no_values;
-            $show_expired_options[] = EE_Question_Option::new_instance(
-                ['QSO_value' => 2, 'QSO_desc' => esc_html__('Show Only Expired', 'event_espresso')]
-            );
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Expired Events:', 'event_espresso'),
-                $instance['show_expired'],
-                $show_expired_options,
-                $this->fieldName('show_expired'),
-                $this->fieldID('show_expired')
-            );
-            ?>
+			$show_expired_options   = $yes_no_values;
+			$show_expired_options[] = EE_Question_Option::new_instance(
+				['QSO_value' => 2, 'QSO_desc' => esc_html__('Show Only Expired', 'event_espresso')]
+			);
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Expired Events:', 'event_espresso'),
+				$instance['show_expired'],
+				$show_expired_options,
+				$this->fieldName('show_expired'),
+				$this->fieldID('show_expired')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('sort')); ?>">
                 <?php esc_html_e('Sort Events:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Sort Events:', 'event_espresso'),
-                $instance['sort'],
-                $sort_values,
-                $this->fieldName('sort'),
-                $this->fieldID('sort')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Sort Events:', 'event_espresso'),
+				$instance['sort'],
+				$sort_values,
+				$this->fieldName('sort'),
+				$this->fieldID('sort')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('image_size')); ?>">
@@ -191,42 +191,42 @@ 
                 <?php esc_html_e('Show Description:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Description:', 'event_espresso'),
-                $instance['show_desc'],
-                $yes_no_values,
-                $this->fieldName('show_desc'),
-                $this->fieldID('show_desc')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Description:', 'event_espresso'),
+				$instance['show_desc'],
+				$yes_no_values,
+				$this->fieldName('show_desc'),
+				$this->fieldID('show_desc')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('show_dates')); ?>">
                 <?php esc_html_e('Show Dates:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Dates:', 'event_espresso'),
-                $instance['show_dates'],
-                $yes_no_values,
-                $this->fieldName('show_dates'),
-                $this->fieldID('show_dates')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Dates:', 'event_espresso'),
+				$instance['show_dates'],
+				$yes_no_values,
+				$this->fieldName('show_dates'),
+				$this->fieldID('show_dates')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('show_everywhere')); ?>">
                 <?php esc_html_e('Show on all Pages:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show on all Pages:', 'event_espresso'),
-                $instance['show_everywhere'],
-                $yes_no_values,
-                $this->fieldName('show_everywhere'),
-                $this->fieldID('show_everywhere')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show on all Pages:', 'event_espresso'),
+				$instance['show_everywhere'],
+				$yes_no_values,
+				$this->fieldName('show_everywhere'),
+				$this->fieldID('show_everywhere')
+			);
+			?>
         </p>
         <p>
             <label for="<?php echo esc_attr($this->fieldID('date_limit')); ?>">
@@ -244,278 +244,278 @@ 
                 <?php esc_html_e('Show Date Range:', 'event_espresso'); ?>
             </label>
             <?php
-            echo EEH_Form_Fields::select(
-                esc_html__('Show Date Range:', 'event_espresso'),
-                $instance['date_range'],
-                $yes_no_values,
-                $this->fieldName('date_range'),
-                $this->fieldID('date_range')
-            );
-            ?>
+			echo EEH_Form_Fields::select(
+				esc_html__('Show Date Range:', 'event_espresso'),
+				$instance['date_range'],
+				$yes_no_values,
+				$this->fieldName('date_range'),
+				$this->fieldID('date_range')
+			);
+			?>
             <span class="description">
                 <br />
                 <?php esc_html_e(
-                    'This setting will replace the list of dates in the widget.',
-                    'event_espresso'
-                ); ?>
+					'This setting will replace the list of dates in the widget.',
+					'event_espresso'
+				); ?>
             </span>
         </p>
 
         <?php
-    }
-
-
-    /**
-     * Sanitize widget form values as they are saved.
-     *
-     * @param array $new_instance Values just sent to be saved.
-     * @param array $old_instance Previously saved values from database.
-     *
-     * @return array Updated safe values to be saved.
-     * @see WP_Widget::update()
-     *
-     */
-    public function update($new_instance, $old_instance)
-    {
-        $instance                    = $old_instance;
-        $instance['title']           = ! empty($new_instance['title']) ? strip_tags($new_instance['title']) : '';
-        $instance['category_name']   = $new_instance['category_name'];
-        $instance['show_expired']    = $new_instance['show_expired'];
-        $instance['limit']           = $new_instance['limit'];
-        $instance['sort']            = $new_instance['sort'];
-        $instance['image_size']      = $new_instance['image_size'];
-        $instance['show_desc']       = $new_instance['show_desc'];
-        $instance['show_dates']      = $new_instance['show_dates'];
-        $instance['show_everywhere'] = $new_instance['show_everywhere'];
-        $instance['date_limit']      = $new_instance['date_limit'];
-        $instance['date_range']      = $new_instance['date_range'];
-        return $instance;
-    }
-
-
-    /**
-     * Front-end display of widget.
-     *
-     * @param array $args     Widget arguments.
-     * @param array $instance Saved values from database.
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @see WP_Widget::widget()
-     *
-     */
-    public function widget($args, $instance)
-    {
-
-        global $post;
-        // make sure there is some kinda post object
-        if ($post instanceof WP_Post) {
-            $before_widget = '';
-            $before_title  = '';
-            $after_title   = '';
-            $after_widget  = '';
-            // but NOT an events archives page, cuz that would be like two event lists on the same page
-            $show_everywhere = ! isset($instance['show_everywhere']) || absint($instance['show_everywhere']);
-            if ($show_everywhere || ! ($post->post_type == 'espresso_events' && is_archive())) {
-                // let's use some of the event helper functions'
-                // make separate vars out of attributes
-                extract($args);
-
-                // grab widget settings
-                $this->parseWidgetSettings($instance);
-                $title = $this->widgetTitle();
-
-                // Before widget (defined by themes).
-                echo wp_kses($before_widget, AllowedTags::getAllowedTags());
-                // Display the widget title if one was input (before and after defined by themes).
-                if (! empty($title)) {
-                    echo wp_kses($before_title . $title . $after_title, AllowedTags::getAllowedTags());
-                }
-                echo wp_kses($this->widgetContent($post), AllowedTags::getAllowedTags());
-                // After widget (defined by themes).
-                echo wp_kses($after_widget, AllowedTags::getAllowedTags());
-            }
-        }
-    }
-
-
-    /**
-     * make_the_title_a_link
-     * callback for widget_title filter
-     *
-     * @param $title
-     * @return string
-     */
-    public function make_the_title_a_link($title)
-    {
-        return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
-    }
-
-
-    /**
-     * @param string $field_name
-     * @return string
-     * @since   4.10.14.p
-     */
-    public function fieldID($field_name)
-    {
-        return parent::get_field_id($field_name);
-    }
-
-
-    /**
-     * @param string $field_name
-     * @return string
-     * @since   4.10.14.p
-     */
-    public function fieldName($field_name)
-    {
-        return parent::get_field_name($field_name);
-    }
-
-
-    /**
-     * @param array $instance
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function eventCategoriesSelector(array $instance)
-    {
-        $event_categories = [];
-        $categories       = EEM_Term::instance()->get_all_ee_categories(true);
-        if ($categories) {
-            foreach ($categories as $category) {
-                if ($category instanceof EE_Term) {
-                    $event_categories[] =
-                        EE_Question_Option::new_instance(
-                            [
-                                'QSO_value' => $category->get('slug'),
-                                'QSO_desc'  => $category->get('name'),
-                            ]
-                        );
-                }
-            }
-        }
-        array_unshift(
-            $event_categories,
-            EE_Question_Option::new_instance(
-                [
-                    'QSO_value' => '',
-                    'QSO_desc'  => esc_html__(' - display all - ', 'event_espresso'),
-                ]
-            )
-        );
-        echo EEH_Form_Fields::select(
-            esc_html__('Event Category:', 'event_espresso'),
-            $instance['category_name'],
-            $event_categories,
-            $this->fieldName('category_name'),
-            $this->fieldID('category_name')
-        );
-    }
-
-
-    /**
-     * @param array $instance
-     * @since   4.10.14.p
-     */
-    private function imageSizeSelector(array $instance)
-    {
-        $image_sizes = [];
-        $sizes       = get_intermediate_image_sizes();
-        if ($sizes) {
-            // loop thru images and create option objects out of them
-            foreach ($sizes as $image_size) {
-                $image_size = trim($image_size);
-                // no big images plz
-                if (! in_array($image_size, ['large', 'post-thumbnail'])) {
-                    $image_sizes[] =
-                        EE_Question_Option::new_instance(['QSO_value' => $image_size, 'QSO_desc' => $image_size]);
-                }
-            }
-            $image_sizes[] =
-                EE_Question_Option::new_instance(
-                    ['QSO_value' => 'none', 'QSO_desc' => esc_html__('don\'t show images', 'event_espresso')]
-                );
-        }
-        echo EEH_Form_Fields::select(
-            esc_html__('Image Size:', 'event_espresso'),
-            $instance['image_size'],
-            $image_sizes,
-            $this->fieldName('image_size'),
-            $this->fieldID('image_size')
-        );
-    }
-
-
-    /**
-     * @param array $instance
-     * @since   4.10.14.p
-     */
-    private function parseWidgetSettings(array $instance)
-    {
-        $this->title = isset($instance['title']) && ! empty($instance['title']) ? $instance['title'] : '';
-        $this->events_category     = isset($instance['category_name']) && ! empty($instance['category_name'])
-            ? $instance['category_name']
-            : false;
-        $this->show_expired = isset($instance['show_expired'])
-            ? filter_var($instance['show_expired'], FILTER_VALIDATE_BOOLEAN)
-            : 0;
-        $this->image_size   = isset($instance['image_size']) && ! empty($instance['image_size'])
-            ? $instance['image_size']
-            : 'medium';
-        $this->show_desc    = ! isset($instance['show_desc'])
-                              || filter_var($instance['show_desc'], FILTER_VALIDATE_BOOLEAN);
-        $this->show_dates   = ! isset($instance['show_dates'])
-                              || filter_var($instance['show_dates'], FILTER_VALIDATE_BOOLEAN);
-        $this->date_limit   = isset($instance['date_limit']) && ! empty($instance['date_limit'])
-            ? $instance['date_limit']
-            : null;
-        $this->date_range   = isset($instance['date_range']) && ! empty($instance['date_range'])
-            ? $instance['date_range']
-            : false;
-        $this->limit        = isset($instance['limit']) ? absint($instance['limit']) : 10;
-        $this->order        = isset($instance['sort']) && $instance['sort'] === 'DESC'
-            ? 'DESC'
-            : 'ASC';
-    }
-
-
-    /**
-     * @return mixed|void
-     * @since   4.10.14.p
-     */
-    private function widgetTitle()
-    {
-        // add function to make the title a link
-        add_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
-        // filter the title
-        $title = apply_filters('widget_title', $this->title);
-        // remove the function from the filter, so it does not affect other widgets
-        remove_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
-        return $title;
-    }
-
-
-    /**
-     * @param WP_Post $post
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function widgetContent(WP_Post $post)
-    {
-        // run the query
-        $events = $this->getUpcomingEvents();
-        if (empty($events)) {
-            return '';
-        }
-        $list_items = '';
-        foreach ($events as $event) {
-            if ($event instanceof EE_Event && (! is_single() || $post->ID != $event->ID())) {
-                $event_url = $this->eventUrl($event);
-                $list_items .= '
+	}
+
+
+	/**
+	 * Sanitize widget form values as they are saved.
+	 *
+	 * @param array $new_instance Values just sent to be saved.
+	 * @param array $old_instance Previously saved values from database.
+	 *
+	 * @return array Updated safe values to be saved.
+	 * @see WP_Widget::update()
+	 *
+	 */
+	public function update($new_instance, $old_instance)
+	{
+		$instance                    = $old_instance;
+		$instance['title']           = ! empty($new_instance['title']) ? strip_tags($new_instance['title']) : '';
+		$instance['category_name']   = $new_instance['category_name'];
+		$instance['show_expired']    = $new_instance['show_expired'];
+		$instance['limit']           = $new_instance['limit'];
+		$instance['sort']            = $new_instance['sort'];
+		$instance['image_size']      = $new_instance['image_size'];
+		$instance['show_desc']       = $new_instance['show_desc'];
+		$instance['show_dates']      = $new_instance['show_dates'];
+		$instance['show_everywhere'] = $new_instance['show_everywhere'];
+		$instance['date_limit']      = $new_instance['date_limit'];
+		$instance['date_range']      = $new_instance['date_range'];
+		return $instance;
+	}
+
+
+	/**
+	 * Front-end display of widget.
+	 *
+	 * @param array $args     Widget arguments.
+	 * @param array $instance Saved values from database.
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @see WP_Widget::widget()
+	 *
+	 */
+	public function widget($args, $instance)
+	{
+
+		global $post;
+		// make sure there is some kinda post object
+		if ($post instanceof WP_Post) {
+			$before_widget = '';
+			$before_title  = '';
+			$after_title   = '';
+			$after_widget  = '';
+			// but NOT an events archives page, cuz that would be like two event lists on the same page
+			$show_everywhere = ! isset($instance['show_everywhere']) || absint($instance['show_everywhere']);
+			if ($show_everywhere || ! ($post->post_type == 'espresso_events' && is_archive())) {
+				// let's use some of the event helper functions'
+				// make separate vars out of attributes
+				extract($args);
+
+				// grab widget settings
+				$this->parseWidgetSettings($instance);
+				$title = $this->widgetTitle();
+
+				// Before widget (defined by themes).
+				echo wp_kses($before_widget, AllowedTags::getAllowedTags());
+				// Display the widget title if one was input (before and after defined by themes).
+				if (! empty($title)) {
+					echo wp_kses($before_title . $title . $after_title, AllowedTags::getAllowedTags());
+				}
+				echo wp_kses($this->widgetContent($post), AllowedTags::getAllowedTags());
+				// After widget (defined by themes).
+				echo wp_kses($after_widget, AllowedTags::getAllowedTags());
+			}
+		}
+	}
+
+
+	/**
+	 * make_the_title_a_link
+	 * callback for widget_title filter
+	 *
+	 * @param $title
+	 * @return string
+	 */
+	public function make_the_title_a_link($title)
+	{
+		return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+	}
+
+
+	/**
+	 * @param string $field_name
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	public function fieldID($field_name)
+	{
+		return parent::get_field_id($field_name);
+	}
+
+
+	/**
+	 * @param string $field_name
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	public function fieldName($field_name)
+	{
+		return parent::get_field_name($field_name);
+	}
+
+
+	/**
+	 * @param array $instance
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function eventCategoriesSelector(array $instance)
+	{
+		$event_categories = [];
+		$categories       = EEM_Term::instance()->get_all_ee_categories(true);
+		if ($categories) {
+			foreach ($categories as $category) {
+				if ($category instanceof EE_Term) {
+					$event_categories[] =
+						EE_Question_Option::new_instance(
+							[
+								'QSO_value' => $category->get('slug'),
+								'QSO_desc'  => $category->get('name'),
+							]
+						);
+				}
+			}
+		}
+		array_unshift(
+			$event_categories,
+			EE_Question_Option::new_instance(
+				[
+					'QSO_value' => '',
+					'QSO_desc'  => esc_html__(' - display all - ', 'event_espresso'),
+				]
+			)
+		);
+		echo EEH_Form_Fields::select(
+			esc_html__('Event Category:', 'event_espresso'),
+			$instance['category_name'],
+			$event_categories,
+			$this->fieldName('category_name'),
+			$this->fieldID('category_name')
+		);
+	}
+
+
+	/**
+	 * @param array $instance
+	 * @since   4.10.14.p
+	 */
+	private function imageSizeSelector(array $instance)
+	{
+		$image_sizes = [];
+		$sizes       = get_intermediate_image_sizes();
+		if ($sizes) {
+			// loop thru images and create option objects out of them
+			foreach ($sizes as $image_size) {
+				$image_size = trim($image_size);
+				// no big images plz
+				if (! in_array($image_size, ['large', 'post-thumbnail'])) {
+					$image_sizes[] =
+						EE_Question_Option::new_instance(['QSO_value' => $image_size, 'QSO_desc' => $image_size]);
+				}
+			}
+			$image_sizes[] =
+				EE_Question_Option::new_instance(
+					['QSO_value' => 'none', 'QSO_desc' => esc_html__('don\'t show images', 'event_espresso')]
+				);
+		}
+		echo EEH_Form_Fields::select(
+			esc_html__('Image Size:', 'event_espresso'),
+			$instance['image_size'],
+			$image_sizes,
+			$this->fieldName('image_size'),
+			$this->fieldID('image_size')
+		);
+	}
+
+
+	/**
+	 * @param array $instance
+	 * @since   4.10.14.p
+	 */
+	private function parseWidgetSettings(array $instance)
+	{
+		$this->title = isset($instance['title']) && ! empty($instance['title']) ? $instance['title'] : '';
+		$this->events_category     = isset($instance['category_name']) && ! empty($instance['category_name'])
+			? $instance['category_name']
+			: false;
+		$this->show_expired = isset($instance['show_expired'])
+			? filter_var($instance['show_expired'], FILTER_VALIDATE_BOOLEAN)
+			: 0;
+		$this->image_size   = isset($instance['image_size']) && ! empty($instance['image_size'])
+			? $instance['image_size']
+			: 'medium';
+		$this->show_desc    = ! isset($instance['show_desc'])
+							  || filter_var($instance['show_desc'], FILTER_VALIDATE_BOOLEAN);
+		$this->show_dates   = ! isset($instance['show_dates'])
+							  || filter_var($instance['show_dates'], FILTER_VALIDATE_BOOLEAN);
+		$this->date_limit   = isset($instance['date_limit']) && ! empty($instance['date_limit'])
+			? $instance['date_limit']
+			: null;
+		$this->date_range   = isset($instance['date_range']) && ! empty($instance['date_range'])
+			? $instance['date_range']
+			: false;
+		$this->limit        = isset($instance['limit']) ? absint($instance['limit']) : 10;
+		$this->order        = isset($instance['sort']) && $instance['sort'] === 'DESC'
+			? 'DESC'
+			: 'ASC';
+	}
+
+
+	/**
+	 * @return mixed|void
+	 * @since   4.10.14.p
+	 */
+	private function widgetTitle()
+	{
+		// add function to make the title a link
+		add_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
+		// filter the title
+		$title = apply_filters('widget_title', $this->title);
+		// remove the function from the filter, so it does not affect other widgets
+		remove_filter('widget_title', [$this, 'make_the_title_a_link'], 15);
+		return $title;
+	}
+
+
+	/**
+	 * @param WP_Post $post
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function widgetContent(WP_Post $post)
+	{
+		// run the query
+		$events = $this->getUpcomingEvents();
+		if (empty($events)) {
+			return '';
+		}
+		$list_items = '';
+		foreach ($events as $event) {
+			if ($event instanceof EE_Event && (! is_single() || $post->ID != $event->ID())) {
+				$event_url = $this->eventUrl($event);
+				$list_items .= '
                 <li id="ee-upcoming-events-widget-li-' . absint($event->ID()) . '" 
                     class="ee-upcoming-events-widget-li"
                 >
@@ -526,194 +526,194 @@ 
                     </h5>
                     ' . $this->eventWidgetContent($event, $event_url) . '
                 </li>';
-            }
-        }
-        return '
+			}
+		}
+		return '
             <ul class="ee-upcoming-events-widget-ul">
                 ' . $list_items . '
             </ul>';
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string|null
-     * @throws EE_Error
-     * @since   4.10.14.p
-     */
-    private function eventUrl(EE_Event $event)
-    {
-        return esc_url_raw(
-            apply_filters(
-                'FHEE_EEW_Upcoming_Events__widget__event_url',
-                $event->get_permalink(),
-                $event
-            )
-        );
-    }
-
-
-    /**
-     * @return EE_Base_Class[]
-     * @throws EE_Error
-     */
-    private function getUpcomingEvents()
-    {
-        return EEM_Event::instance()->get_all(
-            [
-                $this->queryWhereParams(),
-                'limit'    => '0,' . $this->limit,
-                'order_by' => 'Datetime.DTT_EVT_start',
-                'order'    => $this->order,
-                'group_by' => 'EVT_ID',
-            ]
-        );
-    }
-
-
-    /**
-     * @return mixed|void
-     * @throws EE_Error
-     * @since   4.10.14.p
-     */
-    private function queryWhereParams()
-    {
-        // start to build our where clause
-        $where = [
-            'status' => ['IN', ['publish', 'sold_out']],
-        ];
-        // add category
-        if ($this->events_category) {
-            $where['Term_Taxonomy.taxonomy']  = 'espresso_event_categories';
-            $where['Term_Taxonomy.Term.slug'] = $this->events_category;
-        }
-        // if NOT expired then we want events that start today or in the future
-        // if NOT show expired then we want events that start today or in the future
-        if ($this->show_expired == 0) {
-            $where['Datetime.DTT_EVT_end'] = [
-                '>=',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
-            ];
-        }
-        // if show ONLY expired we want events that ended prior to today
-        if ($this->show_expired == 2) {
-            $where['Datetime.DTT_EVT_end'] = [
-                '<=',
-                EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
-            ];
-        }
-        // allow $where to be filtered
-        return apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $this->events_category, $this->show_expired);
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function linkClass(EE_Event $event)
-    {
-        // how big is the event name ?
-        $name_length = strlen($event->name());
-        switch ($name_length) {
-            case $name_length > 70:
-                return ' three-line';
-            case $name_length > 35:
-                return ' two-line';
-        }
-        return ' one-line';
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @param string   $event_url
-     * @return mixed|string|void
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function eventWidgetContent(EE_Event $event, $event_url = '')
-    {
-        if (post_password_required($event->ID())) {
-            return apply_filters(
-                'FHEE_EEW_Upcoming_Events__widget__password_form',
-                get_the_password_form($event->ID()),
-                $event
-            );
-        }
-
-        $content = '';
-        if (has_post_thumbnail($event->ID()) && $this->image_size != 'none') {
-            $content .= '
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string|null
+	 * @throws EE_Error
+	 * @since   4.10.14.p
+	 */
+	private function eventUrl(EE_Event $event)
+	{
+		return esc_url_raw(
+			apply_filters(
+				'FHEE_EEW_Upcoming_Events__widget__event_url',
+				$event->get_permalink(),
+				$event
+			)
+		);
+	}
+
+
+	/**
+	 * @return EE_Base_Class[]
+	 * @throws EE_Error
+	 */
+	private function getUpcomingEvents()
+	{
+		return EEM_Event::instance()->get_all(
+			[
+				$this->queryWhereParams(),
+				'limit'    => '0,' . $this->limit,
+				'order_by' => 'Datetime.DTT_EVT_start',
+				'order'    => $this->order,
+				'group_by' => 'EVT_ID',
+			]
+		);
+	}
+
+
+	/**
+	 * @return mixed|void
+	 * @throws EE_Error
+	 * @since   4.10.14.p
+	 */
+	private function queryWhereParams()
+	{
+		// start to build our where clause
+		$where = [
+			'status' => ['IN', ['publish', 'sold_out']],
+		];
+		// add category
+		if ($this->events_category) {
+			$where['Term_Taxonomy.taxonomy']  = 'espresso_event_categories';
+			$where['Term_Taxonomy.Term.slug'] = $this->events_category;
+		}
+		// if NOT expired then we want events that start today or in the future
+		// if NOT show expired then we want events that start today or in the future
+		if ($this->show_expired == 0) {
+			$where['Datetime.DTT_EVT_end'] = [
+				'>=',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_end'),
+			];
+		}
+		// if show ONLY expired we want events that ended prior to today
+		if ($this->show_expired == 2) {
+			$where['Datetime.DTT_EVT_end'] = [
+				'<=',
+				EEM_Datetime::instance()->current_time_for_query('DTT_EVT_start'),
+			];
+		}
+		// allow $where to be filtered
+		return apply_filters('FHEE__EEW_Upcoming_Events__widget__where', $where, $this->events_category, $this->show_expired);
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function linkClass(EE_Event $event)
+	{
+		// how big is the event name ?
+		$name_length = strlen($event->name());
+		switch ($name_length) {
+			case $name_length > 70:
+				return ' three-line';
+			case $name_length > 35:
+				return ' two-line';
+		}
+		return ' one-line';
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @param string   $event_url
+	 * @return mixed|string|void
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function eventWidgetContent(EE_Event $event, $event_url = '')
+	{
+		if (post_password_required($event->ID())) {
+			return apply_filters(
+				'FHEE_EEW_Upcoming_Events__widget__password_form',
+				get_the_password_form($event->ID()),
+				$event
+			);
+		}
+
+		$content = '';
+		if (has_post_thumbnail($event->ID()) && $this->image_size != 'none') {
+			$content .= '
                 <div class="ee-upcoming-events-widget-img-dv">
                     <a class="ee-upcoming-events-widget-img" href="' . $event_url . '">
                         ' . get_the_post_thumbnail($event->ID(), $this->image_size) . '
                     </a>
                 </div>';
-        }
-
-        if ($this->show_dates) {
-            $content .= $this->eventDates($event);
-        }
-
-        if ($this->show_desc) {
-            $allowedtags = AllowedTags::getAllowedTags();
-            $desc    = $event->short_description(25);
-            $content .= $desc ? '<p style="margin-top: .5em">' . wp_kses($desc, $allowedtags) . '</p>' : '';
-        }
-
-        return $content;
-    }
-
-
-    /**
-     * @param EE_Event $event
-     * @return string
-     * @throws EE_Error
-     * @throws ReflectionException
-     * @since   4.10.14.p
-     */
-    private function eventDates(EE_Event $event)
-    {
-        $date_format        = apply_filters(
-            'FHEE__espresso_event_date_range__date_format',
-            get_option('date_format')
-        );
-        $time_format        = apply_filters(
-            'FHEE__espresso_event_date_range__time_format',
-            get_option('time_format')
-        );
-        $single_date_format = apply_filters(
-            'FHEE__espresso_event_date_range__single_date_format',
-            get_option('date_format')
-        );
-        $single_time_format = apply_filters(
-            'FHEE__espresso_event_date_range__single_time_format',
-            get_option('time_format')
-        );
-        if ($this->date_range == true) {
-            return espresso_event_date_range(
-                $date_format,
-                $time_format,
-                $single_date_format,
-                $single_time_format,
-                $event->ID(),
-                false
-            );
-        }
-        return espresso_list_of_event_dates(
-            $event->ID(),
-            $date_format,
-            $time_format,
-            false,
-            null,
-            true,
-            true,
-            $this->date_limit
-        );
-    }
+		}
+
+		if ($this->show_dates) {
+			$content .= $this->eventDates($event);
+		}
+
+		if ($this->show_desc) {
+			$allowedtags = AllowedTags::getAllowedTags();
+			$desc    = $event->short_description(25);
+			$content .= $desc ? '<p style="margin-top: .5em">' . wp_kses($desc, $allowedtags) . '</p>' : '';
+		}
+
+		return $content;
+	}
+
+
+	/**
+	 * @param EE_Event $event
+	 * @return string
+	 * @throws EE_Error
+	 * @throws ReflectionException
+	 * @since   4.10.14.p
+	 */
+	private function eventDates(EE_Event $event)
+	{
+		$date_format        = apply_filters(
+			'FHEE__espresso_event_date_range__date_format',
+			get_option('date_format')
+		);
+		$time_format        = apply_filters(
+			'FHEE__espresso_event_date_range__time_format',
+			get_option('time_format')
+		);
+		$single_date_format = apply_filters(
+			'FHEE__espresso_event_date_range__single_date_format',
+			get_option('date_format')
+		);
+		$single_time_format = apply_filters(
+			'FHEE__espresso_event_date_range__single_time_format',
+			get_option('time_format')
+		);
+		if ($this->date_range == true) {
+			return espresso_event_date_range(
+				$date_format,
+				$time_format,
+				$single_date_format,
+				$single_time_format,
+				$event->ID(),
+				false
+			);
+		}
+		return espresso_list_of_event_dates(
+			$event->ID(),
+			$date_format,
+			$time_format,
+			false,
+			null,
+			true,
+			true,
+			$this->date_limit
+		);
+	}
 }

Spacing +19 added lines, -19 removed lines

@@ -110,7 +110,7 @@ 
             EE_Question_Option::new_instance(['QSO_value' => false, 'QSO_desc' => esc_html__('No', 'event_espresso')]),
             EE_Question_Option::new_instance(['QSO_value' => true, 'QSO_desc' => esc_html__('Yes', 'event_espresso')]),
         ];
-        $sort_values   = [
+        $sort_values = [
             EE_Question_Option::new_instance(['QSO_value' => 'ASC', 'QSO_desc' => esc_html__('ASC', 'event_espresso')]),
             EE_Question_Option::new_instance(['QSO_value' => 'DESC', 'QSO_desc' => esc_html__('DESC', 'event_espresso')]),
         ];
@@ -327,8 +327,8 @@ 
                 // Before widget (defined by themes).
                 echo wp_kses($before_widget, AllowedTags::getAllowedTags());
                 // Display the widget title if one was input (before and after defined by themes).
-                if (! empty($title)) {
-                    echo wp_kses($before_title . $title . $after_title, AllowedTags::getAllowedTags());
+                if ( ! empty($title)) {
+                    echo wp_kses($before_title.$title.$after_title, AllowedTags::getAllowedTags());
                 }
                 echo wp_kses($this->widgetContent($post), AllowedTags::getAllowedTags());
                 // After widget (defined by themes).
@@ -347,7 +347,7 @@ 
      */
     public function make_the_title_a_link($title)
     {
-        return '<a href="' . EEH_Event_View::event_archive_url() . '">' . $title . '</a>';
+        return '<a href="'.EEH_Event_View::event_archive_url().'">'.$title.'</a>';
     }
 
 
@@ -428,7 +428,7 @@ 
             foreach ($sizes as $image_size) {
                 $image_size = trim($image_size);
                 // no big images plz
-                if (! in_array($image_size, ['large', 'post-thumbnail'])) {
+                if ( ! in_array($image_size, ['large', 'post-thumbnail'])) {
                     $image_sizes[] =
                         EE_Question_Option::new_instance(['QSO_value' => $image_size, 'QSO_desc' => $image_size]);
                 }
@@ -455,7 +455,7 @@ 
     private function parseWidgetSettings(array $instance)
     {
         $this->title = isset($instance['title']) && ! empty($instance['title']) ? $instance['title'] : '';
-        $this->events_category     = isset($instance['category_name']) && ! empty($instance['category_name'])
+        $this->events_category = isset($instance['category_name']) && ! empty($instance['category_name'])
             ? $instance['category_name']
             : false;
         $this->show_expired = isset($instance['show_expired'])
@@ -513,24 +513,24 @@ 
         }
         $list_items = '';
         foreach ($events as $event) {
-            if ($event instanceof EE_Event && (! is_single() || $post->ID != $event->ID())) {
+            if ($event instanceof EE_Event && ( ! is_single() || $post->ID != $event->ID())) {
                 $event_url = $this->eventUrl($event);
                 $list_items .= '
-                <li id="ee-upcoming-events-widget-li-' . absint($event->ID()) . '" 
+                <li id="ee-upcoming-events-widget-li-' . absint($event->ID()).'" 
                     class="ee-upcoming-events-widget-li"
                 >
                     <h5 class="ee-upcoming-events-widget-title-h5">
-                        <a class="ee-widget-event-name-a' . $this->linkClass($event) . '" href="' . $event_url . '">
-                            ' . esc_html($event->name()) . '
+                        <a class="ee-widget-event-name-a' . $this->linkClass($event).'" href="'.$event_url.'">
+                            ' . esc_html($event->name()).'
                         </a>
                     </h5>
-                    ' . $this->eventWidgetContent($event, $event_url) . '
+                    ' . $this->eventWidgetContent($event, $event_url).'
                 </li>';
             }
         }
         return '
             <ul class="ee-upcoming-events-widget-ul">
-                ' . $list_items . '
+                ' . $list_items.'
             </ul>';
     }
 
@@ -562,7 +562,7 @@ 
         return EEM_Event::instance()->get_all(
             [
                 $this->queryWhereParams(),
-                'limit'    => '0,' . $this->limit,
+                'limit'    => '0,'.$this->limit,
                 'order_by' => 'Datetime.DTT_EVT_start',
                 'order'    => $this->order,
                 'group_by' => 'EVT_ID',
@@ -650,8 +650,8 @@ 
         if (has_post_thumbnail($event->ID()) && $this->image_size != 'none') {
             $content .= '
                 <div class="ee-upcoming-events-widget-img-dv">
-                    <a class="ee-upcoming-events-widget-img" href="' . $event_url . '">
-                        ' . get_the_post_thumbnail($event->ID(), $this->image_size) . '
+                    <a class="ee-upcoming-events-widget-img" href="' . $event_url.'">
+                        ' . get_the_post_thumbnail($event->ID(), $this->image_size).'
                     </a>
                 </div>';
         }
@@ -662,8 +662,8 @@ 
 
         if ($this->show_desc) {
             $allowedtags = AllowedTags::getAllowedTags();
-            $desc    = $event->short_description(25);
-            $content .= $desc ? '<p style="margin-top: .5em">' . wp_kses($desc, $allowedtags) . '</p>' : '';
+            $desc = $event->short_description(25);
+            $content .= $desc ? '<p style="margin-top: .5em">'.wp_kses($desc, $allowedtags).'</p>' : '';
         }
 
         return $content;
@@ -679,11 +679,11 @@ 
      */
     private function eventDates(EE_Event $event)
     {
-        $date_format        = apply_filters(
+        $date_format = apply_filters(
             'FHEE__espresso_event_date_range__date_format',
             get_option('date_format')
         );
-        $time_format        = apply_filters(
+        $time_format = apply_filters(
             'FHEE__espresso_event_date_range__time_format',
             get_option('time_format')
         );

admin_pages/general_settings/templates/countries_settings.template.php

Indentation +18 added lines, -18 removed lines

@@ -14,9 +14,9 @@ 
 
     <h2 class="ee-admin-settings-hdr">
         <?php
-        echo esc_html__('Countries and States/Provinces', 'event_espresso');
-        echo EEH_Template::get_help_tab_link('country_select_info'); // already escaped
-        ?>
+		echo esc_html__('Countries and States/Provinces', 'event_espresso');
+		echo EEH_Template::get_help_tab_link('country_select_info'); // already escaped
+		?>
     </h2>
     <table class="form-table">
         <tbody>
@@ -26,27 +26,27 @@ 
     <br/>
     <p>
         <?php esc_html_e(
-            'The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.',
-            'event_espresso'
-        ); ?>
+			'The country that is selected above will populate the Country Details settings and the options for States/Provinces. This information will be used throughout Event Espresso including for registration purposes and how currency is displayed. If you make a change to the country on this page, it is important that you also update your Contact Information on the Your Organization tab.',
+			'event_espresso'
+		); ?>
     </p>
     <p id="country-currency-setting-disabled-pg" style="display: none;">
         <span class="reminder-spn">
             <?php printf(
-                esc_html__(
-                    'Currency setting inputs are currently only enabled for the country "%1$s" which is the selected country for the site. This can be changed in the "Contact Information" section under the "Your Organization" tab of the Event Espresso - General Settings.',
-                    'event_espresso'
-                ),
-                $CNT_name_for_site
-            ); ?>
+				esc_html__(
+					'Currency setting inputs are currently only enabled for the country "%1$s" which is the selected country for the site. This can be changed in the "Contact Information" section under the "Your Organization" tab of the Event Espresso - General Settings.',
+					'event_espresso'
+				),
+				$CNT_name_for_site
+			); ?>
         </span>
     </p>
     <div id="country-details-settings-dv">
         <h2 class="ee-admin-settings-hdr">
             <?php
-            echo esc_html__('Country Details', 'event_espresso');
-            echo EEH_Template::get_help_tab_link('country_details_info'); // already escaped
-            ?>
+			echo esc_html__('Country Details', 'event_espresso');
+			echo EEH_Template::get_help_tab_link('country_details_info'); // already escaped
+			?>
         </h2>
         <div id="country-details-dv"><?php echo wp_kses($country_details_settings, AllowedTags::getAllowedTags()); ?></div>
     </div>
@@ -54,9 +54,9 @@ 
     <div id="country-states-settings-dv">
         <h2 class="ee-admin-settings-hdr">
             <?php
-            echo esc_html__('States/Provinces', 'event_espresso');
-            echo EEH_Template::get_help_tab_link('country_states_info'); // already escaped
-            ?>
+			echo esc_html__('States/Provinces', 'event_espresso');
+			echo EEH_Template::get_help_tab_link('country_states_info'); // already escaped
+			?>
         </h2>
         <div id="country-states-dv"><?php echo wp_kses($country_states_settings, AllowedTags::getAllowedTags()); ?></div>
     </div>

admin_pages/general_settings/General_Settings_Admin_Page.core.php

Indentation +1397 added lines, -1397 removed lines

@@ -18,1412 +18,1412 @@
 class General_Settings_Admin_Page extends EE_Admin_Page
 {
 
-    /**
-     * _question_group
-     * holds the specific question group object for the question group details screen
-     *
-     * @var object
-     */
-    protected $_question_group;
-
-
-    /**
-     * Initialize basic properties.
-     */
-    protected function _init_page_props()
-    {
-        $this->page_slug        = GEN_SET_PG_SLUG;
-        $this->page_label       = GEN_SET_LABEL;
-        $this->_admin_base_url  = GEN_SET_ADMIN_URL;
-        $this->_admin_base_path = GEN_SET_ADMIN;
-    }
-
-
-    /**
-     * Set ajax hooks
-     */
-    protected function _ajax_hooks()
-    {
-        add_action('wp_ajax_espresso_display_country_settings', [$this, 'display_country_settings']);
-        add_action('wp_ajax_espresso_display_country_states', [$this, 'display_country_states']);
-        add_action('wp_ajax_espresso_delete_state', [$this, 'delete_state'], 10, 3);
-        add_action('wp_ajax_espresso_add_new_state', [$this, 'add_new_state']);
-    }
-
-
-    /**
-     * More page properties initialization.
-     */
-    protected function _define_page_props()
-    {
-        $this->_admin_page_title = GEN_SET_LABEL;
-        $this->_labels           = [
-            'publishbox' => esc_html__('Update Settings', 'event_espresso'),
-        ];
-    }
-
-
-    /**
-     * Set page routes property.
-     */
-    protected function _set_page_routes()
-    {
-        $this->_page_routes = [
-
-            'critical_pages'                => [
-                'func'       => '_espresso_page_settings',
-                'capability' => 'manage_options',
-            ],
-            'update_espresso_page_settings' => [
-                'func'       => '_update_espresso_page_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'default'                       => [
-                'func'       => '_your_organization_settings',
-                'capability' => 'manage_options',
-            ],
-
-            'update_your_organization_settings' => [
-                'func'       => '_update_your_organization_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'admin_option_settings' => [
-                'func'       => '_admin_option_settings',
-                'capability' => 'manage_options',
-            ],
-
-            'update_admin_option_settings' => [
-                'func'       => '_update_admin_option_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'country_settings' => [
-                'func'       => '_country_settings',
-                'capability' => 'manage_options',
-            ],
-
-            'update_country_settings' => [
-                'func'       => '_update_country_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'display_country_settings' => [
-                'func'       => 'display_country_settings',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'add_new_state' => [
-                'func'       => 'add_new_state',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-
-            'delete_state'            => [
-                'func'       => 'delete_state',
-                'capability' => 'manage_options',
-                'noheader'   => true,
-            ],
-            'privacy_settings'        => [
-                'func'       => 'privacySettings',
-                'capability' => 'manage_options',
-            ],
-            'update_privacy_settings' => [
-                'func'               => 'updatePrivacySettings',
-                'capability'         => 'manage_options',
-                'noheader'           => true,
-                'headers_sent_route' => 'privacy_settings',
-            ],
-        ];
-    }
-
-
-    /**
-     * Set page configuration property
-     */
-    protected function _set_page_config()
-    {
-        $this->_page_config = [
-            'critical_pages'        => [
-                'nav'           => [
-                    'label' => esc_html__('Critical Pages', 'event_espresso'),
-                    'order' => 50,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'help_tabs'     => [
-                    'general_settings_critical_pages_help_tab' => [
-                        'title'    => esc_html__('Critical Pages', 'event_espresso'),
-                        'filename' => 'general_settings_critical_pages',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'default'               => [
-                'nav'           => [
-                    'label' => esc_html__('Your Organization', 'event_espresso'),
-                    'order' => 20,
-                ],
-                'help_tabs'     => [
-                    'general_settings_your_organization_help_tab' => [
-                        'title'    => esc_html__('Your Organization', 'event_espresso'),
-                        'filename' => 'general_settings_your_organization',
-                    ],
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'require_nonce' => false,
-            ],
-            'admin_option_settings' => [
-                'nav'           => [
-                    'label' => esc_html__('Admin Options', 'event_espresso'),
-                    'order' => 60,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'help_tabs'     => [
-                    'general_settings_admin_options_help_tab' => [
-                        'title'    => esc_html__('Admin Options', 'event_espresso'),
-                        'filename' => 'general_settings_admin_options',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'country_settings'      => [
-                'nav'           => [
-                    'label' => esc_html__('Countries', 'event_espresso'),
-                    'order' => 70,
-                ],
-                'help_tabs'     => [
-                    'general_settings_countries_help_tab' => [
-                        'title'    => esc_html__('Countries', 'event_espresso'),
-                        'filename' => 'general_settings_countries',
-                    ],
-                ],
-                'require_nonce' => false,
-            ],
-            'privacy_settings'      => [
-                'nav'           => [
-                    'label' => esc_html__('Privacy', 'event_espresso'),
-                    'order' => 80,
-                ],
-                'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
-                'require_nonce' => false,
-            ],
-        ];
-    }
-
-
-    protected function _add_screen_options()
-    {
-    }
-
-
-    protected function _add_feature_pointers()
-    {
-    }
-
-
-    /**
-     * Enqueue global scripts and styles for all routes in the General Settings Admin Pages.
-     */
-    public function load_scripts_styles()
-    {
-        // styles
-        wp_enqueue_style('espresso-ui-theme');
-        // scripts
-        wp_enqueue_script('ee_admin_js');
-    }
-
-
-    /**
-     * Execute logic running on `admin_init`
-     */
-    public function admin_init()
-    {
-        EE_Registry::$i18n_js_strings['invalid_server_response'] = wp_strip_all_tags(__(
-            'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.',
-            'event_espresso'
-        ));
-        EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(__(
-            'An error occurred! Please refresh the page and try again.',
-            'event_espresso'
-        ));
-        EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(__(
-            'Are you sure you want to delete this State / Province?',
-            'event_espresso'
-        ));
-        $protocol                                                = is_ssl() ? 'https://' : 'http://';
-        EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
-            'admin-ajax.php?page=espresso_general_settings',
-            $protocol
-        );
-    }
-
-
-    public function admin_notices()
-    {
-    }
-
-
-    public function admin_footer_scripts()
-    {
-    }
-
-
-    /**
-     * Enqueue scripts and styles for the default route.
-     */
-    public function load_scripts_styles_default()
-    {
-        // styles
-        wp_enqueue_style('thickbox');
-        // scripts
-        wp_enqueue_script('media-upload');
-        wp_enqueue_script('thickbox');
-        wp_register_script(
-            'organization_settings',
-            GEN_SET_ASSETS_URL . 'your_organization_settings.js',
-            ['jquery', 'media-upload', 'thickbox'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
-        wp_enqueue_script('organization_settings');
-        wp_enqueue_style('organization-css');
-        $confirm_image_delete = [
-            'text' => wp_strip_all_tags(
-                __(
-                    'Do you really want to delete this image? Please remember to save your settings to complete the removal.',
-                    'event_espresso'
-                )
-            ),
-        ];
-        wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
-    }
-
-
-    /**
-     * Enqueue scripts and styles for the country settings route.
-     */
-    public function load_scripts_styles_country_settings()
-    {
-        // scripts
-        wp_register_script(
-            'gen_settings_countries',
-            GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
-            ['ee_admin_js'],
-            EVENT_ESPRESSO_VERSION,
-            true
-        );
-        wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
-        wp_enqueue_script('gen_settings_countries');
-        wp_enqueue_style('organization-css');
-    }
-
-
-    /*************        Espresso Pages        *************/
-    /**
-     * _espresso_page_settings
-     *
-     * @throws EE_Error
-     * @throws DomainException
-     * @throws DomainException
-     * @throws InvalidDataTypeException
-     * @throws InvalidArgumentException
-     */
-    protected function _espresso_page_settings()
-    {
-        // Check to make sure all of the main pages are set up properly,
-        // if not create the default pages and display an admin notice
-        EEH_Activation::verify_default_pages_exist();
-        $this->_transient_garbage_collection();
-        $this->_template_args['values']             = $this->_yes_no_values;
-        $this->_template_args['reg_page_id']        = isset(EE_Registry::instance()->CFG->core->reg_page_id)
-            ? EE_Registry::instance()->CFG->core->reg_page_id
-            : null;
-        $this->_template_args['reg_page_obj']       = isset(EE_Registry::instance()->CFG->core->reg_page_id)
-            ? get_post(EE_Registry::instance()->CFG->core->reg_page_id)
-            : false;
-        $this->_template_args['txn_page_id']        = isset(EE_Registry::instance()->CFG->core->txn_page_id)
-            ? EE_Registry::instance()->CFG->core->txn_page_id
-            : null;
-        $this->_template_args['txn_page_obj']       = isset(EE_Registry::instance()->CFG->core->txn_page_id)
-            ? get_post(EE_Registry::instance()->CFG->core->txn_page_id)
-            : false;
-        $this->_template_args['thank_you_page_id']  = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
-            ? EE_Registry::instance()->CFG->core->thank_you_page_id
-            : null;
-        $this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
-            ? get_post(EE_Registry::instance()->CFG->core->thank_you_page_id)
-            : false;
-        $this->_template_args['cancel_page_id']     = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
-            ? EE_Registry::instance()->CFG->core->cancel_page_id
-            : null;
-        $this->_template_args['cancel_page_obj']    = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
-            ? get_post(EE_Registry::instance()->CFG->core->cancel_page_id)
-            : false;
-        $this->_set_add_edit_form_tags('update_espresso_page_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * Handler for updating espresso page settings.
-     *
-     * @throws EE_Error
-     */
-    protected function _update_espresso_page_settings()
-    {
-        // capture incoming request data && set page IDs
-        EE_Registry::instance()->CFG->core->reg_page_id       = isset($this->_req_data['reg_page_id'])
-            ? absint($this->_req_data['reg_page_id'])
-            : EE_Registry::instance()->CFG->core->reg_page_id;
-        EE_Registry::instance()->CFG->core->txn_page_id       = isset($this->_req_data['txn_page_id'])
-            ? absint($this->_req_data['txn_page_id'])
-            : EE_Registry::instance()->CFG->core->txn_page_id;
-        EE_Registry::instance()->CFG->core->thank_you_page_id = isset($this->_req_data['thank_you_page_id'])
-            ? absint($this->_req_data['thank_you_page_id'])
-            : EE_Registry::instance()->CFG->core->thank_you_page_id;
-        EE_Registry::instance()->CFG->core->cancel_page_id    = isset($this->_req_data['cancel_page_id'])
-            ? absint($this->_req_data['cancel_page_id'])
-            : EE_Registry::instance()->CFG->core->cancel_page_id;
-
-        EE_Registry::instance()->CFG->core = apply_filters(
-            'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core',
-            EE_Registry::instance()->CFG->core,
-            $this->_req_data
-        );
-        $what                              = esc_html__('Critical Pages & Shortcodes', 'event_espresso');
-        $this->_redirect_after_action(
-            $this->_update_espresso_configuration(
-                $what,
-                EE_Registry::instance()->CFG->core,
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            ),
-            $what,
-            '',
-            [
-                'action' => 'critical_pages',
-            ],
-            true
-        );
-    }
-
-
-    /*************        Your Organization        *************/
-
-
-    /**
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _your_organization_settings()
-    {
-        $this->_template_args['admin_page_content'] = '';
-        try {
-            /** @var EventEspresso\admin_pages\general_settings\OrganizationSettings $organization_settings_form */
-            $organization_settings_form                 = $this->loader->getShared(
-                'EventEspresso\admin_pages\general_settings\OrganizationSettings'
-            );
-            $this->_template_args['admin_page_content'] = $organization_settings_form->display();
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_set_add_edit_form_tags('update_your_organization_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * Handler for updating organization settings.
-     *
-     * @throws EE_Error
-     */
-    protected function _update_your_organization_settings()
-    {
-        try {
-            /** @var EventEspresso\admin_pages\general_settings\OrganizationSettings $organization_settings_form */
-            $organization_settings_form  = $this->loader->getShared(
-                'EventEspresso\admin_pages\general_settings\OrganizationSettings'
-            );
-            $success                     = $organization_settings_form->process($this->_req_data);
-            EE_Registry::instance()->CFG = apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG',
-                EE_Registry::instance()->CFG
-            );
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-            $success = false;
-        }
-
-        if ($success) {
-            $success = $this->_update_espresso_configuration(
-                esc_html__('Your Organization Settings', 'event_espresso'),
-                EE_Registry::instance()->CFG,
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-        }
-
-        $this->_redirect_after_action($success, '', '', ['action' => 'default'], true);
-    }
-
-
-
-    /*************        Admin Options        *************/
-
-
-    /**
-     * _admin_option_settings
-     *
-     * @throws EE_Error
-     * @throws LogicException
-     */
-    protected function _admin_option_settings()
-    {
-        $this->_template_args['admin_page_content'] = '';
-        try {
-            $admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
-            // still need this for the old school form in Extend_General_Settings_Admin_Page
-            $this->_template_args['values'] = $this->_yes_no_values;
-            // also need to account for the do_action that was in the old template
-            $admin_options_settings_form->setTemplateArgs($this->_template_args);
-            $this->_template_args['admin_page_content'] = $admin_options_settings_form->display();
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_set_add_edit_form_tags('update_admin_option_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * _update_admin_option_settings
-     *
-     * @throws EE_Error
-     * @throws InvalidDataTypeException
-     * @throws InvalidFormSubmissionException
-     * @throws InvalidArgumentException
-     * @throws LogicException
-     */
-    protected function _update_admin_option_settings()
-    {
-        try {
-            $admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
-            $admin_options_settings_form->process($this->_req_data[ $admin_options_settings_form->slug() ]);
-            EE_Registry::instance()->CFG->admin = apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
-                EE_Registry::instance()->CFG->admin
-            );
-        } catch (Exception $e) {
-            EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
-        }
-        $this->_redirect_after_action(
-            apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success',
-                $this->_update_espresso_configuration(
-                    'Admin Options',
-                    EE_Registry::instance()->CFG->admin,
-                    __FILE__,
-                    __FUNCTION__,
-                    __LINE__
-                )
-            ),
-            'Admin Options',
-            'updated',
-            ['action' => 'admin_option_settings']
-        );
-    }
-
-
-    /*************        Countries        *************/
-
-
-    /**
-     * @return string
-     */
-    protected function getCountryIsoForSite()
-    {
-        return ! empty(EE_Registry::instance()->CFG->organization->CNT_ISO)
-            ? EE_Registry::instance()->CFG->organization->CNT_ISO
-            : 'US';
-    }
-
-
-    /**
-     * @param string          $CNT_ISO
-     * @param EE_Country|null $country
-     * @return EE_Base_Class|EE_Country
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function verifyOrGetCountryFromIso($CNT_ISO, EE_Country $country = null)
-    {
-        /** @var EE_Country $country */
-        return $country instanceof EE_Country && $country->ID() === $CNT_ISO
-            ? $country
-            : EEM_Country::instance()->get_one_by_ID($CNT_ISO);
-    }
-
-
-    /**
-     * Output Country Settings view.
-     *
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    protected function _country_settings()
-    {
-        $CNT_ISO_for_site = $this->getCountryIsoForSite();
-        $CNT_ISO          = isset($this->_req_data['country'])
-            ? strtoupper(sanitize_text_field($this->_req_data['country']))
-            : $CNT_ISO_for_site;
-
-        // load field generator helper
-
-        $this->_template_args['values'] = $this->_yes_no_values;
-
-        $this->_template_args['countries'] = new EE_Question_Form_Input(
-            EE_Question::new_instance(
-                [
-                    'QST_ID'           => 0,
-                    'QST_display_text' => esc_html__('Select Country', 'event_espresso'),
-                    'QST_system'       => 'admin-country',
-                ]
-            ),
-            EE_Answer::new_instance(
-                [
-                    'ANS_ID'    => 0,
-                    'ANS_value' => $CNT_ISO,
-                ]
-            ),
-            [
-                'input_id'       => 'country',
-                'input_name'     => 'country',
-                'input_prefix'   => '',
-                'append_qstn_id' => false,
-            ]
-        );
-        $country                           = $this->verifyOrGetCountryFromIso($CNT_ISO_for_site);
-        add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10, 2);
-        $this->_template_args['country_details_settings'] = $this->display_country_settings(
-            $country->ID(),
-            $country
-        );
-        $this->_template_args['country_states_settings']  = $this->display_country_states(
-            $country->ID(),
-            $country
-        );
-        $this->_template_args['CNT_name_for_site']        = $country->name();
-
-        $this->_set_add_edit_form_tags('update_country_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $this->_template_args['admin_page_content'] = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
-            $this->_template_args,
-            true
-        );
-        $this->display_admin_page_with_no_sidebar();
-    }
-
-
-    /**
-     * @param string          $CNT_ISO
-     * @param EE_Country|null $country
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function display_country_settings($CNT_ISO = '', EE_Country $country = null)
-    {
-        $CNT_ISO_for_site = $this->getCountryIsoForSite();
-
-        $CNT_ISO = isset($this->_req_data['country'])
-            ? strtoupper(sanitize_text_field($this->_req_data['country']))
-            : $CNT_ISO;
-        if (! $CNT_ISO) {
-            return '';
-        }
-
-        // for ajax
-        remove_all_filters('FHEE__EEH_Form_Fields__label_html');
-        remove_all_filters('FHEE__EEH_Form_Fields__input_html');
-        add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10, 2);
-        $country                                  = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
-        $CNT_cur_disabled                         = $CNT_ISO !== $CNT_ISO_for_site;
-        $this->_template_args['CNT_cur_disabled'] = $CNT_cur_disabled;
-
-        $country_input_types            = [
-            'CNT_active'      => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true,
-            ],
-            'CNT_ISO'         => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-            ],
-            'CNT_ISO3'        => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-            ],
-            'RGN_ID'          => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-            ],
-            'CNT_name'        => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'regular-text',
-            ],
-            'CNT_cur_code'    => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_single'  => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'medium-text',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_plural'  => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'medium-text',
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_sign'    => [
-                'type'         => 'TEXT',
-                'input_name'   => 'cntry[' . $CNT_ISO . ']',
-                'class'        => 'small-text',
-                'htmlentities' => false,
-                'disabled'     => $CNT_cur_disabled,
-            ],
-            'CNT_cur_sign_b4' => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true,
-                'disabled'         => $CNT_cur_disabled,
-            ],
-            'CNT_cur_dec_plc' => [
-                'type'       => 'RADIO_BTN',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => '',
-                'options'    => [
-                    ['id' => 0, 'text' => ''],
-                    ['id' => 1, 'text' => ''],
-                    ['id' => 2, 'text' => ''],
-                    ['id' => 3, 'text' => ''],
-                ],
-                'disabled'   => $CNT_cur_disabled,
-            ],
-            'CNT_cur_dec_mrk' => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => [
-                    [
-                        'id'   => ',',
-                        'text' => esc_html__(', (comma)', 'event_espresso'),
-                    ],
-                    ['id' => '.', 'text' => esc_html__('. (decimal)', 'event_espresso')],
-                ],
-                'use_desc_4_label' => true,
-                'disabled'         => $CNT_cur_disabled,
-            ],
-            'CNT_cur_thsnds'  => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => [
-                    [
-                        'id'   => ',',
-                        'text' => esc_html__(', (comma)', 'event_espresso'),
-                    ],
-                    [
-                        'id'   => '.',
-                        'text' => esc_html__('. (decimal)', 'event_espresso'),
-                    ],
-                    [
-                        'id'   => ' ',
-                        'text' => esc_html__('(space)', 'event_espresso'),
-                    ],
-                ],
-                'use_desc_4_label' => true,
-                'disabled'         => $CNT_cur_disabled,
-            ],
-            'CNT_tel_code'    => [
-                'type'       => 'TEXT',
-                'input_name' => 'cntry[' . $CNT_ISO . ']',
-                'class'      => 'small-text',
-            ],
-            'CNT_is_EU'       => [
-                'type'             => 'RADIO_BTN',
-                'input_name'       => 'cntry[' . $CNT_ISO . ']',
-                'class'            => '',
-                'options'          => $this->_yes_no_values,
-                'use_desc_4_label' => true,
-            ],
-        ];
-        $this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object(
-            $country,
-            $country_input_types
-        );
-        $country_details_settings       = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
-            $this->_template_args,
-            true
-        );
-
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(
-                [
-                    'return_data' => $country_details_settings,
-                    'success'     => $notices['success'],
-                    'errors'      => $notices['errors'],
-                ]
-            );
-            die();
-        } else {
-            return $country_details_settings;
-        }
-    }
-
-
-    /**
-     * @param string          $CNT_ISO
-     * @param EE_Country|null $country
-     * @return string
-     * @throws DomainException
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     * @throws ReflectionException
-     */
-    public function display_country_states($CNT_ISO = '', EE_Country $country = null)
-    {
-
-        $CNT_ISO = isset($this->_req_data['country'])
-            ? sanitize_text_field($this->_req_data['country'])
-            : $CNT_ISO;
-        if (! $CNT_ISO) {
-            return '';
-        }
-        // for ajax
-        remove_all_filters('FHEE__EEH_Form_Fields__label_html');
-        remove_all_filters('FHEE__EEH_Form_Fields__input_html');
-        add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'state_form_field_label_wrap'], 10, 2);
-        add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'state_form_field_input__wrap'], 10, 2);
-        $states = EEM_State::instance()->get_all_states_for_these_countries([$CNT_ISO => $CNT_ISO]);
-        if (empty($states)) {
-            /** @var EventEspresso\core\services\address\CountrySubRegionDao $countrySubRegionDao */
-            $countrySubRegionDao = $this->loader->getShared(
-                'EventEspresso\core\services\address\CountrySubRegionDao'
-            );
-            if ($countrySubRegionDao instanceof EventEspresso\core\services\address\CountrySubRegionDao) {
-                $country = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
-                if ($countrySubRegionDao->saveCountrySubRegions($country)) {
-                    $states = EEM_State::instance()->get_all_states_for_these_countries(
-                        [$CNT_ISO => $CNT_ISO]
-                    );
-                }
-            }
-        }
-        if (is_array($states)) {
-            foreach ($states as $STA_ID => $state) {
-                if ($state instanceof EE_State) {
-                    // STA_abbrev    STA_name    STA_active
-                    $state_input_types                                             = [
-                        'STA_abbrev' => [
-                            'type'       => 'TEXT',
-                            'input_name' => 'states[' . $STA_ID . ']',
-                            'class'      => 'small-text',
-                        ],
-                        'STA_name'   => [
-                            'type'       => 'TEXT',
-                            'input_name' => 'states[' . $STA_ID . ']',
-                            'class'      => 'regular-text',
-                        ],
-                        'STA_active' => [
-                            'type'             => 'RADIO_BTN',
-                            'input_name'       => 'states[' . $STA_ID . ']',
-                            'options'          => $this->_yes_no_values,
-                            'use_desc_4_label' => true,
-                        ],
-                    ];
-                    $this->_template_args['states'][ $STA_ID ]['inputs']           =
-                        EE_Question_Form_Input::generate_question_form_inputs_for_object(
-                            $state,
-                            $state_input_types
-                        );
-                    $query_args                                                    = [
-                        'action'     => 'delete_state',
-                        'STA_ID'     => $STA_ID,
-                        'CNT_ISO'    => $CNT_ISO,
-                        'STA_abbrev' => $state->abbrev(),
-                    ];
-                    $this->_template_args['states'][ $STA_ID ]['delete_state_url'] =
-                        EE_Admin_Page::add_query_args_and_nonce(
-                            $query_args,
-                            GEN_SET_ADMIN_URL
-                        );
-                }
-            }
-        } else {
-            $this->_template_args['states'] = false;
-        }
-
-        $this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(
-            ['action' => 'add_new_state'],
-            GEN_SET_ADMIN_URL
-        );
-
-        $state_details_settings = EEH_Template::display_template(
-            GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
-            $this->_template_args,
-            true
-        );
-
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(
-                [
-                    'return_data' => $state_details_settings,
-                    'success'     => $notices['success'],
-                    'errors'      => $notices['errors'],
-                ]
-            );
-            die();
-        } else {
-            return $state_details_settings;
-        }
-    }
-
-
-    /**
-     *        add_new_state
-     *
-     * @access    public
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function add_new_state()
-    {
-
-        $success = true;
-
-        $CNT_ISO = isset($this->_req_data['CNT_ISO'])
-            ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO']))
-            : false;
-        if (! $CNT_ISO) {
-            EE_Error::add_error(
-                esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $success = false;
-        }
-        $STA_abbrev = isset($this->_req_data['STA_abbrev'])
-            ? sanitize_text_field($this->_req_data['STA_abbrev'])
-            : false;
-        if (! $STA_abbrev) {
-            EE_Error::add_error(
-                esc_html__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $success = false;
-        }
-        $STA_name = isset($this->_req_data['STA_name'])
-            ? sanitize_text_field($this->_req_data['STA_name'])
-            : false;
-        if (! $STA_name) {
-            EE_Error::add_error(
-                esc_html__('No State name or an invalid State name was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            $success = false;
-        }
-
-        if ($success) {
-            $cols_n_values = [
-                'CNT_ISO'    => $CNT_ISO,
-                'STA_abbrev' => $STA_abbrev,
-                'STA_name'   => $STA_name,
-                'STA_active' => true,
-            ];
-            $success       = EEM_State::instance()->insert($cols_n_values);
-            EE_Error::add_success(esc_html__('The State was added successfully.', 'event_espresso'));
-        }
-
-        if (defined('DOING_AJAX')) {
-            $notices = EE_Error::get_notices(false, false, false);
-            echo wp_json_encode(array_merge($notices, ['return_data' => $CNT_ISO]));
-            die();
-        } else {
-            $this->_redirect_after_action($success, 'State', 'added', ['action' => 'country_settings']);
-        }
-    }
-
-
-    /**
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    public function delete_state()
-    {
-        $CNT_ISO    = isset($this->_req_data['CNT_ISO'])
-            ? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO']))
-            : false;
-        $STA_ID     = isset($this->_req_data['STA_ID'])
-            ? sanitize_text_field($this->_req_data['STA_ID'])
-            : false;
-        $STA_abbrev = isset($this->_req_data['STA_abbrev'])
-            ? sanitize_text_field($this->_req_data['STA_abbrev'])
-            : false;
-        if (! $STA_ID) {
-            EE_Error::add_error(
-                esc_html__('No State ID or an invalid State ID was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-            return;
-        }
-
-        $success = EEM_State::instance()->delete_by_ID($STA_ID);
-        if ($success !== false) {
-            do_action(
-                'AHEE__General_Settings_Admin_Page__delete_state__state_deleted',
-                $CNT_ISO,
-                $STA_ID,
-                ['STA_abbrev' => $STA_abbrev]
-            );
-            EE_Error::add_success(esc_html__('The State was deleted successfully.', 'event_espresso'));
-        }
-        if (defined('DOING_AJAX')) {
-            $notices                = EE_Error::get_notices(false);
-            $notices['return_data'] = true;
-            echo wp_json_encode($notices);
-            die();
-        } else {
-            $this->_redirect_after_action(
-                $success,
-                'State',
-                'deleted',
-                ['action' => 'country_settings']
-            );
-        }
-    }
-
-
-    /**
-     *        _update_country_settings
-     *
-     * @return void
-     * @throws EE_Error
-     * @throws InvalidArgumentException
-     * @throws InvalidDataTypeException
-     * @throws InvalidInterfaceException
-     */
-    protected function _update_country_settings()
-    {
-        // grab the country ISO code
-        $CNT_ISO = isset($this->_req_data['country'])
-            ? strtoupper(sanitize_text_field($this->_req_data['country']))
-            : false;
-        if (! $CNT_ISO) {
-            EE_Error::add_error(
-                esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
-                __FILE__,
-                __FUNCTION__,
-                __LINE__
-            );
-
-            return;
-        }
-        $cols_n_values             = [];
-        $cols_n_values['CNT_ISO3'] = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_ISO3'])
-            ? strtoupper(sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_ISO3']))
-            : false;
-        $cols_n_values['RGN_ID']   = isset($this->_req_data['cntry'][ $CNT_ISO ]['RGN_ID'])
-            ? absint($this->_req_data['cntry'][ $CNT_ISO ]['RGN_ID'])
-            : null;
-        $cols_n_values['CNT_name'] = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_name'])
-            ? sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_name'])
-            : null;
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_code'])) {
-            $cols_n_values['CNT_cur_code'] = strtoupper(
-                sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_code'])
-            );
-        }
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_single'])) {
-            $cols_n_values['CNT_cur_single'] = sanitize_text_field(
-                $this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_single']
-            );
-        }
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_plural'])) {
-            $cols_n_values['CNT_cur_plural'] = sanitize_text_field(
-                $this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_plural']
-            );
-        }
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign'])) {
-            $cols_n_values['CNT_cur_sign'] = sanitize_text_field(
-                $this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign']
-            );
-        }
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign_b4'])) {
-            $cols_n_values['CNT_cur_sign_b4'] = absint(
-                $this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign_b4']
-            );
-        }
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_plc'])) {
-            $cols_n_values['CNT_cur_dec_plc'] = absint(
-                $this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_plc']
-            );
-        }
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_mrk'])) {
-            $cols_n_values['CNT_cur_dec_mrk'] = sanitize_text_field(
-                $this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_mrk']
-            );
-        }
-        if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_thsnds'])) {
-            $cols_n_values['CNT_cur_thsnds'] = sanitize_text_field(
-                $this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_thsnds']
-            );
-        }
-        $cols_n_values['CNT_tel_code'] = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_tel_code'])
-            ? sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_tel_code'])
-            : null;
-        $cols_n_values['CNT_is_EU']    = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_is_EU'])
-            ? absint($this->_req_data['cntry'][ $CNT_ISO ]['CNT_is_EU'])
-            : false;
-        $cols_n_values['CNT_active']   = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_active'])
-            ? absint($this->_req_data['cntry'][ $CNT_ISO ]['CNT_active'])
-            : false;
-        // allow filtering of country data
-        $cols_n_values = apply_filters(
-            'FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values',
-            $cols_n_values
-        );
-
-        // where values
-        $where_cols_n_values = [['CNT_ISO' => $CNT_ISO]];
-        // run the update
-        $success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
-
-        if (isset($this->_req_data['states']) && is_array($this->_req_data['states']) && $success !== false) {
-            // allow filtering of states data
-            $states = apply_filters(
-                'FHEE__General_Settings_Admin_Page___update_country_settings__states',
-                $this->_req_data['states']
-            );
-
-            // loop thru state data ( looks like : states[75][STA_name] )
-            foreach ($states as $STA_ID => $state) {
-                $cols_n_values = [
-                    'CNT_ISO'    => $CNT_ISO,
-                    'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
-                    'STA_name'   => sanitize_text_field($state['STA_name']),
-                    'STA_active' => (bool) absint($state['STA_active']),
-                ];
-                // where values
-                $where_cols_n_values = [['STA_ID' => $STA_ID]];
-                // run the update
-                $success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
-                if ($success !== false) {
-                    do_action(
-                        'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved',
-                        $CNT_ISO,
-                        $STA_ID,
-                        $cols_n_values
-                    );
-                }
-            }
-        }
-        // check if country being edited matches org option country, and if so, then  update EE_Config with new settings
-        if (
-            isset(EE_Registry::instance()->CFG->organization->CNT_ISO)
-            && $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO
-        ) {
-            EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
-            EE_Registry::instance()->CFG->update_espresso_config();
-        }
-
-        if ($success !== false) {
-            EE_Error::add_success(
-                esc_html__('Country Settings updated successfully.', 'event_espresso')
-            );
-        }
-        $this->_redirect_after_action(
-            $success,
-            '',
-            '',
-            ['action' => 'country_settings', 'country' => $CNT_ISO],
-            true
-        );
-    }
-
-
-    /**
-     *        form_form_field_label_wrap
-     *
-     * @param string $label
-     * @return        string
-     */
-    public function country_form_field_label_wrap($label, $required_text)
-    {
-        return '
+	/**
+	 * _question_group
+	 * holds the specific question group object for the question group details screen
+	 *
+	 * @var object
+	 */
+	protected $_question_group;
+
+
+	/**
+	 * Initialize basic properties.
+	 */
+	protected function _init_page_props()
+	{
+		$this->page_slug        = GEN_SET_PG_SLUG;
+		$this->page_label       = GEN_SET_LABEL;
+		$this->_admin_base_url  = GEN_SET_ADMIN_URL;
+		$this->_admin_base_path = GEN_SET_ADMIN;
+	}
+
+
+	/**
+	 * Set ajax hooks
+	 */
+	protected function _ajax_hooks()
+	{
+		add_action('wp_ajax_espresso_display_country_settings', [$this, 'display_country_settings']);
+		add_action('wp_ajax_espresso_display_country_states', [$this, 'display_country_states']);
+		add_action('wp_ajax_espresso_delete_state', [$this, 'delete_state'], 10, 3);
+		add_action('wp_ajax_espresso_add_new_state', [$this, 'add_new_state']);
+	}
+
+
+	/**
+	 * More page properties initialization.
+	 */
+	protected function _define_page_props()
+	{
+		$this->_admin_page_title = GEN_SET_LABEL;
+		$this->_labels           = [
+			'publishbox' => esc_html__('Update Settings', 'event_espresso'),
+		];
+	}
+
+
+	/**
+	 * Set page routes property.
+	 */
+	protected function _set_page_routes()
+	{
+		$this->_page_routes = [
+
+			'critical_pages'                => [
+				'func'       => '_espresso_page_settings',
+				'capability' => 'manage_options',
+			],
+			'update_espresso_page_settings' => [
+				'func'       => '_update_espresso_page_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'default'                       => [
+				'func'       => '_your_organization_settings',
+				'capability' => 'manage_options',
+			],
+
+			'update_your_organization_settings' => [
+				'func'       => '_update_your_organization_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'admin_option_settings' => [
+				'func'       => '_admin_option_settings',
+				'capability' => 'manage_options',
+			],
+
+			'update_admin_option_settings' => [
+				'func'       => '_update_admin_option_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'country_settings' => [
+				'func'       => '_country_settings',
+				'capability' => 'manage_options',
+			],
+
+			'update_country_settings' => [
+				'func'       => '_update_country_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'display_country_settings' => [
+				'func'       => 'display_country_settings',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'add_new_state' => [
+				'func'       => 'add_new_state',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+
+			'delete_state'            => [
+				'func'       => 'delete_state',
+				'capability' => 'manage_options',
+				'noheader'   => true,
+			],
+			'privacy_settings'        => [
+				'func'       => 'privacySettings',
+				'capability' => 'manage_options',
+			],
+			'update_privacy_settings' => [
+				'func'               => 'updatePrivacySettings',
+				'capability'         => 'manage_options',
+				'noheader'           => true,
+				'headers_sent_route' => 'privacy_settings',
+			],
+		];
+	}
+
+
+	/**
+	 * Set page configuration property
+	 */
+	protected function _set_page_config()
+	{
+		$this->_page_config = [
+			'critical_pages'        => [
+				'nav'           => [
+					'label' => esc_html__('Critical Pages', 'event_espresso'),
+					'order' => 50,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'help_tabs'     => [
+					'general_settings_critical_pages_help_tab' => [
+						'title'    => esc_html__('Critical Pages', 'event_espresso'),
+						'filename' => 'general_settings_critical_pages',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'default'               => [
+				'nav'           => [
+					'label' => esc_html__('Your Organization', 'event_espresso'),
+					'order' => 20,
+				],
+				'help_tabs'     => [
+					'general_settings_your_organization_help_tab' => [
+						'title'    => esc_html__('Your Organization', 'event_espresso'),
+						'filename' => 'general_settings_your_organization',
+					],
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'require_nonce' => false,
+			],
+			'admin_option_settings' => [
+				'nav'           => [
+					'label' => esc_html__('Admin Options', 'event_espresso'),
+					'order' => 60,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'help_tabs'     => [
+					'general_settings_admin_options_help_tab' => [
+						'title'    => esc_html__('Admin Options', 'event_espresso'),
+						'filename' => 'general_settings_admin_options',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'country_settings'      => [
+				'nav'           => [
+					'label' => esc_html__('Countries', 'event_espresso'),
+					'order' => 70,
+				],
+				'help_tabs'     => [
+					'general_settings_countries_help_tab' => [
+						'title'    => esc_html__('Countries', 'event_espresso'),
+						'filename' => 'general_settings_countries',
+					],
+				],
+				'require_nonce' => false,
+			],
+			'privacy_settings'      => [
+				'nav'           => [
+					'label' => esc_html__('Privacy', 'event_espresso'),
+					'order' => 80,
+				],
+				'metaboxes'     => array_merge($this->_default_espresso_metaboxes, ['_publish_post_box']),
+				'require_nonce' => false,
+			],
+		];
+	}
+
+
+	protected function _add_screen_options()
+	{
+	}
+
+
+	protected function _add_feature_pointers()
+	{
+	}
+
+
+	/**
+	 * Enqueue global scripts and styles for all routes in the General Settings Admin Pages.
+	 */
+	public function load_scripts_styles()
+	{
+		// styles
+		wp_enqueue_style('espresso-ui-theme');
+		// scripts
+		wp_enqueue_script('ee_admin_js');
+	}
+
+
+	/**
+	 * Execute logic running on `admin_init`
+	 */
+	public function admin_init()
+	{
+		EE_Registry::$i18n_js_strings['invalid_server_response'] = wp_strip_all_tags(__(
+			'An error occurred! Your request may have been processed, but a valid response from the server was not received. Please refresh the page and try again.',
+			'event_espresso'
+		));
+		EE_Registry::$i18n_js_strings['error_occurred']          = wp_strip_all_tags(__(
+			'An error occurred! Please refresh the page and try again.',
+			'event_espresso'
+		));
+		EE_Registry::$i18n_js_strings['confirm_delete_state']    = wp_strip_all_tags(__(
+			'Are you sure you want to delete this State / Province?',
+			'event_espresso'
+		));
+		$protocol                                                = is_ssl() ? 'https://' : 'http://';
+		EE_Registry::$i18n_js_strings['ajax_url']                = admin_url(
+			'admin-ajax.php?page=espresso_general_settings',
+			$protocol
+		);
+	}
+
+
+	public function admin_notices()
+	{
+	}
+
+
+	public function admin_footer_scripts()
+	{
+	}
+
+
+	/**
+	 * Enqueue scripts and styles for the default route.
+	 */
+	public function load_scripts_styles_default()
+	{
+		// styles
+		wp_enqueue_style('thickbox');
+		// scripts
+		wp_enqueue_script('media-upload');
+		wp_enqueue_script('thickbox');
+		wp_register_script(
+			'organization_settings',
+			GEN_SET_ASSETS_URL . 'your_organization_settings.js',
+			['jquery', 'media-upload', 'thickbox'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('organization_settings');
+		wp_enqueue_style('organization-css');
+		$confirm_image_delete = [
+			'text' => wp_strip_all_tags(
+				__(
+					'Do you really want to delete this image? Please remember to save your settings to complete the removal.',
+					'event_espresso'
+				)
+			),
+		];
+		wp_localize_script('organization_settings', 'confirm_image_delete', $confirm_image_delete);
+	}
+
+
+	/**
+	 * Enqueue scripts and styles for the country settings route.
+	 */
+	public function load_scripts_styles_country_settings()
+	{
+		// scripts
+		wp_register_script(
+			'gen_settings_countries',
+			GEN_SET_ASSETS_URL . 'gen_settings_countries.js',
+			['ee_admin_js'],
+			EVENT_ESPRESSO_VERSION,
+			true
+		);
+		wp_register_style('organization-css', GEN_SET_ASSETS_URL . 'organization.css', [], EVENT_ESPRESSO_VERSION);
+		wp_enqueue_script('gen_settings_countries');
+		wp_enqueue_style('organization-css');
+	}
+
+
+	/*************        Espresso Pages        *************/
+	/**
+	 * _espresso_page_settings
+	 *
+	 * @throws EE_Error
+	 * @throws DomainException
+	 * @throws DomainException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidArgumentException
+	 */
+	protected function _espresso_page_settings()
+	{
+		// Check to make sure all of the main pages are set up properly,
+		// if not create the default pages and display an admin notice
+		EEH_Activation::verify_default_pages_exist();
+		$this->_transient_garbage_collection();
+		$this->_template_args['values']             = $this->_yes_no_values;
+		$this->_template_args['reg_page_id']        = isset(EE_Registry::instance()->CFG->core->reg_page_id)
+			? EE_Registry::instance()->CFG->core->reg_page_id
+			: null;
+		$this->_template_args['reg_page_obj']       = isset(EE_Registry::instance()->CFG->core->reg_page_id)
+			? get_post(EE_Registry::instance()->CFG->core->reg_page_id)
+			: false;
+		$this->_template_args['txn_page_id']        = isset(EE_Registry::instance()->CFG->core->txn_page_id)
+			? EE_Registry::instance()->CFG->core->txn_page_id
+			: null;
+		$this->_template_args['txn_page_obj']       = isset(EE_Registry::instance()->CFG->core->txn_page_id)
+			? get_post(EE_Registry::instance()->CFG->core->txn_page_id)
+			: false;
+		$this->_template_args['thank_you_page_id']  = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
+			? EE_Registry::instance()->CFG->core->thank_you_page_id
+			: null;
+		$this->_template_args['thank_you_page_obj'] = isset(EE_Registry::instance()->CFG->core->thank_you_page_id)
+			? get_post(EE_Registry::instance()->CFG->core->thank_you_page_id)
+			: false;
+		$this->_template_args['cancel_page_id']     = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
+			? EE_Registry::instance()->CFG->core->cancel_page_id
+			: null;
+		$this->_template_args['cancel_page_obj']    = isset(EE_Registry::instance()->CFG->core->cancel_page_id)
+			? get_post(EE_Registry::instance()->CFG->core->cancel_page_id)
+			: false;
+		$this->_set_add_edit_form_tags('update_espresso_page_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'espresso_page_settings.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Handler for updating espresso page settings.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _update_espresso_page_settings()
+	{
+		// capture incoming request data && set page IDs
+		EE_Registry::instance()->CFG->core->reg_page_id       = isset($this->_req_data['reg_page_id'])
+			? absint($this->_req_data['reg_page_id'])
+			: EE_Registry::instance()->CFG->core->reg_page_id;
+		EE_Registry::instance()->CFG->core->txn_page_id       = isset($this->_req_data['txn_page_id'])
+			? absint($this->_req_data['txn_page_id'])
+			: EE_Registry::instance()->CFG->core->txn_page_id;
+		EE_Registry::instance()->CFG->core->thank_you_page_id = isset($this->_req_data['thank_you_page_id'])
+			? absint($this->_req_data['thank_you_page_id'])
+			: EE_Registry::instance()->CFG->core->thank_you_page_id;
+		EE_Registry::instance()->CFG->core->cancel_page_id    = isset($this->_req_data['cancel_page_id'])
+			? absint($this->_req_data['cancel_page_id'])
+			: EE_Registry::instance()->CFG->core->cancel_page_id;
+
+		EE_Registry::instance()->CFG->core = apply_filters(
+			'FHEE__General_Settings_Admin_Page___update_espresso_page_settings__CFG_core',
+			EE_Registry::instance()->CFG->core,
+			$this->_req_data
+		);
+		$what                              = esc_html__('Critical Pages & Shortcodes', 'event_espresso');
+		$this->_redirect_after_action(
+			$this->_update_espresso_configuration(
+				$what,
+				EE_Registry::instance()->CFG->core,
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			),
+			$what,
+			'',
+			[
+				'action' => 'critical_pages',
+			],
+			true
+		);
+	}
+
+
+	/*************        Your Organization        *************/
+
+
+	/**
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _your_organization_settings()
+	{
+		$this->_template_args['admin_page_content'] = '';
+		try {
+			/** @var EventEspresso\admin_pages\general_settings\OrganizationSettings $organization_settings_form */
+			$organization_settings_form                 = $this->loader->getShared(
+				'EventEspresso\admin_pages\general_settings\OrganizationSettings'
+			);
+			$this->_template_args['admin_page_content'] = $organization_settings_form->display();
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_set_add_edit_form_tags('update_your_organization_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Handler for updating organization settings.
+	 *
+	 * @throws EE_Error
+	 */
+	protected function _update_your_organization_settings()
+	{
+		try {
+			/** @var EventEspresso\admin_pages\general_settings\OrganizationSettings $organization_settings_form */
+			$organization_settings_form  = $this->loader->getShared(
+				'EventEspresso\admin_pages\general_settings\OrganizationSettings'
+			);
+			$success                     = $organization_settings_form->process($this->_req_data);
+			EE_Registry::instance()->CFG = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_your_organization_settings__CFG',
+				EE_Registry::instance()->CFG
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+			$success = false;
+		}
+
+		if ($success) {
+			$success = $this->_update_espresso_configuration(
+				esc_html__('Your Organization Settings', 'event_espresso'),
+				EE_Registry::instance()->CFG,
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+		}
+
+		$this->_redirect_after_action($success, '', '', ['action' => 'default'], true);
+	}
+
+
+
+	/*************        Admin Options        *************/
+
+
+	/**
+	 * _admin_option_settings
+	 *
+	 * @throws EE_Error
+	 * @throws LogicException
+	 */
+	protected function _admin_option_settings()
+	{
+		$this->_template_args['admin_page_content'] = '';
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			// still need this for the old school form in Extend_General_Settings_Admin_Page
+			$this->_template_args['values'] = $this->_yes_no_values;
+			// also need to account for the do_action that was in the old template
+			$admin_options_settings_form->setTemplateArgs($this->_template_args);
+			$this->_template_args['admin_page_content'] = $admin_options_settings_form->display();
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_set_add_edit_form_tags('update_admin_option_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * _update_admin_option_settings
+	 *
+	 * @throws EE_Error
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidFormSubmissionException
+	 * @throws InvalidArgumentException
+	 * @throws LogicException
+	 */
+	protected function _update_admin_option_settings()
+	{
+		try {
+			$admin_options_settings_form = new AdminOptionsSettings(EE_Registry::instance());
+			$admin_options_settings_form->process($this->_req_data[ $admin_options_settings_form->slug() ]);
+			EE_Registry::instance()->CFG->admin = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin',
+				EE_Registry::instance()->CFG->admin
+			);
+		} catch (Exception $e) {
+			EE_Error::add_error($e->getMessage(), __FILE__, __FUNCTION__, __LINE__);
+		}
+		$this->_redirect_after_action(
+			apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success',
+				$this->_update_espresso_configuration(
+					'Admin Options',
+					EE_Registry::instance()->CFG->admin,
+					__FILE__,
+					__FUNCTION__,
+					__LINE__
+				)
+			),
+			'Admin Options',
+			'updated',
+			['action' => 'admin_option_settings']
+		);
+	}
+
+
+	/*************        Countries        *************/
+
+
+	/**
+	 * @return string
+	 */
+	protected function getCountryIsoForSite()
+	{
+		return ! empty(EE_Registry::instance()->CFG->organization->CNT_ISO)
+			? EE_Registry::instance()->CFG->organization->CNT_ISO
+			: 'US';
+	}
+
+
+	/**
+	 * @param string          $CNT_ISO
+	 * @param EE_Country|null $country
+	 * @return EE_Base_Class|EE_Country
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function verifyOrGetCountryFromIso($CNT_ISO, EE_Country $country = null)
+	{
+		/** @var EE_Country $country */
+		return $country instanceof EE_Country && $country->ID() === $CNT_ISO
+			? $country
+			: EEM_Country::instance()->get_one_by_ID($CNT_ISO);
+	}
+
+
+	/**
+	 * Output Country Settings view.
+	 *
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	protected function _country_settings()
+	{
+		$CNT_ISO_for_site = $this->getCountryIsoForSite();
+		$CNT_ISO          = isset($this->_req_data['country'])
+			? strtoupper(sanitize_text_field($this->_req_data['country']))
+			: $CNT_ISO_for_site;
+
+		// load field generator helper
+
+		$this->_template_args['values'] = $this->_yes_no_values;
+
+		$this->_template_args['countries'] = new EE_Question_Form_Input(
+			EE_Question::new_instance(
+				[
+					'QST_ID'           => 0,
+					'QST_display_text' => esc_html__('Select Country', 'event_espresso'),
+					'QST_system'       => 'admin-country',
+				]
+			),
+			EE_Answer::new_instance(
+				[
+					'ANS_ID'    => 0,
+					'ANS_value' => $CNT_ISO,
+				]
+			),
+			[
+				'input_id'       => 'country',
+				'input_name'     => 'country',
+				'input_prefix'   => '',
+				'append_qstn_id' => false,
+			]
+		);
+		$country                           = $this->verifyOrGetCountryFromIso($CNT_ISO_for_site);
+		add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10, 2);
+		$this->_template_args['country_details_settings'] = $this->display_country_settings(
+			$country->ID(),
+			$country
+		);
+		$this->_template_args['country_states_settings']  = $this->display_country_states(
+			$country->ID(),
+			$country
+		);
+		$this->_template_args['CNT_name_for_site']        = $country->name();
+
+		$this->_set_add_edit_form_tags('update_country_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'countries_settings.template.php',
+			$this->_template_args,
+			true
+		);
+		$this->display_admin_page_with_no_sidebar();
+	}
+
+
+	/**
+	 * @param string          $CNT_ISO
+	 * @param EE_Country|null $country
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function display_country_settings($CNT_ISO = '', EE_Country $country = null)
+	{
+		$CNT_ISO_for_site = $this->getCountryIsoForSite();
+
+		$CNT_ISO = isset($this->_req_data['country'])
+			? strtoupper(sanitize_text_field($this->_req_data['country']))
+			: $CNT_ISO;
+		if (! $CNT_ISO) {
+			return '';
+		}
+
+		// for ajax
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'country_form_field_label_wrap'], 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'country_form_field_input__wrap'], 10, 2);
+		$country                                  = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
+		$CNT_cur_disabled                         = $CNT_ISO !== $CNT_ISO_for_site;
+		$this->_template_args['CNT_cur_disabled'] = $CNT_cur_disabled;
+
+		$country_input_types            = [
+			'CNT_active'      => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true,
+			],
+			'CNT_ISO'         => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+			],
+			'CNT_ISO3'        => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+			],
+			'RGN_ID'          => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+			],
+			'CNT_name'        => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'regular-text',
+			],
+			'CNT_cur_code'    => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_single'  => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'medium-text',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_plural'  => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'medium-text',
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_sign'    => [
+				'type'         => 'TEXT',
+				'input_name'   => 'cntry[' . $CNT_ISO . ']',
+				'class'        => 'small-text',
+				'htmlentities' => false,
+				'disabled'     => $CNT_cur_disabled,
+			],
+			'CNT_cur_sign_b4' => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true,
+				'disabled'         => $CNT_cur_disabled,
+			],
+			'CNT_cur_dec_plc' => [
+				'type'       => 'RADIO_BTN',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => '',
+				'options'    => [
+					['id' => 0, 'text' => ''],
+					['id' => 1, 'text' => ''],
+					['id' => 2, 'text' => ''],
+					['id' => 3, 'text' => ''],
+				],
+				'disabled'   => $CNT_cur_disabled,
+			],
+			'CNT_cur_dec_mrk' => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => [
+					[
+						'id'   => ',',
+						'text' => esc_html__(', (comma)', 'event_espresso'),
+					],
+					['id' => '.', 'text' => esc_html__('. (decimal)', 'event_espresso')],
+				],
+				'use_desc_4_label' => true,
+				'disabled'         => $CNT_cur_disabled,
+			],
+			'CNT_cur_thsnds'  => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => [
+					[
+						'id'   => ',',
+						'text' => esc_html__(', (comma)', 'event_espresso'),
+					],
+					[
+						'id'   => '.',
+						'text' => esc_html__('. (decimal)', 'event_espresso'),
+					],
+					[
+						'id'   => ' ',
+						'text' => esc_html__('(space)', 'event_espresso'),
+					],
+				],
+				'use_desc_4_label' => true,
+				'disabled'         => $CNT_cur_disabled,
+			],
+			'CNT_tel_code'    => [
+				'type'       => 'TEXT',
+				'input_name' => 'cntry[' . $CNT_ISO . ']',
+				'class'      => 'small-text',
+			],
+			'CNT_is_EU'       => [
+				'type'             => 'RADIO_BTN',
+				'input_name'       => 'cntry[' . $CNT_ISO . ']',
+				'class'            => '',
+				'options'          => $this->_yes_no_values,
+				'use_desc_4_label' => true,
+			],
+		];
+		$this->_template_args['inputs'] = EE_Question_Form_Input::generate_question_form_inputs_for_object(
+			$country,
+			$country_input_types
+		);
+		$country_details_settings       = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'country_details_settings.template.php',
+			$this->_template_args,
+			true
+		);
+
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(
+				[
+					'return_data' => $country_details_settings,
+					'success'     => $notices['success'],
+					'errors'      => $notices['errors'],
+				]
+			);
+			die();
+		} else {
+			return $country_details_settings;
+		}
+	}
+
+
+	/**
+	 * @param string          $CNT_ISO
+	 * @param EE_Country|null $country
+	 * @return string
+	 * @throws DomainException
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 * @throws ReflectionException
+	 */
+	public function display_country_states($CNT_ISO = '', EE_Country $country = null)
+	{
+
+		$CNT_ISO = isset($this->_req_data['country'])
+			? sanitize_text_field($this->_req_data['country'])
+			: $CNT_ISO;
+		if (! $CNT_ISO) {
+			return '';
+		}
+		// for ajax
+		remove_all_filters('FHEE__EEH_Form_Fields__label_html');
+		remove_all_filters('FHEE__EEH_Form_Fields__input_html');
+		add_filter('FHEE__EEH_Form_Fields__label_html', [$this, 'state_form_field_label_wrap'], 10, 2);
+		add_filter('FHEE__EEH_Form_Fields__input_html', [$this, 'state_form_field_input__wrap'], 10, 2);
+		$states = EEM_State::instance()->get_all_states_for_these_countries([$CNT_ISO => $CNT_ISO]);
+		if (empty($states)) {
+			/** @var EventEspresso\core\services\address\CountrySubRegionDao $countrySubRegionDao */
+			$countrySubRegionDao = $this->loader->getShared(
+				'EventEspresso\core\services\address\CountrySubRegionDao'
+			);
+			if ($countrySubRegionDao instanceof EventEspresso\core\services\address\CountrySubRegionDao) {
+				$country = $this->verifyOrGetCountryFromIso($CNT_ISO, $country);
+				if ($countrySubRegionDao->saveCountrySubRegions($country)) {
+					$states = EEM_State::instance()->get_all_states_for_these_countries(
+						[$CNT_ISO => $CNT_ISO]
+					);
+				}
+			}
+		}
+		if (is_array($states)) {
+			foreach ($states as $STA_ID => $state) {
+				if ($state instanceof EE_State) {
+					// STA_abbrev    STA_name    STA_active
+					$state_input_types                                             = [
+						'STA_abbrev' => [
+							'type'       => 'TEXT',
+							'input_name' => 'states[' . $STA_ID . ']',
+							'class'      => 'small-text',
+						],
+						'STA_name'   => [
+							'type'       => 'TEXT',
+							'input_name' => 'states[' . $STA_ID . ']',
+							'class'      => 'regular-text',
+						],
+						'STA_active' => [
+							'type'             => 'RADIO_BTN',
+							'input_name'       => 'states[' . $STA_ID . ']',
+							'options'          => $this->_yes_no_values,
+							'use_desc_4_label' => true,
+						],
+					];
+					$this->_template_args['states'][ $STA_ID ]['inputs']           =
+						EE_Question_Form_Input::generate_question_form_inputs_for_object(
+							$state,
+							$state_input_types
+						);
+					$query_args                                                    = [
+						'action'     => 'delete_state',
+						'STA_ID'     => $STA_ID,
+						'CNT_ISO'    => $CNT_ISO,
+						'STA_abbrev' => $state->abbrev(),
+					];
+					$this->_template_args['states'][ $STA_ID ]['delete_state_url'] =
+						EE_Admin_Page::add_query_args_and_nonce(
+							$query_args,
+							GEN_SET_ADMIN_URL
+						);
+				}
+			}
+		} else {
+			$this->_template_args['states'] = false;
+		}
+
+		$this->_template_args['add_new_state_url'] = EE_Admin_Page::add_query_args_and_nonce(
+			['action' => 'add_new_state'],
+			GEN_SET_ADMIN_URL
+		);
+
+		$state_details_settings = EEH_Template::display_template(
+			GEN_SET_TEMPLATE_PATH . 'state_details_settings.template.php',
+			$this->_template_args,
+			true
+		);
+
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(
+				[
+					'return_data' => $state_details_settings,
+					'success'     => $notices['success'],
+					'errors'      => $notices['errors'],
+				]
+			);
+			die();
+		} else {
+			return $state_details_settings;
+		}
+	}
+
+
+	/**
+	 *        add_new_state
+	 *
+	 * @access    public
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function add_new_state()
+	{
+
+		$success = true;
+
+		$CNT_ISO = isset($this->_req_data['CNT_ISO'])
+			? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO']))
+			: false;
+		if (! $CNT_ISO) {
+			EE_Error::add_error(
+				esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$success = false;
+		}
+		$STA_abbrev = isset($this->_req_data['STA_abbrev'])
+			? sanitize_text_field($this->_req_data['STA_abbrev'])
+			: false;
+		if (! $STA_abbrev) {
+			EE_Error::add_error(
+				esc_html__('No State ISO code or an invalid State ISO code was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$success = false;
+		}
+		$STA_name = isset($this->_req_data['STA_name'])
+			? sanitize_text_field($this->_req_data['STA_name'])
+			: false;
+		if (! $STA_name) {
+			EE_Error::add_error(
+				esc_html__('No State name or an invalid State name was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			$success = false;
+		}
+
+		if ($success) {
+			$cols_n_values = [
+				'CNT_ISO'    => $CNT_ISO,
+				'STA_abbrev' => $STA_abbrev,
+				'STA_name'   => $STA_name,
+				'STA_active' => true,
+			];
+			$success       = EEM_State::instance()->insert($cols_n_values);
+			EE_Error::add_success(esc_html__('The State was added successfully.', 'event_espresso'));
+		}
+
+		if (defined('DOING_AJAX')) {
+			$notices = EE_Error::get_notices(false, false, false);
+			echo wp_json_encode(array_merge($notices, ['return_data' => $CNT_ISO]));
+			die();
+		} else {
+			$this->_redirect_after_action($success, 'State', 'added', ['action' => 'country_settings']);
+		}
+	}
+
+
+	/**
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	public function delete_state()
+	{
+		$CNT_ISO    = isset($this->_req_data['CNT_ISO'])
+			? strtoupper(sanitize_text_field($this->_req_data['CNT_ISO']))
+			: false;
+		$STA_ID     = isset($this->_req_data['STA_ID'])
+			? sanitize_text_field($this->_req_data['STA_ID'])
+			: false;
+		$STA_abbrev = isset($this->_req_data['STA_abbrev'])
+			? sanitize_text_field($this->_req_data['STA_abbrev'])
+			: false;
+		if (! $STA_ID) {
+			EE_Error::add_error(
+				esc_html__('No State ID or an invalid State ID was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+			return;
+		}
+
+		$success = EEM_State::instance()->delete_by_ID($STA_ID);
+		if ($success !== false) {
+			do_action(
+				'AHEE__General_Settings_Admin_Page__delete_state__state_deleted',
+				$CNT_ISO,
+				$STA_ID,
+				['STA_abbrev' => $STA_abbrev]
+			);
+			EE_Error::add_success(esc_html__('The State was deleted successfully.', 'event_espresso'));
+		}
+		if (defined('DOING_AJAX')) {
+			$notices                = EE_Error::get_notices(false);
+			$notices['return_data'] = true;
+			echo wp_json_encode($notices);
+			die();
+		} else {
+			$this->_redirect_after_action(
+				$success,
+				'State',
+				'deleted',
+				['action' => 'country_settings']
+			);
+		}
+	}
+
+
+	/**
+	 *        _update_country_settings
+	 *
+	 * @return void
+	 * @throws EE_Error
+	 * @throws InvalidArgumentException
+	 * @throws InvalidDataTypeException
+	 * @throws InvalidInterfaceException
+	 */
+	protected function _update_country_settings()
+	{
+		// grab the country ISO code
+		$CNT_ISO = isset($this->_req_data['country'])
+			? strtoupper(sanitize_text_field($this->_req_data['country']))
+			: false;
+		if (! $CNT_ISO) {
+			EE_Error::add_error(
+				esc_html__('No Country ISO code or an invalid Country ISO code was received.', 'event_espresso'),
+				__FILE__,
+				__FUNCTION__,
+				__LINE__
+			);
+
+			return;
+		}
+		$cols_n_values             = [];
+		$cols_n_values['CNT_ISO3'] = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_ISO3'])
+			? strtoupper(sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_ISO3']))
+			: false;
+		$cols_n_values['RGN_ID']   = isset($this->_req_data['cntry'][ $CNT_ISO ]['RGN_ID'])
+			? absint($this->_req_data['cntry'][ $CNT_ISO ]['RGN_ID'])
+			: null;
+		$cols_n_values['CNT_name'] = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_name'])
+			? sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_name'])
+			: null;
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_code'])) {
+			$cols_n_values['CNT_cur_code'] = strtoupper(
+				sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_code'])
+			);
+		}
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_single'])) {
+			$cols_n_values['CNT_cur_single'] = sanitize_text_field(
+				$this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_single']
+			);
+		}
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_plural'])) {
+			$cols_n_values['CNT_cur_plural'] = sanitize_text_field(
+				$this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_plural']
+			);
+		}
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign'])) {
+			$cols_n_values['CNT_cur_sign'] = sanitize_text_field(
+				$this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign']
+			);
+		}
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign_b4'])) {
+			$cols_n_values['CNT_cur_sign_b4'] = absint(
+				$this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_sign_b4']
+			);
+		}
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_plc'])) {
+			$cols_n_values['CNT_cur_dec_plc'] = absint(
+				$this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_plc']
+			);
+		}
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_mrk'])) {
+			$cols_n_values['CNT_cur_dec_mrk'] = sanitize_text_field(
+				$this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_dec_mrk']
+			);
+		}
+		if (isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_thsnds'])) {
+			$cols_n_values['CNT_cur_thsnds'] = sanitize_text_field(
+				$this->_req_data['cntry'][ $CNT_ISO ]['CNT_cur_thsnds']
+			);
+		}
+		$cols_n_values['CNT_tel_code'] = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_tel_code'])
+			? sanitize_text_field($this->_req_data['cntry'][ $CNT_ISO ]['CNT_tel_code'])
+			: null;
+		$cols_n_values['CNT_is_EU']    = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_is_EU'])
+			? absint($this->_req_data['cntry'][ $CNT_ISO ]['CNT_is_EU'])
+			: false;
+		$cols_n_values['CNT_active']   = isset($this->_req_data['cntry'][ $CNT_ISO ]['CNT_active'])
+			? absint($this->_req_data['cntry'][ $CNT_ISO ]['CNT_active'])
+			: false;
+		// allow filtering of country data
+		$cols_n_values = apply_filters(
+			'FHEE__General_Settings_Admin_Page___update_country_settings__cols_n_values',
+			$cols_n_values
+		);
+
+		// where values
+		$where_cols_n_values = [['CNT_ISO' => $CNT_ISO]];
+		// run the update
+		$success = EEM_Country::instance()->update($cols_n_values, $where_cols_n_values);
+
+		if (isset($this->_req_data['states']) && is_array($this->_req_data['states']) && $success !== false) {
+			// allow filtering of states data
+			$states = apply_filters(
+				'FHEE__General_Settings_Admin_Page___update_country_settings__states',
+				$this->_req_data['states']
+			);
+
+			// loop thru state data ( looks like : states[75][STA_name] )
+			foreach ($states as $STA_ID => $state) {
+				$cols_n_values = [
+					'CNT_ISO'    => $CNT_ISO,
+					'STA_abbrev' => sanitize_text_field($state['STA_abbrev']),
+					'STA_name'   => sanitize_text_field($state['STA_name']),
+					'STA_active' => (bool) absint($state['STA_active']),
+				];
+				// where values
+				$where_cols_n_values = [['STA_ID' => $STA_ID]];
+				// run the update
+				$success = EEM_State::instance()->update($cols_n_values, $where_cols_n_values);
+				if ($success !== false) {
+					do_action(
+						'AHEE__General_Settings_Admin_Page__update_country_settings__state_saved',
+						$CNT_ISO,
+						$STA_ID,
+						$cols_n_values
+					);
+				}
+			}
+		}
+		// check if country being edited matches org option country, and if so, then  update EE_Config with new settings
+		if (
+			isset(EE_Registry::instance()->CFG->organization->CNT_ISO)
+			&& $CNT_ISO == EE_Registry::instance()->CFG->organization->CNT_ISO
+		) {
+			EE_Registry::instance()->CFG->currency = new EE_Currency_Config($CNT_ISO);
+			EE_Registry::instance()->CFG->update_espresso_config();
+		}
+
+		if ($success !== false) {
+			EE_Error::add_success(
+				esc_html__('Country Settings updated successfully.', 'event_espresso')
+			);
+		}
+		$this->_redirect_after_action(
+			$success,
+			'',
+			'',
+			['action' => 'country_settings', 'country' => $CNT_ISO],
+			true
+		);
+	}
+
+
+	/**
+	 *        form_form_field_label_wrap
+	 *
+	 * @param string $label
+	 * @return        string
+	 */
+	public function country_form_field_label_wrap($label, $required_text)
+	{
+		return '
 			<tr>
 				<th>
 					' . $label . '
 				</th>';
-    }
-
-
-    /**
-     *        form_form_field_input__wrap
-     *
-     * @param string $label
-     * @return        string
-     */
-    public function country_form_field_input__wrap($input, $label)
-    {
-        return '
+	}
+
+
+	/**
+	 *        form_form_field_input__wrap
+	 *
+	 * @param string $label
+	 * @return        string
+	 */
+	public function country_form_field_input__wrap($input, $label)
+	{
+		return '
 				<td class="general-settings-country-input-td">
 					' . $input . '
 				</td>
 			</tr>';
-    }
-
-
-    /**
-     *        form_form_field_label_wrap
-     *
-     * @param string $label
-     * @param string $required_text
-     * @return        string
-     */
-    public function state_form_field_label_wrap($label, $required_text)
-    {
-        return $required_text;
-    }
-
-
-    /**
-     *        form_form_field_input__wrap
-     *
-     * @param string $label
-     * @return        string
-     */
-    public function state_form_field_input__wrap($input, $label)
-    {
-        return '
+	}
+
+
+	/**
+	 *        form_form_field_label_wrap
+	 *
+	 * @param string $label
+	 * @param string $required_text
+	 * @return        string
+	 */
+	public function state_form_field_label_wrap($label, $required_text)
+	{
+		return $required_text;
+	}
+
+
+	/**
+	 *        form_form_field_input__wrap
+	 *
+	 * @param string $label
+	 * @return        string
+	 */
+	public function state_form_field_input__wrap($input, $label)
+	{
+		return '
 				<td class="general-settings-country-state-input-td">
 					' . $input . '
 				</td>';
-    }
-
-
-    /***********/
-
-
-    /**
-     * displays edit and view links for critical EE pages
-     *
-     * @param int $ee_page_id
-     * @return string
-     */
-    public static function edit_view_links($ee_page_id)
-    {
-        $links = '<a href="'
-                 . add_query_arg(
-                     ['post' => $ee_page_id, 'action' => 'edit'],
-                     admin_url('post.php')
-                 )
-                 . '" >'
-                 . esc_html__('Edit', 'event_espresso')
-                 . '</a>';
-        $links .= ' &nbsp;|&nbsp; ';
-        $links .= '<a href="' . get_permalink($ee_page_id) . '" >' . esc_html__('View', 'event_espresso') . '</a>';
-
-        return $links;
-    }
-
-
-    /**
-     * displays page and shortcode status for critical EE pages
-     *
-     * @param WP page object $ee_page
-     * @return string
-     */
-    public static function page_and_shortcode_status($ee_page, $shortcode)
-    {
-
-        // page status
-        if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
-            $pg_colour = 'green';
-            $pg_status = sprintf(esc_html__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
-        } else {
-            $pg_colour = 'red';
-            $pg_status = sprintf(esc_html__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
-        }
-
-        // shortcode status
-        if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== false) {
-            $sc_colour = 'green';
-            $sc_status = sprintf(esc_html__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
-        } else {
-            $sc_colour = 'red';
-            $sc_status = sprintf(esc_html__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
-        }
-
-        return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>'
-               . $pg_status
-               . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
-    }
-
-
-    /**
-     * generates a dropdown of all parent pages - copied from WP core
-     *
-     * @param int  $default
-     * @param int  $parent
-     * @param int  $level
-     * @param bool $echo
-     * @return string;
-     */
-    public static function page_settings_dropdown($default = 0, $parent = 0, $level = 0, $echo = true)
-    {
-        global $wpdb;
-        $items  = $wpdb->get_results(
-            $wpdb->prepare(
-                "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
-                $parent
-            )
-        );
-        $output = '';
-
-        if ($items) {
-            $level = absint($level);
-            foreach ($items as $item) {
-                $ID = absint($item->ID);
-                $post_title = wp_strip_all_tags($item->post_title);
-                $pad    = str_repeat('&nbsp;', $level * 3);
-                $option = "\n\t";
-                $option .= '<option class="level-' . $level . '" ';
-                $option .= 'value="' . $ID . '" ';
-                $option .= $ID === absint($default) ? ' selected="selected"' : '';
-                $option .= '>';
-                $option .= "$pad {$post_title}";
-                $option .= '</option>';
-                $output .= $option;
-                ob_start();
-                parent_dropdown($default, $item->ID, $level + 1);
-                $output .= ob_get_clean();
-            }
-        }
-        if ($echo) {
-            echo wp_kses($output, AllowedTags::getAllowedTags());
-            return '';
-        }
-        return $output;
-    }
-
-
-    /**
-     * Loads the scripts for the privacy settings form
-     */
-    public function load_scripts_styles_privacy_settings()
-    {
-        $form_handler =
-            $this->loader->getShared('EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler');
-        $form_handler->enqueueStylesAndScripts();
-    }
-
-
-    /**
-     * display the privacy settings form
-     *
-     * @throws EE_Error
-     */
-    public function privacySettings()
-    {
-        $this->_set_add_edit_form_tags('update_privacy_settings');
-        $this->_set_publish_post_box_vars(null, false, false, null, false);
-        $form_handler                               =
-            $this->loader->getShared('EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler');
-        $this->_template_args['admin_page_content'] = $form_handler->display();
-        $this->display_admin_page_with_sidebar();
-    }
-
-
-    /**
-     * Update the privacy settings from form data
-     *
-     * @throws EE_Error
-     */
-    public function updatePrivacySettings()
-    {
-        $form_handler =
-            $this->loader->getShared('EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler');
-        $success      = $form_handler->process($this->get_request_data());
-        $this->_redirect_after_action(
-            $success,
-            esc_html__('Registration Form Options', 'event_espresso'),
-            'updated',
-            ['action' => 'privacy_settings']
-        );
-    }
+	}
+
+
+	/***********/
+
+
+	/**
+	 * displays edit and view links for critical EE pages
+	 *
+	 * @param int $ee_page_id
+	 * @return string
+	 */
+	public static function edit_view_links($ee_page_id)
+	{
+		$links = '<a href="'
+				 . add_query_arg(
+					 ['post' => $ee_page_id, 'action' => 'edit'],
+					 admin_url('post.php')
+				 )
+				 . '" >'
+				 . esc_html__('Edit', 'event_espresso')
+				 . '</a>';
+		$links .= ' &nbsp;|&nbsp; ';
+		$links .= '<a href="' . get_permalink($ee_page_id) . '" >' . esc_html__('View', 'event_espresso') . '</a>';
+
+		return $links;
+	}
+
+
+	/**
+	 * displays page and shortcode status for critical EE pages
+	 *
+	 * @param WP page object $ee_page
+	 * @return string
+	 */
+	public static function page_and_shortcode_status($ee_page, $shortcode)
+	{
+
+		// page status
+		if (isset($ee_page->post_status) && $ee_page->post_status == 'publish') {
+			$pg_colour = 'green';
+			$pg_status = sprintf(esc_html__('Page%sStatus%sOK', 'event_espresso'), '&nbsp;', '&nbsp;');
+		} else {
+			$pg_colour = 'red';
+			$pg_status = sprintf(esc_html__('Page%sVisibility%sProblem', 'event_espresso'), '&nbsp;', '&nbsp;');
+		}
+
+		// shortcode status
+		if (isset($ee_page->post_content) && strpos($ee_page->post_content, $shortcode) !== false) {
+			$sc_colour = 'green';
+			$sc_status = sprintf(esc_html__('Shortcode%sOK', 'event_espresso'), '&nbsp;');
+		} else {
+			$sc_colour = 'red';
+			$sc_status = sprintf(esc_html__('Shortcode%sProblem', 'event_espresso'), '&nbsp;');
+		}
+
+		return '<span style="color:' . $pg_colour . '; margin-right:2em;"><strong>'
+			   . $pg_status
+			   . '</strong></span><span style="color:' . $sc_colour . '"><strong>' . $sc_status . '</strong></span>';
+	}
+
+
+	/**
+	 * generates a dropdown of all parent pages - copied from WP core
+	 *
+	 * @param int  $default
+	 * @param int  $parent
+	 * @param int  $level
+	 * @param bool $echo
+	 * @return string;
+	 */
+	public static function page_settings_dropdown($default = 0, $parent = 0, $level = 0, $echo = true)
+	{
+		global $wpdb;
+		$items  = $wpdb->get_results(
+			$wpdb->prepare(
+				"SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' AND post_status != 'trash' ORDER BY menu_order",
+				$parent
+			)
+		);
+		$output = '';
+
+		if ($items) {
+			$level = absint($level);
+			foreach ($items as $item) {
+				$ID = absint($item->ID);
+				$post_title = wp_strip_all_tags($item->post_title);
+				$pad    = str_repeat('&nbsp;', $level * 3);
+				$option = "\n\t";
+				$option .= '<option class="level-' . $level . '" ';
+				$option .= 'value="' . $ID . '" ';
+				$option .= $ID === absint($default) ? ' selected="selected"' : '';
+				$option .= '>';
+				$option .= "$pad {$post_title}";
+				$option .= '</option>';
+				$output .= $option;
+				ob_start();
+				parent_dropdown($default, $item->ID, $level + 1);
+				$output .= ob_get_clean();
+			}
+		}
+		if ($echo) {
+			echo wp_kses($output, AllowedTags::getAllowedTags());
+			return '';
+		}
+		return $output;
+	}
+
+
+	/**
+	 * Loads the scripts for the privacy settings form
+	 */
+	public function load_scripts_styles_privacy_settings()
+	{
+		$form_handler =
+			$this->loader->getShared('EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler');
+		$form_handler->enqueueStylesAndScripts();
+	}
+
+
+	/**
+	 * display the privacy settings form
+	 *
+	 * @throws EE_Error
+	 */
+	public function privacySettings()
+	{
+		$this->_set_add_edit_form_tags('update_privacy_settings');
+		$this->_set_publish_post_box_vars(null, false, false, null, false);
+		$form_handler                               =
+			$this->loader->getShared('EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler');
+		$this->_template_args['admin_page_content'] = $form_handler->display();
+		$this->display_admin_page_with_sidebar();
+	}
+
+
+	/**
+	 * Update the privacy settings from form data
+	 *
+	 * @throws EE_Error
+	 */
+	public function updatePrivacySettings()
+	{
+		$form_handler =
+			$this->loader->getShared('EventEspresso\core\domain\services\admin\privacy\forms\PrivacySettingsFormHandler');
+		$success      = $form_handler->process($this->get_request_data());
+		$this->_redirect_after_action(
+			$success,
+			esc_html__('Registration Form Options', 'event_espresso'),
+			'updated',
+			['action' => 'privacy_settings']
+		);
+	}
 }