lightspeeddevelopment / lsx-search

includes/template-tags.php

Indentation +1 added lines, -1 removed lines

@@ -9,6 +9,6 @@
  * Adds text domain.
  */
 function lsx_search_load_plugin_textdomain() {
-	load_plugin_textdomain( 'lsx-search', false, basename( LSX_SEARCH_PATH ) . '/languages' );
+     load_plugin_textdomain( 'lsx-search', false, basename( LSX_SEARCH_PATH ) . '/languages' );
 }
 add_action( 'init', 'lsx_search_load_plugin_textdomain' );

Spacing +2 added lines, -2 removed lines

@@ -9,6 +9,6 @@
  * Adds text domain.
  */
 function lsx_search_load_plugin_textdomain() {
-	load_plugin_textdomain( 'lsx-search', false, basename( LSX_SEARCH_PATH ) . '/languages' );
+	load_plugin_textdomain('lsx-search', false, basename(LSX_SEARCH_PATH).'/languages');
 }
-add_action( 'init', 'lsx_search_load_plugin_textdomain' );
+add_action('init', 'lsx_search_load_plugin_textdomain');

includes/functions.php

Indentation +32 added lines, -32 removed lines

@@ -13,17 +13,17 @@ 
  * @return array
  */
 function get_options() {
-	$options = array();
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
-	} else {
-		$options = get_option( '_lsx_settings', false );
+     $options = array();
+     if ( function_exists( 'tour_operator' ) ) {
+          $options = get_option( '_lsx-to_settings', false );
+     } else {
+          $options = get_option( '_lsx_settings', false );
 
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
-		}
-	}
-	return $options;
+          if ( false === $options ) {
+               $options = get_option( '_lsx_lsx-settings', false );
+          }
+     }
+     return $options;
 }
 
 /**
@@ -32,26 +32,26 @@ 
  * @return array
  */
 function get_restricted_post_types() {
-	$post_types = array(
-		'page',
-		'attachment',
-		'lesson',
-		'certificate',
-		'envira',
-		'tribe_organizer',
-		'tribe_venue',
-		'envira',
-		'reply',
-		'topic',
-		'popup',
-		'question',
-		'certificate_template',
-		'sensei_message',
-		'tribe_events',
-		'tip',
-		'quiz',
-		'forum',
-	);
-	$post_types = apply_filters( 'lsx_search_restricted_post_types', $post_types );
-	return $post_types;
+     $post_types = array(
+          'page',
+          'attachment',
+          'lesson',
+          'certificate',
+          'envira',
+          'tribe_organizer',
+          'tribe_venue',
+          'envira',
+          'reply',
+          'topic',
+          'popup',
+          'question',
+          'certificate_template',
+          'sensei_message',
+          'tribe_events',
+          'tip',
+          'quiz',
+          'forum',
+     );
+     $post_types = apply_filters( 'lsx_search_restricted_post_types', $post_types );
+     return $post_types;
 }

Spacing +6 added lines, -6 removed lines

@@ -14,13 +14,13 @@ 
  */
 function get_options() {
 	$options = array();
-	if ( function_exists( 'tour_operator' ) ) {
-		$options = get_option( '_lsx-to_settings', false );
+	if (function_exists('tour_operator')) {
+		$options = get_option('_lsx-to_settings', false);
 	} else {
-		$options = get_option( '_lsx_settings', false );
+		$options = get_option('_lsx_settings', false);
 
-		if ( false === $options ) {
-			$options = get_option( '_lsx_lsx-settings', false );
+		if (false === $options) {
+			$options = get_option('_lsx_lsx-settings', false);
 		}
 	}
 	return $options;
@@ -52,6 +52,6 @@ 
 		'quiz',
 		'forum',
 	);
-	$post_types = apply_filters( 'lsx_search_restricted_post_types', $post_types );
+	$post_types = apply_filters('lsx_search_restricted_post_types', $post_types);
 	return $post_types;
 }

lsx-search.php

Indentation +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+     die;
 }
 
 define( 'LSX_SEARCH_PATH', plugin_dir_path( __FILE__ ) );

Spacing +8 added lines, -8 removed lines

@@ -12,17 +12,17 @@
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if (!defined('WPINC')) {
 	die;
 }
 
-define( 'LSX_SEARCH_PATH', plugin_dir_path( __FILE__ ) );
-define( 'LSX_SEARCH_CORE', __FILE__ );
-define( 'LSX_SEARCH_URL', plugin_dir_url( __FILE__ ) );
-define( 'LSX_SEARCH_VER', '1.5.1' );
+define('LSX_SEARCH_PATH', plugin_dir_path(__FILE__));
+define('LSX_SEARCH_CORE', __FILE__);
+define('LSX_SEARCH_URL', plugin_dir_url(__FILE__));
+define('LSX_SEARCH_VER', '1.5.1');
 
 /* ======================= Below is the Plugin Class init ========================= */
 
-require_once LSX_SEARCH_PATH . '/includes/template-tags.php';
-require_once LSX_SEARCH_PATH . '/includes/functions.php';
-require_once LSX_SEARCH_PATH . '/classes/class-lsx-search.php';
+require_once LSX_SEARCH_PATH.'/includes/template-tags.php';
+require_once LSX_SEARCH_PATH.'/includes/functions.php';
+require_once LSX_SEARCH_PATH.'/classes/class-lsx-search.php';

classes/admin/class-settings-theme.php

Indentation +176 added lines, -176 removed lines

@@ -10,186 +10,186 @@ 
  */
 class Settings_Theme {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx\search\classes\admin\Settings_Theme()
-	 */
-	protected static $instance = null;
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx\search\classes\admin\Settings_Theme()
+      */
+     protected static $instance = null;
 
-	/**
-	 * Will return true if this is the LSX Search settings page.
-	 *
-	 * @var array
-	 */
-	public $is_options_page = false;
+     /**
+      * Will return true if this is the LSX Search settings page.
+      *
+      * @var array
+      */
+     public $is_options_page = false;
 
-	/**
-	 * Holds the id and labels for the navigation.
-	 *
-	 * @var array
-	 */
-	public $navigation = array();
+     /**
+      * Holds the id and labels for the navigation.
+      *
+      * @var array
+      */
+     public $navigation = array();
 
-	/**
-	 * Contructor
-	 */
-	public function __construct() {
-		add_filter( 'cmb2_enqueue_css', array( $this, 'disable_cmb2_styles' ), 1, 1 );
-		add_action( 'cmb2_before_form', array( $this, 'generate_navigation' ), 10, 4 );
-		add_action( 'cmb2_before_title_field_row', array( $this, 'output_tab_open_div' ), 10, 1 );
-		add_action( 'cmb2_after_tab_closing_field_row', array( $this, 'output_tab_closing_div' ), 10, 1 );
-		add_action( 'cmb2_render_tab_closing', array( $this, 'cmb2_render_callback_for_tab_closing' ), 10, 5 );
-		add_filter( 'cmb2_sanitize_tab_closing', array( $this, 'cmb2_sanitize_tab_closing_callback' ), 10, 2 );
-		add_action( 'cmb2_after_form', array( $this, 'navigation_js' ), 10, 4 );
-		add_filter( 'cmb2_options_page_redirect_url', array( $this, 'add_tab_argument' ), 10, 1 );
-	}
+     /**
+      * Contructor
+      */
+     public function __construct() {
+          add_filter( 'cmb2_enqueue_css', array( $this, 'disable_cmb2_styles' ), 1, 1 );
+          add_action( 'cmb2_before_form', array( $this, 'generate_navigation' ), 10, 4 );
+          add_action( 'cmb2_before_title_field_row', array( $this, 'output_tab_open_div' ), 10, 1 );
+          add_action( 'cmb2_after_tab_closing_field_row', array( $this, 'output_tab_closing_div' ), 10, 1 );
+          add_action( 'cmb2_render_tab_closing', array( $this, 'cmb2_render_callback_for_tab_closing' ), 10, 5 );
+          add_filter( 'cmb2_sanitize_tab_closing', array( $this, 'cmb2_sanitize_tab_closing_callback' ), 10, 2 );
+          add_action( 'cmb2_after_form', array( $this, 'navigation_js' ), 10, 4 );
+          add_filter( 'cmb2_options_page_redirect_url', array( $this, 'add_tab_argument' ), 10, 1 );
+     }
 
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx\search\classes\admin\Settings_Theme()    A single instance of this class.
-	 */
-	public static function get_instance() {
-		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object \lsx\search\classes\admin\Settings_Theme()    A single instance of this class.
+      */
+     public static function get_instance() {
+          // If the single instance hasn't been set, set it now.
+          if ( null == self::$instance ) {
+               self::$instance = new self();
+          }
+          return self::$instance;
+     }
 
-	/**
-	 * Disable CMB2 styles on front end forms.
-	 *
-	 * @return bool $enabled Whether to enable (enqueue) styles.
-	 */
-	public function disable_cmb2_styles( $enabled ) {
-		if ( is_admin() ) {
-			$current_screen = get_current_screen();
-			if ( is_object( $current_screen ) && 'settings_page_lsx-search-settings' === $current_screen->id ) {
-				$enabled = false;
-			}
-		}
-		return $enabled;
-	}
+     /**
+      * Disable CMB2 styles on front end forms.
+      *
+      * @return bool $enabled Whether to enable (enqueue) styles.
+      */
+     public function disable_cmb2_styles( $enabled ) {
+          if ( is_admin() ) {
+               $current_screen = get_current_screen();
+               if ( is_object( $current_screen ) && 'settings_page_lsx-search-settings' === $current_screen->id ) {
+                    $enabled = false;
+               }
+          }
+          return $enabled;
+     }
 
-	/**
-	 * Generates the tabbed navigation for the settings page.
-	 *
-	 * @param string $cmb_id
-	 * @param string $object_id
-	 * @param string $object_type
-	 * @param object $cmb2_obj
-	 * @return void
-	 */
-	public function generate_navigation( $cmb_id, $object_id, $object_type, $cmb2_obj ) {
-		if ( 'lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type ) {
-			$this->navigation      = array();
-			$this->is_options_page = true;
-			if ( isset( $cmb2_obj->meta_box['fields'] ) && ! empty( $cmb2_obj->meta_box['fields'] ) ) {
-				foreach ( $cmb2_obj->meta_box['fields'] as $field_index => $field ) {
-					if ( 'title' === $field['type'] ) {
-						$this->navigation[ $field_index ] = $field['name'];
-					}
-				}
-			}
-			$this->output_navigation();
-		}
-	}
+     /**
+      * Generates the tabbed navigation for the settings page.
+      *
+      * @param string $cmb_id
+      * @param string $object_id
+      * @param string $object_type
+      * @param object $cmb2_obj
+      * @return void
+      */
+     public function generate_navigation( $cmb_id, $object_id, $object_type, $cmb2_obj ) {
+          if ( 'lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type ) {
+               $this->navigation      = array();
+               $this->is_options_page = true;
+               if ( isset( $cmb2_obj->meta_box['fields'] ) && ! empty( $cmb2_obj->meta_box['fields'] ) ) {
+                    foreach ( $cmb2_obj->meta_box['fields'] as $field_index => $field ) {
+                         if ( 'title' === $field['type'] ) {
+                              $this->navigation[ $field_index ] = $field['name'];
+                         }
+                    }
+               }
+               $this->output_navigation();
+          }
+     }
 
-	/**
-	 * Outputs the WP style navigation for the Settings page.
-	 *
-	 * @return void
-	 */
-	public function output_navigation() {
-		if ( ! empty( $this->navigation ) ) {
-			?>
+     /**
+      * Outputs the WP style navigation for the Settings page.
+      *
+      * @return void
+      */
+     public function output_navigation() {
+          if ( ! empty( $this->navigation ) ) {
+               ?>
 			<div class="wp-filter hide-if-no-js">
 				<ul class="filter-links">
 					<?php
-					$first_tab    = true;
-					$total        = count( $this->navigation );
-					$count        = 0;
-					$separator    = ' |';
-					$selected_tab = '';
-					if ( isset( $_GET['cmb_tab'] ) && '' !== $_GET['cmb_tab'] ) {
-						$selected_tab  = sanitize_text_field( $_GET['cmb_tab'] );
-						$selected_tab  = 'settings_' . $selected_tab;
-					}
-					foreach ( $this->navigation as $key => $label ) {
-						$count++;
-						$current_css = '';
-						if ( ( true === $first_tab && '' === $selected_tab ) || $key === $selected_tab ) {
-							$first_tab   = false;
-							$current_css = 'current';
-						}
-						if ( $count === $total ) {
-							$separator = '';
-						}
-						?>
+                         $first_tab    = true;
+                         $total        = count( $this->navigation );
+                         $count        = 0;
+                         $separator    = ' |';
+                         $selected_tab = '';
+                         if ( isset( $_GET['cmb_tab'] ) && '' !== $_GET['cmb_tab'] ) {
+                              $selected_tab  = sanitize_text_field( $_GET['cmb_tab'] );
+                              $selected_tab  = 'settings_' . $selected_tab;
+                         }
+                         foreach ( $this->navigation as $key => $label ) {
+                              $count++;
+                              $current_css = '';
+                              if ( ( true === $first_tab && '' === $selected_tab ) || $key === $selected_tab ) {
+                                   $first_tab   = false;
+                                   $current_css = 'current';
+                              }
+                              if ( $count === $total ) {
+                                   $separator = '';
+                              }
+                              ?>
 							<li><a href="#" class="<?php echo esc_attr( $current_css ); ?>" data-sort="<?php echo esc_attr( $key ); ?>_tab"><?php echo esc_attr( $label ); ?></a><?php echo esc_attr( $separator ); ?></li>
 						<?php
-					}
-					?>
+                         }
+                         ?>
 				</ul>
 			</div>
 			<?php
-		}
-	}
+          }
+     }
 
-	/**
-	 * Outputs the opening tab div.
-	 *
-	 * @param object $field CMB2_Field();
-	 * @return void
-	 */
-	public function output_tab_open_div( $field ) {
-		if ( true === $this->is_options_page && isset( $field->args['type'] ) && 'title' === $field->args['type'] ) {
-			?>
+     /**
+      * Outputs the opening tab div.
+      *
+      * @param object $field CMB2_Field();
+      * @return void
+      */
+     public function output_tab_open_div( $field ) {
+          if ( true === $this->is_options_page && isset( $field->args['type'] ) && 'title' === $field->args['type'] ) {
+               ?>
 			<div id="<?php echo esc_attr( $field->args['id'] ); ?>_tab" class="tab tab-nav hidden">
 			<?php
-		}
-	}
+          }
+     }
 
-	/**
-	 * Outputs the opening closing div.
-	 *
-	 * @param object $field CMB2_Field();
-	 * @return void
-	 */
-	public function output_tab_closing_div( $field ) {
-		if ( true === $this->is_options_page && isset( $field->args['type'] ) && 'tab_closing' === $field->args['type'] ) {
-			?>
+     /**
+      * Outputs the opening closing div.
+      *
+      * @param object $field CMB2_Field();
+      * @return void
+      */
+     public function output_tab_closing_div( $field ) {
+          if ( true === $this->is_options_page && isset( $field->args['type'] ) && 'tab_closing' === $field->args['type'] ) {
+               ?>
 			</div>
 			<?php
-		}
-	}
+          }
+     }
 
-	public function cmb2_render_callback_for_tab_closing( $field, $escaped_value, $object_id, $object_type, $field_type_object ) {
-		return;
-	}
+     public function cmb2_render_callback_for_tab_closing( $field, $escaped_value, $object_id, $object_type, $field_type_object ) {
+          return;
+     }
 
-	public function cmb2_sanitize_tab_closing_callback( $override_value, $value ) {
-		return '';
-	}
+     public function cmb2_sanitize_tab_closing_callback( $override_value, $value ) {
+          return '';
+     }
 
-	/**
-	 * Outputs the Script for the tabbed navigation.
-	 *
-	 * @param string $cmb_id
-	 * @param string $object_id
-	 * @param string $object_type
-	 * @param object $cmb2_obj
-	 * @return void
-	 */
-	public function navigation_js( $cmb_id, $object_id, $object_type, $cmb2_obj ) {
-		if ( 'lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type ) {
-			?>
+     /**
+      * Outputs the Script for the tabbed navigation.
+      *
+      * @param string $cmb_id
+      * @param string $object_id
+      * @param string $object_type
+      * @param object $cmb2_obj
+      * @return void
+      */
+     public function navigation_js( $cmb_id, $object_id, $object_type, $cmb2_obj ) {
+          if ( 'lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type ) {
+               ?>
 			<script>
 				var LSX_SEARCH_CMB2 = Object.create( null );
 
@@ -261,25 +261,25 @@ 
 				} )( jQuery, window, document );
 			</script>
 			<?php
-		}
-	}
+          }
+     }
 
-	/**
-	 * This will add the tab selection to the url.
-	 *
-	 * @param string $url
-	 * @return void
-	 */
-	public function add_tab_argument( $url ) {
-		if ( isset( $_POST['cmb_tab'] ) && '' !== $_POST['cmb_tab'] ) { // @codingStandardsIgnoreLine
-			$tab_selection = sanitize_text_field( $_POST['cmb_tab'] ); // @codingStandardsIgnoreLine
-			$tab_selection = str_replace( array( 'settings_', '_tab' ), '', $tab_selection ); // @codingStandardsIgnoreLine
-			if ( 'single' !== $tab_selection ) {
-				$url = add_query_arg( 'cmb_tab', $tab_selection, $url );
-			} else {
-				$url = remove_query_arg( 'cmb_tab', $url );
-			}
-		}
-		return $url;
-	}
+     /**
+      * This will add the tab selection to the url.
+      *
+      * @param string $url
+      * @return void
+      */
+     public function add_tab_argument( $url ) {
+          if ( isset( $_POST['cmb_tab'] ) && '' !== $_POST['cmb_tab'] ) { // @codingStandardsIgnoreLine
+               $tab_selection = sanitize_text_field( $_POST['cmb_tab'] ); // @codingStandardsIgnoreLine
+               $tab_selection = str_replace( array( 'settings_', '_tab' ), '', $tab_selection ); // @codingStandardsIgnoreLine
+               if ( 'single' !== $tab_selection ) {
+                    $url = add_query_arg( 'cmb_tab', $tab_selection, $url );
+               } else {
+                    $url = remove_query_arg( 'cmb_tab', $url );
+               }
+          }
+          return $url;
+     }
 }

Spacing +43 added lines, -43 removed lines

@@ -37,14 +37,14 @@ 
 	 * Contructor
 	 */
 	public function __construct() {
-		add_filter( 'cmb2_enqueue_css', array( $this, 'disable_cmb2_styles' ), 1, 1 );
-		add_action( 'cmb2_before_form', array( $this, 'generate_navigation' ), 10, 4 );
-		add_action( 'cmb2_before_title_field_row', array( $this, 'output_tab_open_div' ), 10, 1 );
-		add_action( 'cmb2_after_tab_closing_field_row', array( $this, 'output_tab_closing_div' ), 10, 1 );
-		add_action( 'cmb2_render_tab_closing', array( $this, 'cmb2_render_callback_for_tab_closing' ), 10, 5 );
-		add_filter( 'cmb2_sanitize_tab_closing', array( $this, 'cmb2_sanitize_tab_closing_callback' ), 10, 2 );
-		add_action( 'cmb2_after_form', array( $this, 'navigation_js' ), 10, 4 );
-		add_filter( 'cmb2_options_page_redirect_url', array( $this, 'add_tab_argument' ), 10, 1 );
+		add_filter('cmb2_enqueue_css', array($this, 'disable_cmb2_styles'), 1, 1);
+		add_action('cmb2_before_form', array($this, 'generate_navigation'), 10, 4);
+		add_action('cmb2_before_title_field_row', array($this, 'output_tab_open_div'), 10, 1);
+		add_action('cmb2_after_tab_closing_field_row', array($this, 'output_tab_closing_div'), 10, 1);
+		add_action('cmb2_render_tab_closing', array($this, 'cmb2_render_callback_for_tab_closing'), 10, 5);
+		add_filter('cmb2_sanitize_tab_closing', array($this, 'cmb2_sanitize_tab_closing_callback'), 10, 2);
+		add_action('cmb2_after_form', array($this, 'navigation_js'), 10, 4);
+		add_filter('cmb2_options_page_redirect_url', array($this, 'add_tab_argument'), 10, 1);
 	}
 
 	/**
@@ -56,7 +56,7 @@ 
 	 */
 	public static function get_instance() {
 		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
+		if (null == self::$instance) {
 			self::$instance = new self();
 		}
 		return self::$instance;
@@ -67,10 +67,10 @@ 
 	 *
 	 * @return bool $enabled Whether to enable (enqueue) styles.
 	 */
-	public function disable_cmb2_styles( $enabled ) {
-		if ( is_admin() ) {
+	public function disable_cmb2_styles($enabled) {
+		if (is_admin()) {
 			$current_screen = get_current_screen();
-			if ( is_object( $current_screen ) && 'settings_page_lsx-search-settings' === $current_screen->id ) {
+			if (is_object($current_screen) && 'settings_page_lsx-search-settings' === $current_screen->id) {
 				$enabled = false;
 			}
 		}
@@ -86,14 +86,14 @@ 
 	 * @param object $cmb2_obj
 	 * @return void
 	 */
-	public function generate_navigation( $cmb_id, $object_id, $object_type, $cmb2_obj ) {
-		if ( 'lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type ) {
+	public function generate_navigation($cmb_id, $object_id, $object_type, $cmb2_obj) {
+		if ('lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type) {
 			$this->navigation      = array();
 			$this->is_options_page = true;
-			if ( isset( $cmb2_obj->meta_box['fields'] ) && ! empty( $cmb2_obj->meta_box['fields'] ) ) {
-				foreach ( $cmb2_obj->meta_box['fields'] as $field_index => $field ) {
-					if ( 'title' === $field['type'] ) {
-						$this->navigation[ $field_index ] = $field['name'];
+			if (isset($cmb2_obj->meta_box['fields']) && !empty($cmb2_obj->meta_box['fields'])) {
+				foreach ($cmb2_obj->meta_box['fields'] as $field_index => $field) {
+					if ('title' === $field['type']) {
+						$this->navigation[$field_index] = $field['name'];
 					}
 				}
 			}
@@ -107,32 +107,32 @@ 
 	 * @return void
 	 */
 	public function output_navigation() {
-		if ( ! empty( $this->navigation ) ) {
+		if (!empty($this->navigation)) {
 			?>
 			<div class="wp-filter hide-if-no-js">
 				<ul class="filter-links">
 					<?php
 					$first_tab    = true;
-					$total        = count( $this->navigation );
+					$total        = count($this->navigation);
 					$count        = 0;
 					$separator    = ' |';
 					$selected_tab = '';
-					if ( isset( $_GET['cmb_tab'] ) && '' !== $_GET['cmb_tab'] ) {
-						$selected_tab  = sanitize_text_field( $_GET['cmb_tab'] );
-						$selected_tab  = 'settings_' . $selected_tab;
+					if (isset($_GET['cmb_tab']) && '' !== $_GET['cmb_tab']) {
+						$selected_tab  = sanitize_text_field($_GET['cmb_tab']);
+						$selected_tab  = 'settings_'.$selected_tab;
 					}
-					foreach ( $this->navigation as $key => $label ) {
+					foreach ($this->navigation as $key => $label) {
 						$count++;
 						$current_css = '';
-						if ( ( true === $first_tab && '' === $selected_tab ) || $key === $selected_tab ) {
+						if ((true === $first_tab && '' === $selected_tab) || $key === $selected_tab) {
 							$first_tab   = false;
 							$current_css = 'current';
 						}
-						if ( $count === $total ) {
+						if ($count === $total) {
 							$separator = '';
 						}
 						?>
-							<li><a href="#" class="<?php echo esc_attr( $current_css ); ?>" data-sort="<?php echo esc_attr( $key ); ?>_tab"><?php echo esc_attr( $label ); ?></a><?php echo esc_attr( $separator ); ?></li>
+							<li><a href="#" class="<?php echo esc_attr($current_css); ?>" data-sort="<?php echo esc_attr($key); ?>_tab"><?php echo esc_attr($label); ?></a><?php echo esc_attr($separator); ?></li>
 						<?php
 					}
 					?>
@@ -148,10 +148,10 @@ 
 	 * @param object $field CMB2_Field();
 	 * @return void
 	 */
-	public function output_tab_open_div( $field ) {
-		if ( true === $this->is_options_page && isset( $field->args['type'] ) && 'title' === $field->args['type'] ) {
+	public function output_tab_open_div($field) {
+		if (true === $this->is_options_page && isset($field->args['type']) && 'title' === $field->args['type']) {
 			?>
-			<div id="<?php echo esc_attr( $field->args['id'] ); ?>_tab" class="tab tab-nav hidden">
+			<div id="<?php echo esc_attr($field->args['id']); ?>_tab" class="tab tab-nav hidden">
 			<?php
 		}
 	}
@@ -162,19 +162,19 @@ 
 	 * @param object $field CMB2_Field();
 	 * @return void
 	 */
-	public function output_tab_closing_div( $field ) {
-		if ( true === $this->is_options_page && isset( $field->args['type'] ) && 'tab_closing' === $field->args['type'] ) {
+	public function output_tab_closing_div($field) {
+		if (true === $this->is_options_page && isset($field->args['type']) && 'tab_closing' === $field->args['type']) {
 			?>
 			</div>
 			<?php
 		}
 	}
 
-	public function cmb2_render_callback_for_tab_closing( $field, $escaped_value, $object_id, $object_type, $field_type_object ) {
+	public function cmb2_render_callback_for_tab_closing($field, $escaped_value, $object_id, $object_type, $field_type_object) {
 		return;
 	}
 
-	public function cmb2_sanitize_tab_closing_callback( $override_value, $value ) {
+	public function cmb2_sanitize_tab_closing_callback($override_value, $value) {
 		return '';
 	}
 
@@ -187,8 +187,8 @@ 
 	 * @param object $cmb2_obj
 	 * @return void
 	 */
-	public function navigation_js( $cmb_id, $object_id, $object_type, $cmb2_obj ) {
-		if ( 'lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type ) {
+	public function navigation_js($cmb_id, $object_id, $object_type, $cmb2_obj) {
+		if ('lsx_search_settings' === $cmb_id && 'lsx-search-settings' === $object_id && 'options-page' === $object_type) {
 			?>
 			<script>
 				var LSX_SEARCH_CMB2 = Object.create( null );
@@ -270,14 +270,14 @@ 
 	 * @param string $url
 	 * @return void
 	 */
-	public function add_tab_argument( $url ) {
-		if ( isset( $_POST['cmb_tab'] ) && '' !== $_POST['cmb_tab'] ) { // @codingStandardsIgnoreLine
-			$tab_selection = sanitize_text_field( $_POST['cmb_tab'] ); // @codingStandardsIgnoreLine
-			$tab_selection = str_replace( array( 'settings_', '_tab' ), '', $tab_selection ); // @codingStandardsIgnoreLine
-			if ( 'single' !== $tab_selection ) {
-				$url = add_query_arg( 'cmb_tab', $tab_selection, $url );
+	public function add_tab_argument($url) {
+		if (isset($_POST['cmb_tab']) && '' !== $_POST['cmb_tab']) { // @codingStandardsIgnoreLine
+			$tab_selection = sanitize_text_field($_POST['cmb_tab']); // @codingStandardsIgnoreLine
+			$tab_selection = str_replace(array('settings_', '_tab'), '', $tab_selection); // @codingStandardsIgnoreLine
+			if ('single' !== $tab_selection) {
+				$url = add_query_arg('cmb_tab', $tab_selection, $url);
 			} else {
-				$url = remove_query_arg( 'cmb_tab', $url );
+				$url = remove_query_arg('cmb_tab', $url);
 			}
 		}
 		return $url;

classes/class-lsx-search.php

Indentation +64 added lines, -64 removed lines

@@ -6,76 +6,76 @@ 
  */
 class LSX_Search {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object LSX_Search()
-	 */
-	protected static $instance = null;
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object LSX_Search()
+      */
+     protected static $instance = null;
 
-	/**
-	 * @var LSX_Search_Admin()
-	 */
-	public $admin;
+     /**
+      * @var LSX_Search_Admin()
+      */
+     public $admin;
 
-	/**
-	 * @var LSX_Search_Frontend()
-	 */
-	public $frontend;
+     /**
+      * @var LSX_Search_Frontend()
+      */
+     public $frontend;
 
-	/**
-	 * @var LSX_Search_FacetWP()
-	 */
-	public $facetwp;
+     /**
+      * @var LSX_Search_FacetWP()
+      */
+     public $facetwp;
 
-	/**
-	 * @var LSX_Search_Shortcode()
-	 */
-	public $shortcode;
+     /**
+      * @var LSX_Search_Shortcode()
+      */
+     public $shortcode;
 
-	/**
-	 * LSX_Search constructor
-	 */
-	public function __construct() {
-		$this->load_vendors();
+     /**
+      * LSX_Search constructor
+      */
+     public function __construct() {
+          $this->load_vendors();
 
-		require_once LSX_SEARCH_PATH . '/classes/class-admin.php';
-		require_once LSX_SEARCH_PATH . '/classes/class-frontend.php';
-		require_once LSX_SEARCH_PATH . '/classes/class-lsx-search-facetwp.php';
-		require_once LSX_SEARCH_PATH . '/classes/class-lsx-search-shortcode.php';
+          require_once LSX_SEARCH_PATH . '/classes/class-admin.php';
+          require_once LSX_SEARCH_PATH . '/classes/class-frontend.php';
+          require_once LSX_SEARCH_PATH . '/classes/class-lsx-search-facetwp.php';
+          require_once LSX_SEARCH_PATH . '/classes/class-lsx-search-shortcode.php';
 
-		$this->admin     = \lsx\search\classes\Admin::get_instance();
-		$this->frontend  = \lsx\search\classes\Frontend::get_instance();
-		$this->facetwp   = new LSX_Search_FacetWP();
-		$this->shortcode = new LSX_Search_Shortcode();
-	}
+          $this->admin     = \lsx\search\classes\Admin::get_instance();
+          $this->frontend  = \lsx\search\classes\Frontend::get_instance();
+          $this->facetwp   = new LSX_Search_FacetWP();
+          $this->shortcode = new LSX_Search_Shortcode();
+     }
 
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object LSX_Search()    A single instance of this class.
-	 */
-	public static function get_instance() {
-		// If the single instance hasn't been set, set it now.
-		if ( null === self::$instance ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object LSX_Search()    A single instance of this class.
+      */
+     public static function get_instance() {
+          // If the single instance hasn't been set, set it now.
+          if ( null === self::$instance ) {
+               self::$instance = new self();
+          }
+          return self::$instance;
+     }
 
-	/**
-	 * Loads the plugin functions.
-	 */
-	private function load_vendors() {
-		// Configure custom fields.
-		if ( ! class_exists( 'CMB2' ) ) {
-			require_once LSX_SEARCH_PATH . 'vendor/CMB2/init.php';
-		}
-	}
+     /**
+      * Loads the plugin functions.
+      */
+     private function load_vendors() {
+          // Configure custom fields.
+          if ( ! class_exists( 'CMB2' ) ) {
+               require_once LSX_SEARCH_PATH . 'vendor/CMB2/init.php';
+          }
+     }
 }
 
 /**
@@ -84,8 +84,8 @@ 
  * @return object LSX_Search();
  */
 function lsx_search() {
-	global $lsx_search;
-	$lsx_search = LSX_Search::get_instance();
-	return $lsx_search;
+     global $lsx_search;
+     $lsx_search = LSX_Search::get_instance();
+     return $lsx_search;
 }
 lsx_search();

Spacing +7 added lines, -7 removed lines

@@ -41,10 +41,10 @@ 
 	public function __construct() {
 		$this->load_vendors();
 
-		require_once LSX_SEARCH_PATH . '/classes/class-admin.php';
-		require_once LSX_SEARCH_PATH . '/classes/class-frontend.php';
-		require_once LSX_SEARCH_PATH . '/classes/class-lsx-search-facetwp.php';
-		require_once LSX_SEARCH_PATH . '/classes/class-lsx-search-shortcode.php';
+		require_once LSX_SEARCH_PATH.'/classes/class-admin.php';
+		require_once LSX_SEARCH_PATH.'/classes/class-frontend.php';
+		require_once LSX_SEARCH_PATH.'/classes/class-lsx-search-facetwp.php';
+		require_once LSX_SEARCH_PATH.'/classes/class-lsx-search-shortcode.php';
 
 		$this->admin     = \lsx\search\classes\Admin::get_instance();
 		$this->frontend  = \lsx\search\classes\Frontend::get_instance();
@@ -61,7 +61,7 @@ 
 	 */
 	public static function get_instance() {
 		// If the single instance hasn't been set, set it now.
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new self();
 		}
 		return self::$instance;
@@ -72,8 +72,8 @@ 
 	 */
 	private function load_vendors() {
 		// Configure custom fields.
-		if ( ! class_exists( 'CMB2' ) ) {
-			require_once LSX_SEARCH_PATH . 'vendor/CMB2/init.php';
+		if (!class_exists('CMB2')) {
+			require_once LSX_SEARCH_PATH.'vendor/CMB2/init.php';
 		}
 	}
 }

classes/facetwp/class-hierarchy.php

Indentation +69 added lines, -69 removed lines

@@ -7,61 +7,61 @@ 
 
 class Hierarchy {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx\search\classes\facetwp\Hierarchy()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		add_filter( 'facetwp_facet_html', array( $this, 'checkbox_facet_html' ), 100, 2 );
-	}
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx\search\classes\facetwp\Hierarchy()    A single instance of this class.
-	 */
-	public static function get_instance() {
-		// If the single instance hasn't been set, set it now.
-		if ( null === self::$instance ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
-
-	public function checkbox_facet_html( $output, $params ) {
-		if ( 'checkboxes' === $params['facet']['type'] && 'yes' === $params['facet']['hierarchical'] ) {
-			$output = $this->render_hierarchy( $params );
-		}
-		return $output;
-	}
-
-	/**
-	 * Generate the facet HTML (hierarchical taxonomies)
-	 */
-	function render_hierarchy( $params ) {
-
-		$output = '';
-		$facet = $params['facet'];
-		$selected_values = (array) $params['selected_values'];
-		$values = FWP()->helper->sort_taxonomy_values( $params['values'], $facet['orderby'] );
-
-		$init_depth = -1;
-		$last_depth = -1;
-
-		foreach ( $values as $result ) {
-			$depth = (int) $result['depth'];
-
-			/*if ( -1 == $last_depth ) {
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx\search\classes\facetwp\Hierarchy()
+      */
+     protected static $instance = null;
+
+     /**
+      * Constructor
+      */
+     public function __construct() {
+          add_filter( 'facetwp_facet_html', array( $this, 'checkbox_facet_html' ), 100, 2 );
+     }
+
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object \lsx\search\classes\facetwp\Hierarchy()    A single instance of this class.
+      */
+     public static function get_instance() {
+          // If the single instance hasn't been set, set it now.
+          if ( null === self::$instance ) {
+               self::$instance = new self();
+          }
+          return self::$instance;
+     }
+
+     public function checkbox_facet_html( $output, $params ) {
+          if ( 'checkboxes' === $params['facet']['type'] && 'yes' === $params['facet']['hierarchical'] ) {
+               $output = $this->render_hierarchy( $params );
+          }
+          return $output;
+     }
+
+     /**
+      * Generate the facet HTML (hierarchical taxonomies)
+      */
+     function render_hierarchy( $params ) {
+
+          $output = '';
+          $facet = $params['facet'];
+          $selected_values = (array) $params['selected_values'];
+          $values = FWP()->helper->sort_taxonomy_values( $params['values'], $facet['orderby'] );
+
+          $init_depth = -1;
+          $last_depth = -1;
+
+          foreach ( $values as $result ) {
+               $depth = (int) $result['depth'];
+
+               /*if ( -1 == $last_depth ) {
 				$init_depth = $depth;
 			}
 			elseif ( $depth > $last_depth ) {
@@ -73,23 +73,23 @@ 
 				}
 			}*/
 
-			$selected = in_array( $result['facet_value'], $selected_values ) ? ' checked' : '';
-			$selected .= ( 0 == $result['counter'] && '' == $selected ) ? ' disabled' : '';
+               $selected = in_array( $result['facet_value'], $selected_values ) ? ' checked' : '';
+               $selected .= ( 0 == $result['counter'] && '' == $selected ) ? ' disabled' : '';
 
-			$is_child = ( 0 == $result['parent_id'] && '0' == $result['parent_id'] ) ? ' is-child' : '';
-			$depth_css = ' depth-' . $result['depth'];
+               $is_child = ( 0 == $result['parent_id'] && '0' == $result['parent_id'] ) ? ' is-child' : '';
+               $depth_css = ' depth-' . $result['depth'];
 
-			$output .= '<div class="facetwp-checkbox' . $selected . $is_child . $depth_css . '" data-parent-id="' . esc_attr( $result['parent_id'] ) . '" data-value="' . esc_attr( $result['facet_value'] ) . '">';
-			$output .= esc_html( $result['facet_display_value'] ) . ' <span class="facetwp-counter">(' . $result['counter'] . ')</span>';
-			$output .= '</div>';
+               $output .= '<div class="facetwp-checkbox' . $selected . $is_child . $depth_css . '" data-parent-id="' . esc_attr( $result['parent_id'] ) . '" data-value="' . esc_attr( $result['facet_value'] ) . '">';
+               $output .= esc_html( $result['facet_display_value'] ) . ' <span class="facetwp-counter">(' . $result['counter'] . ')</span>';
+               $output .= '</div>';
 
-			$last_depth = $depth;
-		}
+               $last_depth = $depth;
+          }
 
-		for ( $i = $last_depth; $i > $init_depth; $i-- ) {
-			$output .= '</div>';
-		}
+          for ( $i = $last_depth; $i > $init_depth; $i-- ) {
+               $output .= '</div>';
+          }
 
-		return $output;
-	}
+          return $output;
+     }
 }

Spacing +15 added lines, -15 removed lines

@@ -20,7 +20,7 @@ 
 	 * Constructor
 	 */
 	public function __construct() {
-		add_filter( 'facetwp_facet_html', array( $this, 'checkbox_facet_html' ), 100, 2 );
+		add_filter('facetwp_facet_html', array($this, 'checkbox_facet_html'), 100, 2);
 	}
 
 	/**
@@ -32,15 +32,15 @@ 
 	 */
 	public static function get_instance() {
 		// If the single instance hasn't been set, set it now.
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new self();
 		}
 		return self::$instance;
 	}
 
-	public function checkbox_facet_html( $output, $params ) {
-		if ( 'checkboxes' === $params['facet']['type'] && 'yes' === $params['facet']['hierarchical'] ) {
-			$output = $this->render_hierarchy( $params );
+	public function checkbox_facet_html($output, $params) {
+		if ('checkboxes' === $params['facet']['type'] && 'yes' === $params['facet']['hierarchical']) {
+			$output = $this->render_hierarchy($params);
 		}
 		return $output;
 	}
@@ -48,17 +48,17 @@ 
 	/**
 	 * Generate the facet HTML (hierarchical taxonomies)
 	 */
-	function render_hierarchy( $params ) {
+	function render_hierarchy($params) {
 
 		$output = '';
 		$facet = $params['facet'];
 		$selected_values = (array) $params['selected_values'];
-		$values = FWP()->helper->sort_taxonomy_values( $params['values'], $facet['orderby'] );
+		$values = FWP()->helper->sort_taxonomy_values($params['values'], $facet['orderby']);
 
 		$init_depth = -1;
 		$last_depth = -1;
 
-		foreach ( $values as $result ) {
+		foreach ($values as $result) {
 			$depth = (int) $result['depth'];
 
 			/*if ( -1 == $last_depth ) {
@@ -73,20 +73,20 @@ 
 				}
 			}*/
 
-			$selected = in_array( $result['facet_value'], $selected_values ) ? ' checked' : '';
-			$selected .= ( 0 == $result['counter'] && '' == $selected ) ? ' disabled' : '';
+			$selected = in_array($result['facet_value'], $selected_values) ? ' checked' : '';
+			$selected .= (0 == $result['counter'] && '' == $selected) ? ' disabled' : '';
 
-			$is_child = ( 0 == $result['parent_id'] && '0' == $result['parent_id'] ) ? ' is-child' : '';
-			$depth_css = ' depth-' . $result['depth'];
+			$is_child = (0 == $result['parent_id'] && '0' == $result['parent_id']) ? ' is-child' : '';
+			$depth_css = ' depth-'.$result['depth'];
 
-			$output .= '<div class="facetwp-checkbox' . $selected . $is_child . $depth_css . '" data-parent-id="' . esc_attr( $result['parent_id'] ) . '" data-value="' . esc_attr( $result['facet_value'] ) . '">';
-			$output .= esc_html( $result['facet_display_value'] ) . ' <span class="facetwp-counter">(' . $result['counter'] . ')</span>';
+			$output .= '<div class="facetwp-checkbox'.$selected.$is_child.$depth_css.'" data-parent-id="'.esc_attr($result['parent_id']).'" data-value="'.esc_attr($result['facet_value']).'">';
+			$output .= esc_html($result['facet_display_value']).' <span class="facetwp-counter">('.$result['counter'].')</span>';
 			$output .= '</div>';
 
 			$last_depth = $depth;
 		}
 
-		for ( $i = $last_depth; $i > $init_depth; $i-- ) {
+		for ($i = $last_depth; $i > $init_depth; $i--) {
 			$output .= '</div>';
 		}
 

classes/facetwp/class-post-connections.php

Indentation +374 added lines, -374 removed lines

@@ -7,381 +7,381 @@
 
 class Post_Connections {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx\search\classes\facetwp\Post_Connections()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * Holds the plugin options.
-	 *
-	 * @var array
-	 */
-	public $options = array();
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->get_cmb2_options();
-		add_filter( 'facetwp_indexer_row_data', array( $this, 'facetwp_index_row_data' ), 10, 2 );
-		add_filter( 'facetwp_index_row', array( $this, 'facetwp_index_row' ), 10, 2 );
-		add_filter( 'facetwp_facet_html', array( $this, 'destination_facet_html' ), 10, 2 );
-	}
-
-	/**
-	 * Gets the cmb2 options.
-	 *
-	 * @return void
-	 */
-	private function get_cmb2_options() {
-		$cmb2_options = get_option( 'lsx-search-settings' );
-		if ( false !== $cmb2_options && ! empty( $cmb2_options ) ) {
-			$this->options['display'] = $cmb2_options;
-			foreach ( $this->options['display'] as $option_key => $option_value ) {
-				if ( is_array( $option_value ) && ! empty( $option_value ) ) {
-					$new_values = array();
-					foreach ( $option_value as $empty_key => $key_value ) {
-						$new_values[ $key_value ] = 'on';
-					}
-					$this->options['display'][ $option_key ] = $new_values;
-				}
-			}
-		}
-
-		/*print_r('<pre>');
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx\search\classes\facetwp\Post_Connections()
+      */
+     protected static $instance = null;
+
+     /**
+      * Holds the plugin options.
+      *
+      * @var array
+      */
+     public $options = array();
+
+     /**
+      * Constructor
+      */
+     public function __construct() {
+          $this->get_cmb2_options();
+          add_filter( 'facetwp_indexer_row_data', array( $this, 'facetwp_index_row_data' ), 10, 2 );
+          add_filter( 'facetwp_index_row', array( $this, 'facetwp_index_row' ), 10, 2 );
+          add_filter( 'facetwp_facet_html', array( $this, 'destination_facet_html' ), 10, 2 );
+     }
+
+     /**
+      * Gets the cmb2 options.
+      *
+      * @return void
+      */
+     private function get_cmb2_options() {
+          $cmb2_options = get_option( 'lsx-search-settings' );
+          if ( false !== $cmb2_options && ! empty( $cmb2_options ) ) {
+               $this->options['display'] = $cmb2_options;
+               foreach ( $this->options['display'] as $option_key => $option_value ) {
+                    if ( is_array( $option_value ) && ! empty( $option_value ) ) {
+                         $new_values = array();
+                         foreach ( $option_value as $empty_key => $key_value ) {
+                              $new_values[ $key_value ] = 'on';
+                         }
+                         $this->options['display'][ $option_key ] = $new_values;
+                    }
+               }
+          }
+
+          /*print_r('<pre>');
 		print_r($this->options);
 		print_r('</pre>');
 		die();*/
-	}
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx\search\classes\facetwp\Post_Connections()    A single instance of this class.
-	 */
-	public static function get_instance() {
-		// If the single instance hasn't been set, set it now.
-		if ( null === self::$instance ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
-
-	/**
-	 *	Alter the rows and include extra facets rows for the continents
-	 */
-	public function facetwp_index_row_data( $rows, $params ) {
-		switch ( $params['facet']['source'] ) {
-			case 'cf/destination_to_tour':
-			case 'cf/destination_to_accommodation':
-				$countries = array();
-
-				foreach ( $rows as $r_index => $row ) {
-					$parent                        = wp_get_post_parent_id( $row['facet_value'] );
-					$rows[ $r_index ]['parent_id'] = $parent;
-
-					if ( 0 === $parent || '0' === $parent ) {
-						if ( ! isset( $countries[ $r_index ] ) ) {
-							$countries[ $r_index ] = $row['facet_value'];
-						}
-
-						if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-							$rows[ $r_index ]['depth'] = 1;
-						} else {
-							$rows[ $r_index ]['depth'] = 0;
-						}
-					} else {
-						if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-							$rows[ $r_index ]['depth'] = 2;
-						} else {
-							$rows[ $r_index ]['depth'] = 1;
-						}
-					}
-				}
-				if ( ! empty( $this->options['display']['enable_search_continent_filter'] ) ) {
-					if ( ! empty( $countries ) ) {
-						foreach ( $countries as $row_index => $country ) {
-							$continents   = wp_get_object_terms( $country, 'continent' );
-							$continent_id = 0;
-
-							if ( ! is_wp_error( $continents ) ) {
-								$new_row = $params['defaults'];
-								if ( ! is_array( $continents ) ) {
-									$continents = array( $continents );
-								}
-
-								foreach ( $continents as $continent ) {
-									$new_row['facet_value'] = $continent->slug;
-									$new_row['facet_display_value'] = $continent->name;
-									$continent_id = $continent->term_id;
-									$new_row['depth'] = 0;
-								}
-								$rows[] = $new_row;
-								$rows[ $row_index ]['parent_id'] = $continent_id;
-							}
-						}
-					}
-				}
-
-				break;
-
-			default:
-				break;
-		}
-
-		return $rows;
-	}
-
-	/**
-	 * Displays the destination specific settings
-	 */
-	public function facetwp_index_row( $params, $class ) {
-		$custom_field = false;
-		$meta_key = false;
-
-		preg_match( '/cf\//', $class->facet['source'], $custom_field );
-		preg_match( '/_to_/', $class->facet['source'], $meta_key );
-
-		if ( ! empty( $custom_field ) && ! empty( $meta_key ) ) {
-
-			if ( ( 'cf/destination_to_accommodation' === $class->facet['source'] || 'cf/destination_to_tour' === $class->facet['source'] ) && ! empty( $this->options['display']['engine_search_continent_filter'] ) && ( '0' === (string) $params['depth'] ) ) {
-				$title = '';
-			} else {
-				$title = get_the_title( $params['facet_value'] );
-				if ( '' !== $title ) {
-					$params['facet_display_value'] = $title;
-				}
-				if ( '' === $title && ! empty( $meta_key ) ) {
-					$params['facet_value'] = '';
-				}
-			}
-		}
-
-		// If its a price, save the value as a standard number.
-		if ( 'cf/price' === $class->facet['source'] ) {
-			$params['facet_value'] = preg_replace( '/[^0-9.]/', '', $params['facet_value'] );
-			$params['facet_value'] = ltrim( $params['facet_value'], '.' );
-			#$params['facet_value'] = number_format( (int) $params['facet_value'], 2 );
-			$params['facet_display_value'] = $params['facet_value'];
-		}
-
-		// If its a duration, save the value as a standard number.
-		if ( 'cf/duration' === $class->facet['source'] ) {
-			$params['facet_value'] = preg_replace( '/[^0-9 ]/', '', $params['facet_value'] );
-			$params['facet_value'] = trim( $params['facet_value'] );
-			$params['facet_value'] = explode( ' ', $params['facet_value'] );
-			$params['facet_value'] = $params['facet_value'][0];
-			#$params['facet_value'] = (int) $params['facet_value'];
-			$params['facet_display_value'] = $params['facet_value'];
-		}
-
-		return $params;
-	}
-
-	/**
-	 * Checks the facet source value and outputs the destination facet HTML if needed.
-	 *
-	 * @param  string  $output
-	 * @param  array   $params
-	 * @return string
-	 */
-	public function destination_facet_html( $output, $params ) {
-		$possible_keys = array(
-			'cf/destination_to_accommodation',
-			'cf/destination_to_tour',
-			'cf/destination_to_special',
-			'cf/destination_to_activity',
-			'cf/destination_to_review',
-			'cf/destination_to_vehicle',
-		);
-		if ( in_array( $params['facet']['source'], $possible_keys ) ) {
-			$output = $this->destination_facet_render( $params );
-		}
-		return $output;
-	}
-
-	/**
-	 * Generate the facet HTML
-	 */
-	public function destination_facet_render( $params ) {
-		$facet = $params['facet'];
-
-		$output = '';
-		$values = (array) $params['values'];
-		$selected_values = (array) $params['selected_values'];
-		$soft_limit = empty( $facet['soft_limit'] ) ? 0 : (int) $facet['soft_limit'];
-		$countries = array();
-		$continents = array();
-
-		$continent_terms = get_terms(
-			array(
-				'taxonomy' => 'continent',
-			)
-		);
-
-		if ( ! is_wp_error( $continent_terms ) ) {
-			foreach ( $continent_terms as $continent ) {
-				$continents[ $continent->term_id ] = $continent->slug;
-			}
-		}
-
-		//Create a relationship of the facet value and the their depths
-		$depths = array();
-		$parents = array();
-		foreach ( $values as $value ) {
-			$depths[ $value['facet_value'] ]  = (int) $value['depth'];
-			$parents[ $value['facet_value'] ] = (int) $value['parent_id'];
-		}
-
-		//Determine the current depth and check if the selected values parents are in the selected array.
-		$current_depth = 0;
-		$additional_values = array();
-		if ( ! empty( $selected_values ) ) {
-			foreach ( $selected_values as $selected ) {
-				if ( $depths[ $selected ] > $current_depth ) {
-					$current_depth = $depths[ $selected ];
-				}
-			}
-			$current_depth++;
-		}
-
-		if ( ! empty( $additional_values ) ) {
-			$selected_values = array_merge( $selected_values, $additional_values );
-		}
-
-		// This is where the items are sorted by their depth
-		$sorted_values = array();
-		$stored = $values;
-
-		//sort the options so
-		foreach ( $values as $key => $result ) {
-			if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-				if ( in_array( $result['facet_value'], $continents ) ) {
-					$sorted_values[] = $result;
-					$destinations    = $this->get_countries( $stored, $result['facet_value'], $continents, '1' );
-
-					if ( ! empty( $destinations ) ) {
-						foreach ( $destinations as $destination ) {
-							$sorted_values[] = $destination;
-						}
-					}
-				}
-			} else {
-				if ( '0' === $result['depth'] || 0 === $result['depth'] ) {
-					$sorted_values[] = $result;
-					$destinations    = $this->get_regions( $stored, $result['facet_value'], '1' );
-
-					if ( ! empty( $destinations ) ) {
-						foreach ( $destinations as $destination ) {
-							$sorted_values[] = $destination;
-						}
-					}
-				}
-			}
-		}
-		$values = $sorted_values;
-
-		$continent_class = '';
-		$country_class = '';
-
-		// Run through each value and output the values.
-		foreach ( $values as $key => $facet ) {
-			$depth_type = '';
-
-			if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-				switch ( $facet['depth'] ) {
-					case '0':
-						$depth_type = '';
-						$continent_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' continent-checked' : '';
-						break;
-
-					case '1':
-						$depth_type = 'country' . $continent_class;
-						$country_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' country-checked' : '';
-						break;
-
-					case '2':
-						$depth_type = 'region' . $continent_class . $country_class;
-						break;
-				}
-			} else {
-				switch ( $facet['depth'] ) {
-					case '0':
-						$depth_type = 'country continent-checked';
-						$country_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' country-checked' : '';
-						break;
-
-					case '1':
-						$depth_type = 'region continent-checked' . $country_class;
-						break;
-				}
-			}
-
-			if ( $facet['depth'] <= $current_depth ) {
-				$options[] = $this->format_single_facet( $key, $facet, $selected_values, $depth_type );
-			}
-		}
-
-		if ( ! empty( $options ) ) {
-			$output = implode( '', $options );
-		}
-
-		return $output;
-	}
-
-	/**
-	 * Gets the direct countries from the array.
-	 */
-	public function get_countries( $values, $parent, $continents, $depth ) {
-		$children = array();
-		$stored = $values;
-
-		foreach ( $values as $value ) {
-			if ( isset( $continents[ $value['parent_id'] ] ) && $continents[ $value['parent_id'] ] === $parent && $value['depth'] === $depth ) {
-				$children[] = $value;
-
-				$destinations = $this->get_regions( $stored, $value['facet_value'], '2' );
-				if ( ! empty( $destinations ) ) {
-					foreach ( $destinations as $destination ) {
-						$children[] = $destination;
-					}
-				}
-			}
-		}
-		return $children;
-	}
-
-	/**
-	 * Gets the direct regions from the array.
-	 */
-	public function get_regions( $values, $parent, $depth ) {
-		$children = array();
-		foreach ( $values as $value ) {
-			if ( $value['parent_id'] === $parent && $value['depth'] === $depth ) {
-				$children[] = $value;
-			}
-		}
-		return $children;
-	}
-
-	public function format_single_facet( $key, $result, $selected_values, $region = '' ) {
-		$temp_html = '';
-
-		$selected = in_array( $result['facet_value'], $selected_values ) ? ' checked' : '';
-		$selected .= ( 0 == $result['counter'] && '' == $selected ) ? ' disabled' : '';
-		$selected .= ' ' . $region;
-
-		$temp_html .= '<div class="facetwp-checkbox' . $selected . '" data-value="' . $result['facet_value'] . '">';
-		$temp_html .= $result['facet_display_value'] . ' <span class="facetwp-counter">(' . $result['counter'] . ')</span>';
-		$temp_html .= '</div>';
-
-		return $temp_html;
-	}
+     }
+
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object \lsx\search\classes\facetwp\Post_Connections()    A single instance of this class.
+      */
+     public static function get_instance() {
+          // If the single instance hasn't been set, set it now.
+          if ( null === self::$instance ) {
+               self::$instance = new self();
+          }
+          return self::$instance;
+     }
+
+     /**
+      *	Alter the rows and include extra facets rows for the continents
+      */
+     public function facetwp_index_row_data( $rows, $params ) {
+          switch ( $params['facet']['source'] ) {
+               case 'cf/destination_to_tour':
+               case 'cf/destination_to_accommodation':
+                    $countries = array();
+
+                    foreach ( $rows as $r_index => $row ) {
+                         $parent                        = wp_get_post_parent_id( $row['facet_value'] );
+                         $rows[ $r_index ]['parent_id'] = $parent;
+
+                         if ( 0 === $parent || '0' === $parent ) {
+                              if ( ! isset( $countries[ $r_index ] ) ) {
+                                   $countries[ $r_index ] = $row['facet_value'];
+                              }
+
+                              if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
+                                   $rows[ $r_index ]['depth'] = 1;
+                              } else {
+                                   $rows[ $r_index ]['depth'] = 0;
+                              }
+                         } else {
+                              if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
+                                   $rows[ $r_index ]['depth'] = 2;
+                              } else {
+                                   $rows[ $r_index ]['depth'] = 1;
+                              }
+                         }
+                    }
+                    if ( ! empty( $this->options['display']['enable_search_continent_filter'] ) ) {
+                         if ( ! empty( $countries ) ) {
+                              foreach ( $countries as $row_index => $country ) {
+                                   $continents   = wp_get_object_terms( $country, 'continent' );
+                                   $continent_id = 0;
+
+                                   if ( ! is_wp_error( $continents ) ) {
+                                        $new_row = $params['defaults'];
+                                        if ( ! is_array( $continents ) ) {
+                                             $continents = array( $continents );
+                                        }
+
+                                        foreach ( $continents as $continent ) {
+                                             $new_row['facet_value'] = $continent->slug;
+                                             $new_row['facet_display_value'] = $continent->name;
+                                             $continent_id = $continent->term_id;
+                                             $new_row['depth'] = 0;
+                                        }
+                                        $rows[] = $new_row;
+                                        $rows[ $row_index ]['parent_id'] = $continent_id;
+                                   }
+                              }
+                         }
+                    }
+
+                    break;
+
+               default:
+                    break;
+          }
+
+          return $rows;
+     }
+
+     /**
+      * Displays the destination specific settings
+      */
+     public function facetwp_index_row( $params, $class ) {
+          $custom_field = false;
+          $meta_key = false;
+
+          preg_match( '/cf\//', $class->facet['source'], $custom_field );
+          preg_match( '/_to_/', $class->facet['source'], $meta_key );
+
+          if ( ! empty( $custom_field ) && ! empty( $meta_key ) ) {
+
+               if ( ( 'cf/destination_to_accommodation' === $class->facet['source'] || 'cf/destination_to_tour' === $class->facet['source'] ) && ! empty( $this->options['display']['engine_search_continent_filter'] ) && ( '0' === (string) $params['depth'] ) ) {
+                    $title = '';
+               } else {
+                    $title = get_the_title( $params['facet_value'] );
+                    if ( '' !== $title ) {
+                         $params['facet_display_value'] = $title;
+                    }
+                    if ( '' === $title && ! empty( $meta_key ) ) {
+                         $params['facet_value'] = '';
+                    }
+               }
+          }
+
+          // If its a price, save the value as a standard number.
+          if ( 'cf/price' === $class->facet['source'] ) {
+               $params['facet_value'] = preg_replace( '/[^0-9.]/', '', $params['facet_value'] );
+               $params['facet_value'] = ltrim( $params['facet_value'], '.' );
+               #$params['facet_value'] = number_format( (int) $params['facet_value'], 2 );
+               $params['facet_display_value'] = $params['facet_value'];
+          }
+
+          // If its a duration, save the value as a standard number.
+          if ( 'cf/duration' === $class->facet['source'] ) {
+               $params['facet_value'] = preg_replace( '/[^0-9 ]/', '', $params['facet_value'] );
+               $params['facet_value'] = trim( $params['facet_value'] );
+               $params['facet_value'] = explode( ' ', $params['facet_value'] );
+               $params['facet_value'] = $params['facet_value'][0];
+               #$params['facet_value'] = (int) $params['facet_value'];
+               $params['facet_display_value'] = $params['facet_value'];
+          }
+
+          return $params;
+     }
+
+     /**
+      * Checks the facet source value and outputs the destination facet HTML if needed.
+      *
+      * @param  string  $output
+      * @param  array   $params
+      * @return string
+      */
+     public function destination_facet_html( $output, $params ) {
+          $possible_keys = array(
+               'cf/destination_to_accommodation',
+               'cf/destination_to_tour',
+               'cf/destination_to_special',
+               'cf/destination_to_activity',
+               'cf/destination_to_review',
+               'cf/destination_to_vehicle',
+          );
+          if ( in_array( $params['facet']['source'], $possible_keys ) ) {
+               $output = $this->destination_facet_render( $params );
+          }
+          return $output;
+     }
+
+     /**
+      * Generate the facet HTML
+      */
+     public function destination_facet_render( $params ) {
+          $facet = $params['facet'];
+
+          $output = '';
+          $values = (array) $params['values'];
+          $selected_values = (array) $params['selected_values'];
+          $soft_limit = empty( $facet['soft_limit'] ) ? 0 : (int) $facet['soft_limit'];
+          $countries = array();
+          $continents = array();
+
+          $continent_terms = get_terms(
+               array(
+                    'taxonomy' => 'continent',
+               )
+          );
+
+          if ( ! is_wp_error( $continent_terms ) ) {
+               foreach ( $continent_terms as $continent ) {
+                    $continents[ $continent->term_id ] = $continent->slug;
+               }
+          }
+
+          //Create a relationship of the facet value and the their depths
+          $depths = array();
+          $parents = array();
+          foreach ( $values as $value ) {
+               $depths[ $value['facet_value'] ]  = (int) $value['depth'];
+               $parents[ $value['facet_value'] ] = (int) $value['parent_id'];
+          }
+
+          //Determine the current depth and check if the selected values parents are in the selected array.
+          $current_depth = 0;
+          $additional_values = array();
+          if ( ! empty( $selected_values ) ) {
+               foreach ( $selected_values as $selected ) {
+                    if ( $depths[ $selected ] > $current_depth ) {
+                         $current_depth = $depths[ $selected ];
+                    }
+               }
+               $current_depth++;
+          }
+
+          if ( ! empty( $additional_values ) ) {
+               $selected_values = array_merge( $selected_values, $additional_values );
+          }
+
+          // This is where the items are sorted by their depth
+          $sorted_values = array();
+          $stored = $values;
+
+          //sort the options so
+          foreach ( $values as $key => $result ) {
+               if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
+                    if ( in_array( $result['facet_value'], $continents ) ) {
+                         $sorted_values[] = $result;
+                         $destinations    = $this->get_countries( $stored, $result['facet_value'], $continents, '1' );
+
+                         if ( ! empty( $destinations ) ) {
+                              foreach ( $destinations as $destination ) {
+                                   $sorted_values[] = $destination;
+                              }
+                         }
+                    }
+               } else {
+                    if ( '0' === $result['depth'] || 0 === $result['depth'] ) {
+                         $sorted_values[] = $result;
+                         $destinations    = $this->get_regions( $stored, $result['facet_value'], '1' );
+
+                         if ( ! empty( $destinations ) ) {
+                              foreach ( $destinations as $destination ) {
+                                   $sorted_values[] = $destination;
+                              }
+                         }
+                    }
+               }
+          }
+          $values = $sorted_values;
+
+          $continent_class = '';
+          $country_class = '';
+
+          // Run through each value and output the values.
+          foreach ( $values as $key => $facet ) {
+               $depth_type = '';
+
+               if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
+                    switch ( $facet['depth'] ) {
+                         case '0':
+                              $depth_type = '';
+                              $continent_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' continent-checked' : '';
+                              break;
+
+                         case '1':
+                              $depth_type = 'country' . $continent_class;
+                              $country_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' country-checked' : '';
+                              break;
+
+                         case '2':
+                              $depth_type = 'region' . $continent_class . $country_class;
+                              break;
+                    }
+               } else {
+                    switch ( $facet['depth'] ) {
+                         case '0':
+                              $depth_type = 'country continent-checked';
+                              $country_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' country-checked' : '';
+                              break;
+
+                         case '1':
+                              $depth_type = 'region continent-checked' . $country_class;
+                              break;
+                    }
+               }
+
+               if ( $facet['depth'] <= $current_depth ) {
+                    $options[] = $this->format_single_facet( $key, $facet, $selected_values, $depth_type );
+               }
+          }
+
+          if ( ! empty( $options ) ) {
+               $output = implode( '', $options );
+          }
+
+          return $output;
+     }
+
+     /**
+      * Gets the direct countries from the array.
+      */
+     public function get_countries( $values, $parent, $continents, $depth ) {
+          $children = array();
+          $stored = $values;
+
+          foreach ( $values as $value ) {
+               if ( isset( $continents[ $value['parent_id'] ] ) && $continents[ $value['parent_id'] ] === $parent && $value['depth'] === $depth ) {
+                    $children[] = $value;
+
+                    $destinations = $this->get_regions( $stored, $value['facet_value'], '2' );
+                    if ( ! empty( $destinations ) ) {
+                         foreach ( $destinations as $destination ) {
+                              $children[] = $destination;
+                         }
+                    }
+               }
+          }
+          return $children;
+     }
+
+     /**
+      * Gets the direct regions from the array.
+      */
+     public function get_regions( $values, $parent, $depth ) {
+          $children = array();
+          foreach ( $values as $value ) {
+               if ( $value['parent_id'] === $parent && $value['depth'] === $depth ) {
+                    $children[] = $value;
+               }
+          }
+          return $children;
+     }
+
+     public function format_single_facet( $key, $result, $selected_values, $region = '' ) {
+          $temp_html = '';
+
+          $selected = in_array( $result['facet_value'], $selected_values ) ? ' checked' : '';
+          $selected .= ( 0 == $result['counter'] && '' == $selected ) ? ' disabled' : '';
+          $selected .= ' ' . $region;
+
+          $temp_html .= '<div class="facetwp-checkbox' . $selected . '" data-value="' . $result['facet_value'] . '">';
+          $temp_html .= $result['facet_display_value'] . ' <span class="facetwp-counter">(' . $result['counter'] . ')</span>';
+          $temp_html .= '</div>';
+
+          return $temp_html;
+     }
 }

Spacing +105 added lines, -105 removed lines

@@ -28,9 +28,9 @@ 
 	 */
 	public function __construct() {
 		$this->get_cmb2_options();
-		add_filter( 'facetwp_indexer_row_data', array( $this, 'facetwp_index_row_data' ), 10, 2 );
-		add_filter( 'facetwp_index_row', array( $this, 'facetwp_index_row' ), 10, 2 );
-		add_filter( 'facetwp_facet_html', array( $this, 'destination_facet_html' ), 10, 2 );
+		add_filter('facetwp_indexer_row_data', array($this, 'facetwp_index_row_data'), 10, 2);
+		add_filter('facetwp_index_row', array($this, 'facetwp_index_row'), 10, 2);
+		add_filter('facetwp_facet_html', array($this, 'destination_facet_html'), 10, 2);
 	}
 
 	/**
@@ -39,16 +39,16 @@ 
 	 * @return void
 	 */
 	private function get_cmb2_options() {
-		$cmb2_options = get_option( 'lsx-search-settings' );
-		if ( false !== $cmb2_options && ! empty( $cmb2_options ) ) {
+		$cmb2_options = get_option('lsx-search-settings');
+		if (false !== $cmb2_options && !empty($cmb2_options)) {
 			$this->options['display'] = $cmb2_options;
-			foreach ( $this->options['display'] as $option_key => $option_value ) {
-				if ( is_array( $option_value ) && ! empty( $option_value ) ) {
+			foreach ($this->options['display'] as $option_key => $option_value) {
+				if (is_array($option_value) && !empty($option_value)) {
 					$new_values = array();
-					foreach ( $option_value as $empty_key => $key_value ) {
-						$new_values[ $key_value ] = 'on';
+					foreach ($option_value as $empty_key => $key_value) {
+						$new_values[$key_value] = 'on';
 					}
-					$this->options['display'][ $option_key ] = $new_values;
+					$this->options['display'][$option_key] = $new_values;
 				}
 			}
 		}
@@ -68,7 +68,7 @@ 
 	 */
 	public static function get_instance() {
 		// If the single instance hasn't been set, set it now.
-		if ( null === self::$instance ) {
+		if (null === self::$instance) {
 			self::$instance = new self();
 		}
 		return self::$instance;
@@ -77,54 +77,54 @@ 
 	/**
 	 *	Alter the rows and include extra facets rows for the continents
 	 */
-	public function facetwp_index_row_data( $rows, $params ) {
-		switch ( $params['facet']['source'] ) {
+	public function facetwp_index_row_data($rows, $params) {
+		switch ($params['facet']['source']) {
 			case 'cf/destination_to_tour':
 			case 'cf/destination_to_accommodation':
 				$countries = array();
 
-				foreach ( $rows as $r_index => $row ) {
-					$parent                        = wp_get_post_parent_id( $row['facet_value'] );
-					$rows[ $r_index ]['parent_id'] = $parent;
+				foreach ($rows as $r_index => $row) {
+					$parent                        = wp_get_post_parent_id($row['facet_value']);
+					$rows[$r_index]['parent_id'] = $parent;
 
-					if ( 0 === $parent || '0' === $parent ) {
-						if ( ! isset( $countries[ $r_index ] ) ) {
-							$countries[ $r_index ] = $row['facet_value'];
+					if (0 === $parent || '0' === $parent) {
+						if (!isset($countries[$r_index])) {
+							$countries[$r_index] = $row['facet_value'];
 						}
 
-						if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-							$rows[ $r_index ]['depth'] = 1;
+						if (!empty($this->options['display']['engine_search_continent_filter'])) {
+							$rows[$r_index]['depth'] = 1;
 						} else {
-							$rows[ $r_index ]['depth'] = 0;
+							$rows[$r_index]['depth'] = 0;
 						}
 					} else {
-						if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-							$rows[ $r_index ]['depth'] = 2;
+						if (!empty($this->options['display']['engine_search_continent_filter'])) {
+							$rows[$r_index]['depth'] = 2;
 						} else {
-							$rows[ $r_index ]['depth'] = 1;
+							$rows[$r_index]['depth'] = 1;
 						}
 					}
 				}
-				if ( ! empty( $this->options['display']['enable_search_continent_filter'] ) ) {
-					if ( ! empty( $countries ) ) {
-						foreach ( $countries as $row_index => $country ) {
-							$continents   = wp_get_object_terms( $country, 'continent' );
+				if (!empty($this->options['display']['enable_search_continent_filter'])) {
+					if (!empty($countries)) {
+						foreach ($countries as $row_index => $country) {
+							$continents   = wp_get_object_terms($country, 'continent');
 							$continent_id = 0;
 
-							if ( ! is_wp_error( $continents ) ) {
+							if (!is_wp_error($continents)) {
 								$new_row = $params['defaults'];
-								if ( ! is_array( $continents ) ) {
-									$continents = array( $continents );
+								if (!is_array($continents)) {
+									$continents = array($continents);
 								}
 
-								foreach ( $continents as $continent ) {
+								foreach ($continents as $continent) {
 									$new_row['facet_value'] = $continent->slug;
 									$new_row['facet_display_value'] = $continent->name;
 									$continent_id = $continent->term_id;
 									$new_row['depth'] = 0;
 								}
 								$rows[] = $new_row;
-								$rows[ $row_index ]['parent_id'] = $continent_id;
+								$rows[$row_index]['parent_id'] = $continent_id;
 							}
 						}
 					}
@@ -142,41 +142,41 @@ 
 	/**
 	 * Displays the destination specific settings
 	 */
-	public function facetwp_index_row( $params, $class ) {
+	public function facetwp_index_row($params, $class) {
 		$custom_field = false;
 		$meta_key = false;
 
-		preg_match( '/cf\//', $class->facet['source'], $custom_field );
-		preg_match( '/_to_/', $class->facet['source'], $meta_key );
+		preg_match('/cf\//', $class->facet['source'], $custom_field);
+		preg_match('/_to_/', $class->facet['source'], $meta_key);
 
-		if ( ! empty( $custom_field ) && ! empty( $meta_key ) ) {
+		if (!empty($custom_field) && !empty($meta_key)) {
 
-			if ( ( 'cf/destination_to_accommodation' === $class->facet['source'] || 'cf/destination_to_tour' === $class->facet['source'] ) && ! empty( $this->options['display']['engine_search_continent_filter'] ) && ( '0' === (string) $params['depth'] ) ) {
+			if (('cf/destination_to_accommodation' === $class->facet['source'] || 'cf/destination_to_tour' === $class->facet['source']) && !empty($this->options['display']['engine_search_continent_filter']) && ('0' === (string) $params['depth'])) {
 				$title = '';
 			} else {
-				$title = get_the_title( $params['facet_value'] );
-				if ( '' !== $title ) {
+				$title = get_the_title($params['facet_value']);
+				if ('' !== $title) {
 					$params['facet_display_value'] = $title;
 				}
-				if ( '' === $title && ! empty( $meta_key ) ) {
+				if ('' === $title && !empty($meta_key)) {
 					$params['facet_value'] = '';
 				}
 			}
 		}
 
 		// If its a price, save the value as a standard number.
-		if ( 'cf/price' === $class->facet['source'] ) {
-			$params['facet_value'] = preg_replace( '/[^0-9.]/', '', $params['facet_value'] );
-			$params['facet_value'] = ltrim( $params['facet_value'], '.' );
+		if ('cf/price' === $class->facet['source']) {
+			$params['facet_value'] = preg_replace('/[^0-9.]/', '', $params['facet_value']);
+			$params['facet_value'] = ltrim($params['facet_value'], '.');
 			#$params['facet_value'] = number_format( (int) $params['facet_value'], 2 );
 			$params['facet_display_value'] = $params['facet_value'];
 		}
 
 		// If its a duration, save the value as a standard number.
-		if ( 'cf/duration' === $class->facet['source'] ) {
-			$params['facet_value'] = preg_replace( '/[^0-9 ]/', '', $params['facet_value'] );
-			$params['facet_value'] = trim( $params['facet_value'] );
-			$params['facet_value'] = explode( ' ', $params['facet_value'] );
+		if ('cf/duration' === $class->facet['source']) {
+			$params['facet_value'] = preg_replace('/[^0-9 ]/', '', $params['facet_value']);
+			$params['facet_value'] = trim($params['facet_value']);
+			$params['facet_value'] = explode(' ', $params['facet_value']);
 			$params['facet_value'] = $params['facet_value'][0];
 			#$params['facet_value'] = (int) $params['facet_value'];
 			$params['facet_display_value'] = $params['facet_value'];
@@ -192,7 +192,7 @@ 
 	 * @param  array   $params
 	 * @return string
 	 */
-	public function destination_facet_html( $output, $params ) {
+	public function destination_facet_html($output, $params) {
 		$possible_keys = array(
 			'cf/destination_to_accommodation',
 			'cf/destination_to_tour',
@@ -201,8 +201,8 @@ 
 			'cf/destination_to_review',
 			'cf/destination_to_vehicle',
 		);
-		if ( in_array( $params['facet']['source'], $possible_keys ) ) {
-			$output = $this->destination_facet_render( $params );
+		if (in_array($params['facet']['source'], $possible_keys)) {
+			$output = $this->destination_facet_render($params);
 		}
 		return $output;
 	}
@@ -210,13 +210,13 @@ 
 	/**
 	 * Generate the facet HTML
 	 */
-	public function destination_facet_render( $params ) {
+	public function destination_facet_render($params) {
 		$facet = $params['facet'];
 
 		$output = '';
 		$values = (array) $params['values'];
 		$selected_values = (array) $params['selected_values'];
-		$soft_limit = empty( $facet['soft_limit'] ) ? 0 : (int) $facet['soft_limit'];
+		$soft_limit = empty($facet['soft_limit']) ? 0 : (int) $facet['soft_limit'];
 		$countries = array();
 		$continents = array();
 
@@ -226,34 +226,34 @@ 
 			)
 		);
 
-		if ( ! is_wp_error( $continent_terms ) ) {
-			foreach ( $continent_terms as $continent ) {
-				$continents[ $continent->term_id ] = $continent->slug;
+		if (!is_wp_error($continent_terms)) {
+			foreach ($continent_terms as $continent) {
+				$continents[$continent->term_id] = $continent->slug;
 			}
 		}
 
 		//Create a relationship of the facet value and the their depths
 		$depths = array();
 		$parents = array();
-		foreach ( $values as $value ) {
-			$depths[ $value['facet_value'] ]  = (int) $value['depth'];
-			$parents[ $value['facet_value'] ] = (int) $value['parent_id'];
+		foreach ($values as $value) {
+			$depths[$value['facet_value']]  = (int) $value['depth'];
+			$parents[$value['facet_value']] = (int) $value['parent_id'];
 		}
 
 		//Determine the current depth and check if the selected values parents are in the selected array.
 		$current_depth = 0;
 		$additional_values = array();
-		if ( ! empty( $selected_values ) ) {
-			foreach ( $selected_values as $selected ) {
-				if ( $depths[ $selected ] > $current_depth ) {
-					$current_depth = $depths[ $selected ];
+		if (!empty($selected_values)) {
+			foreach ($selected_values as $selected) {
+				if ($depths[$selected] > $current_depth) {
+					$current_depth = $depths[$selected];
 				}
 			}
 			$current_depth++;
 		}
 
-		if ( ! empty( $additional_values ) ) {
-			$selected_values = array_merge( $selected_values, $additional_values );
+		if (!empty($additional_values)) {
+			$selected_values = array_merge($selected_values, $additional_values);
 		}
 
 		// This is where the items are sorted by their depth
@@ -261,25 +261,25 @@ 
 		$stored = $values;
 
 		//sort the options so
-		foreach ( $values as $key => $result ) {
-			if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-				if ( in_array( $result['facet_value'], $continents ) ) {
+		foreach ($values as $key => $result) {
+			if (!empty($this->options['display']['engine_search_continent_filter'])) {
+				if (in_array($result['facet_value'], $continents)) {
 					$sorted_values[] = $result;
-					$destinations    = $this->get_countries( $stored, $result['facet_value'], $continents, '1' );
+					$destinations    = $this->get_countries($stored, $result['facet_value'], $continents, '1');
 
-					if ( ! empty( $destinations ) ) {
-						foreach ( $destinations as $destination ) {
+					if (!empty($destinations)) {
+						foreach ($destinations as $destination) {
 							$sorted_values[] = $destination;
 						}
 					}
 				}
 			} else {
-				if ( '0' === $result['depth'] || 0 === $result['depth'] ) {
+				if ('0' === $result['depth'] || 0 === $result['depth']) {
 					$sorted_values[] = $result;
-					$destinations    = $this->get_regions( $stored, $result['facet_value'], '1' );
+					$destinations    = $this->get_regions($stored, $result['facet_value'], '1');
 
-					if ( ! empty( $destinations ) ) {
-						foreach ( $destinations as $destination ) {
+					if (!empty($destinations)) {
+						foreach ($destinations as $destination) {
 							$sorted_values[] = $destination;
 						}
 					}
@@ -292,45 +292,45 @@ 
 		$country_class = '';
 
 		// Run through each value and output the values.
-		foreach ( $values as $key => $facet ) {
+		foreach ($values as $key => $facet) {
 			$depth_type = '';
 
-			if ( ! empty( $this->options['display']['engine_search_continent_filter'] ) ) {
-				switch ( $facet['depth'] ) {
+			if (!empty($this->options['display']['engine_search_continent_filter'])) {
+				switch ($facet['depth']) {
 					case '0':
 						$depth_type = '';
-						$continent_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' continent-checked' : '';
+						$continent_class = in_array($facet['facet_value'], $selected_values) ? $depth_type .= ' continent-checked' : '';
 						break;
 
 					case '1':
-						$depth_type = 'country' . $continent_class;
-						$country_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' country-checked' : '';
+						$depth_type = 'country'.$continent_class;
+						$country_class = in_array($facet['facet_value'], $selected_values) ? $depth_type .= ' country-checked' : '';
 						break;
 
 					case '2':
-						$depth_type = 'region' . $continent_class . $country_class;
+						$depth_type = 'region'.$continent_class.$country_class;
 						break;
 				}
 			} else {
-				switch ( $facet['depth'] ) {
+				switch ($facet['depth']) {
 					case '0':
 						$depth_type = 'country continent-checked';
-						$country_class = in_array( $facet['facet_value'], $selected_values ) ? $depth_type .= ' country-checked' : '';
+						$country_class = in_array($facet['facet_value'], $selected_values) ? $depth_type .= ' country-checked' : '';
 						break;
 
 					case '1':
-						$depth_type = 'region continent-checked' . $country_class;
+						$depth_type = 'region continent-checked'.$country_class;
 						break;
 				}
 			}
 
-			if ( $facet['depth'] <= $current_depth ) {
-				$options[] = $this->format_single_facet( $key, $facet, $selected_values, $depth_type );
+			if ($facet['depth'] <= $current_depth) {
+				$options[] = $this->format_single_facet($key, $facet, $selected_values, $depth_type);
 			}
 		}
 
-		if ( ! empty( $options ) ) {
-			$output = implode( '', $options );
+		if (!empty($options)) {
+			$output = implode('', $options);
 		}
 
 		return $output;
@@ -339,17 +339,17 @@ 
 	/**
 	 * Gets the direct countries from the array.
 	 */
-	public function get_countries( $values, $parent, $continents, $depth ) {
+	public function get_countries($values, $parent, $continents, $depth) {
 		$children = array();
 		$stored = $values;
 
-		foreach ( $values as $value ) {
-			if ( isset( $continents[ $value['parent_id'] ] ) && $continents[ $value['parent_id'] ] === $parent && $value['depth'] === $depth ) {
+		foreach ($values as $value) {
+			if (isset($continents[$value['parent_id']]) && $continents[$value['parent_id']] === $parent && $value['depth'] === $depth) {
 				$children[] = $value;
 
-				$destinations = $this->get_regions( $stored, $value['facet_value'], '2' );
-				if ( ! empty( $destinations ) ) {
-					foreach ( $destinations as $destination ) {
+				$destinations = $this->get_regions($stored, $value['facet_value'], '2');
+				if (!empty($destinations)) {
+					foreach ($destinations as $destination) {
 						$children[] = $destination;
 					}
 				}
@@ -361,25 +361,25 @@ 
 	/**
 	 * Gets the direct regions from the array.
 	 */
-	public function get_regions( $values, $parent, $depth ) {
+	public function get_regions($values, $parent, $depth) {
 		$children = array();
-		foreach ( $values as $value ) {
-			if ( $value['parent_id'] === $parent && $value['depth'] === $depth ) {
+		foreach ($values as $value) {
+			if ($value['parent_id'] === $parent && $value['depth'] === $depth) {
 				$children[] = $value;
 			}
 		}
 		return $children;
 	}
 
-	public function format_single_facet( $key, $result, $selected_values, $region = '' ) {
+	public function format_single_facet($key, $result, $selected_values, $region = '') {
 		$temp_html = '';
 
-		$selected = in_array( $result['facet_value'], $selected_values ) ? ' checked' : '';
-		$selected .= ( 0 == $result['counter'] && '' == $selected ) ? ' disabled' : '';
-		$selected .= ' ' . $region;
+		$selected = in_array($result['facet_value'], $selected_values) ? ' checked' : '';
+		$selected .= (0 == $result['counter'] && '' == $selected) ? ' disabled' : '';
+		$selected .= ' '.$region;
 
-		$temp_html .= '<div class="facetwp-checkbox' . $selected . '" data-value="' . $result['facet_value'] . '">';
-		$temp_html .= $result['facet_display_value'] . ' <span class="facetwp-counter">(' . $result['counter'] . ')</span>';
+		$temp_html .= '<div class="facetwp-checkbox'.$selected.'" data-value="'.$result['facet_value'].'">';
+		$temp_html .= $result['facet_display_value'].' <span class="facetwp-counter">('.$result['counter'].')</span>';
 		$temp_html .= '</div>';
 
 		return $temp_html;

classes/class-lsx-search-shortcode.php

Indentation +164 added lines, -164 removed lines

@@ -6,86 +6,86 @@ 
  */
 class LSX_Search_Shortcode {
 
-	/**
-	 * Construct method.
-	 */
-	public function __construct() {
-		add_shortcode( 'lsx_search_form', array( $this, 'search_form' ) );
-	}
+     /**
+      * Construct method.
+      */
+     public function __construct() {
+          add_shortcode( 'lsx_search_form', array( $this, 'search_form' ) );
+     }
 
-	/**
-	 * Outputs the appropriate search form
-	 */
-	public function search_form( $atts = array() ) {
-		$classes = 'search-form lsx-search-form form-inline';
+     /**
+      * Outputs the appropriate search form
+      */
+     public function search_form( $atts = array() ) {
+          $classes = 'search-form lsx-search-form form-inline';
 
-		if ( isset( $atts['class'] ) ) {
-			$classes .= $atts['class'];
-		}
+          if ( isset( $atts['class'] ) ) {
+               $classes .= $atts['class'];
+          }
 
-		$placeholder = __( 'Where do you want to go?', 'lsx-search' );
+          $placeholder = __( 'Where do you want to go?', 'lsx-search' );
 
-		if ( isset( $atts['placeholder'] ) ) {
-			$placeholder = $atts['placeholder'];
-		}
+          if ( isset( $atts['placeholder'] ) ) {
+               $placeholder = $atts['placeholder'];
+          }
 
-		$action = '/';
+          $action = '/';
 
-		if ( isset( $atts['action'] ) ) {
-			$action = $atts['action'];
-		}
+          if ( isset( $atts['action'] ) ) {
+               $action = $atts['action'];
+          }
 
-		$method = 'get';
+          $method = 'get';
 
-		if ( isset( $atts['method'] ) ) {
-			$method = $atts['method'];
-		}
+          if ( isset( $atts['method'] ) ) {
+               $method = $atts['method'];
+          }
 
-		$button_label = __( 'Search', 'lsx-search' );
+          $button_label = __( 'Search', 'lsx-search' );
 
-		if ( isset( $atts['button_label'] ) ) {
-			$button_label = $atts['button_label'];
-		}
+          if ( isset( $atts['button_label'] ) ) {
+               $button_label = $atts['button_label'];
+          }
 
-		$button_class = 'btn cta-btn ';
+          $button_class = 'btn cta-btn ';
 
-		if ( isset( $atts['button_class'] ) ) {
-			$button_class .= $atts['button_class'];
-		}
+          if ( isset( $atts['button_class'] ) ) {
+               $button_class .= $atts['button_class'];
+          }
 
-		$engine = false;
+          $engine = false;
 
-		if ( isset( $atts['engine'] ) ) {
-			$engine = $atts['engine'];
-		}
+          if ( isset( $atts['engine'] ) ) {
+               $engine = $atts['engine'];
+          }
 
-		$engine_select = false;
+          $engine_select = false;
 
-		if ( isset( $atts['engine_select'] ) ) {
-			$engine_select = true;
-		}
+          if ( isset( $atts['engine_select'] ) ) {
+               $engine_select = true;
+          }
 
-		$display_search_field = true;
+          $display_search_field = true;
 
-		if ( isset( $atts['search_field'] ) ) {
-			$display_search_field = (boolean) $atts['search_field'];
-		}
+          if ( isset( $atts['search_field'] ) ) {
+               $display_search_field = (boolean) $atts['search_field'];
+          }
 
-		$facets = false;
+          $facets = false;
 
-		if ( isset( $atts['facets'] ) ) {
-			$facets = $atts['facets'];
-		}
+          if ( isset( $atts['facets'] ) ) {
+               $facets = $atts['facets'];
+          }
 
-		$combo_box = false;
+          $combo_box = false;
 
-		if ( isset( $atts['combo_box'] ) ) {
-			$combo_box = true;
-		}
+          if ( isset( $atts['combo_box'] ) ) {
+               $combo_box = true;
+          }
 
-		$return = '';
+          $return = '';
 
-		ob_start(); ?>
+          ob_start(); ?>
 
 		<?php do_action( 'lsx_search_form_before' ); ?>
 
@@ -103,62 +103,62 @@ 
 					<?php endif; ?>
 
 					<?php if ( false !== $engine_select && false !== $engine && 'default' !== $engine ) :
-						$engines = explode( '|',$engine ); ?>
+                              $engines = explode( '|',$engine ); ?>
 						<div class="field engine-select">
 							<div class="dropdown nav-item">
 								<?php
-								$plural = 's';
-								if ( 'accommodation' === $engine[0] ) {
-									$plural = '';
-								}
-								?>
+                                        $plural = 's';
+                                        if ( 'accommodation' === $engine[0] ) {
+                                             $plural = '';
+                                        }
+                                        ?>
 								<button id="engine" data-selection="<?php echo esc_attr( $engines[0] ); ?>" class="btn border-btn btn-dropdown dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo esc_html( ucwords( str_replace( '_', ' ',$engines[0] ) ) . $plural ); ?> <span class="caret"></span></button>
 								<ul class="dropdown-menu">
 									<?php
-									foreach ( $engines as $engine ) {
-										$plural = 's';
-										if ( 'accommodation' === $engine ) {
-											$plural = '';
-										}
-										echo '<li><a data-value="' . esc_attr( $engine ) . '" href="#">' . esc_html( ucfirst( str_replace( '_', ' ',$engine ) ) . $plural ) . '</a></li>';
-									}
-									?>
+                                             foreach ( $engines as $engine ) {
+                                                  $plural = 's';
+                                                  if ( 'accommodation' === $engine ) {
+                                                       $plural = '';
+                                                  }
+                                                  echo '<li><a data-value="' . esc_attr( $engine ) . '" href="#">' . esc_html( ucfirst( str_replace( '_', ' ',$engine ) ) . $plural ) . '</a></li>';
+                                             }
+                                             ?>
 								</ul>
 							</div>
 						</div>
 					<?php endif; ?>
 
 					<?php if ( false !== $facets ) {
-						$facets = explode( '|',$facets );
+                              $facets = explode( '|',$facets );
 
-						if ( ! is_array( $facets ) ) {
-							$facets = array( $facets );
-						}
+                              if ( ! is_array( $facets ) ) {
+                                   $facets = array( $facets );
+                              }
 
-						$field_class = 'field';
+                              $field_class = 'field';
 
-						if ( false !== $combo_box ) {
-							$this->combo_box( $facets );
-							$field_class .= ' combination-toggle hidden';
-						}
+                              if ( false !== $combo_box ) {
+                                   $this->combo_box( $facets );
+                                   $field_class .= ' combination-toggle hidden';
+                              }
 
-						foreach ( $facets as $facet ) {
-							?>
+                              foreach ( $facets as $facet ) {
+                                   ?>
 							<div class="<?php echo wp_kses_post( $field_class ); ?>">
 								<?php
-								$facet = FWP()->helper->get_facet_by_name( $facet );
-								if ( isset( $facet['source'] ) ) {
-									$values = $this->get_form_facet( $facet['source'] );
-								} else {
-									$values = array();
-								}
-								$facet_display_type = apply_filters( 'lsx_search_form_field_type', 'select', $facet );
-								$this->display_form_field( $facet_display_type,$facet,$values,$combo_box );
-								?>
+                                        $facet = FWP()->helper->get_facet_by_name( $facet );
+                                        if ( isset( $facet['source'] ) ) {
+                                             $values = $this->get_form_facet( $facet['source'] );
+                                        } else {
+                                             $values = array();
+                                        }
+                                        $facet_display_type = apply_filters( 'lsx_search_form_field_type', 'select', $facet );
+                                        $this->display_form_field( $facet_display_type,$facet,$values,$combo_box );
+                                        ?>
 							</div>
 							<?php
-						}
-					} ?>
+                              }
+                         } ?>
 
 					<div class="field submit-button">
 						<button class="<?php echo esc_attr( $button_class ); ?>" type="submit"><?php echo wp_kses_post( $button_label ); ?></button>
@@ -177,19 +177,19 @@ 
 
 		<?php do_action( 'lsx_search_form_after' ); ?>
 		<?php
-		$return = ob_get_clean();
+          $return = ob_get_clean();
 
-		$return = preg_replace( '/[\n]+/', ' ', $return );
-		$return = preg_replace( '/[\t]+/', ' ', $return );
+          $return = preg_replace( '/[\n]+/', ' ', $return );
+          $return = preg_replace( '/[\t]+/', ' ', $return );
 
-		return $return;
-	}
+          return $return;
+     }
 
-	/**
-	 * Outputs the combination selector
-	 */
-	public function combo_box( $facets ) {
-		?>
+     /**
+      * Outputs the combination selector
+      */
+     public function combo_box( $facets ) {
+          ?>
 		<div class="field combination-dropdown">
 			<div class="dropdown">
 				<button data-selection="0" class="btn border-btn btn-dropdown dropdown-toggle btn-combination" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
@@ -201,65 +201,65 @@ 
 					<li style="display: none;"><a class="default" data-value="0" href="#"><?php esc_attr_e( 'Select ', 'lsx-search' ); ?></a></li>
 
 					<?php foreach ( $facets as $facet ) {
-						$facet = FWP()->helper->get_facet_by_name( $facet );
-						?>
+                              $facet = FWP()->helper->get_facet_by_name( $facet );
+                              ?>
 						<li><a data-value="fwp_<?php echo wp_kses_post( $facet['name'] ); ?>" href="#"><?php echo wp_kses_post( $facet['label'] ); ?></a></li>
 					<?php } ?>
 				</ul>
 			</div>
 		</div>
 		<?php
-	}
-
-	/**
-	 * Grabs the Values for the Facet in Question.
-	 */
-	protected function get_form_facet( $facet_source = false ) {
-		global $wpdb;
-
-		$values = array();
-		$select = 'f.facet_value, f.facet_display_value';
-		$from = "{$wpdb->prefix}facetwp_index f";
-		$where = "f.facet_source = '{$facet_source}'";
-
-		//Check if the current facet is showing destinations.
-		if ( stripos( $facet_source, 'destination_to' ) ) {
-			$from .= " INNER JOIN {$wpdb->posts} p ON f.facet_value = p.ID";
-			$where .= " AND p.post_parent = '0'";
-
-		}
-
-		$response = $wpdb->prepare( "SELECT {$select} FROM {$from} WHERE {$where}" );// WPCS: unprepared SQL OK.
-
-		if ( ! empty( $response ) ) {
-			foreach ( $response as $re ) {
-				$display_value = $re->facet_display_value;
-				if ( function_exists( 'pll_translate_string' ) ) {
-					$current_lang = pll_current_language();
-					$display_value = pll_translate_string( $display_value, $current_lang );
-				}
-				$display_value = apply_filters( 'lsx_search_facetwp_display_value', $display_value, $re->facet_value );
-				$values[ $re->facet_value ] = $display_value;
-			}
-		}
-
-		asort( $values );
-		return $values;
-	}
-
-	/**
-	 * Change FaceWP pagination HTML to be equal main pagination (WP-PageNavi)
-	 */
-	public function display_form_field( $type = 'select', $facet = array(), $values = array(), $combo = false ) {
-		if ( empty( $facet ) ) {
-			return;
-		}
-
-		$source = 'fwp_' . $facet['name'];
-
-		switch ( $type ) {
-
-			case 'select': ?>
+     }
+
+     /**
+      * Grabs the Values for the Facet in Question.
+      */
+     protected function get_form_facet( $facet_source = false ) {
+          global $wpdb;
+
+          $values = array();
+          $select = 'f.facet_value, f.facet_display_value';
+          $from = "{$wpdb->prefix}facetwp_index f";
+          $where = "f.facet_source = '{$facet_source}'";
+
+          //Check if the current facet is showing destinations.
+          if ( stripos( $facet_source, 'destination_to' ) ) {
+               $from .= " INNER JOIN {$wpdb->posts} p ON f.facet_value = p.ID";
+               $where .= " AND p.post_parent = '0'";
+
+          }
+
+          $response = $wpdb->prepare( "SELECT {$select} FROM {$from} WHERE {$where}" );// WPCS: unprepared SQL OK.
+
+          if ( ! empty( $response ) ) {
+               foreach ( $response as $re ) {
+                    $display_value = $re->facet_display_value;
+                    if ( function_exists( 'pll_translate_string' ) ) {
+                         $current_lang = pll_current_language();
+                         $display_value = pll_translate_string( $display_value, $current_lang );
+                    }
+                    $display_value = apply_filters( 'lsx_search_facetwp_display_value', $display_value, $re->facet_value );
+                    $values[ $re->facet_value ] = $display_value;
+               }
+          }
+
+          asort( $values );
+          return $values;
+     }
+
+     /**
+      * Change FaceWP pagination HTML to be equal main pagination (WP-PageNavi)
+      */
+     public function display_form_field( $type = 'select', $facet = array(), $values = array(), $combo = false ) {
+          if ( empty( $facet ) ) {
+               return;
+          }
+
+          $source = 'fwp_' . $facet['name'];
+
+          switch ( $type ) {
+
+               case 'select': ?>
 				<div class="dropdown nav-item <?php if ( true === $combo ) { echo 'combination-dropdown'; } ?>">
 					<button data-selection="0" class="btn border-btn btn-dropdown dropdown-toggle" type="button" id="<?php echo wp_kses_post( $source ); ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
 						<?php echo esc_attr( apply_filters( 'lsx_search_facet_label', __( 'Select', 'lsx-search' ) . ' ' . wp_kses_post( $facet['label'] ) ) ); ?>
@@ -271,10 +271,10 @@ 
 							<li style="display: none;">
 								<a class="default" data-value="0" href="#">
 									<?php
-										$facet_label = __( 'Select ', 'lsx-search' ) . ' ' . wp_kses_post( $facet['label'] );
-										$facet_label = apply_filters( 'lsx_search_facet_label', $facet_label );
-										echo esc_attr( $facet_label );
-									?>
+                                                  $facet_label = __( 'Select ', 'lsx-search' ) . ' ' . wp_kses_post( $facet['label'] );
+                                                  $facet_label = apply_filters( 'lsx_search_facet_label', $facet_label );
+                                                  echo esc_attr( $facet_label );
+                                             ?>
 								</a>
 							</li>
 
@@ -287,17 +287,17 @@ 
 					</ul>
 				</div>
 				<?php
-				break;
+                    break;
 
-			case 'datepicker': ?>
+               case 'datepicker': ?>
 				<div class="datepicker nav-item">
 					<input autocomplete="off" class="datepicker-value" placeholder="<?php echo wp_kses_post( apply_filters( 'lsx_search_facet_label' , $facet['label'] ) ); ?>" name="<?php echo wp_kses_post( $source ); ?>"  id="<?php echo wp_kses_post( $source ); ?>" type="text" value="" />
 				</div>
 			<?php
-				break;
-		}
+                    break;
+          }
 
-		?>
+          ?>
 
 	<?php }
 }

Spacing +79 added lines, -79 removed lines

@@ -10,76 +10,76 @@ 
 	 * Construct method.
 	 */
 	public function __construct() {
-		add_shortcode( 'lsx_search_form', array( $this, 'search_form' ) );
+		add_shortcode('lsx_search_form', array($this, 'search_form'));
 	}
 
 	/**
 	 * Outputs the appropriate search form
 	 */
-	public function search_form( $atts = array() ) {
+	public function search_form($atts = array()) {
 		$classes = 'search-form lsx-search-form form-inline';
 
-		if ( isset( $atts['class'] ) ) {
+		if (isset($atts['class'])) {
 			$classes .= $atts['class'];
 		}
 
-		$placeholder = __( 'Where do you want to go?', 'lsx-search' );
+		$placeholder = __('Where do you want to go?', 'lsx-search');
 
-		if ( isset( $atts['placeholder'] ) ) {
+		if (isset($atts['placeholder'])) {
 			$placeholder = $atts['placeholder'];
 		}
 
 		$action = '/';
 
-		if ( isset( $atts['action'] ) ) {
+		if (isset($atts['action'])) {
 			$action = $atts['action'];
 		}
 
 		$method = 'get';
 
-		if ( isset( $atts['method'] ) ) {
+		if (isset($atts['method'])) {
 			$method = $atts['method'];
 		}
 
-		$button_label = __( 'Search', 'lsx-search' );
+		$button_label = __('Search', 'lsx-search');
 
-		if ( isset( $atts['button_label'] ) ) {
+		if (isset($atts['button_label'])) {
 			$button_label = $atts['button_label'];
 		}
 
 		$button_class = 'btn cta-btn ';
 
-		if ( isset( $atts['button_class'] ) ) {
+		if (isset($atts['button_class'])) {
 			$button_class .= $atts['button_class'];
 		}
 
 		$engine = false;
 
-		if ( isset( $atts['engine'] ) ) {
+		if (isset($atts['engine'])) {
 			$engine = $atts['engine'];
 		}
 
 		$engine_select = false;
 
-		if ( isset( $atts['engine_select'] ) ) {
+		if (isset($atts['engine_select'])) {
 			$engine_select = true;
 		}
 
 		$display_search_field = true;
 
-		if ( isset( $atts['search_field'] ) ) {
+		if (isset($atts['search_field'])) {
 			$display_search_field = (boolean) $atts['search_field'];
 		}
 
 		$facets = false;
 
-		if ( isset( $atts['facets'] ) ) {
+		if (isset($atts['facets'])) {
 			$facets = $atts['facets'];
 		}
 
 		$combo_box = false;
 
-		if ( isset( $atts['combo_box'] ) ) {
+		if (isset($atts['combo_box'])) {
 			$combo_box = true;
 		}
 
@@ -87,40 +87,40 @@ 
 
 		ob_start(); ?>
 
-		<?php do_action( 'lsx_search_form_before' ); ?>
+		<?php do_action('lsx_search_form_before'); ?>
 
 		<nav class="navbar navbar-light bg-light">
 
-			<form class="<?php echo esc_attr( $classes ); ?>" action="<?php echo esc_attr( $action ); ?>" method="<?php echo esc_attr( $method ); ?>">
+			<form class="<?php echo esc_attr($classes); ?>" action="<?php echo esc_attr($action); ?>" method="<?php echo esc_attr($method); ?>">
 
-				<?php do_action( 'lsx_search_form_top' ); ?>
+				<?php do_action('lsx_search_form_top'); ?>
 
 				<div class="input-group navbar-nav">
-					<?php if ( true === $display_search_field ) : ?>
+					<?php if (true === $display_search_field) : ?>
 						<div class="field">
-							<input class="search-field form-control" name="s" type="search" placeholder="<?php echo esc_attr( $placeholder ); ?>" autocomplete="off">
+							<input class="search-field form-control" name="s" type="search" placeholder="<?php echo esc_attr($placeholder); ?>" autocomplete="off">
 						</div>
 					<?php endif; ?>
 
-					<?php if ( false !== $engine_select && false !== $engine && 'default' !== $engine ) :
-						$engines = explode( '|',$engine ); ?>
+					<?php if (false !== $engine_select && false !== $engine && 'default' !== $engine) :
+						$engines = explode('|', $engine); ?>
 						<div class="field engine-select">
 							<div class="dropdown nav-item">
 								<?php
 								$plural = 's';
-								if ( 'accommodation' === $engine[0] ) {
+								if ('accommodation' === $engine[0]) {
 									$plural = '';
 								}
 								?>
-								<button id="engine" data-selection="<?php echo esc_attr( $engines[0] ); ?>" class="btn border-btn btn-dropdown dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo esc_html( ucwords( str_replace( '_', ' ',$engines[0] ) ) . $plural ); ?> <span class="caret"></span></button>
+								<button id="engine" data-selection="<?php echo esc_attr($engines[0]); ?>" class="btn border-btn btn-dropdown dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><?php echo esc_html(ucwords(str_replace('_', ' ', $engines[0])).$plural); ?> <span class="caret"></span></button>
 								<ul class="dropdown-menu">
 									<?php
-									foreach ( $engines as $engine ) {
+									foreach ($engines as $engine) {
 										$plural = 's';
-										if ( 'accommodation' === $engine ) {
+										if ('accommodation' === $engine) {
 											$plural = '';
 										}
-										echo '<li><a data-value="' . esc_attr( $engine ) . '" href="#">' . esc_html( ucfirst( str_replace( '_', ' ',$engine ) ) . $plural ) . '</a></li>';
+										echo '<li><a data-value="'.esc_attr($engine).'" href="#">'.esc_html(ucfirst(str_replace('_', ' ', $engine)).$plural).'</a></li>';
 									}
 									?>
 								</ul>
@@ -128,32 +128,32 @@ 
 						</div>
 					<?php endif; ?>
 
-					<?php if ( false !== $facets ) {
-						$facets = explode( '|',$facets );
+					<?php if (false !== $facets) {
+						$facets = explode('|', $facets);
 
-						if ( ! is_array( $facets ) ) {
-							$facets = array( $facets );
+						if (!is_array($facets)) {
+							$facets = array($facets);
 						}
 
 						$field_class = 'field';
 
-						if ( false !== $combo_box ) {
-							$this->combo_box( $facets );
+						if (false !== $combo_box) {
+							$this->combo_box($facets);
 							$field_class .= ' combination-toggle hidden';
 						}
 
-						foreach ( $facets as $facet ) {
+						foreach ($facets as $facet) {
 							?>
-							<div class="<?php echo wp_kses_post( $field_class ); ?>">
+							<div class="<?php echo wp_kses_post($field_class); ?>">
 								<?php
-								$facet = FWP()->helper->get_facet_by_name( $facet );
-								if ( isset( $facet['source'] ) ) {
-									$values = $this->get_form_facet( $facet['source'] );
+								$facet = FWP()->helper->get_facet_by_name($facet);
+								if (isset($facet['source'])) {
+									$values = $this->get_form_facet($facet['source']);
 								} else {
 									$values = array();
 								}
-								$facet_display_type = apply_filters( 'lsx_search_form_field_type', 'select', $facet );
-								$this->display_form_field( $facet_display_type,$facet,$values,$combo_box );
+								$facet_display_type = apply_filters('lsx_search_form_field_type', 'select', $facet);
+								$this->display_form_field($facet_display_type, $facet, $values, $combo_box);
 								?>
 							</div>
 							<?php
@@ -161,26 +161,26 @@ 
 					} ?>
 
 					<div class="field submit-button">
-						<button class="<?php echo esc_attr( $button_class ); ?>" type="submit"><?php echo wp_kses_post( $button_label ); ?></button>
+						<button class="<?php echo esc_attr($button_class); ?>" type="submit"><?php echo wp_kses_post($button_label); ?></button>
 					</div>
 
-					<?php if ( false === $engine_select && false !== $engine && 'default' !== $engine ) : ?>
-						<input name="engine" type="hidden" value="<?php echo esc_attr( $engine ); ?>">
+					<?php if (false === $engine_select && false !== $engine && 'default' !== $engine) : ?>
+						<input name="engine" type="hidden" value="<?php echo esc_attr($engine); ?>">
 					<?php endif; ?>
 				</div>
 
-				<?php do_action( 'lsx_search_form_bottom' ); ?>
+				<?php do_action('lsx_search_form_bottom'); ?>
 
 			</form>
 
 		</nav>
 
-		<?php do_action( 'lsx_search_form_after' ); ?>
+		<?php do_action('lsx_search_form_after'); ?>
 		<?php
 		$return = ob_get_clean();
 
-		$return = preg_replace( '/[\n]+/', ' ', $return );
-		$return = preg_replace( '/[\t]+/', ' ', $return );
+		$return = preg_replace('/[\n]+/', ' ', $return);
+		$return = preg_replace('/[\t]+/', ' ', $return);
 
 		return $return;
 	}
@@ -188,22 +188,22 @@ 
 	/**
 	 * Outputs the combination selector
 	 */
-	public function combo_box( $facets ) {
+	public function combo_box($facets) {
 		?>
 		<div class="field combination-dropdown">
 			<div class="dropdown">
 				<button data-selection="0" class="btn border-btn btn-dropdown dropdown-toggle btn-combination" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-					<?php esc_attr_e( 'Select', 'lsx-search' ); ?>
+					<?php esc_attr_e('Select', 'lsx-search'); ?>
 					<span class="caret"></span>
 				</button>
 				<ul class="dropdown-menu">
 
-					<li style="display: none;"><a class="default" data-value="0" href="#"><?php esc_attr_e( 'Select ', 'lsx-search' ); ?></a></li>
+					<li style="display: none;"><a class="default" data-value="0" href="#"><?php esc_attr_e('Select ', 'lsx-search'); ?></a></li>
 
-					<?php foreach ( $facets as $facet ) {
-						$facet = FWP()->helper->get_facet_by_name( $facet );
+					<?php foreach ($facets as $facet) {
+						$facet = FWP()->helper->get_facet_by_name($facet);
 						?>
-						<li><a data-value="fwp_<?php echo wp_kses_post( $facet['name'] ); ?>" href="#"><?php echo wp_kses_post( $facet['label'] ); ?></a></li>
+						<li><a data-value="fwp_<?php echo wp_kses_post($facet['name']); ?>" href="#"><?php echo wp_kses_post($facet['label']); ?></a></li>
 					<?php } ?>
 				</ul>
 			</div>
@@ -214,7 +214,7 @@ 
 	/**
 	 * Grabs the Values for the Facet in Question.
 	 */
-	protected function get_form_facet( $facet_source = false ) {
+	protected function get_form_facet($facet_source = false) {
 		global $wpdb;
 
 		$values = array();
@@ -223,66 +223,66 @@ 
 		$where = "f.facet_source = '{$facet_source}'";
 
 		//Check if the current facet is showing destinations.
-		if ( stripos( $facet_source, 'destination_to' ) ) {
+		if (stripos($facet_source, 'destination_to')) {
 			$from .= " INNER JOIN {$wpdb->posts} p ON f.facet_value = p.ID";
 			$where .= " AND p.post_parent = '0'";
 
 		}
 
-		$response = $wpdb->prepare( "SELECT {$select} FROM {$from} WHERE {$where}" );// WPCS: unprepared SQL OK.
+		$response = $wpdb->prepare("SELECT {$select} FROM {$from} WHERE {$where}"); // WPCS: unprepared SQL OK.
 
-		if ( ! empty( $response ) ) {
-			foreach ( $response as $re ) {
+		if (!empty($response)) {
+			foreach ($response as $re) {
 				$display_value = $re->facet_display_value;
-				if ( function_exists( 'pll_translate_string' ) ) {
+				if (function_exists('pll_translate_string')) {
 					$current_lang = pll_current_language();
-					$display_value = pll_translate_string( $display_value, $current_lang );
+					$display_value = pll_translate_string($display_value, $current_lang);
 				}
-				$display_value = apply_filters( 'lsx_search_facetwp_display_value', $display_value, $re->facet_value );
-				$values[ $re->facet_value ] = $display_value;
+				$display_value = apply_filters('lsx_search_facetwp_display_value', $display_value, $re->facet_value);
+				$values[$re->facet_value] = $display_value;
 			}
 		}
 
-		asort( $values );
+		asort($values);
 		return $values;
 	}
 
 	/**
 	 * Change FaceWP pagination HTML to be equal main pagination (WP-PageNavi)
 	 */
-	public function display_form_field( $type = 'select', $facet = array(), $values = array(), $combo = false ) {
-		if ( empty( $facet ) ) {
+	public function display_form_field($type = 'select', $facet = array(), $values = array(), $combo = false) {
+		if (empty($facet)) {
 			return;
 		}
 
-		$source = 'fwp_' . $facet['name'];
+		$source = 'fwp_'.$facet['name'];
 
-		switch ( $type ) {
+		switch ($type) {
 
 			case 'select': ?>
-				<div class="dropdown nav-item <?php if ( true === $combo ) { echo 'combination-dropdown'; } ?>">
-					<button data-selection="0" class="btn border-btn btn-dropdown dropdown-toggle" type="button" id="<?php echo wp_kses_post( $source ); ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-						<?php echo esc_attr( apply_filters( 'lsx_search_facet_label', __( 'Select', 'lsx-search' ) . ' ' . wp_kses_post( $facet['label'] ) ) ); ?>
+				<div class="dropdown nav-item <?php if (true === $combo) { echo 'combination-dropdown'; } ?>">
+					<button data-selection="0" class="btn border-btn btn-dropdown dropdown-toggle" type="button" id="<?php echo wp_kses_post($source); ?>" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+						<?php echo esc_attr(apply_filters('lsx_search_facet_label', __('Select', 'lsx-search').' '.wp_kses_post($facet['label']))); ?>
 						<span class="caret"></span>
 					</button>
-					<ul class="dropdown-menu" aria-labelledby="<?php echo wp_kses_post( $source ); ?>">
-						<?php if ( ! empty( $values ) ) { ?>
+					<ul class="dropdown-menu" aria-labelledby="<?php echo wp_kses_post($source); ?>">
+						<?php if (!empty($values)) { ?>
 
 							<li style="display: none;">
 								<a class="default" data-value="0" href="#">
 									<?php
-										$facet_label = __( 'Select ', 'lsx-search' ) . ' ' . wp_kses_post( $facet['label'] );
-										$facet_label = apply_filters( 'lsx_search_facet_label', $facet_label );
-										echo esc_attr( $facet_label );
+										$facet_label = __('Select ', 'lsx-search').' '.wp_kses_post($facet['label']);
+										$facet_label = apply_filters('lsx_search_facet_label', $facet_label);
+										echo esc_attr($facet_label);
 									?>
 								</a>
 							</li>
 
-							<?php foreach ( $values as $key => $value ) { ?>
-								<li><a data-value="<?php echo wp_kses_post( $key ); ?>" href="#"><?php echo wp_kses_post( $value ); ?></a></li>
+							<?php foreach ($values as $key => $value) { ?>
+								<li><a data-value="<?php echo wp_kses_post($key); ?>" href="#"><?php echo wp_kses_post($value); ?></a></li>
 							<?php } ?>
 						<?php } else { ?>
-							<li><a data-value="0" href="#"><?php esc_attr_e( 'Please re-index your facets.', 'lsx-search' ); ?></a></li>
+							<li><a data-value="0" href="#"><?php esc_attr_e('Please re-index your facets.', 'lsx-search'); ?></a></li>
 						<?php } ?>
 					</ul>
 				</div>
@@ -291,7 +291,7 @@ 
 
 			case 'datepicker': ?>
 				<div class="datepicker nav-item">
-					<input autocomplete="off" class="datepicker-value" placeholder="<?php echo wp_kses_post( apply_filters( 'lsx_search_facet_label' , $facet['label'] ) ); ?>" name="<?php echo wp_kses_post( $source ); ?>"  id="<?php echo wp_kses_post( $source ); ?>" type="text" value="" />
+					<input autocomplete="off" class="datepicker-value" placeholder="<?php echo wp_kses_post(apply_filters('lsx_search_facet_label', $facet['label'])); ?>" name="<?php echo wp_kses_post($source); ?>"  id="<?php echo wp_kses_post($source); ?>" type="text" value="" />
 				</div>
 			<?php
 				break;

classes/frontend/class-layout.php

Indentation +145 added lines, -145 removed lines

@@ -10,149 +10,149 @@
  */
 class Layout {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx\search\classes\frontend\Layout()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * Contructor
-	 */
-	public function __construct() {
-		add_action( 'wp', array( $this, 'load_functions' ), 24 );
-	}
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx\search\classes\frontend\Layout()    A single instance of this class.
-	 */
-	public static function get_instance() {
-		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
-			self::$instance = new self();
-		}
-		return self::$instance;
-	}
-
-	/**
-	 * Check all settings.
-	 */
-	public function load_functions() {
-		$lsx_search = LSX_Search::get_instance();
-		if ( $lsx_search->frontend->search_enabled ) {
-			if ( isset( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_layout_switcher_enable' ] ) ) {
-				add_filter( 'lsx_blog_customizer_show_switcher', array( $this, 'show_layout_switcher' ), 10, 1 );
-				add_filter( 'lsx_layout_switcher_options', array( $this, 'lsx_layout_switcher_options' ), 10, 1 );
-				add_filter( 'lsx_layout_switcher_page_key', array( $this, 'lsx_layout_switcher_page_key' ), 10, 1 );
-				add_filter( 'lsx_layout_switcher_options_default', array( $this, 'lsx_layout_switcher_options_default' ), 10, 1 );
-
-				// Layout Classes
-				add_filter( 'woocommerce_product_loop_start', array( $this, 'woocommerce_layout_class' ), 10, 1 );
-			}
-		}
-	}
-
-	/**
-	 * Display the woocommerce archive swticher.
-	 */
-	public function show_layout_switcher( $show = false ) {
-		$show = true;
-		return $show;
-	}
-
-	/**
-	 * Remove the default and half-grid options from the results layouts.
-	 *
-	 * @param  array $layout_options
-	 * @return array
-	 */
-	public function lsx_layout_switcher_options( $layout_options ) {
-		unset( $layout_options['default'] );
-		unset( $layout_options['half-grid'] );
-		return $layout_options;
-	}
-
-	/**
-	 * Replace the key for the layout switcher.
-	 *
-	 * @param  string $page_key
-	 * @return string
-	 */
-	public function lsx_layout_switcher_page_key( $page_key ) {
-		$lsx_search = LSX_Search::get_instance();
-		$page_key   = str_replace( '_search', '', $lsx_search->frontend->search_prefix );
-		return $page_key;
-	}
-
-	/**
-	 * CHange the default layout to a grid layout.
-	 *
-	 * @param  string $default
-	 * @return string
-	 */
-	public function lsx_layout_switcher_options_default( $default = 'grid' ) {
-		$lsx_search = LSX_Search::get_instance();
-		$default    = 'grid';
-		if ( isset( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ] ) && ! empty( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ] ) ) {
-			$default = $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ];
-		}
-		return $default;
-	}
-
-	/**
-	 * Controls the layout for the woocommerce shop page.
-	 */
-	public function woocommerce_layout_class( $output = '' ) {
-		$default_class = $this->lsx_layout_switcher_options_default();
-		$selected      = $this->get_layout_value_from_cookie( 'product' );
-		if ( '' !== $selected ) {
-			$default_class = $selected;
-		}
-		$output = str_replace( 'products', 'products ' . $default_class, $output );
-		return $output;
-	}
-
-	/**
-	 * Get layout value from cookie
-	 *
-	 * @since 1.0.0
-	 */
-	public function get_layout_value_from_cookie( $page_key = 'blog' ) {
-		$archive_layout = 'grid';
-
-		if ( isset( $_COOKIE[ 'lsx-' . $page_key . '-layout' ] ) ) {
-			$archive_layout_from_cookie = sanitize_key( $_COOKIE[ 'lsx-' . $page_key . '-layout' ] );
-			$archive_layout_from_cookie = $this->sanitize_select_layout_switcher( $archive_layout_from_cookie );
-
-			if ( ! empty( $archive_layout_from_cookie ) ) {
-				$archive_layout = $archive_layout_from_cookie;
-			}
-		}
-		return $archive_layout;
-	}
-
-	/**
-	 * Sanitize select (layout switcher).
-	 *
-	 * @since 1.0.0
-	 */
-	public function sanitize_select_layout_switcher( $input ) {
-		$valid = array(
-			'list'      => esc_html__( 'List', 'lsx-search' ),
-			'grid'      => esc_html__( 'Grid', 'lsx-search' ),
-		);
-
-		if ( array_key_exists( $input, $valid ) ) {
-			return $input;
-		} else {
-			return '';
-		}
-	}
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx\search\classes\frontend\Layout()
+      */
+     protected static $instance = null;
+
+     /**
+      * Contructor
+      */
+     public function __construct() {
+          add_action( 'wp', array( $this, 'load_functions' ), 24 );
+     }
+
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object \lsx\search\classes\frontend\Layout()    A single instance of this class.
+      */
+     public static function get_instance() {
+          // If the single instance hasn't been set, set it now.
+          if ( null == self::$instance ) {
+               self::$instance = new self();
+          }
+          return self::$instance;
+     }
+
+     /**
+      * Check all settings.
+      */
+     public function load_functions() {
+          $lsx_search = LSX_Search::get_instance();
+          if ( $lsx_search->frontend->search_enabled ) {
+               if ( isset( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_layout_switcher_enable' ] ) ) {
+                    add_filter( 'lsx_blog_customizer_show_switcher', array( $this, 'show_layout_switcher' ), 10, 1 );
+                    add_filter( 'lsx_layout_switcher_options', array( $this, 'lsx_layout_switcher_options' ), 10, 1 );
+                    add_filter( 'lsx_layout_switcher_page_key', array( $this, 'lsx_layout_switcher_page_key' ), 10, 1 );
+                    add_filter( 'lsx_layout_switcher_options_default', array( $this, 'lsx_layout_switcher_options_default' ), 10, 1 );
+
+                    // Layout Classes
+                    add_filter( 'woocommerce_product_loop_start', array( $this, 'woocommerce_layout_class' ), 10, 1 );
+               }
+          }
+     }
+
+     /**
+      * Display the woocommerce archive swticher.
+      */
+     public function show_layout_switcher( $show = false ) {
+          $show = true;
+          return $show;
+     }
+
+     /**
+      * Remove the default and half-grid options from the results layouts.
+      *
+      * @param  array $layout_options
+      * @return array
+      */
+     public function lsx_layout_switcher_options( $layout_options ) {
+          unset( $layout_options['default'] );
+          unset( $layout_options['half-grid'] );
+          return $layout_options;
+     }
+
+     /**
+      * Replace the key for the layout switcher.
+      *
+      * @param  string $page_key
+      * @return string
+      */
+     public function lsx_layout_switcher_page_key( $page_key ) {
+          $lsx_search = LSX_Search::get_instance();
+          $page_key   = str_replace( '_search', '', $lsx_search->frontend->search_prefix );
+          return $page_key;
+     }
+
+     /**
+      * CHange the default layout to a grid layout.
+      *
+      * @param  string $default
+      * @return string
+      */
+     public function lsx_layout_switcher_options_default( $default = 'grid' ) {
+          $lsx_search = LSX_Search::get_instance();
+          $default    = 'grid';
+          if ( isset( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ] ) && ! empty( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ] ) ) {
+               $default = $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ];
+          }
+          return $default;
+     }
+
+     /**
+      * Controls the layout for the woocommerce shop page.
+      */
+     public function woocommerce_layout_class( $output = '' ) {
+          $default_class = $this->lsx_layout_switcher_options_default();
+          $selected      = $this->get_layout_value_from_cookie( 'product' );
+          if ( '' !== $selected ) {
+               $default_class = $selected;
+          }
+          $output = str_replace( 'products', 'products ' . $default_class, $output );
+          return $output;
+     }
+
+     /**
+      * Get layout value from cookie
+      *
+      * @since 1.0.0
+      */
+     public function get_layout_value_from_cookie( $page_key = 'blog' ) {
+          $archive_layout = 'grid';
+
+          if ( isset( $_COOKIE[ 'lsx-' . $page_key . '-layout' ] ) ) {
+               $archive_layout_from_cookie = sanitize_key( $_COOKIE[ 'lsx-' . $page_key . '-layout' ] );
+               $archive_layout_from_cookie = $this->sanitize_select_layout_switcher( $archive_layout_from_cookie );
+
+               if ( ! empty( $archive_layout_from_cookie ) ) {
+                    $archive_layout = $archive_layout_from_cookie;
+               }
+          }
+          return $archive_layout;
+     }
+
+     /**
+      * Sanitize select (layout switcher).
+      *
+      * @since 1.0.0
+      */
+     public function sanitize_select_layout_switcher( $input ) {
+          $valid = array(
+               'list'      => esc_html__( 'List', 'lsx-search' ),
+               'grid'      => esc_html__( 'Grid', 'lsx-search' ),
+          );
+
+          if ( array_key_exists( $input, $valid ) ) {
+               return $input;
+          } else {
+               return '';
+          }
+     }
 }

Spacing +31 added lines, -31 removed lines

@@ -23,7 +23,7 @@ 
 	 * Contructor
 	 */
 	public function __construct() {
-		add_action( 'wp', array( $this, 'load_functions' ), 24 );
+		add_action('wp', array($this, 'load_functions'), 24);
 	}
 
 	/**
@@ -35,7 +35,7 @@ 
 	 */
 	public static function get_instance() {
 		// If the single instance hasn't been set, set it now.
-		if ( null == self::$instance ) {
+		if (null == self::$instance) {
 			self::$instance = new self();
 		}
 		return self::$instance;
@@ -46,15 +46,15 @@ 
 	 */
 	public function load_functions() {
 		$lsx_search = LSX_Search::get_instance();
-		if ( $lsx_search->frontend->search_enabled ) {
-			if ( isset( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_layout_switcher_enable' ] ) ) {
-				add_filter( 'lsx_blog_customizer_show_switcher', array( $this, 'show_layout_switcher' ), 10, 1 );
-				add_filter( 'lsx_layout_switcher_options', array( $this, 'lsx_layout_switcher_options' ), 10, 1 );
-				add_filter( 'lsx_layout_switcher_page_key', array( $this, 'lsx_layout_switcher_page_key' ), 10, 1 );
-				add_filter( 'lsx_layout_switcher_options_default', array( $this, 'lsx_layout_switcher_options_default' ), 10, 1 );
+		if ($lsx_search->frontend->search_enabled) {
+			if (isset($lsx_search->frontend->options['display'][$lsx_search->frontend->search_prefix.'_layout_switcher_enable'])) {
+				add_filter('lsx_blog_customizer_show_switcher', array($this, 'show_layout_switcher'), 10, 1);
+				add_filter('lsx_layout_switcher_options', array($this, 'lsx_layout_switcher_options'), 10, 1);
+				add_filter('lsx_layout_switcher_page_key', array($this, 'lsx_layout_switcher_page_key'), 10, 1);
+				add_filter('lsx_layout_switcher_options_default', array($this, 'lsx_layout_switcher_options_default'), 10, 1);
 
 				// Layout Classes
-				add_filter( 'woocommerce_product_loop_start', array( $this, 'woocommerce_layout_class' ), 10, 1 );
+				add_filter('woocommerce_product_loop_start', array($this, 'woocommerce_layout_class'), 10, 1);
 			}
 		}
 	}
@@ -62,7 +62,7 @@ 
 	/**
 	 * Display the woocommerce archive swticher.
 	 */
-	public function show_layout_switcher( $show = false ) {
+	public function show_layout_switcher($show = false) {
 		$show = true;
 		return $show;
 	}
@@ -73,9 +73,9 @@ 
 	 * @param  array $layout_options
 	 * @return array
 	 */
-	public function lsx_layout_switcher_options( $layout_options ) {
-		unset( $layout_options['default'] );
-		unset( $layout_options['half-grid'] );
+	public function lsx_layout_switcher_options($layout_options) {
+		unset($layout_options['default']);
+		unset($layout_options['half-grid']);
 		return $layout_options;
 	}
 
@@ -85,9 +85,9 @@ 
 	 * @param  string $page_key
 	 * @return string
 	 */
-	public function lsx_layout_switcher_page_key( $page_key ) {
+	public function lsx_layout_switcher_page_key($page_key) {
 		$lsx_search = LSX_Search::get_instance();
-		$page_key   = str_replace( '_search', '', $lsx_search->frontend->search_prefix );
+		$page_key   = str_replace('_search', '', $lsx_search->frontend->search_prefix);
 		return $page_key;
 	}
 
@@ -97,11 +97,11 @@ 
 	 * @param  string $default
 	 * @return string
 	 */
-	public function lsx_layout_switcher_options_default( $default = 'grid' ) {
+	public function lsx_layout_switcher_options_default($default = 'grid') {
 		$lsx_search = LSX_Search::get_instance();
 		$default    = 'grid';
-		if ( isset( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ] ) && ! empty( $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ] ) ) {
-			$default = $lsx_search->frontend->options['display'][ $lsx_search->frontend->search_prefix . '_grid_list' ];
+		if (isset($lsx_search->frontend->options['display'][$lsx_search->frontend->search_prefix.'_grid_list']) && !empty($lsx_search->frontend->options['display'][$lsx_search->frontend->search_prefix.'_grid_list'])) {
+			$default = $lsx_search->frontend->options['display'][$lsx_search->frontend->search_prefix.'_grid_list'];
 		}
 		return $default;
 	}
@@ -109,13 +109,13 @@ 
 	/**
 	 * Controls the layout for the woocommerce shop page.
 	 */
-	public function woocommerce_layout_class( $output = '' ) {
+	public function woocommerce_layout_class($output = '') {
 		$default_class = $this->lsx_layout_switcher_options_default();
-		$selected      = $this->get_layout_value_from_cookie( 'product' );
-		if ( '' !== $selected ) {
+		$selected      = $this->get_layout_value_from_cookie('product');
+		if ('' !== $selected) {
 			$default_class = $selected;
 		}
-		$output = str_replace( 'products', 'products ' . $default_class, $output );
+		$output = str_replace('products', 'products '.$default_class, $output);
 		return $output;
 	}
 
@@ -124,14 +124,14 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function get_layout_value_from_cookie( $page_key = 'blog' ) {
+	public function get_layout_value_from_cookie($page_key = 'blog') {
 		$archive_layout = 'grid';
 
-		if ( isset( $_COOKIE[ 'lsx-' . $page_key . '-layout' ] ) ) {
-			$archive_layout_from_cookie = sanitize_key( $_COOKIE[ 'lsx-' . $page_key . '-layout' ] );
-			$archive_layout_from_cookie = $this->sanitize_select_layout_switcher( $archive_layout_from_cookie );
+		if (isset($_COOKIE['lsx-'.$page_key.'-layout'])) {
+			$archive_layout_from_cookie = sanitize_key($_COOKIE['lsx-'.$page_key.'-layout']);
+			$archive_layout_from_cookie = $this->sanitize_select_layout_switcher($archive_layout_from_cookie);
 
-			if ( ! empty( $archive_layout_from_cookie ) ) {
+			if (!empty($archive_layout_from_cookie)) {
 				$archive_layout = $archive_layout_from_cookie;
 			}
 		}
@@ -143,13 +143,13 @@ 
 	 *
 	 * @since 1.0.0
 	 */
-	public function sanitize_select_layout_switcher( $input ) {
+	public function sanitize_select_layout_switcher($input) {
 		$valid = array(
-			'list'      => esc_html__( 'List', 'lsx-search' ),
-			'grid'      => esc_html__( 'Grid', 'lsx-search' ),
+			'list'      => esc_html__('List', 'lsx-search'),
+			'grid'      => esc_html__('Grid', 'lsx-search'),
 		);
 
-		if ( array_key_exists( $input, $valid ) ) {
+		if (array_key_exists($input, $valid)) {
 			return $input;
 		} else {
 			return '';