eventespresso / event-espresso-core

admin_pages/maintenance/templates/ee_data_reset_and_delete.template.php

Indentation +44 added lines, -44 removed lines

@@ -35,9 +35,9 @@ 
     </h4>
     <p>
         <?php esc_html_e(
-            'Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.',
-            'event_espresso'
-        ); ?>
+			'Use this to reset the capabilities on WP roles to the defaults as defined via EE_Capabilities.  Note this reset does not REMOVE any existing capabilities, it just ensures that all the defaults are ADDED to the roles.',
+			'event_espresso'
+		); ?>
     </p>
     <div class="float-right"><?php echo wp_kses($reset_capabilities_button, AllowedTags::getAllowedTags()); ?></div>
     <div class="clear"></div>
@@ -51,15 +51,15 @@ 
     </h4>
     <p>
         <?php esc_html_e(
-            ' This will reset data for Event Espresso 4, and for all active add-ons. Inactive add-ons will not be affected.',
-            'event_espresso'
-        ); ?>
+			' This will reset data for Event Espresso 4, and for all active add-ons. Inactive add-ons will not be affected.',
+			'event_espresso'
+		); ?>
     </p>
     <p>
         <?php esc_html_e(
-            'Your Event Espresso data will return to its default settings. The rest of your website will be unaffected.',
-            'event_espresso'
-        ); ?>
+			'Your Event Espresso data will return to its default settings. The rest of your website will be unaffected.',
+			'event_espresso'
+		); ?>
     </p>
     <div class="float-right">
         <a class="button button-primary ee-confirm" href="<?php echo esc_url_raw($reset_db_url); ?>">
@@ -78,61 +78,61 @@ 
     </h4>
     <p>
         <?php esc_html_e(
-            ' This will delete data for Event Espresso 4, and all currently active add-ons. Event Espresso will then be deactivated. You may need to manually deactivate each add-on individually.',
-            'event_espresso'
-        ); ?>
+			' This will delete data for Event Espresso 4, and all currently active add-ons. Event Espresso will then be deactivated. You may need to manually deactivate each add-on individually.',
+			'event_espresso'
+		); ?>
     </p>
     <p>
         <?php esc_html_e(
-            'If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.',
-            'event_espresso'
-        ); ?>
+			'If you know for certain that you will no longer be using Event Espresso and you wish to remove ALL traces of the plugin from your system, then perform the following steps.',
+			'event_espresso'
+		); ?>
     </p>
     <p class="important-notice">
         <?php printf(
-            esc_html__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'),
-            '<em>',
-            '</em>'
-        ); ?>
+			esc_html__('Please note: %sThis is permanent and can NOT be undone.%s', 'event_espresso'),
+			'<em>',
+			'</em>'
+		); ?>
         <br />
     </p>
     <ol>
         <li>
             <?php printf(
-                esc_html__(
-                    'First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being updated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the Database Update will continue where it left off.',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            ); ?>
+				esc_html__(
+					'First, click the button below to permanently delete all Event Espresso tables, records, and options from your WordPress database . If you receive a "500 Internal Server Error" or a blank white screen, it means the server has timed out due to the large number of records being updated. This is not a cause for concern. Simply %1$srefresh the page%2$s and the Database Update will continue where it left off.',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			); ?>
         </li>
         <li>
             <?php printf(
-                esc_html__(
-                    'Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            ); ?>
+				esc_html__(
+					'Then, locate Event Espresso on the WordPress Plugins page, and click on %sDelete%s',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			); ?>
         </li>
         <li>
             <?php printf(
-                esc_html__(
-                    'Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s',
-                    'event_espresso'
-                ),
-                '<strong>',
-                '</strong>'
-            ); ?>
+				esc_html__(
+					'Once you are on the Delete Plugin page, click on %sYes, Delete these files and data%s',
+					'event_espresso'
+				),
+				'<strong>',
+				'</strong>'
+			); ?>
         </li>
         <li>
             <?php printf(
-                esc_html__('Note: Event Espresso 4 categories are %snot%s deleted by this script', 'event_espresso'),
-                '<strong>',
-                '</strong>'
-            ); ?>
+				esc_html__('Note: Event Espresso 4 categories are %snot%s deleted by this script', 'event_espresso'),
+				'<strong>',
+				'</strong>'
+			); ?>
             <br>
             <a href="<?php echo esc_url_raw(admin_url('edit-tags.php?taxonomy=espresso_event_categories')); ?>">
                 <?php esc_html_e('You can go here to delete Event Espresso categories', 'event_espresso'); ?>

admin_pages/maintenance/templates/ee_migration_page.template.php

Indentation +118 added lines, -118 removed lines

@@ -36,55 +36,55 @@ 
             <h3 class="espresso-header">
                 <span class="dashicons dashicons-flag ee-icon-size-22"></span>
                 <?php
-                echo esc_html(
-                    apply_filters(
-                        'FHEE__ee_migration_page__header',
-                        sprintf(
-                            __("Your Event Espresso data needs to be updated.", "event_espresso"),
-                            $current_db_state,
-                            $next_db_state
-                        ),
-                        $current_db_state,
-                        $next_db_state
-                    )
-                );
-                ?>
+				echo esc_html(
+					apply_filters(
+						'FHEE__ee_migration_page__header',
+						sprintf(
+							__("Your Event Espresso data needs to be updated.", "event_espresso"),
+							$current_db_state,
+							$next_db_state
+						),
+						$current_db_state,
+						$next_db_state
+					)
+				);
+				?>
             </h3>
         <?php } elseif ($show_most_recent_migration) { ?>
             <h3 class="espresso-header">
                 <span class="dashicons dashicons-awards ee-icon-size-22"></span>
                 <?php echo esc_html(
-                    apply_filters(
-                        'FHEE__ee_migration_page__done_migration_header',
-                        sprintf(
-                            __(
-                                'Congratulations! Your database is "up-to-date" and you are ready to begin using %s',
-                                "event_espresso"
-                            ),
-                            $ultimate_db_state
-                        )
-                    )
-                ); ?>
+					apply_filters(
+						'FHEE__ee_migration_page__done_migration_header',
+						sprintf(
+							__(
+								'Congratulations! Your database is "up-to-date" and you are ready to begin using %s',
+								"event_espresso"
+							),
+							$ultimate_db_state
+						)
+					)
+				); ?>
             </h3>
             <p>
                 <?php echo esc_html(
-                    apply_filters(
-                        'FHEE__ee_migration_page__p_after_done_migration_header',
-                        sprintf(
-                            __(
-                                "Time to find out about all the great new features %s has to offer.",
-                                "event_espresso"
-                            ),
-                            $ultimate_db_state
-                        )
-                    )
-                ); ?> &nbsp;
+					apply_filters(
+						'FHEE__ee_migration_page__p_after_done_migration_header',
+						sprintf(
+							__(
+								"Time to find out about all the great new features %s has to offer.",
+								"event_espresso"
+							),
+							$ultimate_db_state
+						)
+					)
+				); ?> &nbsp;
                 <b>
                     <a class="button-primary"
                        id='get-started-after-migrate'
                        href="<?php
-                        echo esc_url_raw(add_query_arg(['page' => 'espresso_about'], admin_url('admin.php')));
-                        ?>"
+						echo esc_url_raw(add_query_arg(['page' => 'espresso_about'], admin_url('admin.php')));
+						?>"
                     >
                         <?php esc_html_e("Let's Get Started", "event_espresso"); ?>&nbsp;
                         <span class="dashicons dashicons-arrow-right ee-icon-size-22" style="margin:0;"></span>
@@ -95,46 +95,46 @@ 
 
 
         <?php
-        if ($show_backup_db_text) {
-            echo wp_kses($migration_options_html, AllowedTags::getAllowedTags());
-        } ?>
+		if ($show_backup_db_text) {
+			echo wp_kses($migration_options_html, AllowedTags::getAllowedTags());
+		} ?>
 
         <?php
-        if ($show_most_recent_migration) {
-            if ($most_recent_migration instanceof EE_Data_Migration_Script_Base) {
-                if ($most_recent_migration->can_continue()) {
-                    // tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
+		if ($show_most_recent_migration) {
+			if ($most_recent_migration instanceof EE_Data_Migration_Script_Base) {
+				if ($most_recent_migration->can_continue()) {
+					// tell the user they should continue their migration because it appears to be unfinished... well, assuming there were no errors ?>
                     <h3 class="espresso-header">
                         <span class="dashicons dashicons-star-half ee-icon-size-22"></span>
                         <?php printf(
-                            esc_html__(
-                                "It appears that your previous Database Update (%s) is incomplete, and should be resumed",
-                                "event_espresso"
-                            ),
-                            $most_recent_migration->pretty_name()
-                        ); ?>
+							esc_html__(
+								"It appears that your previous Database Update (%s) is incomplete, and should be resumed",
+								"event_espresso"
+							),
+							$most_recent_migration->pretty_name()
+						); ?>
                     </h3>
                     <?php
-                } elseif ($most_recent_migration->is_broken()) {
-                    // tell the user the migration failed, and they should notify EE?>
+				} elseif ($most_recent_migration->is_broken()) {
+					// tell the user the migration failed, and they should notify EE?>
                     <h3 class="espresso-header">
                         <span class="dashicons dashicons-no ee-icon-size-22"></span>
                         <?php echo esc_html($most_recent_migration->get_feedback_message()) ?>
                     </h3>
                     <?php
-                }
-                // display errors or not of the most recent migration ran
-                if ($most_recent_migration->get_errors()) {
-                    ?>
+				}
+				// display errors or not of the most recent migration ran
+				if ($most_recent_migration->get_errors()) {
+					?>
                     <div class="ee-attention">
                         <strong>
                             <?php printf(
-                                esc_html__(
-                                    "Warnings occurred during your last Database Update (%s):",
-                                    'event_espresso'
-                                ),
-                                $most_recent_migration->pretty_name()
-                            ); ?>
+								esc_html__(
+									"Warnings occurred during your last Database Update (%s):",
+									'event_espresso'
+								),
+								$most_recent_migration->pretty_name()
+							); ?>
                         </strong>
                         <a id="show-hide-migration-warnings" class="display-the-hidden">
                             <?php esc_html_e("Show Warnings", 'event_espresso'); ?>
@@ -146,32 +146,32 @@ 
                         </ul>
                     </div>
                     <?php
-                } else {
-                    // there were no errors during the last migration, just say so?>
+				} else {
+					// there were no errors during the last migration, just say so?>
                     <h2>
                         <?php printf(
-                            esc_html__(
-                                "The last Database Update (%s) ran successfully without errors.",
-                                "event_espresso"
-                            ),
-                            $most_recent_migration->pretty_name()
-                        ); ?>
+							esc_html__(
+								"The last Database Update (%s) ran successfully without errors.",
+								"event_espresso"
+							),
+							$most_recent_migration->pretty_name()
+						); ?>
                     </h2>
                     <?php
-                }
-            }
-        }
-        // end of: if ( $show_most_recent_migration )
-        ?>
+				}
+			}
+		}
+		// end of: if ( $show_most_recent_migration )
+		?>
 
     </div>
     <!--end of #migration-prep-->
 
     <?php
-    if ($show_migration_progress) { ?>
+	if ($show_migration_progress) { ?>
         <div id='migration-monitor' <?php echo ($show_backup_db_text ? "style='display:none'" : ''); ?>>
             <?php
-            if ($show_backup_db_text) { ?>
+			if ($show_backup_db_text) { ?>
                 <p>
                     <a class="toggle-migration-monitor small-text" style="cursor: pointer;">
                         <span class="dashicons dashicons-arrow-left-alt2" style="top:0;"></span>
@@ -181,19 +181,19 @@ 
 
                 </p>
                 <?php
-            } ?>
+			} ?>
             <div id='progress-area'>
                 <h3 class="espresso-header">
                     <?php
-                    echo sprintf(
-                        _n(
-                            "The following task needs to be performed:",
-                            "The following %s tasks need to be performed:",
-                            count($script_names),
-                            "event_espresso"
-                        ),
-                        count($script_names)
-                    ); ?>
+					echo sprintf(
+						_n(
+							"The following task needs to be performed:",
+							"The following %s tasks need to be performed:",
+							count($script_names),
+							"event_espresso"
+						),
+						count($script_names)
+					); ?>
                 </h3>
                 <ul style="list-style: inside;">
                     <?php foreach ($script_names as $script_name) { ?>
@@ -204,9 +204,9 @@ 
                 <?php if (count($script_names) > 1) { ?>
                     <p>
                         <?php esc_html_e(
-                            "Please note: after each task is completed you will need to continue the Database Update, or report an error to Event Espresso.",
-                            "event_espresso"
-                        ); ?>
+							"Please note: after each task is completed you will need to continue the Database Update, or report an error to Event Espresso.",
+							"event_espresso"
+						); ?>
                     </p>
                 <?php } ?>
 
@@ -217,19 +217,19 @@ 
                         </span>
                         <br />
                         <?php esc_html_e(
-                            "Depending on the number of events and the complexity of the information in your database, this could take a few minutes.",
-                            "event_espresso"
-                        ); ?>
+							"Depending on the number of events and the complexity of the information in your database, this could take a few minutes.",
+							"event_espresso"
+						); ?>
                     </p>
                     <p>
                         <?php printf(
-                            esc_html__(
-                                "%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.",
-                                "event_espresso"
-                            ),
-                            '<strong>',
-                            '</strong>'
-                        ); ?>
+							esc_html__(
+								"%sPlease be patient and do NOT navigate away from this page once the migration has begun%s. If any issues arise due to existing malformed data, an itemized report will be made available to you after the migration has completed.",
+								"event_espresso"
+							),
+							'<strong>',
+							'</strong>'
+						); ?>
                     </p>
                     <p>
                         <?php esc_html_e("Click the button below to begin the migration process.", "event_espresso") ?>
@@ -245,8 +245,8 @@ 
 
                 <button id='start-migration' class='button-primary'>
                     <?php echo ($show_continue_current_migration_script
-                        ? esc_html__("Continue Database Update", "event_espresso")
-                        : esc_html__("Begin Database Update", "event_espresso")); ?>
+						? esc_html__("Continue Database Update", "event_espresso")
+						: esc_html__("Begin Database Update", "event_espresso")); ?>
                 </button>
                 <br class="clear" />
 
@@ -262,9 +262,9 @@ 
         </div>
 
         <?php
-    }
-    if ($show_maintenance_switch) {
-        ?>
+	}
+	if ($show_maintenance_switch) {
+		?>
         <h2>
             <span class="dashicons dashicons-admin-tools"></span>
             <?php esc_html_e('Set Event Espresso Maintenance Mode', 'event_espresso'); ?>
@@ -279,9 +279,9 @@ 
                                    type='radio'
                                    value="0"
                                 <?php echo ($mMode_level === EE_Maintenance_Mode::level_0_not_in_maintenance
-                                    ? 'checked="checked"'
-                                    : '');
-                                ?>
+									? 'checked="checked"'
+									: '');
+								?>
                             />
                         </td>
                         <th align="left">
@@ -290,9 +290,9 @@ 
                             </label>
                             <p class='description' style="font-weight: normal;">
                                 <?php esc_html_e(
-                                    "This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.",
-                                    "event_espresso"
-                                ); ?>
+									"This is the normal operating mode for Event Espresso and allows all functionality to be viewed by all site visitors.",
+									"event_espresso"
+								); ?>
                             </p>
                         </th>
                     </tr>
@@ -303,9 +303,9 @@ 
                                    type='radio'
                                    value="1"
                                 <?php echo ($mMode_level === EE_Maintenance_Mode::level_1_frontend_only_maintenance
-                                    ? 'checked="checked"'
-                                    : '');
-                                ?>
+									? 'checked="checked"'
+									: '');
+								?>
                             />
                         </td>
                         <th align="left">
@@ -314,9 +314,9 @@ 
                             </label>
                             <p class='description' style="font-weight: normal;">
                                 <?php esc_html_e(
-                                    "This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.",
-                                    "event_espresso"
-                                ); ?>
+									"This disables Event Espresso frontend functionality for all site visitors that are not administrators, and allows you to configure and/or test things on the frontend of your website before others can see.",
+									"event_espresso"
+								); ?>
                             </p>
                         </th>
                     </tr>
@@ -330,6 +330,6 @@ 
             </p>
         </form>
         <?php
-    } ?>
+	} ?>
 
 </div>

admin_pages/maintenance/templates/ee_system_stati_page.template.php

Indentation +61 added lines, -61 removed lines

@@ -19,38 +19,38 @@ 
  */
 function ee_recurse_into_array_for_display($data, $depth = 0, $td = true)
 {
-    if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
-        // is_object($incomplete_class) actually returns false, hence why we check for it
-        $data = json_decode(json_encode($data), true);
-    }
-    if (empty($data)) {
-        return;
-    }
-    if (is_array($data)) {
-        $depth++;
-        ksort($data, SORT_NATURAL | SORT_FLAG_CASE);
-        if (EEH_Array::is_associative_array($data)) { ?>
+	if (is_object($data) || $data instanceof __PHP_Incomplete_Class) {
+		// is_object($incomplete_class) actually returns false, hence why we check for it
+		$data = json_decode(json_encode($data), true);
+	}
+	if (empty($data)) {
+		return;
+	}
+	if (is_array($data)) {
+		$depth++;
+		ksort($data, SORT_NATURAL | SORT_FLAG_CASE);
+		if (EEH_Array::is_associative_array($data)) { ?>
             <table class='ee-system-stati ee-system-stati-<?php echo absint($depth); ?>'>
                 <tbody>
                     <?php foreach ($data as $data_key => $data_value) {
-                        // if the value is a single element array with no key,
-                        // and the value is a primitive (not an array, object, etc.)
-                        if (
-                            is_array($data_value)
-                            && count($data_value) === 1
-                            && empty(key($data_value))
-                            && is_scalar(reset($data_value))
-                        ) {
-                            ?>
+						// if the value is a single element array with no key,
+						// and the value is a primitive (not an array, object, etc.)
+						if (
+							is_array($data_value)
+							&& count($data_value) === 1
+							&& empty(key($data_value))
+							&& is_scalar(reset($data_value))
+						) {
+							?>
                             <tr>
                                 <td class="ee-system-stati-value" colspan="2">
                                     <?php echo esc_html(reset($data_value)); ?>
                                 </td>
                             </tr>
                             <?php
-                            continue;
-                        }
-                        ?>
+							continue;
+						}
+						?>
                         <tr>
                             <td class='ee-system-stati-key'>
                                 <span class="ee-system-stati-label">
@@ -65,31 +65,31 @@ 
                             <?php if (is_scalar($data_value)) { ?>
                                 <?php ee_recurse_into_array_for_display($data_value, $depth); ?>
                             <?php } else {
-                                if (is_array($data_value) && count($data_value) === 1) {
-                                    // verify that values have been set
-                                    $keys_only = empty(
-                                        array_filter(
-                                            array_values($data_value),
-                                            function ($v) {
-                                                return $v !== null && (is_array($v) || trim($v) !== '');
-                                            }
-                                        )
-                                    );
-                                    // if the array only consists of keys (no values)
-                                    if ($keys_only) {
-                                        // then use keys for values
-                                        $data_value = array_keys($data_value);
-                                        // but if there is only one value now
-                                        if (count($data_value) === 1) {
-                                            // then pass that single value back into this function
-                                            // this prevents extra empty layers of nothing being added to the output
-                                            ee_recurse_into_array_for_display(reset($data_value), $depth);
-                                            // need to finish the row off though
-                                            echo '</tr>';
-                                            continue;
-                                        }
-                                    }
-                                } ?>
+								if (is_array($data_value) && count($data_value) === 1) {
+									// verify that values have been set
+									$keys_only = empty(
+										array_filter(
+											array_values($data_value),
+											function ($v) {
+												return $v !== null && (is_array($v) || trim($v) !== '');
+											}
+										)
+									);
+									// if the array only consists of keys (no values)
+									if ($keys_only) {
+										// then use keys for values
+										$data_value = array_keys($data_value);
+										// but if there is only one value now
+										if (count($data_value) === 1) {
+											// then pass that single value back into this function
+											// this prevents extra empty layers of nothing being added to the output
+											ee_recurse_into_array_for_display(reset($data_value), $depth);
+											// need to finish the row off though
+											echo '</tr>';
+											continue;
+										}
+									}
+								} ?>
                                 <td class="ee-system-stati-sub-values">
                                     <?php ee_recurse_into_array_for_display($data_value, $depth); ?>
                                 </td>
@@ -107,19 +107,19 @@ 
                 <?php } ?>
             </ul>
         <?php } else {
-            // there's no key (label) and there's only one value,
-            // so let's just pass that value back into this function,
-            // but reset the depth back to where it was.
-            // this prevents extra empty layers of nothing being added to the output
-            $depth--;
-            ee_recurse_into_array_for_display(reset($data), $depth, false);
-        }
-    } else {
-        echo ($td ? '<td class="ee-system-stati-value">' : '');
-        // simple value
-        echo wp_kses($data, AllowedTags::getAllowedTags());
-        echo ($td ? '</td>' : '');
-    }
+			// there's no key (label) and there's only one value,
+			// so let's just pass that value back into this function,
+			// but reset the depth back to where it was.
+			// this prevents extra empty layers of nothing being added to the output
+			$depth--;
+			ee_recurse_into_array_for_display(reset($data), $depth, false);
+		}
+	} else {
+		echo ($td ? '<td class="ee-system-stati-value">' : '');
+		// simple value
+		echo wp_kses($data, AllowedTags::getAllowedTags());
+		echo ($td ? '</td>' : '');
+	}
 }
 
 ?>

core/domain/entities/notifications/PersistentAdminNotice.php

Indentation +311 added lines, -311 removed lines

@@ -26,315 +26,315 @@
 class PersistentAdminNotice implements RequiresCapCheckInterface
 {
 
-    /**
-     * @var string $name
-     */
-    protected $name = '';
-
-    /**
-     * @var string $message
-     */
-    protected $message = '';
-
-    /**
-     * @var boolean $force_update
-     */
-    protected $force_update = false;
-
-    /**
-     * @var string $capability
-     */
-    protected $capability = 'manage_options';
-
-    /**
-     * @var string $cap_context
-     */
-    protected $cap_context = 'view persistent admin notice';
-
-    /**
-     * @var boolean $dismissed
-     */
-    protected $dismissed = false;
-
-    /**
-     * @var CapCheckInterface $cap_check
-     */
-    protected $cap_check;
-
-    /**
-     * if true, then this notice will be deleted from the database
-     *
-     * @var boolean $purge
-     */
-    protected $purge = false;
-
-    /**
-     * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
-     * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
-     *
-     * @var boolean $registered
-     */
-    private $registered = false;
-
-
-    /**
-     * PersistentAdminNotice constructor
-     *
-     * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
-     * @param string $message      [required] the message to be stored persistently until dismissed
-     * @param bool   $force_update enforce the reappearance of a persistent message
-     * @param string $capability   user capability required to view this notice
-     * @param string $cap_context  description for why the cap check is being performed
-     * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
-     * @throws InvalidDataTypeException
-     */
-    public function __construct(
-        $name,
-        $message,
-        $force_update = false,
-        $capability = 'manage_options',
-        $cap_context = 'view persistent admin notice',
-        $dismissed = false
-    ) {
-        $this->setName($name);
-        $this->setMessage($message);
-        $this->setForceUpdate($force_update);
-        $this->setCapability($capability);
-        $this->setCapContext($cap_context);
-        $this->setDismissed($dismissed);
-        add_action(
-            'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
-            array($this, 'registerPersistentAdminNotice')
-        );
-        add_action('shutdown', array($this, 'confirmRegistered'), 999);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-
-    /**
-     * @param string $name
-     * @throws InvalidDataTypeException
-     */
-    private function setName($name)
-    {
-        if (! is_string($name)) {
-            throw new InvalidDataTypeException('$name', $name, 'string');
-        }
-        $this->name = sanitize_key($name);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getMessage()
-    {
-        return $this->message;
-    }
-
-
-    /**
-     * @param string $message
-     * @throws InvalidDataTypeException
-     */
-    private function setMessage($message)
-    {
-        if (! is_string($message)) {
-            throw new InvalidDataTypeException('$message', $message, 'string');
-        }
-        $allowedtags = AllowedTags::getAllowedTags();
-        $this->message = wp_kses($message, $allowedtags);
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getForceUpdate()
-    {
-        return $this->force_update;
-    }
-
-
-    /**
-     * @param bool $force_update
-     */
-    private function setForceUpdate($force_update)
-    {
-        $this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapability()
-    {
-        return $this->capability;
-    }
-
-
-    /**
-     * @param string $capability
-     * @throws InvalidDataTypeException
-     */
-    private function setCapability($capability)
-    {
-        if (! is_string($capability)) {
-            throw new InvalidDataTypeException('$capability', $capability, 'string');
-        }
-        $this->capability = ! empty($capability) ? $capability : 'manage_options';
-    }
-
-
-    /**
-     * @return string
-     */
-    public function getCapContext()
-    {
-        return $this->cap_context;
-    }
-
-
-    /**
-     * @param string $cap_context
-     * @throws InvalidDataTypeException
-     */
-    private function setCapContext($cap_context)
-    {
-        if (! is_string($cap_context)) {
-            throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
-        }
-        $this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getDismissed()
-    {
-        return $this->dismissed;
-    }
-
-
-    /**
-     * @param bool $dismissed
-     */
-    public function setDismissed($dismissed)
-    {
-        $this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * @return CapCheckInterface
-     * @throws InvalidDataTypeException
-     */
-    public function getCapCheck()
-    {
-        if (! $this->cap_check instanceof CapCheckInterface) {
-            $this->setCapCheck(
-                new CapCheck(
-                    $this->capability,
-                    $this->cap_context
-                )
-            );
-        }
-        return $this->cap_check;
-    }
-
-
-    /**
-     * @param CapCheckInterface $cap_check
-     */
-    private function setCapCheck(CapCheckInterface $cap_check)
-    {
-        $this->cap_check = $cap_check;
-    }
-
-
-    /**
-     * @return bool
-     */
-    public function getPurge()
-    {
-        return $this->purge;
-    }
-
-
-    /**
-     * @param bool $purge
-     */
-    public function setPurge($purge)
-    {
-        $this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
-    }
-
-
-    /**
-     * given a valid PersistentAdminNotice Collection,
-     * this notice will be added if it is not already found in the collection (using its name as the identifier)
-     * if an existing notice is found that has already been dismissed,
-     * but we are overriding with a forced update, then we will toggle its dismissed state,
-     * so that the notice is displayed again
-     *
-     * @param Collection $persistent_admin_notice_collection
-     * @throws InvalidEntityException
-     * @throws InvalidDataTypeException
-     * @throws DuplicateCollectionIdentifierException
-     */
-    public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
-    {
-        if ($this->registered) {
-            return;
-        }
-        // first check if this notice has already been added to the collection
-        if ($persistent_admin_notice_collection->has($this->name)) {
-            /** @var PersistentAdminNotice $existing */
-            $existing = $persistent_admin_notice_collection->get($this->name);
-            // we don't need to add it again (we can't actually)
-            // but if it has already been dismissed, and we are overriding with a forced update
-            if ($existing->getDismissed() && $this->getForceUpdate()) {
-                // then toggle the notice's dismissed state to true
-                // so that it gets displayed again
-                $existing->setDismissed(false);
-                // and make sure the message is set
-                $existing->setMessage($this->message);
-            }
-        } else {
-            $persistent_admin_notice_collection->add($this, $this->name);
-        }
-        $this->registered = true;
-    }
-
-
-    /**
-     * @throws Exception
-     */
-    public function confirmRegistered()
-    {
-        if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
-            PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
-        }
-        if (! $this->registered && WP_DEBUG) {
-            throw new DomainException(
-                sprintf(
-                    esc_html__(
-                        'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
-                        'event_espresso'
-                    ),
-                    $this->name
-                )
-            );
-        }
-    }
+	/**
+	 * @var string $name
+	 */
+	protected $name = '';
+
+	/**
+	 * @var string $message
+	 */
+	protected $message = '';
+
+	/**
+	 * @var boolean $force_update
+	 */
+	protected $force_update = false;
+
+	/**
+	 * @var string $capability
+	 */
+	protected $capability = 'manage_options';
+
+	/**
+	 * @var string $cap_context
+	 */
+	protected $cap_context = 'view persistent admin notice';
+
+	/**
+	 * @var boolean $dismissed
+	 */
+	protected $dismissed = false;
+
+	/**
+	 * @var CapCheckInterface $cap_check
+	 */
+	protected $cap_check;
+
+	/**
+	 * if true, then this notice will be deleted from the database
+	 *
+	 * @var boolean $purge
+	 */
+	protected $purge = false;
+
+	/**
+	 * gets set to true if notice is successfully registered with the PersistentAdminNoticeManager
+	 * if false, and WP_DEBUG is on, then an exception will be thrown in the admin footer
+	 *
+	 * @var boolean $registered
+	 */
+	private $registered = false;
+
+
+	/**
+	 * PersistentAdminNotice constructor
+	 *
+	 * @param string $name         [required] the name, or key of the Persistent Admin Notice to be stored
+	 * @param string $message      [required] the message to be stored persistently until dismissed
+	 * @param bool   $force_update enforce the reappearance of a persistent message
+	 * @param string $capability   user capability required to view this notice
+	 * @param string $cap_context  description for why the cap check is being performed
+	 * @param bool   $dismissed    whether or not the user has already dismissed/viewed this notice
+	 * @throws InvalidDataTypeException
+	 */
+	public function __construct(
+		$name,
+		$message,
+		$force_update = false,
+		$capability = 'manage_options',
+		$cap_context = 'view persistent admin notice',
+		$dismissed = false
+	) {
+		$this->setName($name);
+		$this->setMessage($message);
+		$this->setForceUpdate($force_update);
+		$this->setCapability($capability);
+		$this->setCapContext($cap_context);
+		$this->setDismissed($dismissed);
+		add_action(
+			'AHEE__EventEspresso_core_services_notifications_PersistentAdminNoticeManager__registerNotices',
+			array($this, 'registerPersistentAdminNotice')
+		);
+		add_action('shutdown', array($this, 'confirmRegistered'), 999);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+
+	/**
+	 * @param string $name
+	 * @throws InvalidDataTypeException
+	 */
+	private function setName($name)
+	{
+		if (! is_string($name)) {
+			throw new InvalidDataTypeException('$name', $name, 'string');
+		}
+		$this->name = sanitize_key($name);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getMessage()
+	{
+		return $this->message;
+	}
+
+
+	/**
+	 * @param string $message
+	 * @throws InvalidDataTypeException
+	 */
+	private function setMessage($message)
+	{
+		if (! is_string($message)) {
+			throw new InvalidDataTypeException('$message', $message, 'string');
+		}
+		$allowedtags = AllowedTags::getAllowedTags();
+		$this->message = wp_kses($message, $allowedtags);
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getForceUpdate()
+	{
+		return $this->force_update;
+	}
+
+
+	/**
+	 * @param bool $force_update
+	 */
+	private function setForceUpdate($force_update)
+	{
+		$this->force_update = filter_var($force_update, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapability()
+	{
+		return $this->capability;
+	}
+
+
+	/**
+	 * @param string $capability
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapability($capability)
+	{
+		if (! is_string($capability)) {
+			throw new InvalidDataTypeException('$capability', $capability, 'string');
+		}
+		$this->capability = ! empty($capability) ? $capability : 'manage_options';
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function getCapContext()
+	{
+		return $this->cap_context;
+	}
+
+
+	/**
+	 * @param string $cap_context
+	 * @throws InvalidDataTypeException
+	 */
+	private function setCapContext($cap_context)
+	{
+		if (! is_string($cap_context)) {
+			throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
+		}
+		$this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getDismissed()
+	{
+		return $this->dismissed;
+	}
+
+
+	/**
+	 * @param bool $dismissed
+	 */
+	public function setDismissed($dismissed)
+	{
+		$this->dismissed = filter_var($dismissed, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * @return CapCheckInterface
+	 * @throws InvalidDataTypeException
+	 */
+	public function getCapCheck()
+	{
+		if (! $this->cap_check instanceof CapCheckInterface) {
+			$this->setCapCheck(
+				new CapCheck(
+					$this->capability,
+					$this->cap_context
+				)
+			);
+		}
+		return $this->cap_check;
+	}
+
+
+	/**
+	 * @param CapCheckInterface $cap_check
+	 */
+	private function setCapCheck(CapCheckInterface $cap_check)
+	{
+		$this->cap_check = $cap_check;
+	}
+
+
+	/**
+	 * @return bool
+	 */
+	public function getPurge()
+	{
+		return $this->purge;
+	}
+
+
+	/**
+	 * @param bool $purge
+	 */
+	public function setPurge($purge)
+	{
+		$this->purge = filter_var($purge, FILTER_VALIDATE_BOOLEAN);
+	}
+
+
+	/**
+	 * given a valid PersistentAdminNotice Collection,
+	 * this notice will be added if it is not already found in the collection (using its name as the identifier)
+	 * if an existing notice is found that has already been dismissed,
+	 * but we are overriding with a forced update, then we will toggle its dismissed state,
+	 * so that the notice is displayed again
+	 *
+	 * @param Collection $persistent_admin_notice_collection
+	 * @throws InvalidEntityException
+	 * @throws InvalidDataTypeException
+	 * @throws DuplicateCollectionIdentifierException
+	 */
+	public function registerPersistentAdminNotice(Collection $persistent_admin_notice_collection)
+	{
+		if ($this->registered) {
+			return;
+		}
+		// first check if this notice has already been added to the collection
+		if ($persistent_admin_notice_collection->has($this->name)) {
+			/** @var PersistentAdminNotice $existing */
+			$existing = $persistent_admin_notice_collection->get($this->name);
+			// we don't need to add it again (we can't actually)
+			// but if it has already been dismissed, and we are overriding with a forced update
+			if ($existing->getDismissed() && $this->getForceUpdate()) {
+				// then toggle the notice's dismissed state to true
+				// so that it gets displayed again
+				$existing->setDismissed(false);
+				// and make sure the message is set
+				$existing->setMessage($this->message);
+			}
+		} else {
+			$persistent_admin_notice_collection->add($this, $this->name);
+		}
+		$this->registered = true;
+	}
+
+
+	/**
+	 * @throws Exception
+	 */
+	public function confirmRegistered()
+	{
+		if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
+			PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
+		}
+		if (! $this->registered && WP_DEBUG) {
+			throw new DomainException(
+				sprintf(
+					esc_html__(
+						'The "%1$s" PersistentAdminNotice was not successfully registered. Please ensure that it is being created prior to either the "admin_notices" or "network_admin_notices" hooks being triggered.',
+						'event_espresso'
+					),
+					$this->name
+				)
+			);
+		}
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -125,7 +125,7 @@ 
      */
     private function setName($name)
     {
-        if (! is_string($name)) {
+        if ( ! is_string($name)) {
             throw new InvalidDataTypeException('$name', $name, 'string');
         }
         $this->name = sanitize_key($name);
@@ -147,7 +147,7 @@ 
      */
     private function setMessage($message)
     {
-        if (! is_string($message)) {
+        if ( ! is_string($message)) {
             throw new InvalidDataTypeException('$message', $message, 'string');
         }
         $allowedtags = AllowedTags::getAllowedTags();
@@ -188,7 +188,7 @@ 
      */
     private function setCapability($capability)
     {
-        if (! is_string($capability)) {
+        if ( ! is_string($capability)) {
             throw new InvalidDataTypeException('$capability', $capability, 'string');
         }
         $this->capability = ! empty($capability) ? $capability : 'manage_options';
@@ -210,7 +210,7 @@ 
      */
     private function setCapContext($cap_context)
     {
-        if (! is_string($cap_context)) {
+        if ( ! is_string($cap_context)) {
             throw new InvalidDataTypeException('$cap_context', $cap_context, 'string');
         }
         $this->cap_context = ! empty($cap_context) ? $cap_context : 'view persistent admin notice';
@@ -241,7 +241,7 @@ 
      */
     public function getCapCheck()
     {
-        if (! $this->cap_check instanceof CapCheckInterface) {
+        if ( ! $this->cap_check instanceof CapCheckInterface) {
             $this->setCapCheck(
                 new CapCheck(
                     $this->capability,
@@ -322,10 +322,10 @@ 
      */
     public function confirmRegistered()
     {
-        if (! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
+        if ( ! apply_filters('PersistentAdminNoticeManager__registerAndSaveNotices__complete', false)) {
             PersistentAdminNoticeManager::loadRegisterAndSaveNotices();
         }
-        if (! $this->registered && WP_DEBUG) {
+        if ( ! $this->registered && WP_DEBUG) {
             throw new DomainException(
                 sprintf(
                     esc_html__(

core/helpers/EEH_HTML.helper.php

Indentation +861 added lines, -861 removed lines

@@ -1,875 +1,875 @@
 <?php
 
  /**
- *
- * Class EEH_HTML
- *
+  *
+  * Class EEH_HTML
+  *
   * Sometimes when writing PHP you need to generate some standard HTML,
   * but either not enough to warrant creating a template file,
   * or the amount of PHP conditionals and/or loops peppered throughout the HTML
   * just make it really ugly and difficult to read.
   * This class simply adds a bunch of methods for generating basic HTML tags.
   * Most of the methods have the same name as the HTML tag they generate, and most have the same set of parameters.
- *
- * @package         Event Espresso
- * @subpackage    core
- * @author              Brent Christensen
- *
- *
- */
+  *
+  * @package         Event Espresso
+  * @subpackage    core
+  * @author              Brent Christensen
+  *
+  *
+  */
 class EEH_HTML
 {
 
-    /**
-     *  instance of the EEH_Autoloader object
-     *  @var    $_instance
-     *  @access     private
-     */
-    private static $_instance;
-
-    /**
-     *  @var array  $_indent
-     *  @access     private
-     */
-    private static $_indent = array();
-
-
-
-    /**
-     *  @singleton method used to instantiate class object
-     *  @access public
-     *  @return EEH_HTML
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated, and instantiated properly
-        if (! self::$_instance instanceof EEH_HTML) {
-            self::$_instance = new EEH_HTML();
-        }
-        return self::$_instance;
-    }
-
-
-
-    /**
-     *  class constructor
-     *
-     * @access    private
-     * @return \EEH_HTML
-     */
-    private function __construct()
-    {
-        // set some initial formatting for table indentation
-        EEH_HTML::$_indent = array(
-            'table'     => 0,
-            'thead' => 1,
-            'tbody' => 1,
-            'tr'    => 2,
-            'th'    => 3,
-            'td'    => 3,
-            'div'   => 0,
-            'h1'    => 0,
-            'h2'    => 0,
-            'h3'    => 0,
-            'h4'    => 0,
-            'h5'    => 0,
-            'h6'    => 0,
-            'p'     => 0,
-            'ul'    => 0,
-            'li'    => 1
-        );
-    }
-
-
-
-    /**
-     * Generates an opening HTML <XX> tag and adds any passed attributes
-     * if passed content, it will also add that, as well as the closing </XX> tag
-     *
-     * @access protected
-     * @param string $tag
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @param bool   $force_close
-     * @return string
-     */
-    protected static function _open_tag(
-        $tag = 'div',
-        $content = '',
-        $id = '',
-        $class = '',
-        $style = '',
-        $other_attributes = '',
-        $force_close = false
-    ) {
-        $attributes = ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
-        $attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
-        $attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
-        $attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
-        $html = EEH_HTML::nl(0, $tag) . '<' . $tag . $attributes . '>';
-        $html .= ! empty($content) ? EEH_HTML::nl(1, $tag) . $content : '';
-        $indent = ! empty($content) || $force_close ? true : false;
-        $html .= ! empty($content) || $force_close ? EEH_HTML::_close_tag($tag, $id, $class, $indent) : '';
-        return $html;
-    }
-
-
-
-    /**
-     * Generates HTML closing </XX> tag - if passed the id or class attribute
-     * used for the opening tag, will append a comment
-     *
+	/**
+	 *  instance of the EEH_Autoloader object
+	 *  @var    $_instance
+	 *  @access     private
+	 */
+	private static $_instance;
+
+	/**
+	 *  @var array  $_indent
+	 *  @access     private
+	 */
+	private static $_indent = array();
+
+
+
+	/**
+	 *  @singleton method used to instantiate class object
+	 *  @access public
+	 *  @return EEH_HTML
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated, and instantiated properly
+		if (! self::$_instance instanceof EEH_HTML) {
+			self::$_instance = new EEH_HTML();
+		}
+		return self::$_instance;
+	}
+
+
+
+	/**
+	 *  class constructor
+	 *
+	 * @access    private
+	 * @return \EEH_HTML
+	 */
+	private function __construct()
+	{
+		// set some initial formatting for table indentation
+		EEH_HTML::$_indent = array(
+			'table'     => 0,
+			'thead' => 1,
+			'tbody' => 1,
+			'tr'    => 2,
+			'th'    => 3,
+			'td'    => 3,
+			'div'   => 0,
+			'h1'    => 0,
+			'h2'    => 0,
+			'h3'    => 0,
+			'h4'    => 0,
+			'h5'    => 0,
+			'h6'    => 0,
+			'p'     => 0,
+			'ul'    => 0,
+			'li'    => 1
+		);
+	}
+
+
+
+	/**
+	 * Generates an opening HTML <XX> tag and adds any passed attributes
+	 * if passed content, it will also add that, as well as the closing </XX> tag
+	 *
+	 * @access protected
+	 * @param string $tag
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @param bool   $force_close
+	 * @return string
+	 */
+	protected static function _open_tag(
+		$tag = 'div',
+		$content = '',
+		$id = '',
+		$class = '',
+		$style = '',
+		$other_attributes = '',
+		$force_close = false
+	) {
+		$attributes = ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
+		$attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
+		$attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
+		$attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
+		$html = EEH_HTML::nl(0, $tag) . '<' . $tag . $attributes . '>';
+		$html .= ! empty($content) ? EEH_HTML::nl(1, $tag) . $content : '';
+		$indent = ! empty($content) || $force_close ? true : false;
+		$html .= ! empty($content) || $force_close ? EEH_HTML::_close_tag($tag, $id, $class, $indent) : '';
+		return $html;
+	}
+
+
+
+	/**
+	 * Generates HTML closing </XX> tag - if passed the id or class attribute
+	 * used for the opening tag, will append a comment
+	 *
 *@access protected
-     * @param string $tag
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param bool   $indent
-     * @return string
-     */
-    protected static function _close_tag($tag = 'div', $id = '', $class = '', $indent = true)
-    {
-        $comment = '';
-        if ($id) {
-            $comment = EEH_HTML::comment('close ' . $id) . EEH_HTML::nl(0, $tag);
-        } elseif ($class) {
-            $comment = EEH_HTML::comment('close ' . $class) . EEH_HTML::nl(0, $tag);
-        }
-        $html = $indent ? EEH_HTML::nl(-1, $tag) : '';
-        $html .= '</' . $tag . '>' . $comment;
-        return $html;
-    }
-
-
-
-    /**
-     *  div - generates HTML opening <div> tag and adds any passed attributes
-     *  to add an id use:       echo EEH_HTML::div( 'this is some content', 'footer' );
-     *  to add a class use:     echo EEH_HTML::div( 'this is some content', '', 'float_left' );
-     *  to add a both an id and a class use:    echo EEH_HTML::div( 'this is some content', 'footer', 'float_left' );
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function div($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('div', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * Generates HTML closing </div> tag - if passed the id or class attribute used for the opening div tag, will append a comment
-     * usage: echo EEH_HTML::divx();
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function divx($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('div', $id, $class);
-    }
-
-
-
-    /**
-     * Generates HTML <h1></h1> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::h1( 'This is a Heading' );
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function h1($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('h1', $content, $id, $class, $style, $other_attributes, true);
-    }
-
-
-
-    /**
-     * Generates HTML <h2></h2> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::h2( 'This is a Heading' );
-     *
-     * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id               - html id attribute
-     * @param string $class            - html class attribute
-     * @param string $style            - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function h2($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('h2', $content, $id, $class, $style, $other_attributes, true);
-    }
-
-
-
-    /**
-     * Generates HTML <h3></h3> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::h3( 'This is a Heading' );
-     *
-     * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id               - html id attribute
-     * @param string $class            - html class attribute
-     * @param string $style            - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function h3($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('h3', $content, $id, $class, $style, $other_attributes, true);
-    }
-
-
-
-    /**
-     * Generates HTML <h4></h4> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::h4( 'This is a Heading' );
-     *
-     * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id               - html id attribute
-     * @param string $class            - html class attribute
-     * @param string $style            - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function h4($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('h4', $content, $id, $class, $style, $other_attributes, true);
-    }
-
-
-
-    /**
-     * Generates HTML <h5></h5> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::h5( 'This is a Heading' );
-     *
-     * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id               - html id attribute
-     * @param string $class            - html class attribute
-     * @param string $style            - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function h5($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('h5', $content, $id, $class, $style, $other_attributes, true);
-    }
-
-
-
-    /**
-     * Generates HTML <h6></h6> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::h6( 'This is a Heading' );
-     *
-     * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id               - html id attribute
-     * @param string $class            - html class attribute
-     * @param string $style            - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function h6($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('h6', $content, $id, $class, $style, $other_attributes, true);
-    }
-
-
-
-    /**
-     * Generates HTML <p></p> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::p( 'this is a paragraph' );
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function p($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('p', $content, $id, $class, $style, $other_attributes, true);
-    }
-
-
-
-    /**
-     *  ul - generates HTML opening <ul> tag and adds any passed attributes
-     *  usage:      echo EEH_HTML::ul( 'my-list-id', 'my-list-class' );
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function ul($id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('ul', '', $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * Generates HTML closing </ul> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     * usage: echo EEH_HTML::ulx();
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function ulx($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('ul', $id, $class);
-    }
-
-
-
-    /**
-     * Generates HTML <li> tag, inserts content, and adds any passed attributes
-     * if passed content, it will also add that, as well as the closing </li> tag
-     * usage: echo EEH_HTML::li( 'this is a line item' );
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function li($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('li', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * Generates HTML closing </li> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     * usage: echo EEH_HTML::lix();
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function lix($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('li', $id, $class);
-    }
-
-
-
-    /**
-     *    table - generates an HTML <table> tag and adds any passed attributes
-     *    usage: echo EEH_HTML::table();
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function table($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('table', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * tablex - generates an HTML </table> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function tablex($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('table', $id, $class);
-    }
-
-
-
-    /**
-     *    thead - generates an HTML <thead> tag and adds any passed attributes
-     *    usage: echo EEH_HTML::thead();
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function thead($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('thead', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * theadx - generates an HTML </thead> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function theadx($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('thead', $id, $class);
-    }
-
-
-
-    /**
-     *    tbody - generates an HTML <tbody> tag and adds any passed attributes
-     *    usage: echo EEH_HTML::tbody();
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function tbody($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('tbody', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * tbodyx - generates an HTML </tbody> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function tbodyx($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('tbody', $id, $class);
-    }
-
-
-
-    /**
-     *    tr - generates an HTML <tr> tag and adds any passed attributes
-     *    usage: echo EEH_HTML::tr();
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function tr($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('tr', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * trx - generates an HTML </tr> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function trx($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('tr', $id, $class);
-    }
-
-
-
-    /**
-     *    th - generates an HTML <th> tag and adds any passed attributes
-     *    usage: echo EEH_HTML::th();
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function th($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('th', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * thx - generates an HTML </th> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function thx($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('th', $id, $class);
-    }
-
-
-
-    /**
-     *    td - generates an HTML <td> tag and adds any passed attributes
-     *    usage: echo EEH_HTML::td();
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function td($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_open_tag('td', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * tdx - generates an HTML </td> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
-     *
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @return string
-     */
-    public static function tdx($id = '', $class = '')
-    {
-        return EEH_HTML::_close_tag('td', $id, $class);
-    }
-
-
-
-    /**
-     * no_row - for generating a "hidden" table row, good for embedding tables within tables
-     * generates a new table row with one td cell that spans however many columns you set
-     * removes all styles from the tr and td
-     *
-     * @param string $content
-     * @param int    $colspan
-     * @return string
-     */
-    public static function no_row($content = '', $colspan = 2)
-    {
-        return EEH_HTML::tr(
-            EEH_HTML::td($content, '', '', 'padding:0; border:none;', 'colspan="' . $colspan . '"'),
-            '',
-            '',
-            'padding:0; border:none;'
-        );
-    }
-
-
-
-    /**
-     * Generates HTML <label></label> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::span( 'this is some inline text' );
-     *
-     * @access public
-     * @param string $href URL to link to
-     * @param string $link_text - the text that will become "hyperlinked"
-     * @param string $title - html title attribute
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function link($href = '', $link_text = '', $title = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        $link_text = ! empty($link_text) ? $link_text : $href;
-        $attributes = ! empty($href) ? ' href="' . $href . '"' : '';
-        $attributes .= ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
-        $attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
-        $attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
-        $attributes .= ! empty($title) ? ' title="' . esc_attr($title) . '"' : '';
-        $attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
-        return "<a{$attributes}>{$link_text}</a>";
-    }
-
-
-
-    /**
-     *    img - generates an HTML <img> tag and adds any passed attributes
-     *    usage: echo EEH_HTML::img();
-     *
-     * @param string $src - html src attribute ie: the path or URL to the image
-     * @param string $alt - html alt attribute
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function img($src = '', $alt = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        $attributes = ! empty($src) ? ' src="' . esc_url_raw($src) . '"' : '';
-        $attributes .= ! empty($alt) ? ' alt="' . esc_attr($alt) . '"' : '';
-        $attributes .= ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
-        $attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
-        $attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
-        $attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
-        return '<img' . $attributes  . '/>';
-    }
-
-
-
-    /**
-     * Generates HTML <label></label> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::span( 'this is some inline text' );
-     *
-     * @access protected
-     * @param string $tag
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    protected static function _inline_tag($tag = 'span', $content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        $attributes = ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
-        $attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
-        $attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
-        $attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
-        return '<' . $tag . ' ' . $attributes . '>'  . $content  . '</' . $tag . '>';
-    }
-
-
-
-    /**
-     * Generates HTML <label></label> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::span( 'this is some inline text' );
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function label($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_inline_tag('label', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * Generates HTML <span></span> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::span( 'this is some inline text' );
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function span($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_inline_tag('span', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * Generates HTML <span></span> tags, inserts content, and adds any passed attributes
-     * usage: echo EEH_HTML::span( 'this is some inline text' );
-     *
-     * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
-     * @param string $id - html id attribute
-     * @param string $class - html class attribute
-     * @param string $style - html style attribute for applying inline styles
-     * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
-     * @return string
-     */
-    public static function strong($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
-    {
-        return EEH_HTML::_inline_tag('strong', $content, $id, $class, $style, $other_attributes);
-    }
-
-
-
-    /**
-     * Generates an html <--  comment --> tag
-     *  usage: echo comment( 'this is a comment' );
-     *
-     * @param string $comment
-     * @return string
-     */
-    public static function comment($comment = '')
-    {
-        return ! empty($comment) ? EEH_HTML::nl() . '<!-- ' . $comment . ' -->' : '';
-    }
-
-
-
-    /**
-     * br - generates a line break
-     *
-     * @param int $nmbr - the number of line breaks to return
-     * @return string
-     */
-    public static function br($nmbr = 1)
-    {
-        return str_repeat('<br />', $nmbr);
-    }
-
-
-
-    /**
-     * nbsp - generates non-breaking space entities based on number supplied
-     *
-     * @param int $nmbr - the number of non-breaking spaces to return
-     * @return string
-     */
-    public static function nbsp($nmbr = 1)
-    {
-        return str_repeat('&nbsp;', $nmbr);
-    }
-
-
-
-    /**
-     * sanitize_id
-     *
-     * functionally does the same as the wp_core function sanitize_key except it does NOT use
-     * strtolower and allows capitals.
-     *
-     * @param string $id
-     * @return string
-     */
-    public static function sanitize_id($id = '')
-    {
-        $key = str_replace(' ', '-', trim($id));
-        return preg_replace('/[^a-zA-Z0-9_\-]/', '', $key);
-    }
-
-
-
-    /**
-     * return a newline and tabs ("nl" stands for "new line")
-     *
-     * @param int    $indent the number of tabs to ADD to the current indent (can be negative or zero)
-     * @param string $tag
-     * @return string - newline character plus # of indents passed (can be + or -)
-     */
-    public static function nl($indent = 0, $tag = 'none')
-    {
-        $html = "\n";
-        EEH_HTML::indent($indent, $tag);
-        for ($x = 0; $x < EEH_HTML::$_indent[ $tag ]; $x++) {
-            $html .= "\t";
-        }
-        return $html;
-    }
-
-
-
-    /**
-     * Changes the indents used in EEH_HTML::nl. Often its convenient to change
-     * the indentation level without actually creating a new line
-     *
-     * @param int    $indent can be negative to decrease the indentation level
-     * @param string $tag
-     */
-    public static function indent($indent, $tag = 'none')
-    {
-        static $default_indentation = false;
-        if (! $default_indentation) {
-            EEH_HTML::_set_default_indentation();
-            $default_indentation = true;
-        }
-        if (! isset(EEH_HTML::$_indent[ $tag ])) {
-            EEH_HTML::$_indent[ $tag ] = 0;
-        }
-        EEH_HTML::$_indent[ $tag ] += (int) $indent;
-        EEH_HTML::$_indent[ $tag ] = EEH_HTML::$_indent[ $tag ] >= 0 ? EEH_HTML::$_indent[ $tag ] : 0;
-    }
-
-
-    /**
-     *  class _set_default_indentation
-     *
-     * @access    private
-     */
-    private static function _set_default_indentation()
-    {
-        // set some initial formatting for table indentation
-        EEH_HTML::$_indent = array(
-            'none'  => 0,
-            'form'  => 0,
-            'radio'     => 0,
-            'checkbox'  => 0,
-            'select'    => 0,
-            'option' => 0,
-            'optgroup' => 0,
-            'table'     => 1,
-            'thead' => 2,
-            'tbody' => 2,
-            'tr'    => 3,
-            'th'    => 4,
-            'td'    => 4,
-            'div'   => 0,
-            'h1'    => 0,
-            'h2'    => 0,
-            'h3'    => 0,
-            'h4'    => 0,
-            'h5'    => 0,
-            'h6'    => 0,
-            'p'     => 0,
-            'ul'    => 0,
-            'li'    => 1
-        );
-    }
-
-
-
-    /**
-     * Retrieves the list of tags considered "simple", that are probably safe for
-     * use in inputs
-     * @global array $allowedtags
-     * @return array
-     */
-    public static function get_simple_tags()
-    {
-        global $allowedtags;
-        $tags_we_allow = array_merge_recursive(
-            $allowedtags,
-            [
-                'ol' => [],
-                'ul' => [],
-                'li' => [],
-                'br' => [],
-                'p' => [],
-                'a' => ['target']
-            ]
-        );
-        return apply_filters('FHEE__EEH_HTML__get_simple_tags', $tags_we_allow);
-    }
+	 * @param string $tag
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param bool   $indent
+	 * @return string
+	 */
+	protected static function _close_tag($tag = 'div', $id = '', $class = '', $indent = true)
+	{
+		$comment = '';
+		if ($id) {
+			$comment = EEH_HTML::comment('close ' . $id) . EEH_HTML::nl(0, $tag);
+		} elseif ($class) {
+			$comment = EEH_HTML::comment('close ' . $class) . EEH_HTML::nl(0, $tag);
+		}
+		$html = $indent ? EEH_HTML::nl(-1, $tag) : '';
+		$html .= '</' . $tag . '>' . $comment;
+		return $html;
+	}
+
+
+
+	/**
+	 *  div - generates HTML opening <div> tag and adds any passed attributes
+	 *  to add an id use:       echo EEH_HTML::div( 'this is some content', 'footer' );
+	 *  to add a class use:     echo EEH_HTML::div( 'this is some content', '', 'float_left' );
+	 *  to add a both an id and a class use:    echo EEH_HTML::div( 'this is some content', 'footer', 'float_left' );
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function div($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('div', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * Generates HTML closing </div> tag - if passed the id or class attribute used for the opening div tag, will append a comment
+	 * usage: echo EEH_HTML::divx();
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function divx($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('div', $id, $class);
+	}
+
+
+
+	/**
+	 * Generates HTML <h1></h1> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::h1( 'This is a Heading' );
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function h1($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('h1', $content, $id, $class, $style, $other_attributes, true);
+	}
+
+
+
+	/**
+	 * Generates HTML <h2></h2> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::h2( 'This is a Heading' );
+	 *
+	 * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id               - html id attribute
+	 * @param string $class            - html class attribute
+	 * @param string $style            - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function h2($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('h2', $content, $id, $class, $style, $other_attributes, true);
+	}
+
+
+
+	/**
+	 * Generates HTML <h3></h3> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::h3( 'This is a Heading' );
+	 *
+	 * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id               - html id attribute
+	 * @param string $class            - html class attribute
+	 * @param string $style            - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function h3($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('h3', $content, $id, $class, $style, $other_attributes, true);
+	}
+
+
+
+	/**
+	 * Generates HTML <h4></h4> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::h4( 'This is a Heading' );
+	 *
+	 * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id               - html id attribute
+	 * @param string $class            - html class attribute
+	 * @param string $style            - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function h4($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('h4', $content, $id, $class, $style, $other_attributes, true);
+	}
+
+
+
+	/**
+	 * Generates HTML <h5></h5> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::h5( 'This is a Heading' );
+	 *
+	 * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id               - html id attribute
+	 * @param string $class            - html class attribute
+	 * @param string $style            - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function h5($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('h5', $content, $id, $class, $style, $other_attributes, true);
+	}
+
+
+
+	/**
+	 * Generates HTML <h6></h6> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::h6( 'This is a Heading' );
+	 *
+	 * @param string $content          - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id               - html id attribute
+	 * @param string $class            - html class attribute
+	 * @param string $style            - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function h6($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('h6', $content, $id, $class, $style, $other_attributes, true);
+	}
+
+
+
+	/**
+	 * Generates HTML <p></p> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::p( 'this is a paragraph' );
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function p($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('p', $content, $id, $class, $style, $other_attributes, true);
+	}
+
+
+
+	/**
+	 *  ul - generates HTML opening <ul> tag and adds any passed attributes
+	 *  usage:      echo EEH_HTML::ul( 'my-list-id', 'my-list-class' );
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function ul($id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('ul', '', $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * Generates HTML closing </ul> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 * usage: echo EEH_HTML::ulx();
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function ulx($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('ul', $id, $class);
+	}
+
+
+
+	/**
+	 * Generates HTML <li> tag, inserts content, and adds any passed attributes
+	 * if passed content, it will also add that, as well as the closing </li> tag
+	 * usage: echo EEH_HTML::li( 'this is a line item' );
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function li($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('li', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * Generates HTML closing </li> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 * usage: echo EEH_HTML::lix();
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function lix($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('li', $id, $class);
+	}
+
+
+
+	/**
+	 *    table - generates an HTML <table> tag and adds any passed attributes
+	 *    usage: echo EEH_HTML::table();
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function table($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('table', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * tablex - generates an HTML </table> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function tablex($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('table', $id, $class);
+	}
+
+
+
+	/**
+	 *    thead - generates an HTML <thead> tag and adds any passed attributes
+	 *    usage: echo EEH_HTML::thead();
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function thead($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('thead', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * theadx - generates an HTML </thead> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function theadx($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('thead', $id, $class);
+	}
+
+
+
+	/**
+	 *    tbody - generates an HTML <tbody> tag and adds any passed attributes
+	 *    usage: echo EEH_HTML::tbody();
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function tbody($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('tbody', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * tbodyx - generates an HTML </tbody> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function tbodyx($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('tbody', $id, $class);
+	}
+
+
+
+	/**
+	 *    tr - generates an HTML <tr> tag and adds any passed attributes
+	 *    usage: echo EEH_HTML::tr();
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function tr($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('tr', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * trx - generates an HTML </tr> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function trx($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('tr', $id, $class);
+	}
+
+
+
+	/**
+	 *    th - generates an HTML <th> tag and adds any passed attributes
+	 *    usage: echo EEH_HTML::th();
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function th($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('th', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * thx - generates an HTML </th> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function thx($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('th', $id, $class);
+	}
+
+
+
+	/**
+	 *    td - generates an HTML <td> tag and adds any passed attributes
+	 *    usage: echo EEH_HTML::td();
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function td($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_open_tag('td', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * tdx - generates an HTML </td> tag - if passed the id or class attribute used for the opening ul tag, will append a comment
+	 *
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @return string
+	 */
+	public static function tdx($id = '', $class = '')
+	{
+		return EEH_HTML::_close_tag('td', $id, $class);
+	}
+
+
+
+	/**
+	 * no_row - for generating a "hidden" table row, good for embedding tables within tables
+	 * generates a new table row with one td cell that spans however many columns you set
+	 * removes all styles from the tr and td
+	 *
+	 * @param string $content
+	 * @param int    $colspan
+	 * @return string
+	 */
+	public static function no_row($content = '', $colspan = 2)
+	{
+		return EEH_HTML::tr(
+			EEH_HTML::td($content, '', '', 'padding:0; border:none;', 'colspan="' . $colspan . '"'),
+			'',
+			'',
+			'padding:0; border:none;'
+		);
+	}
+
+
+
+	/**
+	 * Generates HTML <label></label> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::span( 'this is some inline text' );
+	 *
+	 * @access public
+	 * @param string $href URL to link to
+	 * @param string $link_text - the text that will become "hyperlinked"
+	 * @param string $title - html title attribute
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function link($href = '', $link_text = '', $title = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		$link_text = ! empty($link_text) ? $link_text : $href;
+		$attributes = ! empty($href) ? ' href="' . $href . '"' : '';
+		$attributes .= ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
+		$attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
+		$attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
+		$attributes .= ! empty($title) ? ' title="' . esc_attr($title) . '"' : '';
+		$attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
+		return "<a{$attributes}>{$link_text}</a>";
+	}
+
+
+
+	/**
+	 *    img - generates an HTML <img> tag and adds any passed attributes
+	 *    usage: echo EEH_HTML::img();
+	 *
+	 * @param string $src - html src attribute ie: the path or URL to the image
+	 * @param string $alt - html alt attribute
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function img($src = '', $alt = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		$attributes = ! empty($src) ? ' src="' . esc_url_raw($src) . '"' : '';
+		$attributes .= ! empty($alt) ? ' alt="' . esc_attr($alt) . '"' : '';
+		$attributes .= ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
+		$attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
+		$attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
+		$attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
+		return '<img' . $attributes  . '/>';
+	}
+
+
+
+	/**
+	 * Generates HTML <label></label> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::span( 'this is some inline text' );
+	 *
+	 * @access protected
+	 * @param string $tag
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	protected static function _inline_tag($tag = 'span', $content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		$attributes = ! empty($id) ? ' id="' . EEH_HTML::sanitize_id($id) . '"' : '';
+		$attributes .= ! empty($class) ? ' class="' . $class . '"' : '';
+		$attributes .= ! empty($style) ? ' style="' . $style . '"' : '';
+		$attributes .= ! empty($other_attributes) ? ' ' . $other_attributes : '';
+		return '<' . $tag . ' ' . $attributes . '>'  . $content  . '</' . $tag . '>';
+	}
+
+
+
+	/**
+	 * Generates HTML <label></label> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::span( 'this is some inline text' );
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function label($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_inline_tag('label', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * Generates HTML <span></span> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::span( 'this is some inline text' );
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function span($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_inline_tag('span', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * Generates HTML <span></span> tags, inserts content, and adds any passed attributes
+	 * usage: echo EEH_HTML::span( 'this is some inline text' );
+	 *
+	 * @param string $content - inserted after opening tag, and appends closing tag, otherwise tag is left open
+	 * @param string $id - html id attribute
+	 * @param string $class - html class attribute
+	 * @param string $style - html style attribute for applying inline styles
+	 * @param string $other_attributes - additional attributes like "colspan", inline JS, "rel" tags, etc
+	 * @return string
+	 */
+	public static function strong($content = '', $id = '', $class = '', $style = '', $other_attributes = '')
+	{
+		return EEH_HTML::_inline_tag('strong', $content, $id, $class, $style, $other_attributes);
+	}
+
+
+
+	/**
+	 * Generates an html <--  comment --> tag
+	 *  usage: echo comment( 'this is a comment' );
+	 *
+	 * @param string $comment
+	 * @return string
+	 */
+	public static function comment($comment = '')
+	{
+		return ! empty($comment) ? EEH_HTML::nl() . '<!-- ' . $comment . ' -->' : '';
+	}
+
+
+
+	/**
+	 * br - generates a line break
+	 *
+	 * @param int $nmbr - the number of line breaks to return
+	 * @return string
+	 */
+	public static function br($nmbr = 1)
+	{
+		return str_repeat('<br />', $nmbr);
+	}
+
+
+
+	/**
+	 * nbsp - generates non-breaking space entities based on number supplied
+	 *
+	 * @param int $nmbr - the number of non-breaking spaces to return
+	 * @return string
+	 */
+	public static function nbsp($nmbr = 1)
+	{
+		return str_repeat('&nbsp;', $nmbr);
+	}
+
+
+
+	/**
+	 * sanitize_id
+	 *
+	 * functionally does the same as the wp_core function sanitize_key except it does NOT use
+	 * strtolower and allows capitals.
+	 *
+	 * @param string $id
+	 * @return string
+	 */
+	public static function sanitize_id($id = '')
+	{
+		$key = str_replace(' ', '-', trim($id));
+		return preg_replace('/[^a-zA-Z0-9_\-]/', '', $key);
+	}
+
+
+
+	/**
+	 * return a newline and tabs ("nl" stands for "new line")
+	 *
+	 * @param int    $indent the number of tabs to ADD to the current indent (can be negative or zero)
+	 * @param string $tag
+	 * @return string - newline character plus # of indents passed (can be + or -)
+	 */
+	public static function nl($indent = 0, $tag = 'none')
+	{
+		$html = "\n";
+		EEH_HTML::indent($indent, $tag);
+		for ($x = 0; $x < EEH_HTML::$_indent[ $tag ]; $x++) {
+			$html .= "\t";
+		}
+		return $html;
+	}
+
+
+
+	/**
+	 * Changes the indents used in EEH_HTML::nl. Often its convenient to change
+	 * the indentation level without actually creating a new line
+	 *
+	 * @param int    $indent can be negative to decrease the indentation level
+	 * @param string $tag
+	 */
+	public static function indent($indent, $tag = 'none')
+	{
+		static $default_indentation = false;
+		if (! $default_indentation) {
+			EEH_HTML::_set_default_indentation();
+			$default_indentation = true;
+		}
+		if (! isset(EEH_HTML::$_indent[ $tag ])) {
+			EEH_HTML::$_indent[ $tag ] = 0;
+		}
+		EEH_HTML::$_indent[ $tag ] += (int) $indent;
+		EEH_HTML::$_indent[ $tag ] = EEH_HTML::$_indent[ $tag ] >= 0 ? EEH_HTML::$_indent[ $tag ] : 0;
+	}
+
+
+	/**
+	 *  class _set_default_indentation
+	 *
+	 * @access    private
+	 */
+	private static function _set_default_indentation()
+	{
+		// set some initial formatting for table indentation
+		EEH_HTML::$_indent = array(
+			'none'  => 0,
+			'form'  => 0,
+			'radio'     => 0,
+			'checkbox'  => 0,
+			'select'    => 0,
+			'option' => 0,
+			'optgroup' => 0,
+			'table'     => 1,
+			'thead' => 2,
+			'tbody' => 2,
+			'tr'    => 3,
+			'th'    => 4,
+			'td'    => 4,
+			'div'   => 0,
+			'h1'    => 0,
+			'h2'    => 0,
+			'h3'    => 0,
+			'h4'    => 0,
+			'h5'    => 0,
+			'h6'    => 0,
+			'p'     => 0,
+			'ul'    => 0,
+			'li'    => 1
+		);
+	}
+
+
+
+	/**
+	 * Retrieves the list of tags considered "simple", that are probably safe for
+	 * use in inputs
+	 * @global array $allowedtags
+	 * @return array
+	 */
+	public static function get_simple_tags()
+	{
+		global $allowedtags;
+		$tags_we_allow = array_merge_recursive(
+			$allowedtags,
+			[
+				'ol' => [],
+				'ul' => [],
+				'li' => [],
+				'br' => [],
+				'p' => [],
+				'a' => ['target']
+			]
+		);
+		return apply_filters('FHEE__EEH_HTML__get_simple_tags', $tags_we_allow);
+	}
 }

core/helpers/EEH_Template.helper.php

Indentation +926 added lines, -926 removed lines

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

Spacing +58 added lines, -58 removed lines

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

payment_methods/Invoice/templates/invoice_payment_details_content.template.php

Spacing +3 added lines, -3 removed lines

@@ -16,12 +16,12 @@ 
 $allowedtags = AllowedTags::getAllowedTags();
 ?>
 <div class="event-display-boxes">
-    <?php if (! empty($page_title)) { ?>
+    <?php if ( ! empty($page_title)) { ?>
         <h4 id="invoice_title" class="payment_type_title section-heading">
             <?php echo esc_html($page_title); ?>
         </h4>
     <?php }
-    if (! empty($invoice_url)) { ?>
+    if ( ! empty($invoice_url)) { ?>
         <p>
             <a href="<?php echo esc_url_raw($invoice_url); ?>"
                class="ee-button-lnk inline-button ee-invoice-lnk"
@@ -36,7 +36,7 @@ 
                 <p class="instruct"><?php echo wpautop(wp_kses($page_confirmation_text, $allowedtags)); ?></p>
             </div>
         <?php }
-        if (! empty($page_extra_info)) { ?>
+        if ( ! empty($page_extra_info)) { ?>
             <div class="address-block">
                 <?php echo wpautop(wp_kses($page_extra_info, $allowedtags)); ?>
             </div>

shortcodes/espresso_thank_you/templates/thank-you-page-payment-details.template.php

Indentation +31 added lines, -31 removed lines

@@ -17,7 +17,7 @@ 
 
 <div id="espresso-thank-you-page-payment-details-dv">
     <?php
-    if (! empty($payments)) { ?>
+	if (! empty($payments)) { ?>
         <table class="ee-table">
             <thead>
             <tr>
@@ -37,39 +37,39 @@ 
             </thead>
             <tbody>
             <?php
-            foreach ($payments as $payment) {
-                echo wp_kses($payment, AllowedTags::getAllowedTags());
-            }
-            ?>
+			foreach ($payments as $payment) {
+				echo wp_kses($payment, AllowedTags::getAllowedTags());
+			}
+			?>
             </tbody>
         </table>
         <?php
-    } else {
-        if ($transaction->total()) {
-            echo apply_filters(
-                'FHEE__payment_overview_template__no_payments_made',
-                sprintf(
-                    esc_html__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
-                    '<p class="important-notice">',
-                    '</p>'
-                )
-            );
-            do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
-        } else {
-            echo apply_filters(
-                'FHEE__payment_overview_template__no_payment_required',
-                sprintf(
-                    esc_html__('%sNo payment is required for this transaction.%s', 'event_espresso'),
-                    '<p>',
-                    '</p>'
-                )
-            );
-            do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
-        }
-    }
-    echo wp_kses($gateway_content, AllowedTags::getAllowedTags());
-    do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
-    ?>
+	} else {
+		if ($transaction->total()) {
+			echo apply_filters(
+				'FHEE__payment_overview_template__no_payments_made',
+				sprintf(
+					esc_html__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
+					'<p class="important-notice">',
+					'</p>'
+				)
+			);
+			do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
+		} else {
+			echo apply_filters(
+				'FHEE__payment_overview_template__no_payment_required',
+				sprintf(
+					esc_html__('%sNo payment is required for this transaction.%s', 'event_espresso'),
+					'<p>',
+					'</p>'
+				)
+			);
+			do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
+		}
+	}
+	echo wp_kses($gateway_content, AllowedTags::getAllowedTags());
+	do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
+	?>
 
     <br/>
     <?php do_action('AHEE__thank_you_page_payment_details_template__after_payment_details'); ?>

shortcodes/espresso_thank_you/templates/thank-you-page-registration-details.template.php

Indentation +65 added lines, -65 removed lines

@@ -12,22 +12,22 @@ 
 
 <div class="ee-registration-details-dv">
     <?php
-    $registrations = $transaction->registrations();
-    $registrations = is_array($registrations) ? $registrations : [];
-    $reg_count     = count($registrations);
-    $reg_cntr      = 0;
-    $event_name    = '';
-    $wait_list     = false;
-    foreach ($registrations as $registration) {
-        if ($registration instanceof EE_Registration) {
-            if ($event_name != $registration->event_name() && ! empty($event_name)) { ?>
+	$registrations = $transaction->registrations();
+	$registrations = is_array($registrations) ? $registrations : [];
+	$reg_count     = count($registrations);
+	$reg_cntr      = 0;
+	$event_name    = '';
+	$wait_list     = false;
+	foreach ($registrations as $registration) {
+		if ($registration instanceof EE_Registration) {
+			if ($event_name != $registration->event_name() && ! empty($event_name)) { ?>
                 </tbody>
                 </table>
                 <?php
-            }
-            $reg_cntr++;
-            if ($event_name != $registration->event_name()) {
-                ?>
+			}
+			$reg_cntr++;
+			if ($event_name != $registration->event_name()) {
+				?>
                 <h5>
                     <span class="smaller-text grey-text">
                         <?php esc_html_e('for', 'event_espresso'); ?> :
@@ -50,25 +50,25 @@ 
                 </thead>
                 <tbody>
                 <?php
-            }
-            if ($is_primary || (! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
+			}
+			if ($is_primary || (! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
                 <tr>
                     <td width="40%">
                         <?php
-                        if ($registration->attendee() instanceof EE_Attendee) {
-                            echo esc_html($registration->attendee()->full_name(true));
-                        }
-                        ?>
+						if ($registration->attendee() instanceof EE_Attendee) {
+							echo esc_html($registration->attendee()->full_name(true));
+						}
+						?>
                         <p class="tiny-text" style="margin: .75em 0 0;">
                             <?php
-                            if ($registration->count_question_groups()) {
-                                ?>
+							if ($registration->count_question_groups()) {
+								?>
                                 <a class="ee-icon-only-lnk"
                                    href="<?php echo esc_url_raw($registration->edit_attendee_information_url()); ?>"
                                    title="<?php esc_attr_e(
-                                       'Click here to edit Attendee Information',
-                                       'event_espresso'
-                                   ); ?>"
+									   'Click here to edit Attendee Information',
+									   'event_espresso'
+								   ); ?>"
                                 >
                                     <span class="ee-icon ee-icon-user-edit"></span>
                                     <?php esc_html_e('edit info', 'event_espresso'); ?>
@@ -76,13 +76,13 @@ 
                             <?php } ?>
                             <a class="ee-resend-reg-confirmation-email ee-icon-only-lnk"
                                href="<?php echo add_query_arg(
-                                   ['token' => $registration->reg_url_link(), 'resend_reg_confirmation' => 'true'],
-                                   EE_Registry::instance()->CFG->core->thank_you_page_url()
-                               ); ?>"
+								   ['token' => $registration->reg_url_link(), 'resend_reg_confirmation' => 'true'],
+								   EE_Registry::instance()->CFG->core->thank_you_page_url()
+							   ); ?>"
                                title="<?php esc_attr_e(
-                                   'Click here to resend the Registration Confirmation email',
-                                   'event_espresso'
-                               ); ?>"
+								   'Click here to resend the Registration Confirmation email',
+								   'event_espresso'
+							   ); ?>"
                                rel="<?php echo esc_attr($registration->reg_url_link()); ?>"
                             >
                                 <span class="dashicons dashicons-email-alt"></span>
@@ -96,55 +96,55 @@ 
                     <td width="35%" class="jst-left">
                         <?php $registration->e_pretty_status(true) ?>
                         <?php
-                        if ($registration->status_ID() === EEM_Registration::status_id_wait_list) {
-                            $wait_list = true;
-                        }
-                        ?>
+						if ($registration->status_ID() === EEM_Registration::status_id_wait_list) {
+							$wait_list = true;
+						}
+						?>
                     </td>
                 </tr>
                 <?php
-                do_action(
-                    'AHEE__thank_you_page_registration_details_template__after_registration_table_row',
-                    $registration
-                );
-                $event_name = $registration->event_name();
-            }
-            if ($reg_cntr >= $reg_count) {
-                ?>
+				do_action(
+					'AHEE__thank_you_page_registration_details_template__after_registration_table_row',
+					$registration
+				);
+				$event_name = $registration->event_name();
+			}
+			if ($reg_cntr >= $reg_count) {
+				?>
                 </tbody>
                 </table>
                 <?php
-            }
-        }
-    }
-    ?>
+			}
+		}
+	}
+	?>
     <?php if ($is_primary && $SPCO_attendee_information_url) { ?>
         <p class="small-text jst-rght">
             <a href='<?php echo esc_url_raw($SPCO_attendee_information_url) ?>'>
                 <?php esc_html_e(
-                    "Click here to edit All Attendee Information",
-                    'event_espresso'
-                ); ?>
+					"Click here to edit All Attendee Information",
+					'event_espresso'
+				); ?>
             </a>
         </p>
     <?php }
-    if ($wait_list) {
-        echo apply_filters(
-            'AFEE__thank_you_page_registration_details_template__wait_list_notice',
-            sprintf(
-                esc_html__(
-                    '%1$sre: Wait List Registrations%2$sPlease note that the total cost listed below in the Transaction Details is for ALL registrations, including those that are on the wait list, even though they can not be currently paid for. If any spaces become available however, you may be notified by the Event admin and have the opportunity to secure the remaining tickets by making a payment for them.%3$s',
-                    'event_espresso'
-                ),
-                '<h6 class="" style="margin-bottom:.25em;"><span class="dashicons dashicons-clipboard ee-icon-size-16 purple-text"></span>',
-                '</h6 ><p class="ee-wait-list-notice">',
-                '</p ><br />'
-            )
-        );
-    }
+	if ($wait_list) {
+		echo apply_filters(
+			'AFEE__thank_you_page_registration_details_template__wait_list_notice',
+			sprintf(
+				esc_html__(
+					'%1$sre: Wait List Registrations%2$sPlease note that the total cost listed below in the Transaction Details is for ALL registrations, including those that are on the wait list, even though they can not be currently paid for. If any spaces become available however, you may be notified by the Event admin and have the opportunity to secure the remaining tickets by making a payment for them.%3$s',
+					'event_espresso'
+				),
+				'<h6 class="" style="margin-bottom:.25em;"><span class="dashicons dashicons-clipboard ee-icon-size-16 purple-text"></span>',
+				'</h6 ><p class="ee-wait-list-notice">',
+				'</p ><br />'
+			)
+		);
+	}
 
-    do_action('AHEE__thank_you_page_registration_details_template__after_registration_details');
-    ?>
+	do_action('AHEE__thank_you_page_registration_details_template__after_registration_details');
+	?>
 
 </div>
 <!-- end of .registration-details -->