lightspeeddevelopment / lsx-health-plan

templates/partials/content-default.php

Spacing +17 added lines, -17 removed lines

@@ -9,47 +9,47 @@
 
 $column_class = '4';
 // Check for shortcode overrides.
-if ( null !== $shortcode_args ) {
-	if ( isset( $shortcode_args['columns'] ) ) {
+if (null !== $shortcode_args) {
+	if (isset($shortcode_args['columns'])) {
 		$column_class = $shortcode_args['columns'];
-		$column_class = \lsx_health_plan\functions\column_class( $column_class );
+		$column_class = \lsx_health_plan\functions\column_class($column_class);
 	}
 }
 
 lsx_entry_before();
 
 $post_id        = get_the_id();
-$featured_image = get_the_post_thumbnail_url( $post_id, $image_size );
+$featured_image = get_the_post_thumbnail_url($post_id, $image_size);
 ?>
-<div class="col-xs-12 col-sm-6 col-md-<?php echo esc_attr( $column_class ); ?>">
-	<div style="background-image:url('<?php echo esc_url( $featured_image ); ?>')" class="lsx-exercises-item bg-<?php echo esc_html( $image_size ); ?>">
+<div class="col-xs-12 col-sm-6 col-md-<?php echo esc_attr($column_class); ?>">
+	<div style="background-image:url('<?php echo esc_url($featured_image); ?>')" class="lsx-exercises-item bg-<?php echo esc_html($image_size); ?>">
 		<?php
 
-		if ( ( 'item' === $link ) || ( 'modal' === $link ) ) {
+		if (('item' === $link) || ('modal' === $link)) {
 			?>
-			<a href="<?php echo esc_url( get_permalink() ); ?>" class="exercise-link excerpt-<?php echo esc_html( $description ); ?>">
+			<a href="<?php echo esc_url(get_permalink()); ?>" class="exercise-link excerpt-<?php echo esc_html($description); ?>">
 			<?php
 		} else {
 			?>
-			<div class="exercise-link excerpt-<?php echo esc_html( $description ); ?>">
+			<div class="exercise-link excerpt-<?php echo esc_html($description); ?>">
 			<?php
 		}
 		?>
 
-		<?php the_title( '<h4 class="lsx-exercises-title">', '</h4>' ); ?>
-		<?php if ( isset( $description ) && ( 'none' !== $description ) ) { ?>
+		<?php the_title('<h4 class="lsx-exercises-title">', '</h4>'); ?>
+		<?php if (isset($description) && ('none' !== $description)) { ?>
 			<?php
-			if ( 'excerpt' === $description ) {
-				$excerpt = \lsx_health_plan\functions\hp_excerpt( $post_id );
+			if ('excerpt' === $description) {
+				$excerpt = \lsx_health_plan\functions\hp_excerpt($post_id);
 				?>
-				<p class="lsx-exercises-excerpt"><?php echo wp_kses_post( $excerpt ); ?></p>
+				<p class="lsx-exercises-excerpt"><?php echo wp_kses_post($excerpt); ?></p>
 			<?php } ?>
-			<?php if ( 'full' === $description ) { ?>
-				<?php echo wp_kses_post( get_the_content() ); ?>
+			<?php if ('full' === $description) { ?>
+				<?php echo wp_kses_post(get_the_content()); ?>
 			<?php } ?>
 		<?php } ?>
 		<?php
-		if ( isset( $link ) && ( ( 'item' === $link ) || ( 'modal' === $link ) ) ) {
+		if (isset($link) && (('item' === $link) || ('modal' === $link))) {
 		?>
 			</a>
 		<?php } else { ?>

Indentation +15 added lines, -15 removed lines

@@ -10,10 +10,10 @@ 
 $column_class = '4';
 // Check for shortcode overrides.
 if ( null !== $shortcode_args ) {
-	if ( isset( $shortcode_args['columns'] ) ) {
-		$column_class = $shortcode_args['columns'];
-		$column_class = \lsx_health_plan\functions\column_class( $column_class );
-	}
+     if ( isset( $shortcode_args['columns'] ) ) {
+          $column_class = $shortcode_args['columns'];
+          $column_class = \lsx_health_plan\functions\column_class( $column_class );
+     }
 }
 
 lsx_entry_before();
@@ -25,23 +25,23 @@ 
 	<div style="background-image:url('<?php echo esc_url( $featured_image ); ?>')" class="lsx-exercises-item bg-<?php echo esc_html( $image_size ); ?>">
 		<?php
 
-		if ( ( 'item' === $link ) || ( 'modal' === $link ) ) {
-			?>
+          if ( ( 'item' === $link ) || ( 'modal' === $link ) ) {
+               ?>
 			<a href="<?php echo esc_url( get_permalink() ); ?>" class="exercise-link excerpt-<?php echo esc_html( $description ); ?>">
 			<?php
-		} else {
-			?>
+          } else {
+               ?>
 			<div class="exercise-link excerpt-<?php echo esc_html( $description ); ?>">
 			<?php
-		}
-		?>
+          }
+          ?>
 
 		<?php the_title( '<h4 class="lsx-exercises-title">', '</h4>' ); ?>
 		<?php if ( isset( $description ) && ( 'none' !== $description ) ) { ?>
 			<?php
-			if ( 'excerpt' === $description ) {
-				$excerpt = \lsx_health_plan\functions\hp_excerpt( $post_id );
-				?>
+               if ( 'excerpt' === $description ) {
+                    $excerpt = \lsx_health_plan\functions\hp_excerpt( $post_id );
+                    ?>
 				<p class="lsx-exercises-excerpt"><?php echo wp_kses_post( $excerpt ); ?></p>
 			<?php } ?>
 			<?php if ( 'full' === $description ) { ?>
@@ -49,8 +49,8 @@ 
 			<?php } ?>
 		<?php } ?>
 		<?php
-		if ( isset( $link ) && ( ( 'item' === $link ) || ( 'modal' === $link ) ) ) {
-		?>
+          if ( isset( $link ) && ( ( 'item' === $link ) || ( 'modal' === $link ) ) ) {
+          ?>
 			</a>
 		<?php } else { ?>
 			</div>

templates/single-exercise.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 <?php lsx_content_wrap_before(); ?>
 
-<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
+<div id="primary" class="content-area <?php echo esc_attr(lsx_main_class()); ?>">
 
 	<?php lsx_content_before(); ?>
 
@@ -17,10 +17,10 @@ 
 
 		<?php lsx_content_top(); ?>
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
 			<?php
-			while ( have_posts() ) :
+			while (have_posts()) :
 				the_post();
 				?>
 
@@ -37,7 +37,7 @@ 
 	<?php lsx_content_after(); ?>
 
 	<?php
-	if ( is_singular( 'post' ) ) {
+	if (is_singular('post')) {
 		lsx_post_nav();
 	}
 	?>

Indentation +7 added lines, -7 removed lines

@@ -20,9 +20,9 @@ 
 		<?php if ( have_posts() ) : ?>
 
 			<?php
-			while ( have_posts() ) :
-				the_post();
-				?>
+               while ( have_posts() ) :
+                    the_post();
+                    ?>
 
 				<?php include LSX_HEALTH_PLAN_PATH . '/templates/content-exercise.php'; ?>
 
@@ -37,10 +37,10 @@ 
 	<?php lsx_content_after(); ?>
 
 	<?php
-	if ( is_singular( 'post' ) ) {
-		lsx_post_nav();
-	}
-	?>
+     if ( is_singular( 'post' ) ) {
+          lsx_post_nav();
+     }
+     ?>
 
 </div><!-- #primary -->
 

templates/featured-recipes.php

Spacing +9 added lines, -9 removed lines

@@ -5,7 +5,7 @@ 
  * @package lsx-health-plan
  */
 
-$args    = array(
+$args = array(
 	'orderby'        => 'date',
 	'order'          => 'DESC',
 	'post_type'      => 'recipe',
@@ -13,31 +13,31 @@ 
 	'meta_key'       => 'recipe_featured',
 	'meta_compare'   => 'EXISTS',
 );
-$recipes = new WP_Query( $args );
+$recipes = new WP_Query($args);
 ?>
 
 <div id="lsx-recipes-shortcode" class="daily-plan-block">
-	<h2 class="title-lined"><?php esc_html_e( 'Featured Recipe', 'lsx-health-plan' ); ?></h2>
+	<h2 class="title-lined"><?php esc_html_e('Featured Recipe', 'lsx-health-plan'); ?></h2>
 	<div class="lsx-recipes-shortcode lsx-recipes-slider slick-slider slick-dotted slick-has-arrows" data-slick="{'slidesToShow': 1, 'slidesToScroll': 1}" >
 
 		<?php
-		if ( $recipes->have_posts() ) :
-			while ( $recipes->have_posts() ) :
+		if ($recipes->have_posts()) :
+			while ($recipes->have_posts()) :
 				$recipes->the_post();
 				$post_id        = get_the_id();
-				$featured_image = get_the_post_thumbnail( $post_id, array( 600, 300 ) );
+				$featured_image = get_the_post_thumbnail($post_id, array(600, 300));
 				?>
 				<div class="lsx-recipes-slot">
 					<div class="row">
 						<div class="col-md-5 col-sm-6">
 							<h4 class="lsx-recipes-title"><?php the_title(); ?></h4>
 							<?php lsx_health_plan_recipe_data(); ?>
-							<a href="<?php echo esc_url( get_permalink() ); ?>" class="btn"><?php esc_html_e( 'View Recipe', 'lsx-health-plan' ); ?></a>
+							<a href="<?php echo esc_url(get_permalink()); ?>" class="btn"><?php esc_html_e('View Recipe', 'lsx-health-plan'); ?></a>
 						</div>
 						<div class="col-md-7 col-sm-6">
 							<?php
-							if ( ! empty( $featured_image ) ) {
-								echo wp_kses_post( $featured_image );
+							if ( ! empty($featured_image)) {
+								echo wp_kses_post($featured_image);
 							}
 							?>
 						</div>

Indentation +16 added lines, -16 removed lines

@@ -6,12 +6,12 @@ 
  */
 
 $args    = array(
-	'orderby'        => 'date',
-	'order'          => 'DESC',
-	'post_type'      => 'recipe',
-	'posts_per_page' => 3,
-	'meta_key'       => 'recipe_featured',
-	'meta_compare'   => 'EXISTS',
+     'orderby'        => 'date',
+     'order'          => 'DESC',
+     'post_type'      => 'recipe',
+     'posts_per_page' => 3,
+     'meta_key'       => 'recipe_featured',
+     'meta_compare'   => 'EXISTS',
 );
 $recipes = new WP_Query( $args );
 ?>
@@ -21,12 +21,12 @@ 
 	<div class="lsx-recipes-shortcode lsx-recipes-slider slick-slider slick-dotted slick-has-arrows" data-slick="{'slidesToShow': 1, 'slidesToScroll': 1}" >
 
 		<?php
-		if ( $recipes->have_posts() ) :
-			while ( $recipes->have_posts() ) :
-				$recipes->the_post();
-				$post_id        = get_the_id();
-				$featured_image = get_the_post_thumbnail( $post_id, array( 600, 300 ) );
-				?>
+          if ( $recipes->have_posts() ) :
+               while ( $recipes->have_posts() ) :
+                    $recipes->the_post();
+                    $post_id        = get_the_id();
+                    $featured_image = get_the_post_thumbnail( $post_id, array( 600, 300 ) );
+                    ?>
 				<div class="lsx-recipes-slot">
 					<div class="row">
 						<div class="col-md-5 col-sm-6">
@@ -36,10 +36,10 @@ 
 						</div>
 						<div class="col-md-7 col-sm-6">
 							<?php
-							if ( ! empty( $featured_image ) ) {
-								echo wp_kses_post( $featured_image );
-							}
-							?>
+                                   if ( ! empty( $featured_image ) ) {
+                                        echo wp_kses_post( $featured_image );
+                                   }
+                                   ?>
 						</div>
 					</div>
 				</div>

templates/taxonomy-week.php

Spacing +4 added lines, -4 removed lines

@@ -9,7 +9,7 @@ 
 
 <?php lsx_content_wrap_before(); ?>
 
-<div id="primary" class="content-area <?php echo esc_attr( lsx_main_class() ); ?>">
+<div id="primary" class="content-area <?php echo esc_attr(lsx_main_class()); ?>">
 
 	<?php lsx_content_before(); ?>
 
@@ -17,12 +17,12 @@ 
 
 		<?php lsx_content_top(); ?>
 
-		<?php if ( have_posts() ) : ?>
+		<?php if (have_posts()) : ?>
 
 			<div class="post-wrapper">
 
 				<?php
-				while ( have_posts() ) :
+				while (have_posts()) :
 					the_post();
 				?>
 
@@ -36,7 +36,7 @@ 
 
 		<?php else : ?>
 
-			<?php get_template_part( 'partials/content', 'none' ); ?>
+			<?php get_template_part('partials/content', 'none'); ?>
 
 		<?php endif; ?>
 

Indentation +3 added lines, -3 removed lines

@@ -22,9 +22,9 @@
 			<div class="post-wrapper">
 
 				<?php
-				while ( have_posts() ) :
-					the_post();
-				?>
+                    while ( have_posts() ) :
+                         the_post();
+                    ?>
 
 					<?php include LSX_HEALTH_PLAN_PATH . '/templates/content-plan.php'; ?>
 

Braces +5 added lines, -2 removed lines

@@ -36,9 +36,12 @@
 
 			<?php lsx_paging_nav(); ?>
 
-		<?php else : ?>
+		<?php else {
+     : ?>
 
-			<?php get_template_part( 'partials/content', 'none' ); ?>
+			<?php get_template_part( 'partials/content', 'none' );
+}
+?>
 
 		<?php endif; ?>
 

templates/featured-videos.php

Spacing +11 added lines, -11 removed lines

@@ -5,7 +5,7 @@ 
  * @package lsx-health-plan
  */
 
-$args   = array(
+$args = array(
 	'orderby'        => 'date',
 	'order'          => 'DESC',
 	'post_type'      => 'video',
@@ -13,20 +13,20 @@ 
 	'meta_key'       => 'video_featured_video',
 	'meta_compare'   => 'EXISTS',
 );
-$videos = new WP_Query( $args );
+$videos = new WP_Query($args);
 ?>
 
 <div id="lsx-videos-shortcode" class="daily-plan-block">
-	<h2 class="title-lined"><?php esc_html_e( 'Featured Workout', 'lsx-health-plan' ); ?></h2>
+	<h2 class="title-lined"><?php esc_html_e('Featured Workout', 'lsx-health-plan'); ?></h2>
 	<div class="lsx-videos-shortcode lsx-videos-slider slick-slider slick-dotted slick-has-arrows" data-slick="{'slidesToShow': 1, 'slidesToScroll': 1}" >
 		<?php
-		if ( $videos->have_posts() ) :
-			while ( $videos->have_posts() ) :
+		if ($videos->have_posts()) :
+			while ($videos->have_posts()) :
 				$videos->the_post();
 
-				$featured = get_post_meta( get_the_ID(), 'video_featured_video', true );
-				$giphy    = get_post_meta( get_the_ID(), 'video_giphy_source', true );
-				$youtube  = esc_url( get_post_meta( get_the_ID(), 'video_youtube_source', 1 ) );
+				$featured = get_post_meta(get_the_ID(), 'video_featured_video', true);
+				$giphy    = get_post_meta(get_the_ID(), 'video_giphy_source', true);
+				$youtube  = esc_url(get_post_meta(get_the_ID(), 'video_youtube_source', 1));
 				?>
 				<div class="lsx-videos-slot">
 					<div class="row">
@@ -36,10 +36,10 @@ 
 						</div>
 						<div class="col-md-8">
 							<?php
-							if ( ! empty( $giphy ) ) {
+							if ( ! empty($giphy)) {
 								echo $giphy; // WPCS: XSS OK.
-							} elseif ( ! empty( $youtube ) ) {
-								echo wp_oembed_get( $youtube ); // WPCS: XSS OK.
+							} elseif ( ! empty($youtube)) {
+								echo wp_oembed_get($youtube); // WPCS: XSS OK.
 							}
 							?>
 						</div>

Indentation +19 added lines, -19 removed lines

@@ -6,12 +6,12 @@ 
  */
 
 $args   = array(
-	'orderby'        => 'date',
-	'order'          => 'DESC',
-	'post_type'      => 'video',
-	'posts_per_page' => 3,
-	'meta_key'       => 'video_featured_video',
-	'meta_compare'   => 'EXISTS',
+     'orderby'        => 'date',
+     'order'          => 'DESC',
+     'post_type'      => 'video',
+     'posts_per_page' => 3,
+     'meta_key'       => 'video_featured_video',
+     'meta_compare'   => 'EXISTS',
 );
 $videos = new WP_Query( $args );
 ?>
@@ -20,14 +20,14 @@ 
 	<h2 class="title-lined"><?php esc_html_e( 'Featured Workout', 'lsx-health-plan' ); ?></h2>
 	<div class="lsx-videos-shortcode lsx-videos-slider slick-slider slick-dotted slick-has-arrows" data-slick="{'slidesToShow': 1, 'slidesToScroll': 1}" >
 		<?php
-		if ( $videos->have_posts() ) :
-			while ( $videos->have_posts() ) :
-				$videos->the_post();
+          if ( $videos->have_posts() ) :
+               while ( $videos->have_posts() ) :
+                    $videos->the_post();
 
-				$featured = get_post_meta( get_the_ID(), 'video_featured_video', true );
-				$giphy    = get_post_meta( get_the_ID(), 'video_giphy_source', true );
-				$youtube  = esc_url( get_post_meta( get_the_ID(), 'video_youtube_source', 1 ) );
-				?>
+                    $featured = get_post_meta( get_the_ID(), 'video_featured_video', true );
+                    $giphy    = get_post_meta( get_the_ID(), 'video_giphy_source', true );
+                    $youtube  = esc_url( get_post_meta( get_the_ID(), 'video_youtube_source', 1 ) );
+                    ?>
 				<div class="lsx-videos-slot">
 					<div class="row">
 						<div class="col-md-4">
@@ -36,12 +36,12 @@ 
 						</div>
 						<div class="col-md-8">
 							<?php
-							if ( ! empty( $giphy ) ) {
-								echo $giphy; // WPCS: XSS OK.
-							} elseif ( ! empty( $youtube ) ) {
-								echo wp_oembed_get( $youtube ); // WPCS: XSS OK.
-							}
-							?>
+                                   if ( ! empty( $giphy ) ) {
+                                        echo $giphy; // WPCS: XSS OK.
+                                   } elseif ( ! empty( $youtube ) ) {
+                                        echo wp_oembed_get( $youtube ); // WPCS: XSS OK.
+                                   }
+                                   ?>
 						</div>
 					</div>
 				</div>

includes/template-tags/gallery.php

Spacing +5 added lines, -5 removed lines

@@ -14,17 +14,17 @@
  * @param  string  $item_id
  * @return string
  */
-function lsx_health_plan_gallery( $before = '', $after = '', $echo = true, $item_id = false ) {
+function lsx_health_plan_gallery($before = '', $after = '', $echo = true, $item_id = false) {
 	$gallery = '';
 	$lsx_hp  = lsx_health_plan();
-	if ( false === $item_id ) {
+	if (false === $item_id) {
 		$item_id = get_the_ID();
 	}
-	if ( $lsx_hp->frontend->gallery->has_gallery( $item_id ) ) {
+	if ($lsx_hp->frontend->gallery->has_gallery($item_id)) {
 		$gallery = $before . $lsx_hp->frontend->gallery->get_gallery() . $after;
 	}
-	if ( true === $echo ) {
-		echo wp_kses_post( $gallery );
+	if (true === $echo) {
+		echo wp_kses_post($gallery);
 	} else {
 		return $gallery;
 	}

Indentation +13 added lines, -13 removed lines

@@ -15,17 +15,17 @@
  * @return string
  */
 function lsx_health_plan_gallery( $before = '', $after = '', $echo = true, $item_id = false ) {
-	$gallery = '';
-	$lsx_hp  = lsx_health_plan();
-	if ( false === $item_id ) {
-		$item_id = get_the_ID();
-	}
-	if ( $lsx_hp->frontend->gallery->has_gallery( $item_id ) ) {
-		$gallery = $before . $lsx_hp->frontend->gallery->get_gallery() . $after;
-	}
-	if ( true === $echo ) {
-		echo wp_kses_post( $gallery );
-	} else {
-		return $gallery;
-	}
+     $gallery = '';
+     $lsx_hp  = lsx_health_plan();
+     if ( false === $item_id ) {
+          $item_id = get_the_ID();
+     }
+     if ( $lsx_hp->frontend->gallery->has_gallery( $item_id ) ) {
+          $gallery = $before . $lsx_hp->frontend->gallery->get_gallery() . $after;
+     }
+     if ( true === $echo ) {
+          echo wp_kses_post( $gallery );
+     } else {
+          return $gallery;
+     }
 }

classes/class-core.php

Spacing +6 added lines, -6 removed lines

@@ -60,7 +60,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();
 		}
 
@@ -107,11 +107,11 @@ 
 	 * @return void
 	 */
 	public function get_post_types() {
-		$post_types = apply_filters( 'lsx_health_plan_post_types', isset( $this->post_types ) );
-		foreach ( $post_types as $index => $post_type ) {
-			$is_disabled = \cmb2_get_option( 'lsx_health_plan_options', $post_type . '_disabled', false );
-			if ( true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled ) {
-				unset( $post_types[ $index ] );
+		$post_types = apply_filters('lsx_health_plan_post_types', isset($this->post_types));
+		foreach ($post_types as $index => $post_type) {
+			$is_disabled = \cmb2_get_option('lsx_health_plan_options', $post_type . '_disabled', false);
+			if (true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled) {
+				unset($post_types[$index]);
 			}
 		}
 		return $post_types;

Indentation +112 added lines, -112 removed lines

@@ -8,116 +8,116 @@
  */
 class Core {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_health_plan\classes\Core()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * @var object \lsx_health_plan\classes\Setup();
-	 */
-	public $setup;
-
-	/**
-	 * @var object \lsx_health_plan\classes\Admin();
-	 */
-	public $admin;
-
-	/**
-	 * @var object \lsx_health_plan\classes\Frontend();
-	 */
-	public $frontend;
-
-	/**
-	 * @var object \lsx_health_plan\classes\Integrations();
-	 */
-	public $integrations;
-
-	/**
-	 * @var object \lsx_health_plan\classes\Integrations();
-	 */
-	public $scpo_engine;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->load_includes();
-		$this->load_classes();
-	}
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx_health_plan\classes\Core()    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 variable classes and the static classes.
-	 */
-	private function load_classes() {
-
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/class-setup.php';
-		$this->setup = Setup::get_instance();
-
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/class-admin.php';
-		$this->admin = Admin::get_instance();
-
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/class-frontend.php';
-		$this->frontend = Frontend::get_instance();
-
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/class-integrations.php';
-		$this->integrations = Integrations::get_instance();
-
-		require_once LSX_HEALTH_PLAN_PATH . 'classes/class-scpo-engine.php';
-		$this->scpo_engine = SCPO_Engine::get_instance();
-	}
-
-	/**
-	 * Loads the plugin functions.
-	 */
-	private function load_includes() {
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/functions.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/functions/triggers.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/functions/recipes.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/functions/plan.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/conditionals.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags/exercise.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags/gallery.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags/plan.php';
-		require_once LSX_HEALTH_PLAN_PATH . '/includes/shortcodes.php';
-	}
-
-	/**
-	 * Returns the post types currently active
-	 *
-	 * @return void
-	 */
-	public function get_post_types() {
-		$post_types = apply_filters( 'lsx_health_plan_post_types', isset( $this->post_types ) );
-		foreach ( $post_types as $index => $post_type ) {
-			$is_disabled = \cmb2_get_option( 'lsx_health_plan_options', $post_type . '_disabled', false );
-			if ( true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled ) {
-				unset( $post_types[ $index ] );
-			}
-		}
-		return $post_types;
-	}
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx_health_plan\classes\Core()
+      */
+     protected static $instance = null;
+
+     /**
+      * @var object \lsx_health_plan\classes\Setup();
+      */
+     public $setup;
+
+     /**
+      * @var object \lsx_health_plan\classes\Admin();
+      */
+     public $admin;
+
+     /**
+      * @var object \lsx_health_plan\classes\Frontend();
+      */
+     public $frontend;
+
+     /**
+      * @var object \lsx_health_plan\classes\Integrations();
+      */
+     public $integrations;
+
+     /**
+      * @var object \lsx_health_plan\classes\Integrations();
+      */
+     public $scpo_engine;
+
+     /**
+      * Constructor
+      */
+     public function __construct() {
+          $this->load_includes();
+          $this->load_classes();
+     }
+
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object \lsx_health_plan\classes\Core()    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 variable classes and the static classes.
+      */
+     private function load_classes() {
+
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/class-setup.php';
+          $this->setup = Setup::get_instance();
+
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/class-admin.php';
+          $this->admin = Admin::get_instance();
+
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/class-frontend.php';
+          $this->frontend = Frontend::get_instance();
+
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/class-integrations.php';
+          $this->integrations = Integrations::get_instance();
+
+          require_once LSX_HEALTH_PLAN_PATH . 'classes/class-scpo-engine.php';
+          $this->scpo_engine = SCPO_Engine::get_instance();
+     }
+
+     /**
+      * Loads the plugin functions.
+      */
+     private function load_includes() {
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/functions.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/functions/triggers.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/functions/recipes.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/functions/plan.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/conditionals.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags/exercise.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags/gallery.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/template-tags/plan.php';
+          require_once LSX_HEALTH_PLAN_PATH . '/includes/shortcodes.php';
+     }
+
+     /**
+      * Returns the post types currently active
+      *
+      * @return void
+      */
+     public function get_post_types() {
+          $post_types = apply_filters( 'lsx_health_plan_post_types', isset( $this->post_types ) );
+          foreach ( $post_types as $index => $post_type ) {
+               $is_disabled = \cmb2_get_option( 'lsx_health_plan_options', $post_type . '_disabled', false );
+               if ( true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled ) {
+                    unset( $post_types[ $index ] );
+               }
+          }
+          return $post_types;
+     }
 }

classes/class-scpo-engine.php

Spacing +123 added lines, -123 removed lines

@@ -22,74 +22,74 @@ 
 	 */
 	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 __construct() {
-		if ( ! get_option( 'lsx_to_scporder_install' ) ) {
+		if ( ! get_option('lsx_to_scporder_install')) {
 			$this->lsx_to_scporder_install();
 		}
 
-		add_action( 'admin_init', array( $this, 'refresh' ) );
-		add_action( 'admin_init', array( $this, 'load_script_css' ) );
+		add_action('admin_init', array($this, 'refresh'));
+		add_action('admin_init', array($this, 'load_script_css'));
 
-		add_action( 'wp_ajax_update-menu-order', array(
+		add_action('wp_ajax_update-menu-order', array(
 			$this,
 			'update_menu_order',
-		) );
-		add_action( 'wp_ajax_update-menu-order-tags', array(
+		));
+		add_action('wp_ajax_update-menu-order-tags', array(
 			$this,
 			'update_menu_order_tags',
-		) );
+		));
 
-		add_action( 'pre_get_posts', array(
+		add_action('pre_get_posts', array(
 			$this,
 			'lsx_to_scporder_pre_get_posts',
-		) );
+		));
 
-		add_filter( 'get_previous_post_where', array(
+		add_filter('get_previous_post_where', array(
 			$this,
 			'lsx_to_scporder_previous_post_where',
-		) );
-		add_filter( 'get_previous_post_sort', array(
+		));
+		add_filter('get_previous_post_sort', array(
 			$this,
 			'lsx_to_scporder_previous_post_sort',
-		) );
-		add_filter( 'get_next_post_where', array(
+		));
+		add_filter('get_next_post_where', array(
 			$this,
 			'lsx_to_scporder_next_post_where',
-		) );
-		add_filter( 'get_next_post_sort', array(
+		));
+		add_filter('get_next_post_sort', array(
 			$this,
 			'lsx_to_scporder_next_post_sort',
-		) );
+		));
 
-		add_filter( 'get_terms_orderby', array(
+		add_filter('get_terms_orderby', array(
 			$this,
 			'lsx_to_scporder_get_terms_orderby',
-		), 10, 3 );
-		add_filter( 'wp_get_object_terms', array(
+		), 10, 3);
+		add_filter('wp_get_object_terms', array(
 			$this,
 			'lsx_to_scporder_get_object_terms',
-		), 10, 4 );
-		add_filter( 'get_terms', array(
+		), 10, 4);
+		add_filter('get_terms', array(
 			$this,
 			'lsx_to_scporder_get_object_terms',
-		), 10, 4 );
+		), 10, 4);
 	}
 
 	public function lsx_to_scporder_install() {
 		global $wpdb;
-		$result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_to_term_order`" );
+		$result = $wpdb->query("DESCRIBE $wpdb->terms `lsx_to_term_order`");
 
-		if ( ! $result ) {
-			$result = $wpdb->query( "ALTER TABLE $wpdb->terms ADD `lsx_to_term_order` INT(4) NULL DEFAULT '0'" );
+		if ( ! $result) {
+			$result = $wpdb->query("ALTER TABLE $wpdb->terms ADD `lsx_to_term_order` INT(4) NULL DEFAULT '0'");
 		}
 
-		update_option( 'lsx_to_scporder_install', 1 );
+		update_option('lsx_to_scporder_install', 1);
 	}
 
 	public function _check_load_script_css() {
@@ -98,25 +98,25 @@ 
 		$objects = $this->get_to_scporder_options_objects();
 		$tags    = $this->get_to_scporder_options_tags();
 
-		if ( empty( $objects ) && empty( $tags ) ) {
+		if (empty($objects) && empty($tags)) {
 			return false;
 		}
 
-		if ( isset( $_GET['orderby'] ) || strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'action=edit' ) || strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'wp-admin/post-new.php' ) ) {
+		if (isset($_GET['orderby']) || strstr(sanitize_text_field($_SERVER['REQUEST_URI']), 'action=edit') || strstr(sanitize_text_field($_SERVER['REQUEST_URI']), 'wp-admin/post-new.php')) {
 			return false;
 		}
 
-		if ( ! empty( $objects ) ) {
-			if ( isset( $_GET['post_type'] ) && ! isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( $_GET['post_type'] ), $objects ) ) { // if page or custom post types
+		if ( ! empty($objects)) {
+			if (isset($_GET['post_type']) && ! isset($_GET['taxonomy']) && array_key_exists(sanitize_text_field($_GET['post_type']), $objects)) { // if page or custom post types
 				$active = true;
 			}
-			if ( ! isset( $_GET['post_type'] ) && strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'wp-admin/edit.php' ) && array_key_exists( 'post', $objects ) ) { // if post
+			if ( ! isset($_GET['post_type']) && strstr(sanitize_text_field($_SERVER['REQUEST_URI']), 'wp-admin/edit.php') && array_key_exists('post', $objects)) { // if post
 				$active = true;
 			}
 		}
 
-		if ( ! empty( $tags ) ) {
-			if ( isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( $_GET['taxonomy'] ), $tags ) ) {
+		if ( ! empty($tags)) {
+			if (isset($_GET['taxonomy']) && array_key_exists(sanitize_text_field($_GET['taxonomy']), $tags)) {
 				$active = true;
 			}
 		}
@@ -125,18 +125,18 @@ 
 	}
 
 	public function load_script_css() {
-		if ( $this->_check_load_script_css() ) {
-			wp_enqueue_script( 'scporderjs', LSX_HEALTH_PLAN_URL . '/assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
+		if ($this->_check_load_script_css()) {
+			wp_enqueue_script('scporderjs', LSX_HEALTH_PLAN_URL . '/assets/js/scporder.min.js', array('jquery', 'jquery-ui-sortable'), null, true);
 
 			$scporderjs_params = array(
-				'ajax_url'   => admin_url( 'admin-ajax.php' ),
-				'ajax_nonce' => wp_create_nonce( 'scporder' ),
+				'ajax_url'   => admin_url('admin-ajax.php'),
+				'ajax_nonce' => wp_create_nonce('scporder'),
 			);
 
-			wp_localize_script( 'scporderjs', 'scporderjs_params', $scporderjs_params );
+			wp_localize_script('scporderjs', 'scporderjs_params', $scporderjs_params);
 
-			wp_enqueue_style( 'scporder', LSX_HEALTH_PLAN_URL . '/assets/css/scporder.css', array(), null );
-			wp_style_add_data( 'scporder', 'rtl', 'replace' );
+			wp_enqueue_style('scporder', LSX_HEALTH_PLAN_URL . '/assets/css/scporder.css', array(), null);
+			wp_style_add_data('scporder', 'rtl', 'replace');
 		}
 	}
 
@@ -145,26 +145,26 @@ 
 		$objects = $this->get_to_scporder_options_objects();
 		$tags    = $this->get_to_scporder_options_tags();
 
-		if ( ! empty( $objects ) ) {
-			foreach ( $objects as $object => $object_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+		if ( ! empty($objects)) {
+			foreach ($objects as $object => $object_data) {
+				$result = $wpdb->get_results($wpdb->prepare("
 					SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
-				", $object ) );
+				", $object));
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+				if (0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max) {
 					continue;
 				}
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+				$results = $wpdb->get_results($wpdb->prepare("
 					SELECT ID
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
 					ORDER BY menu_order ASC
-				", $object ) );
+				", $object));
 
-				foreach ( $results as $key => $result ) {
+				foreach ($results as $key => $result) {
 					$wpdb->update(
 						$wpdb->posts,
 						array(
@@ -178,28 +178,28 @@ 
 			}
 		}
 
-		if ( ! empty( $tags ) ) {
-			foreach ( $tags as $taxonomy => $taxonomy_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+		if ( ! empty($tags)) {
+			foreach ($tags as $taxonomy => $taxonomy_data) {
+				$result = $wpdb->get_results($wpdb->prepare("
 					SELECT count(*) as cnt, max(lsx_to_term_order) as max, min(lsx_to_term_order) as min
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
 					WHERE term_taxonomy.taxonomy = '%s'
-				", $taxonomy ) );
+				", $taxonomy));
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+				if (0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max) {
 					continue;
 				}
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+				$results = $wpdb->get_results($wpdb->prepare("
 					SELECT terms.term_id
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
 					WHERE term_taxonomy.taxonomy = '%s'
 					ORDER BY lsx_to_term_order ASC
-				", $taxonomy ) );
+				", $taxonomy));
 
-				foreach ( $results as $key => $result ) {
+				foreach ($results as $key => $result) {
 					$wpdb->update(
 						$wpdb->terms,
 						array(
@@ -215,13 +215,13 @@ 
 	}
 
 	public function update_menu_order() {
-		check_ajax_referer( 'scporder', 'security' );
+		check_ajax_referer('scporder', 'security');
 
 		global $wpdb;
 
-		parse_str( sanitize_text_field( $_POST['order'] ), $data );
+		parse_str(sanitize_text_field($_POST['order']), $data);
 
-		if ( ! is_array( $data ) ) {
+		if ( ! is_array($data)) {
 			return false;
 		}
 
@@ -244,15 +244,15 @@ 
 
 		sort( $menu_order_arr );*/
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
+		foreach ($data as $key => $values) {
+			foreach ($values as $position => $id) {
 				$wpdb->update(
 					$wpdb->posts,
 					array(
 						'menu_order' => $position,
 					),
 					array(
-						'ID' => intval( $id ),
+						'ID' => intval($id),
 					)
 				);
 			}
@@ -260,13 +260,13 @@ 
 	}
 
 	public function update_menu_order_tags() {
-		check_ajax_referer( 'scporder', 'security' );
+		check_ajax_referer('scporder', 'security');
 
 		global $wpdb;
 
-		parse_str( sanitize_text_field( $_POST['order'] ), $data );
+		parse_str(sanitize_text_field($_POST['order']), $data);
 
-		if ( ! is_array( $data ) ) {
+		if ( ! is_array($data)) {
 			return false;
 		}
 
@@ -294,33 +294,33 @@ 
 
 		sort( $menu_order_arr );*/
 
-		foreach ( $data as $key => $values ) {
+		foreach ($data as $key => $values) {
 			$term_ids = array();
-			foreach ( $values as $position => $id ) {
+			foreach ($values as $position => $id) {
 				$wpdb->update(
 					$wpdb->terms,
 					array(
 						'lsx_to_term_order' => $position + 1,
 					),
 					array(
-						'term_id' => intval( $id ),
+						'term_id' => intval($id),
 					)
 				);
-				$term_ids[] = intval( $id );
+				$term_ids[] = intval($id);
 			}
-			clean_term_cache( $term_ids );
+			clean_term_cache($term_ids);
 		}
 	}
 
-	public function lsx_to_scporder_previous_post_where( $where ) {
+	public function lsx_to_scporder_previous_post_where($where) {
 		global $post;
 		$objects = $this->get_to_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $where;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$current_menu_order = $post->menu_order;
 			$where              = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
 		}
@@ -328,30 +328,30 @@ 
 		return $where;
 	}
 
-	public function lsx_to_scporder_previous_post_sort( $orderby ) {
+	public function lsx_to_scporder_previous_post_sort($orderby) {
 		global $post;
 		$objects = $this->get_to_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $orderby;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
 		}
 
 		return $orderby;
 	}
 
-	public function lsx_to_scporder_next_post_where( $where ) {
+	public function lsx_to_scporder_next_post_where($where) {
 		global $post;
 		$objects = $this->get_to_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $where;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$current_menu_order = $post->menu_order;
 			$where              = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
 		}
@@ -359,97 +359,97 @@ 
 		return $where;
 	}
 
-	public function lsx_to_scporder_next_post_sort( $orderby ) {
+	public function lsx_to_scporder_next_post_sort($orderby) {
 		global $post;
 		$objects = $this->get_to_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return $orderby;
 		}
 
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+		if (isset($post->post_type) && array_key_exists($post->post_type, $objects)) {
 			$orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
 		}
 
 		return $orderby;
 	}
 
-	public function lsx_to_scporder_pre_get_posts( $wp_query ) {
+	public function lsx_to_scporder_pre_get_posts($wp_query) {
 		$objects = $this->get_to_scporder_options_objects();
 
-		if ( empty( $objects ) ) {
+		if (empty($objects)) {
 			return false;
 		}
 
-		if ( is_admin() ) {
-			if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) {
-				if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-					$wp_query->set( 'order', 'ASC' );
+		if (is_admin()) {
+			if (isset($wp_query->query['post_type']) && ! isset($_GET['orderby'])) {
+				if (array_key_exists($wp_query->query['post_type'], $objects)) {
+					$wp_query->set('orderby', 'menu_order');
+					$wp_query->set('order', 'ASC');
 				}
 			}
 		} else {
 			$active = false;
 
-			if ( isset( $wp_query->query['post_type'] ) ) {
-				if ( ! is_array( $wp_query->query['post_type'] ) ) {
-					if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
+			if (isset($wp_query->query['post_type'])) {
+				if ( ! is_array($wp_query->query['post_type'])) {
+					if (array_key_exists($wp_query->query['post_type'], $objects)) {
 						$active = true;
 					}
 				}
 			} else {
-				if ( array_key_exists( 'post', $objects ) ) {
+				if (array_key_exists('post', $objects)) {
 					$active = true;
 				}
 			}
 
-			if ( ! $active ) {
+			if ( ! $active) {
 				return false;
 			}
 
-			if ( isset( $wp_query->query['disabled_custom_post_order'] ) ) {
+			if (isset($wp_query->query['disabled_custom_post_order'])) {
 				return false;
 			}
 
-			if ( isset( $wp_query->query['suppress_filters'] ) ) {
-				if ( $wp_query->get( 'orderby' ) == 'date' ) {
-					$wp_query->set( 'orderby', 'menu_order' );
+			if (isset($wp_query->query['suppress_filters'])) {
+				if ($wp_query->get('orderby') == 'date') {
+					$wp_query->set('orderby', 'menu_order');
 				}
-				if ( $wp_query->get( 'order' ) == 'DESC' ) {
-					$wp_query->set( 'order', 'ASC' );
+				if ($wp_query->get('order') == 'DESC') {
+					$wp_query->set('order', 'ASC');
 				}
 			} else {
-				if ( ! $wp_query->get( 'orderby' ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
+				if ( ! $wp_query->get('orderby')) {
+					$wp_query->set('orderby', 'menu_order');
 				}
-				if ( ! $wp_query->get( 'order' ) ) {
-					$wp_query->set( 'order', 'ASC' );
+				if ( ! $wp_query->get('order')) {
+					$wp_query->set('order', 'ASC');
 				}
 			}
 		}
 	}
 
-	public function lsx_to_scporder_get_terms_orderby( $orderby, $args ) {
+	public function lsx_to_scporder_get_terms_orderby($orderby, $args) {
 
-		if ( is_admin() ) {
+		if (is_admin()) {
 			return $orderby;
 		}
 
-		if ( isset( $args['disabled_custom_post_order'] ) ) {
+		if (isset($args['disabled_custom_post_order'])) {
 			return $orderby;
 		}
 
 		$tags = $this->get_to_scporder_options_tags();
 
-		if ( ! isset( $args['taxonomy'] ) ) {
+		if ( ! isset($args['taxonomy'])) {
 			return $orderby;
 		}
 
 		$taxonomy = $args['taxonomy'];
-		if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 ) {
+		if (is_array($taxonomy) && count($taxonomy) == 1) {
 			$taxonomy = $taxonomy[0];
 		}
-		if ( ! is_array( $taxonomy ) && ! array_key_exists( $taxonomy, $tags ) ) {
+		if ( ! is_array($taxonomy) && ! array_key_exists($taxonomy, $tags)) {
 			return $orderby;
 		}
 
@@ -458,38 +458,38 @@ 
 		return $orderby;
 	}
 
-	public function lsx_to_scporder_get_object_terms( $terms, $not_used, $args_1, $args_2 = null ) {
+	public function lsx_to_scporder_get_object_terms($terms, $not_used, $args_1, $args_2 = null) {
 		$tags = $this->get_to_scporder_options_tags();
 
-		if ( is_admin() && isset( $_GET['orderby'] ) ) {
+		if (is_admin() && isset($_GET['orderby'])) {
 			return $terms;
 		}
 
-		$args = is_null( $args_2 ) || ! is_array( $args_2 ) ? $args_1 : $args_2;
+		$args = is_null($args_2) || ! is_array($args_2) ? $args_1 : $args_2;
 
-		if ( isset( $args['disabled_custom_post_order'] ) ) {
+		if (isset($args['disabled_custom_post_order'])) {
 			return $terms;
 		}
 
-		foreach ( $terms as $key => $term ) {
-			if ( is_object( $term ) && isset( $term->taxonomy ) ) {
+		foreach ($terms as $key => $term) {
+			if (is_object($term) && isset($term->taxonomy)) {
 				$taxonomy = $term->taxonomy;
-				if ( ! array_key_exists( $taxonomy, $tags ) ) {
+				if ( ! array_key_exists($taxonomy, $tags)) {
 					return $terms;
 				}
 			} else {
 				return $terms;
 			}
 		}
-		usort( $terms, array( $this, 'taxcmp' ) );
+		usort($terms, array($this, 'taxcmp'));
 		return $terms;
 	}
 
-	public function taxcmp( $a, $b ) {
-		if ( $a->lsx_to_term_order == $b->lsx_to_term_order ) {
+	public function taxcmp($a, $b) {
+		if ($a->lsx_to_term_order == $b->lsx_to_term_order) {
 			return 0;
 		}
-		return ( $a->lsx_to_term_order < $b->lsx_to_term_order ) ? - 1 : 1;
+		return ($a->lsx_to_term_order < $b->lsx_to_term_order) ? -1 : 1;
 	}
 
 	public function get_to_scporder_options_objects() {

Indentation +431 added lines, -431 removed lines

@@ -4,194 +4,194 @@ 
 
 class SCPO_Engine {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_health_plan\classes\SCPO_Engine()
-	 */
-	protected static $instance = null;
-
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx_health_plan\classes\SCPO_Engine()    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 __construct() {
-		if ( ! get_option( 'lsx_to_scporder_install' ) ) {
-			$this->lsx_to_scporder_install();
-		}
-
-		add_action( 'admin_init', array( $this, 'refresh' ) );
-		add_action( 'admin_init', array( $this, 'load_script_css' ) );
-
-		add_action( 'wp_ajax_update-menu-order', array(
-			$this,
-			'update_menu_order',
-		) );
-		add_action( 'wp_ajax_update-menu-order-tags', array(
-			$this,
-			'update_menu_order_tags',
-		) );
-
-		add_action( 'pre_get_posts', array(
-			$this,
-			'lsx_to_scporder_pre_get_posts',
-		) );
-
-		add_filter( 'get_previous_post_where', array(
-			$this,
-			'lsx_to_scporder_previous_post_where',
-		) );
-		add_filter( 'get_previous_post_sort', array(
-			$this,
-			'lsx_to_scporder_previous_post_sort',
-		) );
-		add_filter( 'get_next_post_where', array(
-			$this,
-			'lsx_to_scporder_next_post_where',
-		) );
-		add_filter( 'get_next_post_sort', array(
-			$this,
-			'lsx_to_scporder_next_post_sort',
-		) );
-
-		add_filter( 'get_terms_orderby', array(
-			$this,
-			'lsx_to_scporder_get_terms_orderby',
-		), 10, 3 );
-		add_filter( 'wp_get_object_terms', array(
-			$this,
-			'lsx_to_scporder_get_object_terms',
-		), 10, 4 );
-		add_filter( 'get_terms', array(
-			$this,
-			'lsx_to_scporder_get_object_terms',
-		), 10, 4 );
-	}
-
-	public function lsx_to_scporder_install() {
-		global $wpdb;
-		$result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_to_term_order`" );
-
-		if ( ! $result ) {
-			$result = $wpdb->query( "ALTER TABLE $wpdb->terms ADD `lsx_to_term_order` INT(4) NULL DEFAULT '0'" );
-		}
-
-		update_option( 'lsx_to_scporder_install', 1 );
-	}
-
-	public function _check_load_script_css() {
-		$active = false;
-
-		$objects = $this->get_to_scporder_options_objects();
-		$tags    = $this->get_to_scporder_options_tags();
-
-		if ( empty( $objects ) && empty( $tags ) ) {
-			return false;
-		}
-
-		if ( isset( $_GET['orderby'] ) || strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'action=edit' ) || strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'wp-admin/post-new.php' ) ) {
-			return false;
-		}
-
-		if ( ! empty( $objects ) ) {
-			if ( isset( $_GET['post_type'] ) && ! isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( $_GET['post_type'] ), $objects ) ) { // if page or custom post types
-				$active = true;
-			}
-			if ( ! isset( $_GET['post_type'] ) && strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'wp-admin/edit.php' ) && array_key_exists( 'post', $objects ) ) { // if post
-				$active = true;
-			}
-		}
-
-		if ( ! empty( $tags ) ) {
-			if ( isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( $_GET['taxonomy'] ), $tags ) ) {
-				$active = true;
-			}
-		}
-
-		return $active;
-	}
-
-	public function load_script_css() {
-		if ( $this->_check_load_script_css() ) {
-			wp_enqueue_script( 'scporderjs', LSX_HEALTH_PLAN_URL . '/assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
-
-			$scporderjs_params = array(
-				'ajax_url'   => admin_url( 'admin-ajax.php' ),
-				'ajax_nonce' => wp_create_nonce( 'scporder' ),
-			);
-
-			wp_localize_script( 'scporderjs', 'scporderjs_params', $scporderjs_params );
-
-			wp_enqueue_style( 'scporder', LSX_HEALTH_PLAN_URL . '/assets/css/scporder.css', array(), null );
-			wp_style_add_data( 'scporder', 'rtl', 'replace' );
-		}
-	}
-
-	public function refresh() {
-		global $wpdb;
-		$objects = $this->get_to_scporder_options_objects();
-		$tags    = $this->get_to_scporder_options_tags();
-
-		if ( ! empty( $objects ) ) {
-			foreach ( $objects as $object => $object_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx_health_plan\classes\SCPO_Engine()
+      */
+     protected static $instance = null;
+
+     /**
+      * Return an instance of this class.
+      *
+      * @since 1.0.0
+      *
+      * @return    object \lsx_health_plan\classes\SCPO_Engine()    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 __construct() {
+          if ( ! get_option( 'lsx_to_scporder_install' ) ) {
+               $this->lsx_to_scporder_install();
+          }
+
+          add_action( 'admin_init', array( $this, 'refresh' ) );
+          add_action( 'admin_init', array( $this, 'load_script_css' ) );
+
+          add_action( 'wp_ajax_update-menu-order', array(
+               $this,
+               'update_menu_order',
+          ) );
+          add_action( 'wp_ajax_update-menu-order-tags', array(
+               $this,
+               'update_menu_order_tags',
+          ) );
+
+          add_action( 'pre_get_posts', array(
+               $this,
+               'lsx_to_scporder_pre_get_posts',
+          ) );
+
+          add_filter( 'get_previous_post_where', array(
+               $this,
+               'lsx_to_scporder_previous_post_where',
+          ) );
+          add_filter( 'get_previous_post_sort', array(
+               $this,
+               'lsx_to_scporder_previous_post_sort',
+          ) );
+          add_filter( 'get_next_post_where', array(
+               $this,
+               'lsx_to_scporder_next_post_where',
+          ) );
+          add_filter( 'get_next_post_sort', array(
+               $this,
+               'lsx_to_scporder_next_post_sort',
+          ) );
+
+          add_filter( 'get_terms_orderby', array(
+               $this,
+               'lsx_to_scporder_get_terms_orderby',
+          ), 10, 3 );
+          add_filter( 'wp_get_object_terms', array(
+               $this,
+               'lsx_to_scporder_get_object_terms',
+          ), 10, 4 );
+          add_filter( 'get_terms', array(
+               $this,
+               'lsx_to_scporder_get_object_terms',
+          ), 10, 4 );
+     }
+
+     public function lsx_to_scporder_install() {
+          global $wpdb;
+          $result = $wpdb->query( "DESCRIBE $wpdb->terms `lsx_to_term_order`" );
+
+          if ( ! $result ) {
+               $result = $wpdb->query( "ALTER TABLE $wpdb->terms ADD `lsx_to_term_order` INT(4) NULL DEFAULT '0'" );
+          }
+
+          update_option( 'lsx_to_scporder_install', 1 );
+     }
+
+     public function _check_load_script_css() {
+          $active = false;
+
+          $objects = $this->get_to_scporder_options_objects();
+          $tags    = $this->get_to_scporder_options_tags();
+
+          if ( empty( $objects ) && empty( $tags ) ) {
+               return false;
+          }
+
+          if ( isset( $_GET['orderby'] ) || strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'action=edit' ) || strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'wp-admin/post-new.php' ) ) {
+               return false;
+          }
+
+          if ( ! empty( $objects ) ) {
+               if ( isset( $_GET['post_type'] ) && ! isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( $_GET['post_type'] ), $objects ) ) { // if page or custom post types
+                    $active = true;
+               }
+               if ( ! isset( $_GET['post_type'] ) && strstr( sanitize_text_field( $_SERVER['REQUEST_URI'] ), 'wp-admin/edit.php' ) && array_key_exists( 'post', $objects ) ) { // if post
+                    $active = true;
+               }
+          }
+
+          if ( ! empty( $tags ) ) {
+               if ( isset( $_GET['taxonomy'] ) && array_key_exists( sanitize_text_field( $_GET['taxonomy'] ), $tags ) ) {
+                    $active = true;
+               }
+          }
+
+          return $active;
+     }
+
+     public function load_script_css() {
+          if ( $this->_check_load_script_css() ) {
+               wp_enqueue_script( 'scporderjs', LSX_HEALTH_PLAN_URL . '/assets/js/scporder.min.js', array( 'jquery', 'jquery-ui-sortable' ), null, true );
+
+               $scporderjs_params = array(
+                    'ajax_url'   => admin_url( 'admin-ajax.php' ),
+                    'ajax_nonce' => wp_create_nonce( 'scporder' ),
+               );
+
+               wp_localize_script( 'scporderjs', 'scporderjs_params', $scporderjs_params );
+
+               wp_enqueue_style( 'scporder', LSX_HEALTH_PLAN_URL . '/assets/css/scporder.css', array(), null );
+               wp_style_add_data( 'scporder', 'rtl', 'replace' );
+          }
+     }
+
+     public function refresh() {
+          global $wpdb;
+          $objects = $this->get_to_scporder_options_objects();
+          $tags    = $this->get_to_scporder_options_tags();
+
+          if ( ! empty( $objects ) ) {
+               foreach ( $objects as $object => $object_data ) {
+                    $result = $wpdb->get_results( $wpdb->prepare( "
 					SELECT count(*) as cnt, max(menu_order) as max, min(menu_order) as min
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
 				", $object ) );
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
-					continue;
-				}
+                    if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+                         continue;
+                    }
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+                    $results = $wpdb->get_results( $wpdb->prepare( "
 					SELECT ID
 					FROM $wpdb->posts
 					WHERE post_type = '%s' AND post_status IN ('publish', 'pending', 'draft', 'private', 'future')
 					ORDER BY menu_order ASC
 				", $object ) );
 
-				foreach ( $results as $key => $result ) {
-					$wpdb->update(
-						$wpdb->posts,
-						array(
-							'menu_order' => $key + 1,
-						),
-						array(
-							'ID' => $result->ID,
-						)
-					);
-				}
-			}
-		}
-
-		if ( ! empty( $tags ) ) {
-			foreach ( $tags as $taxonomy => $taxonomy_data ) {
-				$result = $wpdb->get_results( $wpdb->prepare( "
+                    foreach ( $results as $key => $result ) {
+                         $wpdb->update(
+                              $wpdb->posts,
+                              array(
+                                   'menu_order' => $key + 1,
+                              ),
+                              array(
+                                   'ID' => $result->ID,
+                              )
+                         );
+                    }
+               }
+          }
+
+          if ( ! empty( $tags ) ) {
+               foreach ( $tags as $taxonomy => $taxonomy_data ) {
+                    $result = $wpdb->get_results( $wpdb->prepare( "
 					SELECT count(*) as cnt, max(lsx_to_term_order) as max, min(lsx_to_term_order) as min
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
 					WHERE term_taxonomy.taxonomy = '%s'
 				", $taxonomy ) );
 
-				if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
-					continue;
-				}
+                    if ( 0 == $result[0]->cnt || $result[0]->cnt == $result[0]->max ) {
+                         continue;
+                    }
 
-				$results = $wpdb->get_results( $wpdb->prepare( "
+                    $results = $wpdb->get_results( $wpdb->prepare( "
 					SELECT terms.term_id
 					FROM $wpdb->terms AS terms
 					INNER JOIN $wpdb->term_taxonomy AS term_taxonomy ON ( terms.term_id = term_taxonomy.term_id )
@@ -199,33 +199,33 @@ 
 					ORDER BY lsx_to_term_order ASC
 				", $taxonomy ) );
 
-				foreach ( $results as $key => $result ) {
-					$wpdb->update(
-						$wpdb->terms,
-						array(
-							'lsx_to_term_order' => $key + 1,
-						),
-						array(
-							'term_id' => $result->term_id,
-						)
-					);
-				}
-			}
-		}
-	}
+                    foreach ( $results as $key => $result ) {
+                         $wpdb->update(
+                              $wpdb->terms,
+                              array(
+                                   'lsx_to_term_order' => $key + 1,
+                              ),
+                              array(
+                                   'term_id' => $result->term_id,
+                              )
+                         );
+                    }
+               }
+          }
+     }
 
-	public function update_menu_order() {
-		check_ajax_referer( 'scporder', 'security' );
+     public function update_menu_order() {
+          check_ajax_referer( 'scporder', 'security' );
 
-		global $wpdb;
+          global $wpdb;
 
-		parse_str( sanitize_text_field( $_POST['order'] ), $data );
+          parse_str( sanitize_text_field( $_POST['order'] ), $data );
 
-		if ( ! is_array( $data ) ) {
-			return false;
-		}
+          if ( ! is_array( $data ) ) {
+               return false;
+          }
 
-		/*$id_arr = array();
+          /*$id_arr = array();
 
 		foreach ( $data as $key => $values ) {
 			foreach ( $values as $position => $id ) {
@@ -244,38 +244,38 @@ 
 
 		sort( $menu_order_arr );*/
 
-		foreach ( $data as $key => $values ) {
-			foreach ( $values as $position => $id ) {
-				$wpdb->update(
-					$wpdb->posts,
-					array(
-						'menu_order' => $position,
-					),
-					array(
-						'ID' => intval( $id ),
-					)
-				);
-			}
-		}
-	}
-
-	public function update_menu_order_tags() {
-		check_ajax_referer( 'scporder', 'security' );
-
-		global $wpdb;
-
-		parse_str( sanitize_text_field( $_POST['order'] ), $data );
-
-		if ( ! is_array( $data ) ) {
-			return false;
-		}
-
-		/*$current_user = wp_get_current_user();
+          foreach ( $data as $key => $values ) {
+               foreach ( $values as $position => $id ) {
+                    $wpdb->update(
+                         $wpdb->posts,
+                         array(
+                              'menu_order' => $position,
+                         ),
+                         array(
+                              'ID' => intval( $id ),
+                         )
+                    );
+               }
+          }
+     }
+
+     public function update_menu_order_tags() {
+          check_ajax_referer( 'scporder', 'security' );
+
+          global $wpdb;
+
+          parse_str( sanitize_text_field( $_POST['order'] ), $data );
+
+          if ( ! is_array( $data ) ) {
+               return false;
+          }
+
+          /*$current_user = wp_get_current_user();
 		if ( false === $current_user || 'lightspeed' !== $current_user->data->user_login ) {
 			return false;
 		}*/
 
-		/*$id_arr = array();
+          /*$id_arr = array();
 
 		foreach ( $data as $key => $values ) {
 			foreach ( $values as $position => $id ) {
@@ -294,217 +294,217 @@ 
 
 		sort( $menu_order_arr );*/
 
-		foreach ( $data as $key => $values ) {
-			$term_ids = array();
-			foreach ( $values as $position => $id ) {
-				$wpdb->update(
-					$wpdb->terms,
-					array(
-						'lsx_to_term_order' => $position + 1,
-					),
-					array(
-						'term_id' => intval( $id ),
-					)
-				);
-				$term_ids[] = intval( $id );
-			}
-			clean_term_cache( $term_ids );
-		}
-	}
-
-	public function lsx_to_scporder_previous_post_where( $where ) {
-		global $post;
-		$objects = $this->get_to_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $where;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$current_menu_order = $post->menu_order;
-			$where              = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
-		}
-
-		return $where;
-	}
-
-	public function lsx_to_scporder_previous_post_sort( $orderby ) {
-		global $post;
-		$objects = $this->get_to_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $orderby;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
-		}
-
-		return $orderby;
-	}
-
-	public function lsx_to_scporder_next_post_where( $where ) {
-		global $post;
-		$objects = $this->get_to_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $where;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$current_menu_order = $post->menu_order;
-			$where              = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
-		}
-
-		return $where;
-	}
-
-	public function lsx_to_scporder_next_post_sort( $orderby ) {
-		global $post;
-		$objects = $this->get_to_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return $orderby;
-		}
-
-		if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
-			$orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
-		}
-
-		return $orderby;
-	}
-
-	public function lsx_to_scporder_pre_get_posts( $wp_query ) {
-		$objects = $this->get_to_scporder_options_objects();
-
-		if ( empty( $objects ) ) {
-			return false;
-		}
-
-		if ( is_admin() ) {
-			if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) {
-				if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-					$wp_query->set( 'order', 'ASC' );
-				}
-			}
-		} else {
-			$active = false;
-
-			if ( isset( $wp_query->query['post_type'] ) ) {
-				if ( ! is_array( $wp_query->query['post_type'] ) ) {
-					if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
-						$active = true;
-					}
-				}
-			} else {
-				if ( array_key_exists( 'post', $objects ) ) {
-					$active = true;
-				}
-			}
-
-			if ( ! $active ) {
-				return false;
-			}
-
-			if ( isset( $wp_query->query['disabled_custom_post_order'] ) ) {
-				return false;
-			}
-
-			if ( isset( $wp_query->query['suppress_filters'] ) ) {
-				if ( $wp_query->get( 'orderby' ) == 'date' ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-				}
-				if ( $wp_query->get( 'order' ) == 'DESC' ) {
-					$wp_query->set( 'order', 'ASC' );
-				}
-			} else {
-				if ( ! $wp_query->get( 'orderby' ) ) {
-					$wp_query->set( 'orderby', 'menu_order' );
-				}
-				if ( ! $wp_query->get( 'order' ) ) {
-					$wp_query->set( 'order', 'ASC' );
-				}
-			}
-		}
-	}
-
-	public function lsx_to_scporder_get_terms_orderby( $orderby, $args ) {
-
-		if ( is_admin() ) {
-			return $orderby;
-		}
-
-		if ( isset( $args['disabled_custom_post_order'] ) ) {
-			return $orderby;
-		}
-
-		$tags = $this->get_to_scporder_options_tags();
-
-		if ( ! isset( $args['taxonomy'] ) ) {
-			return $orderby;
-		}
-
-		$taxonomy = $args['taxonomy'];
-		if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 ) {
-			$taxonomy = $taxonomy[0];
-		}
-		if ( ! is_array( $taxonomy ) && ! array_key_exists( $taxonomy, $tags ) ) {
-			return $orderby;
-		}
-
-		$orderby = 't.lsx_to_term_order';
-
-		return $orderby;
-	}
-
-	public function lsx_to_scporder_get_object_terms( $terms, $not_used, $args_1, $args_2 = null ) {
-		$tags = $this->get_to_scporder_options_tags();
-
-		if ( is_admin() && isset( $_GET['orderby'] ) ) {
-			return $terms;
-		}
-
-		$args = is_null( $args_2 ) || ! is_array( $args_2 ) ? $args_1 : $args_2;
-
-		if ( isset( $args['disabled_custom_post_order'] ) ) {
-			return $terms;
-		}
-
-		foreach ( $terms as $key => $term ) {
-			if ( is_object( $term ) && isset( $term->taxonomy ) ) {
-				$taxonomy = $term->taxonomy;
-				if ( ! array_key_exists( $taxonomy, $tags ) ) {
-					return $terms;
-				}
-			} else {
-				return $terms;
-			}
-		}
-		usort( $terms, array( $this, 'taxcmp' ) );
-		return $terms;
-	}
-
-	public function taxcmp( $a, $b ) {
-		if ( $a->lsx_to_term_order == $b->lsx_to_term_order ) {
-			return 0;
-		}
-		return ( $a->lsx_to_term_order < $b->lsx_to_term_order ) ? - 1 : 1;
-	}
-
-	public function get_to_scporder_options_objects() {
-		$ordering = array(
-			'plan' => 'plan',
-		);
-		return $ordering;
-	}
-
-	public function get_to_scporder_options_tags() {
-		$ordering = array(
-			'week' => 'week',
-			'recipe-type' => 'recipe-type',
-		);
-		return $ordering;
-	}
+          foreach ( $data as $key => $values ) {
+               $term_ids = array();
+               foreach ( $values as $position => $id ) {
+                    $wpdb->update(
+                         $wpdb->terms,
+                         array(
+                              'lsx_to_term_order' => $position + 1,
+                         ),
+                         array(
+                              'term_id' => intval( $id ),
+                         )
+                    );
+                    $term_ids[] = intval( $id );
+               }
+               clean_term_cache( $term_ids );
+          }
+     }
+
+     public function lsx_to_scporder_previous_post_where( $where ) {
+          global $post;
+          $objects = $this->get_to_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $where;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $current_menu_order = $post->menu_order;
+               $where              = "WHERE p.menu_order > '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
+          }
+
+          return $where;
+     }
+
+     public function lsx_to_scporder_previous_post_sort( $orderby ) {
+          global $post;
+          $objects = $this->get_to_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $orderby;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $orderby = 'ORDER BY p.menu_order ASC LIMIT 1';
+          }
+
+          return $orderby;
+     }
+
+     public function lsx_to_scporder_next_post_where( $where ) {
+          global $post;
+          $objects = $this->get_to_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $where;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $current_menu_order = $post->menu_order;
+               $where              = "WHERE p.menu_order < '" . $current_menu_order . "' AND p.post_type = '" . $post->post_type . "' AND p.post_status = 'publish'";
+          }
+
+          return $where;
+     }
+
+     public function lsx_to_scporder_next_post_sort( $orderby ) {
+          global $post;
+          $objects = $this->get_to_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return $orderby;
+          }
+
+          if ( isset( $post->post_type ) && array_key_exists( $post->post_type, $objects ) ) {
+               $orderby = 'ORDER BY p.menu_order DESC LIMIT 1';
+          }
+
+          return $orderby;
+     }
+
+     public function lsx_to_scporder_pre_get_posts( $wp_query ) {
+          $objects = $this->get_to_scporder_options_objects();
+
+          if ( empty( $objects ) ) {
+               return false;
+          }
+
+          if ( is_admin() ) {
+               if ( isset( $wp_query->query['post_type'] ) && ! isset( $_GET['orderby'] ) ) {
+                    if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
+                         $wp_query->set( 'orderby', 'menu_order' );
+                         $wp_query->set( 'order', 'ASC' );
+                    }
+               }
+          } else {
+               $active = false;
+
+               if ( isset( $wp_query->query['post_type'] ) ) {
+                    if ( ! is_array( $wp_query->query['post_type'] ) ) {
+                         if ( array_key_exists( $wp_query->query['post_type'], $objects ) ) {
+                              $active = true;
+                         }
+                    }
+               } else {
+                    if ( array_key_exists( 'post', $objects ) ) {
+                         $active = true;
+                    }
+               }
+
+               if ( ! $active ) {
+                    return false;
+               }
+
+               if ( isset( $wp_query->query['disabled_custom_post_order'] ) ) {
+                    return false;
+               }
+
+               if ( isset( $wp_query->query['suppress_filters'] ) ) {
+                    if ( $wp_query->get( 'orderby' ) == 'date' ) {
+                         $wp_query->set( 'orderby', 'menu_order' );
+                    }
+                    if ( $wp_query->get( 'order' ) == 'DESC' ) {
+                         $wp_query->set( 'order', 'ASC' );
+                    }
+               } else {
+                    if ( ! $wp_query->get( 'orderby' ) ) {
+                         $wp_query->set( 'orderby', 'menu_order' );
+                    }
+                    if ( ! $wp_query->get( 'order' ) ) {
+                         $wp_query->set( 'order', 'ASC' );
+                    }
+               }
+          }
+     }
+
+     public function lsx_to_scporder_get_terms_orderby( $orderby, $args ) {
+
+          if ( is_admin() ) {
+               return $orderby;
+          }
+
+          if ( isset( $args['disabled_custom_post_order'] ) ) {
+               return $orderby;
+          }
+
+          $tags = $this->get_to_scporder_options_tags();
+
+          if ( ! isset( $args['taxonomy'] ) ) {
+               return $orderby;
+          }
+
+          $taxonomy = $args['taxonomy'];
+          if ( is_array( $taxonomy ) && count( $taxonomy ) == 1 ) {
+               $taxonomy = $taxonomy[0];
+          }
+          if ( ! is_array( $taxonomy ) && ! array_key_exists( $taxonomy, $tags ) ) {
+               return $orderby;
+          }
+
+          $orderby = 't.lsx_to_term_order';
+
+          return $orderby;
+     }
+
+     public function lsx_to_scporder_get_object_terms( $terms, $not_used, $args_1, $args_2 = null ) {
+          $tags = $this->get_to_scporder_options_tags();
+
+          if ( is_admin() && isset( $_GET['orderby'] ) ) {
+               return $terms;
+          }
+
+          $args = is_null( $args_2 ) || ! is_array( $args_2 ) ? $args_1 : $args_2;
+
+          if ( isset( $args['disabled_custom_post_order'] ) ) {
+               return $terms;
+          }
+
+          foreach ( $terms as $key => $term ) {
+               if ( is_object( $term ) && isset( $term->taxonomy ) ) {
+                    $taxonomy = $term->taxonomy;
+                    if ( ! array_key_exists( $taxonomy, $tags ) ) {
+                         return $terms;
+                    }
+               } else {
+                    return $terms;
+               }
+          }
+          usort( $terms, array( $this, 'taxcmp' ) );
+          return $terms;
+     }
+
+     public function taxcmp( $a, $b ) {
+          if ( $a->lsx_to_term_order == $b->lsx_to_term_order ) {
+               return 0;
+          }
+          return ( $a->lsx_to_term_order < $b->lsx_to_term_order ) ? - 1 : 1;
+     }
+
+     public function get_to_scporder_options_objects() {
+          $ordering = array(
+               'plan' => 'plan',
+          );
+          return $ordering;
+     }
+
+     public function get_to_scporder_options_tags() {
+          $ordering = array(
+               'week' => 'week',
+               'recipe-type' => 'recipe-type',
+          );
+          return $ordering;
+     }
 }
 

classes/class-post-type.php

Spacing +11 added lines, -11 removed lines

@@ -37,20 +37,20 @@ 
 	 */
 	public function __construct() {
 		$this->enable_post_types();
-		add_filter( 'lsx_health_plan_post_types', array( $this, 'enable_post_types' ) );
-		foreach ( $this->post_types as $index => $post_type ) {
-			$is_disabled = \lsx_health_plan\functions\get_option( $post_type . '_disabled', false );
+		add_filter('lsx_health_plan_post_types', array($this, 'enable_post_types'));
+		foreach ($this->post_types as $index => $post_type) {
+			$is_disabled = \lsx_health_plan\functions\get_option($post_type . '_disabled', false);
 			// Check if exercises is enabled, if so disable the videos.
-			if ( 'video' === $post_type && false !== \lsx_health_plan\functions\get_option( 'exercise_enabled', false ) ) {
+			if ('video' === $post_type && false !== \lsx_health_plan\functions\get_option('exercise_enabled', false)) {
 				$is_disabled = true;
 			}
 
-			if ( true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled ) {
-				unset( $this->post_types[ $index ] );
+			if (true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled) {
+				unset($this->post_types[$index]);
 			} else {
 				require_once LSX_HEALTH_PLAN_PATH . 'classes/post-types/class-' . $post_type . '.php';
-				$classname        = ucwords( $post_type );
-				$this->$post_type = call_user_func_array( '\\lsx_health_plan\classes\\' . $classname . '::get_instance', array() );
+				$classname        = ucwords($post_type);
+				$this->$post_type = call_user_func_array('\\lsx_health_plan\classes\\' . $classname . '::get_instance', array());
 			}
 		}
 	}
@@ -64,7 +64,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;
@@ -75,8 +75,8 @@ 
 	 *
 	 * @return void
 	 */
-	public function enable_post_types( $post_types = array() ) {
-		$post_types       = array(
+	public function enable_post_types($post_types = array()) {
+		$post_types = array(
 			'plan',
 			'workout',
 			'meal',

Indentation +73 added lines, -73 removed lines

@@ -9,83 +9,83 @@
  */
 class Post_Type {
 
-	/**
-	 * Holds class instance
-	 *
-	 * @since 1.0.0
-	 *
-	 * @var      object \lsx_health_plan\classes\Post_Type()
-	 */
-	protected static $instance = null;
+     /**
+      * Holds class instance
+      *
+      * @since 1.0.0
+      *
+      * @var      object \lsx_health_plan\classes\Post_Type()
+      */
+     protected static $instance = null;
 
-	/**
-	 * The post types available
-	 *
-	 * @var array
-	 */
-	public $post_types = array();
+     /**
+      * The post types available
+      *
+      * @var array
+      */
+     public $post_types = array();
 
-	/**
-	 * The related post type connections
-	 *
-	 * @var array
-	 */
-	public $connections = array();
+     /**
+      * The related post type connections
+      *
+      * @var array
+      */
+     public $connections = array();
 
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->enable_post_types();
-		add_filter( 'lsx_health_plan_post_types', array( $this, 'enable_post_types' ) );
-		foreach ( $this->post_types as $index => $post_type ) {
-			$is_disabled = \lsx_health_plan\functions\get_option( $post_type . '_disabled', false );
-			// Check if exercises is enabled, if so disable the videos.
-			if ( 'video' === $post_type && false !== \lsx_health_plan\functions\get_option( 'exercise_enabled', false ) ) {
-				$is_disabled = true;
-			}
+     /**
+      * Constructor
+      */
+     public function __construct() {
+          $this->enable_post_types();
+          add_filter( 'lsx_health_plan_post_types', array( $this, 'enable_post_types' ) );
+          foreach ( $this->post_types as $index => $post_type ) {
+               $is_disabled = \lsx_health_plan\functions\get_option( $post_type . '_disabled', false );
+               // Check if exercises is enabled, if so disable the videos.
+               if ( 'video' === $post_type && false !== \lsx_health_plan\functions\get_option( 'exercise_enabled', false ) ) {
+                    $is_disabled = true;
+               }
 
-			if ( true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled ) {
-				unset( $this->post_types[ $index ] );
-			} else {
-				require_once LSX_HEALTH_PLAN_PATH . 'classes/post-types/class-' . $post_type . '.php';
-				$classname        = ucwords( $post_type );
-				$this->$post_type = call_user_func_array( '\\lsx_health_plan\classes\\' . $classname . '::get_instance', array() );
-			}
-		}
-	}
+               if ( true === $is_disabled || 1 === $is_disabled || 'on' === $is_disabled ) {
+                    unset( $this->post_types[ $index ] );
+               } else {
+                    require_once LSX_HEALTH_PLAN_PATH . 'classes/post-types/class-' . $post_type . '.php';
+                    $classname        = ucwords( $post_type );
+                    $this->$post_type = call_user_func_array( '\\lsx_health_plan\classes\\' . $classname . '::get_instance', array() );
+               }
+          }
+     }
 
-	/**
-	 * Return an instance of this class.
-	 *
-	 * @since 1.0.0
-	 *
-	 * @return    object \lsx_health_plan\classes\Post_Type()    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_health_plan\classes\Post_Type()    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;
+     }
 
-	/**
-	 * Enable our post types
-	 *
-	 * @return void
-	 */
-	public function enable_post_types( $post_types = array() ) {
-		$post_types       = array(
-			'plan',
-			'workout',
-			'meal',
-			'recipe',
-			'tip',
-			'video',
-			'exercise',
-		);
-		$this->post_types = $post_types;
-		return $post_types;
-	}
+     /**
+      * Enable our post types
+      *
+      * @return void
+      */
+     public function enable_post_types( $post_types = array() ) {
+          $post_types       = array(
+               'plan',
+               'workout',
+               'meal',
+               'recipe',
+               'tip',
+               'video',
+               'exercise',
+          );
+          $this->post_types = $post_types;
+          return $post_types;
+     }
 }