eventespresso / event-espresso-core

public/Espresso_Arabica_2014/content-espresso_venues-thumbnail.php

Spacing +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@ 
 
 global $post;
 
-do_action( 'AHEE__content_espresso_venues_template__before_featured_img', $post );
+do_action('AHEE__content_espresso_venues_template__before_featured_img', $post);
 
-if ( has_post_thumbnail( $post->ID )) :
-	if ( $img_ID = get_post_thumbnail_id( $post->ID )) :
-		if ( $featured_img = wp_get_attachment_image_src( $img_ID, 'large' )) :
-			$caption = get_post( get_post( $img_ID ))->post_excerpt;
+if (has_post_thumbnail($post->ID)) :
+	if ($img_ID = get_post_thumbnail_id($post->ID)) :
+		if ($featured_img = wp_get_attachment_image_src($img_ID, 'large')) :
+			$caption = get_post(get_post($img_ID))->post_excerpt;
 			$wrap_class .= ' has-img';
 			?>
 <div id="ee-venue-img-dv-<?php echo esc_attr($post->ID); ?>" class="ee-venue-img-dv">
@@ -26,5 +26,5 @@ 
 	endif;
 endif;
 ?>		
-<?php do_action( 'AHEE__content_espresso_venues_template__after_featured_img', $post );?>
+<?php do_action('AHEE__content_espresso_venues_template__after_featured_img', $post); ?>
 <!-- .venue-content -->

public/Espresso_Arabica_2014/content-espresso_events-details.php

Indentation +11 added lines, -11 removed lines

@@ -13,20 +13,20 @@
 	    <?php if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) : ?>
 	    <span class="comments-link">
         <?php comments_popup_link(
-            esc_html__( 'Leave a comment', 'event_espresso' ),
-            esc_html__( '1 Comment', 'event_espresso' ),
-            esc_html__( '% Comments', 'event_espresso' )
-        ); ?>
+			esc_html__( 'Leave a comment', 'event_espresso' ),
+			esc_html__( '1 Comment', 'event_espresso' ),
+			esc_html__( '% Comments', 'event_espresso' )
+		); ?>
         </span>
 
         <?php
-            endif;
-            edit_post_link(
-                esc_html__( 'Edit', 'event_espresso' ),
-                '<span class="edit-link">',
-                '</span>'
-            );
-        ?>
+			endif;
+			edit_post_link(
+				esc_html__( 'Edit', 'event_espresso' ),
+				'<span class="edit-link">',
+				'</span>'
+			);
+		?>
 	</div>
 
 <?php endif;

Spacing +15 added lines, -15 removed lines

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

public/Espresso_Arabica_2014/content-espresso_venues-location.php

Spacing +4 added lines, -4 removed lines

@@ -1,16 +1,16 @@
 <?php //echo '<h1>' . __FILE__ . '</h1>'; 
 global $post; 
-if ( espresso_venue_has_address( $post->ID )) :
+if (espresso_venue_has_address($post->ID)) :
 ?>
 <div class="venue-location">
 	
 	<h3 class="venue-address-h3 ee-venue-h3">
-		<span class="dashicons dashicons-location-alt"></span><?php esc_html_e( 'Location', 'event_espresso' ); ?>
+		<span class="dashicons dashicons-location-alt"></span><?php esc_html_e('Location', 'event_espresso'); ?>
 	</h3>
-	<span class="small-text"><strong><?php esc_html_e( 'Address:', 'event_espresso' ); ?></strong></span><?php espresso_venue_address( 'inline', $post->ID ); ?>
+	<span class="small-text"><strong><?php esc_html_e('Address:', 'event_espresso'); ?></strong></span><?php espresso_venue_address('inline', $post->ID); ?>
 	<div class="clear"></div>
 
-	<div class="venue-gmap"><?php espresso_venue_gmap( $post->ID ); ?></div>
+	<div class="venue-gmap"><?php espresso_venue_gmap($post->ID); ?></div>
 	<div class="clear"></div>
 	
 </div>

public/Espresso_Arabica_2014/content-espresso_events-venues.php

Braces +10 added lines, -4 removed lines

@@ -51,8 +51,11 @@ 
 		<?php echo do_shortcode( $venue_description ); ?>
 	</p>
 		<?php endif;  ?>
-	<?php else : ?>
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
+	<?php else {
+	: ?>
+		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE );
+}
+?>
 		<?php if ( $venue_excerpt ) : ?>
 	<p>
 		<strong><?php esc_html_e( 'Description:', 'event_espresso' ); ?></strong><br/>
@@ -64,12 +67,15 @@ 
 <!-- .espresso-venue-dv -->
 <?php
 do_action( 'AHEE_event_details_after_venue_details', $post );
-else :
+else {
+	:
 	if ( espresso_venue_is_password_protected() ) :
 ?>
 	<div class="espresso-venue-dv  espresso-password-protected-venue-dv" >
 		<h3 class="event-venues-h3 ee-event-h3">
-			<?php esc_html_e( 'Location', 'event_espresso' );?>
+			<?php esc_html_e( 'Location', 'event_espresso' );
+}
+?>
 		</h3>
 		<?php echo espresso_password_protected_venue_form(); ?>
 	</div>

Spacing +32 added lines, -32 removed lines

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

public/Espresso_Arabica_2014/content-espresso_events-header.php

Spacing +2 added lines, -2 removed lines

@@ -7,10 +7,10 @@
 	<?php echo "<{$tag}  id=\"event-details-{$tag}-{$post->ID}\" class=\"entry-title\">"; ?>
 		<a class="ee-event-header-lnk"
            href="<?php the_permalink(); ?>"
-           <?php echo \EED_Events_Archive::link_target();?>
+           <?php echo \EED_Events_Archive::link_target(); ?>
         >
             <?php the_title(); ?>
         </a>
 	<?php echo "</{$tag}>"; ?>
-	<?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?>
+	<?php if ( ! is_archive() && has_excerpt($post->ID)): the_excerpt(); endif; ?>
 </header>

ui/blocks/event-attendees.php

Indentation +20 added lines, -20 removed lines

@@ -13,25 +13,25 @@ 
 <div id="ee-block-event-attendees" class="ee-core-blocks event-espresso-blocks event-attendees">
     <ul>
         <?php
-        foreach ($attendees as $attendee) {
-            $attendee_name = esc_html($attendee->full_name());
+		foreach ($attendees as $attendee) {
+			$attendee_name = esc_html($attendee->full_name());
 
-            $gravatar = $attributes['showGravatar']
-                ? get_avatar_url(
-                    $attendee->email(),
-                    array(
-                        'width'   => $attributes['avatarSize'],
-                        'height'  => $attributes['avatarSize']
-                    )
-                )
-                : '';
+			$gravatar = $attributes['showGravatar']
+				? get_avatar_url(
+					$attendee->email(),
+					array(
+						'width'   => $attributes['avatarSize'],
+						'height'  => $attributes['avatarSize']
+					)
+				)
+				: '';
 
-            $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
-                : 'contact-avatar-img avatar';
+			$gravatar_class = $attributes['avatarClass']
+				? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+				: 'contact-avatar-img avatar';
 
-            $gravatar = $gravatar !== ''
-                ? '
+			$gravatar = $gravatar !== ''
+				? '
                 <div class="contact-image-wrap-div">
                     <img class="' . esc_attr($gravatar_class) . '"
                          width="' . esc_attr($attributes['avatarSize']) . '"
@@ -40,13 +40,13 @@ 
                          alt="contact avatar"
                      >
                  </div>'
-                : '';
+				: '';
 
-            echo "
+			echo "
             <li>
                 {$gravatar}<span>{$attendee_name}</span>
             </li>";
-        }
-        ?>
+		}
+		?>
     </ul>
 </div>

Spacing +5 added lines, -5 removed lines

@@ -27,16 +27,16 @@
                 : '';
 
             $gravatar_class = $attributes['avatarClass']
-                ? $attributes['avatarClass'] . ' contact-avatar-img avatar'
+                ? $attributes['avatarClass'].' contact-avatar-img avatar'
                 : 'contact-avatar-img avatar';
 
             $gravatar = $gravatar !== ''
                 ? '
                 <div class="contact-image-wrap-div">
-                    <img class="' . esc_attr($gravatar_class) . '"
-                         width="' . esc_attr($attributes['avatarSize']) . '"
-                         height="' . esc_attr($attributes['avatarSize']) . '"
-                         src="' . esc_url_raw($gravatar) . '" 
+                    <img class="' . esc_attr($gravatar_class).'"
+                         width="' . esc_attr($attributes['avatarSize']).'"
+                         height="' . esc_attr($attributes['avatarSize']).'"
+                         src="' . esc_url_raw($gravatar).'" 
                          alt="contact avatar"
                      >
                  </div>'

core/templates/espresso-ajax-notices.template.php

Indentation +3 added lines, -3 removed lines

@@ -1,9 +1,9 @@
 <div id="espresso-ajax-loading" style="display:none;">
     <span class="ee-spinner ee-spin"></span><span style="display:none;">
         <?php esc_html_e(
-            'loading...',
-            'event_espresso'
-        ); ?></span>
+			'loading...',
+			'event_espresso'
+		); ?></span>
 </div>
 
 <div id="espresso-ajax-notices">

core/helpers/EEH_Tabbed_Content.helper.php

Spacing +11 added lines, -11 removed lines

@@ -30,7 +30,7 @@ 
     {
 
         // first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-        if (! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
+        if ( ! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
             throw new EE_Error(
                 esc_html__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso')
             );
@@ -49,9 +49,9 @@ 
 
         $index = 0;
         foreach ($tabs as $tab) {
-            $active            = $index === 0;
+            $active = $index === 0;
             $tabs_html         .= self::tab($tab, $active);
-            $tabs_content_html .= self::tab_content($tab, $tabs_content[ $tab ], $active);
+            $tabs_content_html .= self::tab_content($tab, $tabs_content[$tab], $active);
             $index++;
         }
 
@@ -118,9 +118,9 @@ 
     {
         $nice_name = $nice_name ?: esc_html(ucwords(str_replace(['_', '-'], ' ', $name)));
         $name      = self::generateTadID($name);
-        $class     = $css ? ' ' . esc_attr($css) : '';
-        $class     .= $active ? ' nav-tab-active' : '';
-        $url       = $url ?: '#' . esc_attr($name);
+        $class     = $css ? ' '.esc_attr($css) : '';
+        $class .= $active ? ' nav-tab-active' : '';
+        $url       = $url ?: '#'.esc_attr($name);
         return "
         <a class='nav-tab{$class}' rel='{$name}' href='{$url}'>
             $nice_name
@@ -136,7 +136,7 @@ 
      */
     private static function generateTadID($tab_name)
     {
-        return 'ee-tab-' . esc_attr(str_replace(' ', '-', $tab_name));
+        return 'ee-tab-'.esc_attr(str_replace(' ', '-', $tab_name));
     }
 
 
@@ -187,18 +187,18 @@ 
     public static function tab_text_links(array $item_array, $container_class = '', $sep = '|', $default = '')
     {
         $item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
-        if (! is_array($item_array) || empty($item_array)) {
+        if ( ! is_array($item_array) || empty($item_array)) {
             return false; // get out we don't have even the basic thing we need!
         }
 
-        $defaults        = [
+        $defaults = [
             'label' => esc_html__('Item', 'event_espresso'),
             'class' => '',
             'href'  => '',
             'title' => esc_attr__('Link for Item', 'event_espresso'),
             'slug'  => 'item_slug',
         ];
-        $container_class = ! empty($container_class) ? ' ' . esc_attr($container_class) : '';
+        $container_class = ! empty($container_class) ? ' '.esc_attr($container_class) : '';
         $list            = '';
         $list_length     = count($item_array);
         // if we're' adding separators, set $current to 1, otherwise set it to list length + 1
@@ -206,7 +206,7 @@ 
         // (if we aren't adding separators $current will always be > list length cuz it started at list length + 1)
         $current = empty($sep) ? $list_length + 1 : 1;
         foreach ($item_array as $item) {
-            $item          = wp_parse_args($item, $defaults);
+            $item = wp_parse_args($item, $defaults);
             $item['class'] .= $default === $item['slug'] ? ' item_display' : '';
             $list          .= self::textLinkItem($item);
             $list          .= $current < $list_length ? self::textLinkSeparator($sep) : '';

Indentation +189 added lines, -189 removed lines

@@ -13,246 +13,246 @@
  */
 class EEH_Tabbed_Content
 {
-    /**
-     * assembles and returns the html structure for tabs
-     *
-     * @static
-     * @param array $tabs_contents an array of the content for each tab [required]
-     * @param array $tabs_names    a numerically indexed array of names for each tab [optional]
-     *                             - if this isn't included then we use the indexes for $tabs_content as the tab names)
-     * @param bool  $small_tabs
-     * @param bool  $tabs_content
-     * @return string the assembled html string containing the tabbed content for display.
-     * @throws EE_Error
-     */
-    public static function display($tabs_contents, $tabs_names = [], $small_tabs = true, $tabs_content = true)
-    {
+	/**
+	 * assembles and returns the html structure for tabs
+	 *
+	 * @static
+	 * @param array $tabs_contents an array of the content for each tab [required]
+	 * @param array $tabs_names    a numerically indexed array of names for each tab [optional]
+	 *                             - if this isn't included then we use the indexes for $tabs_content as the tab names)
+	 * @param bool  $small_tabs
+	 * @param bool  $tabs_content
+	 * @return string the assembled html string containing the tabbed content for display.
+	 * @throws EE_Error
+	 */
+	public static function display($tabs_contents, $tabs_names = [], $small_tabs = true, $tabs_content = true)
+	{
 
-        // first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
-        if (! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
-            throw new EE_Error(
-                esc_html__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso')
-            );
-        }
+		// first check if $tabs_names is not empty then the count must match the count of $tabs_content otherwise we've got a problem houston
+		if (! empty($tabs_names) && (count((array) $tabs_names) != count((array) $tabs_content))) {
+			throw new EE_Error(
+				esc_html__('The count for $tabs_names and $tabs_content does not match.', 'event_espresso')
+			);
+		}
 
-        // make sure we've got incoming data setup properly
-        $tabs         = ! empty($tabs_names)
-            ? (array) $tabs_names
-            : array_keys((array) $tabs_contents);
-        $tabs_content = ! empty($tabs_names)
-            ? array_combine((array) $tabs_names, (array) $tabs_content)
-            : $tabs_contents;
+		// make sure we've got incoming data setup properly
+		$tabs         = ! empty($tabs_names)
+			? (array) $tabs_names
+			: array_keys((array) $tabs_contents);
+		$tabs_content = ! empty($tabs_names)
+			? array_combine((array) $tabs_names, (array) $tabs_content)
+			: $tabs_contents;
 
-        $tabs_html         = '';
-        $tabs_content_html = '';
+		$tabs_html         = '';
+		$tabs_content_html = '';
 
-        $index = 0;
-        foreach ($tabs as $tab) {
-            $active            = $index === 0;
-            $tabs_html         .= self::tab($tab, $active);
-            $tabs_content_html .= self::tab_content($tab, $tabs_content[ $tab ], $active);
-            $index++;
-        }
+		$index = 0;
+		foreach ($tabs as $tab) {
+			$active            = $index === 0;
+			$tabs_html         .= self::tab($tab, $active);
+			$tabs_content_html .= self::tab_content($tab, $tabs_content[ $tab ], $active);
+			$index++;
+		}
 
-        $tabs_class = $small_tabs ? ' ee-nav-tabs-small' : '';
+		$tabs_class = $small_tabs ? ' ee-nav-tabs-small' : '';
 
-        return "
+		return "
     <div class='ee-nav-tabs{$tabs_class}'>
         <h2 class='nav-tab-wrapper'>{$tabs_html}</h2>
         {$tabs_content_html}
     </div>
     ";
-    }
+	}
 
 
-    /**
-     * display_admin_nav_tabs
-     * this returns the properly formatted tab html for EE_Admin_Pages.
-     * We are expecting an array of tabs in the following format
-     * array(
-     *    'nav_tab_name' => array(
-     *        'url' => 'url for tab',
-     *        'link_text' => 'tab text',
-     *        'css_class' => 'tab class' //including the nav-tab-active class if its active
-     *    )
-     * )
-     *
-     * @access public
-     * @static
-     * @param string[][] $nav_tabs tab array for nav tabs
-     * @return string
-     * @throws EE_Error
-     */
-    public static function display_admin_nav_tabs($nav_tabs = [])
-    {
-        if (empty($nav_tabs)) {
-            throw new EE_Error(
-                esc_html__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso')
-            );
-        }
-        $tab_content = '';
-        foreach ($nav_tabs as $slug => $tab) {
-            $tab_content .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
-        }
-        $aria_label = esc_attr__('Secondary menu', 'event_espresso');
-        return "
+	/**
+	 * display_admin_nav_tabs
+	 * this returns the properly formatted tab html for EE_Admin_Pages.
+	 * We are expecting an array of tabs in the following format
+	 * array(
+	 *    'nav_tab_name' => array(
+	 *        'url' => 'url for tab',
+	 *        'link_text' => 'tab text',
+	 *        'css_class' => 'tab class' //including the nav-tab-active class if its active
+	 *    )
+	 * )
+	 *
+	 * @access public
+	 * @static
+	 * @param string[][] $nav_tabs tab array for nav tabs
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public static function display_admin_nav_tabs($nav_tabs = [])
+	{
+		if (empty($nav_tabs)) {
+			throw new EE_Error(
+				esc_html__('Nav Tabs cannot be generated because the tab array is missing', 'event_espresso')
+			);
+		}
+		$tab_content = '';
+		foreach ($nav_tabs as $slug => $tab) {
+			$tab_content .= self::tab($slug, false, $tab['link_text'], $tab['url'], $tab['css_class']);
+		}
+		$aria_label = esc_attr__('Secondary menu', 'event_espresso');
+		return "
         <nav class='nav-tab-wrapper wp-clearfix' aria-label='{$aria_label}'>
             {$tab_content}
         </nav>
         ";
-    }
+	}
 
 
-    /**
-     * this simply returns a single tab given a tab name & content
-     *
-     * @param string      $name      name of tab
-     * @param bool        $active    true=tab active, false=tab not active
-     * @param bool|string $nice_name if string given then this value will be used for the tab link text.
-     * @param bool|string $url       If url given then tabs will be generated linking to the url.
-     * @param bool|string $css       If string given then the generated tab will include that as the class.
-     * @return string          html for tab
-     */
-    private static function tab($name, $active = false, $nice_name = false, $url = false, $css = false)
-    {
-        $nice_name = $nice_name ?: esc_html(ucwords(str_replace(['_', '-'], ' ', $name)));
-        $name      = self::generateTadID($name);
-        $class     = $css ? ' ' . esc_attr($css) : '';
-        $class     .= $active ? ' nav-tab-active' : '';
-        $url       = $url ?: '#' . esc_attr($name);
-        return "
+	/**
+	 * this simply returns a single tab given a tab name & content
+	 *
+	 * @param string      $name      name of tab
+	 * @param bool        $active    true=tab active, false=tab not active
+	 * @param bool|string $nice_name if string given then this value will be used for the tab link text.
+	 * @param bool|string $url       If url given then tabs will be generated linking to the url.
+	 * @param bool|string $css       If string given then the generated tab will include that as the class.
+	 * @return string          html for tab
+	 */
+	private static function tab($name, $active = false, $nice_name = false, $url = false, $css = false)
+	{
+		$nice_name = $nice_name ?: esc_html(ucwords(str_replace(['_', '-'], ' ', $name)));
+		$name      = self::generateTadID($name);
+		$class     = $css ? ' ' . esc_attr($css) : '';
+		$class     .= $active ? ' nav-tab-active' : '';
+		$url       = $url ?: '#' . esc_attr($name);
+		return "
         <a class='nav-tab{$class}' rel='{$name}' href='{$url}'>
             $nice_name
         </a>
         ";
-    }
+	}
 
 
-    /**
-     * @param string $tab_name
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function generateTadID($tab_name)
-    {
-        return 'ee-tab-' . esc_attr(str_replace(' ', '-', $tab_name));
-    }
+	/**
+	 * @param string $tab_name
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function generateTadID($tab_name)
+	{
+		return 'ee-tab-' . esc_attr(str_replace(' ', '-', $tab_name));
+	}
 
 
-    /**
-     * this just returns the properly formatted tab content for our tab box.
-     *
-     * @param string $name        name of tab (used for selector)
-     * @param string $tab_content content of tab
-     * @param bool   $active
-     * @return string html for content area
-     */
-    private static function tab_content($name, $tab_content, $active = false)
-    {
-        $class = $active ? '' : ' hidden';
-        $name  = self::generateTadID($name);
-        return "
+	/**
+	 * this just returns the properly formatted tab content for our tab box.
+	 *
+	 * @param string $name        name of tab (used for selector)
+	 * @param string $tab_content content of tab
+	 * @param bool   $active
+	 * @return string html for content area
+	 */
+	private static function tab_content($name, $tab_content, $active = false)
+	{
+		$class = $active ? '' : ' hidden';
+		$name  = self::generateTadID($name);
+		return "
     <div class='nav-tab-content{$class}' id='{$name}'>
         {$tab_content}
         <div style='clear:both'></div>
     </div>";
-    }
+	}
 
 
 
-    /** HORIZONTAL TEXT LINKS **/
+	/** HORIZONTAL TEXT LINKS **/
 
-    /**
-     * This will take in an array of link items and spit out a formatted list of links that can be used to navigate to
-     * items. There is a corresponding js file that can be loaded to dynamically display containers with the same id as
-     * the href -ref.
-     *
-     * @param string[] $item_array      formatted array of items.  Format:
-     *                                  array(
-     *                                  'label' => esc_html__('localized label displayed'),
-     *                                  'class' => 'class_for_item',
-     *                                  'href' => '#some_item_id', //url/bookmark for item.  If you include a bookmark
-     *                                  the js will used this to show the container div.
-     *                                  'title' => esc_html__('localized text for the title attribute of the link'),
-     *                                  'slug' => 'slug_used_for_reference'
-     *                                  )
-     * @param string   $container_class class used for main container
-     * @param string   $sep             you can add in what is used as a separator between each link (or leave blank for
-     *                                  none)
-     * @param string   $default         You can include a string for the item that will receive the "item_display" class
-     *                                  for the js.
-     * @return string                  a html snippet of of all the formatted link elements.
-     */
-    public static function tab_text_links(array $item_array, $container_class = '', $sep = '|', $default = '')
-    {
-        $item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
-        if (! is_array($item_array) || empty($item_array)) {
-            return false; // get out we don't have even the basic thing we need!
-        }
+	/**
+	 * This will take in an array of link items and spit out a formatted list of links that can be used to navigate to
+	 * items. There is a corresponding js file that can be loaded to dynamically display containers with the same id as
+	 * the href -ref.
+	 *
+	 * @param string[] $item_array      formatted array of items.  Format:
+	 *                                  array(
+	 *                                  'label' => esc_html__('localized label displayed'),
+	 *                                  'class' => 'class_for_item',
+	 *                                  'href' => '#some_item_id', //url/bookmark for item.  If you include a bookmark
+	 *                                  the js will used this to show the container div.
+	 *                                  'title' => esc_html__('localized text for the title attribute of the link'),
+	 *                                  'slug' => 'slug_used_for_reference'
+	 *                                  )
+	 * @param string   $container_class class used for main container
+	 * @param string   $sep             you can add in what is used as a separator between each link (or leave blank for
+	 *                                  none)
+	 * @param string   $default         You can include a string for the item that will receive the "item_display" class
+	 *                                  for the js.
+	 * @return string                  a html snippet of of all the formatted link elements.
+	 */
+	public static function tab_text_links(array $item_array, $container_class = '', $sep = '|', $default = '')
+	{
+		$item_array = apply_filters('FHEE__EEH_Tabbed_Content__tab_text_links', $item_array, $container_class);
+		if (! is_array($item_array) || empty($item_array)) {
+			return false; // get out we don't have even the basic thing we need!
+		}
 
-        $defaults        = [
-            'label' => esc_html__('Item', 'event_espresso'),
-            'class' => '',
-            'href'  => '',
-            'title' => esc_attr__('Link for Item', 'event_espresso'),
-            'slug'  => 'item_slug',
-        ];
-        $container_class = ! empty($container_class) ? ' ' . esc_attr($container_class) : '';
-        $list            = '';
-        $list_length     = count($item_array);
-        // if we're' adding separators, set $current to 1, otherwise set it to list length + 1
-        // then we'll increment $current while looping and only add separators if $current is < list length
-        // (if we aren't adding separators $current will always be > list length cuz it started at list length + 1)
-        $current = empty($sep) ? $list_length + 1 : 1;
-        foreach ($item_array as $item) {
-            $item          = wp_parse_args($item, $defaults);
-            $item['class'] .= $default === $item['slug'] ? ' item_display' : '';
-            $list          .= self::textLinkItem($item);
-            $list          .= $current < $list_length ? self::textLinkSeparator($sep) : '';
-            $current++;
-        }
+		$defaults        = [
+			'label' => esc_html__('Item', 'event_espresso'),
+			'class' => '',
+			'href'  => '',
+			'title' => esc_attr__('Link for Item', 'event_espresso'),
+			'slug'  => 'item_slug',
+		];
+		$container_class = ! empty($container_class) ? ' ' . esc_attr($container_class) : '';
+		$list            = '';
+		$list_length     = count($item_array);
+		// if we're' adding separators, set $current to 1, otherwise set it to list length + 1
+		// then we'll increment $current while looping and only add separators if $current is < list length
+		// (if we aren't adding separators $current will always be > list length cuz it started at list length + 1)
+		$current = empty($sep) ? $list_length + 1 : 1;
+		foreach ($item_array as $item) {
+			$item          = wp_parse_args($item, $defaults);
+			$item['class'] .= $default === $item['slug'] ? ' item_display' : '';
+			$list          .= self::textLinkItem($item);
+			$list          .= $current < $list_length ? self::textLinkSeparator($sep) : '';
+			$current++;
+		}
 
-        return "
+		return "
         <ul class='ee-text-links{$container_class}'>{$list}</ul>
         ";
-    }
+	}
 
 
-    /**
-     * @param string[] $item
-     * @return string
-     */
-    private static function textLinkItem(array $item)
-    {
-        $class = $item['class'] ? esc_attr($item['class']) : '';
-        $label = esc_html($item['label']);
-        $href  = $item['href'] ? esc_attr($item['href']) : '';
-        $title = esc_attr($item['title']);
+	/**
+	 * @param string[] $item
+	 * @return string
+	 */
+	private static function textLinkItem(array $item)
+	{
+		$class = $item['class'] ? esc_attr($item['class']) : '';
+		$label = esc_html($item['label']);
+		$href  = $item['href'] ? esc_attr($item['href']) : '';
+		$title = esc_attr($item['title']);
 
 
-        $link = ! empty($href)
-            ? "
+		$link = ! empty($href)
+			? "
             <a class='ee-text-link' href='#{$href}' title='{$title}'>
                 {$label}
             </a>
             "
-            : $label;
-        return "
+			: $label;
+		return "
         <li class='ee-text-link-li {$class}'>{$link}</li>
         ";
-    }
+	}
 
 
-    /**
-     * @param string $separator
-     * @return string
-     * @since   4.10.14.p
-     */
-    private static function textLinkSeparator($separator)
-    {
-        $separator = esc_html($separator);
-        return "
+	/**
+	 * @param string $separator
+	 * @return string
+	 * @since   4.10.14.p
+	 */
+	private static function textLinkSeparator($separator)
+	{
+		$separator = esc_html($separator);
+		return "
         <li class='ee-text-link-sep'>{$separator}</li>
         ";
-    }
+	}
 }

core/helpers/EEH_Qtip_Loader.helper.php

Spacing +20 added lines, -20 removed lines

@@ -35,7 +35,7 @@ 
     public static function instance()
     {
         // check if class object is instantiated
-        if (self::$_instance === null  or ! is_object(self::$_instance) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) {
+        if (self::$_instance === null or ! is_object(self::$_instance) or ! (self::$_instance instanceof EEH_Qtip_Loader)) {
             self::$_instance = new self();
         }
         return self::$_instance;
@@ -66,25 +66,25 @@ 
      */
     public function register_and_enqueue()
     {
-        $qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js';
-        $qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map';
-        $qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css';
+        $qtips_js = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.js';
+        $qtip_map = EE_THIRD_PARTY_URL.'qtip/jquery.qtip.min.map';
+        $qtipcss = ! defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL.'qtip/jquery.qtip.css';
 
         wp_register_script('qtip-map', $qtip_map, array(), '3', true);
         wp_register_script('qtip', $qtips_js, array('jquery'), '3.0.3', true);
-        wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, true);
+        wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS.'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, true);
 
         wp_register_style('qtip-css', $qtipcss, array(), '2.2');
 
         // k now let's see if there are any registered qtips.  If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!)
-        if (!empty($this->_qtips)) {
+        if ( ! empty($this->_qtips)) {
             wp_enqueue_script('ee-qtip-helper');
             wp_enqueue_style('qtip-css');
             $qtips = array();
             foreach ($this->_qtips as $qtip) {
                 $qts = $qtip->get_tips();
                 foreach ($qts as $qt) {
-                    if (! $qt instanceof EE_Qtip) {
+                    if ( ! $qt instanceof EE_Qtip) {
                         continue;
                     }
                     $qtips[] = array(
@@ -94,8 +94,8 @@ 
                         );
                 }
             }
-            if (!empty($qtips)) {
-                wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ));
+            if ( ! empty($qtips)) {
+                wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array('qtips' => $qtips));
             }
         } else {
             // qtips has been requested without any registration (so assuming its just directly used in the admin).
@@ -154,11 +154,11 @@ 
         // before doing anything we have to make sure that EE_Qtip_Config parent is required.
         EE_Registry::instance()->load_lib('Qtip_Config', array(), true);
 
-        if (!empty($paths)) {
+        if ( ! empty($paths)) {
             $paths = (array) $paths;
             foreach ($paths as $path) {
-                $path = $path . $config . '.lib.php';
-                if (!is_readable($path)) {
+                $path = $path.$config.'.lib.php';
+                if ( ! is_readable($path)) {
                     continue;
                 } else {
                     require_once $path;
@@ -167,9 +167,9 @@ 
         }
 
         // does class exist at this point?  If it does then let's instantiate.  If it doesn't then let's continue with other paths.
-        if (!class_exists($config)) {
-            $path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php';
-            if (!is_readable($path)) {
+        if ( ! class_exists($config)) {
+            $path = EE_LIBRARIES.'qtips/'.$config.'.lib.php';
+            if ( ! is_readable($path)) {
                 throw new EE_Error(sprintf(esc_html__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config));
             } else {
                 require_once $path;
@@ -177,7 +177,7 @@ 
         }
 
         // now we attempt a class_exists one more time.
-        if (!class_exists($config)) {
+        if ( ! class_exists($config)) {
             throw new EE_Error(sprintf(esc_html__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config));
         }
 
@@ -186,7 +186,7 @@ 
         $qtip = $a->newInstance();
 
         // verify that $qtip is a valid object
-        if (! $qtip instanceof EE_Qtip_Config) {
+        if ( ! $qtip instanceof EE_Qtip_Config) {
             throw new EE_Error(sprintf(esc_html__('The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>'));
         }
 
@@ -229,11 +229,11 @@ 
         $qts = $qtip->get_tips();
         $content = array();
         foreach ($qts as $qt) {
-            if (! $qt instanceof EE_Qtip) {
+            if ( ! $qt instanceof EE_Qtip) {
                 continue;
             }
-            $content[] = '<div class="ee-qtip-helper-content hidden" id="' . esc_attr($qt->content_id) . '">' .
-                         $qt->content . '</div>';
+            $content[] = '<div class="ee-qtip-helper-content hidden" id="'.esc_attr($qt->content_id).'">'.
+                         $qt->content.'</div>';
         }
 
         return implode('<br />', $content);

Indentation +226 added lines, -226 removed lines

@@ -11,230 +11,230 @@
  */
 class EEH_Qtip_Loader extends EEH_Base
 {
-    /**
-     * EEH_Qtip_Loader Object
-     * @var EEH_Qtip_Loader
-     * @access private
-     */
-    private static $_instance = null;
-
-    /**
-     * array of qtip config objects
-     * @var EE_Qtip_Config[]
-     */
-    private $_qtips = array();
-
-
-
-    /**
-     *@singleton method used to instantiate class object
-     *@access public
-     *@return EEH_Qtip_Loader instance
-     */
-    public static function instance()
-    {
-        // check if class object is instantiated
-        if (self::$_instance === null  or ! is_object(self::$_instance) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) {
-            self::$_instance = new self();
-        }
-        return self::$_instance;
-    }
-
-
-
-    /**
-     *private constructor to prevent direct creation
-     * @Constructor
-     * @access private
-     * @return \EEH_Qtip_Loader
-     */
-    private function __construct()
-    {
-        // let's just make sure this is instantiated in the right place.
-        if (did_action('wp_print_styles') || did_action('admin_head')) {
-            EE_Error::doing_it_wrong('EEH_Qtip_Loader', esc_html__('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso'), '4.1');
-        }
-    }
-
-
-    /**
-     * Call this from wp_enqueue_scripts or admin_enqueue_scripts to setup and enqueue the qtip library
-     *
-     * @access public
-     * @return void
-     */
-    public function register_and_enqueue()
-    {
-        $qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js';
-        $qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map';
-        $qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css';
-
-        wp_register_script('qtip-map', $qtip_map, array(), '3', true);
-        wp_register_script('qtip', $qtips_js, array('jquery'), '3.0.3', true);
-        wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, true);
-
-        wp_register_style('qtip-css', $qtipcss, array(), '2.2');
-
-        // k now let's see if there are any registered qtips.  If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!)
-        if (!empty($this->_qtips)) {
-            wp_enqueue_script('ee-qtip-helper');
-            wp_enqueue_style('qtip-css');
-            $qtips = array();
-            foreach ($this->_qtips as $qtip) {
-                $qts = $qtip->get_tips();
-                foreach ($qts as $qt) {
-                    if (! $qt instanceof EE_Qtip) {
-                        continue;
-                    }
-                    $qtips[] = array(
-                        'content_id' => $qt->content_id,
-                        'options' => $qt->options,
-                        'target' => $qt->target,
-                        );
-                }
-            }
-            if (!empty($qtips)) {
-                wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ));
-            }
-        } else {
-            // qtips has been requested without any registration (so assuming its just directly used in the admin).
-            wp_enqueue_script('qtip');
-            wp_enqueue_style('qtip-css');
-        }
-    }
-
-
-
-    /**
-     * This simply registers the given qtip config and:
-     * - adds it to the $_qtips property array.
-     * - sets up the content containers for all qtips in the config,
-     * - registers and enqueues the qtip scripts and styles.
-     *
-     * @access public
-     * @param  array  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
-     * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
-     * @return void
-     */
-    public function register($configname, $paths = array())
-    {
-
-        // let's just make sure this is instantiated in the right place.
-        if (did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts')) {
-            EE_Error::doing_it_wrong('EEH_Qtip_Loader->register()', esc_html__('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso'), '4.1');
-        }
-
-        $configname = (array) $configname; // typecast to array
-        foreach ($configname as $config) {
-            $this->_register($config, $paths);
-        }
-
-        // hook into appropriate footer
-        $footer_action = is_admin() ? 'admin_footer' : 'wp_footer';
-        add_action($footer_action, array($this, 'setup_qtip'), 10);
-
-        // make sure we "turn on" qtip js.
-        add_filter('FHEE_load_qtip', '__return_true');
-    }
-
-
-
-    /**
-     * private utility for registering and setting up qtip config objects
-     *
-     * @access private
-     * @param  string $config the short name of the class (will be used to generate the expected classname)
-     * @param  array  $paths  array of paths to check (or if empty we check core/libraries/qtips or assume its loaded)
-     * @throws EE_Error
-     * @return void
-     */
-    private function _register($config, $paths)
-    {
-        // before doing anything we have to make sure that EE_Qtip_Config parent is required.
-        EE_Registry::instance()->load_lib('Qtip_Config', array(), true);
-
-        if (!empty($paths)) {
-            $paths = (array) $paths;
-            foreach ($paths as $path) {
-                $path = $path . $config . '.lib.php';
-                if (!is_readable($path)) {
-                    continue;
-                } else {
-                    require_once $path;
-                }
-            }
-        }
-
-        // does class exist at this point?  If it does then let's instantiate.  If it doesn't then let's continue with other paths.
-        if (!class_exists($config)) {
-            $path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php';
-            if (!is_readable($path)) {
-                throw new EE_Error(sprintf(esc_html__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config));
-            } else {
-                require_once $path;
-            }
-        }
-
-        // now we attempt a class_exists one more time.
-        if (!class_exists($config)) {
-            throw new EE_Error(sprintf(esc_html__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config));
-        }
-
-        // made it HERE?  FINALLY, let's get things setup.
-        $a = new ReflectionClass($config);
-        $qtip = $a->newInstance();
-
-        // verify that $qtip is a valid object
-        if (! $qtip instanceof EE_Qtip_Config) {
-            throw new EE_Error(sprintf(esc_html__('The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>'));
-        }
-
-        $this->_qtips[] = $a->newInstance();
-    }
-
-
-
-    /**
-     * This takes care of generating the qtip content containers.
-     * Output gets put in the appropriate page footer (depending on context (either admin_footer or wp_footer) )
-     *
-     * @access public
-     * @return void
-     */
-    public function setup_qtip()
-    {
-        if (empty($this->_qtips)) {
-            return; // no qtips!
-        }
-
-        $content = array();
-
-        foreach ($this->_qtips as $qtip) {
-            $content[] = $this->_generate_content_container($qtip);
-        }
-
-        echo implode('<br />', $content);
-    }
-
-
-    /**
-     * Generates a content container from a given EE_Qtip_Config object.
-     *
-     * @param  EE_Qtip_Config $qtip
-     * @return string  (html content container for qtip);
-     */
-    private function _generate_content_container($qtip)
-    {
-        $qts = $qtip->get_tips();
-        $content = array();
-        foreach ($qts as $qt) {
-            if (! $qt instanceof EE_Qtip) {
-                continue;
-            }
-            $content[] = '<div class="ee-qtip-helper-content hidden" id="' . esc_attr($qt->content_id) . '">' .
-                         $qt->content . '</div>';
-        }
-
-        return implode('<br />', $content);
-    }
+	/**
+	 * EEH_Qtip_Loader Object
+	 * @var EEH_Qtip_Loader
+	 * @access private
+	 */
+	private static $_instance = null;
+
+	/**
+	 * array of qtip config objects
+	 * @var EE_Qtip_Config[]
+	 */
+	private $_qtips = array();
+
+
+
+	/**
+	 *@singleton method used to instantiate class object
+	 *@access public
+	 *@return EEH_Qtip_Loader instance
+	 */
+	public static function instance()
+	{
+		// check if class object is instantiated
+		if (self::$_instance === null  or ! is_object(self::$_instance) or ! ( self::$_instance instanceof EEH_Qtip_Loader )) {
+			self::$_instance = new self();
+		}
+		return self::$_instance;
+	}
+
+
+
+	/**
+	 *private constructor to prevent direct creation
+	 * @Constructor
+	 * @access private
+	 * @return \EEH_Qtip_Loader
+	 */
+	private function __construct()
+	{
+		// let's just make sure this is instantiated in the right place.
+		if (did_action('wp_print_styles') || did_action('admin_head')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader', esc_html__('This helper must be instantiated before or within a callback for the WordPress wp_enqueue_scripts hook action hook.', 'event_espresso'), '4.1');
+		}
+	}
+
+
+	/**
+	 * Call this from wp_enqueue_scripts or admin_enqueue_scripts to setup and enqueue the qtip library
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function register_and_enqueue()
+	{
+		$qtips_js = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.js' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.js';
+		$qtip_map = EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.map';
+		$qtipcss = !defined('SCRIPT_DEBUG') ? EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.min.css' : EE_THIRD_PARTY_URL . 'qtip/jquery.qtip.css';
+
+		wp_register_script('qtip-map', $qtip_map, array(), '3', true);
+		wp_register_script('qtip', $qtips_js, array('jquery'), '3.0.3', true);
+		wp_register_script('ee-qtip-helper', EE_HELPERS_ASSETS . 'ee-qtip-helper.js', array('qtip', 'jquery-cookie'), EVENT_ESPRESSO_VERSION, true);
+
+		wp_register_style('qtip-css', $qtipcss, array(), '2.2');
+
+		// k now let's see if there are any registered qtips.  If there are, then we need to setup the localized script for ee-qtip-helper.js (and enqueue ee-qtip-helper.js of course!)
+		if (!empty($this->_qtips)) {
+			wp_enqueue_script('ee-qtip-helper');
+			wp_enqueue_style('qtip-css');
+			$qtips = array();
+			foreach ($this->_qtips as $qtip) {
+				$qts = $qtip->get_tips();
+				foreach ($qts as $qt) {
+					if (! $qt instanceof EE_Qtip) {
+						continue;
+					}
+					$qtips[] = array(
+						'content_id' => $qt->content_id,
+						'options' => $qt->options,
+						'target' => $qt->target,
+						);
+				}
+			}
+			if (!empty($qtips)) {
+				wp_localize_script('ee-qtip-helper', 'EE_QTIP_HELPER', array( 'qtips' => $qtips ));
+			}
+		} else {
+			// qtips has been requested without any registration (so assuming its just directly used in the admin).
+			wp_enqueue_script('qtip');
+			wp_enqueue_style('qtip-css');
+		}
+	}
+
+
+
+	/**
+	 * This simply registers the given qtip config and:
+	 * - adds it to the $_qtips property array.
+	 * - sets up the content containers for all qtips in the config,
+	 * - registers and enqueues the qtip scripts and styles.
+	 *
+	 * @access public
+	 * @param  array  $paths      Array of paths to check for the EE_Qtip class. If present we check these path(s) first.  If not present (empty array), then it's assumed it's either in core/libraries/qtips OR the file is already loaded.
+	 * @param  string|array $configname name of the Qtip class (full class name is expected and will be used for looking for file, Qtip config classes must extend EE_Qtip_Config) [if this is an array, then we loop through the array to instantiate and setup the qtips]
+	 * @return void
+	 */
+	public function register($configname, $paths = array())
+	{
+
+		// let's just make sure this is instantiated in the right place.
+		if (did_action('wp_enqueue_scripts') || did_action('admin_enqueue_scripts')) {
+			EE_Error::doing_it_wrong('EEH_Qtip_Loader->register()', esc_html__('EE_Qtip_Config objects must be registered before wp_enqueue_scripts is called.', 'event_espresso'), '4.1');
+		}
+
+		$configname = (array) $configname; // typecast to array
+		foreach ($configname as $config) {
+			$this->_register($config, $paths);
+		}
+
+		// hook into appropriate footer
+		$footer_action = is_admin() ? 'admin_footer' : 'wp_footer';
+		add_action($footer_action, array($this, 'setup_qtip'), 10);
+
+		// make sure we "turn on" qtip js.
+		add_filter('FHEE_load_qtip', '__return_true');
+	}
+
+
+
+	/**
+	 * private utility for registering and setting up qtip config objects
+	 *
+	 * @access private
+	 * @param  string $config the short name of the class (will be used to generate the expected classname)
+	 * @param  array  $paths  array of paths to check (or if empty we check core/libraries/qtips or assume its loaded)
+	 * @throws EE_Error
+	 * @return void
+	 */
+	private function _register($config, $paths)
+	{
+		// before doing anything we have to make sure that EE_Qtip_Config parent is required.
+		EE_Registry::instance()->load_lib('Qtip_Config', array(), true);
+
+		if (!empty($paths)) {
+			$paths = (array) $paths;
+			foreach ($paths as $path) {
+				$path = $path . $config . '.lib.php';
+				if (!is_readable($path)) {
+					continue;
+				} else {
+					require_once $path;
+				}
+			}
+		}
+
+		// does class exist at this point?  If it does then let's instantiate.  If it doesn't then let's continue with other paths.
+		if (!class_exists($config)) {
+			$path = EE_LIBRARIES . 'qtips/' . $config . '.lib.php';
+			if (!is_readable($path)) {
+				throw new EE_Error(sprintf(esc_html__('Unable to load the Qtip Config registered for this page (%s) because none of the file paths attempted are readable.  Please check the spelling of the paths you\'ve used in the registration', 'event_espresso'), $config));
+			} else {
+				require_once $path;
+			}
+		}
+
+		// now we attempt a class_exists one more time.
+		if (!class_exists($config)) {
+			throw new EE_Error(sprintf(esc_html__('The Qtip_Config class being registered (%s) does not exist, please check the spelling.', 'event_espresso'), $config));
+		}
+
+		// made it HERE?  FINALLY, let's get things setup.
+		$a = new ReflectionClass($config);
+		$qtip = $a->newInstance();
+
+		// verify that $qtip is a valid object
+		if (! $qtip instanceof EE_Qtip_Config) {
+			throw new EE_Error(sprintf(esc_html__('The class given for the Qtip loader (%1$s) is not a child of the %2$sEE_Qtip_Config%3$s class. Please make sure you are extending EE_Qtip_Config.', 'event_espresso'), $config, '<strong>', '</strong>'));
+		}
+
+		$this->_qtips[] = $a->newInstance();
+	}
+
+
+
+	/**
+	 * This takes care of generating the qtip content containers.
+	 * Output gets put in the appropriate page footer (depending on context (either admin_footer or wp_footer) )
+	 *
+	 * @access public
+	 * @return void
+	 */
+	public function setup_qtip()
+	{
+		if (empty($this->_qtips)) {
+			return; // no qtips!
+		}
+
+		$content = array();
+
+		foreach ($this->_qtips as $qtip) {
+			$content[] = $this->_generate_content_container($qtip);
+		}
+
+		echo implode('<br />', $content);
+	}
+
+
+	/**
+	 * Generates a content container from a given EE_Qtip_Config object.
+	 *
+	 * @param  EE_Qtip_Config $qtip
+	 * @return string  (html content container for qtip);
+	 */
+	private function _generate_content_container($qtip)
+	{
+		$qts = $qtip->get_tips();
+		$content = array();
+		foreach ($qts as $qt) {
+			if (! $qt instanceof EE_Qtip) {
+				continue;
+			}
+			$content[] = '<div class="ee-qtip-helper-content hidden" id="' . esc_attr($qt->content_id) . '">' .
+						 $qt->content . '</div>';
+		}
+
+		return implode('<br />', $content);
+	}
 }